diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2022-06-09 20:16:40 +0000 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2022-06-09 20:16:40 +0000 |
| commit | 1593664d2f17ab563c7ad81215696b1ac6a3bd7b (patch) | |
| tree | f6d071dc55837307c915d202255af69b1ff9911e | |
| parent | 1fa03abcffabbf8c8b19084cb05846fca5fe4792 (diff) | |
Revert "Add VIS vehicle signal support"
This reverts commit 1fa03abcffabbf8c8b19084cb05846fca5fe4792.
Reason for revert: Merged by accident, needs to come after several other KUKSA.val enabling changes get merged elsewhere.
Change-Id: Ib0ba44dd8259d91532885bd78e66ceb9ea38d72d
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, 4 insertions, 6 deletions
diff --git a/app/BtnGuidance.qml b/app/BtnGuidance.qml index e262704..bebb53b 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("Stopped"); + navigation.broadcastStatus("stop"); } if(map.center !== map.currentpostion){ diff --git a/app/app.pro b/app/app.pro index 1a0a9c3..077a408 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 qtappfw-vehicle-signals +PKGCONFIG += qtappfw-navigation HEADERS += \ markermodel.h \ diff --git a/app/main.cpp b/app/main.cpp index 1d07977..62fe415 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -25,7 +25,6 @@ #include <QtQuickControls2/QQuickStyle> #include <QQuickWindow> #include <navigation.h> -#include <vehiclesignals.h> #include "markermodel.h" #include "guidance_module.h" #include "file_operation.h" @@ -49,8 +48,7 @@ int main(int argc, char *argv[]) File_Operation file; context->setContextProperty("fileOperation", &file); - VehicleSignalsConfig vsConfig("navigation"); - Navigation *navigation = new Navigation(new VehicleSignals(vsConfig), context); + Navigation *navigation = new Navigation(context); context->setContextProperty("navigation", navigation); MarkerModel model; diff --git a/app/navigation.qml b/app/navigation.qml index 1216249..d8f56a1 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) |