diff options
87 files changed, 104 insertions, 483 deletions
diff --git a/doc/fuel-stop-advisor/NavigationAppBrowseMap.png b/doc/fuel-stop-advisor/NavigationAppBrowseMap.png Binary files differnew file mode 100644 index 0000000..61c8c92 --- /dev/null +++ b/doc/fuel-stop-advisor/NavigationAppBrowseMap.png diff --git a/doc/fuel-stop-advisor/NavigationAppBrowseMapManeuvers.png b/doc/fuel-stop-advisor/NavigationAppBrowseMapManeuvers.png Binary files differnew file mode 100644 index 0000000..391cf2d --- /dev/null +++ b/doc/fuel-stop-advisor/NavigationAppBrowseMapManeuvers.png diff --git a/doc/fuel-stop-advisor/NavigationAppBrowseMap_Settings.png b/doc/fuel-stop-advisor/NavigationAppBrowseMap_Settings.png Binary files differnew file mode 100644 index 0000000..39c3e5f --- /dev/null +++ b/doc/fuel-stop-advisor/NavigationAppBrowseMap_Settings.png diff --git a/doc/fuel-stop-advisor/NavigationAppMain.png b/doc/fuel-stop-advisor/NavigationAppMain.png Binary files differnew file mode 100644 index 0000000..b225d0d --- /dev/null +++ b/doc/fuel-stop-advisor/NavigationAppMain.png diff --git a/doc/fuel-stop-advisor/NavigationAppPOI.png b/doc/fuel-stop-advisor/NavigationAppPOI.png Binary files differnew file mode 100644 index 0000000..8b7c4e6 --- /dev/null +++ b/doc/fuel-stop-advisor/NavigationAppPOI.png diff --git a/doc/fuel-stop-advisor/NavigationAppSearch.png b/doc/fuel-stop-advisor/NavigationAppSearch.png Binary files differnew file mode 100644 index 0000000..ab187ea --- /dev/null +++ b/doc/fuel-stop-advisor/NavigationAppSearch.png diff --git a/doc/fuel-stop-advisor/NavigationAppSettings.png b/doc/fuel-stop-advisor/NavigationAppSettings.png Binary files differnew file mode 100644 index 0000000..5c2d4ab --- /dev/null +++ b/doc/fuel-stop-advisor/NavigationAppSettings.png diff --git a/doc/fuel-stop-advisor/NavigationAppSettingsLanguageAndUnits.png b/doc/fuel-stop-advisor/NavigationAppSettingsLanguageAndUnits.png Binary files differnew file mode 100644 index 0000000..92a9b52 --- /dev/null +++ b/doc/fuel-stop-advisor/NavigationAppSettingsLanguageAndUnits.png diff --git a/doc/fuel-stop-advisor/NavigationAppSettingsPreferences.png b/doc/fuel-stop-advisor/NavigationAppSettingsPreferences.png Binary files differnew file mode 100644 index 0000000..f32a6e8 --- /dev/null +++ b/doc/fuel-stop-advisor/NavigationAppSettingsPreferences.png diff --git a/doc/fuel-stop-advisor/NavigationAppTripComputer.png b/doc/fuel-stop-advisor/NavigationAppTripComputer.png Binary files differnew file mode 100644 index 0000000..089c9dd --- /dev/null +++ b/doc/fuel-stop-advisor/NavigationAppTripComputer.png diff --git a/doc/fuel-stop-advisor/menu.md b/doc/fuel-stop-advisor/menu.md new file mode 100644 index 0000000..72808fe --- /dev/null +++ b/doc/fuel-stop-advisor/menu.md @@ -0,0 +1,98 @@ +# Description of the menu tree structure + +## Some naming conventions: + +A menu is named with the corresponding qml file name. +Each menu contains a set of possible actions (e.g. push a button) that change the status and in some case open another menu +Actions are named with capital letters + +## Available menus and details: + +### NavigationAppMain + +Rationale: +To allow to access sub menus +Actions: +NAVI --> show navigation menu +POI --> show poi menu +MAP --> show map viewer menu +TRIP --> show trip computer +QUIT --> close the application + +###NavigationAppTripComputer + +Rationale: +To display trip computer data, including tank disatnce and enhanced tank distance +TRIP1 --> display trip 1 +TRIP2 --> display trip 2 +RESET --> reset the current displayed trip +BACK --> back to parent menu + +###NavigationAppPOI + +Rationale: +To search for POIs, by selecting categories +To display it on the map +To launch a route calculation to reach a selected POI +Actions: +KBCATE --> display categories +KBPOI --> button keyboard for poi +SEARCH --> button search +MAP --> button show on map +GOTO --> button goto the selected destination +KBYD --> keyboard area +BACK --> back to parent menu + +###NavigationAppSettings + +Rationale: +To configure the simulation +To access sub menus for configuration +Actions: +SIMU --> on/off simulation +SPEED --> set simulation speed +MODE --> start/pause stop simulation +PREF --> access sub menu preferences +LANG&UNIT --> access sub menu language and units +BACK --> back to NavigationAppSearch + +###NavigationAppSettingsLanguageAndUnits + +To select language and units +Actions: +LANG --> select the language +UNIT --> select the unit +BACK --> back to NavigationAppSettings + +###NavigationAppSettingsPreferences + +To select preferences for route calculation +Actions: +COST --> select cost model +ROUTE_PREF --> select routing preference +BACK --> back to NavigationAppSettings + +###NavigationAppSearch + +To enter a location by a keyboard +To launch a route calculation +To launch a guidance and go to the map viewer menu +To display the route on the map +To access sub menu poi +To access sub menu nav settings +Actions: +COUNTRY/CITY/STREET/NUMBER --> activate the keyboard and enter a destination +GOTO --> launch a route calculation +MAP --> display the route on map +ON --> launch a guidance and go to the map viewer menu +SETTINGS --> display the navigation settings menu +POI --> go to POI menu +BACK --> back to NavigationAppMain + +###NavigationAppBrowseMap + + + + + + diff --git a/src/README.md b/src/README.md index 3cb5dd9..acbcb73 100644 --- a/src/README.md +++ b/src/README.md @@ -38,7 +38,7 @@ or to build updated parts ./build.sh ## How to test - +There's a file that contains some test case and the reminding issues (bug list) ##Directory Structure @@ -80,7 +80,7 @@ Potential issue may occur due to path change of freetype stuff. If necessary, ad There are two resolutions available, WVGA and XGA. For instance, for VGA: cd script -./prepare.sh -i ../hmi/qml/Core/gimp/green-theme/800x480 +./prepare.sh -i ../hmi/qml/Core/gimp/gdp-theme/800x480 cd ../ diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/button-keyboard.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/button-keyboard.xcf Binary files differdeleted file mode 100644 index 63659ef..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/button-keyboard.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/fsa-main-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/fsa-main-menu.xcf Binary files differdeleted file mode 100755 index abae8ed..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/fsa-main-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/fsa-poi-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/fsa-poi-menu.xcf Binary files differdeleted file mode 100644 index a093966..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/fsa-poi-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-bottom.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-bottom.xcf Binary files differdeleted file mode 100755 index ac2e49e..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-bottom.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-guidance.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-guidance.xcf Binary files differdeleted file mode 100755 index e7d4a28..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-guidance.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-route.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-route.xcf Binary files differdeleted file mode 100755 index fae321d..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-route.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-scroll.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-scroll.xcf Binary files differdeleted file mode 100755 index 8c749c3..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-scroll.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-settings.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-settings.xcf Binary files differdeleted file mode 100755 index afa6e14..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-settings.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-simulation.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-simulation.xcf Binary files differdeleted file mode 100755 index 57fd772..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-simulation.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-top.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-top.xcf Binary files differdeleted file mode 100644 index a8652fd..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map-top.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map.xcf Binary files differdeleted file mode 100644 index 1097726..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-browse-map.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-calculated-route-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-calculated-route-menu.xcf Binary files differdeleted file mode 100644 index c69d527..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-calculated-route-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-route-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-route-menu.xcf Binary files differdeleted file mode 100644 index d59910c..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-route-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-search-address-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-search-address-menu.xcf Binary files differdeleted file mode 100644 index 69b493b..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-search-address-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-search-coordinates-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-search-coordinates-menu.xcf Binary files differdeleted file mode 100644 index b79f57c..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-search-coordinates-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-search-freetext-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-search-freetext-menu.xcf Binary files differdeleted file mode 100644 index fb3e0ae..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-search-freetext-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-search-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-search-menu.xcf Binary files differdeleted file mode 100644 index ef56108..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-search-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-settings-language-and-units-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-settings-language-and-units-menu.xcf Binary files differdeleted file mode 100644 index 94f8189..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-settings-language-and-units-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-settings-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-settings-menu.xcf Binary files differdeleted file mode 100644 index 946bc07..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-settings-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-settings-preference-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-settings-preference-menu.xcf Binary files differdeleted file mode 100644 index 82be1e0..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/navigation-settings-preference-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/1024x768/trip-computer-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/1024x768/trip-computer-menu.xcf Binary files differdeleted file mode 100644 index 4a079f9..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/1024x768/trip-computer-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/button-keyboard.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/button-keyboard.xcf Binary files differdeleted file mode 100644 index 63659ef..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/button-keyboard.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/fsa-main-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/fsa-main-menu.xcf Binary files differdeleted file mode 100755 index b91af1a..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/fsa-main-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/fsa-poi-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/fsa-poi-menu.xcf Binary files differdeleted file mode 100644 index 5dc1c76..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/fsa-poi-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-bottom.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-bottom.xcf Binary files differdeleted file mode 100755 index aed1524..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-bottom.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-guidance.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-guidance.xcf Binary files differdeleted file mode 100755 index 54a08fc..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-guidance.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-route.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-route.xcf Binary files differdeleted file mode 100755 index fae321d..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-route.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-scroll.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-scroll.xcf Binary files differdeleted file mode 100755 index 175b35b..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-scroll.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-settings.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-settings.xcf Binary files differdeleted file mode 100755 index afa6e14..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-settings.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-simulation.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-simulation.xcf Binary files differdeleted file mode 100755 index 50b7e64..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-simulation.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-top.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-top.xcf Binary files differdeleted file mode 100644 index f70a038..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map-top.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map.xcf Binary files differdeleted file mode 100644 index 01cf78d..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-browse-map.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-calculated-route-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-calculated-route-menu.xcf Binary files differdeleted file mode 100644 index 84a8984..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-calculated-route-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-route-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-route-menu.xcf Binary files differdeleted file mode 100644 index 2b09b09..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-route-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-search-address-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-search-address-menu.xcf Binary files differdeleted file mode 100644 index 0111920..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-search-address-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-search-coordinates-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-search-coordinates-menu.xcf Binary files differdeleted file mode 100644 index 183d5bc..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-search-coordinates-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-search-freetext-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-search-freetext-menu.xcf Binary files differdeleted file mode 100644 index 669b75f..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-search-freetext-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-search-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-search-menu.xcf Binary files differdeleted file mode 100644 index 32e9614..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-search-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-settings-language-and-units-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-settings-language-and-units-menu.xcf Binary files differdeleted file mode 100644 index 43e65a3..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-settings-language-and-units-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-settings-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-settings-menu.xcf Binary files differdeleted file mode 100644 index a7f8316..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-settings-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-settings-preference-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-settings-preference-menu.xcf Binary files differdeleted file mode 100644 index 8ad7b6e..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/navigation-settings-preference-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/800x480/trip-computer-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/800x480/trip-computer-menu.xcf Binary files differdeleted file mode 100644 index 64180aa..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/800x480/trip-computer-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/green-theme/LICENSE b/src/hmi/qml/Core/gimp/green-theme/LICENSE deleted file mode 100644 index 41de4d3..0000000 --- a/src/hmi/qml/Core/gimp/green-theme/LICENSE +++ /dev/null @@ -1,8 +0,0 @@ -SPDX-License-Identifier: CC-BY-SA-4.0
-
-Copyright (C) 2014, PCA Peugeot Citroen
-
-Author Philippe Colliot <philippe.colliot@mpsa.com>
-
-This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 Unported License.
-To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/ or send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/button-keyboard.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/button-keyboard.xcf Binary files differdeleted file mode 100644 index 23fdc4a..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/button-keyboard.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/fsa-main-menu.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/fsa-main-menu.xcf Binary files differdeleted file mode 100755 index 123ac3a..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/fsa-main-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/fsa-poi-menu.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/fsa-poi-menu.xcf Binary files differdeleted file mode 100644 index 6c22cd3..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/fsa-poi-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-bottom.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-bottom.xcf Binary files differdeleted file mode 100755 index 52a8a1a..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-bottom.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-guidance.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-guidance.xcf Binary files differdeleted file mode 100755 index 54a08fc..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-guidance.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-route.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-route.xcf Binary files differdeleted file mode 100755 index fae321d..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-route.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-scroll.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-scroll.xcf Binary files differdeleted file mode 100755 index 5e68dc1..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-scroll.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-settings.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-settings.xcf Binary files differdeleted file mode 100755 index 08e0753..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-settings.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-simulation.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-simulation.xcf Binary files differdeleted file mode 100755 index 1315c79..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-simulation.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-top.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-top.xcf Binary files differdeleted file mode 100644 index ba56540..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map-top.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map.xcf Binary files differdeleted file mode 100644 index 81da5af..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-browse-map.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-calculated-route-menu.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-calculated-route-menu.xcf Binary files differdeleted file mode 100644 index 7765546..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-calculated-route-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-route-menu.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-route-menu.xcf Binary files differdeleted file mode 100644 index df57652..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-route-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-search-address-menu.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-search-address-menu.xcf Binary files differdeleted file mode 100644 index cfa5986..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-search-address-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-search-coordinates-menu.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-search-coordinates-menu.xcf Binary files differdeleted file mode 100644 index 0317a61..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-search-coordinates-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-search-freetext-menu.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-search-freetext-menu.xcf Binary files differdeleted file mode 100644 index a164c11..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-search-freetext-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-search-menu.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-search-menu.xcf Binary files differdeleted file mode 100644 index 75206e0..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-search-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-settings-language-and-units-menu.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-settings-language-and-units-menu.xcf Binary files differdeleted file mode 100644 index 17bdf9f..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-settings-language-and-units-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-settings-menu.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-settings-menu.xcf Binary files differdeleted file mode 100644 index 2b9500c..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-settings-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-settings-preference-menu.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-settings-preference-menu.xcf Binary files differdeleted file mode 100644 index 88a167e..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/navigation-settings-preference-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/800x480/trip-computer-menu.xcf b/src/hmi/qml/Core/gimp/seoul-theme/800x480/trip-computer-menu.xcf Binary files differdeleted file mode 100644 index 0fb21ff..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/800x480/trip-computer-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/seoul-theme/LICENSE b/src/hmi/qml/Core/gimp/seoul-theme/LICENSE deleted file mode 100644 index 47c14d8..0000000 --- a/src/hmi/qml/Core/gimp/seoul-theme/LICENSE +++ /dev/null @@ -1,8 +0,0 @@ -SPDX-License-Identifier: CC-BY-SA-4.0
-
-Copyright (C) 2015, PCA Peugeot Citroen
-
-Author Philippe Colliot <philippe.colliot@mpsa.com>
-
-This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 Unported License.
-To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/ or send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
diff --git a/src/hmi/qml/NavigationAppBrowseMap.qml b/src/hmi/qml/NavigationAppBrowseMap.qml index 060ee6d..e0d82cd 100644 --- a/src/hmi/qml/NavigationAppBrowseMap.qml +++ b/src/hmi/qml/NavigationAppBrowseMap.qml @@ -122,7 +122,10 @@ HMIMenu { function guidancePositionOnRouteChanged(args) { Genivi.hookSignal("guidancePositionOnRouteChanged"); - updateGuidance(); + if(simu_mode.status!==0) + { //for the time being it's necessary because of a bug in simulation use case + updateGuidance(); + } } property Item mapmatchedpositionPositionUpdateSignal; diff --git a/src/step b/src/step deleted file mode 100755 index cd9679e..0000000 --- a/src/step +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/bash -########################################################################### -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# \copyright Copyright (C) 2016, PCA Peugeot Citroen -# -# \file step: step given step numbers -# -# \brief This file is part of the Build System. -# -# \author # Author: Philippe COLLIOT <philippe.colliot@mpsa.com> -# -# \version 1.0 -# -# This Source Code Form is subject to the terms of the -# Mozilla Public License (MPL), v. 2.0. -# If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. -# -# For further information see http://www.genivi.org/. -# -# List of changes: -# -# -# @licence end@ -########################################################################### - -for param in "$@" -do - ./step$param & -done - diff --git a/src/step1 b/src/step1 deleted file mode 100755 index daed5b3..0000000 --- a/src/step1 +++ /dev/null @@ -1,68 +0,0 @@ -#! /bin/bash -########################################################################### -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# \copyright Copyright (C) 2016, PCA Peugeot Citroen -# -# \file step1: start amb -# -# \brief This file is part of the Build System. -# -# \author # Author: Philippe COLLIOT <philippe.colliot@mpsa.com> -# -# \version 1.0 -# -# This Source Code Form is subject to the terms of the -# Mozilla Public License (MPL), v. 2.0. -# If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. -# -# For further information see http://www.genivi.org/. -# -# List of changes: -# -# -# @licence end@ -########################################################################### - -CUR_DIR=$PWD -BIN_DIR=$CUR_DIR/build -SRC_DIR=$CUR_DIR - -# location of exe, lib and config files -AUTOMOTIVE_MESSAGE_BROKER=automotive-message-broker -AUTOMOTIVE_MESSAGE_BROKER_SRC_DIR=$SRC_DIR/$AUTOMOTIVE_MESSAGE_BROKER -AUTOMOTIVE_MESSAGE_BROKER_BIN_DIR=$AUTOMOTIVE_MESSAGE_BROKER_SRC_DIR/src/$AUTOMOTIVE_MESSAGE_BROKER-build -GENIVI_LOGREPLAYER=genivilogreplayer -GENIVI_LOGREPLAYER_SRC_DIR=$SRC_DIR/$GENIVI_LOGREPLAYER -GENIVI_LOGREPLAYER_BIN_DIR=$BIN_DIR/$GENIVI_LOGREPLAYER - -# function to wait for the dbus service to be started, exit if too long -function wait_for_service -{ - for i in $(seq 1 50) - do - if dbus-send --dest=$1 $2 org.freedesktop.DBus.Introspectable.Introspect - then - return - fi - echo "Waiting for $1" - sleep 0.1 - done - exit 1 -} - -# check and kill remaining ambd process -ambd_process_id=$(pidof ambd) -if [ -n $ambd_process_id ] -then - kill -9 $ambd_process_id -fi - -# start the automotive message broker and wait for dbus service -cd $AUTOMOTIVE_MESSAGE_BROKER_BIN_DIR -./ambd/ambd > /dev/null 2>&1 --config $GENIVI_LOGREPLAYER_SRC_DIR/logreplayerconfig.in.json - -wait_for_service org.automotive.message.broker / - diff --git a/src/step2 b/src/step2 deleted file mode 100755 index 877dfea..0000000 --- a/src/step2 +++ /dev/null @@ -1,59 +0,0 @@ -#! /bin/bash -########################################################################### -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# \copyright Copyright (C) 2016, PCA Peugeot Citroen -# -# \file step2: start poi server -# -# \brief This file is part of the Build System. -# -# \author # Author: Philippe COLLIOT <philippe.colliot@mpsa.com> -# -# \version 1.0 -# -# This Source Code Form is subject to the terms of the -# Mozilla Public License (MPL), v. 2.0. -# If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. -# -# For further information see http://www.genivi.org/. -# -# List of changes: -# -# -# @licence end@ -########################################################################### - -CUR_DIR=$PWD -BIN_DIR=$CUR_DIR/build -SRC_DIR=$CUR_DIR -SCRIPT_DIR=$SRC_DIR/script - -# location of exe, lib and config files -NAVIGATION=navigation - -POI_SERVER=poi-server -POI_SERVER_SRC_DIR=$SRC_DIR/$NAVIGATION/src/poi-service/$POI_SERVER -POI_SERVER_BIN_DIR=$SRC_DIR/$NAVIGATION/src/poi-service/bin - -# function to wait for the dbus service to be started, exit if too long -function wait_for_service -{ - for i in $(seq 1 50) - do - if dbus-send --dest=$1 $2 org.freedesktop.DBus.Introspectable.Introspect - then - return - fi - echo "Waiting for $1" - sleep 0.1 - done - exit 1 -} - -# start the poi server and wait for dbus service -$POI_SERVER_BIN_DIR/$POI_SERVER -f $SCRIPT_DIR/empty.db -wait_for_service org.genivi.poiservice.POISearch /org/genivi/poiservice/POISearch - diff --git a/src/step3 b/src/step3 deleted file mode 100755 index ce84d95..0000000 --- a/src/step3 +++ /dev/null @@ -1,59 +0,0 @@ -#! /bin/bash -########################################################################### -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# \copyright Copyright (C) 2016, PCA Peugeot Citroen -# -# \file step2: start enhanced position service -# -# \brief This file is part of the Build System. -# -# \author # Author: Philippe COLLIOT <philippe.colliot@mpsa.com> -# -# \version 1.0 -# -# This Source Code Form is subject to the terms of the -# Mozilla Public License (MPL), v. 2.0. -# If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. -# -# For further information see http://www.genivi.org/. -# -# List of changes: -# -# -# @licence end@ -########################################################################### - -CUR_DIR=$PWD -BIN_DIR=$CUR_DIR/build -SRC_DIR=$CUR_DIR -SCRIPT_DIR=$SRC_DIR/script - -# location of exe, lib and config files -NAVIGATION=navigation -NAVIGATION_SRC_DIR=$SRC_DIR/$NAVIGATION/src/navigation -ENHANCED_POSITION_SERVICE=enhanced-position-service -ENHANCED_POSITION_SERVICE_SRC_DIR=$NAVIGATION_SRC_DIR/positioning/$ENHANCED_POSITION_SERVICE -ENHANCED_POSITION_SERVICE_BIN_DIR=$NAVIGATION_SRC_DIR/bin - -# function to wait for the dbus service to be started, exit if too long -function wait_for_service -{ - for i in $(seq 1 50) - do - if dbus-send --dest=$1 $2 org.freedesktop.DBus.Introspectable.Introspect - then - return - fi - echo "Waiting for $1" - sleep 0.1 - done - exit 1 -} - -# start the enhanced position service -$ENHANCED_POSITION_SERVICE_BIN_DIR/$ENHANCED_POSITION_SERVICE -wait_for_service org.genivi.positioning.EnhancedPosition /org/genivi/positioning/EnhancedPosition - diff --git a/src/step4 b/src/step4 deleted file mode 100755 index ff09ab7..0000000 --- a/src/step4 +++ /dev/null @@ -1,68 +0,0 @@ -#! /bin/bash -########################################################################### -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# \copyright Copyright (C) 2016, PCA Peugeot Citroen -# -# \file step2: start map viewer -# -# \brief This file is part of the Build System. -# -# \author # Author: Philippe COLLIOT <philippe.colliot@mpsa.com> -# -# \version 1.0 -# -# This Source Code Form is subject to the terms of the -# Mozilla Public License (MPL), v. 2.0. -# If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. -# -# For further information see http://www.genivi.org/. -# -# List of changes: -# -# -# @licence end@ -########################################################################### - -CUR_DIR=$PWD -BIN_DIR=$CUR_DIR/build -SRC_DIR=$CUR_DIR -SCRIPT_DIR=$SRC_DIR/script - -center="4612 N 0608 E" - -# location of exe, lib and config files -NAVIGATION=navigation -NAVIGATION_SRC_DIR=$SRC_DIR/$NAVIGATION/src/navigation -NAVIGATION_BIN_DIR=$BIN_DIR/$NAVIGATION - -NAVIT=navit -NAVIT_BIN_DIR=$NAVIGATION_BIN_DIR/navit/navit - -# function to wait for the dbus service to be started, exit if too long -function wait_for_service -{ - for i in $(seq 1 50) - do - if dbus-send --dest=$1 $2 org.freedesktop.DBus.Introspectable.Introspect - then - return - fi - echo "Waiting for $1" - sleep 0.1 - done - exit 1 -} - -cd $NAVIT_BIN_DIR ->bookmark.txt -echo "$center" >center.txt - -./$NAVIT -d 0 -c navit_genivi_mapviewer.xml - -wait_for_service org.genivi.mapviewer.Configuration /org/genivi/mapviewer -wait_for_service org.genivi.mapviewer.MapViewerControl /org/genivi/mapviewer -wait_for_service org.genivi.mapviewer.Session /org/genivi/mapviewer - diff --git a/src/step5 b/src/step5 deleted file mode 100755 index b83f797..0000000 --- a/src/step5 +++ /dev/null @@ -1,71 +0,0 @@ -#! /bin/bash -########################################################################### -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# \copyright Copyright (C) 2016, PCA Peugeot Citroen -# -# \file step2: start navigation core -# -# \brief This file is part of the Build System. -# -# \author # Author: Philippe COLLIOT <philippe.colliot@mpsa.com> -# -# \version 1.0 -# -# This Source Code Form is subject to the terms of the -# Mozilla Public License (MPL), v. 2.0. -# If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. -# -# For further information see http://www.genivi.org/. -# -# List of changes: -# -# -# @licence end@ -########################################################################### - -CUR_DIR=$PWD -BIN_DIR=$CUR_DIR/build -SRC_DIR=$CUR_DIR -SCRIPT_DIR=$SRC_DIR/script - -center="4612 N 0608 E" - -# location of exe, lib and config files -NAVIGATION=navigation -NAVIGATION_SRC_DIR=$SRC_DIR/$NAVIGATION/src/navigation -NAVIGATION_BIN_DIR=$BIN_DIR/$NAVIGATION - -NAVIT=navit -NAVIT_BIN_DIR=$NAVIGATION_BIN_DIR/navit/navit - -# function to wait for the dbus service to be started, exit if too long -function wait_for_service -{ - for i in $(seq 1 50) - do - if dbus-send --dest=$1 $2 org.freedesktop.DBus.Introspectable.Introspect - then - return - fi - echo "Waiting for $1" - sleep 0.1 - done - exit 1 -} - -cd $NAVIT_BIN_DIR ->bookmark.txt -echo "$center" >center.txt - -./$NAVIT -d 0 -c navit_genivi_navigationcore.xml - -wait_for_service org.genivi.navigationcore.Configuration /org/genivi/navigationcore -wait_for_service org.genivi.navigationcore.Guidance /org/genivi/navigationcore -wait_for_service org.genivi.navigationcore.LocationInput /org/genivi/navigationcore -wait_for_service org.genivi.navigationcore.MapMatchedPosition /org/genivi/navigationcore -wait_for_service org.genivi.navigationcore.Routing /org/genivi/navigationcore -wait_for_service org.genivi.navigationcore.Session /org/genivi/navigationcore - diff --git a/src/step6 b/src/step6 deleted file mode 100755 index 4bc9c89..0000000 --- a/src/step6 +++ /dev/null @@ -1,42 +0,0 @@ -#! /bin/bash -########################################################################### -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# \copyright Copyright (C) 2016, PCA Peugeot Citroen -# -# \file step2: start fsa application -# -# \brief This file is part of the Build System. -# -# \author # Author: Philippe COLLIOT <philippe.colliot@mpsa.com> -# -# \version 1.0 -# -# This Source Code Form is subject to the terms of the -# Mozilla Public License (MPL), v. 2.0. -# If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. -# -# For further information see http://www.genivi.org/. -# -# List of changes: -# -# -# @licence end@ -########################################################################### - -CUR_DIR=$PWD -BIN_DIR=$CUR_DIR/build -SRC_DIR=$CUR_DIR - -# location of exe, lib and config files -FUEL_STOP_ADVISOR=fuel-stop-advisor -FUEL_STOP_ADVISOR_SRC_DIR=$SRC_DIR/$FUEL_STOP_ADVISOR -FUEL_STOP_ADVISOR_BIN_DIR=$BIN_DIR/$FUEL_STOP_ADVISOR - -sleep 3 # need a sleep here (to be improved) - -# start the fuel stop advisor application -$FUEL_STOP_ADVISOR_BIN_DIR/$FUEL_STOP_ADVISOR - diff --git a/src/step7 b/src/step7 deleted file mode 100755 index 2ad28ac..0000000 --- a/src/step7 +++ /dev/null @@ -1,52 +0,0 @@ -#! /bin/bash -########################################################################### -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# \copyright Copyright (C) 2016, PCA Peugeot Citroen -# -# \file step2: start fsa hmi -# -# \brief This file is part of the Build System. -# -# \author # Author: Philippe COLLIOT <philippe.colliot@mpsa.com> -# -# \version 1.0 -# -# This Source Code Form is subject to the terms of the -# Mozilla Public License (MPL), v. 2.0. -# If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. -# -# For further information see http://www.genivi.org/. -# -# List of changes: -# -# -# @licence end@ -########################################################################### - -CUR_DIR=$PWD -BIN_DIR=$CUR_DIR/build -SRC_DIR=$CUR_DIR - -# location of exe, lib and config files -HMI_LAUNCHER=hmi-launcher -HMI_LAUNCHER_SRC_DIR=$SRC_DIR/hmi/qml/$HMI_LAUNCHER -HMI_LAUNCHER_BIN_DIR=$BIN_DIR/hmi/qml/$HMI_LAUNCHER -SCRIPT_DIR=$SRC_DIR/script -HMI_QML_DIR=$SRC_DIR/hmi/qml -app=$HMI_QML_DIR/application.qml # hmi panel launched by default -STYLE_SHEETS_GENERATED_INDICATOR=$HMI_QML_DIR/Core/style-sheets/the-style-sheets-have-been-generated-css.js - -# check if style sheets have been generated -if [ ! -f $STYLE_SHEETS_GENERATED_INDICATOR ] -then - echo "Please generate the style sheets before" - $SCRIPT_DIR/prepare.sh -h - exit 1 -fi - -# start the hmi -$HMI_LAUNCHER_BIN_DIR/$HMI_LAUNCHER $app - diff --git a/src/stop b/src/stop deleted file mode 100755 index 9a093b8..0000000 --- a/src/stop +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -echo 'kill all remaining process created by step*' -for i in 1 2 3 4 5 6 7 -do -STEP=$(pgrep -f step$i) -echo $STEP -if [ -n "$STEP" ]; then - kill -TERM $(pgrep -P $(pgrep -o step$i)) - kill -TERM $(pgrep -o step$i) -fi -done - |
