put back old work without the no/auto/yes

Author: brentru

src/components/i2c/controller.cpp

@@ -750,7 +750,6 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
         // Use the "default" types from the sensor driver
         drv->SetSensorTypes(true);
         drv->SetPeriod(DEFAULT_SENSOR_PERIOD);
-        // Add driver information to config file so it persists
         WsV2._fileSystemV2->AddI2cDeviceToFileConfig(
             device_descriptor.i2c_device_address, driverName,
             drv->GetSensorTypeStrings(), drv->GetNumSensorTypes());

src/provisioning/sdcard/ws_sdcard.cpp

@@ -531,6 +531,21 @@ void ws_sdcard::ParseI2cAddScanned(
 
 bool ws_sdcard::AddI2cScanResultsToBuffer() {
   for (size_t i = 0; i < WsV2._i2c_controller->GetScanDeviceCount(); i++) {
+
+    // Was this address already provided by the config file?
+    bool skip_device = false;
+    for (size_t j = 0; j < _cfg_i2c_addresses.size(); j++) {
+        if (_cfg_i2c_addresses[j] == WsV2._i2c_controller->GetScanDeviceAddress(i)) {
+            skip_device = true;
+            break;
+        }
+    }
+
+    if (skip_device) {
+      WS_DEBUG_PRINTLN("[SD] Skipping I2C device - already in config file");
+      continue;
+    }
+
     // Build the PB message
     wippersnapper_signal_BrokerToDevice msg_signal =
         wippersnapper_signal_BrokerToDevice_init_default;
@@ -808,35 +823,6 @@ bool ws_sdcard::ParseComponents(JsonArray &components) {
       }
     } else if (strcmp(component_api_type, "i2c") == 0) {
       WS_DEBUG_PRINTLN("[SD] I2C component found in cfg");
-
-      const char *use = component["use"];
-      if (use == nullptr) {
-        WS_DEBUG_PRINT("[SD] Error: Missing use field, skipping..");
-        continue;
-      }
-
-      // Case #1 - If use is "no", do not attempt to initialize this component
-      if (strcmp(use, "no") == 0) {
-        WS_DEBUG_PRINTLN("[SD] Component marked use=no, skipping..");
-        continue;
-      }
-
-      // For "auto", only proceed if device was found in scan
-      if (strcmp(use, "auto") == 0) {
-        // For I2C devices, check scan results
-        if (component["i2cDeviceAddress"] != nullptr) {
-          if (!WsV2._i2c_controller->WasDeviceScanned(
-                  HexStrToInt(component["i2cDeviceAddress"]))) {
-            WS_DEBUG_PRINT(
-                "[SD] auto component not found in scan, skipping init.");
-            // TODO: We need to initialize this device with autoconfig instead?
-            continue;
-          }
-          WS_DEBUG_PRINT("[SD] auto component found in scan, initializing from "
-                         "cfg. file.");
-        }
-      }
-
       // Init for use=yes || use=auto
       wippersnapper_i2c_I2cDeviceAddOrReplace msg_add =
           wippersnapper_i2c_I2cDeviceAddOrReplace_init_default;
@@ -845,6 +831,7 @@ bool ws_sdcard::ParseComponents(JsonArray &components) {
         msg_signal_b2d.which_payload =
             wippersnapper_signal_BrokerToDevice_i2c_device_add_replace_tag;
         msg_signal_b2d.payload.i2c_device_add_replace = msg_add;
+        _cfg_i2c_addresses.push_back(msg_add.i2c_device_description.i2c_device_address);
       }
     } else {
       WS_DEBUG_PRINTLN("[SD] Error: Unknown Component API: " +

src/provisioning/sdcard/ws_sdcard.h

@@ -130,6 +130,7 @@ class ws_sdcard {
   bool _is_soft_rtc; ///< True if a "soft rtc" is being used, False otherwise
   uint32_t _soft_rtc_counter; ///< Holds the counter for a "soft rtc"
   bool _use_test_data;        ///< True if sample data is being used for testing
+  std::vector<uint32_t> _cfg_i2c_addresses;
 };
 extern Wippersnapper_V2 WsV2;
 #endif // WS_SDCARD_H

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -457,7 +457,6 @@ void Wippersnapper_FS::AddI2cDeviceToFileConfig(
   char address_str[6];
   sprintf(address_str, "0x%02X", address);
   new_component["i2cDeviceAddress"] = address_str;
-  new_component["use"] = "auto";
   JsonArray new_component_sensor_types =
       new_component["i2cDeviceSensorTypes"].to<JsonArray>();
   for (size_t i = 0; i < sensor_types_count; i++) {