diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2023-05-12 14:50:32 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2023-05-29 12:31:08 +0000 |
| commit | 908850bfc86e0853225abfc670ffaab85f83853a (patch) | |
| tree | 7cc9e766e69dc0c30a9d3bf16fe1b1afdc6773a4 | |
| parent | 9bf35819c7d71e04163bf2db4d3b8360eaf119fd (diff) | |
Update status signal states for VSS 3.1.1octopus
The states for Vehicle.Cabin.Infotainment.Navigation.State are now
uppercase with the update to VSS 3.1.1, update calls into the
Navigation API from libqtappfw to match. Also comment out use of
the currently unsupported start/stop states in the status event
signal handler. Those were removed with the switch to using VSS,
and if they are needed again down the road they will need to be
implemented somewhat differently, document that in a comment.
Bug-AGL: SPEC-4761
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I02863bb3754ba984dda7c9c28c77cf0f184f92cd
(cherry picked from commit f10d5dcb08d2b0c816f73b1e9b63e3da0109ac34)
| -rw-r--r-- | app/BtnGuidance.qml | 2 | ||||
| -rw-r--r-- | app/navigation.qml | 31 |
2 files changed, 19 insertions, 14 deletions
diff --git a/app/BtnGuidance.qml b/app/BtnGuidance.qml index e262704..2130857 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("STOPPED"); } if(map.center !== map.currentpostion){ diff --git a/app/navigation.qml b/app/navigation.qml index 1216249..5cb3634 100644 --- a/app/navigation.qml +++ b/app/navigation.qml @@ -78,18 +78,23 @@ ApplicationWindow { map.doSetWaypointsSlot(data.points[0].latitude, data.points[0].longitude, true) } - onStatusEvent: { - if (data.state == "stop") { - // Slight hack here, if sts_guide != 0, btn_guidance.discardWaypoints - // will trigger another stop, which can cancel a queued waypoint set, - // so set it to 0 in advance. - btn_guidance.sts_guide = 0 - map.doPauseSimulationSlot() - } - if (data.state == "start") { - btn_guidance.startGuidance() - } - } + // The status event no longer has start/stop, since that did not really + // match with "sensor" signal behavior in VSS. If such is required in + // the future, a new "actuator" signal should be used in the backend + // instead to reimplement this as a different event. + // + //onStatusEvent: { + // if (data.state == "stop") { + // // Slight hack here, if sts_guide != 0, btn_guidance.discardWaypoints + // // will trigger another stop, which can cancel a queued waypoint set, + // // so set it to 0 in advance. + // btn_guidance.sts_guide = 0 + // map.doPauseSimulationSlot() + // } + // if (data.state == "start") { + // btn_guidance.startGuidance() + // } + //} } Map { @@ -566,7 +571,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) |