Merge be1a724ab4 into bd3cbfc1ad

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>

.gitignore

@@ -39,5 +39,14 @@ release/
 src/mesh/raspihttp/certificate.pem
 src/mesh/raspihttp/private_key.pem
 
+# pioarduino platform
+managed_components/*
+arduino-lib-builder*
+dependencies.lock
+idf_component.yml
+CMakeLists.txt
+sdkconfig.*
+.dummy/*
+
 # Ignore logo (set at build time with platformio-custom.py)
 data/boot/logo.*

.trunk/trunk.yaml

@@ -9,14 +9,14 @@ plugins:
 lint:
   enabled:
     - checkov@3.2.467
-    - renovate@41.88.0
+    - renovate@41.90.1
     - prettier@3.6.2
     - trufflehog@3.90.5
     - yamllint@1.37.1
     - bandit@1.8.6
     - trivy@0.65.0
     - taplo@0.10.0
-    - ruff@0.12.10
+    - ruff@0.12.11
     - isort@6.0.1
     - markdownlint@0.45.0
     - oxipng@9.1.5

8MB_no_ota.csv

@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x660000,
+spiffs,   data, spiffs,  0x670000,0x180000,
+coredump, data, coredump,0x7F0000,0x10000,

arch/esp32/esp32.ini

@@ -52,8 +52,8 @@ lib_deps =
   https://github.com/meshtastic/esp32_https_server/archive/3223704846752e6d545139204837bdb2a55459ca.zip
   # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
   h2zero/NimBLE-Arduino@^1.4.3
-  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
-  https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
+  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/mverch67/libpax gitBranch=master
+  https://github.com/mverch67/libpax/archive/6f52ee989301cdabaeef00bcbf93bff55708ce2f.zip
   # renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
   https://github.com/lewisxhe/XPowersLib/archive/v0.3.0.zip
   # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master

bin/device-install.bat

@@ -100,7 +100,6 @@ IF NOT "!FILENAME:update=!"=="!FILENAME!" (
 )
 
 :skip-filename
-SET "ESPTOOL_BAUD=1200"
 
 CALL :LOG_MESSAGE DEBUG "Determine the correct esptool command to use..."
 IF NOT "__%PYTHON%__"=="____" (
@@ -142,7 +141,7 @@ CALL :LOG_MESSAGE INFO "Using esptool baud: !ESPTOOL_BAUD!."
 
 IF %BPS_RESET% EQU 1 (
     @REM Attempt to change mode via 1200bps Reset.
-    CALL :RUN_ESPTOOL !ESPTOOL_BAUD! --after no_reset read_flash_status
+    CALL :RUN_ESPTOOL 1200 --after no_reset read_flash_status
     GOTO eof
 )
 

bin/org.meshtastic.meshtasticd.metainfo.xml

@@ -87,6 +87,9 @@
   </screenshots>
 
   <releases>
+    <release version="2.7.8" date="2025-08-30">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.8</url>
+    </release>
     <release version="2.7.7" date="2025-08-28">
       <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.7</url>
     </release>

boards/seeed-sensecap-indicator.json

@@ -2,7 +2,7 @@
   "build": {
     "arduino": {
       "ldscript": "esp32s3_out.ld",
-      "partitions": "default_8MB.csv",
+      "partitions": "8MB_no_ota.csv",
       "memory_type": "qio_opi"
     },
     "core": "esp32",
@@ -16,6 +16,7 @@
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "f_boot": "120000000L",
+    "boot_freq": "120000000L",
     "boot": "qio",
     "flash_mode": "qio",
     "psram_type": "opi",

debian/changelog

@@ -1,4 +1,4 @@
-meshtasticd (2.7.7.0) UNRELEASED; urgency=medium
+meshtasticd (2.7.8.0) UNRELEASED; urgency=medium
 
   [ Austin Lane ]
   * Initial packaging
@@ -41,4 +41,7 @@ meshtasticd (2.7.7.0) UNRELEASED; urgency=medium
   * GitHub Actions Automatic version bump
   * GitHub Actions Automatic version bump
 
- -- Ubuntu <github-actions[bot]@users.noreply.github.com>  Thu, 28 Aug 2025 10:33:25 +0000
+  [  ]
+  * GitHub Actions Automatic version bump
+
+ --  <github-actions[bot]@users.noreply.github.com>  Sat, 30 Aug 2025 00:26:04 +0000

platformio.ini

@@ -87,8 +87,9 @@ check_flags =
 framework = arduino
 lib_deps =
 	${env.lib_deps}
-	# renovate: datasource=custom.pio depName=NonBlockingRTTTL packageName=end2endzone/library/NonBlockingRTTTL
-	end2endzone/NonBlockingRTTTL@1.3.0
+	# renovate: datasource=custom.pio depName=NonBlockingRTTTL packageName=mverch67/library/NonBlockingRTTTL
+	https://github.com/mverch67/NonBlockingRTTTL/archive/ad1c2fb12bc81db546c6a94e963acb3382d3689e.zip ; TODO
+
 build_flags = ${env.build_flags} -Os
 build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/niche/>
 
@@ -99,8 +100,6 @@ lib_deps =
 	thingsboard/TBPubSubClient@2.12.1
 	# renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient
 	arduino-libraries/NTPClient@3.2.1
-	# renovate: datasource=custom.pio depName=Syslog packageName=arcao/library/Syslog
-	arcao/Syslog@2.0.0
 
 ; Minimal networking libs for nrf52 (excludes Syslog to save flash)
 [nrf52_networking_base]

src/Power.cpp

@@ -128,6 +128,7 @@ RAK9154Sensor rak9154Sensor;
 #ifdef HAS_PPM
 // note: XPOWERS_CHIP_XXX must be defined in variant.h
 #include <XPowersLib.h>
+XPowersPPM *PPM = NULL;
 #endif
 
 #ifdef HAS_BQ27220
@@ -681,7 +682,7 @@ bool Power::setup()
         found = true;
     } else if (lipoChargerInit()) {
         found = true;
-    }  else if (meshSolarInit()) {
+    } else if (meshSolarInit()) {
         found = true;
     } else if (analogInit()) {
         found = true;
@@ -745,7 +746,11 @@ void Power::shutdown()
 
 #if HAS_SCREEN
     if (screen) {
+#ifdef T_DECK_PRO
+        screen->showSimpleBanner("Device is powered off.\nConnect USB to start!", 0); // T-Deck Pro has no power button
+#else
         screen->showSimpleBanner("Shutting Down...", 0); // stays on screen
+#endif
     }
 #endif
 #if !defined(ARCH_STM32WL)
@@ -763,7 +768,7 @@ void Power::shutdown()
 #ifdef PIN_LED3
     ledOff(PIN_LED3);
 #endif
-    doDeepSleep(DELAY_FOREVER, false, true);
+    doDeepSleep(DELAY_FOREVER, true, true);
 #elif defined(ARCH_PORTDUINO)
     exit(EXIT_SUCCESS);
 #else
@@ -1320,7 +1325,6 @@ bool Power::lipoInit()
 class LipoCharger : public HasBatteryLevel
 {
   private:
-    XPowersPPM *ppm = nullptr;
     BQ27220 *bq = nullptr;
 
   public:
@@ -1329,41 +1333,41 @@ class LipoCharger : public HasBatteryLevel
      */
     bool runOnce()
     {
-        if (ppm == nullptr) {
-            ppm = new XPowersPPM;
-            bool result = ppm->init(Wire, I2C_SDA, I2C_SCL, BQ25896_ADDR);
+        if (PPM == nullptr) {
+            PPM = new XPowersPPM;
+            bool result = PPM->init(Wire, I2C_SDA, I2C_SCL, BQ25896_ADDR);
             if (result) {
                 LOG_INFO("PPM BQ25896 init succeeded");
                 // Set the minimum operating voltage. Below this voltage, the PPM will protect
-                // ppm->setSysPowerDownVoltage(3100);
+                // PPM->setSysPowerDownVoltage(3100);
 
                 // Set input current limit, default is 500mA
-                // ppm->setInputCurrentLimit(800);
+                // PPM->setInputCurrentLimit(800);
 
                 // Disable current limit pin
-                // ppm->disableCurrentLimitPin();
+                // PPM->disableCurrentLimitPin();
 
                 // Set the charging target voltage, Range:3840 ~ 4608mV ,step:16 mV
-                ppm->setChargeTargetVoltage(4288);
+                PPM->setChargeTargetVoltage(4288);
 
                 // Set the precharge current , Range: 64mA ~ 1024mA ,step:64mA
-                // ppm->setPrechargeCurr(64);
+                // PPM->setPrechargeCurr(64);
 
                 // The premise is that limit pin is disabled, or it will
                 // only follow the maximum charging current set by limit pin.
                 // Set the charging current , Range:0~5056mA ,step:64mA
-                ppm->setChargerConstantCurr(1024);
+                PPM->setChargerConstantCurr(1024);
 
                 // To obtain voltage data, the ADC must be enabled first
-                ppm->enableMeasure();
+                PPM->enableMeasure();
 
                 // Turn on charging function
                 // If there is no battery connected, do not turn on the charging function
-                ppm->enableCharge();
+                PPM->enableCharge();
             } else {
                 LOG_WARN("PPM BQ25896 init failed");
-                delete ppm;
-                ppm = nullptr;
+                delete PPM;
+                PPM = nullptr;
                 return false;
             }
         }
@@ -1404,23 +1408,23 @@ class LipoCharger : public HasBatteryLevel
     /**
      * return true if there is a battery installed in this unit
      */
-    virtual bool isBatteryConnect() override { return ppm->getBattVoltage() > 0; }
+    virtual bool isBatteryConnect() override { return PPM->getBattVoltage() > 0; }
 
     /**
      * return true if there is an external power source detected
      */
-    virtual bool isVbusIn() override { return ppm->getVbusVoltage() > 0; }
+    virtual bool isVbusIn() override { return PPM->getVbusVoltage() > 0; }
 
     /**
      * return true if the battery is currently charging
      */
     virtual bool isCharging() override
     {
-        bool isCharging = ppm->isCharging();
+        bool isCharging = PPM->isCharging();
         if (isCharging) {
             LOG_DEBUG("BQ27220 time to full charge: %d min", bq->getTimeToFull());
         } else {
-            if (!ppm->isVbusIn()) {
+            if (!PPM->isVbusIn()) {
                 LOG_DEBUG("BQ27220 time to empty: %d min (%d mAh)", bq->getTimeToEmpty(), bq->getRemainingCapacity());
             }
         }
@@ -1453,8 +1457,6 @@ bool Power::lipoChargerInit()
 }
 #endif
 
-
-
 #ifdef HELTEC_MESH_SOLAR
 #include "meshSolarApp.h"
 
@@ -1492,7 +1494,7 @@ class meshSolarBatteryLevel : public HasBatteryLevel
     /**
      * return true if there is an external power source detected
      */
-    virtual bool isVbusIn() override { return meshSolarIsVbusIn();}
+    virtual bool isVbusIn() override { return meshSolarIsVbusIn(); }
 
     /**
      * return true if the battery is currently charging

src/configuration.h

@@ -26,10 +26,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <Arduino.h>
 
-#ifdef RV3028_RTC
+#if __has_include("Melopero_RV3028.h")
 #include "Melopero_RV3028.h"
 #endif
-#ifdef PCF8563_RTC
+#if __has_include("pcf8563.h")
 #include "pcf8563.h"
 #endif
 

src/gps/RTC.cpp

@@ -55,9 +55,9 @@ RTCSetResult readFromRTC()
 
         LOG_DEBUG("Read RTC time from RV3028 getTime as %02d-%02d-%02d %02d:%02d:%02d (%ld)", t.tm_year + 1900, t.tm_mon + 1,
                   t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, printableEpoch);
-        timeStartMsec = now;
-        zeroOffsetSecs = tv.tv_sec;
         if (currentQuality == RTCQualityNone) {
+            timeStartMsec = now;
+            zeroOffsetSecs = tv.tv_sec;
             currentQuality = RTCQualityDevice;
         }
         return RTCSetResultSuccess;
@@ -94,9 +94,9 @@ RTCSetResult readFromRTC()
 
         LOG_DEBUG("Read RTC time from PCF8563 getDateTime as %02d-%02d-%02d %02d:%02d:%02d (%ld)", t.tm_year + 1900, t.tm_mon + 1,
                   t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, printableEpoch);
-        timeStartMsec = now;
-        zeroOffsetSecs = tv.tv_sec;
         if (currentQuality == RTCQualityNone) {
+            timeStartMsec = now;
+            zeroOffsetSecs = tv.tv_sec;
             currentQuality = RTCQualityDevice;
         }
         return RTCSetResultSuccess;

src/graphics/draw/MenuHandler.cpp

@@ -528,10 +528,12 @@ void menuHandler::positionBaseMenu()
     static int optionsEnumArray[enumEnd] = {Back, GPSToggle, CompassMenu};
     int options = 3;
 
+#if !MESHTASTIC_EXCLUDE_I2C
     if (accelerometerThread) {
         optionsArray[options] = "Compass Calibrate";
         optionsEnumArray[options++] = CompassCalibrate;
     }
+#endif
     BannerOverlayOptions bannerOptions;
     bannerOptions.message = "Position Action";
     bannerOptions.optionsArrayPtr = optionsArray;
@@ -544,8 +546,10 @@ void menuHandler::positionBaseMenu()
         } else if (selected == CompassMenu) {
             menuQueue = compass_point_north_menu;
             screen->runNow();
+#if !MESHTASTIC_EXCLUDE_I2C
         } else if (selected == CompassCalibrate) {
             accelerometerThread->calibrate(30);
+#endif
         }
     };
     screen->showOverlayBanner(bannerOptions);

src/main.cpp

@@ -419,7 +419,7 @@ void setup()
     struct timeval tv;
     tv.tv_sec = time(NULL);
     tv.tv_usec = 0;
-    perhapsSetRTC(RTCQualityNTP, &tv);
+    perhapsSetRTC(RTCQualityDevice, &tv);
 #endif
 
     powerMonInit();

src/modules/Modules.cpp

@@ -164,7 +164,7 @@ void setupModules()
 #endif
         // Example: Put your module here
         // new ReplyModule();
-#if (HAS_BUTTON || ARCH_PORTDUINO) && !MESHTASTIC_EXCLUDE_INPUTBROKER
+#if (HAS_BUTTON || ARCH_PORTDUINO) && !MESHTASTIC_EXCLUDE_INPUTBROKER && !MESHTASTIC_EXCLUDE_I2C
         if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
             rotaryEncoderInterruptImpl1 = new RotaryEncoderInterruptImpl1();
             if (!rotaryEncoderInterruptImpl1->init()) {

src/modules/esp32/PaxcounterModule.cpp

@@ -90,8 +90,6 @@ int32_t PaxcounterModule::runOnce()
             configuration.blecounter = 1;
             configuration.blescantime = 0; // infinite
             configuration.wificounter = 1;
-            configuration.wifi_channel_map = WIFI_CHANNEL_ALL;
-            configuration.wifi_channel_switch_interval = 50;
             configuration.wifi_rssi_threshold = Default::getConfiguredOrDefault(moduleConfig.paxcounter.wifi_threshold, -80);
             configuration.ble_rssi_threshold = Default::getConfiguredOrDefault(moduleConfig.paxcounter.ble_threshold, -80);
             libpax_update_config(&configuration);

src/platform/esp32/main-esp32.cpp

@@ -169,9 +169,10 @@ void esp32Setup()
 // #define APP_WATCHDOG_SECS 45
 #define APP_WATCHDOG_SECS 90
 
-#ifdef CONFIG_IDF_TARGET_ESP32C6
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
     esp_task_wdt_config_t *wdt_config = (esp_task_wdt_config_t *)malloc(sizeof(esp_task_wdt_config_t));
     wdt_config->timeout_ms = APP_WATCHDOG_SECS * 1000;
+    wdt_config->idle_core_mask = 1 << 1;
     wdt_config->trigger_panic = true;
     res = esp_task_wdt_init(wdt_config);
     assert(res == ESP_OK);

src/sleep.cpp

@@ -32,6 +32,16 @@ esp_sleep_source_t wakeCause; // the reason we booted this time
 #endif
 #include "Throttle.h"
 
+#ifdef USE_XL9555
+#include "ExtensionIOXL9555.hpp"
+extern ExtensionIOXL9555 io;
+#endif
+
+#ifdef HAS_PPM
+#include <XPowersLib.h>
+extern XPowersPPM *PPM;
+#endif
+
 #ifndef INCLUDE_vTaskSuspend
 #define INCLUDE_vTaskSuspend 0
 #endif
@@ -297,6 +307,14 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false, bool skipSaveN
 #endif
 #endif
 
+#ifdef HAS_PPM
+    if (PPM) {
+        LOG_INFO("PMM shutdown");
+        console->flush();
+        PPM->shutdown();
+    }
+#endif
+
 #ifdef HAS_PMU
     if (pmu_found && PMU) {
         // Obsolete comment: from back when we we used to receive lora packets while CPU was in deep sleep.
@@ -412,6 +430,16 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r
     if (pmu_found)
         gpio_wakeup_enable((gpio_num_t)PMU_IRQ, GPIO_INTR_LOW_LEVEL); // pmu irq
 #endif
+
+#ifdef T_LORA_PAGER
+    LOG_DEBUG("power down XL9555 io");
+    io.digitalWrite(EXPANDS_DRV_EN, LOW);
+    io.digitalWrite(EXPANDS_AMP_EN, LOW);
+    io.digitalWrite(EXPANDS_KB_EN, LOW);
+    io.digitalWrite(EXPANDS_SD_EN, LOW);
+    io.digitalWrite(EXPANDS_GPIO_EN, LOW);
+#endif
+
     auto res = esp_sleep_enable_gpio_wakeup();
     if (res != ESP_OK) {
         LOG_ERROR("esp_sleep_enable_gpio_wakeup result %d", res);
@@ -452,6 +480,14 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r
         gpio_wakeup_disable((gpio_num_t)RF95_IRQ);
     }
 #endif
+#ifdef T_LORA_PAGER
+    LOG_DEBUG("power up XL9555 io");
+    io.digitalWrite(EXPANDS_DRV_EN, HIGH);
+    io.digitalWrite(EXPANDS_AMP_EN, HIGH);
+    io.digitalWrite(EXPANDS_KB_EN, HIGH);
+    io.digitalWrite(EXPANDS_SD_EN, HIGH);
+    io.digitalWrite(EXPANDS_GPIO_EN, HIGH);
+#endif
 
     esp_sleep_wakeup_cause_t cause = esp_sleep_get_wakeup_cause();
     notifyLightSleepEnd.notifyObservers(cause); // Button interrupts are reattached here

variants/esp32s3/seeed-sensecap-indicator/platformio.ini

@@ -1,18 +1,31 @@
 ; Seeed Studio SenseCAP Indicator
+; note: does not work with vscode platformio plugin; needs pioarduino IDE plugin instead
 [env:seeed-sensecap-indicator]
 extends = esp32s3_base
+platform =
+    https://github.com/pioarduino/platform-espressif32.git#55.03.30-1
+
 platform_packages =
-    platformio/framework-arduinoespressif32 @ https://github.com/mverch67/arduino-esp32/archive/aef7fef6de3329ed6f75512d46d63bba12b09bb5.zip ; add_tca9535 (based on 2.0.16)
+    platformio/framework-arduinoespressif32 @ https://github.com/mverch67/arduino-esp32#ab7f873773424561fa0d8434034960a36d335fcb
 
 board = seeed-sensecap-indicator
 board_check = true
-board_build.partitions = default_8MB.csv
+board_build.partitions = 8MB_no_ota.csv
 upload_protocol = esptool
 
-build_flags = ${esp32_base.build_flags}
+build_unflags =
+  -DCONFIG_BT_NIMBLE_ENABLED
+  -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
+  -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
+  -DCONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=8192
+
+build_flags = ${esp32_base.build_flags} -D lcd_periph_signals=lcd_periph_rgb_signals -mtext-section-literals -ffat-lto-objects
   -Ivariants/esp32s3/seeed-sensecap-indicator
   -DSENSECAP_INDICATOR
-  -DCONFIG_ARDUHAL_LOG_COLORS
+  -DARDUINO_HAL_LOG_LEVEL=5
+  -DARDUHAL_LOG_MAXIMUM_LEVEL=5
+  -DARDUHAL_LOG_COLORS=1
+  -DUSE_ARDUINO_HAL_GPIO
   -DRADIOLIB_DEBUG_SPI=0
   -DRADIOLIB_DEBUG_PROTOCOL=0
   -DRADIOLIB_DEBUG_BASIC=0
@@ -20,13 +33,72 @@ build_flags = ${esp32_base.build_flags}
   -DRADIOLIB_SPI_PARANOID=0
   -DIO_EXPANDER=0x40
   -DIO_EXPANDER_IRQ=42
-  ;-DIO_EXPANDER_DEBUG
-  -DUSE_ARDUINO_HAL_GPIO
+;  -DIO_EXPANDER_DEBUG
 
 lib_deps = ${esp32s3_base.lib_deps}
-  https://github.com/mverch67/LovyanGFX/archive/4c76238c1344162a234ae917b27651af146d6fb2.zip
-  earlephilhower/ESP8266Audio@^1.9.9
-  earlephilhower/ESP8266SAM@^1.0.1
+  https://github.com/mverch67/LovyanGFX/archive/a1c1278fc9116d1c6cb15a7bb14565aef59a9a97.zip
+
+custom_component_remove =
+    espressif/esp_hosted
+    espressif/esp_wifi_remote
+    espressif/esp_modem
+    espressif/esp-dsp
+    espressif/esp32-camera
+    espressif/libsodium
+    espressif/esp-modbus
+    espressif/qrcode
+    espressif/esp_insights
+    espressif/esp_diag_data_store
+    espressif/esp_diagnostics
+    espressif/esp_rainmaker
+    espressif/rmaker_common
+    espressif/network_provisioning
+    chmorgan/esp-libhelix-mp3
+
+custom_sdkconfig =
+    CONFIG_AUTOSTART_ARDUINO=y
+    CONFIG_LOG_DEFAULT_LEVEL=4
+    CONFIG_LOG_MAXIMUM_LEVEL=4
+    CONFIG_LOG_COLORS=y
+    CONFIG_ARDUHAL_LOG_COLORS=y
+    CONFIG_SPIRAM_MODE_OCT=y
+    CONFIG_SPIRAM_SPEED_120M=y
+    CONFIG_SPIRAM_SPEED=120
+    CONFIG_SPIRAM_XIP_FROM_PSRAM=y
+    CONFIG_LCD_RGB_ISR_IRAM_SAFE=y
+    CONFIG_GDMA_CTRL_FUNC_IN_IRAM=y
+    CONFIG_I2S_ISR_IRAM_SAFE=y
+    CONFIG_GDMA_ISR_IRAM_SAFE=y
+    CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y
+    CONFIG_ESP32S3_DATA_CACHE_64KB=y
+    CONFIG_ESP32S3_DATA_CACHE_LINE_64B=y
+    CONFIG_I2C_SKIP_LEGACY_CONFLICT_CHECK=y
+    CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
+    CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
+    CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
+    CONFIG_ESP_SYSTEM_ESP32_SRAM1_REGION_AS_IRAM=y
+    CONFIG_ESP_WIFI_IRAM_OPT=n
+    CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+    CONFIG_SPIRAM_CACHE_LIBCHAR_IN_IRAM=n
+    CONFIG_SPIRAM_CACHE_LIBSTR_IN_IRAM=n
+    CONFIG_SPIRAM_CACHE_LIBMISC_IN_IRAM=n
+    CONFIG_SPIRAM_CACHE_LIBTIME_IN_IRAM=n
+    CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=0
+    CONFIG_BT_ENABLED=y
+    CONFIG_BT_NIMBLE_ENABLED=y
+    CONFIG_BT_BLUEDROID_ENABLED=y
+    CONFIG_BT_CONTROLLER_ENABLED=y
+    CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=8192
+    CONFIG_BT_NIMBLE_MAX_CCCDS=20
+    CONFIG_BT_NIMBLE_CPP_LOG_LEVEL=1
+    CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+    CONFIG_ESPTOOLPY_FLASHSIZE="8MB"
+    CONFIG_ESPTOOLPY_FLASHFREQ_120M=y
+    CONFIG_ESPTOOLPY_FLASHFREQ="120m"
+    CONFIG_ESP_TASK_WDT_INIT=n
+    CONFIG_IDF_EXPERIMENTAL_FEATURES=y
+    CONFIG_COMPILER_OPTIMIZATION_PERF=y
+    CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
 
 
 [env:seeed-sensecap-indicator-tft]
@@ -37,14 +109,19 @@ upload_speed = 460800
 build_flags =
   ${env:seeed-sensecap-indicator.build_flags}
   -D INPUTDRIVER_BUTTON_TYPE=38
+  -D MESHTASTIC_EXCLUDE_WEBSERVER=1
+  -D MESHTASTIC_EXCLUDE_SERIAL=1
+  -D MESHTASTIC_EXCLUDE_SOCKETAPI=1
+  -D MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
+  -D HAS_TELEMETRY=0
   -D CONFIG_DISABLE_HAL_LOCKS=1
   -D HAS_SCREEN=1
   -D HAS_TFT=1
   -D DISPLAY_SET_RESOLUTION
-  -D RAM_SIZE=4096
-	-D LV_LVGL_H_INCLUDE_SIMPLE
-	-D LV_CONF_INCLUDE_SIMPLE
-	-D LV_COMP_CONF_INCLUDE_SIMPLE
+  -D RAM_SIZE=4000
+  -D LV_LVGL_H_INCLUDE_SIMPLE
+  -D LV_CONF_INCLUDE_SIMPLE
+  -D LV_COMP_CONF_INCLUDE_SIMPLE
   -D LV_USE_SYSMON=0
   -D LV_USE_PROFILER=0
   -D LV_USE_PERF_MONITOR=0

variants/esp32s3/seeed-sensecap-indicator/variant.h

@@ -4,7 +4,7 @@
 // This board has a serial coprocessor for sensor readings
 #define SENSOR_RP2040_TXD 19
 #define SENSOR_RP2040_RXD 20
-#define SENSOR_PORT_NUM 2
+#define SENSOR_PORT_NUM UART_NUM_2
 #define SENSOR_BAUD_RATE 115200
 
 #define BUTTON_PIN 38

variants/native/portduino/platformio.ini

@@ -3,7 +3,10 @@ extends = portduino_base
 build_flags = ${portduino_base.build_flags} -I variants/native/portduino
   -I /usr/include
 board = cross_platform
-lib_deps = ${portduino_base.lib_deps}
+lib_deps = 
+  ${portduino_base.lib_deps}
+  melopero/Melopero RV3028@^1.1.0
+
 build_src_filter = ${portduino_base.build_src_filter}
 
 [env:native]

variants/native/portduino/variant.h

@@ -4,4 +4,7 @@
 #define CANNED_MESSAGE_MODULE_ENABLE 1
 #define HAS_GPS 1
 #define MAX_RX_TOPHONE settingsMap[maxtophone]
-#define MAX_NUM_NODES settingsMap[maxnodes]
+#define MAX_NUM_NODES settingsMap[maxnodes]
+
+// RAK12002 RTC Module
+#define RV3028_RTC (uint8_t)0b1010010

variants/nrf52840/heltec_mesh_node_t114/variant.h

@@ -208,7 +208,7 @@ No longer populated on PCB
 #undef AREF_VOLTAGE
 #define AREF_VOLTAGE 3.0
 #define VBAT_AR_INTERNAL AR_INTERNAL_3_0
-#define ADC_MULTIPLIER (4.90F)
+#define ADC_MULTIPLIER (4.99F)
 
 #define HAS_RTC 0
 #ifdef __cplusplus

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 7
-build = 7
+build = 8