Adds i2c device configuration to native

arch/portduino/portduino.ini

@@ -1,6 +1,6 @@
 ; The Portduino based sim environment on top of any host OS, all hardware will be simulated
 [portduino_base]
-platform = https://github.com/meshtastic/platform-native.git#04435d06e39916a6c019d511518d8e95c659dfbd
+platform = https://github.com/meshtastic/platform-native.git#a28dd5a9ccd5c48a9bede46037855ff83915d74b
 framework = arduino
 
 build_src_filter = 

bin/config-dist.yaml

@@ -60,6 +60,11 @@ GPIO:
 GPS:
 #  SerialPath: /dev/ttyS0
 
+### Specify I2C device, or leave blank for none
+
+I2C:
+#  I2CDevice: /dev/i2c-1
+
 ### Set up SPI displays here. Note that I2C displays are generally auto-detected.
 
 Display:

src/main.cpp

@@ -363,6 +363,13 @@ void setup()
     Wire.begin();
 #elif defined(I2C_SDA) && !defined(ARCH_RP2040)
     Wire.begin(I2C_SDA, I2C_SCL);
+#elif defined(ARCH_PORTDUINO)
+    if (settingsStrings[i2cdev] != "") {
+        LOG_INFO("Using %s as I2C device.\n", settingsStrings[i2cdev]);
+        Wire.begin(settingsStrings[i2cdev].c_str());
+    } else {
+        LOG_INFO("No I2C device configured, skipping.\n");
+    }
 #elif HAS_WIRE
     Wire.begin();
 #endif
@@ -408,8 +415,9 @@ void setup()
     // We need to scan here to decide if we have a screen for nodeDB.init() and because power has been applied to
     // accessories
     auto i2cScanner = std::unique_ptr<ScanI2CTwoWire>(new ScanI2CTwoWire());
-
+#ifdef HAS_WIRE
     LOG_INFO("Scanning for i2c devices...\n");
+#endif
 
 #if defined(I2C_SDA1) && defined(ARCH_RP2040)
     Wire1.setSDA(I2C_SDA1);
@@ -429,6 +437,11 @@ void setup()
 #elif defined(I2C_SDA) && !defined(ARCH_RP2040)
     Wire.begin(I2C_SDA, I2C_SCL);
     i2cScanner->scanPort(ScanI2C::I2CPort::WIRE);
+#elif defined(ARCH_PORTDUINO)
+    if (settingsStrings[i2cdev] != "") {
+        LOG_INFO("Scanning for i2c devices...\n");
+        i2cScanner->scanPort(ScanI2C::I2CPort::WIRE);
+    }
 #elif HAS_WIRE
     i2cScanner->scanPort(ScanI2C::I2CPort::WIRE);
 #endif

src/platform/portduino/PortduinoGlue.cpp

@@ -150,6 +150,9 @@ void portduinoSetup()
                 settingsMap[has_gps] = 1;
             }
         }
+        if (yamlConfig["I2C"]) {
+            settingsStrings[i2cdev] = yamlConfig["I2C"]["I2CDevice"].as<std::string>("");
+        }
         settingsMap[displayPanel] = no_screen;
         if (yamlConfig["Display"]) {
             if (yamlConfig["Display"]["Panel"].as<std::string>("") == "ST7789")

src/platform/portduino/PortduinoGlue.h

@@ -16,6 +16,7 @@ enum configNames {
     user,
     gpiochip,
     spidev,
+    i2cdev,
     has_gps,
     touchscreenModule,
     touchscreenCS,

variants/portduino/variant.h

@@ -1,3 +1,2 @@
-#define HAS_WIRE 1
 #define HAS_SCREEN 1
 #define CANNED_MESSAGE_MODULE_ENABLE 1