aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuta Doi <yuta-d@witz-inc.co.jp>2018-06-20 22:21:27 +0900
committerYuta Doi <yuta-d@witz-inc.co.jp>2018-06-20 22:21:27 +0900
commit7e9df0b2f5a8d910ee7cb973ffd775fb15022858 (patch)
tree1d2a44907c80f69341c27a3afe29f5bc210ef9e0
parent5ea38c92ac6cb61fe108b7962ab4e2b71df06f05 (diff)
Modify car info name
Change-Id: I81939c5e981b6fb2f15257d40331d328a3bb55af Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
-rw-r--r--src/app.cpp6
-rw-r--r--src/app.hpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/app.cpp b/src/app.cpp
index 4ce9df6..cbb8cfd 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -168,11 +168,11 @@ void App::updateCarElements(json_object* json_out) {
}
else if ("running" == car_ele_name) {
if ("stop" == state) {
- this->crr_car_info.car_stt = "stop";
+ this->crr_car_info.running_stt = false;
this->emitCarStop();
}
else if ("run" == state) {
- this->crr_car_info.car_stt = "run";
+ this->crr_car_info.running_stt = true;
this->emitCarRun();
}
else {
@@ -321,7 +321,7 @@ App::App(wl::display *d)
this->crr_car_info.parking_brake_stt = true;
this->crr_car_info.accel_pedal_stt = false;
this->crr_car_info.accel_pedal_pos = 0;
- this->crr_car_info.car_stt = "stop";
+ this->crr_car_info.running_stt = false;
this->crr_car_info.headlamp_stt = false;
}
diff --git a/src/app.hpp b/src/app.hpp
index 14cf2f9..3fc5738 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -132,7 +132,7 @@ typedef struct CarInfo {
bool parking_brake_stt;
bool accel_pedal_stt;
double accel_pedal_pos;
- const char *car_stt;
+ bool running_stt;
bool headlamp_stt;
bool lightstatus_brake_stt;
} CarInfo;