fix for samd

Author: brentru

src/Wippersnapper.h

@@ -58,7 +58,8 @@
 #define USE_STAGING
 #define IO_MQTT_SERVER "io.adafruit.us" ///< Adafruit IO MQTT Server
 
-//#define IO_MQTT_SERVER "io.adafruit.com" ///< Adafruit IO MQTT Server (Production)
+//#define IO_MQTT_SERVER "io.adafruit.com" ///< Adafruit IO MQTT Server
+//(Production)
 
 #ifdef USE_TINYUSB
 #include "provisioning/tinyusb/Wippersnapper_FS.h"
@@ -76,10 +77,10 @@
 #define TOPIC_IO_ERRORS "/errors"     ///< Adafruit IO Error MQTT Topic
 
 // Reserved Wippersnapper topics
-#define TOPIC_WS "/wprsnpr/"       ///< WipperSnapper topic
-#define TOPIC_INFO "/info/" ///< Registration sub-topic
-#define TOPIC_SIGNALS "/signals/"  ///< Signals sub-topic
-#define TOPIC_I2C "/i2c"           ///< I2C sub-topic
+#define TOPIC_WS "/wprsnpr/"      ///< WipperSnapper topic
+#define TOPIC_INFO "/info/"       ///< Registration sub-topic
+#define TOPIC_SIGNALS "/signals/" ///< Signals sub-topic
+#define TOPIC_I2C "/i2c"          ///< I2C sub-topic
 
 #define WS_DEBUG          ///< Define to enable debugging to serial terminal
 #define WS_PRINTER Serial ///< Where debug messages will be printed
@@ -302,7 +303,6 @@ class Wippersnapper {
   wippersnapper_signal_v1_CreateSignalRequest
       _incomingSignalMsg; /*!< Incoming signal message from broker */
 
-
   // i2c signal msg
   wippersnapper_signal_v1_I2CRequest msgSignalI2C =
       wippersnapper_signal_v1_I2CRequest_init_zero; ///< I2C request wrapper
@@ -315,7 +315,6 @@ class Wippersnapper {
                                      device. */
   bool pinCfgCompleted = false;
 
-
 private:
   void _init();
 

src/components/i2c/WipperSnapper_I2C.cpp

@@ -35,19 +35,26 @@ WipperSnapper_Component_I2C::WipperSnapper_Component_I2C(
   WS_DEBUG_PRINT("\tFrequency (Hz): ");
   WS_DEBUG_PRINTLN(msgInitRequest->i2c_frequency);
 
-// initialize TwoWire w/ desired portNum if ESP32-S2
-#if defined(ARDUINO_ARCH_ESP32)
-  _i2c = new TwoWire(msgInitRequest->i2c_port_number);
-#endif
   // validate if SDA & SCL has pullup
   if (digitalRead(msgInitRequest->i2c_pin_sda) == LOW) {
     pinMode(msgInitRequest->i2c_pin_sda, INPUT_PULLUP);
   }
   if (digitalRead(msgInitRequest->i2c_pin_scl) == LOW) {
     pinMode(msgInitRequest->i2c_pin_scl, INPUT_PULLUP);
   }
-  // set up i2c port
+
+// Initialize TwoWire interface
+#if defined(ARDUINO_ARCH_ESP32)
+  // ESP32, ESP32-S2
+  _i2c = new TwoWire(msgInitRequest->i2c_port_number);
   _i2c->begin(msgInitRequest->i2c_pin_sda, msgInitRequest->i2c_pin_scl);
+#else
+  // SAMD
+  _i2c = new TwoWire(&PERIPH_WIRE, msgInitRequest->i2c_pin_sda,
+                     msgInitRequest->i2c_pin_scl);
+  _i2c->begin();
+#endif
+
   _i2c->setClock(msgInitRequest->i2c_frequency);
   // set i2c obj. properties
   _portNum = msgInitRequest->i2c_port_number;
@@ -81,8 +88,8 @@ bool WipperSnapper_Component_I2C::isInitialized() { return _isInit; }
 /************************************************************************/
 wippersnapper_i2c_v1_I2CScanResponse
 WipperSnapper_Component_I2C::scanAddresses() {
-  WS_DEBUG_PRINT("EXEC: I2C Scan on port # ");
-  WS_DEBUG_PRINTLN(_portNum);
+  WS_DEBUG_PRINT("EXEC: I2C Scan");
+
   // Create response
   wippersnapper_i2c_v1_I2CScanResponse scanResp =
       wippersnapper_i2c_v1_I2CScanResponse_init_zero;