diff --git a/common/params.cc b/common/params.cc index 64781f144b..acde50f775 100644 --- a/common/params.cc +++ b/common/params.cc @@ -113,7 +113,6 @@ std::unordered_map keys = { {"DoUninstall", CLEAR_ON_MANAGER_START}, {"FirmwareQueryDone", CLEAR_ON_MANAGER_START | CLEAR_ON_IGNITION_ON}, {"ObdMultiplexingRequested", CLEAR_ON_MANAGER_START | CLEAR_ON_IGNITION_ON}, - {"ObdMultiplexingEnabled", CLEAR_ON_MANAGER_START | CLEAR_ON_IGNITION_ON}, {"ObdMultiplexingSet", CLEAR_ON_MANAGER_START | CLEAR_ON_IGNITION_ON}, {"ForcePowerDown", CLEAR_ON_MANAGER_START}, {"GitBranch", PERSISTENT}, diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc index 895c2885e2..5ce4dd8047 100644 --- a/selfdrive/boardd/boardd.cc +++ b/selfdrive/boardd/boardd.cc @@ -114,7 +114,7 @@ bool safety_setter_thread(std::vector pandas) { } // set to ELM327 without OBD multiplexing for fingerprinting - p.putBool("ObdMultiplexingEnabled", false); + bool obd_multiplexing_enabled = false; for (int i = 0; i < pandas.size(); i++) { // const uint16_t safety_param = (i > 0) ? 1U : 0U; pandas[i]->set_safety_model(cereal::CarParams::SafetyModel::ELM327, 1U); @@ -128,12 +128,12 @@ bool safety_setter_thread(std::vector pandas) { } bool obd_multiplexing_requested = p.getBool("ObdMultiplexingRequested"); - if (obd_multiplexing_requested != p.getBool("ObdMultiplexingEnabled")) { + if (obd_multiplexing_requested != obd_multiplexing_enabled) { const uint16_t safety_param = obd_multiplexing_requested ? 0U : 1U; for (int i = 0; i < pandas.size(); i++) { pandas[i]->set_safety_model(cereal::CarParams::SafetyModel::ELM327, safety_param); } - p.putBool("ObdMultiplexingEnabled", obd_multiplexing_requested); + obd_multiplexing_enabled = obd_multiplexing_requested; p.putBool("ObdMultiplexingChanged", true); } diff --git a/selfdrive/car/fw_versions.py b/selfdrive/car/fw_versions.py index 2eeff7d28e..c56b7d0af9 100755 --- a/selfdrive/car/fw_versions.py +++ b/selfdrive/car/fw_versions.py @@ -237,7 +237,7 @@ def set_obd_multiplexing(params: Params, obd_multiplexing: bool): if params.get_bool("ObdMultiplexingEnabled") != obd_multiplexing: cloudlog.warning(f"Setting OBD multiplexing to {obd_multiplexing}") params.remove("ObdMultiplexingChanged") - params.put_bool("ObdMultiplexingRequested", obd_multiplexing) + params.put_bool("ObdMultiplexingEnabled", obd_multiplexing) params.get_bool("ObdMultiplexingChanged", block=True) cloudlog.warning(f"OBD multiplexing set successfully")