debugging mux

Author: brentru

src/Wippersnapper_demo.ino.cpp

@@ -0,0 +1,19 @@
+# 1 "/var/folders/ff/dmzflvf52tq9kzvt6g8jglxw0000gn/T/tmprs71yldn"
+#include <Arduino.h>
+# 1 "/Users/brentrubell/Documents/Arduino/libraries/Adafruit_Wippersnapper_Arduino/src/Wippersnapper_demo.ino"
+# 11 "/Users/brentrubell/Documents/Arduino/libraries/Adafruit_Wippersnapper_Arduino/src/Wippersnapper_demo.ino"
+#include "ws_adapters.h"
+
+
+ws_adapter_offline wipper;
+#define WS_DEBUG
+void setup();
+void loop();
+#line 17 "/Users/brentrubell/Documents/Arduino/libraries/Adafruit_Wippersnapper_Arduino/src/Wippersnapper_demo.ino"
+void setup() {
+  Serial.begin(115200);
+  wipper.provision();
+  wipper.connect();
+}
+
+void loop() { wipper.run(); }

src/components/i2c/controller.cpp

@@ -701,6 +701,8 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
     if (_i2c_bus_alt->HasMux() || _i2c_bus_default->HasMux()) {
       WS_DEBUG_PRINT("[i2c] Configuring MUX channel: ");
       WS_DEBUG_PRINTLN(device_descriptor.i2c_mux_channel);
+      WS_DEBUG_PRINT("[i2c] use_alt_bus: ");
+      WS_DEBUG_PRINTLN(use_alt_bus);
       ConfigureMuxChannel(device_descriptor.i2c_mux_channel, use_alt_bus);
       did_set_mux_ch = true;
     } else {
@@ -710,12 +712,13 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
     }
   }
 
-  WS_DEBUG_PRINTLN("Creating a new I2C driver");
   // Assign I2C bus
   TwoWire *bus = nullptr;
   if (use_alt_bus) {
+    WS_DEBUG_PRINTLN("[i2c] Using alt. I2C bus...");
     bus = _i2c_bus_alt->GetBus();
   } else {
+    WS_DEBUG_PRINTLN("[i2c] Using default I2C bus...");
     bus = _i2c_bus_default->GetBus();
   }
 
@@ -757,27 +760,35 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
       }
     }
   } else {
-    WS_DEBUG_PRINTLN("[i2c] Device was defined in message or config file.");
+    WS_DEBUG_PRINTLN("[i2c] Device in message/cfg file.");
+    // Create new driver
+    WS_DEBUG_PRINT("[i2c] Creating driver: ");
+    WS_DEBUG_PRINTLN(device_name);
+    WS_DEBUG_PRINTLN(device_descriptor.i2c_device_address);
+    WS_DEBUG_PRINTLN(device_descriptor.i2c_mux_channel);
+    WS_DEBUG_PRINTLN(device_status);
+
+    drv = CreateI2CDriverByName(
+        device_name, bus, device_descriptor.i2c_device_address,
+        device_descriptor.i2c_mux_channel, device_status);
+    if (drv == nullptr) {
+      WS_DEBUG_PRINTLN("[i2c] ERROR: I2C driver type not found or unsupported!");
+    }
+
+    // Configure MUX and bus
     if (did_set_mux_ch) {
+      WS_DEBUG_PRINT("Configuring driver's MUX address: ");
+      WS_DEBUG_PRINTLN(device_descriptor.i2c_mux_address);
       drv->SetMuxAddress(device_descriptor.i2c_mux_address);
+      WS_DEBUG_PRINTLN("[i2c] Set driver to use MUX");
     }
+
     if (use_alt_bus) {
       drv->EnableAltI2CBus(_i2c_model->GetI2cDeviceAddOrReplaceMsg()
                                ->i2c_device_description.i2c_bus_scl,
                            _i2c_model->GetI2cDeviceAddOrReplaceMsg()
                                ->i2c_device_description.i2c_bus_sda);
-    }
-    drv = CreateI2CDriverByName(
-        device_name, bus, device_descriptor.i2c_device_address,
-        device_descriptor.i2c_mux_channel, device_status);
-    if (!drv->begin()) {
-      if (WsV2._sdCardV2->isModeOffline()) {
-        WsV2.haltErrorV2("[i2c] Driver failed to initialize!\n\tDid you set "
-                         "the correct value for i2cDeviceName?\n\tDid you set "
-                         "the correct value for"
-                         "i2cDeviceAddress?",
-                         WS_LED_STATUS_ERROR_RUNTIME, false);
-      }
+      WS_DEBUG_PRINTLN("[i2c] Set driver to use Alt I2C bus");
     }
     // Configure the driver
     drv->SetSensorTypes(
@@ -788,6 +799,16 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
 
     drv->SetPeriod(
         _i2c_model->GetI2cDeviceAddOrReplaceMsg()->i2c_device_period);
+
+    if (!drv->begin()) {
+      if (WsV2._sdCardV2->isModeOffline()) {
+        WsV2.haltErrorV2("[i2c] Driver failed to initialize!\n\tDid you set "
+                         "the correct value for i2cDeviceName?\n\tDid you set "
+                         "the correct value for"
+                         "i2cDeviceAddress?",
+                         WS_LED_STATUS_ERROR_RUNTIME, false);
+      }
+    }
     WS_DEBUG_PRINTLN("[i2c] Driver successfully initialized!");
   }
   // Add the initialized driver

src/components/i2c/hardware.cpp

@@ -183,9 +183,9 @@ bool I2cHardware::ScanBus(wippersnapper_i2c_I2cBusScanned *scan_results) {
     uint8_t endTransmissionRC = _bus->endTransmission();
 
     if (endTransmissionRC == 0) {
-      WS_DEBUG_PRINTLN("[i2c] Found Device at ");
+      WS_DEBUG_PRINT("[i2c] Found Device at ");
       WS_DEBUG_PRINT("0x");
-      WS_DEBUG_PRINT(address, HEX);
+      WS_DEBUG_PRINTLN(address, HEX);
       scan_results
           ->i2c_bus_found_devices[scan_results->i2c_bus_found_devices_count]
           .i2c_device_address = address;

src/provisioning/sdcard/ws_sdcard.cpp

@@ -126,6 +126,7 @@ bool ws_sdcard::InitDS1307() {
   }
   if (!_rtc_ds1307->isrunning())
     _rtc_ds1307->adjust(DateTime(F(__DATE__), F(__TIME__)));
+  _cfg_i2c_addresses.push_back(0x68); // Disable auto-config for DS1307
   return true;
 }
 
@@ -148,6 +149,7 @@ bool ws_sdcard::InitDS3231() {
   }
   if (_rtc_ds3231->lostPower())
     _rtc_ds3231->adjust(DateTime(F(__DATE__), F(__TIME__)));
+  _cfg_i2c_addresses.push_back(0x68); // Disable auto-config for DS3231
   return true;
 }
 
@@ -172,6 +174,7 @@ bool ws_sdcard::InitPCF8523() {
     _rtc_pcf8523->adjust(DateTime(F(__DATE__), F(__TIME__)));
   }
   _rtc_pcf8523->start();
+  _cfg_i2c_addresses.push_back(0x68); // Disable auto-config for DS3231
   return true;
 }
 
@@ -489,11 +492,16 @@ bool ws_sdcard::ParseI2cDeviceAddReplace(
   const char *addr_device = component["i2cDeviceAddress"] | "0x00";
   msg_i2c_add.i2c_device_description.i2c_device_address =
       HexStrToInt(addr_device);
-  if (!WsV2._i2c_controller->WasDeviceScanned(
-          msg_i2c_add.i2c_device_description.i2c_device_address)) {
-    WS_DEBUG_PRINT("[SD] WARNING - I2C Device (");
-    WS_DEBUG_PRINT(msg_i2c_add.i2c_device_description.i2c_device_address, HEX);
-    WS_DEBUG_PRINTLN(") not found in scan!");
+
+  // MUXes, Seesaw, special devices should have an auto-init flag set to false
+  const char *is_auto = component["autoInit"] | "true";
+  WS_DEBUG_PRINT("[SD] Found autoInit = ");
+  WS_DEBUG_PRINTLN(is_auto);
+  if (strcmp(is_auto, "false") == 0) {
+    WS_DEBUG_PRINTLN(
+        "[SD] Found autoInit = false, do not initialize this address");
+    _cfg_i2c_addresses.push_back(
+        msg_i2c_add.i2c_device_description.i2c_device_address);
   }
 
   const char *addr_mux = component["i2cMuxAddress"] | "0x00";
@@ -535,10 +543,11 @@ bool ws_sdcard::AddI2cScanResultsToBuffer() {
     // 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 (_cfg_i2c_addresses[j] ==
+          WsV2._i2c_controller->GetScanDeviceAddress(i)) {
+        skip_device = true;
+        break;
+      }
     }
 
     if (skip_device) {
@@ -722,17 +731,10 @@ bool ws_sdcard::ParseFileConfig() {
   }
 #endif
 
-  // Dump what doc looks like to serial
-  String jsonStr;
-  serializeJsonPretty(doc, jsonStr);
-  WS_DEBUG_PRINTLN("[SD] Deserialized JSON:");
-  WS_DEBUG_PRINTLN("========================================");
-  WS_DEBUG_PRINTLN(jsonStr);
-  WS_DEBUG_PRINTLN("========================================");
-
-  // query document size
+  // Get JSON document size
+  // TODO: Remove, this is DEBUG ONLY
   size_t doc_size = measureJson(doc);
-  WS_DEBUG_PRINT("[SD] Document size: ");
+  WS_DEBUG_PRINT("[DBG | SD] Document size: ");
   WS_DEBUG_PRINTLN(doc_size);
 
   if (doc.isNull()) {
@@ -831,7 +833,8 @@ 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);
+        _cfg_i2c_addresses.push_back(
+            msg_add.i2c_device_description.i2c_device_address);
       }
     } else {
       WS_DEBUG_PRINTLN("[SD] Error: Unknown Component API: " +

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -294,10 +294,10 @@ void Wippersnapper_FS::InitUsbMsc() {
 // If already enumerated, additional class driverr begin() e.g msc, hid, midi
 // won't take effect until re-enumeration
 // Attach MSC and wait for enumeration
-#ifndef BUILD_OFFLINE_ONLY
+//#ifndef BUILD_OFFLINE_ONLY
   TinyUSBDevice.attach();
   delay(500);
-#endif
+//#endif
 }
 
 /**************************************************************************/
@@ -488,7 +488,7 @@ bool Wippersnapper_FS::WriteFileConfig() {
   // Re-attach USB-MSC with updated filesystem
   // NOTE: This is required to ensure the filesystem is sync'd between host and
   // device
-  TinyUSBDevice.attach();
+  // TinyUSBDevice.attach();
   delay(2500);
   // TODO: This is debug, we can remove it!
   WS_DEBUG_PRINT("Bytes written to config.json: ");