diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
index 970640480c..0dcc9afc21 100644
--- a/arch/portduino/portduino.ini
+++ b/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 = 
diff --git a/bin/config-dist.yaml b/bin/config-dist.yaml
index 32a989098c..e7e8ae2e4c 100644
--- a/bin/config-dist.yaml
+++ b/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:
diff --git a/protobufs b/protobufs
index 44e369e181..e894709e4a 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 44e369e1813f8ec9c7aefe1aac7d0adc75e11f8a
+Subproject commit e894709e4a96867ea8fad59a12f582e1029a6f8e
diff --git a/src/Power.cpp b/src/Power.cpp
index 12e92b3f10..dc8a43d46e 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -164,7 +164,8 @@ class AnalogBatteryLevel : public HasBatteryLevel
 #endif
 
 #ifndef BATTERY_SENSE_SAMPLES
-#define BATTERY_SENSE_SAMPLES 30
+#define BATTERY_SENSE_SAMPLES                                                                                                    \
+    30 // Set the number of samples, it has an effect of increasing sensitivity in complex electromagnetic environment.
 #endif
 
 #ifdef BATTERY_PIN
@@ -176,66 +177,71 @@ class AnalogBatteryLevel : public HasBatteryLevel
         if (millis() - last_read_time_ms > min_read_interval) {
             last_read_time_ms = millis();
 
-            // Set the number of samples, it has an effect of increasing sensitivity, especially in complex electromagnetic
-            // environment.
             uint32_t raw = 0;
-#ifdef ARCH_ESP32
-#ifndef BAT_MEASURE_ADC_UNIT // ADC1
-#ifdef ADC_CTRL
-            if (heltec_version == 5) {
-                pinMode(ADC_CTRL, OUTPUT);
-                digitalWrite(ADC_CTRL, HIGH);
-                delay(10);
-            }
-#endif
-            for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
-                raw += adc1_get_raw(adc_channel);
-            }
-#ifdef ADC_CTRL
-            if (heltec_version == 5) {
-                digitalWrite(ADC_CTRL, LOW);
-            }
-#endif
-#else  // ADC2
-            int32_t adc_buf = 0;
-            for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
-                // ADC2 wifi bug workaround, see
-                // https://github.com/espressif/arduino-esp32/issues/102
-                WRITE_PERI_REG(SENS_SAR_READ_CTRL2_REG, RTC_reg_b);
-                SET_PERI_REG_MASK(SENS_SAR_READ_CTRL2_REG, SENS_SAR2_DATA_INV);
-                adc2_get_raw(adc_channel, ADC_WIDTH_BIT_12, &adc_buf);
-                raw += adc_buf;
-            }
-#endif // BAT_MEASURE_ADC_UNIT
-#else  // !ARCH_ESP32
+            float scaled = 0;
+
+#ifdef ARCH_ESP32 // ADC block for espressif platforms
+            raw = espAdcRead();
+            scaled = esp_adc_cal_raw_to_voltage(raw, adc_characs);
+            scaled *= operativeAdcMultiplier;
+#else // block for all other platforms
             for (uint32_t i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
                 raw += analogRead(BATTERY_PIN);
             }
-#endif
             raw = raw / BATTERY_SENSE_SAMPLES;
-            float scaled;
-#ifdef ARCH_ESP32
-            scaled = esp_adc_cal_raw_to_voltage(raw, adc_characs);
-            scaled *= operativeAdcMultiplier;
-#else
-#ifndef VBAT_RAW_TO_SCALED
-            scaled = 1000.0 * operativeAdcMultiplier * (AREF_VOLTAGE / 1024.0) * raw;
-#else
-            scaled = VBAT_RAW_TO_SCALED(raw); // defined in variant.h
-#endif // VBAT RAW TO SCALED
-#endif // ARCH_ESP32
-       // LOG_DEBUG("battery gpio %d raw val=%u scaled=%u\n", BATTERY_PIN, raw, (uint32_t)(scaled));
-
+            scaled = operativeAdcMultiplier * ((1000 * AREF_VOLTAGE) / pow(2, BATTERY_SENSE_RESOLUTION_BITS)) * raw;
+#endif
+            // LOG_DEBUG("battery gpio %d raw val=%u scaled=%u\n", BATTERY_PIN, raw, (uint32_t)(scaled));
             last_read_value = scaled;
             return scaled;
         } else {
             return last_read_value;
         }
-#else
-        return 0;
 #endif // BATTERY_PIN
+        return 0;
     }
 
+#if defined(ARCH_ESP32) && !defined(HAS_PMU) && defined(BATTERY_PIN)
+    /**
+     * ESP32 specific function for getting calibrated ADC reads
+     */
+    uint32_t espAdcRead()
+    {
+
+        uint32_t raw = 0;
+
+#ifndef BAT_MEASURE_ADC_UNIT // ADC1
+#ifdef ADC_CTRL
+        if (heltec_version == 5) {
+            pinMode(ADC_CTRL, OUTPUT);
+            digitalWrite(ADC_CTRL, HIGH);
+            delay(10);
+        }
+#endif
+        for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
+            raw += adc1_get_raw(adc_channel);
+        }
+#ifdef ADC_CTRL
+        if (heltec_version == 5) {
+            digitalWrite(ADC_CTRL, LOW);
+        }
+#endif
+#else  // ADC2
+        int32_t adc_buf = 0;
+        for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
+            // ADC2 wifi bug workaround, see
+            // https://github.com/espressif/arduino-esp32/issues/102
+            WRITE_PERI_REG(SENS_SAR_READ_CTRL2_REG, RTC_reg_b);
+            SET_PERI_REG_MASK(SENS_SAR_READ_CTRL2_REG, SENS_SAR2_DATA_INV);
+            adc2_get_raw(adc_channel, ADC_WIDTH_BIT_12, &adc_buf);
+            raw += adc_buf;
+        }
+#endif // BAT_MEASURE_ADC_UNIT
+        raw = raw / BATTERY_SENSE_SAMPLES;
+        return raw;
+    }
+#endif
+
     /**
      * return true if there is a battery installed in this unit
      */
@@ -894,4 +900,4 @@ bool Power::axpChipInit()
 #else
     return false;
 #endif
-}
+}
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 141518aa3c..84419c70c0 100644
--- a/src/main.cpp
+++ b/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
diff --git a/src/mesh/Channels.cpp b/src/mesh/Channels.cpp
index f3c692e340..80bcc10c6e 100644
--- a/src/mesh/Channels.cpp
+++ b/src/mesh/Channels.cpp
@@ -15,6 +15,7 @@ Channels channels;
 const char *Channels::adminChannel = "admin";
 const char *Channels::gpioChannel = "gpio";
 const char *Channels::serialChannel = "serial";
+const char *Channels::mqttChannel = "mqtt";
 
 uint8_t xorHash(const uint8_t *p, size_t len)
 {
@@ -313,4 +314,4 @@ bool Channels::decryptForHash(ChannelIndex chIndex, ChannelHash channelHash)
 int16_t Channels::setActiveByIndex(ChannelIndex channelIndex)
 {
     return setCrypto(channelIndex);
-}
+}
\ No newline at end of file
diff --git a/src/mesh/Channels.h b/src/mesh/Channels.h
index b4bdcbd5ca..87a72e07b1 100644
--- a/src/mesh/Channels.h
+++ b/src/mesh/Channels.h
@@ -32,7 +32,7 @@ class Channels
     Channels() {}
 
     /// Well known channel names
-    static const char *adminChannel, *gpioChannel, *serialChannel;
+    static const char *adminChannel, *gpioChannel, *serialChannel, *mqttChannel;
 
     const meshtastic_ChannelSettings &getPrimary() { return getByIndex(getPrimaryIndex()).settings; }
 
@@ -139,4 +139,4 @@ class Channels
 };
 
 /// Singleton channel table
-extern Channels channels;
+extern Channels channels;
\ No newline at end of file
diff --git a/src/mesh/generated/meshtastic/admin.pb.h b/src/mesh/generated/meshtastic/admin.pb.h
index 48df9ba56c..28bda429d5 100644
--- a/src/mesh/generated/meshtastic/admin.pb.h
+++ b/src/mesh/generated/meshtastic/admin.pb.h
@@ -134,6 +134,8 @@ typedef struct _meshtastic_AdminMessage {
         /* Enter (UF2) DFU mode
      Only implemented on NRF52 currently */
         bool enter_dfu_mode_request;
+        /* Delete the file by the specified path from the device */
+        char delete_file_request[201];
         /* Set the owner for this node */
         meshtastic_User set_owner;
         /* Set channels (using the new API).
@@ -228,6 +230,7 @@ extern "C" {
 #define meshtastic_AdminMessage_get_node_remote_hardware_pins_request_tag 19
 #define meshtastic_AdminMessage_get_node_remote_hardware_pins_response_tag 20
 #define meshtastic_AdminMessage_enter_dfu_mode_request_tag 21
+#define meshtastic_AdminMessage_delete_file_request_tag 22
 #define meshtastic_AdminMessage_set_owner_tag    32
 #define meshtastic_AdminMessage_set_channel_tag  33
 #define meshtastic_AdminMessage_set_config_tag   34
@@ -266,6 +269,7 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_ham_mode,set_ham_mode),
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,get_node_remote_hardware_pins_request,get_node_remote_hardware_pins_request),  19) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,get_node_remote_hardware_pins_response,get_node_remote_hardware_pins_response),  20) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,enter_dfu_mode_request,enter_dfu_mode_request),  21) \
+X(a, STATIC,   ONEOF,    STRING,   (payload_variant,delete_file_request,delete_file_request),  22) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_owner,set_owner),  32) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_channel,set_channel),  33) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_config,set_config),  34) \
diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp
index e197017988..94df601d86 100644
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -3,6 +3,7 @@
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
+#include <FSCommon.h>
 #ifdef ARCH_ESP32
 #include "BleOta.h"
 #endif
@@ -194,6 +195,15 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
 #endif
         break;
     }
+    case meshtastic_AdminMessage_delete_file_request_tag: {
+        LOG_DEBUG("Client is requesting to delete file: %s\n", r->delete_file_request);
+        if (FSCom.remove(r->delete_file_request)) {
+            LOG_DEBUG("Successfully deleted file\n");
+        } else {
+            LOG_DEBUG("Failed to delete file\n");
+        }
+        break;
+    }
 #ifdef ARCH_PORTDUINO
     case meshtastic_AdminMessage_exit_simulator_tag:
         LOG_INFO("Exiting simulator\n");
diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp
index 87dacde7a4..70b2d753cf 100644
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -17,7 +17,6 @@
 #include "mesh/wifi/WiFiAPClient.h"
 #include <WiFi.h>
 #endif
-#include "mqtt/JSON.h"
 #include <assert.h>
 
 const int reconnectMax = 5;
@@ -49,8 +48,6 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
         payloadStr[length] = 0; // null terminated string
         JSONValue *json_value = JSON::Parse(payloadStr);
         if (json_value != NULL) {
-            LOG_INFO("JSON Received on MQTT, parsing..\n");
-
             // check if it is a valid envelope
             JSONObject json;
             json = json_value->AsObject();
@@ -61,22 +58,21 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
                 ptr = strtok(NULL, "/");
             }
             meshtastic_Channel sendChannel = channels.getByName(ptr);
-            LOG_DEBUG("Found Channel name: %s (Index %d)\n", channels.getGlobalId(sendChannel.index), sendChannel.index);
-
-            if ((json.find("sender") != json.end()) && (json.find("payload") != json.end()) &&
-                (json.find("type") != json.end()) && json["type"]->IsString() &&
-                (json["type"]->AsString().compare("sendtext") == 0)) {
-                // this is a valid envelope
-                if (json["payload"]->IsString() && json["type"]->IsString() &&
-                    (json["sender"]->AsString().compare(owner.id) != 0)) {
-                    std::string jsonPayloadStr = json["payload"]->AsString();
-                    LOG_INFO("JSON payload %s, length %u\n", jsonPayloadStr.c_str(), jsonPayloadStr.length());
-
-                    // construct protobuf data packet using TEXT_MESSAGE, send it to the mesh
-                    meshtastic_MeshPacket *p = router->allocForSending();
-                    p->decoded.portnum = meshtastic_PortNum_TEXT_MESSAGE_APP;
-                    p->channel = sendChannel.index;
-                    if (sendChannel.settings.downlink_enabled) {
+            // We allow downlink JSON packets only on a channel named "mqtt"
+            if (strncasecmp(channels.getGlobalId(sendChannel.index), Channels::mqttChannel, strlen(Channels::mqttChannel)) == 0 &&
+                sendChannel.settings.downlink_enabled) {
+                if (isValidJsonEnvelope(json)) {
+                    // this is a valid envelope
+                    if (json["type"]->AsString().compare("sendtext") == 0 && json["payload"]->IsString()) {
+                        std::string jsonPayloadStr = json["payload"]->AsString();
+                        LOG_INFO("JSON payload %s, length %u\n", jsonPayloadStr.c_str(), jsonPayloadStr.length());
+
+                        // construct protobuf data packet using TEXT_MESSAGE, send it to the mesh
+                        meshtastic_MeshPacket *p = router->allocForSending();
+                        p->decoded.portnum = meshtastic_PortNum_TEXT_MESSAGE_APP;
+                        p->channel = sendChannel.index;
+                        if (json.find("to") != json.end() && json["to"]->IsNumber())
+                            p->to = json["to"]->AsNumber();
                         if (jsonPayloadStr.length() <= sizeof(p->decoded.payload.bytes)) {
                             memcpy(p->decoded.payload.bytes, jsonPayloadStr.c_str(), jsonPayloadStr.length());
                             p->decoded.payload.size = jsonPayloadStr.length();
@@ -85,49 +81,42 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
                         } else {
                             LOG_WARN("Received MQTT json payload too long, dropping\n");
                         }
-                    } else {
-                        LOG_WARN("Received MQTT json payload on channel %s, but downlink is disabled, dropping\n",
-                                 sendChannel.settings.name);
-                    }
-                } else {
-                    LOG_DEBUG("JSON Ignoring downlink message we originally sent.\n");
-                }
-            } else if ((json.find("sender") != json.end()) && (json.find("payload") != json.end()) &&
-                       (json.find("type") != json.end()) && json["type"]->IsString() &&
-                       (json["type"]->AsString().compare("sendposition") == 0)) {
-                // invent the "sendposition" type for a valid envelope
-                if (json["payload"]->IsObject() && json["type"]->IsString() &&
-                    (json["sender"]->AsString().compare(owner.id) != 0)) {
-                    JSONObject posit;
-                    posit = json["payload"]->AsObject(); // get nested JSON Position
-                    meshtastic_Position pos = meshtastic_Position_init_default;
-                    pos.latitude_i = posit["latitude_i"]->AsNumber();
-                    pos.longitude_i = posit["longitude_i"]->AsNumber();
-                    pos.altitude = posit["altitude"]->AsNumber();
-                    pos.time = posit["time"]->AsNumber();
-
-                    // construct protobuf data packet using POSITION, send it to the mesh
-                    meshtastic_MeshPacket *p = router->allocForSending();
-                    p->decoded.portnum = meshtastic_PortNum_POSITION_APP;
-                    p->channel = sendChannel.index;
-                    if (sendChannel.settings.downlink_enabled) {
+                    } else if (json["type"]->AsString().compare("sendposition") == 0 && json["payload"]->IsObject()) {
+                        // invent the "sendposition" type for a valid envelope
+                        JSONObject posit;
+                        posit = json["payload"]->AsObject(); // get nested JSON Position
+                        meshtastic_Position pos = meshtastic_Position_init_default;
+                        if (posit.find("latitude_i") != posit.end() && posit["latitude_i"]->IsNumber())
+                            pos.latitude_i = posit["latitude_i"]->AsNumber();
+                        if (posit.find("longitude_i") != posit.end() && posit["longitude_i"]->IsNumber())
+                            pos.longitude_i = posit["longitude_i"]->AsNumber();
+                        if (posit.find("altitude") != posit.end() && posit["altitude"]->IsNumber())
+                            pos.altitude = posit["altitude"]->AsNumber();
+                        if (posit.find("time") != posit.end() && posit["time"]->IsNumber())
+                            pos.time = posit["time"]->AsNumber();
+
+                        // construct protobuf data packet using POSITION, send it to the mesh
+                        meshtastic_MeshPacket *p = router->allocForSending();
+                        p->decoded.portnum = meshtastic_PortNum_POSITION_APP;
+                        p->channel = sendChannel.index;
+                        if (json.find("to") != json.end() && json["to"]->IsNumber())
+                            p->to = json["to"]->AsNumber();
                         p->decoded.payload.size =
                             pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes),
                                                &meshtastic_Position_msg, &pos); // make the Data protobuf from position
                         service.sendToMesh(p, RX_SRC_LOCAL);
                     } else {
-                        LOG_WARN("Received MQTT json payload on channel %s, but downlink is disabled, dropping\n",
-                                 sendChannel.settings.name);
+                        LOG_DEBUG("JSON Ignoring downlink message with unsupported type.\n");
                     }
                 } else {
-                    LOG_DEBUG("JSON Ignoring downlink message we originally sent.\n");
+                    LOG_ERROR("JSON Received payload on MQTT but not a valid envelope.\n");
                 }
             } else {
-                LOG_ERROR("JSON Received payload on MQTT but not a valid envelope\n");
+                LOG_WARN("JSON downlink received on channel not called 'mqtt' or without downlink enabled.\n");
             }
         } else {
             // no json, this is an invalid payload
-            LOG_ERROR("Invalid MQTT service envelope, topic %s, len %u!\n", topic, length);
+            LOG_ERROR("JSON Received payload on MQTT but not a valid JSON\n");
         }
         delete json_value;
     } else {
@@ -818,4 +807,14 @@ std::string MQTT::meshPacketToJson(meshtastic_MeshPacket *mp)
 
     delete value;
     return jsonStr;
+}
+
+bool MQTT::isValidJsonEnvelope(JSONObject &json)
+{
+    // if "sender" is provided, avoid processing packets we uplinked
+    return (json.find("sender") != json.end() ? (json["sender"]->AsString().compare(owner.id) != 0) : true) &&
+           (json.find("from") != json.end()) && json["from"]->IsNumber() &&
+           (json["from"]->AsNumber() == nodeDB.getNodeNum()) &&             // only accept message if the "from" is us
+           (json.find("type") != json.end()) && json["type"]->IsString() && // should specify a type
+           (json.find("payload") != json.end());                            // should have a payload
 }
\ No newline at end of file
diff --git a/src/mqtt/MQTT.h b/src/mqtt/MQTT.h
index fc9f9d4545..dfcb75b7db 100644
--- a/src/mqtt/MQTT.h
+++ b/src/mqtt/MQTT.h
@@ -5,6 +5,7 @@
 #include "concurrency/OSThread.h"
 #include "mesh/Channels.h"
 #include "mesh/generated/meshtastic/mqtt.pb.h"
+#include "mqtt/JSON.h"
 #if HAS_WIFI
 #include <WiFiClient.h>
 #define HAS_NETWORKING 1
@@ -100,6 +101,9 @@ class MQTT : private concurrency::OSThread
     void publishStatus();
     void publishQueuedMessages();
 
+    // returns true if this is a valid JSON envelope which we accept on downlink
+    bool isValidJsonEnvelope(JSONObject &json);
+
     /// Return 0 if sleep is okay, veto sleep if we are connected to pubsub server
     // int preflightSleepCb(void *unused = NULL) { return pubSub.connected() ? 1 : 0; }
 };
diff --git a/src/platform/portduino/PortduinoGlue.cpp b/src/platform/portduino/PortduinoGlue.cpp
index 16f1366dca..919d298e6e 100644
--- a/src/platform/portduino/PortduinoGlue.cpp
+++ b/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")
diff --git a/src/platform/portduino/PortduinoGlue.h b/src/platform/portduino/PortduinoGlue.h
index a2098919c4..4c48f0c29e 100644
--- a/src/platform/portduino/PortduinoGlue.h
+++ b/src/platform/portduino/PortduinoGlue.h
@@ -16,6 +16,7 @@ enum configNames {
     user,
     gpiochip,
     spidev,
+    i2cdev,
     has_gps,
     touchscreenModule,
     touchscreenCS,
diff --git a/variants/lora_relay_v1/variant.h b/variants/lora_relay_v1/variant.h
index b310223d73..9cfb693374 100644
--- a/variants/lora_relay_v1/variant.h
+++ b/variants/lora_relay_v1/variant.h
@@ -80,6 +80,7 @@ static const uint8_t A5 = PIN_A5;
 // Other pins
 #define PIN_AREF PIN_A5
 #define PIN_VBAT PIN_A4
+#define BATTERY_PIN PIN_VBAT
 #define PIN_NFC1 (33)
 #define PIN_NFC2 (2)
 #define PIN_PIEZO (37)
diff --git a/variants/lora_relay_v2/variant.h b/variants/lora_relay_v2/variant.h
index 172da17f7a..3afe8620ee 100644
--- a/variants/lora_relay_v2/variant.h
+++ b/variants/lora_relay_v2/variant.h
@@ -100,6 +100,7 @@ static const uint8_t A5 = PIN_A5;
 // Other pins
 #define PIN_AREF PIN_A5
 #define PIN_VBAT PIN_A4
+#define BATTERY_PIN PIN_VBAT
 #define PIN_NFC1 (33)
 #define PIN_NFC2 (2)
 #define PIN_PIEZO (37)
diff --git a/variants/nano-g2-ultra/variant.h b/variants/nano-g2-ultra/variant.h
index d69235fd4a..c328d22711 100644
--- a/variants/nano-g2-ultra/variant.h
+++ b/variants/nano-g2-ultra/variant.h
@@ -170,7 +170,7 @@ External serial flash W25Q16JV_IQ
 // Voltage divider value => 100K + 100K voltage divider on VBAT = (100K / (100K + 100K))
 #define VBAT_DIVIDER (0.5F)
 // Compensation factor for the VBAT divider
-#define VBAT_DIVIDER_COMP (2.0)
+#define VBAT_DIVIDER_COMP (2.0F)
 // Fixed calculation of milliVolt from compensation value
 #define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
 #undef AREF_VOLTAGE
diff --git a/variants/portduino/variant.h b/variants/portduino/variant.h
index 24885d7eb6..959fe6275b 100644
--- a/variants/portduino/variant.h
+++ b/variants/portduino/variant.h
@@ -1,3 +1,2 @@
-#define HAS_WIRE 1
 #define HAS_SCREEN 1
 #define CANNED_MESSAGE_MODULE_ENABLE 1
\ No newline at end of file
diff --git a/variants/rak11200/variant.h b/variants/rak11200/variant.h
index 007ed8f152..3399594e53 100644
--- a/variants/rak11200/variant.h
+++ b/variants/rak11200/variant.h
@@ -56,6 +56,8 @@ static const uint8_t SCK = 33;
 #define LED_PIN LED_BLUE
 
 #define PIN_VBAT WB_A0
+#define BATTERY_PIN PIN_VBAT
+#define ADC_CHANNEL ADC1_GPIO36_CHANNEL
 
 // https://docs.rakwireless.com/Product-Categories/WisBlock/RAK13300/
 
diff --git a/variants/rak11310/variant.h b/variants/rak11310/variant.h
index 6334157f53..ba3d4fed72 100644
--- a/variants/rak11310/variant.h
+++ b/variants/rak11310/variant.h
@@ -12,6 +12,7 @@
 // #define EXT_NOTIFY_OUT 4
 
 #define BATTERY_PIN 26
+#define BATTERY_SENSE_RESOLUTION_BITS ADC_RESOLUTION
 // ratio of voltage divider = 3.0 (R17=200k, R18=100k)
 #define ADC_MULTIPLIER 3.1 // 3.0 + a bit for being optimistic
 
diff --git a/variants/rak4631/variant.h b/variants/rak4631/variant.h
index 956bcd7721..cc18a901f6 100644
--- a/variants/rak4631/variant.h
+++ b/variants/rak4631/variant.h
@@ -254,7 +254,7 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 // Voltage divider value => 1.5M + 1M voltage divider on VBAT = (1.5M / (1M + 1.5M))
 #define VBAT_DIVIDER (0.4F)
 // Compensation factor for the VBAT divider
-#define VBAT_DIVIDER_COMP (1.73)
+#define VBAT_DIVIDER_COMP (1.73F)
 // Fixed calculation of milliVolt from compensation value
 #define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
 #undef AREF_VOLTAGE
diff --git a/variants/rak4631_epaper/variant.h b/variants/rak4631_epaper/variant.h
index bc2eddfee7..d8a5e55977 100644
--- a/variants/rak4631_epaper/variant.h
+++ b/variants/rak4631_epaper/variant.h
@@ -223,7 +223,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
 // Voltage divider value => 1.5M + 1M voltage divider on VBAT = (1.5M / (1M + 1.5M))
 #define VBAT_DIVIDER (0.4F)
 // Compensation factor for the VBAT divider
-#define VBAT_DIVIDER_COMP (1.73)
+#define VBAT_DIVIDER_COMP (1.73F)
 // Fixed calculation of milliVolt from compensation value
 #define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
 #undef AREF_VOLTAGE
diff --git a/variants/rpipico/variant.h b/variants/rpipico/variant.h
index aeda3d8331..ad6d0b2116 100644
--- a/variants/rpipico/variant.h
+++ b/variants/rpipico/variant.h
@@ -22,6 +22,7 @@
 #define BATTERY_PIN 26
 // ratio of voltage divider = 3.0 (R17=200k, R18=100k)
 #define ADC_MULTIPLIER 3.1 // 3.0 + a bit for being optimistic
+#define BATTERY_SENSE_RESOLUTION_BITS ADC_RESOLUTION
 
 #define USE_SX1262
 
diff --git a/variants/rpipicow/variant.h b/variants/rpipicow/variant.h
index c48b901ac4..27117680f8 100644
--- a/variants/rpipicow/variant.h
+++ b/variants/rpipicow/variant.h
@@ -24,6 +24,7 @@
 #define BATTERY_PIN 26
 // ratio of voltage divider = 3.0 (R17=200k, R18=100k)
 #define ADC_MULTIPLIER 3.1 // 3.0 + a bit for being optimistic
+#define BATTERY_SENSE_RESOLUTION_BITS ADC_RESOLUTION
 
 #define USE_SX1262
 
diff --git a/variants/senselora_rp2040/variant.h b/variants/senselora_rp2040/variant.h
index 9eda655210..2f68cf0344 100644
--- a/variants/senselora_rp2040/variant.h
+++ b/variants/senselora_rp2040/variant.h
@@ -8,6 +8,7 @@
 #define LED_PIN PIN_LED
 
 #undef BATTERY_PIN
+#define BATTERY_SENSE_RESOLUTION_BITS ADC_RESOLUTION
 
 #undef LORA_SCK
 #undef LORA_MISO
diff --git a/variants/t-echo/variant.h b/variants/t-echo/variant.h
index 8679dbde9d..345091c2fa 100644
--- a/variants/t-echo/variant.h
+++ b/variants/t-echo/variant.h
@@ -213,7 +213,7 @@ External serial flash WP25R1635FZUIL0
 // Voltage divider value => 100K + 100K voltage divider on VBAT = (100K / (100K + 100K))
 #define VBAT_DIVIDER (0.5F)
 // Compensation factor for the VBAT divider
-#define VBAT_DIVIDER_COMP (2.0)
+#define VBAT_DIVIDER_COMP (2.0F)
 // Fixed calculation of milliVolt from compensation value
 #define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
 #undef AREF_VOLTAGE