use one less param

common/params.cc

@@ -113,7 +113,6 @@ std::unordered_map<std::string, uint32_t> 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},

selfdrive/boardd/boardd.cc

@@ -114,7 +114,7 @@ bool safety_setter_thread(std::vector<Panda *> 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<Panda *> 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);
     }
 

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")