merge master in to veml7700

2025-12-31 23:21:06 +00:00 · 2024-05-14 17:40:34 -04:00
parent 022e1f472d cbf20e4cee
commit a3e47b8d9b
114 changed files with 1297 additions and 607 deletions
--- a/src/AccelerometerThread.h
+++ b/src/AccelerometerThread.h
@@ -1,6 +1,9 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "PowerFSM.h"
 #include "concurrency/OSThread.h"
-#include "configuration.h"
 #include "main.h"
 #include "power.h"

@@ -172,4 +175,6 @@ class AccelerometerThread : public concurrency::OSThread
    Adafruit_LSM6DS3TRC lsm;
 };

-} // namespace concurrency
+} // namespace concurrency
+
+#endif
--- a/src/AmbientLightingThread.h
+++ b/src/AmbientLightingThread.h
@@ -5,6 +5,16 @@
 NCP5623 rgb;
 #endif

+#ifdef HAS_NEOPIXEL
+#include <graphics/NeoPixel.h>
+Adafruit_NeoPixel pixels(NEOPIXEL_COUNT, NEOPIXEL_DATA, NEOPIXEL_TYPE);
+#endif
+
+#ifdef UNPHONE
+#include "unPhone.h"
+extern unPhone unphone;
+#endif
+
 namespace concurrency
 {
 class AmbientLightingThread : public concurrency::OSThread
@@ -27,15 +37,31 @@ class AmbientLightingThread : public concurrency::OSThread
            disable();
            return;
        }
+#endif
+#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE)
        if (!moduleConfig.ambient_lighting.led_state) {
            LOG_DEBUG("AmbientLightingThread disabling due to moduleConfig.ambient_lighting.led_state OFF\n");
            disable();
            return;
        }
        LOG_DEBUG("AmbientLightingThread initializing\n");
+#ifdef HAS_NCP5623
        if (_type == ScanI2C::NCP5623) {
            rgb.begin();
+#endif
+#ifdef RGBLED_RED
+            pinMode(RGBLED_RED, OUTPUT);
+            pinMode(RGBLED_GREEN, OUTPUT);
+            pinMode(RGBLED_BLUE, OUTPUT);
+#endif
+#ifdef HAS_NEOPIXEL
+            pixels.begin(); // Initialise the pixel(s)
+            pixels.clear(); // Set all pixel colors to 'off'
+            pixels.setBrightness(moduleConfig.ambient_lighting.current);
+#endif
            setLighting();
+#endif
+#ifdef HAS_NCP5623
        }
 #endif
    }
@@ -43,16 +69,17 @@ class AmbientLightingThread : public concurrency::OSThread
  protected:
    int32_t runOnce() override
    {
+#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE)
 #ifdef HAS_NCP5623
        if (_type == ScanI2C::NCP5623 && moduleConfig.ambient_lighting.led_state) {
+#endif
            setLighting();
            return 30000; // 30 seconds to reset from any animations that may have been running from Ext. Notification
-        } else {
-            return disable();
+#ifdef HAS_NCP5623
        }
-#else
-        return disable();
 #endif
+#endif
+        return disable();
    }

  private:
@@ -65,9 +92,36 @@ class AmbientLightingThread : public concurrency::OSThread
        rgb.setRed(moduleConfig.ambient_lighting.red);
        rgb.setGreen(moduleConfig.ambient_lighting.green);
        rgb.setBlue(moduleConfig.ambient_lighting.blue);
-        LOG_DEBUG("Initializing Ambient lighting w/ current=%d, red=%d, green=%d, blue=%d\n",
+        LOG_DEBUG("Initializing NCP5623 Ambient lighting w/ current=%d, red=%d, green=%d, blue=%d\n",
                  moduleConfig.ambient_lighting.current, moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green,
                  moduleConfig.ambient_lighting.blue);
+#endif
+#ifdef HAS_NEOPIXEL
+        pixels.fill(pixels.Color(moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green,
+                                 moduleConfig.ambient_lighting.blue),
+                    0, NEOPIXEL_COUNT);
+        pixels.show();
+        LOG_DEBUG("Initializing NeoPixel Ambient lighting w/ brightness(current)=%d, red=%d, green=%d, blue=%d\n",
+                  moduleConfig.ambient_lighting.current, moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green,
+                  moduleConfig.ambient_lighting.blue);
+#endif
+#ifdef RGBLED_CA
+        analogWrite(RGBLED_RED, 255 - moduleConfig.ambient_lighting.red);
+        analogWrite(RGBLED_GREEN, 255 - moduleConfig.ambient_lighting.green);
+        analogWrite(RGBLED_BLUE, 255 - moduleConfig.ambient_lighting.blue);
+        LOG_DEBUG("Initializing Ambient lighting RGB Common Anode w/ red=%d, green=%d, blue=%d\n",
+                  moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
+#elif defined(RGBLED_RED)
+        analogWrite(RGBLED_RED, moduleConfig.ambient_lighting.red);
+        analogWrite(RGBLED_GREEN, moduleConfig.ambient_lighting.green);
+        analogWrite(RGBLED_BLUE, moduleConfig.ambient_lighting.blue);
+        LOG_DEBUG("Initializing Ambient lighting RGB Common Cathode w/ red=%d, green=%d, blue=%d\n",
+                  moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
+#endif
+#ifdef UNPHONE
+        unphone.rgb(moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
+        LOG_DEBUG("Initializing unPhone Ambient lighting w/ red=%d, green=%d, blue=%d\n", moduleConfig.ambient_lighting.red,
+                  moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #endif
    }
 };
--- a/src/ButtonThread.cpp
+++ b/src/ButtonThread.cpp
@@ -136,9 +136,12 @@ int32_t ButtonThread::runOnce()
        case BUTTON_EVENT_DOUBLE_PRESSED: {
            LOG_BUTTON("Double press!\n");
            service.refreshLocalMeshNode();
-            service.sendNetworkPing(NODENUM_BROADCAST, true);
+            auto sentPosition = service.trySendPosition(NODENUM_BROADCAST, true);
            if (screen) {
-                screen->print("Sent ad-hoc ping\n");
+                if (sentPosition)
+                    screen->print("Sent ad-hoc position\n");
+                else
+                    screen->print("Sent ad-hoc nodeinfo\n");
                screen->forceDisplay(true); // Force a new UI frame, then force an EInk update
            }
            break;
@@ -193,15 +196,13 @@ int32_t ButtonThread::runOnce()
 #ifdef BUTTON_PIN_TOUCH
        case BUTTON_EVENT_TOUCH_LONG_PRESSED: {
            LOG_BUTTON("Touch press!\n");
-            if (config.display.wake_on_tap_or_motion) {
-                if (screen) {
-                    // Wake if asleep
-                    if (powerFSM.getState() == &stateDARK)
-                        powerFSM.trigger(EVENT_PRESS);
+            if (screen) {
+                // Wake if asleep
+                if (powerFSM.getState() == &stateDARK)
+                    powerFSM.trigger(EVENT_PRESS);

-                    // Update display (legacy behaviour)
-                    screen->forceDisplay();
-                }
+                // Update display (legacy behaviour)
+                screen->forceDisplay();
            }
            break;
        }
--- a/src/FSCommon.cpp
+++ b/src/FSCommon.cpp
@@ -212,8 +212,23 @@ void fsInit()
        LOG_ERROR("Filesystem mount Failed.\n");
        // assert(0); This auto-formats the partition, so no need to fail here.
    }
-#ifdef ARCH_ESP32
+#if defined(ARCH_ESP32)
    LOG_DEBUG("Filesystem files (%d/%d Bytes):\n", FSCom.usedBytes(), FSCom.totalBytes());
+#elif defined(ARCH_NRF52)
+    /*
+     * nRF52840 has a certain chance of automatic formatting failure.
+     * Try to create a file after initializing the file system. If the creation fails,
+     * it means that the file system is not working properly. Please format it manually again.
+     * */
+    Adafruit_LittleFS_Namespace::File file(FSCom);
+    const char *filename = "/meshtastic.txt";
+    if (!file.open(filename, FILE_O_WRITE)) {
+        LOG_DEBUG("Format ....");
+        FSCom.format();
+        FSCom.begin();
+    } else {
+        file.close();
+    }
 #else
    LOG_DEBUG("Filesystem files:\n");
 #endif
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -69,7 +69,7 @@ static const uint8_t ext_chrg_detect_value = EXT_CHRG_DETECT_VALUE;
 #endif
 #endif

-#if HAS_TELEMETRY && !defined(ARCH_PORTDUINO)
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(ARCH_PORTDUINO)
 INA260Sensor ina260Sensor;
 INA219Sensor ina219Sensor;
 INA3221Sensor ina3221Sensor;
@@ -184,7 +184,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
    virtual uint16_t getBattVoltage() override
    {

-#if defined(HAS_TELEMETRY) && !defined(ARCH_PORTDUINO) && !defined(HAS_PMU)
+#if HAS_TELEMETRY && !defined(ARCH_PORTDUINO) && !defined(HAS_PMU) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
        if (hasINA()) {
            LOG_DEBUG("Using INA on I2C addr 0x%x for device battery voltage\n", config.power.device_battery_ina_address);
            return getINAVoltage();
@@ -223,7 +223,17 @@ class AnalogBatteryLevel : public HasBatteryLevel
            raw = raw / BATTERY_SENSE_SAMPLES;
            scaled = operativeAdcMultiplier * ((1000 * AREF_VOLTAGE) / pow(2, BATTERY_SENSE_RESOLUTION_BITS)) * raw;
 #endif
-            last_read_value += (scaled - last_read_value) * 0.5; // Virtual LPF
+
+            if (!initial_read_done) {
+                // Flush the smoothing filter with an ADC reading, if the reading is plausibly correct
+                if (scaled > last_read_value)
+                    last_read_value = scaled;
+                initial_read_done = true;
+            } else {
+                // Already initialized - filter this reading
+                last_read_value += (scaled - last_read_value) * 0.5; // Virtual LPF
+            }
+
            // LOG_DEBUG("battery gpio %d raw val=%u scaled=%u filtered=%u\n", BATTERY_PIN, raw, (uint32_t)(scaled), (uint32_t)
            // (last_read_value));
        }
@@ -357,10 +367,12 @@ class AnalogBatteryLevel : public HasBatteryLevel
    const float noBatVolt = (OCV[NUM_OCV_POINTS - 1] - 500) * NUM_CELLS;
    // Start value from minimum voltage for the filter to not start from 0
    // that could trigger some events.
+    // This value is over-written by the first ADC reading, it the voltage seems reasonable.
+    bool initial_read_done = false;
    float last_read_value = (OCV[NUM_OCV_POINTS - 1] * NUM_CELLS);
    uint32_t last_read_time_ms = 0;

-#if defined(HAS_TELEMETRY) && !defined(ARCH_PORTDUINO)
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(ARCH_PORTDUINO)
    uint16_t getINAVoltage()
    {
        if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219].first == config.power.device_battery_ina_address) {
--- a/src/SerialConsole.cpp
+++ b/src/SerialConsole.cpp
@@ -2,6 +2,7 @@
 #include "NodeDB.h"
 #include "PowerFSM.h"
 #include "configuration.h"
+#include "time.h"

 #ifdef RP2040_SLOW_CLOCK
 #define Port Serial2
@@ -50,7 +51,9 @@ SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port), con
        }
    }
 #endif
+#if !ARCH_PORTDUINO
    emitRebooted();
+#endif
 }

 int32_t SerialConsole::runOnce()
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -128,6 +128,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LPS22HB_ADDR_ALT 0x5D
 #define SHT31_ADDR 0x44
 #define PMSA0031_ADDR 0x12
+#define RCWL9620_ADDR 0x57
 #define VEML7700_ADDR 0x10

 // -----------------------------------------------------------------------------
--- a/src/detect/ScanI2C.h
+++ b/src/detect/ScanI2C.h
@@ -42,9 +42,8 @@ class ScanI2C
        LSM6DS3,
        TCA9555,
        VEML7700,
-#ifdef HAS_NCP5623
+        RCWL9620,
        NCP5623,
-#endif
    } DeviceType;

    // typedef uint8_t DeviceAddress;
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -294,6 +294,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port)

                SCAN_SIMPLE_CASE(SHT31_ADDR, SHT31, "SHT31 sensor found\n")
                SCAN_SIMPLE_CASE(SHTC3_ADDR, SHTC3, "SHTC3 sensor found\n")
+                SCAN_SIMPLE_CASE(RCWL9620_ADDR, RCWL9620, "RCWL9620 sensor found\n")

            case LPS22HB_ADDR_ALT:
                SCAN_SIMPLE_CASE(LPS22HB_ADDR, LPS22HB, "LPS22HB sensor found\n")
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -62,10 +62,10 @@ void GPS::CASChecksum(uint8_t *message, size_t length)

    // Iterate over the payload as a series of uint32_t's and
    // accumulate the cksum
-    uint32_t *payload = (uint32_t *)(message + 6);
+    uint32_t const *payload = (uint32_t *)(message + 6);
    for (size_t i = 0; i < (length - 10) / 4; i++) {
-        uint32_t p = payload[i];
-        cksum += p;
+        uint32_t pl = payload[i];
+        cksum += pl;
    }

    // Place the checksum values in the message
@@ -452,7 +452,7 @@ bool GPS::setup()
            // Set the NEMA output messages
            // Ask for only RMC and GGA
            uint8_t fields[] = {CAS_NEMA_RMC, CAS_NEMA_GGA};
-            for (uint i = 0; i < sizeof(fields); i++) {
+            for (unsigned int i = 0; i < sizeof(fields); i++) {
                // Construct a CAS-CFG-MSG packet
                uint8_t cas_cfg_msg_packet[] = {0x4e, fields[i], 0x01, 0x00};
                msglen = makeCASPacket(0x06, 0x01, sizeof(cas_cfg_msg_packet), cas_cfg_msg_packet);
@@ -1467,7 +1467,7 @@ bool GPS::lookForLocation()
 #endif // GPS_EXTRAVERBOSE

    // Is this a new point or are we re-reading the previous one?
-    if (!reader.location.isUpdated())
+    if (!reader.location.isUpdated() && !reader.altitude.isUpdated())
        return false;

    // check if a complete GPS solution set is available for reading
@@ -1584,7 +1584,7 @@ bool GPS::hasFlow()

 bool GPS::whileIdle()
 {
-    uint charsInBuf = 0;
+    unsigned int charsInBuf = 0;
    bool isValid = false;
    if (!isAwake) {
        clearBuffer();
--- a/src/gps/RTC.cpp
+++ b/src/gps/RTC.cpp
@@ -223,7 +223,7 @@ int32_t getTZOffset()
    now = time(NULL);
    gmt = gmtime(&now);
    gmt->tm_isdst = -1;
-    return (int16_t)difftime(now, mktime(gmt));
+    return (int32_t)difftime(now, mktime(gmt));
 }

 /**
--- a/src/graphics/EInkDynamicDisplay.cpp
+++ b/src/graphics/EInkDynamicDisplay.cpp
@@ -534,6 +534,10 @@ void EInkDynamicDisplay::checkBusyAsyncRefresh()

        return;
    }
+
+    // Async refresh appears to have stopped, but wasn't caught by onNotify()
+    else
+        pollAsyncRefresh(); // Check (and terminate) the async refresh manually
 }

 // Hold control while an async refresh runs
--- a/src/graphics/NeoPixel.h
+++ b/src/graphics/NeoPixel.h
@@ -0,0 +1,4 @@
+#ifdef HAS_NEOPIXEL
+#include <Adafruit_NeoPixel.h>
+extern Adafruit_NeoPixel pixels;
+#endif
--- a/src/graphics/TFTDisplay.cpp
+++ b/src/graphics/TFTDisplay.cpp
@@ -1,7 +1,6 @@
 #include "configuration.h"
 #include "main.h"
 #if ARCH_PORTDUINO
-#include "mesh_bus_spi.h"
 #include "platform/portduino/PortduinoGlue.h"
 #endif

@@ -9,6 +8,12 @@
 #define TFT_BACKLIGHT_ON HIGH
 #endif

+#ifdef GPIO_EXTENDER
+#include <SparkFunSX1509.h>
+#include <Wire.h>
+extern SX1509 gpioExtender;
+#endif
+
 #ifndef TFT_MESH
 #define TFT_MESH COLOR565(0x67, 0xEA, 0x94)
 #endif
@@ -340,7 +345,7 @@ static TFT_eSPI *tft = nullptr; // Invoke library, pins defined in User_Setup.h
 class LGFX : public lgfx::LGFX_Device
 {
    lgfx::Panel_LCD *_panel_instance;
-    lgfx::Mesh_Bus_SPI _bus_instance;
+    lgfx::Bus_SPI _bus_instance;

    lgfx::ITouch *_touch_instance;

@@ -357,7 +362,7 @@ class LGFX : public lgfx::LGFX_Device
            _panel_instance = new lgfx::Panel_ILI9341;
        auto buscfg = _bus_instance.config();
        buscfg.spi_mode = 0;
-        _bus_instance.spi_device(DisplaySPI, settingsStrings[displayspidev]);
+        buscfg.spi_host = settingsMap[displayspidev];

        buscfg.pin_dc = settingsMap[displayDC]; // Set SPI DC pin number (-1 = disable)

@@ -383,6 +388,8 @@ class LGFX : public lgfx::LGFX_Device
                _touch_instance = new lgfx::Touch_XPT2046;
            } else if (settingsMap[touchscreenModule] == stmpe610) {
                _touch_instance = new lgfx::Touch_STMPE610;
+            } else if (settingsMap[touchscreenModule] == ft5x06) {
+                _touch_instance = new lgfx::Touch_FT5x06;
            }
            auto touch_cfg = _touch_instance->config();

@@ -394,6 +401,11 @@ class LGFX : public lgfx::LGFX_Device
            touch_cfg.pin_int = settingsMap[touchscreenIRQ];
            touch_cfg.bus_shared = true;
            touch_cfg.offset_rotation = 1;
+            if (settingsMap[touchscreenI2CAddr] != -1) {
+                touch_cfg.i2c_addr = settingsMap[touchscreenI2CAddr];
+            } else {
+                touch_cfg.spi_host = settingsMap[touchscreenspidev];
+            }

            _touch_instance->config(touch_cfg);
            _panel_instance->setTouch(_touch_instance);
@@ -711,4 +723,4 @@ bool TFTDisplay::connect()
    return true;
 }

-#endif
+#endif
--- a/src/graphics/mesh_bus_spi.cpp
+++ b/src/graphics/mesh_bus_spi.cpp
@@ -1,188 +0,0 @@
-// This code has been copied from LovyanGFX to make the SPI device selectable for touchscreens.
-// Ideally this could eventually be an inherited class from BUS_SPI,
-// but currently too many internal objects are set private.
-
-#include "configuration.h"
-#if ARCH_PORTDUINO
-#include "lgfx/v1/misc/pixelcopy.hpp"
-#include "main.h"
-#include "mesh_bus_spi.h"
-#include <Arduino.h>
-#include <SPI.h>
-
-namespace lgfx
-{
-inline namespace v1
-{
-//----------------------------------------------------------------------------
-
-void Mesh_Bus_SPI::config(const config_t &config)
-{
-    _cfg = config;
-
-    if (_cfg.pin_dc >= 0) {
-        pinMode(_cfg.pin_dc, pin_mode_t::output);
-        gpio_hi(_cfg.pin_dc);
-    }
-}
-
-bool Mesh_Bus_SPI::init(void)
-{
-    dc_h();
-    pinMode(_cfg.pin_dc, pin_mode_t::output);
-    if (SPIName != "")
-        PrivateSPI->begin(SPIName.c_str());
-    else
-        PrivateSPI->begin();
-    return true;
-}
-
-void Mesh_Bus_SPI::release(void)
-{
-    PrivateSPI->end();
-}
-
-void Mesh_Bus_SPI::spi_device(HardwareSPI *newSPI, std::string newSPIName)
-{
-    PrivateSPI = newSPI;
-    SPIName = newSPIName;
-}
-void Mesh_Bus_SPI::beginTransaction(void)
-{
-    dc_h();
-    SPISettings setting(_cfg.freq_write, MSBFIRST, _cfg.spi_mode);
-    PrivateSPI->beginTransaction(setting);
-}
-
-void Mesh_Bus_SPI::endTransaction(void)
-{
-    PrivateSPI->endTransaction();
-    dc_h();
-}
-
-void Mesh_Bus_SPI::beginRead(void)
-{
-    PrivateSPI->endTransaction();
-    // SPISettings setting(_cfg.freq_read, BitOrder::MSBFIRST, _cfg.spi_mode, false);
-    SPISettings setting(_cfg.freq_read, MSBFIRST, _cfg.spi_mode);
-    PrivateSPI->beginTransaction(setting);
-}
-
-void Mesh_Bus_SPI::endRead(void)
-{
-    PrivateSPI->endTransaction();
-    beginTransaction();
-}
-
-void Mesh_Bus_SPI::wait(void) {}
-
-bool Mesh_Bus_SPI::busy(void) const
-{
-    return false;
-}
-
-bool Mesh_Bus_SPI::writeCommand(uint32_t data, uint_fast8_t bit_length)
-{
-    dc_l();
-    PrivateSPI->transfer((uint8_t *)&data, bit_length >> 3);
-    dc_h();
-    return true;
-}
-
-void Mesh_Bus_SPI::writeData(uint32_t data, uint_fast8_t bit_length)
-{
-    PrivateSPI->transfer((uint8_t *)&data, bit_length >> 3);
-}
-
-void Mesh_Bus_SPI::writeDataRepeat(uint32_t data, uint_fast8_t bit_length, uint32_t length)
-{
-    const uint8_t dst_bytes = bit_length >> 3;
-    uint32_t limit = (dst_bytes == 3) ? 12 : 16;
-    auto buf = _flip_buffer.getBuffer(512);
-    size_t fillpos = 0;
-    reinterpret_cast<uint32_t *>(buf)[0] = data;
-    fillpos += dst_bytes;
-    uint32_t len;
-    do {
-        len = ((length - 1) % limit) + 1;
-        if (limit <= 64)
-            limit <<= 1;
-
-        while (fillpos < len * dst_bytes) {
-            memcpy(&buf[fillpos], buf, fillpos);
-            fillpos += fillpos;
-        }
-
-        PrivateSPI->transfer(buf, len * dst_bytes);
-    } while (length -= len);
-}
-
-void Mesh_Bus_SPI::writePixels(pixelcopy_t *param, uint32_t length)
-{
-    const uint8_t dst_bytes = param->dst_bits >> 3;
-    uint32_t limit = (dst_bytes == 3) ? 12 : 16;
-    uint32_t len;
-    do {
-        len = ((length - 1) % limit) + 1;
-        if (limit <= 32)
-            limit <<= 1;
-        auto buf = _flip_buffer.getBuffer(len * dst_bytes);
-        param->fp_copy(buf, 0, len, param);
-        PrivateSPI->transfer(buf, len * dst_bytes);
-    } while (length -= len);
-}
-
-void Mesh_Bus_SPI::writeBytes(const uint8_t *data, uint32_t length, bool dc, bool use_dma)
-{
-    if (dc)
-        dc_h();
-    else
-        dc_l();
-    PrivateSPI->transfer(const_cast<uint8_t *>(data), length);
-    if (!dc)
-        dc_h();
-}
-
-uint32_t Mesh_Bus_SPI::readData(uint_fast8_t bit_length)
-{
-    uint32_t res = 0;
-    bit_length >>= 3;
-    if (!bit_length)
-        return res;
-    int idx = 0;
-    do {
-        res |= PrivateSPI->transfer(0) << idx;
-        idx += 8;
-    } while (--bit_length);
-    return res;
-}
-
-bool Mesh_Bus_SPI::readBytes(uint8_t *dst, uint32_t length, bool use_dma)
-{
-    do {
-        dst[0] = PrivateSPI->transfer(0);
-        ++dst;
-    } while (--length);
-    return true;
-}
-
-void Mesh_Bus_SPI::readPixels(void *dst, pixelcopy_t *param, uint32_t length)
-{
-    uint32_t bytes = param->src_bits >> 3;
-    uint32_t dstindex = 0;
-    uint32_t len = 4;
-    uint8_t buf[24];
-    param->src_data = buf;
-    do {
-        if (len > length)
-            len = length;
-        readBytes((uint8_t *)buf, len * bytes, true);
-        param->src_x = 0;
-        dstindex = param->fp_copy(dst, dstindex, dstindex + len, param);
-        length -= len;
-    } while (length);
-}
-
-} // namespace v1
-} // namespace lgfx
-#endif
--- a/src/graphics/mesh_bus_spi.h
+++ b/src/graphics/mesh_bus_spi.h
@@ -1,100 +0,0 @@
-#if ARCH_PORTDUINO
-/*----------------------------------------------------------------------------/
-  Lovyan GFX - Graphics library for embedded devices.
-
-Original Source:
- https://github.com/lovyan03/LovyanGFX/
-
-Licence:
- [FreeBSD](https://github.com/lovyan03/LovyanGFX/blob/master/license.txt)
-
-Author:
- [lovyan03](https://twitter.com/lovyan03)
-
-Contributors:
- [ciniml](https://github.com/ciniml)
- [mongonta0716](https://github.com/mongonta0716)
- [tobozo](https://github.com/tobozo)
-/----------------------------------------------------------------------------*/
-#pragma once
-
-#include <stdint.h>
-
-#include "lgfx/v1/Bus.hpp"
-#include "lgfx/v1/platforms/common.hpp"
-
-namespace lgfx
-{
-inline namespace v1
-{
-//----------------------------------------------------------------------------
-
-class Mesh_Bus_SPI : public IBus
-{
-  public:
-    struct config_t {
-        uint32_t freq_write = 16000000;
-        uint32_t freq_read = 8000000;
-        // bool spi_3wire = true;
-        // bool use_lock = true;
-        int16_t pin_sclk = -1;
-        int16_t pin_miso = -1;
-        int16_t pin_mosi = -1;
-        int16_t pin_dc = -1;
-        uint8_t spi_mode = 0;
-    };
-
-    const config_t &config(void) const { return _cfg; }
-
-    void config(const config_t &config);
-
-    bus_type_t busType(void) const override { return bus_type_t::bus_spi; }
-
-    bool init(void) override;
-    void release(void) override;
-    void spi_device(HardwareSPI *newSPI, std::string newSPIName);
-
-    void beginTransaction(void) override;
-    void endTransaction(void) override;
-    void wait(void) override;
-    bool busy(void) const override;
-
-    bool writeCommand(uint32_t data, uint_fast8_t bit_length) override;
-    void writeData(uint32_t data, uint_fast8_t bit_length) override;
-    void writeDataRepeat(uint32_t data, uint_fast8_t bit_length, uint32_t count) override;
-    void writePixels(pixelcopy_t *param, uint32_t length) override;
-    void writeBytes(const uint8_t *data, uint32_t length, bool dc, bool use_dma) override;
-
-    void initDMA(void) {}
-    void flush(void) {}
-    void addDMAQueue(const uint8_t *data, uint32_t length) override { writeBytes(data, length, true, true); }
-    void execDMAQueue(void) {}
-    uint8_t *getDMABuffer(uint32_t length) override { return _flip_buffer.getBuffer(length); }
-
-    void beginRead(void) override;
-    void endRead(void) override;
-    uint32_t readData(uint_fast8_t bit_length) override;
-    bool readBytes(uint8_t *dst, uint32_t length, bool use_dma) override;
-    void readPixels(void *dst, pixelcopy_t *param, uint32_t length) override;
-
-  private:
-    HardwareSPI *PrivateSPI;
-    std::string SPIName;
-    __attribute__((always_inline)) inline void dc_h(void) { gpio_hi(_cfg.pin_dc); }
-    __attribute__((always_inline)) inline void dc_l(void) { gpio_lo(_cfg.pin_dc); }
-
-    config_t _cfg;
-    FlipBuffer _flip_buffer;
-    bool _need_wait;
-    uint32_t _mask_reg_dc;
-    uint32_t _last_apb_freq = -1;
-    uint32_t _clkdiv_write;
-    uint32_t _clkdiv_read;
-    volatile uint32_t *_gpio_reg_dc_h;
-    volatile uint32_t *_gpio_reg_dc_l;
-};
-
-//----------------------------------------------------------------------------
-} // namespace v1
-} // namespace lgfx
-#endif
--- a/src/input/TouchScreenBase.h
+++ b/src/input/TouchScreenBase.h
@@ -3,6 +3,7 @@
 #include "InputBroker.h"
 #include "concurrency/OSThread.h"
 #include "mesh/NodeDB.h"
+#include "time.h"

 typedef struct _TouchEvent {
    const char *source;
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -197,7 +197,9 @@ uint32_t timeLastPowered = 0;

 static Periodic *ledPeriodic;
 static OSThread *powerFSMthread;
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 static OSThread *accelerometerThread;
+#endif
 static OSThread *ambientLightingThread;
 SPISettings spiSettings(4000000, MSBFIRST, SPI_MODE0);

@@ -342,7 +344,7 @@ void setup()
    Wire.begin(I2C_SDA, I2C_SCL);
 #elif defined(ARCH_PORTDUINO)
    if (settingsStrings[i2cdev] != "") {
-        LOG_INFO("Using %s as I2C device.\n", settingsStrings[i2cdev]);
+        LOG_INFO("Using %s as I2C device.\n", settingsStrings[i2cdev].c_str());
        Wire.begin(settingsStrings[i2cdev].c_str());
    } else {
        LOG_INFO("No I2C device configured, skipping.\n");
@@ -538,6 +540,7 @@ void setup()
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::QMI8658, meshtastic_TelemetrySensorType_QMI8658)
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::QMC5883L, meshtastic_TelemetrySensorType_QMC5883L)
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::PMSA0031, meshtastic_TelemetrySensorType_PMSA003I)
+    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::RCWL9620, meshtastic_TelemetrySensorType_RCWL9620)
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::VEML7700, meshtastic_TelemetrySensorType_VEML7700)

    i2cScanner.reset();
@@ -605,7 +608,7 @@ void setup()
    screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107; // keep dimension of 128x64
 #endif

-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
    if (acc_info.type != ScanI2C::DeviceType::NONE) {
        config.display.wake_on_tap_or_motion = true;
        moduleConfig.external_notification.enabled = true;
@@ -613,7 +616,9 @@ void setup()
    }
 #endif

-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+#if defined(HAS_NEOPIXEL) || defined(UNPHONE) || defined(RGBLED_RED)
+    ambientLightingThread = new AmbientLightingThread(ScanI2C::DeviceType::NONE);
+#elif !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
    if (rgb_found.type != ScanI2C::DeviceType::NONE) {
        ambientLightingThread = new AmbientLightingThread(rgb_found.type);
    }
@@ -692,6 +697,12 @@ void setup()
    // Now that the mesh service is created, create any modules
    setupModules();

+#ifdef LED_PIN
+    // Turn LED off after boot, if heartbeat by config
+    if (config.device.led_heartbeat_disabled)
+        digitalWrite(LED_PIN, LOW ^ LED_INVERTED);
+#endif
+
 // Do this after service.init (because that clears error_code)
 #ifdef HAS_PMU
    if (!pmu_found)
@@ -728,7 +739,7 @@ void setup()
    if (settingsMap[use_sx1262]) {
        if (!rIf) {
            LOG_DEBUG("Attempting to activate sx1262 radio on SPI port %s\n", settingsStrings[spidev].c_str());
-            LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(*LoraSPI, spiSettings);
+            LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
            rIf = new SX1262Interface((LockingArduinoHal *)RadioLibHAL, settingsMap[cs], settingsMap[irq], settingsMap[reset],
                                      settingsMap[busy]);
            if (!rIf->init()) {
@@ -742,7 +753,7 @@ void setup()
    } else if (settingsMap[use_rf95]) {
        if (!rIf) {
            LOG_DEBUG("Attempting to activate rf95 radio on SPI port %s\n", settingsStrings[spidev].c_str());
-            LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(*LoraSPI, spiSettings);
+            LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
            rIf = new RF95Interface((LockingArduinoHal *)RadioLibHAL, settingsMap[cs], settingsMap[irq], settingsMap[reset],
                                    settingsMap[busy]);
            if (!rIf->init()) {
@@ -757,7 +768,7 @@ void setup()
    } else if (settingsMap[use_sx1280]) {
        if (!rIf) {
            LOG_DEBUG("Attempting to activate sx1280 radio on SPI port %s\n", settingsStrings[spidev].c_str());
-            LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(*LoraSPI, spiSettings);
+            LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
            rIf = new SX1280Interface((LockingArduinoHal *)RadioLibHAL, settingsMap[cs], settingsMap[irq], settingsMap[reset],
                                      settingsMap[busy]);
            if (!rIf->init()) {
@@ -769,6 +780,21 @@ void setup()
                LOG_INFO("SX1280 Radio init succeeded, using SX1280 radio\n");
            }
        }
+    } else if (settingsMap[use_sx1268]) {
+        if (!rIf) {
+            LOG_DEBUG("Attempting to activate sx1268 radio on SPI port %s\n", settingsStrings[spidev].c_str());
+            LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
+            rIf = new SX1268Interface((LockingArduinoHal *)RadioLibHAL, settingsMap[cs], settingsMap[irq], settingsMap[reset],
+                                      settingsMap[busy]);
+            if (!rIf->init()) {
+                LOG_ERROR("Failed to find SX1268 radio\n");
+                delete rIf;
+                rIf = NULL;
+                exit(EXIT_FAILURE);
+            } else {
+                LOG_INFO("SX1268 Radio init succeeded, using SX1268 radio\n");
+            }
+        }
    }

 #elif defined(HW_SPI1_DEVICE)
--- a/src/mesh/FloodingRouter.cpp
+++ b/src/mesh/FloodingRouter.cpp
@@ -35,11 +35,10 @@ bool FloodingRouter::shouldFilterReceived(const meshtastic_MeshPacket *p)

 void FloodingRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtastic_Routing *c)
 {
-    bool isAck =
-        ((c && c->error_reason == meshtastic_Routing_Error_NONE)); // consider only ROUTING_APP message without error as ACK
-    if (isAck && p->to != getNodeNum()) {
-        // do not flood direct message that is ACKed
-        LOG_DEBUG("Receiving an ACK not for me, but don't need to rebroadcast this direct message anymore.\n");
+    bool isAckorReply = (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) && (p->decoded.request_id != 0);
+    if (isAckorReply && p->to != getNodeNum() && p->to != NODENUM_BROADCAST) {
+        // do not flood direct message that is ACKed or replied to
+        LOG_DEBUG("Receiving an ACK or reply not for me, but don't need to rebroadcast this direct message anymore.\n");
        Router::cancelSending(p->to, p->decoded.request_id); // cancel rebroadcast for this DM
    }
    if ((p->to != getNodeNum()) && (p->hop_limit > 0) && (getFrom(p) != getNodeNum())) {
--- a/src/mesh/MeshService.cpp
+++ b/src/mesh/MeshService.cpp
@@ -192,12 +192,7 @@ void MeshService::handleToRadio(meshtastic_MeshPacket &p)
        return;
    }
 #endif
-    if (p.from != 0) { // We don't let phones assign nodenums to their sent messages
-        LOG_WARN("phone tried to pick a nodenum, we don't allow that.\n");
-        p.from = 0;
-    } else {
-        // p.from = nodeDB->getNodeNum();
-    }
+    p.from = 0; // We don't let phones assign nodenums to their sent messages

    if (p.id == 0)
        p.id = generatePacketId(); // If the phone didn't supply one, then pick one
@@ -262,12 +257,12 @@ void MeshService::sendToMesh(meshtastic_MeshPacket *p, RxSource src, bool ccToPh
        LOG_DEBUG("Can't send status to phone");
    }

-    if (ccToPhone) {
+    if (res == ERRNO_OK && ccToPhone) { // Check if p is not released in case it couldn't be sent
        sendToPhone(packetPool.allocCopy(*p));
    }
 }

-void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
+bool MeshService::trySendPosition(NodeNum dest, bool wantReplies)
 {
    meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(nodeDB->getNodeNum());

@@ -278,6 +273,7 @@ void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
        if (positionModule) {
            LOG_INFO("Sending position ping to 0x%x, wantReplies=%d, channel=%d\n", dest, wantReplies, node->channel);
            positionModule->sendOurPosition(dest, wantReplies, node->channel);
+            return true;
        }
    } else {
 #endif
@@ -286,6 +282,7 @@ void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
            nodeInfoModule->sendOurNodeInfo(dest, wantReplies, node->channel);
        }
    }
+    return false;
 }

 void MeshService::sendToPhone(meshtastic_MeshPacket *p)
--- a/src/mesh/MeshService.h
+++ b/src/mesh/MeshService.h
@@ -108,8 +108,9 @@ class MeshService
    void reloadOwner(bool shouldSave = true);

    /// Called when the user wakes up our GUI, normally sends our latest location to the mesh (if we have it), otherwise at least
-    /// sends our owner
-    void sendNetworkPing(NodeNum dest, bool wantReplies = false);
+    /// sends our nodeinfo
+    /// returns true if we sent a position
+    bool trySendPosition(NodeNum dest, bool wantReplies = false);

    /// Send a packet into the mesh - note p must have been allocated from packetPool.  We will return it to that pool after
    /// sending. This is the ONLY function you should use for sending messages into the mesh, because it also updates the nodedb
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -56,7 +56,7 @@ meshtastic_OEMStore oemStore;
 bool meshtastic_DeviceState_callback(pb_istream_t *istream, pb_ostream_t *ostream, const pb_field_iter_t *field)
 {
    if (ostream) {
-        std::vector<meshtastic_NodeInfoLite> *vec = (std::vector<meshtastic_NodeInfoLite> *)field->pData;
+        std::vector<meshtastic_NodeInfoLite> const *vec = (std::vector<meshtastic_NodeInfoLite> *)field->pData;
        for (auto item : *vec) {
            if (!pb_encode_tag_for_field(ostream, field))
                return false;
@@ -269,7 +269,7 @@ void NodeDB::installDefaultConfig()
        config.device.node_info_broadcast_secs = default_node_info_broadcast_secs;
    config.device.serial_enabled = true;
    resetRadioConfig();
-    strncpy(config.network.ntp_server, "0.pool.ntp.org", 32);
+    strncpy(config.network.ntp_server, "meshtastic.pool.ntp.org", 32);
    // FIXME: Default to bluetooth capability of platform as default
    config.bluetooth.enabled = true;
    config.bluetooth.fixed_pin = defaultBLEPin;
@@ -352,9 +352,6 @@ void NodeDB::installDefaultModuleConfig()
    moduleConfig.external_notification.alert_message = true;
    moduleConfig.external_notification.output_ms = 100;
    moduleConfig.external_notification.active = true;
-#endif
-#ifdef TTGO_T_ECHO
-    config.display.wake_on_tap_or_motion = true; // Enable touch button for screen-on / refresh
 #endif
    moduleConfig.has_canned_message = true;

@@ -452,7 +449,7 @@ void NodeDB::resetNodes()
        neighborInfoModule->resetNeighbors();
 }

-void NodeDB::removeNodeByNum(uint nodeNum)
+void NodeDB::removeNodeByNum(NodeNum nodeNum)
 {
    int newPos = 0, removed = 0;
    for (int i = 0; i < numMeshNodes; i++) {
--- a/src/mesh/NodeDB.h
+++ b/src/mesh/NodeDB.h
@@ -124,7 +124,7 @@ class NodeDB
     */
    size_t getNumOnlineMeshNodes(bool localOnly = false);

-    void initConfigIntervals(), initModuleConfigIntervals(), resetNodes(), removeNodeByNum(uint nodeNum);
+    void initConfigIntervals(), initModuleConfigIntervals(), resetNodes(), removeNodeByNum(NodeNum nodeNum);

    bool factoryReset();

--- a/src/mesh/ProtobufModule.h
+++ b/src/mesh/ProtobufModule.h
@@ -95,12 +95,11 @@ template <class T> class ProtobufModule : protected SinglePortModule
     */
    virtual void alterReceived(meshtastic_MeshPacket &mp) override
    {
-        auto &p = mp.decoded;
-
        T scratch;
        T *decoded = NULL;
        if (mp.which_payload_variant == meshtastic_MeshPacket_decoded_tag && mp.decoded.portnum == ourPortNum) {
            memset(&scratch, 0, sizeof(scratch));
+            auto &p = mp.decoded;
            if (pb_decode_from_bytes(p.payload.bytes, p.payload.size, fields, &scratch)) {
                decoded = &scratch;
            } else {
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -76,9 +76,12 @@ const RegionInfo regions[] = {
    RDEF(KR, 920.0f, 923.0f, 100, 0, 0, true, false, false),

    /*
-        ???
+        Taiwan, 920-925Mhz, limited to 0.5W indoor or coastal, 1.0W outdoor.
+        5.8.1 in the Low-power Radio-frequency Devices Technical Regulations
+        https://www.ncc.gov.tw/english/files/23070/102_5190_230703_1_doc_C.PDF
+        https://gazette.nat.gov.tw/egFront/e_detail.do?metaid=147283
     */
-    RDEF(TW, 920.0f, 925.0f, 100, 0, 0, true, false, false),
+    RDEF(TW, 920.0f, 925.0f, 100, 0, 27, true, false, false),

    /*
        https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
@@ -492,7 +495,7 @@ void RadioInterface::applyModemConfig()
    // If user has manually specified a channel num, then use that, otherwise generate one by hashing the name
    const char *channelName = channels.getName(channels.getPrimaryIndex());
    // channel_num is actually (channel_num - 1), since modulus (%) returns values from 0 to (numChannels - 1)
-    uint channel_num = (loraConfig.channel_num ? loraConfig.channel_num - 1 : hash(channelName)) % numChannels;
+    uint32_t channel_num = (loraConfig.channel_num ? loraConfig.channel_num - 1 : hash(channelName)) % numChannels;

    // Check if we use the default frequency slot
    RadioInterface::uses_default_frequency_slot =
@@ -586,4 +589,4 @@ size_t RadioInterface::beginSending(meshtastic_MeshPacket *p)

    sendingPacket = p;
    return p->encrypted.size + sizeof(PacketHeader);
-}
+}
--- a/src/mesh/generated/meshtastic/telemetry.pb.h
+++ b/src/mesh/generated/meshtastic/telemetry.pb.h
@@ -309,4 +309,4 @@ extern const pb_msgdesc_t meshtastic_Telemetry_msg;
 } /* extern "C" */
 #endif

-#endif
+#endif
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -23,6 +23,10 @@
 #include "mqtt/MQTT.h"
 #endif

+#if !MESHTASTIC_EXCLUDE_GPS
+#include "GPS.h"
+#endif
+
 AdminModule *adminModule;
 bool hasOpenEditTransaction;

@@ -217,6 +221,12 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
            nodeDB->setLocalPosition(r->set_fixed_position);
            config.position.fixed_position = true;
            saveChanges(SEGMENT_DEVICESTATE | SEGMENT_CONFIG, false);
+            // Send our new fixed position to the mesh for good measure
+            positionModule->sendOurPosition();
+#if !MESHTASTIC_EXCLUDE_GPS
+            if (gps != nullptr)
+                gps->enable();
+#endif
        }
        break;
    }
--- a/src/modules/CannedMessageModule.cpp
+++ b/src/modules/CannedMessageModule.cpp
@@ -161,10 +161,10 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
        if (!event->kbchar) {
            if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT)) {
                this->payload = 0xb4;
-                this->destSelect = CANNED_MESSAGE_DESTINATION_TYPE_NODE;
+                // this->destSelect = CANNED_MESSAGE_DESTINATION_TYPE_NODE;
            } else if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT)) {
                this->payload = 0xb7;
-                this->destSelect = CANNED_MESSAGE_DESTINATION_TYPE_NODE;
+                // this->destSelect = CANNED_MESSAGE_DESTINATION_TYPE_NODE;
            }
        } else {
            // pass the pressed key
@@ -233,14 +233,16 @@ int32_t CannedMessageModule::runOnce()
 {
    if (((!moduleConfig.canned_message.enabled) && !CANNED_MESSAGE_MODULE_ENABLE) ||
        (this->runState == CANNED_MESSAGE_RUN_STATE_DISABLED) || (this->runState == CANNED_MESSAGE_RUN_STATE_INACTIVE)) {
+        temporaryMessage = "";
        return INT32_MAX;
    }
    // LOG_DEBUG("Check status\n");
    UIFrameEvent e = {false, true};
    if ((this->runState == CANNED_MESSAGE_RUN_STATE_SENDING_ACTIVE) ||
-        (this->runState == CANNED_MESSAGE_RUN_STATE_ACK_NACK_RECEIVED)) {
-        // TODO: might have some feedback of sendig state
+        (this->runState == CANNED_MESSAGE_RUN_STATE_ACK_NACK_RECEIVED) || (this->runState == CANNED_MESSAGE_RUN_STATE_MESSAGE)) {
+        // TODO: might have some feedback of sending state
        this->runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
+        temporaryMessage = "";
        e.frameChanged = true;
        this->currentMessageIndex = -1;
        this->freetext = ""; // clear freetext
@@ -429,31 +431,35 @@ int32_t CannedMessageModule::runOnce()
                runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
                break;
            case 0x9e: // toggle GPS like triple press does
+#if !MESHTASTIC_EXCLUDE_GPS
                if (gps != nullptr) {
                    gps->toggleGpsMode();
                }
                if (screen)
                    screen->forceDisplay();
-                runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
+                showTemporaryMessage("GPS Toggled");
+#endif
                break;
-
            // mute (switch off/toggle) external notifications on fn+m
            case 0xac:
                if (moduleConfig.external_notification.enabled == true) {
                    if (externalNotificationModule->getMute()) {
                        externalNotificationModule->setMute(false);
-                        runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
+                        showTemporaryMessage("Notifications \nEnabled");
                    } else {
                        externalNotificationModule->stopNow(); // this will turn off all GPIO and sounds and idle the loop
                        externalNotificationModule->setMute(true);
-                        runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
+                        showTemporaryMessage("Notifications \nDisabled");
                    }
                }
                break;
            case 0xaf: // fn+space send network ping like double press does
                service.refreshLocalMeshNode();
-                service.sendNetworkPing(NODENUM_BROADCAST, true);
-                runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
+                if (service.trySendPosition(NODENUM_BROADCAST, true)) {
+                    showTemporaryMessage("Position \nUpdate Sent");
+                } else {
+                    showTemporaryMessage("Node Info \nUpdate Sent");
+                }
                break;
            default:
                if (this->cursor == this->freetext.length()) {
@@ -542,12 +548,27 @@ int CannedMessageModule::getPrevIndex()
        return this->currentMessageIndex - 1;
    }
 }
+void CannedMessageModule::showTemporaryMessage(const String &message)
+{
+    temporaryMessage = message;
+    UIFrameEvent e = {false, true};
+    e.frameChanged = true;
+    notifyObservers(&e);
+    runState = CANNED_MESSAGE_RUN_STATE_MESSAGE;
+    // run this loop again in 2 seconds, next iteration will clear the display
+    setIntervalFromNow(2000);
+}

 void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
    char buffer[50];

-    if (cannedMessageModule->runState == CANNED_MESSAGE_RUN_STATE_ACK_NACK_RECEIVED) {
+    if (temporaryMessage.length() != 0) {
+        LOG_DEBUG("Drawing temporary message: %s", temporaryMessage.c_str());
+        display->setTextAlignment(TEXT_ALIGN_CENTER);
+        display->setFont(FONT_MEDIUM);
+        display->drawString(display->getWidth() / 2 + x, 0 + y + 12, temporaryMessage);
+    } else if (cannedMessageModule->runState == CANNED_MESSAGE_RUN_STATE_ACK_NACK_RECEIVED) {
        display->setTextAlignment(TEXT_ALIGN_CENTER);
        display->setFont(FONT_MEDIUM);
        String displayString;
@@ -766,4 +787,4 @@ String CannedMessageModule::drawWithCursor(String text, int cursor)
    return result;
 }

-#endif
+#endif
--- a/src/modules/CannedMessageModule.h
+++ b/src/modules/CannedMessageModule.h
@@ -10,6 +10,7 @@ enum cannedMessageModuleRunState {
    CANNED_MESSAGE_RUN_STATE_FREETEXT,
    CANNED_MESSAGE_RUN_STATE_SENDING_ACTIVE,
    CANNED_MESSAGE_RUN_STATE_ACK_NACK_RECEIVED,
+    CANNED_MESSAGE_RUN_STATE_MESSAGE,
    CANNED_MESSAGE_RUN_STATE_ACTION_SELECT,
    CANNED_MESSAGE_RUN_STATE_ACTION_UP,
    CANNED_MESSAGE_RUN_STATE_ACTION_DOWN,
@@ -51,6 +52,8 @@ class CannedMessageModule : public SinglePortModule, public Observable<const UIF
    void handleGetCannedMessageModuleMessages(const meshtastic_MeshPacket &req, meshtastic_AdminMessage *response);
    void handleSetCannedMessageModuleMessages(const char *from_msg);

+    void showTemporaryMessage(const String &message);
+
    String drawWithCursor(String text, int cursor);

    /*
@@ -112,7 +115,8 @@ class CannedMessageModule : public SinglePortModule, public Observable<const UIF
    char *messages[CANNED_MESSAGE_MODULE_MESSAGE_MAX_COUNT];
    int messagesCount = 0;
    unsigned long lastTouchMillis = 0;
+    String temporaryMessage;
 };

 extern CannedMessageModule *cannedMessageModule;
-#endif
+#endif
--- a/src/modules/ExternalNotificationModule.cpp
+++ b/src/modules/ExternalNotificationModule.cpp
@@ -26,7 +26,18 @@

 #ifdef HAS_NCP5623
 #include <graphics/RAKled.h>
+#endif

+#ifdef HAS_NEOPIXEL
+#include <graphics/NeoPixel.h>
+#endif
+
+#ifdef UNPHONE
+#include "unPhone.h"
+extern unPhone unphone;
+#endif
+
+#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE)
 uint8_t red = 0;
 uint8_t green = 0;
 uint8_t blue = 0;
@@ -108,27 +119,44 @@ int32_t ExternalNotificationModule::runOnce()
                millis()) {
                getExternal(2) ? setExternalOff(2) : setExternalOn(2);
            }
+#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE)
+            red = (colorState & 4) ? brightnessValues[brightnessIndex] : 0;          // Red enabled on colorState = 4,5,6,7
+            green = (colorState & 2) ? brightnessValues[brightnessIndex] : 0;        // Green enabled on colorState = 2,3,6,7
+            blue = (colorState & 1) ? (brightnessValues[brightnessIndex] * 1.5) : 0; // Blue enabled on colorState = 1,3,5,7
 #ifdef HAS_NCP5623
            if (rgb_found.type == ScanI2C::NCP5623) {
-                red = (colorState & 4) ? brightnessValues[brightnessIndex] : 0;          // Red enabled on colorState = 4,5,6,7
-                green = (colorState & 2) ? brightnessValues[brightnessIndex] : 0;        // Green enabled on colorState = 2,3,6,7
-                blue = (colorState & 1) ? (brightnessValues[brightnessIndex] * 1.5) : 0; // Blue enabled on colorState = 1,3,5,7
                rgb.setColor(red, green, blue);
-
-                if (ascending) { // fade in
-                    brightnessIndex++;
-                    if (brightnessIndex == (sizeof(brightnessValues) - 1)) {
-                        ascending = false;
-                    }
-                } else {
-                    brightnessIndex--; // fade out
+            }
+#endif
+#ifdef RGBLED_CA
+            analogWrite(RGBLED_RED, 255 - red); // CA type needs reverse logic
+            analogWrite(RGBLED_GREEN, 255 - green);
+            analogWrite(RGBLED_BLUE, 255 - blue);
+#elif defined(RGBLED_RED)
+            analogWrite(RGBLED_RED, red);
+            analogWrite(RGBLED_GREEN, green);
+            analogWrite(RGBLED_BLUE, blue);
+#endif
+#ifdef HAS_NEOPIXEL
+            pixels.fill(pixels.Color(red, green, blue), 0, NEOPIXEL_COUNT);
+            pixels.show();
+#endif
+#ifdef UNPHONE
+            unphone.rgb(red, green, blue);
+#endif
+            if (ascending) { // fade in
+                brightnessIndex++;
+                if (brightnessIndex == (sizeof(brightnessValues) - 1)) {
+                    ascending = false;
                }
-                if (brightnessIndex == 0) {
-                    ascending = true;
-                    colorState++; // next color
-                    if (colorState > 7) {
-                        colorState = 1;
-                    }
+            } else {
+                brightnessIndex--; // fade out
+            }
+            if (brightnessIndex == 0) {
+                ascending = true;
+                colorState++; // next color
+                if (colorState > 7) {
+                    colorState = 1;
                }
            }
 #endif
@@ -179,6 +207,9 @@ void ExternalNotificationModule::setExternalOn(uint8_t index)

    switch (index) {
    case 1:
+#ifdef UNPHONE
+        unphone.vibe(true); // the unPhone's vibration motor is on a i2c GPIO expander
+#endif
        if (moduleConfig.external_notification.output_vibra)
            digitalWrite(moduleConfig.external_notification.output_vibra, true);
        break;
@@ -197,6 +228,22 @@ void ExternalNotificationModule::setExternalOn(uint8_t index)
        rgb.setColor(red, green, blue);
    }
 #endif
+#ifdef RGBLED_CA
+    analogWrite(RGBLED_RED, 255 - red); // CA type needs reverse logic
+    analogWrite(RGBLED_GREEN, 255 - green);
+    analogWrite(RGBLED_BLUE, 255 - blue);
+#elif defined(RGBLED_RED)
+    analogWrite(RGBLED_RED, red);
+    analogWrite(RGBLED_GREEN, green);
+    analogWrite(RGBLED_BLUE, blue);
+#endif
+#ifdef HAS_NEOPIXEL
+    pixels.fill(pixels.Color(red, green, blue), 0, NEOPIXEL_COUNT);
+    pixels.show();
+#endif
+#ifdef UNPHONE
+    unphone.rgb(red, green, blue);
+#endif
 #ifdef T_WATCH_S3
    drv.go();
 #endif
@@ -209,6 +256,9 @@ void ExternalNotificationModule::setExternalOff(uint8_t index)

    switch (index) {
    case 1:
+#ifdef UNPHONE
+        unphone.vibe(false); // the unPhone's vibration motor is on a i2c GPIO expander
+#endif
        if (moduleConfig.external_notification.output_vibra)
            digitalWrite(moduleConfig.external_notification.output_vibra, false);
        break;
@@ -222,14 +272,33 @@ void ExternalNotificationModule::setExternalOff(uint8_t index)
        break;
    }

+#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE)
+    red = 0;
+    green = 0;
+    blue = 0;
 #ifdef HAS_NCP5623
    if (rgb_found.type == ScanI2C::NCP5623) {
-        red = 0;
-        green = 0;
-        blue = 0;
        rgb.setColor(red, green, blue);
    }
 #endif
+#ifdef RGBLED_CA
+    analogWrite(RGBLED_RED, 255 - red); // CA type needs reverse logic
+    analogWrite(RGBLED_GREEN, 255 - green);
+    analogWrite(RGBLED_BLUE, 255 - blue);
+#elif defined(RGBLED_RED)
+    analogWrite(RGBLED_RED, red);
+    analogWrite(RGBLED_GREEN, green);
+    analogWrite(RGBLED_BLUE, blue);
+#endif
+#ifdef HAS_NEOPIXEL
+    pixels.fill(pixels.Color(red, green, blue), 0, NEOPIXEL_COUNT);
+    pixels.show();
+#endif
+#ifdef UNPHONE
+    unphone.rgb(red, green, blue);
+#endif
+#endif
+
 #ifdef T_WATCH_S3
    drv.stop();
 #endif
@@ -328,6 +397,21 @@ ExternalNotificationModule::ExternalNotificationModule()
            rgb.begin();
            rgb.setCurrent(10);
        }
+#endif
+#ifdef RGBLED_RED
+        pinMode(RGBLED_RED, OUTPUT); // set up the RGB led pins
+        pinMode(RGBLED_GREEN, OUTPUT);
+        pinMode(RGBLED_BLUE, OUTPUT);
+#endif
+#ifdef RGBLED_CA
+        analogWrite(RGBLED_RED, 255);   // with a common anode type, logic is reversed
+        analogWrite(RGBLED_GREEN, 255); // so we want to initialise with lights off
+        analogWrite(RGBLED_BLUE, 255);
+#endif
+#ifdef HAS_NEOPIXEL
+        pixels.begin(); // Initialise the pixel(s)
+        pixels.clear(); // Set all pixel colors to 'off'
+        pixels.setBrightness(moduleConfig.ambient_lighting.current);
 #endif
    } else {
        LOG_INFO("External Notification Module Disabled\n");
@@ -509,4 +593,4 @@ void ExternalNotificationModule::handleSetRingtone(const char *from_msg)
    if (changed) {
        nodeDB->saveProto(rtttlConfigFile, meshtastic_RTTTLConfig_size, &meshtastic_RTTTLConfig_msg, &rtttlConfig);
    }
-}
+}
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -146,7 +146,7 @@ void setupModules()
            new AirQualityTelemetryModule();
        }
 #endif
-#if HAS_TELEMETRY && !defined(ARCH_PORTDUINO) && !MESHTASTIC_EXCLUDE_POWER_TELEMETRY
+#if HAS_TELEMETRY && !defined(ARCH_PORTDUINO) && !MESHTASTIC_EXCLUDE_POWER_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
        new PowerTelemetryModule();
 #endif
 #if (defined(ARCH_ESP32) || defined(ARCH_NRF52) || defined(ARCH_RP2040)) && !defined(CONFIG_IDF_TARGET_ESP32S2) &&               \
--- a/src/modules/NeighborInfoModule.cpp
+++ b/src/modules/NeighborInfoModule.cpp
@@ -116,9 +116,8 @@ Will be used for broadcast.
 */
 int32_t NeighborInfoModule::runOnce()
 {
-    bool requestReplies = false;
    if (airTime->isTxAllowedChannelUtil(true) && airTime->isTxAllowedAirUtil()) {
-        sendNeighborInfo(NODENUM_BROADCAST, requestReplies);
+        sendNeighborInfo(NODENUM_BROADCAST, false);
    }
    return Default::getConfiguredOrDefaultMs(moduleConfig.neighbor_info.update_interval, default_broadcast_interval_secs);
 }
--- a/src/modules/PositionModule.cpp
+++ b/src/modules/PositionModule.cpp
@@ -87,6 +87,23 @@ bool PositionModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
    return false; // Let others look at this message also if they want
 }

+void PositionModule::alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtastic_Position *p)
+{
+    // Phone position packets need to be truncated to the channel precision
+    if (nodeDB->getNodeNum() == getFrom(&mp) && (precision < 32 && precision > 0)) {
+        LOG_DEBUG("Truncating phone position to channel precision %i\n", precision);
+        p->latitude_i = p->latitude_i & (UINT32_MAX << (32 - precision));
+        p->longitude_i = p->longitude_i & (UINT32_MAX << (32 - precision));
+
+        // We want the imprecise position to be the middle of the possible location, not
+        p->latitude_i += (1 << (31 - precision));
+        p->longitude_i += (1 << (31 - precision));
+
+        mp.decoded.payload.size =
+            pb_encode_to_bytes(mp.decoded.payload.bytes, sizeof(mp.decoded.payload.bytes), &meshtastic_Position_msg, p);
+    }
+}
+
 void PositionModule::trySetRtc(meshtastic_Position p, bool isLocal)
 {
    struct timeval tv;
@@ -326,7 +343,7 @@ int32_t PositionModule::runOnce()
            // The minimum time (in seconds) that would pass before we are able to send a new position packet.

            auto smartPosition = getDistanceTraveledSinceLastSend(node->position);
-            uint32_t msSinceLastSend = now - lastGpsSend;
+            msSinceLastSend = now - lastGpsSend;

            if (smartPosition.hasTraveledOverThreshold &&
                Throttle::execute(
--- a/src/modules/PositionModule.h
+++ b/src/modules/PositionModule.h
@@ -42,6 +42,8 @@ class PositionModule : public ProtobufModule<meshtastic_Position>, private concu
    */
    virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Position *p) override;

+    virtual void alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtastic_Position *p) override;
+
    /** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
     * so that subclasses can (optionally) send a response back to the original sender.  */
    virtual meshtastic_MeshPacket *allocReply() override;
--- a/src/modules/Telemetry/AirQualityTelemetry.cpp
+++ b/src/modules/Telemetry/AirQualityTelemetry.cpp
@@ -1,12 +1,15 @@
-#include "AirQualityTelemetry.h"
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "AirQualityTelemetry.h"
 #include "Default.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
 #include "RTC.h"
 #include "Router.h"
-#include "configuration.h"
 #include "main.h"

 int32_t AirQualityTelemetryModule::runOnce()
@@ -130,3 +133,5 @@ bool AirQualityTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
    }
    return true;
 }
+
+#endif
--- a/src/modules/Telemetry/AirQualityTelemetry.h
+++ b/src/modules/Telemetry/AirQualityTelemetry.h
@@ -1,3 +1,7 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #pragma once
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "Adafruit_PM25AQI.h"
@@ -35,3 +39,5 @@ class AirQualityTelemetryModule : private concurrency::OSThread, public Protobuf
    uint32_t sendToPhoneIntervalMs = SECONDS_IN_MINUTE * 1000; // Send to phone every minute
    uint32_t lastSentToMesh = 0;
 };
+
+#endif
--- a/src/modules/Telemetry/EnvironmentTelemetry.cpp
+++ b/src/modules/Telemetry/EnvironmentTelemetry.cpp
@@ -1,12 +1,15 @@
-#include "EnvironmentTelemetry.h"
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "Default.h"
+#include "EnvironmentTelemetry.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
 #include "RTC.h"
 #include "Router.h"
-#include "configuration.h"
 #include "main.h"
 #include "power.h"
 #include "sleep.h"
@@ -21,6 +24,7 @@
 #include "Sensor/BMP280Sensor.h"
 #include "Sensor/LPS22HBSensor.h"
 #include "Sensor/MCP9808Sensor.h"
+#include "Sensor/RCWL9620Sensor.h"
 #include "Sensor/SHT31Sensor.h"
 #include "Sensor/SHTC3Sensor.h"
 #include "Sensor/VEML7700Sensor.h"
@@ -34,6 +38,7 @@ SHTC3Sensor shtc3Sensor;
 LPS22HBSensor lps22hbSensor;
 SHT31Sensor sht31Sensor;
 VEML7700Sensor veml7700Sensor;
+RCWL9620Sensor rcwl9620Sensor;

 #define FAILED_STATE_SENSOR_READ_MULTIPLIER 10
 #define DISPLAY_RECEIVEID_MEASUREMENTS_ON_SCREEN true
@@ -94,6 +99,8 @@ int32_t EnvironmentTelemetryModule::runOnce()
                result = ina260Sensor.runOnce();
            if (veml7700Sensor.hasSensor())
                result = veml7700Sensor.runOnce();
+            if (rcwl9620Sensor.hasSensor())
+                result = rcwl9620Sensor.runOnce();
        }
        return result;
    } else {
@@ -148,45 +155,56 @@ uint32_t GetTimeSinceMeshPacket(const meshtastic_MeshPacket *mp)
 void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
    display->setTextAlignment(TEXT_ALIGN_LEFT);
-    display->setFont(FONT_MEDIUM);
-    display->drawString(x, y, "Environment");
+    display->setFont(FONT_SMALL);
+
    if (lastMeasurementPacket == nullptr) {
-        display->setFont(FONT_SMALL);
-        display->drawString(x, y += fontHeight(FONT_MEDIUM), "No measurement");
+        // If there's no valid packet, display "Environment"
+        display->drawString(x, y, "Environment");
+        display->drawString(x, y += fontHeight(FONT_SMALL), "No measurement");
        return;
    }

+    // Decode the last measurement packet
    meshtastic_Telemetry lastMeasurement;
-
    uint32_t agoSecs = GetTimeSinceMeshPacket(lastMeasurementPacket);
    const char *lastSender = getSenderShortName(*lastMeasurementPacket);

    auto &p = lastMeasurementPacket->decoded;
    if (!pb_decode_from_bytes(p.payload.bytes, p.payload.size, &meshtastic_Telemetry_msg, &lastMeasurement)) {
-        display->setFont(FONT_SMALL);
-        display->drawString(x, y += fontHeight(FONT_MEDIUM), "Measurement Error");
+        display->drawString(x, y, "Measurement Error");
        LOG_ERROR("Unable to decode last packet");
        return;
    }

-    display->setFont(FONT_SMALL);
+    // Display "Env. From: ..." on its own
+    display->drawString(x, y, "Env. From: " + String(lastSender) + "(" + String(agoSecs) + "s)");
+
    String last_temp = String(lastMeasurement.variant.environment_metrics.temperature, 0) + "°C";
    if (moduleConfig.telemetry.environment_display_fahrenheit) {
        last_temp = String(CelsiusToFahrenheit(lastMeasurement.variant.environment_metrics.temperature), 0) + "°F";
    }
-    display->drawString(x, y += fontHeight(FONT_MEDIUM) - 2, "From: " + String(lastSender) + "(" + String(agoSecs) + "s)");
-    display->drawString(x, y += fontHeight(FONT_SMALL) - 2,
+
+    // Continue with the remaining details
+    display->drawString(x, y += fontHeight(FONT_SMALL),
                        "Temp/Hum: " + last_temp + " / " +
                            String(lastMeasurement.variant.environment_metrics.relative_humidity, 0) + "%");
-    if (lastMeasurement.variant.environment_metrics.barometric_pressure != 0)
+
+    if (lastMeasurement.variant.environment_metrics.barometric_pressure != 0) {
        display->drawString(x, y += fontHeight(FONT_SMALL),
                            "Press: " + String(lastMeasurement.variant.environment_metrics.barometric_pressure, 0) + "hPA");
-    if (lastMeasurement.variant.environment_metrics.voltage != 0)
+    }
+
+    if (lastMeasurement.variant.environment_metrics.voltage != 0) {
        display->drawString(x, y += fontHeight(FONT_SMALL),
                            "Volt/Cur: " + String(lastMeasurement.variant.environment_metrics.voltage, 0) + "V / " +
                                String(lastMeasurement.variant.environment_metrics.current, 0) + "mA");
-    if (lastMeasurement.variant.environment_metrics.iaq != 0)
+    }
+    if (lastMeasurement.variant.environment_metrics.iaq != 0) {
        display->drawString(x, y += fontHeight(FONT_SMALL), "IAQ: " + String(lastMeasurement.variant.environment_metrics.iaq));
+    }
+    if (lastMeasurement.variant.environment_metrics.distance != 0)
+        display->drawString(x, y += fontHeight(FONT_SMALL),
+                            "Water Level: " + String(lastMeasurement.variant.environment_metrics.distance, 0) + "mm");
 }

 bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
@@ -196,11 +214,14 @@ bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPac
        const char *sender = getSenderShortName(mp);

        LOG_INFO("(Received from %s): barometric_pressure=%f, current=%f, gas_resistance=%f, relative_humidity=%f, "
-                 "temperature=%f, voltage=%f, lux=%f, iaq=%i\n",
+                 "temperature=%f, lux=%f\n",
                 sender, t->variant.environment_metrics.barometric_pressure, t->variant.environment_metrics.current,
                 t->variant.environment_metrics.gas_resistance, t->variant.environment_metrics.relative_humidity,
-                 t->variant.environment_metrics.temperature, t->variant.environment_metrics.voltage,
-                 t->variant.environment_metrics.lux, t->variant.environment_metrics.iaq);
+                 t->variant.environment_metrics.temperature, t->variant.environment_metrics.lux);
+        LOG_INFO("(Received from %s): voltage=%f, IAQ=%d, distance=%f\n", sender, t->variant.environment_metrics.voltage,
+                 t->variant.environment_metrics.iaq, t->variant.environment_metrics.distance);
+
+#endif
 #endif
        // release previous packet before occupying a new spot
        if (lastMeasurementPacket != nullptr)
@@ -253,7 +274,7 @@ bool EnvironmentTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
        hasSensor = true;
        }
    if (ina219Sensor.hasSensor()) {
-        valid = ina219Sensor.getMetrics(&m);
+        valid = valid && ina219Sensor.getMetrics(&m);
        hasSensor = true;
        }
    if (ina260Sensor.hasSensor()) {
@@ -264,16 +285,20 @@ bool EnvironmentTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
        valid = valid && veml7700Sensor.getMetrics(&m);
        hasSensor = true;
        }
-
+    if (rcwl9620Sensor.hasSensor()){
+        valid = valid && rcwl9620Sensor.getMetrics(&m);
+        hasSensor = true;
+    }
    valid = valid && hasSensor;

    if (valid) {
        LOG_INFO("(Sending): barometric_pressure=%f, current=%f, gas_resistance=%f, relative_humidity=%f, temperature=%f, "
-                 "voltage=%f, lux=%f, iaq=%i\n",
+                 "lux=%f\n",
                 m.variant.environment_metrics.barometric_pressure, m.variant.environment_metrics.current,
                 m.variant.environment_metrics.gas_resistance, m.variant.environment_metrics.relative_humidity,
-                 m.variant.environment_metrics.temperature, m.variant.environment_metrics.voltage,
-                 m.variant.environment_metrics.lux, m.variant.environment_metrics.iaq);
+                 m.variant.environment_metrics.temperature, m.variant.environment_metrics.lux);
+        LOG_INFO("(Sending): voltage=%f, IAQ=%d, distance=%f\n", m.variant.environment_metrics.voltage,
+                 m.variant.environment_metrics.iaq, m.variant.environment_metrics.distance);

        sensor_read_error_count = 0;

@@ -304,4 +329,6 @@ bool EnvironmentTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
        }
    }
    return valid;
-}
+}
+
+#endif
--- a/src/modules/Telemetry/EnvironmentTelemetry.h
+++ b/src/modules/Telemetry/EnvironmentTelemetry.h
@@ -1,3 +1,7 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #pragma once
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "NodeDB.h"
@@ -42,3 +46,5 @@ class EnvironmentTelemetryModule : private concurrency::OSThread, public Protobu
    uint32_t lastSentToPhone = 0;
    uint32_t sensor_read_error_count = 0;
 };
+
+#endif
--- a/src/modules/Telemetry/PowerTelemetry.cpp
+++ b/src/modules/Telemetry/PowerTelemetry.cpp
@@ -1,12 +1,15 @@
-#include "PowerTelemetry.h"
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "Default.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
+#include "PowerTelemetry.h"
 #include "RTC.h"
 #include "Router.h"
-#include "configuration.h"
 #include "main.h"
 #include "power.h"
 #include "sleep.h"
@@ -217,4 +220,6 @@ bool PowerTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
        }
    }
    return valid;
-}
+}
+
+#endif
--- a/src/modules/Telemetry/PowerTelemetry.h
+++ b/src/modules/Telemetry/PowerTelemetry.h
@@ -1,4 +1,9 @@
 #pragma once
+
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "NodeDB.h"
 #include "ProtobufModule.h"
@@ -41,3 +46,5 @@ class PowerTelemetryModule : private concurrency::OSThread, public ProtobufModul
    uint32_t lastSentToPhone = 0;
    uint32_t sensor_read_error_count = 0;
 };
+
+#endif
--- a/src/modules/Telemetry/Sensor/BME280Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/BME280Sensor.cpp
@@ -1,7 +1,10 @@
-#include "BME280Sensor.h"
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "TelemetrySensor.h"
 #include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "BME280Sensor.h"
+#include "TelemetrySensor.h"
 #include <Adafruit_BME280.h>
 #include <typeinfo>

@@ -35,4 +38,5 @@ bool BME280Sensor::getMetrics(meshtastic_Telemetry *measurement)
    measurement->variant.environment_metrics.barometric_pressure = bme280.readPressure() / 100.0F;

    return true;
-}
+}
+#endif
--- a/src/modules/Telemetry/Sensor/BME280Sensor.h
+++ b/src/modules/Telemetry/Sensor/BME280Sensor.h
@@ -1,3 +1,7 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_BME280.h>
@@ -14,4 +18,6 @@ class BME280Sensor : public TelemetrySensor
    BME280Sensor();
    virtual int32_t runOnce() override;
    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
-};
+};
+
+#endif
--- a/src/modules/Telemetry/Sensor/BME680Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/BME680Sensor.cpp
@@ -1,8 +1,11 @@
-#include "BME680Sensor.h"
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "BME680Sensor.h"
 #include "FSCommon.h"
 #include "TelemetrySensor.h"
-#include "configuration.h"

 BME680Sensor::BME680Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_BME680, "BME680") {}

@@ -134,3 +137,5 @@ void BME680Sensor::checkStatus(String functionName)
    else if (bme680.sensor.status > BME68X_OK)
        LOG_WARN("%s BME68X code: %s\n", functionName.c_str(), String(bme680.sensor.status).c_str());
 }
+
+#endif
--- a/src/modules/Telemetry/Sensor/BME680Sensor.h
+++ b/src/modules/Telemetry/Sensor/BME680Sensor.h
@@ -1,3 +1,7 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <bsec2.h>
@@ -35,4 +39,6 @@ class BME680Sensor : public TelemetrySensor
    int32_t runTrigger();
    virtual int32_t runOnce() override;
    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
-};
+};
+
+#endif
--- a/src/modules/Telemetry/Sensor/BMP085Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/BMP085Sensor.cpp
@@ -1,7 +1,10 @@
-#include "BMP085Sensor.h"
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "TelemetrySensor.h"
 #include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "BMP085Sensor.h"
+#include "TelemetrySensor.h"
 #include <Adafruit_BMP085.h>
 #include <typeinfo>

@@ -29,3 +32,5 @@ bool BMP085Sensor::getMetrics(meshtastic_Telemetry *measurement)

    return true;
 }
+
+#endif
--- a/src/modules/Telemetry/Sensor/BMP085Sensor.h
+++ b/src/modules/Telemetry/Sensor/BMP085Sensor.h
@@ -1,3 +1,7 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_BMP085.h>
@@ -14,4 +18,6 @@ class BMP085Sensor : public TelemetrySensor
    BMP085Sensor();
    virtual int32_t runOnce() override;
    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
-};
+};
+
+#endif
--- a/src/modules/Telemetry/Sensor/BMP280Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/BMP280Sensor.cpp
@@ -1,7 +1,10 @@
-#include "BMP280Sensor.h"
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "TelemetrySensor.h"
 #include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "BMP280Sensor.h"
+#include "TelemetrySensor.h"
 #include <Adafruit_BMP280.h>
 #include <typeinfo>

@@ -35,3 +38,5 @@ bool BMP280Sensor::getMetrics(meshtastic_Telemetry *measurement)

    return true;
 }
+
+#endif
--- a/src/modules/Telemetry/Sensor/BMP280Sensor.h
+++ b/src/modules/Telemetry/Sensor/BMP280Sensor.h
@@ -1,3 +1,7 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_BMP280.h>
@@ -14,4 +18,6 @@ class BMP280Sensor : public TelemetrySensor
    BMP280Sensor();
    virtual int32_t runOnce() override;
    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
-};
+};
+
+#endif
--- a/src/modules/Telemetry/Sensor/INA219Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/INA219Sensor.cpp
@@ -1,7 +1,10 @@
-#include "INA219Sensor.h"
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "TelemetrySensor.h"
 #include "configuration.h"
+
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "INA219Sensor.h"
+#include "TelemetrySensor.h"
 #include <Adafruit_INA219.h>

 #ifndef INA219_MULTIPLIER
@@ -37,4 +40,6 @@ bool INA219Sensor::getMetrics(meshtastic_Telemetry *measurement)
 uint16_t INA219Sensor::getBusVoltageMv()
 {
    return lround(ina219.getBusVoltage_V() * 1000);
-}
+}
+
+#endif
--- a/src/modules/Telemetry/Sensor/INA219Sensor.h
+++ b/src/modules/Telemetry/Sensor/INA219Sensor.h
@@ -1,3 +1,7 @@
+#include "configuration.h"
+
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include "VoltageSensor.h"
@@ -16,4 +20,6 @@ class INA219Sensor : public TelemetrySensor, VoltageSensor
    virtual int32_t runOnce() override;
    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
    virtual uint16_t getBusVoltageMv() override;
-};
+};
+
+#endif
--- a/src/modules/Telemetry/Sensor/INA260Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/INA260Sensor.cpp
@@ -1,7 +1,10 @@
-#include "INA260Sensor.h"
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "TelemetrySensor.h"
 #include "configuration.h"
+
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "INA260Sensor.h"
+#include "TelemetrySensor.h"
 #include <Adafruit_INA260.h>

 INA260Sensor::INA260Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_INA260, "INA260") {}
@@ -32,4 +35,6 @@ bool INA260Sensor::getMetrics(meshtastic_Telemetry *measurement)
 uint16_t INA260Sensor::getBusVoltageMv()
 {
    return lround(ina260.readBusVoltage());
-}
+}
+
+#endif
--- a/src/modules/Telemetry/Sensor/INA260Sensor.h
+++ b/src/modules/Telemetry/Sensor/INA260Sensor.h
@@ -1,3 +1,7 @@
+#include "configuration.h"
+
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include "VoltageSensor.h"
@@ -16,4 +20,6 @@ class INA260Sensor : public TelemetrySensor, VoltageSensor
    virtual int32_t runOnce() override;
    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
    virtual uint16_t getBusVoltageMv() override;
-};
+};
+
+#endif
--- a/src/modules/Telemetry/Sensor/INA3221Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/INA3221Sensor.cpp
@@ -1,7 +1,10 @@
-#include "INA3221Sensor.h"
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "TelemetrySensor.h"
 #include "configuration.h"
+
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "INA3221Sensor.h"
+#include "TelemetrySensor.h"
 #include <INA3221.h>

 INA3221Sensor::INA3221Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_INA3221, "INA3221"){};
@@ -41,4 +44,6 @@ bool INA3221Sensor::getMetrics(meshtastic_Telemetry *measurement)
 uint16_t INA3221Sensor::getBusVoltageMv()
 {
    return lround(ina3221.getVoltage(INA3221_CH1) * 1000);
-}
+}
+
+#endif
--- a/src/modules/Telemetry/Sensor/INA3221Sensor.h
+++ b/src/modules/Telemetry/Sensor/INA3221Sensor.h
@@ -1,3 +1,7 @@
+#include "configuration.h"
+
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include "VoltageSensor.h"
@@ -16,4 +20,6 @@ class INA3221Sensor : public TelemetrySensor, VoltageSensor
    int32_t runOnce() override;
    bool getMetrics(meshtastic_Telemetry *measurement) override;
    virtual uint16_t getBusVoltageMv() override;
-};
+};
+
+#endif
--- a/src/modules/Telemetry/Sensor/LPS22HBSensor.cpp
+++ b/src/modules/Telemetry/Sensor/LPS22HBSensor.cpp
@@ -1,7 +1,10 @@
-#include "LPS22HBSensor.h"
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "TelemetrySensor.h"
 #include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "LPS22HBSensor.h"
+#include "TelemetrySensor.h"
 #include <Adafruit_LPS2X.h>
 #include <Adafruit_Sensor.h>

@@ -32,4 +35,6 @@ bool LPS22HBSensor::getMetrics(meshtastic_Telemetry *measurement)
    measurement->variant.environment_metrics.barometric_pressure = pressure.pressure;

    return true;
-}
+}
+
+#endif
--- a/src/modules/Telemetry/Sensor/LPS22HBSensor.h
+++ b/src/modules/Telemetry/Sensor/LPS22HBSensor.h
@@ -1,3 +1,7 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_LPS2X.h>
@@ -15,4 +19,6 @@ class LPS22HBSensor : public TelemetrySensor
    LPS22HBSensor();
    virtual int32_t runOnce() override;
    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
-};
+};
+
+#endif
--- a/src/modules/Telemetry/Sensor/MCP9808Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/MCP9808Sensor.cpp
@@ -1,7 +1,10 @@
-#include "MCP9808Sensor.h"
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "TelemetrySensor.h"
 #include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "MCP9808Sensor.h"
+#include "TelemetrySensor.h"
 #include <Adafruit_MCP9808.h>

 MCP9808Sensor::MCP9808Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_MCP9808, "MCP9808") {}
@@ -26,4 +29,6 @@ bool MCP9808Sensor::getMetrics(meshtastic_Telemetry *measurement)
    LOG_DEBUG("MCP9808Sensor::getMetrics\n");
    measurement->variant.environment_metrics.temperature = mcp9808.readTempC();
    return true;
-}
+}
+
+#endif
--- a/src/modules/Telemetry/Sensor/MCP9808Sensor.h
+++ b/src/modules/Telemetry/Sensor/MCP9808Sensor.h
@@ -1,3 +1,7 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_MCP9808.h>
@@ -14,4 +18,6 @@ class MCP9808Sensor : public TelemetrySensor
    MCP9808Sensor();
    virtual int32_t runOnce() override;
    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
-};
+};
+
+#endif
--- a/src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp
@@ -0,0 +1,65 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "RCWL9620Sensor.h"
+#include "TelemetrySensor.h"
+
+RCWL9620Sensor::RCWL9620Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_RCWL9620, "RCWL9620") {}
+
+int32_t RCWL9620Sensor::runOnce()
+{
+    LOG_INFO("Init sensor: %s\n", sensorName);
+    if (!hasSensor()) {
+        return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
+    }
+    status = 1;
+    begin(nodeTelemetrySensorsMap[sensorType].second, nodeTelemetrySensorsMap[sensorType].first);
+    return initI2CSensor();
+}
+
+void RCWL9620Sensor::setup() {}
+
+bool RCWL9620Sensor::getMetrics(meshtastic_Telemetry *measurement)
+{
+    LOG_DEBUG("RCWL9620Sensor::getMetrics\n");
+    measurement->variant.environment_metrics.distance = getDistance();
+    return true;
+}
+
+void RCWL9620Sensor::begin(TwoWire *wire, uint8_t addr, uint8_t sda, uint8_t scl, uint32_t speed)
+{
+    _wire = wire;
+    _addr = addr;
+    _sda = sda;
+    _scl = scl;
+    _speed = speed;
+    _wire->begin();
+}
+
+float RCWL9620Sensor::getDistance()
+{
+    uint32_t data;
+    _wire->beginTransmission(_addr); // Transfer data to addr.
+    _wire->write(0x01);
+    _wire->endTransmission(); // Stop data transmission with the Ultrasonic
+                              // Unit.
+
+    _wire->requestFrom(_addr,
+                       (uint8_t)3); // Request 3 bytes from Ultrasonic Unit.
+
+    data = _wire->read();
+    data <<= 8;
+    data |= _wire->read();
+    data <<= 8;
+    data |= _wire->read();
+    float Distance = float(data) / 1000;
+    if (Distance > 4500.00) {
+        return 4500.00;
+    } else {
+        return Distance;
+    }
+}
+
+#endif
--- a/src/modules/Telemetry/Sensor/RCWL9620Sensor.h
+++ b/src/modules/Telemetry/Sensor/RCWL9620Sensor.h
@@ -0,0 +1,29 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include <Wire.h>
+
+class RCWL9620Sensor : public TelemetrySensor
+{
+  private:
+    uint8_t _addr = 0x57;
+    TwoWire *_wire = &Wire;
+    uint8_t _scl = -1;
+    uint8_t _sda = -1;
+    uint32_t _speed = 200000UL;
+
+  protected:
+    virtual void setup() override;
+    void begin(TwoWire *wire = &Wire, uint8_t addr = 0x57, uint8_t sda = -1, uint8_t scl = -1, uint32_t speed = 200000UL);
+    float getDistance();
+
+  public:
+    RCWL9620Sensor();
+    virtual int32_t runOnce() override;
+    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
+};
+
+#endif
--- a/src/modules/Telemetry/Sensor/SHT31Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/SHT31Sensor.cpp
@@ -1,7 +1,10 @@
-#include "SHT31Sensor.h"
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "TelemetrySensor.h"
 #include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "SHT31Sensor.h"
+#include "TelemetrySensor.h"
 #include <Adafruit_SHT31.h>

 SHT31Sensor::SHT31Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHT31, "SHT31") {}
@@ -29,3 +32,5 @@ bool SHT31Sensor::getMetrics(meshtastic_Telemetry *measurement)

    return true;
 }
+
+#endif
--- a/src/modules/Telemetry/Sensor/SHT31Sensor.h
+++ b/src/modules/Telemetry/Sensor/SHT31Sensor.h
@@ -1,3 +1,7 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_SHT31.h>
@@ -15,3 +19,5 @@ class SHT31Sensor : public TelemetrySensor
    virtual int32_t runOnce() override;
    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
 };
+
+#endif
--- a/src/modules/Telemetry/Sensor/SHTC3Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/SHTC3Sensor.cpp
@@ -1,7 +1,10 @@
-#include "SHTC3Sensor.h"
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "TelemetrySensor.h"
 #include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "SHTC3Sensor.h"
+#include "TelemetrySensor.h"
 #include <Adafruit_SHTC3.h>

 SHTC3Sensor::SHTC3Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHTC3, "SHTC3") {}
@@ -30,4 +33,6 @@ bool SHTC3Sensor::getMetrics(meshtastic_Telemetry *measurement)
    measurement->variant.environment_metrics.relative_humidity = humidity.relative_humidity;

    return true;
-}
+}
+
+#endif
--- a/src/modules/Telemetry/Sensor/SHTC3Sensor.h
+++ b/src/modules/Telemetry/Sensor/SHTC3Sensor.h
@@ -1,3 +1,7 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_SHTC3.h>
@@ -14,4 +18,6 @@ class SHTC3Sensor : public TelemetrySensor
    SHTC3Sensor();
    virtual int32_t runOnce() override;
    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
-};
+};
+
+#endif
--- a/src/modules/Telemetry/Sensor/TelemetrySensor.cpp
+++ b/src/modules/Telemetry/Sensor/TelemetrySensor.cpp
@@ -1,4 +1,10 @@
-#include "TelemetrySensor.h"
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "NodeDB.h"
+#include "TelemetrySensor.h"
 #include "main.h"
+
+#endif
--- a/src/modules/Telemetry/Sensor/TelemetrySensor.h
+++ b/src/modules/Telemetry/Sensor/TelemetrySensor.h
@@ -1,3 +1,7 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #pragma once
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "NodeDB.h"
@@ -45,4 +49,6 @@ class TelemetrySensor
    virtual bool isRunning() { return status > 0; }

    virtual bool getMetrics(meshtastic_Telemetry *measurement) = 0;
-};
+};
+
+#endif
--- a/src/modules/Telemetry/Sensor/VoltageSensor.h
+++ b/src/modules/Telemetry/Sensor/VoltageSensor.h
@@ -1,7 +1,13 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #pragma once

 class VoltageSensor
 {
  public:
    virtual uint16_t getBusVoltageMv() = 0;
-};
+};
+
+#endif
--- a/src/modules/Telemetry/Sensor/bme680_iaq_33v_3s_4d/bsec_iaq.c
+++ b/src/modules/Telemetry/Sensor/bme680_iaq_33v_3s_4d/bsec_iaq.c
@@ -1,3 +1,5 @@
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include "bsec_iaq.h"

 const uint8_t bsec_config_iaq[1974] = {
@@ -80,3 +82,5 @@ const uint8_t bsec_config_iaq[1974] = {
    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 44,  1,   0,   5,   10,  5,
    0,   2,   0,   10,  0,   30,  0,   5,   0,   5,   0,   5,   0,   5,   0,   5,   0,   5,   0,   64,  1,   100, 0,   100, 0,
    100, 0,   200, 0,   200, 0,   200, 0,   64,  1,   64,  1,   64,  1,   10,  0,   0,   0,   0,   0,   21,  122, 0,   0};
+
+#endif
--- a/src/modules/Telemetry/Sensor/bme680_iaq_33v_3s_4d/bsec_iaq.h
+++ b/src/modules/Telemetry/Sensor/bme680_iaq_33v_3s_4d/bsec_iaq.h
@@ -1,3 +1,7 @@
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
 #include <stdint.h>

 extern const uint8_t bsec_config_iaq[1974];
+
+#endif
--- a/src/mqtt/JSONValue.cpp
+++ b/src/mqtt/JSONValue.cpp
@@ -368,9 +368,9 @@ JSONValue::JSONValue(int m_integer_value)
 *
 * @access public
 *
- * @param uint m_integer_value The number to use as the value
+ * @param unsigned int m_integer_value The number to use as the value
 */
-JSONValue::JSONValue(uint m_integer_value)
+JSONValue::JSONValue(unsigned int m_integer_value)
 {
    type = JSONType_Number;
    number_value = (double)m_integer_value;
--- a/src/mqtt/JSONValue.h
+++ b/src/mqtt/JSONValue.h
@@ -45,7 +45,7 @@ class JSONValue
    JSONValue(bool m_bool_value);
    JSONValue(double m_number_value);
    JSONValue(int m_integer_value);
-    JSONValue(uint m_integer_value);
+    JSONValue(unsigned int m_integer_value);
    JSONValue(const JSONArray &m_array_value);
    JSONValue(const JSONObject &m_object_value);
    JSONValue(const JSONValue &m_source);
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -54,9 +54,9 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
            JSONObject json;
            json = json_value->AsObject();

-            // parse the channel name from the topic string by looking for "json/"
-            const char *jsonSlash = "json/";
-            char *ptr = strstr(topic, jsonSlash) + sizeof(jsonSlash) + 1; // set pointer to after "json/"
+            // parse the channel name from the topic string
+            // the topic has been checked above for having jsonTopic prefix, so just move past it
+            char *ptr = topic + jsonTopic.length();
            ptr = strtok(ptr, "/") ? strtok(ptr, "/") : ptr; // if another "/" was added, parse string up to that character
            meshtastic_Channel sendChannel = channels.getByName(ptr);
            // We allow downlink JSON packets only on a channel named "mqtt"
@@ -76,6 +76,8 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
                            p->channel = json["channel"]->AsNumber();
                        if (json.find("to") != json.end() && json["to"]->IsNumber())
                            p->to = json["to"]->AsNumber();
+                        if (json.find("hopLimit") != json.end() && json["hopLimit"]->IsNumber())
+                            p->hop_limit = json["hopLimit"]->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();
@@ -105,6 +107,8 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
                            p->channel = json["channel"]->AsNumber();
                        if (json.find("to") != json.end() && json["to"]->IsNumber())
                            p->to = json["to"]->AsNumber();
+                        if (json.find("hopLimit") != json.end() && json["hopLimit"]->IsNumber())
+                            p->hop_limit = json["hopLimit"]->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
@@ -548,7 +552,10 @@ void MQTT::perhapsReportToMap()
    } else {
        if (map_position_precision == 0 || (localPosition.latitude_i == 0 && localPosition.longitude_i == 0)) {
            last_report_to_map = millis();
-            LOG_WARN("MQTT Map reporting is enabled, but precision is 0 or no position available.\n");
+            if (map_position_precision == 0)
+                LOG_WARN("MQTT Map reporting is enabled, but precision is 0\n");
+            if (localPosition.latitude_i == 0 && localPosition.longitude_i == 0)
+                LOG_WARN("MQTT Map reporting is enabled, but no position available.\n");
            return;
        }

@@ -652,11 +659,11 @@ std::string MQTT::meshPacketToJson(meshtastic_MeshPacket *mp)
            if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_Telemetry_msg, &scratch)) {
                decoded = &scratch;
                if (decoded->which_variant == meshtastic_Telemetry_device_metrics_tag) {
-                    msgPayload["battery_level"] = new JSONValue((uint)decoded->variant.device_metrics.battery_level);
+                    msgPayload["battery_level"] = new JSONValue((unsigned int)decoded->variant.device_metrics.battery_level);
                    msgPayload["voltage"] = new JSONValue(decoded->variant.device_metrics.voltage);
                    msgPayload["channel_utilization"] = new JSONValue(decoded->variant.device_metrics.channel_utilization);
                    msgPayload["air_util_tx"] = new JSONValue(decoded->variant.device_metrics.air_util_tx);
-                    msgPayload["uptime_seconds"] = new JSONValue((uint)decoded->variant.device_metrics.uptime_seconds);
+                    msgPayload["uptime_seconds"] = new JSONValue((unsigned int)decoded->variant.device_metrics.uptime_seconds);
                } else if (decoded->which_variant == meshtastic_Telemetry_environment_metrics_tag) {
                    msgPayload["temperature"] = new JSONValue(decoded->variant.environment_metrics.temperature);
                    msgPayload["relative_humidity"] = new JSONValue(decoded->variant.environment_metrics.relative_humidity);
@@ -706,10 +713,10 @@ std::string MQTT::meshPacketToJson(meshtastic_MeshPacket *mp)
            if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_Position_msg, &scratch)) {
                decoded = &scratch;
                if ((int)decoded->time) {
-                    msgPayload["time"] = new JSONValue((uint)decoded->time);
+                    msgPayload["time"] = new JSONValue((unsigned int)decoded->time);
                }
                if ((int)decoded->timestamp) {
-                    msgPayload["timestamp"] = new JSONValue((uint)decoded->timestamp);
+                    msgPayload["timestamp"] = new JSONValue((unsigned int)decoded->timestamp);
                }
                msgPayload["latitude_i"] = new JSONValue((int)decoded->latitude_i);
                msgPayload["longitude_i"] = new JSONValue((int)decoded->longitude_i);
@@ -717,13 +724,13 @@ std::string MQTT::meshPacketToJson(meshtastic_MeshPacket *mp)
                    msgPayload["altitude"] = new JSONValue((int)decoded->altitude);
                }
                if ((int)decoded->ground_speed) {
-                    msgPayload["ground_speed"] = new JSONValue((uint)decoded->ground_speed);
+                    msgPayload["ground_speed"] = new JSONValue((unsigned int)decoded->ground_speed);
                }
                if (int(decoded->ground_track)) {
-                    msgPayload["ground_track"] = new JSONValue((uint)decoded->ground_track);
+                    msgPayload["ground_track"] = new JSONValue((unsigned int)decoded->ground_track);
                }
                if (int(decoded->sats_in_view)) {
-                    msgPayload["sats_in_view"] = new JSONValue((uint)decoded->sats_in_view);
+                    msgPayload["sats_in_view"] = new JSONValue((unsigned int)decoded->sats_in_view);
                }
                if ((int)decoded->PDOP) {
                    msgPayload["PDOP"] = new JSONValue((int)decoded->PDOP);
@@ -750,11 +757,11 @@ std::string MQTT::meshPacketToJson(meshtastic_MeshPacket *mp)
            memset(&scratch, 0, sizeof(scratch));
            if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_Waypoint_msg, &scratch)) {
                decoded = &scratch;
-                msgPayload["id"] = new JSONValue((uint)decoded->id);
+                msgPayload["id"] = new JSONValue((unsigned int)decoded->id);
                msgPayload["name"] = new JSONValue(decoded->name);
                msgPayload["description"] = new JSONValue(decoded->description);
-                msgPayload["expire"] = new JSONValue((uint)decoded->expire);
-                msgPayload["locked_to"] = new JSONValue((uint)decoded->locked_to);
+                msgPayload["expire"] = new JSONValue((unsigned int)decoded->expire);
+                msgPayload["locked_to"] = new JSONValue((unsigned int)decoded->locked_to);
                msgPayload["latitude_i"] = new JSONValue((int)decoded->latitude_i);
                msgPayload["longitude_i"] = new JSONValue((int)decoded->longitude_i);
                jsonObj["payload"] = new JSONValue(msgPayload);
@@ -771,14 +778,14 @@ std::string MQTT::meshPacketToJson(meshtastic_MeshPacket *mp)
            if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_NeighborInfo_msg,
                                     &scratch)) {
                decoded = &scratch;
-                msgPayload["node_id"] = new JSONValue((uint)decoded->node_id);
-                msgPayload["node_broadcast_interval_secs"] = new JSONValue((uint)decoded->node_broadcast_interval_secs);
-                msgPayload["last_sent_by_id"] = new JSONValue((uint)decoded->last_sent_by_id);
+                msgPayload["node_id"] = new JSONValue((unsigned int)decoded->node_id);
+                msgPayload["node_broadcast_interval_secs"] = new JSONValue((unsigned int)decoded->node_broadcast_interval_secs);
+                msgPayload["last_sent_by_id"] = new JSONValue((unsigned int)decoded->last_sent_by_id);
                msgPayload["neighbors_count"] = new JSONValue(decoded->neighbors_count);
                JSONArray neighbors;
                for (uint8_t i = 0; i < decoded->neighbors_count; i++) {
                    JSONObject neighborObj;
-                    neighborObj["node_id"] = new JSONValue((uint)decoded->neighbors[i].node_id);
+                    neighborObj["node_id"] = new JSONValue((unsigned int)decoded->neighbors[i].node_id);
                    neighborObj["snr"] = new JSONValue((int)decoded->neighbors[i].snr);
                    neighbors.push_back(new JSONValue(neighborObj));
                }
@@ -839,9 +846,9 @@ std::string MQTT::meshPacketToJson(meshtastic_MeshPacket *mp)
            memset(&scratch, 0, sizeof(scratch));
            if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_Paxcount_msg, &scratch)) {
                decoded = &scratch;
-                msgPayload["wifi_count"] = new JSONValue((uint)decoded->wifi);
-                msgPayload["ble_count"] = new JSONValue((uint)decoded->ble);
-                msgPayload["uptime"] = new JSONValue((uint)decoded->uptime);
+                msgPayload["wifi_count"] = new JSONValue((unsigned int)decoded->wifi);
+                msgPayload["ble_count"] = new JSONValue((unsigned int)decoded->ble);
+                msgPayload["uptime"] = new JSONValue((unsigned int)decoded->uptime);
                jsonObj["payload"] = new JSONValue(msgPayload);
            } else {
                LOG_ERROR("Error decoding protobuf for Paxcount message!\n");
@@ -858,12 +865,12 @@ std::string MQTT::meshPacketToJson(meshtastic_MeshPacket *mp)
                decoded = &scratch;
                if (decoded->type == meshtastic_HardwareMessage_Type_GPIOS_CHANGED) {
                    msgType = "gpios_changed";
-                    msgPayload["gpio_value"] = new JSONValue((uint)decoded->gpio_value);
+                    msgPayload["gpio_value"] = new JSONValue((unsigned int)decoded->gpio_value);
                    jsonObj["payload"] = new JSONValue(msgPayload);
                } else if (decoded->type == meshtastic_HardwareMessage_Type_READ_GPIOS_REPLY) {
                    msgType = "gpios_read_reply";
-                    msgPayload["gpio_value"] = new JSONValue((uint)decoded->gpio_value);
-                    msgPayload["gpio_mask"] = new JSONValue((uint)decoded->gpio_mask);
+                    msgPayload["gpio_value"] = new JSONValue((unsigned int)decoded->gpio_value);
+                    msgPayload["gpio_mask"] = new JSONValue((unsigned int)decoded->gpio_mask);
                    jsonObj["payload"] = new JSONValue(msgPayload);
                }
            } else {
@@ -879,11 +886,11 @@ std::string MQTT::meshPacketToJson(meshtastic_MeshPacket *mp)
        LOG_WARN("Couldn't convert encrypted payload of MeshPacket to JSON\n");
    }

-    jsonObj["id"] = new JSONValue((uint)mp->id);
-    jsonObj["timestamp"] = new JSONValue((uint)mp->rx_time);
-    jsonObj["to"] = new JSONValue((uint)mp->to);
-    jsonObj["from"] = new JSONValue((uint)mp->from);
-    jsonObj["channel"] = new JSONValue((uint)mp->channel);
+    jsonObj["id"] = new JSONValue((unsigned int)mp->id);
+    jsonObj["timestamp"] = new JSONValue((unsigned int)mp->rx_time);
+    jsonObj["to"] = new JSONValue((unsigned int)mp->to);
+    jsonObj["from"] = new JSONValue((unsigned int)mp->from);
+    jsonObj["channel"] = new JSONValue((unsigned int)mp->channel);
    jsonObj["type"] = new JSONValue(msgType.c_str());
    jsonObj["sender"] = new JSONValue(owner.id);
    if (mp->rx_rssi != 0)
@@ -891,7 +898,7 @@ std::string MQTT::meshPacketToJson(meshtastic_MeshPacket *mp)
    if (mp->rx_snr != 0)
        jsonObj["snr"] = new JSONValue((float)mp->rx_snr);
    if (mp->hop_start != 0 && mp->hop_limit <= mp->hop_start)
-        jsonObj["hops_away"] = new JSONValue((uint)(mp->hop_start - mp->hop_limit));
+        jsonObj["hops_away"] = new JSONValue((unsigned int)(mp->hop_start - mp->hop_limit));

    // serialize and write it to the stream
    JSONValue *value = new JSONValue(jsonObj);
@@ -907,6 +914,7 @@ 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("hopLimit") != json.end() ? json["hopLimit"]->IsNumber() : true) && // hop limit should be a number
           (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
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -143,6 +143,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_STATION_G2
 #elif defined(UNPHONE)
 #define HW_VENDOR meshtastic_HardwareModel_UNPHONE
+#elif defined(WIPHONE)
+#define HW_VENDOR meshtastic_HardwareModel_WIPHONE
 #endif

 // -----------------------------------------------------------------------------
--- a/src/platform/nrf52/NRF52Bluetooth.cpp
+++ b/src/platform/nrf52/NRF52Bluetooth.cpp
@@ -287,7 +287,7 @@ void NRF52Bluetooth::setup()
    LOG_INFO("Advertising\n");
 }

-void NRF52Bluetooth::resumeAdverising()
+void NRF52Bluetooth::resumeAdvertising()
 {
    Bluefruit.Advertising.restartOnDisconnect(true);
    Bluefruit.Advertising.setInterval(32, 244); // in unit of 0.625 ms
--- a/src/platform/nrf52/NRF52Bluetooth.h
+++ b/src/platform/nrf52/NRF52Bluetooth.h
@@ -8,7 +8,7 @@ class NRF52Bluetooth : BluetoothApi
  public:
    void setup();
    void shutdown();
-    void resumeAdverising();
+    void resumeAdvertising();
    void clearBonds();
    bool isConnected();
    int getRssi();
--- a/src/platform/nrf52/architecture.h
+++ b/src/platform/nrf52/architecture.h
@@ -52,6 +52,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_CANARYONE
 #elif defined(NORDIC_PCA10059)
 #define HW_VENDOR meshtastic_HardwareModel_NRF52840_PCA10059
+#elif defined(TWC_MESH_V4)
+#define HW_VENDOR meshtastic_HardwareModel_TWC_MESH_V4
 #elif defined(PRIVATE_HW) || defined(FEATHER_DIY)
 #define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
 #else
@@ -110,4 +112,4 @@
 #if !defined(PIN_SERIAL_RX) && !defined(NRF52840_XXAA)
 // No serial ports on this board - ONLY use segger in memory console
 #define USE_SEGGER
-#endif
+#endif
--- a/src/platform/nrf52/main-nrf52.cpp
+++ b/src/platform/nrf52/main-nrf52.cpp
@@ -80,7 +80,7 @@ void setBluetoothEnable(bool enable)
                // We delay brownout init until after BLE because BLE starts soft device
                initBrownout();
            } else {
-                nrf52Bluetooth->resumeAdverising();
+                nrf52Bluetooth->resumeAdvertising();
            }
        }
    } else {
--- a/src/platform/portduino/PortduinoGlue.cpp
+++ b/src/platform/portduino/PortduinoGlue.cpp
@@ -15,8 +15,6 @@
 #include <map>
 #include <unistd.h>

-HardwareSPI *DisplaySPI;
-HardwareSPI *LoraSPI;
 std::map<configNames, int> settingsMap;
 std::map<configNames, std::string> settingsStrings;
 char *configPath = nullptr;
@@ -76,7 +74,21 @@ void portduinoCustomInit()
 void portduinoSetup()
 {
    printf("Setting up Meshtastic on Portduino...\n");
-    gpioInit();
+    int max_GPIO = 0;
+    const configNames GPIO_lines[] = {cs,
+                                      irq,
+                                      busy,
+                                      reset,
+                                      txen,
+                                      rxen,
+                                      displayDC,
+                                      displayCS,
+                                      displayBacklight,
+                                      displayBacklightPWMChannel,
+                                      displayReset,
+                                      touchscreenCS,
+                                      touchscreenIRQ,
+                                      user};

    std::string gpioChipName = "gpiochip";
    settingsStrings[i2cdev] = "";
@@ -91,7 +103,7 @@ void portduinoSetup()
        std::cout << "Using " << configPath << " as config file" << std::endl;
        try {
            yamlConfig = YAML::LoadFile(configPath);
-        } catch (YAML::Exception e) {
+        } catch (YAML::Exception &e) {
            std::cout << "Could not open " << configPath << " because of error: " << e.what() << std::endl;
            exit(EXIT_FAILURE);
        }
@@ -99,7 +111,7 @@ void portduinoSetup()
        std::cout << "Using local config.yaml as config file" << std::endl;
        try {
            yamlConfig = YAML::LoadFile("config.yaml");
-        } catch (YAML::Exception e) {
+        } catch (YAML::Exception &e) {
            std::cout << "*** Exception " << e.what() << std::endl;
            exit(EXIT_FAILURE);
        }
@@ -107,7 +119,7 @@ void portduinoSetup()
        std::cout << "Using /etc/meshtasticd/config.yaml as config file" << std::endl;
        try {
            yamlConfig = YAML::LoadFile("/etc/meshtasticd/config.yaml");
-        } catch (YAML::Exception e) {
+        } catch (YAML::Exception &e) {
            std::cout << "*** Exception " << e.what() << std::endl;
            exit(EXIT_FAILURE);
        }
@@ -136,6 +148,7 @@ void portduinoSetup()
            settingsMap[use_sx1262] = false;
            settingsMap[use_rf95] = false;
            settingsMap[use_sx1280] = false;
+            settingsMap[use_sx1268] = false;

            if (yamlConfig["Lora"]["Module"] && yamlConfig["Lora"]["Module"].as<std::string>("") == "sx1262") {
                settingsMap[use_sx1262] = true;
@@ -143,6 +156,8 @@ void portduinoSetup()
                settingsMap[use_rf95] = true;
            } else if (yamlConfig["Lora"]["Module"] && yamlConfig["Lora"]["Module"].as<std::string>("") == "sx1280") {
                settingsMap[use_sx1280] = true;
+            } else if (yamlConfig["Lora"]["Module"] && yamlConfig["Lora"]["Module"].as<std::string>("") == "sx1268") {
+                settingsMap[use_sx1268] = true;
            }
            settingsMap[dio2_as_rf_switch] = yamlConfig["Lora"]["DIO2_AS_RF_SWITCH"].as<bool>(false);
            settingsMap[dio3_tcxo_voltage] = yamlConfig["Lora"]["DIO3_TCXO_VOLTAGE"].as<bool>(false);
@@ -156,6 +171,15 @@ void portduinoSetup()
            gpioChipName += std::to_string(settingsMap[gpiochip]);

            settingsStrings[spidev] = "/dev/" + yamlConfig["Lora"]["spidev"].as<std::string>("spidev0.0");
+            if (settingsStrings[spidev].length() == 14) {
+                int x = settingsStrings[spidev].at(11) - '0';
+                int y = settingsStrings[spidev].at(13) - '0';
+                if (x >= 0 && x < 10 && y >= 0 && y < 10) {
+                    settingsMap[spidev] = x + y << 4;
+                    settingsMap[displayspidev] = settingsMap[spidev];
+                    settingsMap[touchscreenspidev] = settingsMap[spidev];
+                }
+            }
        }
        if (yamlConfig["GPIO"]) {
            settingsMap[user] = yamlConfig["GPIO"]["User"].as<int>(RADIOLIB_NC);
@@ -205,6 +229,14 @@ void portduinoSetup()
            settingsMap[displayBusFrequency] = yamlConfig["Display"]["BusFrequency"].as<int>(40000000);
            if (yamlConfig["Display"]["spidev"]) {
                settingsStrings[displayspidev] = "/dev/" + yamlConfig["Display"]["spidev"].as<std::string>("spidev0.1");
+                if (settingsStrings[displayspidev].length() == 14) {
+                    int x = settingsStrings[displayspidev].at(11) - '0';
+                    int y = settingsStrings[displayspidev].at(13) - '0';
+                    if (x >= 0 && x < 10 && y >= 0 && y < 10) {
+                        settingsMap[displayspidev] = x + y << 4;
+                        settingsMap[touchscreenspidev] = settingsMap[displayspidev];
+                    }
+                }
            }
        }
        settingsMap[touchscreenModule] = no_touchscreen;
@@ -221,8 +253,16 @@ void portduinoSetup()
            settingsMap[touchscreenIRQ] = yamlConfig["Touchscreen"]["IRQ"].as<int>(-1);
            settingsMap[touchscreenBusFrequency] = yamlConfig["Touchscreen"]["BusFrequency"].as<int>(1000000);
            settingsMap[touchscreenRotate] = yamlConfig["Touchscreen"]["Rotate"].as<int>(-1);
+            settingsMap[touchscreenI2CAddr] = yamlConfig["Touchscreen"]["I2CAddr"].as<int>(-1);
            if (yamlConfig["Touchscreen"]["spidev"]) {
                settingsStrings[touchscreenspidev] = "/dev/" + yamlConfig["Touchscreen"]["spidev"].as<std::string>("");
+                if (settingsStrings[touchscreenspidev].length() == 14) {
+                    int x = settingsStrings[touchscreenspidev].at(11) - '0';
+                    int y = settingsStrings[touchscreenspidev].at(13) - '0';
+                    if (x >= 0 && x < 10 && y >= 0 && y < 10) {
+                        settingsMap[touchscreenspidev] = x + y << 4;
+                    }
+                }
            }
        }
        if (yamlConfig["Input"]) {
@@ -236,11 +276,18 @@ void portduinoSetup()

        settingsMap[maxnodes] = (yamlConfig["General"]["MaxNodes"]).as<int>(200);

-    } catch (YAML::Exception e) {
+    } catch (YAML::Exception &e) {
        std::cout << "*** Exception " << e.what() << std::endl;
        exit(EXIT_FAILURE);
    }

+    for (configNames i : GPIO_lines) {
+        if (settingsMap[i] > max_GPIO)
+            max_GPIO = settingsMap[i];
+    }
+
+    gpioInit(max_GPIO + 1); // Done here so we can inform Portduino how many GPIOs we need.
+
    // Need to bind all the configured GPIO pins so they're not simulated
    if (settingsMap.count(cs) > 0 && settingsMap[cs] != RADIOLIB_NC) {
        if (initGPIOPin(settingsMap[cs], gpioChipName) != ERRNO_OK) {
@@ -294,31 +341,13 @@ void portduinoSetup()
        if (settingsMap[touchscreenIRQ] > 0)
            initGPIOPin(settingsMap[touchscreenIRQ], gpioChipName);
    }
-
-    // if we specify a touchscreen dev, that is SPI.
-    // else if we specify a screen dev, that is SPI
-    // else if we specify a LoRa dev, that is SPI.
-    if (settingsStrings[touchscreenspidev] != "") {
-        SPI.begin(settingsStrings[touchscreenspidev].c_str());
-        DisplaySPI = new HardwareSPI;
-        DisplaySPI->begin(settingsStrings[displayspidev].c_str());
-        LoraSPI = new HardwareSPI;
-        LoraSPI->begin(settingsStrings[spidev].c_str());
-    } else if (settingsStrings[displayspidev] != "") {
-        SPI.begin(settingsStrings[displayspidev].c_str());
-        DisplaySPI = &SPI;
-        LoraSPI = new HardwareSPI;
-        LoraSPI->begin(settingsStrings[spidev].c_str());
-    } else {
+    if (settingsStrings[spidev] != "") {
        SPI.begin(settingsStrings[spidev].c_str());
-        LoraSPI = &SPI;
-        DisplaySPI = &SPI;
    }
-
    return;
 }

-int initGPIOPin(int pinNum, std::string gpioChipName)
+int initGPIOPin(int pinNum, const std::string gpioChipName)
 {
    std::string gpio_name = "GPIO" + std::to_string(pinNum);
    try {
@@ -332,4 +361,4 @@ int initGPIOPin(int pinNum, std::string gpioChipName)
        std::cout << "Warning, cannot claim pin " << gpio_name << (p ? p.__cxa_exception_type()->name() : "null") << std::endl;
        return ERRNO_DISABLED;
    }
-}
+}
--- a/src/platform/portduino/PortduinoGlue.h
+++ b/src/platform/portduino/PortduinoGlue.h
@@ -13,6 +13,7 @@ enum configNames {
    dio3_tcxo_voltage,
    use_rf95,
    use_sx1280,
+    use_sx1268,
    user,
    gpiochip,
    spidev,
@@ -21,6 +22,7 @@ enum configNames {
    touchscreenModule,
    touchscreenCS,
    touchscreenIRQ,
+    touchscreenI2CAddr,
    touchscreenBusFrequency,
    touchscreenRotate,
    touchscreenspidev,
@@ -54,6 +56,4 @@ enum { level_error, level_warn, level_info, level_debug };

 extern std::map<configNames, int> settingsMap;
 extern std::map<configNames, std::string> settingsStrings;
-int initGPIOPin(int pinNum, std::string gpioChipname);
-extern HardwareSPI *DisplaySPI;
-extern HardwareSPI *LoraSPI;
+int initGPIOPin(int pinNum, std::string gpioChipname);
--- a/src/platform/stm32wl/LittleFS_File.cpp
+++ b/src/platform/stm32wl/LittleFS_File.cpp
@@ -186,9 +186,9 @@ int File::available(void)
    _fs->_lockFS();

    if (!this->_is_dir) {
-        uint32_t size = lfs_file_size(_fs->_getFS(), _file);
+        uint32_t fsize = lfs_file_size(_fs->_getFS(), _file);
        uint32_t pos = lfs_file_tell(_fs->_getFS(), _file);
-        ret = size - pos;
+        ret = fsize - pos;
    }

    _fs->_unlockFS();
--- a/src/power.h
+++ b/src/power.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "PowerStatus.h"
 #include "concurrency/OSThread.h"
+#include "configuration.h"
 #ifdef ARCH_ESP32
 #include <esp_adc_cal.h>
 #include <soc/adc_channel.h>
@@ -36,7 +37,7 @@ extern RTC_NOINIT_ATTR uint64_t RTC_reg_b;
 #include "soc/sens_reg.h" // needed for adc pin reset
 #endif

-#if HAS_TELEMETRY && !defined(ARCH_PORTDUINO)
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(ARCH_PORTDUINO)
 #include "modules/Telemetry/Sensor/INA219Sensor.h"
 #include "modules/Telemetry/Sensor/INA260Sensor.h"
 #include "modules/Telemetry/Sensor/INA3221Sensor.h"