diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2022-07-04 21:19:06 +0000 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2022-07-04 21:19:06 +0000 |
| commit | 1a014832f3da70e413650e0eeb4f40e598feb257 (patch) | |
| tree | 61c0c2c4713d5ab507daeca87e68a7b1523a148b | |
| parent | 1593664d2f17ab563c7ad81215696b1ac6a3bd7b (diff) | |
Revert "Revert "Add VIS vehicle signal support""needlefish_13.93.0needlefish/13.93.013.93.0
This reverts commit 1593664d2f17ab563c7ad81215696b1ac6a3bd7b.
Reason for revert: These changes are now appropriate.
Change-Id: I2562a8f347192f942dc2ea0822c8f0b8bd97557b
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
| -rw-r--r-- | app/BtnGuidance.qml | 2 | ||||
| -rw-r--r-- | app/app.pro | 2 | ||||
| -rw-r--r-- | app/main.cpp | 4 | ||||
| -rw-r--r-- | app/navigation.qml | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/app/BtnGuidance.qml b/app/BtnGuidance.qml index bebb53b..e262704 100644 --- a/app/BtnGuidance.qml +++ b/app/BtnGuidance.qml @@ -40,7 +40,7 @@ Item { map.initDestination(startFromCurrentPosition) if(btn_guidance.sts_guide != 0){ - navigation.broadcastStatus("stop"); + navigation.broadcastStatus("Stopped"); } if(map.center !== map.currentpostion){ diff --git a/app/app.pro b/app/app.pro index 077a408..1a0a9c3 100644 --- a/app/app.pro +++ b/app/app.pro @@ -3,7 +3,7 @@ TARGET = navigation QT = core qml quick positioning CONFIG += c++11 link_pkgconfig -PKGCONFIG += qtappfw-navigation +PKGCONFIG += qtappfw-navigation qtappfw-vehicle-signals HEADERS += \ markermodel.h \ diff --git a/app/main.cpp b/app/main.cpp index 62fe415..1d07977 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -25,6 +25,7 @@ #include <QtQuickControls2/QQuickStyle> #include <QQuickWindow> #include <navigation.h> +#include <vehiclesignals.h> #include "markermodel.h" #include "guidance_module.h" #include "file_operation.h" @@ -48,7 +49,8 @@ int main(int argc, char *argv[]) File_Operation file; context->setContextProperty("fileOperation", &file); - Navigation *navigation = new Navigation(context); + VehicleSignalsConfig vsConfig("navigation"); + Navigation *navigation = new Navigation(new VehicleSignals(vsConfig), context); context->setContextProperty("navigation", navigation); MarkerModel model; diff --git a/app/navigation.qml b/app/navigation.qml index d8f56a1..1216249 100644 --- a/app/navigation.qml +++ b/app/navigation.qml @@ -566,7 +566,7 @@ ApplicationWindow { { // Arrive at your destination btn_guidance.sts_guide = 0 - navigation.broadcastStatus("arrived") + navigation.broadcastStatus("Arrived") } }else{ setNextCoordinate(map.currentpostion.latitude, map.currentpostion.longitude,next_direction,root.car_moving_distance) |