diff options
Diffstat (limited to 'src/app.cpp')
| -rw-r--r-- | src/app.cpp | 213 |
1 files changed, 83 insertions, 130 deletions
diff --git a/src/app.cpp b/src/app.cpp index 4fbf639..c82c98c 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -106,142 +106,95 @@ static void onError(json_object* json_out) { } // namespace rm -void App::updateCarStates(json_object* json_out) { - // Check parking brake state - json_object* json_parking_brake; - if (!json_object_object_get_ex(json_out, "parking_brake", &json_parking_brake)) { - HMI_DEBUG("wm", "Not found key \"parking_brake\""); +void App::updateCarElements(json_object* json_out) { + json_object* json_car_ele; + if (!json_object_object_get_ex(json_out, "car_elements", &json_car_ele)) { + HMI_DEBUG("wm", "Not found key \"car_elements\""); return; } - json_bool is_changed; - is_changed = jh::getBoolFromJson(json_parking_brake, "is_changed"); - if (is_changed) { - std::string parking_brake_state = jh::getStringFromJson(json_parking_brake, "state"); - HMI_DEBUG("wm", "parking_brake_state: %s", parking_brake_state.c_str()); + int len = json_object_array_length(json_car_ele); + HMI_DEBUG("wm", "json_car_ele len:%d", len); - // Update state and emit event - if ("parking_brake_off" == parking_brake_state) { - this->crr_car_info.parking_brake_stt = false; + for (int i=0; i<len; i++) { + json_object* json_tmp = json_object_array_get_idx(json_car_ele, i); + + std::string car_ele_name = jh::getStringFromJson(json_tmp, "name"); + std::string state = jh::getStringFromJson(json_tmp, "state"); + json_bool changed = jh::getBoolFromJson(json_tmp, "changed"); + HMI_DEBUG("wm", "car_element:%s changed:%d", car_ele_name.c_str(), changed); + + if (changed) { + if ("parking_brake" == car_ele_name) { + if ("parking_brake_off" == state) { + this->crr_car_info.parking_brake_stt = false; #if 0 // FOR ALS: using lightstatus brake, so do not emit parking brake event - this->emitParkingBrakeOff(); + this->emitParkingBrakeOff(); #endif - } - else if ("parking_brake_on" == parking_brake_state) { - this->crr_car_info.parking_brake_stt = true; + } + else if ("parking_brake_on" == state) { + this->crr_car_info.parking_brake_stt = true; #if 0 // FOR ALS: using lightstatus brake, so do not emit parking brake event - this->emitParkingBrakeOn(); + this->emitParkingBrakeOn(); #endif - } - else { - HMI_DEBUG("wm", "Unknown parking brake state"); - return; - } - } - - // Check accelerator pedal state - json_object* json_accel_pedal; - if (!json_object_object_get_ex(json_out, "accel_pedal", &json_accel_pedal)) { - HMI_DEBUG("wm", "Not found key \"accel_pedal\""); - return; - } - - is_changed = jh::getBoolFromJson(json_accel_pedal, "is_changed"); - if (is_changed) { - std::string accel_pedal_state = jh::getStringFromJson(json_accel_pedal, "state"); - HMI_DEBUG("wm", "accel_pedal_state: %s", accel_pedal_state.c_str()); - - // Update state - if ("accel_pedal_off" == accel_pedal_state) { - this->crr_car_info.accel_pedal_stt = false; - } - else if ("accel_pedal_on" == accel_pedal_state) { - this->crr_car_info.accel_pedal_stt = true; - } - else { - HMI_DEBUG("wm", "Unknown accel pedal state"); - return; - } - } - - // Check lightstatus brake state - json_object* json_lightstatus_brake; - if (!json_object_object_get_ex(json_out, "lightstatus_brake", &json_lightstatus_brake)) { - HMI_DEBUG("wm", "Not found key \"lightstatus_brake\""); - return; - } - - is_changed = jh::getBoolFromJson(json_lightstatus_brake, "is_changed"); - if (is_changed) { - std::string lightstatus_brake_state = jh::getStringFromJson(json_lightstatus_brake, "state"); - HMI_DEBUG("wm", "lightstatus_brake_state: %s", lightstatus_brake_state.c_str()); - - // Update state and emit event - if ("lightstatus_brake_off" == lightstatus_brake_state) { - this->crr_car_info.lightstatus_brake_stt = false; - this->emitLightstatusBrakeOff(); - } - else if ("lightstatus_brake_on" == lightstatus_brake_state) { - this->crr_car_info.lightstatus_brake_stt = true; - this->emitLightstatusBrakeOn(); - } - else { - HMI_DEBUG("wm", "Unknown lightstatus brake state"); - return; - } - } - - // Check car state - json_object* json_car; - if (!json_object_object_get_ex(json_out, "car", &json_car)) { - HMI_DEBUG("wm", "Not found key \"car\""); - return; - } - - is_changed = jh::getBoolFromJson(json_car, "is_changed"); - if (is_changed) { - std::string car_state = jh::getStringFromJson(json_car, "state"); - HMI_DEBUG("wm", "car_state: %s", car_state.c_str()); - - // Emit car event - if ("car_stop" == car_state) { - this->crr_car_info.car_stt = "stop"; - this->emitCarStop(); - } - else if ("car_run" == car_state) { - this->crr_car_info.car_stt = "run"; - this->emitCarRun(); - } - else { - HMI_DEBUG("wm", "Unknown car state"); - return; - } - } - - // Check lamp state - json_object* json_lamp; - if (!json_object_object_get_ex(json_out, "lamp", &json_lamp)) { - HMI_DEBUG("wm", "Not found key \"lamp\""); - return; - } - - is_changed = jh::getBoolFromJson(json_lamp, "is_changed"); - if (is_changed) { - std::string lamp_state = jh::getStringFromJson(json_lamp, "state"); - HMI_DEBUG("wm", "lamp_state: %s", lamp_state.c_str()); - - // Update state and emit event - if ("lamp_off" == lamp_state) { - this->crr_car_info.headlamp_stt = false; - this->emitHeadlampOff(); - } - else if ("lamp_on" == lamp_state) { - this->crr_car_info.headlamp_stt = true; - this->emitHeadlampOn(); - } - else { - HMI_DEBUG("wm", "Unknown lamp state"); - return; + } + else { + HMI_DEBUG("wm", "Unknown parking brake state: %s", state.c_str()); + } + } + else if ("accel_pedal" == car_ele_name) { + if ("accel_pedal_off" == state) { + this->crr_car_info.accel_pedal_stt = false; + } + else if ("accel_pedal_on" == state) { + this->crr_car_info.accel_pedal_stt = true; + } + else { + HMI_DEBUG("wm", "Unknown accel pedal state: %s", state.c_str()); + } + } + else if ("lightstatus_brake" == car_ele_name) { + if ("lightstatus_brake_off" == state) { + this->crr_car_info.lightstatus_brake_stt = false; + this->emitLightstatusBrakeOff(); + } + else if ("lightstatus_brake_on" == state) { + this->crr_car_info.lightstatus_brake_stt = true; + this->emitLightstatusBrakeOn(); + } + else { + HMI_DEBUG("wm", "Unknown lightstatus brake state: %s", state.c_str()); + } + } + else if ("running" == car_ele_name) { + if ("car_stop" == state) { + this->crr_car_info.car_stt = "stop"; + this->emitCarStop(); + } + else if ("car_run" == state) { + this->crr_car_info.car_stt = "run"; + this->emitCarRun(); + } + else { + HMI_DEBUG("wm", "Unknown car state: %s", state.c_str()); + } + } + else if ("lamp" == car_ele_name) { + if ("lamp_off" == state) { + this->crr_car_info.headlamp_stt = false; + this->emitHeadlampOff(); + } + else if ("lamp_on" == state) { + this->crr_car_info.headlamp_stt = true; + this->emitHeadlampOn(); + } + else { + HMI_DEBUG("wm", "Unknown lamp state: %s", state.c_str()); + } + } + else { + HMI_DEBUG("wm", "Unknown car element: %s", car_ele_name.c_str()); + } } } } @@ -330,8 +283,8 @@ void App::updateLayers(json_object* json_out) { void App::updateWindowResources(json_object* json_out) { HMI_DEBUG("wm", "json_out dump:%s", json_object_get_string(json_out)); - // Update car states - this->updateCarStates(json_out); + // Update car elements + this->updateCarElements(json_out); // Update layers this->updateLayers(json_out); |