x

Author: soburi

libraries/Wire/Wire.cpp

@@ -101,4 +101,15 @@ void arduino::ZephyrI2C::flush() {}
 void arduino::ZephyrI2C::onReceive(voidFuncPtrParamInt cb) {}
 void arduino::ZephyrI2C::onRequest(voidFuncPtr cb) {}
 
-arduino::ZephyrI2C Wire;
+#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), i2cs) && (DT_PROP_LEN(DT_PATH(zephyr_user), i2cs) > 0)
+arduino::ZephyrI2C Wire(DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), i2cs, 0)));
+#elif DT_NODE_EXISTS(DT_NODELABEL(arduino_i2c))
+arduino::ZephyrI2C Wire(DEVICE_DT_GET(DT_NODELABEL(arduino_i2c)));
+#endif
+
+#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), i2cs) && (DT_PROP_LEN(DT_PATH(zephyr_user), i2cs) > 1)
+#define HOGE(n, p, i) \
+		const struct device* i2c_dev ## i = DEVICE_DT_GET(DT_PHANDLE_BY_IDX(n, p, i)); \
+		arduino::ZephyrI2C Wire ## i(i2c_dev ## i);
+DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), i2cs, HOGE)
+#endif

libraries/Wire/Wire.h

@@ -41,6 +41,8 @@ class ZephyrI2C : public HardwareI2C {
   virtual void flush();
   virtual int available();
 
+  ZephyrI2C(const struct device* i2c) : i2c_dev(i2c) { }
+
 private:
   int _address;
   uint8_t txBuffer[256];
@@ -50,10 +52,21 @@ class ZephyrI2C : public HardwareI2C {
     uint8_t buffer[256];
   };
   struct rx_ring_buf rxRingBuffer;
+  const struct device* i2c_dev;
 };
 
 } // namespace arduino
 
+#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), i2cs) && (DT_PROP_LEN(DT_PATH(zephyr_user), i2cs) > 0) \
+   || DT_NODE_EXISTS(DT_NODELABEL(arduino_i2c))
 extern arduino::ZephyrI2C Wire;
+#endif
+
+#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), i2cs) && (DT_PROP_LEN(DT_PATH(zephyr_user), i2cs) > 1)
+#define FUGA(n, p, i) \
+	extern const struct device* i2c_dev ## i; extern arduino::ZephyrI2C Wire ## i;
+DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), i2cs, FUGA)
+#endif
+
 
-typedef arduino::ZephyrI2C TwoWire;
+typedef arduino::ZephyrI2C TwoWire;

variants/arduino_mkrzero/arduino_mkrzero.overlay

@@ -44,6 +44,8 @@
 				<&adc 6>,
 				<&adc 7>;
 		io-channel-pins = <15 16 17 18 19 20 21>;
+
+		i2cs = <&sercom0>;
 	};
 };
 

variants/arduino_mkrzero/arduino_mkrzero_pinmap.h

@@ -8,5 +8,3 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/i2c.h>
-
-const static struct device *i2c_dev = DEVICE_DT_GET(DT_NODELABEL(sercom0));

variants/arduino_nano_33_ble/arduino_nano_33_ble.overlay

@@ -43,6 +43,8 @@
 		io-channel-pins = <14 15 16 17 18 19 20 21>;
 
 		builtin-led-gpios = <&arduino_nano_header 13 0>;
+
+		i2cs = <&arduino_nano_i2c>, <&i2c1>;
 	};
 };
 

variants/arduino_nano_33_ble/arduino_nano_33_ble_pinmap.h

@@ -10,5 +10,3 @@
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/device.h>
-
-const static struct device *i2c_dev = DEVICE_DT_GET(DT_NODELABEL(i2c0));

variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense.overlay

@@ -43,6 +43,8 @@
 		io-channel-pins = <14 15 16 17 18 19 20 21>;
 
 		builtin-led-gpios = <&arduino_nano_header 13 0>;
+
+		i2cs = <&arduino_nano_i2c>;
 	};
 };
 

variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense_pinmap.h

@@ -10,5 +10,3 @@
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/device.h>
-
-const static struct device *i2c_dev = DEVICE_DT_GET(DT_NODELABEL(i2c0));

variants/arduino_nano_33_iot/arduino_nano_33_iot.overlay

@@ -43,6 +43,8 @@
 				<&adc 6>,
 				<&adc 7>;
 		io-channel-pins = <14 15 16 17 18 19 20 21>;
+
+		i2cs = <&arduino_nano_i2c>;
 	};
 };
 

variants/arduino_nano_33_iot/arduino_nano_33_iot_pinmap.h

@@ -10,6 +10,3 @@
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/device.h>
-
-const static struct device *i2c_dev =
-			DEVICE_DT_GET(DT_NODELABEL(arduino_nano_i2c));

variants/nrf52840dk_nrf52840/nrf52840dk_nrf52840_pinmap.h

@@ -11,6 +11,4 @@
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/kernel.h>
 
-const static struct device *i2c_dev = DEVICE_DT_GET(DT_NODELABEL(arduino_i2c));
-
 #endif