Merge branch 'master' into apollo

* update libpax
* fix interval init

.vscode/extensions.json

@@ -2,9 +2,8 @@
     // See http://go.microsoft.com/fwlink/?LinkId=827846
     // for the documentation about the extensions.json format
     "recommendations": [
-        "platformio.platformio-ide"
+		"ms-vscode.cpptools",
+        "platformio.platformio-ide",
+        "trunk.io"
     ],
-    "unwantedRecommendations": [
-        "ms-vscode.cpptools-extension-pack"
-    ]
 }

arch/apollo3/apollo3.ini

@@ -0,0 +1,33 @@
+[apollo3_base]
+extends = arduino_base
+platform = https://github.com/nigelb/platform-apollo3blue.git#2e8a9895cf82f2836c483885e6f89b3f83d3ade4
+platform_packages=framework-arduinoapollo3@https://github.com/sparkfun/Arduino_Apollo3#a0d99c5fc9b1112d46a9d11c1339898d01e586c9
+build_type = debug
+build_flags =
+  ${arduino_base.build_flags}
+  -Isrc/platform/apollo3 -g
+  -I"${platformio.packages_dir}/framework-arduinoapollo3/libraries/SPI/src"
+  -DRADIOLIB_EEPROM_UNSUPPORTED
+  -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+build_src_filter = 
+  ${arduino_base.build_src_filter}
+  -<platform/nrf52>
+  -<platform/esp32/>
+  -<platform/rp2040>
+  -<platform/portduino>
+  -<platform/stm32wl>
+  -<nimble/>
+  -<mesh/api/>
+  -<mesh/http/>
+  -<mesh/wifi/>
+  -<modules/esp32>
+  -<mesh/eth/>
+  -<input>
+  -<buzz>
+  -<modules/Telemetry>
+lib_deps =
+  ${env.lib_deps}
+  charlesbaynham/OSFS@^1.2.3
+  rweather/Crypto
+lib_ignore = 
+  mathertel/OneButton

arch/esp32/esp32.ini

@@ -5,7 +5,13 @@ custom_esp32_kind = esp32
 platform = platformio/espressif32@6.9.0
 
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
+  ${arduino_base.build_src_filter}
+  -<platform/nrf52/>
+  -<platform/stm32wl>
+  -<platform/rp2xx0>
+  -<platform/apollo3>
+  -<mesh/eth/>
+  -<mesh/raspihttp>
 
 upload_speed = 921600
 debug_init_break = tbreak setup
@@ -46,7 +52,7 @@ lib_deps =
   ${radiolib_base.lib_deps}
   https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
   h2zero/NimBLE-Arduino@^1.4.2
-  https://github.com/dbSuS/libpax.git#7bcd3fcab75037505be9b122ab2b24cc5176b587
+  https://github.com/dbinfrago/libpax.git#3cdc0371c375676a97967547f4065607d4c53fd1
   lewisxhe/XPowersLib@^0.2.6
   https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
   rweather/Crypto@^0.4.0

arch/esp32/esp32c3.ini

@@ -1,5 +1,6 @@
 [esp32c3_base]
 extends = esp32_base
+
 custom_esp32_kind = esp32c3
 
 monitor_speed = 115200

arch/esp32/esp32s3.ini

@@ -1,6 +1,6 @@
 [esp32s3_base]
 extends = esp32_base
+
 custom_esp32_kind = esp32s3
 
 monitor_speed = 115200
-

arch/nrf52/nrf52.ini

@@ -19,7 +19,18 @@ build_flags =
   -DMAX_NUM_NODES=80
 
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
+  ${arduino_base.build_src_filter}
+  -<platform/esp32/>
+  -<platform/stm32wl>
+  -<nimble/>
+  -<mesh/wifi/>
+  -<mesh/api/>
+  -<mesh/http/>
+  -<modules/esp32>
+  -<platform/rp2xx0>
+  -<mesh/eth/>
+  -<mesh/raspihttp>
+  -<platform/apollo3>
 
 lib_deps=
   ${arduino_base.lib_deps}

arch/portduino/portduino.ini

@@ -10,6 +10,7 @@ build_src_filter =
   -<platform/nrf52/> 
   -<platform/stm32wl/> 
   -<platform/rp2xx0>
+  -<platform/apollo3>
   -<mesh/wifi/>
   -<mesh/http/>
   +<mesh/raspihttp/>
@@ -36,4 +37,4 @@ build_flags =
   -lstdc++fs
   -lbluetooth
   -lgpiod
-  -lyaml-cpp
+  -lyaml-cpp

arch/rp2xx0/rp2040.ini

@@ -1,8 +1,8 @@
 ; Common settings for rp2040 Processor based targets
 [rp2040_base]
-platform = https://github.com/maxgerhardt/platform-raspberrypi.git#a606be683748c73e9a0d46baf70163478d298f0f ; For arduino-pico 4.2.0
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#19e30129fb1428b823be585c787dcb4ac0d9014c ; For arduino-pico 4.2.1
 extends = arduino_base
-platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#4.2.1
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#996c3bfab9758f12c07aa20cc6d352e630c16987 ; 4.2.1 with fix for sporadic hangs
 
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -14,7 +14,7 @@ build_flags =
   -D__PLAT_RP2040__
 #  -D _POSIX_THREADS
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<modules/esp32> -<platform/nrf52/> -<platform/stm32wl> -<mesh/eth/> -<mesh/wifi/> -<mesh/http/> -<mesh/raspihttp>
+  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<modules/esp32> -<platform/nrf52/> -<platform/apollo3> -<platform/stm32wl> -<mesh/eth/> -<mesh/wifi/> -<mesh/http/> -<mesh/raspihttp>
 
 lib_ignore =
   BluetoothOTA
@@ -23,4 +23,4 @@ lib_deps =
   ${arduino_base.lib_deps}
   ${environmental_base.lib_deps}
   ${radiolib_base.lib_deps}
-  rweather/Crypto
+  rweather/Crypto

arch/rp2xx0/rp2350.ini

@@ -1,8 +1,8 @@
 ; Common settings for rp2040 Processor based targets
 [rp2350_base]
-platform = https://github.com/maxgerhardt/platform-raspberrypi.git#a606be683748c73e9a0d46baf70163478d298f0f ; For arduino-pico 4.2.0
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#19e30129fb1428b823be585c787dcb4ac0d9014c ; For arduino-pico 4.2.1
 extends = arduino_base
-platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#4.2.1
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#96c3bfab9758f12c07aa20cc6d352e630c16987 ; 4.2.1 with fix for sporadic hangs
 
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -12,7 +12,17 @@ build_flags =
   -D__PLAT_RP2040__
 #  -D _POSIX_THREADS
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<modules/esp32> -<platform/nrf52/> -<platform/stm32wl> -<mesh/eth/> -<mesh/wifi/> -<mesh/http/> -<mesh/raspihttp>
+  ${arduino_base.build_src_filter}
+  -<platform/esp32/>
+  -<nimble/>
+  -<modules/esp32>
+  -<platform/nrf52/>
+  -<platform/stm32wl>
+  -<mesh/eth/>
+  -<mesh/wifi/>
+  -<mesh/http/>
+  -<platform/apollo3>
+  -<mesh/raspihttp>
 
 lib_ignore =
   BluetoothOTA
@@ -22,4 +32,4 @@ lib_deps =
   ${arduino_base.lib_deps}
   ${environmental_base.lib_deps}
   ${radiolib_base.lib_deps}
-  rweather/Crypto
+  rweather/Crypto

arch/stm32/stm32.ini

@@ -22,7 +22,7 @@ build_flags =
   -fdata-sections
   
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<input> -<buzz> -<modules/RemoteHardwareModule.cpp> -<platform/nrf52> -<platform/portduino> -<platform/rp2xx0> -<mesh/raspihttp>
+  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<input> -<buzz> -<modules/RemoteHardwareModule.cpp> -<platform/nrf52> -<platform/portduino> -<platform/rp2xx0> -<platform/apollo3> -<mesh/raspihttp>
 
 board_upload.offset_address = 0x08000000
 upload_protocol = stlink

bin/base64_to_hex.py

@@ -0,0 +1,33 @@
+import sys
+import base64
+
+def base64_to_hex_string(b64_string):
+    try:
+        # Decode the Base64 string to raw bytes
+        decoded_bytes = base64.b64decode(b64_string)
+    except Exception as e:
+        raise ValueError(f"Invalid Base64 input: {e}")
+    
+    # Check if the decoded result is exactly 32 bytes
+    if len(decoded_bytes) != 32:
+        raise ValueError("Decoded Base64 input must be exactly 32 bytes.")
+    
+    # Convert each byte to its hex representation
+    hex_values = [f"0x{byte:02x}" for byte in decoded_bytes]
+    
+    # Join the formatted hex values with commas
+    formatted_output = "{ " + ", ".join(hex_values) + " };"
+    return formatted_output
+
+if __name__ == "__main__":
+    # Check if a Base64 string was provided in command line arguments
+    if len(sys.argv) != 2:
+        print("Usage: python script.py <base64-string>")
+        sys.exit(1)
+    
+    b64_string = sys.argv[1]
+    try:
+        formatted_hex = base64_to_hex_string(b64_string)
+        print(formatted_hex)
+    except ValueError as e:
+        print(e)

bin/build-native.sh

@@ -27,5 +27,4 @@ rm -r $OUTDIR/* || true
 platformio pkg update --environment native || platformioFailed
 pio run --environment native || platformioFailed
 cp .pio/build/native/program "$OUTDIR/meshtasticd_linux_$(uname -m)"
-cp bin/device-install.* $OUTDIR
-cp bin/device-update.* $OUTDIR
+cp bin/native-install.* $OUTDIR

bin/device-install.bat

@@ -1,6 +1,7 @@
 @ECHO OFF
 
 set PYTHON=python
+set WEB_APP=0
 
 :: Determine the correct esptool command to use
 where esptool >nul 2>&1
@@ -12,13 +13,14 @@ if %ERRORLEVEL% EQU 0 (
 
 goto GETOPTS
 :HELP
-echo Usage: %~nx0 [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME^|FILENAME]
+echo Usage: %~nx0 [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME^|FILENAME] [--web]
 echo Flash image file to device, but first erasing and writing system information
 echo.
 echo     -h               Display this help and exit
 echo     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerrous).
 echo     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: %PYTHON%)
 echo     -f FILENAME      The .bin file to flash.  Custom to your device type and region.
+echo     --web            Flash WEB APP.
 goto EOF
 
 :GETOPTS
@@ -27,6 +29,7 @@ if /I "%1"=="--help" goto HELP
 if /I "%1"=="-F" set "FILENAME=%2" & SHIFT
 if /I "%1"=="-p" set ESPTOOL_PORT=%2 & SHIFT
 if /I "%1"=="-P" set PYTHON=%2 & SHIFT
+if /I "%1"=="--web" set WEB_APP=1 & SHIFT
 SHIFT
 IF NOT "__%1__"=="____" goto GETOPTS
 
@@ -49,8 +52,14 @@ IF EXIST %FILENAME% IF x%FILENAME:update=%==x%FILENAME% (
     ) else (
         %ESPTOOL_CMD% --baud 115200 write_flash 0x260000 bleota-s3.bin
     )
-    for %%f in (littlefs-*.bin) do (
-        %ESPTOOL_CMD% --baud 115200 write_flash 0x300000 %%f
+    IF %WEB_APP%==1 (
+        for %%f in (littlefswebui-*.bin) do (
+            %ESPTOOL_CMD% --baud 115200 write_flash 0x300000 %%f
+        )
+    ) else (
+        for %%f in (littlefs-*.bin) do (
+            %ESPTOOL_CMD% --baud 115200 write_flash 0x300000 %%f
+        )
     )
 ) else (
     echo "Invalid file: %FILENAME%"

bin/device-install.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 PYTHON=${PYTHON:-$(which python3 python | head -n 1)}
+WEB_APP=false
 
 # Determine the correct esptool command to use
 if "$PYTHON" -m esptool version >/dev/null 2>&1; then
@@ -19,16 +20,26 @@ set -e
 # Usage info
 show_help() {
 	cat <<EOF
-Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME|FILENAME]
+Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME|FILENAME] [--web]
 Flash image file to device, but first erasing and writing system information"
 
     -h               Display this help and exit
     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
     -f FILENAME      The .bin file to flash.  Custom to your device type and region.
+    --web            Flash WEB APP.
 
 EOF
 }
+# Preprocess long options like --web
+for arg in "$@"; do
+    case "$arg" in
+        --web)
+            WEB_APP=true
+            shift # Remove this argument from the list
+            ;;
+    esac
+done
 
 while getopts ":hp:P:f:" opt; do
 	case "${opt}" in
@@ -73,7 +84,11 @@ if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
 	else
 		$ESPTOOL_CMD write_flash 0x260000 bleota-s3.bin
 	fi
-	$ESPTOOL_CMD write_flash 0x300000 littlefs-*.bin
+	if [ "$WEB_APP" = true ]; then
+		$ESPTOOL_CMD write_flash 0x300000 littlefswebui-*.bin
+	else
+		$ESPTOOL_CMD write_flash 0x300000 littlefs-*.bin
+	fi
 
 else
 	show_help

boards/wiscore_rak11720.json

@@ -0,0 +1,45 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "f_cpu": "48000000L",
+    "mcu": "AMA3B1KK",
+    "part": "apollo3",
+    "fabi": "hard",
+    "specs": "nosys.specs",
+    "framework": {
+      "arduino": {
+        "v1": {
+          "variant": "artemis",
+          "extra_flags": "-DSFE_ARTEMIS"
+        },
+        "v2": {
+          "variant": "rak11720",
+          "extra_flags": "-DARDUINO_RAK_11720_MODULE"
+        }
+      },
+      "ambiqsdk-sfe": {
+        "variant": ["boards_sfe", "artemis_module"],
+        "extra_flags": "",
+        "variant_lib_src_filter": ""
+      }
+    }
+  },
+  "debug": {
+    "jlink_device": "AMA3B1KK-KBR",
+    "svd_path": "apollo3.svd",
+    "swo_freq": 12000000,
+    "init": {
+      "break": "tbreak setup"
+    }
+  },
+  "frameworks": ["arduino", "ambiqsdk-sfe"],
+  "name": "WisCore RAK11720 Board",
+  "upload": {
+    "maximum_ram_size": 393216,
+    "maximum_size": 983040,
+    "protocol": "svl",
+    "protocols": ["svl", "asb", "jlink"]
+  },
+  "url": "https://www.rakwireless.com",
+  "vendor": "RAKwireless"
+}

platformio.ini

@@ -154,15 +154,11 @@ lib_deps =
 	sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@1.2.13
 	ClosedCube OPT3001@1.1.2
 	emotibit/EmotiBit MLX90632@1.0.8
-	dfrobot/DFRobot_RTU@1.0.3
 	sparkfun/SparkFun MAX3010x Pulse and Proximity Sensor Library@1.1.2
 	adafruit/Adafruit MLX90614 Library@2.1.5
-
 	https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.7.2502
 	boschsensortec/BME68x Sensor Library@1.1.40407
 	https://github.com/KodinLanewave/INA3221@1.0.1
-	lewisxhe/SensorLib@0.2.0
 	mprograms/QMC5883LCompass@1.2.3
-
+	dfrobot/DFRobot_RTU@1.0.3
 	https://github.com/meshtastic/DFRobot_LarkWeatherStation#4de3a9cadef0f6a5220a8a906cf9775b02b0040d
-	https://github.com/gjelsoe/STK8xxx-Accelerometer.git#v0.1.1

release/latest/.gitignore

@@ -1 +0,0 @@
-curfirmwareversion.xml

src/AudioThread.h

@@ -64,7 +64,7 @@ class AudioThread : public concurrency::OSThread
     void initOutput()
     {
         audioOut = new AudioOutputI2S(1, AudioOutputI2S::EXTERNAL_I2S);
-        audioOut->SetPinout(DAC_I2S_BCK, DAC_I2S_WS, DAC_I2S_DOUT);
+        audioOut->SetPinout(DAC_I2S_BCK, DAC_I2S_WS, DAC_I2S_DOUT, DAC_I2S_MCLK);
         audioOut->SetGain(0.2);
     };
 

src/FSCommon.cpp

@@ -24,11 +24,16 @@ SPIClass SPI1(HSPI);
 
 #endif // HAS_SDCARD
 
-#if defined(ARCH_STM32WL)
+#if defined(ARCH_APOLLO3)
+// Apollo series 2 Kbytes (8 rows of 256 bytes)
 
 uint16_t OSFS::startOfEEPROM = 1;
 uint16_t OSFS::endOfEEPROM = 2048;
 
+// Useful consts
+const OSFS::result noerr = OSFS::result::NO_ERROR;
+const OSFS::result notfound = OSFS::result::FILE_NOT_FOUND;
+
 // 3) How do I read from the medium?
 void OSFS::readNBytes(uint16_t address, unsigned int num, byte *output)
 {
@@ -66,7 +71,7 @@ extern "C" void lfs_assert(const char *reason)
  */
 bool copyFile(const char *from, const char *to)
 {
-#ifdef ARCH_STM32WL
+#if defined(ARCH_STM32WL) || defined(ARCH_APOLLO3)
     unsigned char cbuffer[2048];
 
     // Var to hold the result of actions
@@ -129,7 +134,7 @@ bool copyFile(const char *from, const char *to)
  */
 bool renameFile(const char *pathFrom, const char *pathTo)
 {
-#ifdef ARCH_STM32WL
+#if defined(ARCH_STM32WL) || defined(ARCH_APOLLO3)
     if (copyFile(pathFrom, pathTo) && (OSFS::deleteFile(pathFrom) == OSFS::result::NO_ERROR)) {
         return true;
     } else {

src/FSCommon.h

@@ -24,6 +24,25 @@ const OSFS::result noerr = OSFS::result::NO_ERROR;
 const OSFS::result notfound = OSFS::result::FILE_NOT_FOUND;
 #endif
 
+#if defined(ARCH_APOLLO3)
+// Apollo series 2 Kbytes (8 rows of 256 bytes)
+#include <EEPROM.h>
+#include <OSFS.h>
+
+extern uint16_t OSFS::startOfEEPROM;
+extern uint16_t OSFS::endOfEEPROM;
+
+// Useful consts
+extern const OSFS::result noerr;
+extern const OSFS::result notfound;
+
+// 3) How do I read from the medium?
+void OSFS::readNBytes(uint16_t address, unsigned int num, byte *output);
+
+// 4) How to I write to the medium?
+void OSFS::writeNBytes(uint16_t address, unsigned int num, const byte *input);
+#endif
+
 #if defined(ARCH_RP2040)
 // RP2040
 #include "LittleFS.h"

src/RedirectablePrint.cpp

@@ -1,8 +1,8 @@
 #include "RedirectablePrint.h"
 #include "NodeDB.h"
-#include "RTC.h"
 #include "concurrency/OSThread.h"
 #include "configuration.h"
+#include "gps/RTC.h"
 #include "main.h"
 #include "mesh/generated/meshtastic/mesh.pb.h"
 #include <assert.h>

src/configuration.h

@@ -148,6 +148,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NAU7802_ADDR 0x2A
 #define MAX30102_ADDR 0x57
 #define MLX90614_ADDR_DEF 0x5A
+#define CGRADSENS_ADDR 0x66
 
 // -----------------------------------------------------------------------------
 // ACCELEROMETER

src/detect/ScanI2C.h

@@ -63,7 +63,8 @@ class ScanI2C
         ICM20948,
         MAX30102,
         TPS65233,
-        MPR121KB
+        MPR121KB,
+        CGRADSENS
     } DeviceType;
 
     // typedef uint8_t DeviceAddress;

src/detect/ScanI2CTwoWire.cpp

@@ -86,7 +86,7 @@ ScanI2C::DeviceType ScanI2CTwoWire::probeOLED(ScanI2C::DeviceAddress addr) const
 }
 void ScanI2CTwoWire::printATECCInfo() const
 {
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(ARCH_APOLLO3)
     atecc.readConfigZone(false);
 
     std::string atecc_numbers = "ATECC608B Serial Number: ";
@@ -206,7 +206,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 type = probeOLED(addr);
                 break;
 
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(ARCH_APOLLO3)
             case ATECC608B_ADDR:
 #ifdef RP2040_SLOW_CLOCK
                 if (atecc.begin(addr.address, Wire, Serial2) == true)
@@ -314,19 +314,34 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 break;
             case INA3221_ADDR:
                 registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0xFE), 2);
-                LOG_DEBUG("Register MFG_UID: 0x%x", registerValue);
+                LOG_DEBUG("Register MFG_UID FE: 0x%x", registerValue);
                 if (registerValue == 0x5449) {
                     LOG_INFO("INA3221 sensor found at address 0x%x", (uint8_t)addr.address);
                     type = INA3221;
                 } else {
-                    LOG_INFO("DFRobot Lark weather station found at address 0x%x", (uint8_t)addr.address);
-                    type = DFROBOT_LARK;
+                    /* check the first 2 bytes of the 6 byte response register
+                    LARK FW 1.0 should return:
+                    RESPONSE_STATUS STATUS_SUCCESS (0x53)
+                    RESPONSE_CMD CMD_GET_VERSION (0x05)
+                    RESPONSE_LEN_L 0x02
+                    RESPONSE_LEN_H 0x00
+                    RESPONSE_PAYLOAD 0x01
+                    RESPONSE_PAYLOAD+1 0x00
+                    */
+                    registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x05), 2);
+                    LOG_DEBUG("Register MFG_UID 05: 0x%x", registerValue);
+                    if (registerValue == 0x5305) {
+                        LOG_INFO("DFRobot Lark weather station found at address 0x%x", (uint8_t)addr.address);
+                        type = DFROBOT_LARK;
+                    }
+                    // else: probably a RAK12500/UBLOX GPS on I2C
                 }
                 break;
             case MCP9808_ADDR:
                 // We need to check for STK8BAXX first, since register 0x07 is new data flag for the z-axis and can produce some
                 // weird result. and register 0x00 doesn't seems to be colliding with MCP9808 and LIS3DH chips.
                 {
+#ifdef HAS_STK8XXX
                     // Check register 0x00 for 0x8700 response to ID STK8BA53 chip.
                     registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x00), 2);
                     if (registerValue == 0x8700) {
@@ -334,6 +349,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                         LOG_INFO("STK8BAXX accelerometer found");
                         break;
                     }
+#endif
 
                     // Check register 0x07 for 0x0400 response to ID MCP9808 chip.
                     registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x07), 2);
@@ -463,6 +479,16 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 }
                 break;
 
+            case CGRADSENS_ADDR:
+                // Register 0x00 of the RadSens sensor contains is product identifier 0x7D
+                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x00), 1);
+                if (registerValue == 0x7D) {
+                    type = CGRADSENS;
+                    LOG_INFO("ClimateGuard RadSens Geiger-Muller Sensor found");
+                    break;
+                }
+                break;
+
             default:
                 LOG_INFO("Device found at address 0x%x was not able to be enumerated", addr.address);
             }

src/gps/GPS.cpp

@@ -788,7 +788,8 @@ void GPS::setPowerState(GPSPowerState newState, uint32_t sleepTime)
 void GPS::writePinEN(bool on)
 {
     // Abort: if conflict with Canned Messages when using Wisblock(?)
-    if (HW_VENDOR == meshtastic_HardwareModel_RAK4631 && (rotaryEncoderInterruptImpl1 || upDownInterruptImpl1))
+    if ((HW_VENDOR == meshtastic_HardwareModel_RAK4631 || HW_VENDOR == meshtastic_HardwareModel_WISMESH_TAP) &&
+        (rotaryEncoderInterruptImpl1 || upDownInterruptImpl1))
         return;
 
     // Write and log
@@ -1112,7 +1113,7 @@ const char *DETECTED_MESSAGE = "%s detected, using %s Module";
 
 GnssModel_t GPS::probe(int serialSpeed)
 {
-#if defined(ARCH_NRF52) || defined(ARCH_PORTDUINO) || defined(ARCH_STM32WL)
+#if defined(ARCH_NRF52) || defined(ARCH_PORTDUINO) || defined(ARCH_STM32WL) || defined(ARCH_APOLLO3)
     _serial_gps->end();
     _serial_gps->begin(serialSpeed);
 #elif defined(ARCH_RP2040)

src/gps/GPS.h

@@ -64,6 +64,95 @@ const char *getDOPString(uint32_t dop);
  */
 class GPS : private concurrency::OSThread
 {
+  public:
+    meshtastic_Position p = meshtastic_Position_init_default;
+
+    /** This is normally bound to config.position.gps_en_gpio but some rare boards (like heltec tracker) need more advanced
+     * implementations. Those boards will set this public variable to a custom implementation.
+     *
+     * Normally set by GPS::createGPS()
+     */
+    GpioVirtPin *enablePin = NULL;
+
+    virtual ~GPS();
+
+    /** We will notify this observable anytime GPS state has changed meaningfully */
+    Observable<const meshtastic::GPSStatus *> newStatus;
+
+    /**
+     * Returns true if we succeeded
+     */
+    virtual bool setup();
+
+    // re-enable the thread
+    void enable();
+
+    // Disable the thread
+    int32_t disable() override;
+
+    // toggle between enabled/disabled
+    void toggleGpsMode();
+
+    // Change the power state of the GPS - for power saving / shutdown
+    void setPowerState(GPSPowerState newState, uint32_t sleepMs = 0);
+
+    /// Returns true if we have acquired GPS lock.
+    virtual bool hasLock();
+
+    /// Returns true if there's valid data flow with the chip.
+    virtual bool hasFlow();
+
+    /// Return true if we are connected to a GPS
+    bool isConnected() const { return hasGPS; }
+
+    bool isPowerSaving() const { return config.position.gps_mode != meshtastic_Config_PositionConfig_GpsMode_ENABLED; }
+
+    // Empty the input buffer as quickly as possible
+    void clearBuffer();
+
+    virtual bool factoryReset();
+
+    // Creates an instance of the GPS class.
+    // Returns the new instance or null if the GPS is not present.
+    static GPS *createGps();
+
+    // Wake the GPS hardware - ready for an update
+    void up();
+
+    // Let the GPS hardware save power between updates
+    void down();
+
+  protected:
+    /// Record that we have a GPS
+    void setConnected();
+
+    /** Subclasses should look for serial rx characters here and feed it to their GPS parser
+     *
+     * Return true if we received a valid message from the GPS
+     */
+    virtual bool whileActive();
+
+    /**
+     * Perform any processing that should be done only while the GPS is awake and looking for a fix.
+     * Override this method to check for new locations
+     *
+     * @return true if we've acquired a time
+     */
+    virtual bool lookForTime();
+
+    /**
+     * Perform any processing that should be done only while the GPS is awake and looking for a fix.
+     * Override this method to check for new locations
+     *
+     * @return true if we've acquired a new location
+     */
+    virtual bool lookForLocation();
+
+    GnssModel_t gnssModel = GNSS_MODEL_UNKNOWN;
+
+  private:
+    GPS() : concurrency::OSThread("GPS") {}
+
     TinyGPSPlus reader;
     uint8_t fixQual = 0; // fix quality from GPGGA
     uint32_t lastChecksumFailCount = 0;
@@ -75,7 +164,6 @@ class GPS : private concurrency::OSThread
     TinyGPSCustom gsapdop;    // custom extract PDOP from GPGSA
     uint8_t fixType = 0;      // fix type from GPGSA
 #endif
-  private:
 #if GPS_BAUDRATE_FIXED
     // if GPS_BAUDRATE is specified in variant, only try that.
     const int serialSpeeds[1] = {GPS_BAUDRATE};
@@ -113,7 +201,6 @@ class GPS : private concurrency::OSThread
 
     CallbackObserver<GPS, void *> notifyDeepSleepObserver = CallbackObserver<GPS, void *>(this, &GPS::prepareDeepSleep);
 
-  public:
     /** If !NULL we will use this serial port to construct our GPS */
 #if defined(ARCH_RP2040)
     static SerialUART *_serial_gps;
@@ -167,53 +254,6 @@ class GPS : private concurrency::OSThread
 
     const char *ACK_SUCCESS_MESSAGE = "Get ack success!";
 
-    meshtastic_Position p = meshtastic_Position_init_default;
-
-    /** This is normally bound to config.position.gps_en_gpio but some rare boards (like heltec tracker) need more advanced
-     * implementations. Those boards will set this public variable to a custom implementation.
-     *
-     * Normally set by GPS::createGPS()
-     */
-    GpioVirtPin *enablePin = NULL;
-
-    GPS() : concurrency::OSThread("GPS") {}
-
-    virtual ~GPS();
-
-    /** We will notify this observable anytime GPS state has changed meaningfully */
-    Observable<const meshtastic::GPSStatus *> newStatus;
-
-    /**
-     * Returns true if we succeeded
-     */
-    virtual bool setup();
-
-    // re-enable the thread
-    void enable();
-
-    // Disable the thread
-    int32_t disable() override;
-
-    // toggle between enabled/disabled
-    void toggleGpsMode();
-
-    // Change the power state of the GPS - for power saving / shutdown
-    void setPowerState(GPSPowerState newState, uint32_t sleepMs = 0);
-
-    /// Returns true if we have acquired GPS lock.
-    virtual bool hasLock();
-
-    /// Returns true if there's valid data flow with the chip.
-    virtual bool hasFlow();
-
-    /// Return true if we are connected to a GPS
-    bool isConnected() const { return hasGPS; }
-
-    bool isPowerSaving() const { return config.position.gps_mode != meshtastic_Config_PositionConfig_GpsMode_ENABLED; }
-
-    // Empty the input buffer as quickly as possible
-    void clearBuffer();
-
     // Create a ublox packet for editing in memory
     uint8_t makeUBXPacket(uint8_t class_id, uint8_t msg_id, uint8_t payload_size, const uint8_t *msg);
     uint8_t makeCASPacket(uint8_t class_id, uint8_t msg_id, uint8_t payload_size, const uint8_t *msg);
@@ -229,59 +269,6 @@ class GPS : private concurrency::OSThread
 
     GPS_RESPONSE getACKCas(uint8_t class_id, uint8_t msg_id, uint32_t waitMillis);
 
-    virtual bool factoryReset();
-
-    // Creates an instance of the GPS class.
-    // Returns the new instance or null if the GPS is not present.
-    static GPS *createGps();
-
-    // Wake the GPS hardware - ready for an update
-    void up();
-
-    // Let the GPS hardware save power between updates
-    void down();
-
-  protected:
-    /**
-     * Perform any processing that should be done only while the GPS is awake and looking for a fix.
-     * Override this method to check for new locations
-     *
-     * @return true if we've acquired a time
-     */
-
-    /**
-     * Perform any processing that should be done only while the GPS is awake and looking for a fix.
-     * Override this method to check for new locations
-     *
-     * @return true if we've acquired a new location
-     */
-
-    /// Record that we have a GPS
-    void setConnected();
-
-    /** Subclasses should look for serial rx characters here and feed it to their GPS parser
-     *
-     * Return true if we received a valid message from the GPS
-     */
-    virtual bool whileActive();
-
-    /**
-     * Perform any processing that should be done only while the GPS is awake and looking for a fix.
-     * Override this method to check for new locations
-     *
-     * @return true if we've acquired a time
-     */
-    virtual bool lookForTime();
-
-    /**
-     * Perform any processing that should be done only while the GPS is awake and looking for a fix.
-     * Override this method to check for new locations
-     *
-     * @return true if we've acquired a new location
-     */
-    virtual bool lookForLocation();
-
-  private:
     /// Prepare the GPS for the cpu entering deep sleep, expect to be gone for at least 100s of msecs
     /// always returns 0 to indicate okay to sleep
     int prepareDeepSleep(void *unused);
@@ -320,10 +307,7 @@ class GPS : private concurrency::OSThread
     uint8_t fixeddelayCtr = 0;
 
     const char *powerStateToString();
-
-  protected:
-    GnssModel_t gnssModel = GNSS_MODEL_UNKNOWN;
 };
 
 extern GPS *gps;
-#endif // Exclude GPS
+#endif // Exclude GPS

src/gps/NMEAWPL.cpp

@@ -23,7 +23,7 @@ uint32_t printWPL(char *buf, size_t bufsz, const meshtastic_PositionLite &pos, c
 {
     GeoCoord geoCoord(pos.latitude_i, pos.longitude_i, pos.altitude);
     char type = isCaltopoMode ? 'P' : 'N';
-    uint32_t len = snprintf(buf, bufsz, "$G%cWPL,%02d%07.4f,%c,%03d%07.4f,%c,%s", type, geoCoord.getDMSLatDeg(),
+    uint32_t len = snprintf(buf, bufsz, "\r\n$G%cWPL,%02d%07.4f,%c,%03d%07.4f,%c,%s", type, geoCoord.getDMSLatDeg(),
                             (abs(geoCoord.getLatitude()) - geoCoord.getDMSLatDeg() * 1e+7) * 6e-6, geoCoord.getDMSLatCP(),
                             geoCoord.getDMSLonDeg(), (abs(geoCoord.getLongitude()) - geoCoord.getDMSLonDeg() * 1e+7) * 6e-6,
                             geoCoord.getDMSLonCP(), name);

src/graphics/Screen.cpp

@@ -101,9 +101,9 @@ std::vector<MeshModule *> moduleFrames;
 static char ourId[5];
 
 // vector where symbols (string) are displayed in bottom corner of display.
-std::vector<std::string> functionSymbals;
-// string displayed in bottom right corner of display. Created from elements in functionSymbals vector
-std::string functionSymbalString = "";
+std::vector<std::string> functionSymbol;
+// string displayed in bottom right corner of display. Created from elements in functionSymbol vector
+std::string functionSymbolString = "";
 
 #if HAS_GPS
 // GeoCoord object for the screen
@@ -243,10 +243,10 @@ static void drawWelcomeScreen(OLEDDisplay *display, OLEDDisplayUiState *state, i
 static void drawFunctionOverlay(OLEDDisplay *display, OLEDDisplayUiState *state)
 {
     // LOG_DEBUG("Draw function overlay");
-    if (functionSymbals.begin() != functionSymbals.end()) {
+    if (functionSymbol.begin() != functionSymbol.end()) {
         char buf[64];
         display->setFont(FONT_SMALL);
-        snprintf(buf, sizeof(buf), "%s", functionSymbalString.c_str());
+        snprintf(buf, sizeof(buf), "%s", functionSymbolString.c_str());
         display->drawString(SCREEN_WIDTH - display->getStringWidth(buf), SCREEN_HEIGHT - FONT_HEIGHT_SMALL, buf);
     }
 }
@@ -396,7 +396,7 @@ static void drawBattery(OLEDDisplay *display, int16_t x, int16_t y, uint8_t *img
     display->drawFastImage(x, y, 16, 8, imgBuffer);
 }
 
-#ifdef T_WATCH_S3
+#if defined(DISPLAY_CLOCK_FRAME)
 
 void Screen::drawWatchFaceToggleButton(OLEDDisplay *display, int16_t x, int16_t y, bool digitalMode, float scale)
 {
@@ -958,55 +958,65 @@ static void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state
 
     display->setColor(WHITE);
 #ifndef EXCLUDE_EMOJI
-    if (strcmp(reinterpret_cast<const char *>(mp.decoded.payload.bytes), "\U0001F44D") == 0) {
+    const char *msg = reinterpret_cast<const char *>(mp.decoded.payload.bytes);
+    if (strcmp(msg, "\U0001F44D") == 0) {
         display->drawXbm(x + (SCREEN_WIDTH - thumbs_width) / 2,
                          y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - thumbs_height) / 2 + 2 + 5, thumbs_width, thumbs_height,
                          thumbup);
-    } else if (strcmp(reinterpret_cast<const char *>(mp.decoded.payload.bytes), "\U0001F44E") == 0) {
+    } else if (strcmp(msg, "\U0001F44E") == 0) {
         display->drawXbm(x + (SCREEN_WIDTH - thumbs_width) / 2,
                          y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - thumbs_height) / 2 + 2 + 5, thumbs_width, thumbs_height,
                          thumbdown);
-    } else if (strcmp(reinterpret_cast<const char *>(mp.decoded.payload.bytes), "❓") == 0) {
+    } else if (strcmp(msg, "\U0001F60A") == 0 || strcmp(msg, "\U0001F600") == 0 || strcmp(msg, "\U0001F642") == 0 ||
+               strcmp(msg, "\U0001F609") == 0 ||
+               strcmp(msg, "\U0001F601") == 0) { // matches 5 different common smileys, so that the phone user doesn't have to
+                                                 // remember which one is compatible
+        display->drawXbm(x + (SCREEN_WIDTH - smiley_width) / 2,
+                         y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - smiley_height) / 2 + 2 + 5, smiley_width, smiley_height,
+                         smiley);
+    } else if (strcmp(msg, "❓") == 0) {
         display->drawXbm(x + (SCREEN_WIDTH - question_width) / 2,
                          y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - question_height) / 2 + 2 + 5, question_width, question_height,
                          question);
-    } else if (strcmp(reinterpret_cast<const char *>(mp.decoded.payload.bytes), "‼️") == 0) {
+    } else if (strcmp(msg, "‼️") == 0) {
         display->drawXbm(x + (SCREEN_WIDTH - bang_width) / 2, y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - bang_height) / 2 + 2 + 5,
                          bang_width, bang_height, bang);
-    } else if (strcmp(reinterpret_cast<const char *>(mp.decoded.payload.bytes), "\U0001F4A9") == 0) {
+    } else if (strcmp(msg, "\U0001F4A9") == 0) {
         display->drawXbm(x + (SCREEN_WIDTH - poo_width) / 2, y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - poo_height) / 2 + 2 + 5,
                          poo_width, poo_height, poo);
-    } else if (strcmp(reinterpret_cast<const char *>(mp.decoded.payload.bytes), "\xf0\x9f\xa4\xa3") == 0) {
+    } else if (strcmp(msg, "\U0001F923") == 0) {
         display->drawXbm(x + (SCREEN_WIDTH - haha_width) / 2, y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - haha_height) / 2 + 2 + 5,
                          haha_width, haha_height, haha);
-    } else if (strcmp(reinterpret_cast<const char *>(mp.decoded.payload.bytes), "\U0001F44B") == 0) {
+    } else if (strcmp(msg, "\U0001F44B") == 0) {
         display->drawXbm(x + (SCREEN_WIDTH - wave_icon_width) / 2,
                          y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - wave_icon_height) / 2 + 2 + 5, wave_icon_width,
                          wave_icon_height, wave_icon);
-    } else if (strcmp(reinterpret_cast<const char *>(mp.decoded.payload.bytes), "\U0001F920") == 0) {
+    } else if (strcmp(msg, "\U0001F920") == 0) {
         display->drawXbm(x + (SCREEN_WIDTH - cowboy_width) / 2,
                          y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - cowboy_height) / 2 + 2 + 5, cowboy_width, cowboy_height,
                          cowboy);
-    } else if (strcmp(reinterpret_cast<const char *>(mp.decoded.payload.bytes), "\U0001F42D") == 0) {
+    } else if (strcmp(msg, "\U0001F42D") == 0) {
         display->drawXbm(x + (SCREEN_WIDTH - deadmau5_width) / 2,
                          y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - deadmau5_height) / 2 + 2 + 5, deadmau5_width, deadmau5_height,
                          deadmau5);
-    } else if (strcmp(reinterpret_cast<const char *>(mp.decoded.payload.bytes), "\xE2\x98\x80\xEF\xB8\x8F") == 0) {
+    } else if (strcmp(msg, "\xE2\x98\x80\xEF\xB8\x8F") == 0) {
         display->drawXbm(x + (SCREEN_WIDTH - sun_width) / 2, y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - sun_height) / 2 + 2 + 5,
                          sun_width, sun_height, sun);
-    } else if (strcmp(reinterpret_cast<const char *>(mp.decoded.payload.bytes), "\u2614") == 0) {
+    } else if (strcmp(msg, "\u2614") == 0) {
         display->drawXbm(x + (SCREEN_WIDTH - rain_width) / 2, y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - rain_height) / 2 + 2 + 10,
                          rain_width, rain_height, rain);
-    } else if (strcmp(reinterpret_cast<const char *>(mp.decoded.payload.bytes), "☁️") == 0) {
+    } else if (strcmp(msg, "☁️") == 0) {
         display->drawXbm(x + (SCREEN_WIDTH - cloud_width) / 2,
                          y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - cloud_height) / 2 + 2 + 5, cloud_width, cloud_height, cloud);
-    } else if (strcmp(reinterpret_cast<const char *>(mp.decoded.payload.bytes), "🌫️") == 0) {
+    } else if (strcmp(msg, "🌫️") == 0) {
         display->drawXbm(x + (SCREEN_WIDTH - fog_width) / 2, y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - fog_height) / 2 + 2 + 5,
                          fog_width, fog_height, fog);
-    } else if (strcmp(reinterpret_cast<const char *>(mp.decoded.payload.bytes), "\xf0\x9f\x98\x88") == 0) {
+    } else if (strcmp(msg, "\U0001F608") == 0) {
         display->drawXbm(x + (SCREEN_WIDTH - devil_width) / 2,
                          y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - devil_height) / 2 + 2 + 5, devil_width, devil_height, devil);
-    } else if (strcmp(reinterpret_cast<const char *>(mp.decoded.payload.bytes), "♥️") == 0) {
+    } else if (strcmp(msg, "♥️") == 0 || strcmp(msg, "\U0001F9E1") == 0 || strcmp(msg, "\U00002763") == 0 ||
+               strcmp(msg, "\U00002764") == 0 || strcmp(msg, "\U0001F495") == 0 || strcmp(msg, "\U0001F496") == 0 ||
+               strcmp(msg, "\U0001F497") == 0 || strcmp(msg, "\U0001F496") == 0) {
         display->drawXbm(x + (SCREEN_WIDTH - heart_width) / 2,
                          y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - heart_height) / 2 + 2 + 5, heart_width, heart_height, heart);
     } else {
@@ -2058,7 +2068,7 @@ void Screen::setFrames(FrameFocus focus)
         focus = FOCUS_FAULT; // Change our "focus" parameter, to ensure we show the fault frame
     }
 
-#ifdef T_WATCH_S3
+#if defined(DISPLAY_CLOCK_FRAME)
     normalFrames[numframes++] = screen->digitalWatchFace ? &Screen::drawDigitalClockFrame : &Screen::drawAnalogClockFrame;
 #endif
 
@@ -2242,24 +2252,24 @@ void Screen::decreaseBrightness()
     /* TO DO: add little popup in center of screen saying what brightness level it is set to*/
 }
 
-void Screen::setFunctionSymbal(std::string sym)
+void Screen::setFunctionSymbol(std::string sym)
 {
-    if (std::find(functionSymbals.begin(), functionSymbals.end(), sym) == functionSymbals.end()) {
-        functionSymbals.push_back(sym);
-        functionSymbalString = "";
-        for (auto symbol : functionSymbals) {
-            functionSymbalString = symbol + " " + functionSymbalString;
+    if (std::find(functionSymbol.begin(), functionSymbol.end(), sym) == functionSymbol.end()) {
+        functionSymbol.push_back(sym);
+        functionSymbolString = "";
+        for (auto symbol : functionSymbol) {
+            functionSymbolString = symbol + " " + functionSymbolString;
         }
         setFastFramerate();
     }
 }
 
-void Screen::removeFunctionSymbal(std::string sym)
+void Screen::removeFunctionSymbol(std::string sym)
 {
-    functionSymbals.erase(std::remove(functionSymbals.begin(), functionSymbals.end(), sym), functionSymbals.end());
-    functionSymbalString = "";
-    for (auto symbol : functionSymbals) {
-        functionSymbalString = symbol + " " + functionSymbalString;
+    functionSymbol.erase(std::remove(functionSymbol.begin(), functionSymbol.end(), sym), functionSymbol.end());
+    functionSymbolString = "";
+    for (auto symbol : functionSymbol) {
+        functionSymbolString = symbol + " " + functionSymbolString;
     }
     setFastFramerate();
 }
@@ -2689,7 +2699,7 @@ int Screen::handleUIFrameEvent(const UIFrameEvent *event)
 int Screen::handleInputEvent(const InputEvent *event)
 {
 
-#ifdef T_WATCH_S3
+#if defined(DISPLAY_CLOCK_FRAME)
     // For the T-Watch, intercept touches to the 'toggle digital/analog watch face' button
     uint8_t watchFaceFrame = error_code ? 1 : 0;
 
@@ -2747,4 +2757,4 @@ int Screen::handleAdminMessage(const meshtastic_AdminMessage *arg)
 } // namespace graphics
 #else
 graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {}
-#endif // HAS_SCREEN
+#endif // HAS_SCREEN

src/graphics/Screen.h

@@ -24,8 +24,8 @@ class Screen
     void startFirmwareUpdateScreen() {}
     void increaseBrightness() {}
     void decreaseBrightness() {}
-    void setFunctionSymbal(std::string) {}
-    void removeFunctionSymbal(std::string) {}
+    void setFunctionSymbol(std::string) {}
+    void removeFunctionSymbol(std::string) {}
     void startAlert(const char *) {}
     void endAlert() {}
 };
@@ -282,8 +282,8 @@ class Screen : public concurrency::OSThread
     void increaseBrightness();
     void decreaseBrightness();
 
-    void setFunctionSymbal(std::string sym);
-    void removeFunctionSymbal(std::string sym);
+    void setFunctionSymbol(std::string sym);
+    void removeFunctionSymbol(std::string sym);
 
     /// Stops showing the boot screen.
     void stopBootScreen() { enqueueCmd(ScreenCmd{.cmd = Cmd::STOP_BOOT_SCREEN}); }
@@ -554,7 +554,7 @@ class Screen : public concurrency::OSThread
 
     static void drawDebugInfoWiFiTrampoline(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
 
-#ifdef T_WATCH_S3
+#if defined(DISPLAY_CLOCK_FRAME)
     static void drawAnalogClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
 
     static void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
@@ -605,4 +605,4 @@ class Screen : public concurrency::OSThread
 
 } // namespace graphics
 
-#endif
+#endif

src/graphics/images.h

@@ -14,7 +14,7 @@ const uint8_t imgUser[] PROGMEM = {0x3C, 0x42, 0x99, 0xA5, 0xA5, 0x99, 0x42, 0x3
 const uint8_t imgPositionEmpty[] PROGMEM = {0x20, 0x30, 0x28, 0x24, 0x42, 0xFF};
 const uint8_t imgPositionSolid[] PROGMEM = {0x20, 0x30, 0x38, 0x3C, 0x7E, 0xFF};
 
-#ifdef T_WATCH_S3
+#if defined(DISPLAY_CLOCK_FRAME)
 const uint8_t bluetoothConnectedIcon[36] PROGMEM = {0xfe, 0x01, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0xe3, 0x1f,
                                                     0xf3, 0x3f, 0x33, 0x30, 0x33, 0x33, 0x33, 0x33, 0x03, 0x33, 0xff, 0x33,
                                                     0xfe, 0x31, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0xf0, 0x3f, 0xe0, 0x1f};
@@ -56,6 +56,16 @@ static unsigned char thumbdown[] PROGMEM = {
     0x80, 0x09, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00,
 };
 
+#define smiley_height 30
+#define smiley_width 30
+static unsigned char smiley[] PROGMEM = {
+    0x00, 0xfe, 0x0f, 0x00, 0x80, 0x01, 0x30, 0x00, 0x40, 0x00, 0xc0, 0x00, 0x20, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x02,
+    0x08, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x08, 0x04, 0x00, 0x00, 0x10, 0x02, 0x0e, 0x0e, 0x10, 0x02, 0x09, 0x12, 0x10,
+    0x01, 0x09, 0x12, 0x20, 0x01, 0x0f, 0x1e, 0x20, 0x01, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x20,
+    0x01, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x20, 0x81, 0x00, 0x20, 0x20,
+    0x82, 0x00, 0x20, 0x10, 0x02, 0x01, 0x10, 0x10, 0x04, 0x02, 0x08, 0x08, 0x04, 0xfc, 0x07, 0x08, 0x08, 0x00, 0x00, 0x04,
+    0x10, 0x00, 0x00, 0x02, 0x20, 0x00, 0x00, 0x01, 0x40, 0x00, 0xc0, 0x00, 0x80, 0x01, 0x30, 0x00, 0x00, 0xfe, 0x0f, 0x00};
+
 #define question_height 25
 #define question_width 25
 static unsigned char question[] PROGMEM = {

src/main.cpp

@@ -14,13 +14,13 @@
 
 #include "FSCommon.h"
 #include "Led.h"
-#include "RTC.h"
 #include "SPILock.h"
 #include "Throttle.h"
 #include "concurrency/OSThread.h"
 #include "concurrency/Periodic.h"
 #include "detect/ScanI2C.h"
 #include "error.h"
+#include "gps/RTC.h"
 #include "power.h"
 
 #if !MESHTASTIC_EXCLUDE_I2C
@@ -28,6 +28,7 @@
 #include <Wire.h>
 #endif
 #include "detect/einkScan.h"
+#include "gps/RTC.h"
 #include "graphics/RAKled.h"
 #include "graphics/Screen.h"
 #include "main.h"
@@ -103,7 +104,7 @@ NRF52Bluetooth *nrf52Bluetooth = nullptr;
 #include "AmbientLightingThread.h"
 #include "PowerFSMThread.h"
 
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_APOLLO3)
 #include "motion/AccelerometerThread.h"
 AccelerometerThread *accelerometerThread = nullptr;
 #endif
@@ -150,7 +151,7 @@ ScanI2C::DeviceAddress accelerometer_found = ScanI2C::ADDRESS_NONE;
 // The I2C address of the RGB LED (if found)
 ScanI2C::FoundDevice rgb_found = ScanI2C::FoundDevice(ScanI2C::DeviceType::NONE, ScanI2C::ADDRESS_NONE);
 
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(ARCH_APOLLO3)
 ATECCX08A atecc;
 #endif
 
@@ -614,6 +615,7 @@ void setup()
     SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::DFROBOT_LARK, meshtastic_TelemetrySensorType_DFROBOT_LARK)
     SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::ICM20948, meshtastic_TelemetrySensorType_ICM20948)
     SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::MAX30102, meshtastic_TelemetrySensorType_MAX30102)
+    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::CGRADSENS, meshtastic_TelemetrySensorType_RADSENS)
 
     i2cScanner.reset();
 #endif
@@ -689,7 +691,7 @@ void setup()
 #endif
 
 #if !MESHTASTIC_EXCLUDE_I2C
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(ARCH_APOLLO3)
     if (acc_info.type != ScanI2C::DeviceType::NONE) {
         accelerometerThread = new AccelerometerThread(acc_info.type);
     }
@@ -697,7 +699,7 @@ void setup()
 
 #if defined(HAS_NEOPIXEL) || defined(UNPHONE) || defined(RGBLED_RED)
     ambientLightingThread = new AmbientLightingThread(ScanI2C::DeviceType::NONE);
-#elif !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+#elif !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(ARCH_APOLLO3)
     if (rgb_found.type != ScanI2C::DeviceType::NONE) {
         ambientLightingThread = new AmbientLightingThread(rgb_found.type);
     }

src/main.h

@@ -10,7 +10,7 @@
 #include "mesh/generated/meshtastic/telemetry.pb.h"
 #include <SPI.h>
 #include <map>
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(ARCH_APOLLO3)
 #include <SparkFun_ATECCX08a_Arduino_Library.h>
 #endif
 #if defined(ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32S2)
@@ -39,7 +39,7 @@ extern bool pmu_found;
 extern bool isCharging;
 extern bool isUSBPowered;
 
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(ARCH_APOLLO3)
 extern ATECCX08A atecc;
 #endif
 

src/mesh/MeshService.cpp

@@ -9,8 +9,8 @@
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
-#include "RTC.h"
 #include "TypeConversions.h"
+#include "gps/RTC.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
 #include "meshUtils.h"

src/mesh/NodeDB.cpp

@@ -12,11 +12,11 @@
 #include "NodeDB.h"
 #include "PacketHistory.h"
 #include "PowerFSM.h"
-#include "RTC.h"
 #include "Router.h"
 #include "SafeFile.h"
 #include "TypeConversions.h"
 #include "error.h"
+#include "gps/RTC.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
 #include "meshUtils.h"
@@ -61,6 +61,16 @@ meshtastic_LocalConfig config;
 meshtastic_LocalModuleConfig moduleConfig;
 meshtastic_ChannelFile channelFile;
 
+#ifdef USERPREFS_USE_ADMIN_KEY_0
+static unsigned char userprefs_admin_key_0[] = USERPREFS_USE_ADMIN_KEY_0;
+#endif
+#ifdef USERPREFS_USE_ADMIN_KEY_1
+static unsigned char userprefs_admin_key_1[] = USERPREFS_USE_ADMIN_KEY_1;
+#endif
+#ifdef USERPREFS_USE_ADMIN_KEY_2
+static unsigned char userprefs_admin_key_2[] = USERPREFS_USE_ADMIN_KEY_2;
+#endif
+
 bool meshtastic_DeviceState_callback(pb_istream_t *istream, pb_ostream_t *ostream, const pb_field_iter_t *field)
 {
     if (ostream) {
@@ -114,7 +124,7 @@ NodeDB::NodeDB()
     uint32_t channelFileCRC = crc32Buffer(&channelFile, sizeof(channelFile));
 
     int saveWhat = 0;
-    bool hasUniqueId = false;
+    // bool hasUniqueId = false;
     // Get device unique id
 #if defined(ARCH_ESP32) && defined(ESP_EFUSE_OPTIONAL_UNIQUE_ID)
     uint32_t unique_id[4];
@@ -406,11 +416,37 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
 #else
     config.lora.ignore_mqtt = false;
 #endif
-#ifdef USERPREFS_USE_ADMIN_KEY
-    memcpy(config.security.admin_key[0].bytes, USERPREFS_ADMIN_KEY, 32);
-    config.security.admin_key[0].size = 32;
-    config.security.admin_key_count = 1;
+    // Initialize admin_key_count to zero
+    byte numAdminKeys = 0;
+
+#ifdef USERPREFS_USE_ADMIN_KEY_0
+    // Check if USERPREFS_ADMIN_KEY_0 is non-empty
+    if (sizeof(userprefs_admin_key_0) > 0) {
+        memcpy(config.security.admin_key[0].bytes, userprefs_admin_key_0, 32);
+        config.security.admin_key[0].size = 32;
+        numAdminKeys++;
+    }
 #endif
+
+#ifdef USERPREFS_USE_ADMIN_KEY_1
+    // Check if USERPREFS_ADMIN_KEY_1 is non-empty
+    if (sizeof(userprefs_admin_key_1) > 0) {
+        memcpy(config.security.admin_key[1].bytes, userprefs_admin_key_1, 32);
+        config.security.admin_key[1].size = 32;
+        numAdminKeys++;
+    }
+#endif
+
+#ifdef USERPREFS_USE_ADMIN_KEY_2
+    // Check if USERPREFS_ADMIN_KEY_2 is non-empty
+    if (sizeof(userprefs_admin_key_2) > 0) {
+        memcpy(config.security.admin_key[2].bytes, userprefs_admin_key_2, 32);
+        config.security.admin_key[2].size = 32;
+        numAdminKeys++;
+    }
+#endif
+    config.security.admin_key_count = numAdminKeys;
+
     if (shouldPreserveKey) {
         config.security.private_key.size = 32;
         memcpy(config.security.private_key.bytes, private_key_temp, config.security.private_key.size);
@@ -482,7 +518,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
 #ifdef RAK4630
     config.display.wake_on_tap_or_motion = true;
 #endif
-#ifdef T_WATCH_S3
+#if defined(T_WATCH_S3) || defined(SENSECAP_INDICATOR)
     config.display.screen_on_secs = 30;
     config.display.wake_on_tap_or_motion = true;
 #endif
@@ -506,7 +542,7 @@ void NodeDB::initConfigIntervals()
 
     config.display.screen_on_secs = default_screen_on_secs;
 
-#if defined(T_WATCH_S3) || defined(T_DECK) || defined(RAK14014)
+#if defined(T_WATCH_S3) || defined(T_DECK) || defined(RAK14014) || defined(SENSECAP_INDICATOR)
     config.power.is_power_saving = true;
     config.display.screen_on_secs = 30;
     config.power.wait_bluetooth_secs = 30;
@@ -867,6 +903,54 @@ void NodeDB::loadFromDisk()
         }
     }
 
+    // Make sure we load hard coded admin keys even when the configuration file has none.
+    // Initialize admin_key_count to zero
+    byte numAdminKeys = 0;
+    uint16_t sum = 0;
+#ifdef USERPREFS_USE_ADMIN_KEY_0
+    for (uint8_t b = 0; b < 32; b++) {
+        sum += config.security.admin_key[0].bytes[b];
+    }
+    if (sum == 0) {
+        numAdminKeys += 1;
+        LOG_INFO("Admin 0 key zero. Loading hard coded key from user preferences.");
+        memcpy(config.security.admin_key[0].bytes, userprefs_admin_key_0, 32);
+        config.security.admin_key[0].size = 32;
+        config.security.admin_key_count = numAdminKeys;
+        saveToDisk(SEGMENT_CONFIG);
+    }
+#endif
+
+#ifdef USERPREFS_USE_ADMIN_KEY_1
+    sum = 0;
+    for (uint8_t b = 0; b < 32; b++) {
+        sum += config.security.admin_key[1].bytes[b];
+    }
+    if (sum == 0) {
+        numAdminKeys += 1;
+        LOG_INFO("Admin 1 key zero. Loading hard coded key from user preferences.");
+        memcpy(config.security.admin_key[1].bytes, userprefs_admin_key_1, 32);
+        config.security.admin_key[1].size = 32;
+        config.security.admin_key_count = numAdminKeys;
+        saveToDisk(SEGMENT_CONFIG);
+    }
+#endif
+
+#ifdef USERPREFS_USE_ADMIN_KEY_2
+    sum = 0;
+    for (uint8_t b = 0; b < 32; b++) {
+        sum += config.security.admin_key[2].bytes[b];
+    }
+    if (sum == 0) {
+        numAdminKeys += 1;
+        LOG_INFO("Admin 2 key zero. Loading hard coded key from user preferences.");
+        memcpy(config.security.admin_key[2].bytes, userprefs_admin_key_2, 32);
+        config.security.admin_key[2].size = 32;
+        config.security.admin_key_count = numAdminKeys;
+        saveToDisk(SEGMENT_CONFIG);
+    }
+#endif
+
     state = loadProto(moduleConfigFileName, meshtastic_LocalModuleConfig_size, sizeof(meshtastic_LocalModuleConfig),
                       &meshtastic_LocalModuleConfig_msg, &moduleConfig);
     if (state != LoadFileResult::LOAD_SUCCESS) {
@@ -1325,4 +1409,4 @@ void recordCriticalError(meshtastic_CriticalErrorCode code, uint32_t address, co
     LOG_ERROR("A critical failure occurred, portduino is exiting");
     exit(2);
 #endif
-}
+}

src/mesh/RadioInterface.cpp

@@ -601,8 +601,6 @@ size_t RadioInterface::beginSending(meshtastic_MeshPacket *p)
     // LOG_DEBUG("Send queued packet on mesh (txGood=%d,rxGood=%d,rxBad=%d)", rf95.txGood(), rf95.rxGood(), rf95.rxBad());
     assert(p->which_payload_variant == meshtastic_MeshPacket_encrypted_tag); // It should have already been encoded by now
 
-    lastTxStart = millis();
-
     radioBuffer.header.from = p->from;
     radioBuffer.header.to = p->to;
     radioBuffer.header.id = p->id;

src/mesh/RadioLibInterface.cpp

@@ -278,7 +278,8 @@ void RadioLibInterface::onNotify(uint32_t notification)
                     startReceive();      // try receiving this packet, afterwards we'll be trying to transmit again
                     setTransmitDelay();
                 } else {
-                    // Send any outgoing packets we have ready
+                    // Send any outgoing packets we have ready as fast as possible to keep the time between channel scan and
+                    // actual transmission as short as possible
                     meshtastic_MeshPacket *txp = txQueue.dequeue();
                     assert(txp);
                     bool sent = startSend(txp);
@@ -470,7 +471,8 @@ void RadioLibInterface::setStandby()
 /** start an immediate transmit */
 bool RadioLibInterface::startSend(meshtastic_MeshPacket *txp)
 {
-    printPacket("Start low level send", txp);
+    /* NOTE: Minimize the actions before startTransmit() to keep the time between
+             channel scan and actual transmit as low as possible to avoid collisions. */
     if (disabled || !config.lora.tx_enabled) {
         LOG_WARN("Drop Tx packet because LoRa Tx disabled");
         packetPool.release(txp);
@@ -489,6 +491,9 @@ bool RadioLibInterface::startSend(meshtastic_MeshPacket *txp)
             completeSending();
             powerMon->clearState(meshtastic_PowerMon_State_Lora_TXOn); // Transmitter off now
             startReceive(); // Restart receive mode (because startTransmit failed to put us in xmit mode)
+        } else {
+            lastTxStart = millis();
+            printPacket("Started Tx", txp);
         }
 
         // Must be done AFTER, starting transmit, because startTransmit clears (possibly stale) interrupt pending register

src/mesh/Router.cpp

@@ -4,8 +4,8 @@
 #include "MeshRadio.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "RTC.h"
 #include "configuration.h"
+#include "gps/RTC.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
 #include "meshUtils.h"

src/mesh/StreamAPI.cpp

@@ -1,8 +1,7 @@
 #include "StreamAPI.h"
 #include "PowerFSM.h"
-#include "RTC.h"
 #include "Throttle.h"
-#include "configuration.h"
+#include "gps/RTC.h"
 
 #define START1 0x94
 #define START2 0xc3

src/mesh/generated/meshtastic/device_ui.pb.h

@@ -49,6 +49,8 @@ typedef enum _meshtastic_Language {
     meshtastic_Language_DUTCH = 12,
     /* Greek */
     meshtastic_Language_GREEK = 13,
+    /* Norwegian */
+    meshtastic_Language_NORWEGIAN = 14,
     /* Simplified Chinese (experimental) */
     meshtastic_Language_SIMPLIFIED_CHINESE = 30,
     /* Traditional Chinese (experimental) */
@@ -84,6 +86,7 @@ typedef struct _meshtastic_NodeHighlight {
     char node_name[16];
 } meshtastic_NodeHighlight;
 
+typedef PB_BYTES_ARRAY_T(16) meshtastic_DeviceUIConfig_calibration_data_t;
 typedef struct _meshtastic_DeviceUIConfig {
     /* A version integer used to invalidate saved files when we make incompatible changes. */
     uint32_t version;
@@ -109,6 +112,8 @@ typedef struct _meshtastic_DeviceUIConfig {
     /* Node list highlightening */
     bool has_node_highlight;
     meshtastic_NodeHighlight node_highlight;
+    /* 8 integers for screen calibration data */
+    meshtastic_DeviceUIConfig_calibration_data_t calibration_data;
 } meshtastic_DeviceUIConfig;
 
 
@@ -132,10 +137,10 @@ extern "C" {
 
 
 /* Initializer values for message structs */
-#define meshtastic_DeviceUIConfig_init_default   {0, 0, 0, 0, 0, 0, _meshtastic_Theme_MIN, 0, 0, 0, _meshtastic_Language_MIN, false, meshtastic_NodeFilter_init_default, false, meshtastic_NodeHighlight_init_default}
+#define meshtastic_DeviceUIConfig_init_default   {0, 0, 0, 0, 0, 0, _meshtastic_Theme_MIN, 0, 0, 0, _meshtastic_Language_MIN, false, meshtastic_NodeFilter_init_default, false, meshtastic_NodeHighlight_init_default, {0, {0}}}
 #define meshtastic_NodeFilter_init_default       {0, 0, 0, 0, 0, ""}
 #define meshtastic_NodeHighlight_init_default    {0, 0, 0, 0, ""}
-#define meshtastic_DeviceUIConfig_init_zero      {0, 0, 0, 0, 0, 0, _meshtastic_Theme_MIN, 0, 0, 0, _meshtastic_Language_MIN, false, meshtastic_NodeFilter_init_zero, false, meshtastic_NodeHighlight_init_zero}
+#define meshtastic_DeviceUIConfig_init_zero      {0, 0, 0, 0, 0, 0, _meshtastic_Theme_MIN, 0, 0, 0, _meshtastic_Language_MIN, false, meshtastic_NodeFilter_init_zero, false, meshtastic_NodeHighlight_init_zero, {0, {0}}}
 #define meshtastic_NodeFilter_init_zero          {0, 0, 0, 0, 0, ""}
 #define meshtastic_NodeHighlight_init_zero       {0, 0, 0, 0, ""}
 
@@ -164,6 +169,7 @@ extern "C" {
 #define meshtastic_DeviceUIConfig_language_tag   11
 #define meshtastic_DeviceUIConfig_node_filter_tag 12
 #define meshtastic_DeviceUIConfig_node_highlight_tag 13
+#define meshtastic_DeviceUIConfig_calibration_data_tag 14
 
 /* Struct field encoding specification for nanopb */
 #define meshtastic_DeviceUIConfig_FIELDLIST(X, a) \
@@ -179,7 +185,8 @@ X(a, STATIC,   SINGULAR, BOOL,     banner_enabled,    9) \
 X(a, STATIC,   SINGULAR, UINT32,   ring_tone_id,     10) \
 X(a, STATIC,   SINGULAR, UENUM,    language,         11) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  node_filter,      12) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  node_highlight,   13)
+X(a, STATIC,   OPTIONAL, MESSAGE,  node_highlight,   13) \
+X(a, STATIC,   SINGULAR, BYTES,    calibration_data,  14)
 #define meshtastic_DeviceUIConfig_CALLBACK NULL
 #define meshtastic_DeviceUIConfig_DEFAULT NULL
 #define meshtastic_DeviceUIConfig_node_filter_MSGTYPE meshtastic_NodeFilter
@@ -215,7 +222,7 @@ extern const pb_msgdesc_t meshtastic_NodeHighlight_msg;
 
 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_DEVICE_UI_PB_H_MAX_SIZE meshtastic_DeviceUIConfig_size
-#define meshtastic_DeviceUIConfig_size           99
+#define meshtastic_DeviceUIConfig_size           117
 #define meshtastic_NodeFilter_size               36
 #define meshtastic_NodeHighlight_size            25
 

src/mesh/generated/meshtastic/deviceonly.pb.h

@@ -90,6 +90,8 @@ typedef struct _meshtastic_NodeInfoLite {
     /* True if node is in our ignored list
  Persists between NodeDB internal clean ups */
     bool is_ignored;
+    /* Last byte of the node number of the node that should be used as the next hop to reach this node. */
+    uint8_t next_hop;
 } meshtastic_NodeInfoLite;
 
 /* This message is never sent over the wire, but it is used for serializing DB
@@ -153,12 +155,12 @@ extern "C" {
 /* Initializer values for message structs */
 #define meshtastic_PositionLite_init_default     {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN}
 #define meshtastic_UserLite_init_default         {{0}, "", "", _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}}
-#define meshtastic_NodeInfoLite_init_default     {0, false, meshtastic_UserLite_init_default, false, meshtastic_PositionLite_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0, 0}
+#define meshtastic_NodeInfoLite_init_default     {0, false, meshtastic_UserLite_init_default, false, meshtastic_PositionLite_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0, 0, 0}
 #define meshtastic_DeviceState_init_default      {false, meshtastic_MyNodeInfo_init_default, false, meshtastic_User_init_default, 0, {meshtastic_MeshPacket_init_default}, false, meshtastic_MeshPacket_init_default, 0, 0, 0, false, meshtastic_MeshPacket_init_default, 0, {meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default}, {0}}
 #define meshtastic_ChannelFile_init_default      {0, {meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default}, 0}
 #define meshtastic_PositionLite_init_zero        {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN}
 #define meshtastic_UserLite_init_zero            {{0}, "", "", _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}}
-#define meshtastic_NodeInfoLite_init_zero        {0, false, meshtastic_UserLite_init_zero, false, meshtastic_PositionLite_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0, 0}
+#define meshtastic_NodeInfoLite_init_zero        {0, false, meshtastic_UserLite_init_zero, false, meshtastic_PositionLite_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0, 0, 0}
 #define meshtastic_DeviceState_init_zero         {false, meshtastic_MyNodeInfo_init_zero, false, meshtastic_User_init_zero, 0, {meshtastic_MeshPacket_init_zero}, false, meshtastic_MeshPacket_init_zero, 0, 0, 0, false, meshtastic_MeshPacket_init_zero, 0, {meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero}, {0}}
 #define meshtastic_ChannelFile_init_zero         {0, {meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero}, 0}
 
@@ -186,6 +188,7 @@ extern "C" {
 #define meshtastic_NodeInfoLite_hops_away_tag    9
 #define meshtastic_NodeInfoLite_is_favorite_tag  10
 #define meshtastic_NodeInfoLite_is_ignored_tag   11
+#define meshtastic_NodeInfoLite_next_hop_tag     12
 #define meshtastic_DeviceState_my_node_tag       2
 #define meshtastic_DeviceState_owner_tag         3
 #define meshtastic_DeviceState_receive_queue_tag 5
@@ -231,7 +234,8 @@ X(a, STATIC,   SINGULAR, UINT32,   channel,           7) \
 X(a, STATIC,   SINGULAR, BOOL,     via_mqtt,          8) \
 X(a, STATIC,   OPTIONAL, UINT32,   hops_away,         9) \
 X(a, STATIC,   SINGULAR, BOOL,     is_favorite,      10) \
-X(a, STATIC,   SINGULAR, BOOL,     is_ignored,       11)
+X(a, STATIC,   SINGULAR, BOOL,     is_ignored,       11) \
+X(a, STATIC,   SINGULAR, UINT32,   next_hop,         12)
 #define meshtastic_NodeInfoLite_CALLBACK NULL
 #define meshtastic_NodeInfoLite_DEFAULT NULL
 #define meshtastic_NodeInfoLite_user_MSGTYPE meshtastic_UserLite
@@ -284,7 +288,7 @@ extern const pb_msgdesc_t meshtastic_ChannelFile_msg;
 /* meshtastic_DeviceState_size depends on runtime parameters */
 #define MESHTASTIC_MESHTASTIC_DEVICEONLY_PB_H_MAX_SIZE meshtastic_ChannelFile_size
 #define meshtastic_ChannelFile_size              718
-#define meshtastic_NodeInfoLite_size             185
+#define meshtastic_NodeInfoLite_size             188
 #define meshtastic_PositionLite_size             28
 #define meshtastic_UserLite_size                 96
 

src/mesh/generated/meshtastic/mesh.pb.h

@@ -212,6 +212,9 @@ typedef enum _meshtastic_HardwareModel {
     meshtastic_HardwareModel_MS24SF1 = 82,
     /* Lilygo TLora-C6 with the new ESP32-C6 MCU */
     meshtastic_HardwareModel_TLORA_C6 = 83,
+    /* WisMesh Tap
+ RAK-4631 w/ TFT in injection modled case */
+    meshtastic_HardwareModel_WISMESH_TAP = 84,
     /* ------------------------------------------------------------------------------------------------------------------------------------------
  Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
  ------------------------------------------------------------------------------------------------------------------------------------------ */
@@ -751,6 +754,12 @@ typedef struct _meshtastic_MeshPacket {
     meshtastic_MeshPacket_public_key_t public_key;
     /* Indicates whether the packet was en/decrypted using PKI */
     bool pki_encrypted;
+    /* Last byte of the node number of the node that should be used as the next hop in routing. 
+ Set by the firmware internally, clients are not supposed to set this. */
+    uint8_t next_hop;
+    /* Last byte of the node number of the node that will relay/relayed this packet.
+ Set by the firmware internally, clients are not supposed to set this. */
+    uint8_t relay_node;
 } meshtastic_MeshPacket;
 
 /* The bluetooth to device link:
@@ -1159,7 +1168,7 @@ extern "C" {
 #define meshtastic_Data_init_default             {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0}
 #define meshtastic_Waypoint_init_default         {0, false, 0, false, 0, 0, 0, "", "", 0}
 #define meshtastic_MqttClientProxyMessage_init_default {"", 0, {{0, {0}}}, 0}
-#define meshtastic_MeshPacket_init_default       {0, 0, 0, 0, {meshtastic_Data_init_default}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0}
+#define meshtastic_MeshPacket_init_default       {0, 0, 0, 0, {meshtastic_Data_init_default}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0}
 #define meshtastic_NodeInfo_init_default         {0, false, meshtastic_User_init_default, false, meshtastic_Position_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0, 0}
 #define meshtastic_MyNodeInfo_init_default       {0, 0, 0, {0, {0}}, ""}
 #define meshtastic_LogRecord_init_default        {"", 0, "", _meshtastic_LogRecord_Level_MIN}
@@ -1184,7 +1193,7 @@ extern "C" {
 #define meshtastic_Data_init_zero                {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0}
 #define meshtastic_Waypoint_init_zero            {0, false, 0, false, 0, 0, 0, "", "", 0}
 #define meshtastic_MqttClientProxyMessage_init_zero {"", 0, {{0, {0}}}, 0}
-#define meshtastic_MeshPacket_init_zero          {0, 0, 0, 0, {meshtastic_Data_init_zero}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0}
+#define meshtastic_MeshPacket_init_zero          {0, 0, 0, 0, {meshtastic_Data_init_zero}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0}
 #define meshtastic_NodeInfo_init_zero            {0, false, meshtastic_User_init_zero, false, meshtastic_Position_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0, 0}
 #define meshtastic_MyNodeInfo_init_zero          {0, 0, 0, {0, {0}}, ""}
 #define meshtastic_LogRecord_init_zero           {"", 0, "", _meshtastic_LogRecord_Level_MIN}
@@ -1280,6 +1289,8 @@ extern "C" {
 #define meshtastic_MeshPacket_hop_start_tag      15
 #define meshtastic_MeshPacket_public_key_tag     16
 #define meshtastic_MeshPacket_pki_encrypted_tag  17
+#define meshtastic_MeshPacket_next_hop_tag       18
+#define meshtastic_MeshPacket_relay_node_tag     19
 #define meshtastic_NodeInfo_num_tag              1
 #define meshtastic_NodeInfo_user_tag             2
 #define meshtastic_NodeInfo_position_tag         3
@@ -1474,7 +1485,9 @@ X(a, STATIC,   SINGULAR, UENUM,    delayed,          13) \
 X(a, STATIC,   SINGULAR, BOOL,     via_mqtt,         14) \
 X(a, STATIC,   SINGULAR, UINT32,   hop_start,        15) \
 X(a, STATIC,   SINGULAR, BYTES,    public_key,       16) \
-X(a, STATIC,   SINGULAR, BOOL,     pki_encrypted,    17)
+X(a, STATIC,   SINGULAR, BOOL,     pki_encrypted,    17) \
+X(a, STATIC,   SINGULAR, UINT32,   next_hop,         18) \
+X(a, STATIC,   SINGULAR, UINT32,   relay_node,       19)
 #define meshtastic_MeshPacket_CALLBACK NULL
 #define meshtastic_MeshPacket_DEFAULT NULL
 #define meshtastic_MeshPacket_payload_variant_decoded_MSGTYPE meshtastic_Data
@@ -1724,7 +1737,7 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 #define meshtastic_FromRadio_size                510
 #define meshtastic_Heartbeat_size                0
 #define meshtastic_LogRecord_size                426
-#define meshtastic_MeshPacket_size               367
+#define meshtastic_MeshPacket_size               375
 #define meshtastic_MqttClientProxyMessage_size   501
 #define meshtastic_MyNodeInfo_size               77
 #define meshtastic_NeighborInfo_size             258

src/mesh/generated/meshtastic/telemetry.pb.h

@@ -77,7 +77,9 @@ typedef enum _meshtastic_TelemetrySensorType {
     /* MLX90614 non-contact IR temperature sensor */
     meshtastic_TelemetrySensorType_MLX90614 = 31,
     /* SCD40/SCD41 CO2, humidity, temperature sensor */
-    meshtastic_TelemetrySensorType_SCD4X = 32
+    meshtastic_TelemetrySensorType_SCD4X = 32,
+    /* ClimateGuard RadSens, radiation, Geiger-Muller Tube */
+    meshtastic_TelemetrySensorType_RADSENS = 33
 } meshtastic_TelemetrySensorType;
 
 /* Struct definitions */
@@ -155,6 +157,9 @@ typedef struct _meshtastic_EnvironmentMetrics {
     /* Wind lull in m/s */
     bool has_wind_lull;
     float wind_lull;
+    /* Radiation in µR/h */
+    bool has_radiation;
+    float radiation;
 } meshtastic_EnvironmentMetrics;
 
 /* Power Metrics (voltage / current / etc) */
@@ -299,8 +304,8 @@ extern "C" {
 
 /* Helper constants for enums */
 #define _meshtastic_TelemetrySensorType_MIN meshtastic_TelemetrySensorType_SENSOR_UNSET
-#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_SCD4X
-#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_SCD4X+1))
+#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_RADSENS
+#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_RADSENS+1))
 
 
 
@@ -313,7 +318,7 @@ extern "C" {
 
 /* Initializer values for message structs */
 #define meshtastic_DeviceMetrics_init_default    {false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_EnvironmentMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
+#define meshtastic_EnvironmentMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_PowerMetrics_init_default     {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_AirQualityMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_LocalStats_init_default       {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
@@ -321,7 +326,7 @@ extern "C" {
 #define meshtastic_Telemetry_init_default        {0, 0, {meshtastic_DeviceMetrics_init_default}}
 #define meshtastic_Nau7802Config_init_default    {0, 0}
 #define meshtastic_DeviceMetrics_init_zero       {false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_EnvironmentMetrics_init_zero  {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
+#define meshtastic_EnvironmentMetrics_init_zero  {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_PowerMetrics_init_zero        {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_AirQualityMetrics_init_zero   {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_LocalStats_init_zero          {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
@@ -352,6 +357,7 @@ extern "C" {
 #define meshtastic_EnvironmentMetrics_weight_tag 15
 #define meshtastic_EnvironmentMetrics_wind_gust_tag 16
 #define meshtastic_EnvironmentMetrics_wind_lull_tag 17
+#define meshtastic_EnvironmentMetrics_radiation_tag 18
 #define meshtastic_PowerMetrics_ch1_voltage_tag  1
 #define meshtastic_PowerMetrics_ch1_current_tag  2
 #define meshtastic_PowerMetrics_ch2_voltage_tag  3
@@ -422,7 +428,8 @@ X(a, STATIC,   OPTIONAL, UINT32,   wind_direction,   13) \
 X(a, STATIC,   OPTIONAL, FLOAT,    wind_speed,       14) \
 X(a, STATIC,   OPTIONAL, FLOAT,    weight,           15) \
 X(a, STATIC,   OPTIONAL, FLOAT,    wind_gust,        16) \
-X(a, STATIC,   OPTIONAL, FLOAT,    wind_lull,        17)
+X(a, STATIC,   OPTIONAL, FLOAT,    wind_lull,        17) \
+X(a, STATIC,   OPTIONAL, FLOAT,    radiation,        18)
 #define meshtastic_EnvironmentMetrics_CALLBACK NULL
 #define meshtastic_EnvironmentMetrics_DEFAULT NULL
 
@@ -521,12 +528,12 @@ extern const pb_msgdesc_t meshtastic_Nau7802Config_msg;
 #define MESHTASTIC_MESHTASTIC_TELEMETRY_PB_H_MAX_SIZE meshtastic_Telemetry_size
 #define meshtastic_AirQualityMetrics_size        78
 #define meshtastic_DeviceMetrics_size            27
-#define meshtastic_EnvironmentMetrics_size       85
+#define meshtastic_EnvironmentMetrics_size       91
 #define meshtastic_HealthMetrics_size            11
 #define meshtastic_LocalStats_size               60
 #define meshtastic_Nau7802Config_size            16
 #define meshtastic_PowerMetrics_size             30
-#define meshtastic_Telemetry_size                92
+#define meshtastic_Telemetry_size                98
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/http/ContentHandler.cpp

@@ -74,6 +74,7 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
 
     ResourceNode *nodeAPIv1ToRadioOptions = new ResourceNode("/api/v1/toradio", "OPTIONS", &handleAPIv1ToRadio);
     ResourceNode *nodeAPIv1ToRadio = new ResourceNode("/api/v1/toradio", "PUT", &handleAPIv1ToRadio);
+    ResourceNode *nodeAPIv1FromRadioOptions = new ResourceNode("/api/v1/fromradio", "OPTIONS", &handleAPIv1FromRadio);
     ResourceNode *nodeAPIv1FromRadio = new ResourceNode("/api/v1/fromradio", "GET", &handleAPIv1FromRadio);
 
     //    ResourceNode *nodeHotspotApple = new ResourceNode("/hotspot-detect.html", "GET", &handleHotspot);
@@ -100,6 +101,7 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
     // Secure nodes
     secureServer->registerNode(nodeAPIv1ToRadioOptions);
     secureServer->registerNode(nodeAPIv1ToRadio);
+    secureServer->registerNode(nodeAPIv1FromRadioOptions);
     secureServer->registerNode(nodeAPIv1FromRadio);
     //    secureServer->registerNode(nodeHotspotApple);
     //    secureServer->registerNode(nodeHotspotAndroid);
@@ -121,6 +123,7 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
     // Insecure nodes
     insecureServer->registerNode(nodeAPIv1ToRadioOptions);
     insecureServer->registerNode(nodeAPIv1ToRadio);
+    insecureServer->registerNode(nodeAPIv1FromRadioOptions);
     insecureServer->registerNode(nodeAPIv1FromRadio);
     //    insecureServer->registerNode(nodeHotspotApple);
     //    insecureServer->registerNode(nodeHotspotAndroid);
@@ -163,6 +166,12 @@ void handleAPIv1FromRadio(HTTPRequest *req, HTTPResponse *res)
     res->setHeader("Access-Control-Allow-Methods", "GET");
     res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/protobufs/master/meshtastic/mesh.proto");
 
+    if (req->getMethod() == "OPTIONS") {
+        res->setStatusCode(204); // Success with no content
+        // res->print(""); @todo remove
+        return;
+    }
+
     uint8_t txBuf[MAX_STREAM_BUF_SIZE];
     uint32_t len = 1;
 

src/mesh/wifi/WiFiAPClient.cpp

@@ -62,7 +62,11 @@ static void onNetworkConnected()
         LOG_INFO("Start WiFi network services");
 
         // start mdns
-        if (!MDNS.begin("Meshtastic")) {
+        if (
+#ifdef ARCH_RP2040
+            !moduleConfig.mqtt.enabled && // MDNS is not supported when MQTT is enabled on ARCH_RP2040
+#endif
+            !MDNS.begin("Meshtastic")) {
             LOG_ERROR("Error setting up MDNS responder!");
         } else {
             LOG_INFO("mDNS Host: Meshtastic.local");

src/modules/AdminModule.cpp

@@ -3,7 +3,7 @@
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
-#include "RTC.h"
+#include "gps/RTC.h"
 #include "meshUtils.h"
 #include <FSCommon.h>
 #if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_BLUETOOTH

src/modules/CannedMessageModule.cpp

@@ -55,7 +55,7 @@ CannedMessageModule::CannedMessageModule()
             LOG_INFO("CannedMessageModule is enabled");
 
             // T-Watch interface currently has no way to select destination type, so default to 'node'
-#if defined(T_WATCH_S3) || defined(RAK14014)
+#if defined(USE_VIRTUAL_KEYBOARD)
             this->destSelect = CANNED_MESSAGE_DESTINATION_TYPE_NODE;
 #endif
 
@@ -81,7 +81,7 @@ int CannedMessageModule::splitConfiguredMessages()
 
     String canned_messages = cannedMessageModuleConfig.messages;
 
-#if defined(T_WATCH_S3) || defined(RAK14014)
+#if defined(USE_VIRTUAL_KEYBOARD)
     String separator = canned_messages.length() ? "|" : "";
 
     canned_messages = "[---- Free Text ----]" + separator + canned_messages;
@@ -150,7 +150,7 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
     }
     if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT)) {
 
-#if defined(T_WATCH_S3) || defined(RAK14014)
+#if defined(USE_VIRTUAL_KEYBOARD)
         if (this->currentMessageIndex == 0) {
             this->runState = CANNED_MESSAGE_RUN_STATE_FREETEXT;
 
@@ -177,7 +177,7 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
         e.action = UIFrameEvent::Action::REGENERATE_FRAMESET; // We want to change the list of frames shown on-screen
         this->currentMessageIndex = -1;
 
-#if !defined(T_WATCH_S3) && !defined(RAK14014)
+#if !defined(T_WATCH_S3) && !defined(RAK14014) && !defined(USE_VIRTUAL_KEYBOARD)
         this->freetext = ""; // clear freetext
         this->cursor = 0;
         this->destSelect = CANNED_MESSAGE_DESTINATION_TYPE_NONE;
@@ -190,7 +190,7 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
         (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT)) ||
         (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT))) {
 
-#if defined(T_WATCH_S3) || defined(RAK14014)
+#if defined(USE_VIRTUAL_KEYBOARD)
         if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT)) {
             this->payload = INPUT_BROKER_MSG_LEFT;
         } else if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT)) {
@@ -234,13 +234,13 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
                 screen->decreaseBrightness();
             LOG_DEBUG("Decrease Screen Brightness");
             break;
-        case INPUT_BROKER_MSG_FN_SYMBOL_ON: // draw modifier (function) symbal
+        case INPUT_BROKER_MSG_FN_SYMBOL_ON: // draw modifier (function) symbol
             if (screen)
-                screen->setFunctionSymbal("Fn");
+                screen->setFunctionSymbol("Fn");
             break;
-        case INPUT_BROKER_MSG_FN_SYMBOL_OFF: // remove modifier (function) symbal
+        case INPUT_BROKER_MSG_FN_SYMBOL_OFF: // remove modifier (function) symbol
             if (screen)
-                screen->removeFunctionSymbal("Fn");
+                screen->removeFunctionSymbol("Fn");
             break;
         // mute (switch off/toggle) external notifications on fn+m
         case INPUT_BROKER_MSG_MUTE_TOGGLE:
@@ -249,13 +249,13 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
                     externalNotificationModule->setMute(false);
                     showTemporaryMessage("Notifications \nEnabled");
                     if (screen)
-                        screen->removeFunctionSymbal("M"); // remove the mute symbol from the bottom right corner
+                        screen->removeFunctionSymbol("M"); // remove the mute symbol from the bottom right corner
                 } else {
                     externalNotificationModule->stopNow(); // this will turn off all GPIO and sounds and idle the loop
                     externalNotificationModule->setMute(true);
                     showTemporaryMessage("Notifications \nDisabled");
                     if (screen)
-                        screen->setFunctionSymbal("M"); // add the mute symbol to the bottom right corner
+                        screen->setFunctionSymbol("M"); // add the mute symbol to the bottom right corner
                 }
             }
             break;
@@ -308,11 +308,11 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
             break;
         }
         if (screen && (event->kbchar != INPUT_BROKER_MSG_FN_SYMBOL_ON)) {
-            screen->removeFunctionSymbal("Fn"); // remove modifier (function) symbal
+            screen->removeFunctionSymbol("Fn"); // remove modifier (function) symbol
         }
     }
 
-#if defined(T_WATCH_S3) || defined(RAK14014)
+#if defined(USE_VIRTUAL_KEYBOARD)
     if (this->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT) {
         String keyTapped = keyForCoordinates(event->touchX, event->touchY);
 
@@ -446,7 +446,7 @@ int32_t CannedMessageModule::runOnce()
         this->freetext = ""; // clear freetext
         this->cursor = 0;
 
-#if !defined(T_WATCH_S3) && !defined(RAK14014)
+#if !defined(T_WATCH_S3) && !defined(RAK14014) && !defined(SENSECAP_INDICATOR)
         this->destSelect = CANNED_MESSAGE_DESTINATION_TYPE_NONE;
 #endif
 
@@ -459,7 +459,7 @@ int32_t CannedMessageModule::runOnce()
         this->freetext = ""; // clear freetext
         this->cursor = 0;
 
-#if !defined(T_WATCH_S3) && !defined(RAK14014)
+#if !defined(T_WATCH_S3) && !defined(RAK14014) && !defined(USE_VIRTUAL_KEYBOARD)
         this->destSelect = CANNED_MESSAGE_DESTINATION_TYPE_NONE;
 #endif
 
@@ -479,7 +479,7 @@ int32_t CannedMessageModule::runOnce()
                     powerFSM.trigger(EVENT_PRESS);
                     return INT32_MAX;
                 } else {
-#if defined(T_WATCH_S3) || defined(RAK14014)
+#if defined(USE_VIRTUAL_KEYBOARD)
                     sendText(this->dest, indexChannels[this->channel], this->messages[this->currentMessageIndex], true);
 #else
                     sendText(NODENUM_BROADCAST, channels.getPrimaryIndex(), this->messages[this->currentMessageIndex], true);
@@ -496,7 +496,7 @@ int32_t CannedMessageModule::runOnce()
         this->freetext = ""; // clear freetext
         this->cursor = 0;
 
-#if !defined(T_WATCH_S3) && !defined(RAK14014)
+#if !defined(T_WATCH_S3) && !defined(RAK14014) && !defined(USE_VIRTUAL_KEYBOARD)
         this->destSelect = CANNED_MESSAGE_DESTINATION_TYPE_NONE;
 #endif
 
@@ -513,7 +513,7 @@ int32_t CannedMessageModule::runOnce()
             this->freetext = ""; // clear freetext
             this->cursor = 0;
 
-#if !defined(T_WATCH_S3) && !defined(RAK14014)
+#if !defined(T_WATCH_S3) && !defined(RAK14014) && !defined(USE_VIRTUAL_KEYBOARD)
             this->destSelect = CANNED_MESSAGE_DESTINATION_TYPE_NONE;
 #endif
 
@@ -526,7 +526,7 @@ int32_t CannedMessageModule::runOnce()
             this->freetext = ""; // clear freetext
             this->cursor = 0;
 
-#if !defined(T_WATCH_S3) && !defined(RAK14014)
+#if !defined(T_WATCH_S3) && !defined(RAK14014) && !defined(USE_VIRTUAL_KEYBOARD)
             this->destSelect = CANNED_MESSAGE_DESTINATION_TYPE_NONE;
 #endif
 
@@ -672,7 +672,7 @@ int32_t CannedMessageModule::runOnce()
                 break;
             }
             if (screen)
-                screen->removeFunctionSymbal("Fn");
+                screen->removeFunctionSymbol("Fn");
         }
 
         this->lastTouchMillis = millis();
@@ -769,7 +769,7 @@ void CannedMessageModule::showTemporaryMessage(const String &message)
     setIntervalFromNow(2000);
 }
 
-#if defined(T_WATCH_S3) || defined(RAK14014)
+#if defined(USE_VIRTUAL_KEYBOARD)
 
 String CannedMessageModule::keyForCoordinates(uint x, uint y)
 {
@@ -1055,7 +1055,7 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
         display->drawString(10 + x, 0 + y + FONT_HEIGHT_SMALL, "Canned Message\nModule disabled.");
     } else if (cannedMessageModule->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT) {
         requestFocus(); // Tell Screen::setFrames to move to our module's frame
-#if defined(T_WATCH_S3) || defined(RAK14014)
+#if defined(USE_VIRTUAL_KEYBOARD)
         drawKeyboard(display, state, 0, 0);
 #else
 

src/modules/CannedMessageModule.h

@@ -102,7 +102,7 @@ class CannedMessageModule : public SinglePortModule, public Observable<const UIF
     int getNextIndex();
     int getPrevIndex();
 
-#if defined(T_WATCH_S3) || defined(RAK14014)
+#if defined(USE_VIRTUAL_KEYBOARD)
     void drawKeyboard(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
     String keyForCoordinates(uint x, uint y);
     bool shift = false;
@@ -156,7 +156,7 @@ class CannedMessageModule : public SinglePortModule, public Observable<const UIF
     unsigned long lastTouchMillis = 0;
     String temporaryMessage;
 
-#if defined(T_WATCH_S3) || defined(RAK14014)
+#if defined(USE_VIRTUAL_KEYBOARD)
     Letter keyboard[2][4][10] = {{{{"Q", 20, 0, 0, 0, 0},
                                    {"W", 22, 0, 0, 0, 0},
                                    {"E", 17, 0, 0, 0, 0},

src/modules/ExternalNotificationModule.h

@@ -3,7 +3,7 @@
 #include "SinglePortModule.h"
 #include "concurrency/OSThread.h"
 #include "configuration.h"
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(CONFIG_IDF_TARGET_ESP32C6)
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(ARCH_APOLLO3) && !defined(CONFIG_IDF_TARGET_ESP32C6)
 #include <NonBlockingRtttl.h>
 #else
 // Noop class for portduino.

src/modules/NeighborInfoModule.cpp

@@ -2,7 +2,7 @@
 #include "Default.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "RTC.h"
+#include "gps/RTC.h"
 #include <Throttle.h>
 
 NeighborInfoModule *neighborInfoModule;

src/modules/PositionModule.cpp

@@ -4,12 +4,12 @@
 #include "GPS.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "RTC.h"
 #include "Router.h"
 #include "TypeConversions.h"
 #include "airtime.h"
 #include "configuration.h"
 #include "gps/GeoCoord.h"
+#include "gps/RTC.h"
 #include "main.h"
 #include "mesh/compression/unishox2.h"
 #include "meshUtils.h"
@@ -146,11 +146,20 @@ bool PositionModule::hasQualityTimesource()
 #if MESHTASTIC_EXCLUDE_GPS
     bool hasGpsOrRtc = (rtc_found.address != ScanI2C::ADDRESS_NONE.address);
 #else
-    bool hasGpsOrRtc = (gps && gps->isConnected()) || (rtc_found.address != ScanI2C::ADDRESS_NONE.address);
+    bool hasGpsOrRtc = hasGPS() || (rtc_found.address != ScanI2C::ADDRESS_NONE.address);
 #endif
     return hasGpsOrRtc || setFromPhoneOrNtpToday;
 }
 
+bool PositionModule::hasGPS()
+{
+#if MESHTASTIC_EXCLUDE_GPS
+    return false;
+#else
+    return gps && gps->isConnected();
+#endif
+}
+
 meshtastic_MeshPacket *PositionModule::allocReply()
 {
     if (precision == 0) {
@@ -194,10 +203,21 @@ meshtastic_MeshPacket *PositionModule::allocReply()
     p.precision_bits = precision;
     p.has_latitude_i = true;
     p.has_longitude_i = true;
-    p.time = getValidTime(RTCQualityNTP) > 0 ? getValidTime(RTCQualityNTP) : localPosition.time;
+    // Always use NTP / GPS time if available
+    if (getValidTime(RTCQualityNTP) > 0) {
+        p.time = getValidTime(RTCQualityNTP);
+    } else if (rtc_found.address != ScanI2C::ADDRESS_NONE.address) {
+        LOG_INFO("Use RTC time for position");
+        p.time = getValidTime(RTCQualityDevice);
+    } else if (getRTCQuality() < RTCQualityNTP) {
+        LOG_INFO("Strip low RTCQuality (%d) time from position", getRTCQuality());
+        p.time = 0;
+    }
 
     if (config.position.fixed_position) {
         p.location_source = meshtastic_Position_LocSource_LOC_MANUAL;
+    } else {
+        p.location_source = localPosition.location_source;
     }
 
     if (pos_flags & meshtastic_Config_PositionConfig_PositionFlags_ALTITUDE) {
@@ -242,20 +262,6 @@ meshtastic_MeshPacket *PositionModule::allocReply()
         p.has_ground_speed = true;
     }
 
-    // Strip out any time information before sending packets to other nodes - to keep the wire size small (and because other
-    // nodes shouldn't trust it anyways) Note: we allow a device with a local GPS or NTP to include the time, so that devices
-    // without can get time.
-    if (getRTCQuality() < RTCQualityNTP) {
-        LOG_INFO("Strip time %u from position", p.time);
-        p.time = 0;
-    } else if (rtc_found.address != ScanI2C::ADDRESS_NONE.address) {
-        LOG_INFO("Use RTC time %u for position", p.time);
-        p.time = getValidTime(RTCQualityDevice);
-    } else {
-        p.time = getValidTime(RTCQualityNTP);
-        LOG_INFO("Provide time to mesh %u", p.time);
-    }
-
     LOG_INFO("Position reply: time=%i lat=%i lon=%i", p.time, p.latitude_i, p.longitude_i);
 
     // TAK Tracker devices should send their position in a TAK packet over the ATAK port

src/modules/PositionModule.h

@@ -61,6 +61,7 @@ class PositionModule : public ProtobufModule<meshtastic_Position>, private concu
     uint32_t precision;
     void sendLostAndFoundText();
     bool hasQualityTimesource();
+    bool hasGPS();
 
     const uint32_t minimumTimeThreshold =
         Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30);

src/modules/SerialModule.cpp

@@ -204,9 +204,11 @@ int32_t SerialModule::runOnce()
                     lastNmeaTime = millis();
                     uint32_t readIndex = 0;
                     const meshtastic_NodeInfoLite *tempNodeInfo = nodeDB->readNextMeshNode(readIndex);
-                    while (tempNodeInfo != NULL && tempNodeInfo->has_user && hasValidPosition(tempNodeInfo)) {
-                        printWPL(outbuf, sizeof(outbuf), tempNodeInfo->position, tempNodeInfo->user.long_name, true);
-                        serialPrint->printf("%s", outbuf);
+                    while (tempNodeInfo != NULL) {
+                        if (tempNodeInfo->has_user && hasValidPosition(tempNodeInfo)) {
+                            printWPL(outbuf, sizeof(outbuf), tempNodeInfo->position, tempNodeInfo->user.long_name, true);
+                            serialPrint->printf("%s", outbuf);
+                        }
                         tempNodeInfo = nodeDB->readNextMeshNode(readIndex);
                     }
                 }

src/modules/Telemetry/DeviceTelemetry.cpp

@@ -77,9 +77,10 @@ meshtastic_MeshPacket *DeviceTelemetryModule::allocReply()
         // Check for a request for device metrics
         if (decoded->which_variant == meshtastic_Telemetry_device_metrics_tag) {
             LOG_INFO("Device telemetry reply to request");
-
-            meshtastic_Telemetry telemetry = getDeviceTelemetry();
-            return allocDataProtobuf(telemetry);
+            return allocDataProtobuf(getDeviceTelemetry());
+        } else if (decoded->which_variant == meshtastic_Telemetry_local_stats_tag) {
+            LOG_INFO("Device telemetry reply w/ LocalStats to request");
+            return allocDataProtobuf(getLocalStatsTelemetry());
         }
     }
     return NULL;
@@ -112,7 +113,7 @@ meshtastic_Telemetry DeviceTelemetryModule::getDeviceTelemetry()
     return t;
 }
 
-void DeviceTelemetryModule::sendLocalStatsToPhone()
+meshtastic_Telemetry DeviceTelemetryModule::getLocalStatsTelemetry()
 {
     meshtastic_Telemetry telemetry = meshtastic_Telemetry_init_zero;
     telemetry.which_variant = meshtastic_Telemetry_local_stats_tag;
@@ -142,7 +143,12 @@ void DeviceTelemetryModule::sendLocalStatsToPhone()
     LOG_INFO("num_packets_tx=%i, num_packets_rx=%i, num_packets_rx_bad=%i", telemetry.variant.local_stats.num_packets_tx,
              telemetry.variant.local_stats.num_packets_rx, telemetry.variant.local_stats.num_packets_rx_bad);
 
-    meshtastic_MeshPacket *p = allocDataProtobuf(telemetry);
+    return telemetry;
+}
+
+void DeviceTelemetryModule::sendLocalStatsToPhone()
+{
+    meshtastic_MeshPacket *p = allocDataProtobuf(getLocalStatsTelemetry());
     p->to = NODENUM_BROADCAST;
     p->decoded.want_response = false;
     p->priority = meshtastic_MeshPacket_Priority_BACKGROUND;

src/modules/Telemetry/DeviceTelemetry.h

@@ -42,6 +42,8 @@ class DeviceTelemetryModule : private concurrency::OSThread, public ProtobufModu
 
   private:
     meshtastic_Telemetry getDeviceTelemetry();
+    meshtastic_Telemetry getLocalStatsTelemetry();
+
     void sendLocalStatsToPhone();
     uint32_t sendToPhoneIntervalMs = SECONDS_IN_MINUTE * 1000;           // Send to phone every minute
     uint32_t sendStatsToPhoneIntervalMs = 15 * SECONDS_IN_MINUTE * 1000; // Send stats to phone every 15 minutes

src/modules/Telemetry/EnvironmentTelemetry.cpp

@@ -25,6 +25,7 @@
 #include "Sensor/BMP085Sensor.h"
 #include "Sensor/BMP280Sensor.h"
 #include "Sensor/BMP3XXSensor.h"
+#include "Sensor/CGRadSensSensor.h"
 #include "Sensor/DFRobotLarkSensor.h"
 #include "Sensor/LPS22HBSensor.h"
 #include "Sensor/MCP9808Sensor.h"
@@ -60,6 +61,7 @@ BMP3XXSensor bmp3xxSensor;
 #ifdef T1000X_SENSOR_EN
 T1000xSensor t1000xSensor;
 #endif
+CGRadSensSensor cgRadSens;
 
 #define FAILED_STATE_SENSOR_READ_MULTIPLIER 10
 #define DISPLAY_RECEIVEID_MEASUREMENTS_ON_SCREEN true
@@ -147,6 +149,8 @@ int32_t EnvironmentTelemetryModule::runOnce()
                 result = nau7802Sensor.runOnce();
             if (max17048Sensor.hasSensor())
                 result = max17048Sensor.runOnce();
+            if (cgRadSens.hasSensor())
+                result = cgRadSens.runOnce();
 #endif
         }
         return result;
@@ -210,16 +214,19 @@ void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiSt
     // 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(UnitConversions::CelsiusToFahrenheit(lastMeasurement.variant.environment_metrics.temperature), 0) + "°F";
-    }
+    if (lastMeasurement.variant.environment_metrics.has_temperature ||
+        lastMeasurement.variant.environment_metrics.has_relative_humidity) {
+        String last_temp = String(lastMeasurement.variant.environment_metrics.temperature, 0) + "°C";
+        if (moduleConfig.telemetry.environment_display_fahrenheit) {
+            last_temp =
+                String(UnitConversions::CelsiusToFahrenheit(lastMeasurement.variant.environment_metrics.temperature), 0) + "°F";
+        }
 
-    // Continue with the remaining details
-    display->drawString(x, y += _fontHeight(FONT_SMALL),
-                        "Temp/Hum: " + last_temp + " / " +
-                            String(lastMeasurement.variant.environment_metrics.relative_humidity, 0) + "%");
+        // 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) {
         display->drawString(x, y += _fontHeight(FONT_SMALL),
@@ -243,6 +250,10 @@ void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiSt
     if (lastMeasurement.variant.environment_metrics.weight != 0)
         display->drawString(x, y += _fontHeight(FONT_SMALL),
                             "Weight: " + String(lastMeasurement.variant.environment_metrics.weight, 0) + "kg");
+
+    if (lastMeasurement.variant.environment_metrics.radiation != 0)
+        display->drawString(x, y += _fontHeight(FONT_SMALL),
+                            "Rad: " + String(lastMeasurement.variant.environment_metrics.radiation, 2) + "µR/h");
 }
 
 bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
@@ -263,6 +274,8 @@ bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPac
                  t->variant.environment_metrics.wind_speed, t->variant.environment_metrics.wind_direction,
                  t->variant.environment_metrics.weight);
 
+        LOG_INFO("(Received from %s): radiation=%fµR/h", sender, t->variant.environment_metrics.radiation);
+
 #endif
         // release previous packet before occupying a new spot
         if (lastMeasurementPacket != nullptr)
@@ -390,6 +403,10 @@ bool EnvironmentTelemetryModule::getEnvironmentTelemetry(meshtastic_Telemetry *m
         valid = valid && max17048Sensor.getMetrics(m);
         hasSensor = true;
     }
+    if (cgRadSens.hasSensor()) {
+        valid = valid && cgRadSens.getMetrics(m);
+        hasSensor = true;
+    }
 
 #endif
     return valid && hasSensor;
@@ -443,6 +460,8 @@ bool EnvironmentTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
         LOG_INFO("Send: wind speed=%fm/s, direction=%d degrees, weight=%fkg", m.variant.environment_metrics.wind_speed,
                  m.variant.environment_metrics.wind_direction, m.variant.environment_metrics.weight);
 
+        LOG_INFO("Send: radiation=%fµR/h", m.variant.environment_metrics.radiation);
+
         sensor_read_error_count = 0;
 
         meshtastic_MeshPacket *p = allocDataProtobuf(m);
@@ -585,6 +604,11 @@ AdminMessageHandleResult EnvironmentTelemetryModule::handleAdminMessageForModule
         if (result != AdminMessageHandleResult::NOT_HANDLED)
             return result;
     }
+    if (cgRadSens.hasSensor()) {
+        result = cgRadSens.handleAdminMessage(mp, request, response);
+        if (result != AdminMessageHandleResult::NOT_HANDLED)
+            return result;
+    }
     return result;
 }
 

src/modules/Telemetry/Sensor/CGRadSensSensor.cpp

@@ -0,0 +1,75 @@
+/*
+ *  Support for the ClimateGuard RadSens Dosimeter
+ *  A fun and educational sensor for Meshtastic; not for safety critical applications.
+ */
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "CGRadSensSensor.h"
+#include "TelemetrySensor.h"
+#include <Wire.h>
+#include <typeinfo>
+
+CGRadSensSensor::CGRadSensSensor() : TelemetrySensor(meshtastic_TelemetrySensorType_RADSENS, "RadSens") {}
+
+int32_t CGRadSensSensor::runOnce()
+{
+    // Initialize the sensor following the same pattern as RCWL9620Sensor
+    LOG_INFO("Init sensor: %s", sensorName);
+    if (!hasSensor()) {
+        return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
+    }
+
+    status = true;
+    begin(nodeTelemetrySensorsMap[sensorType].second, nodeTelemetrySensorsMap[sensorType].first);
+
+    return initI2CSensor();
+}
+
+void CGRadSensSensor::setup() {}
+
+void CGRadSensSensor::begin(TwoWire *wire, uint8_t addr)
+{
+    // Store the Wire and address to the sensor following the same pattern as RCWL9620Sensor
+    _wire = wire;
+    _addr = addr;
+    _wire->begin();
+}
+
+float CGRadSensSensor::getStaticRadiation()
+{
+    // Read a register, following the same pattern as the RCWL9620Sensor
+    uint32_t data;
+    _wire->beginTransmission(_addr); // Transfer data to addr.
+    _wire->write(0x06);              // Radiation intensity (static period T = 500 sec)
+    if (_wire->endTransmission() == 0) {
+        if (_wire->requestFrom(_addr, (uint8_t)3)) {
+            ; // Request 3 bytes
+            data = _wire->read();
+            data <<= 8;
+            data |= _wire->read();
+            data <<= 8;
+            data |= _wire->read();
+
+            // As per the data sheet for the RadSens
+            // Register 0x06 contains the reading in 0.1 * μR / h
+            float microRadPerHr = float(data) / 10.0;
+            return microRadPerHr;
+        }
+    }
+    return -1.0;
+}
+
+bool CGRadSensSensor::getMetrics(meshtastic_Telemetry *measurement)
+{
+    // Store the meansurement in the the appropriate fields of the protobuf
+    measurement->variant.environment_metrics.has_radiation = true;
+
+    LOG_DEBUG("CGRADSENS getMetrics");
+    measurement->variant.environment_metrics.radiation = getStaticRadiation();
+
+    return true;
+}
+#endif

src/modules/Telemetry/Sensor/CGRadSensSensor.h

@@ -0,0 +1,30 @@
+/*
+ *  Support for the ClimateGuard RadSens Dosimeter
+ *  A fun and educational sensor for Meshtastic; not for safety critical applications.
+ */
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include <Wire.h>
+
+class CGRadSensSensor : public TelemetrySensor
+{
+  private:
+    uint8_t _addr = 0x66;
+    TwoWire *_wire = &Wire;
+
+  protected:
+    virtual void setup() override;
+    void begin(TwoWire *wire = &Wire, uint8_t addr = 0x66);
+    float getStaticRadiation();
+
+  public:
+    CGRadSensSensor();
+    virtual int32_t runOnce() override;
+    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
+};
+
+#endif

src/modules/esp32/PaxcounterModule.cpp

@@ -95,7 +95,9 @@ int32_t PaxcounterModule::runOnce()
 
             // internal processing initialization
             libpax_counter_init(handlePaxCounterReportRequest, &count_from_libpax,
-                                moduleConfig.paxcounter.paxcounter_update_interval, 0);
+                                Default::getConfiguredOrDefault(moduleConfig.paxcounter.paxcounter_update_interval,
+                                                                default_telemetry_broadcast_interval_secs),
+                                0);
             libpax_counter_start();
         } else {
             sendInfo(NODENUM_BROADCAST);

src/motion/AccelerometerThread.h

@@ -7,7 +7,9 @@
 #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
 
 #include "../concurrency/OSThread.h"
+#ifdef HAS_BMA423
 #include "BMA423Sensor.h"
+#endif
 #include "BMX160Sensor.h"
 #include "ICM20948Sensor.h"
 #include "LIS3DHSensor.h"
@@ -17,7 +19,9 @@
 #ifdef HAS_QMA6100P
 #include "QMA6100PSensor.h"
 #endif
+#ifdef HAS_STK8XXX
 #include "STK8XXXSensor.h"
+#endif
 
 extern ScanI2C::DeviceAddress accelerometer_found;
 
@@ -79,9 +83,11 @@ class AccelerometerThread : public concurrency::OSThread
 #endif
 
         switch (device.type) {
+#ifdef HAS_BMA423
         case ScanI2C::DeviceType::BMA423:
             sensor = new BMA423Sensor(device);
             break;
+#endif
         case ScanI2C::DeviceType::MPU6050:
             sensor = new MPU6050Sensor(device);
             break;
@@ -94,9 +100,11 @@ class AccelerometerThread : public concurrency::OSThread
         case ScanI2C::DeviceType::LSM6DS3:
             sensor = new LSM6DS3Sensor(device);
             break;
+#ifdef HAS_STK8XXX
         case ScanI2C::DeviceType::STK8BAXX:
             sensor = new STK8XXXSensor(device);
             break;
+#endif
         case ScanI2C::DeviceType::ICM20948:
             sensor = new ICM20948Sensor(device);
             break;

src/motion/BMA423Sensor.cpp

@@ -1,6 +1,6 @@
 #include "BMA423Sensor.h"
 
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C && defined(HAS_BMA423)
 
 using namespace MotionSensorI2C;
 

src/motion/BMA423Sensor.h

@@ -4,7 +4,7 @@
 
 #include "MotionSensor.h"
 
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C && defined(HAS_BMA423)
 
 #include <SensorBMA423.hpp>
 #include <Wire.h>

src/motion/STK8XXXSensor.cpp

@@ -1,6 +1,6 @@
 #include "STK8XXXSensor.h"
 
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C && defined(HAS_STK8XXX)
 
 STK8XXXSensor::STK8XXXSensor(ScanI2C::FoundDevice foundDevice) : MotionSensor::MotionSensor(foundDevice) {}
 

src/motion/STK8XXXSensor.h

@@ -4,7 +4,7 @@
 
 #include "MotionSensor.h"
 
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C && defined(HAS_STK8XXX)
 
 #ifdef STK8XXX_INT
 

src/mqtt/MQTT.cpp

@@ -545,9 +545,11 @@ void MQTT::onSend(const meshtastic_MeshPacket &mp_encrypted, const meshtastic_Me
 
     // mp_decoded will not be decoded when it's PKI encrypted and not directed to us
     if (mp_decoded.which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
+        // For uplinking other's packets, check if it's not OK to MQTT or if it's an older packet without the bitfield
+        bool dontUplink = !mp_decoded.decoded.has_bitfield ||
+                          (mp_decoded.decoded.has_bitfield && !(mp_decoded.decoded.bitfield & BITFIELD_OK_TO_MQTT_MASK));
         // check for the lowest bit of the data bitfield set false, and the use of one of the default keys.
-        if (!isFromUs(&mp_decoded) && !isMqttServerAddressPrivate && mp_decoded.decoded.has_bitfield &&
-            !(mp_decoded.decoded.bitfield & BITFIELD_OK_TO_MQTT_MASK) &&
+        if (!isFromUs(&mp_decoded) && !isMqttServerAddressPrivate && dontUplink &&
             (ch.settings.psk.size < 2 || (ch.settings.psk.size == 16 && memcmp(ch.settings.psk.bytes, defaultpsk, 16)) ||
              (ch.settings.psk.size == 32 && memcmp(ch.settings.psk.bytes, eventpsk, 32)))) {
             LOG_INFO("MQTT onSend - Not forwarding packet due to DontMqttMeBro flag");

src/platform/apollo3/architecture.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#define ARCH_APOLLO3
+
+//
+// defaults for ARCH_APOLLO3 architecture
+//
+
+#ifndef HAS_RADIO
+#define HAS_RADIO 1
+#endif
+
+//
+// set HW_VENDOR
+//
+
+#ifndef HW_VENDOR
+#define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
+#endif

src/platform/apollo3/main-apollo3.cpp

@@ -0,0 +1,26 @@
+#include "configuration.h"
+#include "gps/RTC.h"
+
+void setBluetoothEnable(bool on) {}
+
+void playStartMelody() {}
+
+void updateBatteryLevel(uint8_t level) {}
+
+void getMacAddr(uint8_t *dmac)
+{
+    for (int i = 0; i < 6; i++)
+        dmac[i] = i;
+}
+
+void cpuDeepSleep(uint32_t msecToWake) {}
+
+void initVariant() {}
+
+/* pacify libc_nano */
+extern "C" {
+int _gettimeofday(struct timeval *tv, void *tzvp)
+{
+    return -1;
+}
+}

src/platform/nrf52/architecture.h

@@ -47,6 +47,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_PPR
 #elif defined(RAK2560)
 #define HW_VENDOR meshtastic_HardwareModel_RAK2560
+#elif defined(WISMESH_TAP)
+#define HW_VENDOR meshtastic_HardwareModel_WISMESH_TAP
 #elif defined(RAK4630)
 #define HW_VENDOR meshtastic_HardwareModel_RAK4631
 #elif defined(TTGO_T_ECHO)

src/serialization/MeshPacketSerializer.cpp

@@ -78,6 +78,7 @@ std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp,
                     msgPayload["wind_direction"] = new JSONValue((uint)decoded->variant.environment_metrics.wind_direction);
                     msgPayload["wind_gust"] = new JSONValue(decoded->variant.environment_metrics.wind_gust);
                     msgPayload["wind_lull"] = new JSONValue(decoded->variant.environment_metrics.wind_lull);
+                    msgPayload["radiation"] = new JSONValue(decoded->variant.environment_metrics.radiation);
                 } else if (decoded->which_variant == meshtastic_Telemetry_air_quality_metrics_tag) {
                     msgPayload["pm10"] = new JSONValue((unsigned int)decoded->variant.air_quality_metrics.pm10_standard);
                     msgPayload["pm25"] = new JSONValue((unsigned int)decoded->variant.air_quality_metrics.pm25_standard);

src/serialization/MeshPacketSerializer_nRF52.cpp

@@ -77,6 +77,7 @@ std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp,
                     jsonObj["payload"]["wind_direction"] = (uint)decoded->variant.environment_metrics.wind_direction;
                     jsonObj["payload"]["wind_gust"] = decoded->variant.environment_metrics.wind_gust;
                     jsonObj["payload"]["wind_lull"] = decoded->variant.environment_metrics.wind_lull;
+                    jsonObj["payload"]["radiation"] = decoded->variant.environment_metrics.radiation;
                 } else if (decoded->which_variant == meshtastic_Telemetry_air_quality_metrics_tag) {
                     jsonObj["payload"]["pm10"] = (unsigned int)decoded->variant.air_quality_metrics.pm10_standard;
                     jsonObj["payload"]["pm25"] = (unsigned int)decoded->variant.air_quality_metrics.pm25_standard;

userPrefs.h

@@ -68,12 +68,21 @@ static unsigned char icon_bits[] = {
     0x98, 0x3F, 0xF0, 0x23, 0x00, 0xFC, 0x0F, 0xE0, 0x7F, 0x00, 0xFC, 0x03, 0x80, 0xFF, 0x01, 0xFC, 0x00, 0x00, 0x3E, 0x00, 0x70,
     0x00, 0x00, 0x1C, 0x00, 0x70, 0x00, 0x00, 0x1C, 0x00, 0x70, 0x00, 0x00, 0x1C, 0x00, 0x70, 0x00, 0x00, 0x1C, 0x00};
 */
+
 /*
-#define USERPREFS_USE_ADMIN_KEY 1
-static unsigned char USERPREFS_ADMIN_KEY[] = {0xcd, 0xc0, 0xb4, 0x3c, 0x53, 0x24, 0xdf, 0x13, 0xca, 0x5a, 0xa6,
-                                       0x0c, 0x0d, 0xec, 0x85, 0x5a, 0x4c, 0xf6, 0x1a, 0x96, 0x04, 0x1a,
-                                       0x3e, 0xfc, 0xbb, 0x8e, 0x33, 0x71, 0xe5, 0xfc, 0xff, 0x3c};
+ * PKI Admin keys.
+ * If a Admin key is set with '{};'
+ * then it will be ignored, a PKI key must have a size of 32 byte.
+ */
+/*
+#define USERPREFS_USE_ADMIN_KEY_0 \
+    {                                                                                                                           \
+        0xcd, 0xc0, 0xb4, 0x3c, 0x53, 0x24, 0xdf, 0x13, 0xca, 0x5a, 0xa6, 0x0c, 0x0d, 0xec, 0x85, 0x5a, 0x4c, 0xf6, 0x1a, 0x96, \
+        0x04, 0x1a, 0x3e, 0xfc, 0xbb, 0x8e, 0x33, 0x71, 0xe5, 0xfc, 0xff, 0x3c                                                  \
+    };
 */
+// #define USERPREFS_USE_ADMIN_KEY_1 {};
+// #define USERPREFS_USE_ADMIN_KEY_2 {};
 
 /*
  * USERPREF_FIXED_GPS_LAT and USERPREF_FIXED_GPS_LON must be set, USERPREF_FIXED_GPS_ALT is optional

variants/diy/platformio.ini

@@ -2,6 +2,7 @@
 [env:meshtastic-diy-v1]
 extends = esp32_base
 board = esp32doit-devkit-v1
+board_level = extra
 board_check = true
 build_flags =
   ${esp32_base.build_flags}

variants/dreamcatcher/platformio.ini

@@ -11,7 +11,7 @@ build_flags =
   -DARDUINO_USB_CDC_ON_BOOT=1
 
 lib_deps = ${esp32s3_base.lib_deps}
-  earlephilhower/ESP8266Audio@^1.9.7
+  earlephilhower/ESP8266Audio@^1.9.9
   earlephilhower/ESP8266SAM@^1.0.1
 
 [env:dreamcatcher-2206] 

variants/dreamcatcher/variant.h

@@ -60,6 +60,7 @@
 #define DAC_I2S_BCK 21
 #define DAC_I2S_WS 9
 #define DAC_I2S_DOUT 48
+#define DAC_I2S_MCLK 44
 
 #define BIAS_T_ENABLE 7 // needs to be low
 #define BIAS_T_VALUE 0

variants/radiomaster_900_bandit/platformio.ini

@@ -6,9 +6,11 @@ build_flags =
   -DRADIOMASTER_900_BANDIT
   -DVTABLES_IN_FLASH=1
   -DCONFIG_DISABLE_HAL_LOCKS=1
+  -DHAS_STK8XXX=1
   -O2
   -Ivariants/radiomaster_900_bandit
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
 lib_deps =
-  ${esp32_base.lib_deps}
+  ${esp32_base.lib_deps}
+  https://github.com/gjelsoe/STK8xxx-Accelerometer.git#v0.1.1

variants/rak11720/mbed/.c-flags

@@ -0,0 +1 @@
+-c -std=gnu11 -DMBED_MINIMAL_PRINTF -DMBED_TRAP_ERRORS_ENABLED=1 -Os -fdata-sections -ffunction-sections -fmessage-length=0 -fno-exceptions -fomit-frame-pointer -funsigned-char -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mthumb 

variants/rak11720/mbed/.c-symbols

@@ -0,0 +1 @@
+-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 

variants/rak11720/mbed/.cxx-flags

@@ -0,0 +1 @@
+-c -fno-rtti -std=gnu++14 -DMBED_MINIMAL_PRINTF -DMBED_TRAP_ERRORS_ENABLED=1 -Os -fdata-sections -ffunction-sections -fmessage-length=0 -fno-exceptions -fomit-frame-pointer -funsigned-char -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mthumb

variants/rak11720/mbed/.cxx-symbols

@@ -0,0 +1 @@
+-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_LoRa_THING_PLUS_expLoRaBLE -DTARGET_M4 -DTARGET_NAME=LoRa_THING_PLUS_expLoRaBLE -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 

variants/rak11720/mbed/.includes

@@ -0,0 +1,306 @@
+"-iwithprefixbeforembed-os"
+"-iwithprefixbeforembed-os/cmsis"
+"-iwithprefixbeforembed-os/cmsis/TARGET_CORTEX_M"
+"-iwithprefixbeforembed-os/components"
+"-iwithprefixbeforembed-os/components/802.15.4_RF"
+"-iwithprefixbeforembed-os/components/802.15.4_RF/atmel-rf-driver"
+"-iwithprefixbeforembed-os/components/802.15.4_RF/atmel-rf-driver/atmel-rf-driver"
+"-iwithprefixbeforembed-os/components/802.15.4_RF/atmel-rf-driver/source"
+"-iwithprefixbeforembed-os/components/802.15.4_RF/mcr20a-rf-driver"
+"-iwithprefixbeforembed-os/components/802.15.4_RF/mcr20a-rf-driver/mcr20a-rf-driver"
+"-iwithprefixbeforembed-os/components/802.15.4_RF/mcr20a-rf-driver/source"
+"-iwithprefixbeforembed-os/components/802.15.4_RF/stm-s2lp-rf-driver"
+"-iwithprefixbeforembed-os/components/802.15.4_RF/stm-s2lp-rf-driver/source"
+"-iwithprefixbeforembed-os/components/802.15.4_RF/stm-s2lp-rf-driver/stm-s2lp-rf-driver"
+"-iwithprefixbeforembed-os/components/storage/blockdevice/COMPONENT_FLASHIAP"
+"-iwithprefixbeforembed-os/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON"
+"-iwithprefixbeforembed-os/components/wifi"
+"-iwithprefixbeforembed-os/components/wifi/esp8266-driver"
+"-iwithprefixbeforembed-os/components/wifi/esp8266-driver/ESP8266"
+"-iwithprefixbeforembed-os/drivers/internal"
+"-iwithprefixbeforembed-os/events"
+"-iwithprefixbeforembed-os/events/internal"
+"-iwithprefixbeforembed-os/features"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/ble"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/ble/common"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/ble/gap"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/ble/generic"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/ble/pal"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/ble/services"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/source"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/source/gap"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/source/generic"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_Ambiq_Micro"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_Ambiq_Micro/TARGET_Apollo3"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_Ambiq_Micro/hal"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_Ambiq_Micro/hal/apollo3"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/driver"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/source"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/include"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/sources"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/sources/hci"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/sources/hci/dual_chip"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/sources/sec"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/sources/sec/common"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/sources/stack"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/sources/stack/att"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/sources/stack/cfg"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/sources/stack/dm"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/sources/stack/hci"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/sources/stack/l2c"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/sources/stack/smp"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/platform/include"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/wsf"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/wsf/include"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/wsf/include/util"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/wsf/sources"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/wsf/sources/port"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/wsf/sources/port/baremetal"
+"-iwithprefixbeforembed-os/features/FEATURE_BLE/targets/TARGET_CORDIO/stack_adaptation"
+"-iwithprefixbeforembed-os/features/cellular"
+"-iwithprefixbeforembed-os/features/cellular/framework"
+"-iwithprefixbeforembed-os/features/cellular/framework/API"
+"-iwithprefixbeforembed-os/features/cellular/framework/AT"
+"-iwithprefixbeforembed-os/features/cellular/framework/common"
+"-iwithprefixbeforembed-os/features/cellular/framework/device"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/Altair"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/Altair/ALT1250"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/Altair/ALT1250/PPP"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/GEMALTO"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/GEMALTO/CINTERION"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/GENERIC"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/GENERIC/GENERIC_AT3GPP"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/MultiTech"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/MultiTech/DragonflyNano"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/MultiTech/DragonflyNano/PPP"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/QUECTEL"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/QUECTEL/BC95"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/QUECTEL/BG96"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/QUECTEL/EC2X"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/QUECTEL/M26"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/QUECTEL/UG96"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/RiotMicro"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/RiotMicro/AT"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/TELIT"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/TELIT/HE910"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/TELIT/ME310"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/TELIT/ME910"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/UBLOX"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/UBLOX/AT"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/UBLOX/N2XX"
+"-iwithprefixbeforembed-os/features/cellular/framework/targets/UBLOX/PPP"
+"-iwithprefixbeforembed-os/features/device_key"
+"-iwithprefixbeforembed-os/features/device_key/source"
+"-iwithprefixbeforembed-os/features/frameworks"
+"-iwithprefixbeforembed-os/features/frameworks/greentea-client"
+"-iwithprefixbeforembed-os/features/frameworks/greentea-client/greentea-client"
+"-iwithprefixbeforembed-os/features/frameworks/mbed-client-cli"
+"-iwithprefixbeforembed-os/features/frameworks/mbed-client-cli/mbed-client-cli"
+"-iwithprefixbeforembed-os/features/frameworks/mbed-client-randlib"
+"-iwithprefixbeforembed-os/features/frameworks/mbed-client-randlib/mbed-client-randlib"
+"-iwithprefixbeforembed-os/features/frameworks/mbed-client-randlib/mbed-client-randlib/platform"
+"-iwithprefixbeforembed-os/features/frameworks/mbed-coap"
+"-iwithprefixbeforembed-os/features/frameworks/mbed-coap/mbed-coap"
+"-iwithprefixbeforembed-os/features/frameworks/mbed-coap/source"
+"-iwithprefixbeforembed-os/features/frameworks/mbed-coap/source/include"
+"-iwithprefixbeforembed-os/features/frameworks/mbed-trace"
+"-iwithprefixbeforembed-os/features/frameworks/mbed-trace/mbed-trace"
+"-iwithprefixbeforembed-os/features/frameworks/nanostack-libservice"
+"-iwithprefixbeforembed-os/features/frameworks/nanostack-libservice/mbed-client-libservice"
+"-iwithprefixbeforembed-os/features/frameworks/nanostack-libservice/mbed-client-libservice/platform"
+"-iwithprefixbeforembed-os/features/frameworks/unity"
+"-iwithprefixbeforembed-os/features/frameworks/unity/unity"
+"-iwithprefixbeforembed-os/features/frameworks/utest"
+"-iwithprefixbeforembed-os/features/frameworks/utest/utest"
+"-iwithprefixbeforembed-os/features/lorawan"
+"-iwithprefixbeforembed-os/features/lorawan/lorastack"
+"-iwithprefixbeforembed-os/features/lorawan/lorastack/mac"
+"-iwithprefixbeforembed-os/features/lorawan/lorastack/phy"
+"-iwithprefixbeforembed-os/features/lorawan/system"
+"-iwithprefixbeforembed-os/features/lwipstack"
+"-iwithprefixbeforembed-os/features/lwipstack/lwip"
+"-iwithprefixbeforembed-os/features/lwipstack/lwip-sys"
+"-iwithprefixbeforembed-os/features/lwipstack/lwip-sys/arch"
+"-iwithprefixbeforembed-os/features/lwipstack/lwip/src"
+"-iwithprefixbeforembed-os/features/lwipstack/lwip/src/include"
+"-iwithprefixbeforembed-os/features/lwipstack/lwip/src/include/compat"
+"-iwithprefixbeforembed-os/features/lwipstack/lwip/src/include/compat/posix"
+"-iwithprefixbeforembed-os/features/lwipstack/lwip/src/include/compat/posix/arpa"
+"-iwithprefixbeforembed-os/features/lwipstack/lwip/src/include/compat/posix/net"
+"-iwithprefixbeforembed-os/features/lwipstack/lwip/src/include/compat/posix/sys"
+"-iwithprefixbeforembed-os/features/lwipstack/lwip/src/include/lwip"
+"-iwithprefixbeforembed-os/features/lwipstack/lwip/src/include/lwip/priv"
+"-iwithprefixbeforembed-os/features/lwipstack/lwip/src/include/lwip/prot"
+"-iwithprefixbeforembed-os/features/lwipstack/lwip/src/include/netif"
+"-iwithprefixbeforembed-os/features/mbedtls"
+"-iwithprefixbeforembed-os/features/mbedtls/inc"
+"-iwithprefixbeforembed-os/features/mbedtls/inc/mbedtls"
+"-iwithprefixbeforembed-os/features/mbedtls/platform"
+"-iwithprefixbeforembed-os/features/mbedtls/platform/inc"
+"-iwithprefixbeforembed-os/features/nanostack"
+"-iwithprefixbeforembed-os/features/nanostack/coap-service"
+"-iwithprefixbeforembed-os/features/nanostack/coap-service/coap-service"
+"-iwithprefixbeforembed-os/features/nanostack/coap-service/source"
+"-iwithprefixbeforembed-os/features/nanostack/coap-service/source/include"
+"-iwithprefixbeforembed-os/features/nanostack/mbed-mesh-api"
+"-iwithprefixbeforembed-os/features/nanostack/mbed-mesh-api/mbed-mesh-api"
+"-iwithprefixbeforembed-os/features/nanostack/mbed-mesh-api/source"
+"-iwithprefixbeforembed-os/features/nanostack/mbed-mesh-api/source/include"
+"-iwithprefixbeforembed-os/features/nanostack/nanostack-hal-mbed-cmsis-rtos"
+"-iwithprefixbeforembed-os/features/nanostack/nanostack-interface"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack-eventloop"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/platform"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack-eventloop/source"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/nanostack"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/nanostack/platform"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/6LoWPAN"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ND"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/BorderRouter"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Common_Protocols"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Core"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Core/include"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/DHCPv6_Server"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/DHCPv6_client"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/MAC"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/MAC/virtual_rf"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/MLE"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/MPL"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/RPL"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Security"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Security/Common"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Security/PANA"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Security/TLS"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Security/eapol"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Security/kmp"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Security/protocols"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Security/protocols/key_sec_prot"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/etx"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/hmac"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/ieee_802_11"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/mac_neighbor_table"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/cpu"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/nist_aes_kw"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/utils"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/configs"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/configs/base"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/ipv6_stack"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/libDHCPv6"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/libNET"
+"-iwithprefixbeforembed-os/features/nanostack/sal-stack-nanostack/source/libNET/src"
+"-iwithprefixbeforembed-os/features/netsocket"
+"-iwithprefixbeforembed-os/features/netsocket/ppp"
+"-iwithprefixbeforembed-os/features/netsocket/ppp/include"
+"-iwithprefixbeforembed-os/features/netsocket/ppp/include/polarssl"
+"-iwithprefixbeforembed-os/features/nfc"
+"-iwithprefixbeforembed-os/features/nfc/acore"
+"-iwithprefixbeforembed-os/features/nfc/acore/acore"
+"-iwithprefixbeforembed-os/features/nfc/controllers"
+"-iwithprefixbeforembed-os/features/nfc/nfc"
+"-iwithprefixbeforembed-os/features/nfc/nfc/ndef"
+"-iwithprefixbeforembed-os/features/nfc/nfc/ndef/common"
+"-iwithprefixbeforembed-os/features/nfc/stack"
+"-iwithprefixbeforembed-os/features/nfc/stack/ndef"
+"-iwithprefixbeforembed-os/features/nfc/stack/platform"
+"-iwithprefixbeforembed-os/features/nfc/stack/tech"
+"-iwithprefixbeforembed-os/features/nfc/stack/tech/iso7816"
+"-iwithprefixbeforembed-os/features/nfc/stack/tech/isodep"
+"-iwithprefixbeforembed-os/features/nfc/stack/tech/type4"
+"-iwithprefixbeforembed-os/features/nfc/stack/transceiver"
+"-iwithprefixbeforembed-os/features/nfc/stack/transceiver/pn512"
+"-iwithprefixbeforembed-os/features/storage"
+"-iwithprefixbeforembed-os/features/storage/blockdevice"
+"-iwithprefixbeforembed-os/features/storage/filesystem"
+"-iwithprefixbeforembed-os/features/storage/filesystem/fat"
+"-iwithprefixbeforembed-os/features/storage/filesystem/fat/ChaN"
+"-iwithprefixbeforembed-os/features/storage/filesystem/littlefs"
+"-iwithprefixbeforembed-os/features/storage/filesystem/littlefs/littlefs"
+"-iwithprefixbeforembed-os/features/storage/filesystem/littlefsv2"
+"-iwithprefixbeforembed-os/features/storage/filesystem/littlefsv2/littlefs"
+"-iwithprefixbeforembed-os/features/storage/kvstore"
+"-iwithprefixbeforembed-os/features/storage/kvstore/conf"
+"-iwithprefixbeforembed-os/features/storage/kvstore/direct_access_devicekey"
+"-iwithprefixbeforembed-os/features/storage/kvstore/filesystemstore"
+"-iwithprefixbeforembed-os/features/storage/kvstore/global_api"
+"-iwithprefixbeforembed-os/features/storage/kvstore/include"
+"-iwithprefixbeforembed-os/features/storage/kvstore/kv_map"
+"-iwithprefixbeforembed-os/features/storage/kvstore/securestore"
+"-iwithprefixbeforembed-os/features/storage/kvstore/tdbstore"
+"-iwithprefixbeforembed-os/hal"
+"-iwithprefixbeforembed-os/hal/usb"
+"-iwithprefixbeforembed-os/platform"
+"-iwithprefixbeforembed-os/platform/cxxsupport"
+"-iwithprefixbeforembed-os/platform/internal"
+"-iwithprefixbeforembed-os/platform/source"
+"-iwithprefixbeforembed-os/platform/source/minimal-printf"
+"-iwithprefixbeforembed-os/rtos"
+"-iwithprefixbeforembed-os/rtos/source"
+"-iwithprefixbeforembed-os/rtos/source/TARGET_CORTEX"
+"-iwithprefixbeforembed-os/rtos/source/TARGET_CORTEX/rtx4"
+"-iwithprefixbeforembed-os/rtos/source/TARGET_CORTEX/rtx5"
+"-iwithprefixbeforembed-os/rtos/source/TARGET_CORTEX/rtx5/Include"
+"-iwithprefixbeforembed-os/rtos/source/TARGET_CORTEX/rtx5/RTX"
+"-iwithprefixbeforembed-os/rtos/source/TARGET_CORTEX/rtx5/RTX/Config"
+"-iwithprefixbeforembed-os/rtos/source/TARGET_CORTEX/rtx5/RTX/Include"
+"-iwithprefixbeforembed-os/rtos/source/TARGET_CORTEX/rtx5/RTX/Source"
+"-iwithprefixbeforembed-os/targets/TARGET_Ambiq_Micro"
+"-iwithprefixbeforembed-os/targets/TARGET_Ambiq_Micro/TARGET_Apollo3"
+"-iwithprefixbeforembed-os/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_LoRa_THING_PLUS_expLoRaBLE"
+"-iwithprefixbeforembed-os/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_LoRa_THING_PLUS_expLoRaBLE/bsp"
+"-iwithprefixbeforembed-os/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/device"
+"-iwithprefixbeforembed-os/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/sdk"
+"-iwithprefixbeforembed-os/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/sdk/CMSIS"
+"-iwithprefixbeforembed-os/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/sdk/CMSIS/AmbiqMicro"
+"-iwithprefixbeforembed-os/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/sdk/CMSIS/AmbiqMicro/Include"
+"-iwithprefixbeforembed-os/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/sdk/mcu"
+"-iwithprefixbeforembed-os/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/sdk/mcu/apollo3"
+"-iwithprefixbeforembed-os/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/sdk/mcu/apollo3/hal"
+"-iwithprefixbeforembed-os/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/sdk/mcu/apollo3/regs"
+"-iwithprefixbeforembed-os/targets/TARGET_Ambiq_Micro/sdk"
+"-iwithprefixbeforembed-os/targets/TARGET_Ambiq_Micro/sdk/devices"
+"-iwithprefixbeforembed-os/targets/TARGET_Ambiq_Micro/sdk/utils"

variants/rak11720/mbed/.ld-flags

@@ -0,0 +1 @@
+-DMBED_BOOT_STACK_SIZE=1024 -DXIP_ENABLE=0 -Wl,--gc-sections -Wl,--wrap,_calloc_r -Wl,--wrap,_memalign_r -Wl,--wrap,atexit -Wl,--wrap,exit -Wl,--wrap,fprintf -Wl,--wrap,main -Wl,--wrap,printf -Wl,--wrap,snprintf -Wl,--wrap,sprintf -Wl,--wrap,vfprintf -Wl,--wrap,vprintf -Wl,--wrap,vsnprintf -Wl,--wrap,vsprintf -Wl,-n -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mthumb 

variants/rak11720/mbed/.ld-macros

@@ -0,0 +1 @@
+ARDUINO_BLE_FIX

variants/rak11720/mbed/.ld-symbols

@@ -0,0 +1 @@
+-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1701297259.6592317 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 

variants/rak11720/mbed/mbed_config.h

@@ -0,0 +1,434 @@
+/*
+ * mbed SDK
+ * Copyright (c) 2017 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Automatically generated configuration file.
+// DO NOT EDIT, content will be overwritten.
+
+#ifndef __MBED_CONFIG_DATA__
+#define __MBED_CONFIG_DATA__
+
+// Configuration parameters
+#define ATT_NUM_SIMUL_NTF 1                                                                       // set by library:cordio
+#define ATT_NUM_SIMUL_WRITE_CMD 1                                                                 // set by library:cordio
+#define BLE_FEATURE_EXTENDED_ADVERTISING 1                                                        // set by library:ble
+#define BLE_FEATURE_GATT_CLIENT 1                                                                 // set by library:ble
+#define BLE_FEATURE_GATT_SERVER 1                                                                 // set by library:ble
+#define BLE_FEATURE_PERIODIC_ADVERTISING 1                                                        // set by library:ble
+#define BLE_FEATURE_PHY_MANAGEMENT 1                                                              // set by library:ble
+#define BLE_FEATURE_PRIVACY 1                                                                     // set by library:ble
+#define BLE_FEATURE_SECURE_CONNECTIONS 1                                                          // set by library:ble
+#define BLE_FEATURE_SECURITY 1                                                                    // set by library:ble
+#define BLE_FEATURE_SIGNING 1                                                                     // set by library:ble
+#define BLE_FEATURE_WHITELIST 1                                                                   // set by library:ble
+#define BLE_ROLE_BROADCASTER 1                                                                    // set by library:ble
+#define BLE_ROLE_CENTRAL 1                                                                        // set by library:ble
+#define BLE_ROLE_OBSERVER 1                                                                       // set by library:ble
+#define BLE_ROLE_PERIPHERAL 1                                                                     // set by library:ble
+#define BLE_SECURITY_DATABASE_MAX_ENTRIES 5                                                       // set by library:ble
+#define DM_CONN_MAX 3                                                                             // set by library:cordio
+#define DM_NUM_ADV_SETS 3                                                                         // set by library:cordio
+#define DM_NUM_PHYS 3                                                                             // set by library:cordio
+#define DM_SYNC_MAX 1                                                                             // set by library:cordio
+#define L2C_COC_CHAN_MAX 1                                                                        // set by library:cordio
+#define L2C_COC_REG_MAX 1                                                                         // set by library:cordio
+#define MBED_CONF_ALT1250_PPP_BAUDRATE 115200                                                     // set by library:ALT1250_PPP
+#define MBED_CONF_ALT1250_PPP_PROVIDE_DEFAULT 0                                                   // set by library:ALT1250_PPP
+#define MBED_CONF_ATMEL_RF_ASSUME_SPACED_SPI 0                                                    // set by library:atmel-rf
+#define MBED_CONF_ATMEL_RF_FULL_SPI_SPEED 7500000                                                 // set by library:atmel-rf
+#define MBED_CONF_ATMEL_RF_FULL_SPI_SPEED_BYTE_SPACING 250                                        // set by library:atmel-rf
+#define MBED_CONF_ATMEL_RF_IRQ_THREAD_STACK_SIZE 1024                                             // set by library:atmel-rf
+#define MBED_CONF_ATMEL_RF_LOW_SPI_SPEED 3750000                                                  // set by library:atmel-rf
+#define MBED_CONF_ATMEL_RF_PROVIDE_DEFAULT 0                                                      // set by library:atmel-rf
+#define MBED_CONF_ATMEL_RF_USE_SPI_SPACING_API 0                                                  // set by library:atmel-rf
+#define MBED_CONF_BLE_PRESENT 1                                                                   // set by library:ble
+#define MBED_CONF_CELLULAR_CONTROL_PLANE_OPT 0                                                    // set by library:cellular
+#define MBED_CONF_CELLULAR_DEBUG_AT 0                                                             // set by library:cellular
+#define MBED_CONF_CELLULAR_MAX_CP_DATA_RECV_LEN 1358                                              // set by library:cellular
+#define MBED_CONF_CELLULAR_RANDOM_MAX_START_DELAY 0                                               // set by library:cellular
+#define MBED_CONF_CELLULAR_USE_APN_LOOKUP 0                                                       // set by library:cellular
+#define MBED_CONF_CELLULAR_USE_SMS 0                                                              // set by library:cellular
+#define MBED_CONF_CORDIO_DESIRED_ATT_MTU 23                                                       // set by library:cordio
+#define MBED_CONF_CORDIO_MAX_PREPARED_WRITES 4                                                    // set by library:cordio
+#define MBED_CONF_CORDIO_PREFERRED_TX_POWER 0                                                     // set by library:cordio
+#define MBED_CONF_CORDIO_ROUTE_UNHANDLED_COMMAND_COMPLETE_EVENTS 1                                // set by library:cordio
+#define MBED_CONF_CORDIO_RX_ACL_BUFFER_SIZE 70                                                    // set by library:cordio
+#define MBED_CONF_DRIVERS_QSPI_CSN QSPI_FLASH1_CSN                                                // set by library:drivers
+#define MBED_CONF_DRIVERS_QSPI_IO0 QSPI_FLASH1_IO0                                                // set by library:drivers
+#define MBED_CONF_DRIVERS_QSPI_IO1 QSPI_FLASH1_IO1                                                // set by library:drivers
+#define MBED_CONF_DRIVERS_QSPI_IO2 QSPI_FLASH1_IO2                                                // set by library:drivers
+#define MBED_CONF_DRIVERS_QSPI_IO3 QSPI_FLASH1_IO3                                                // set by library:drivers
+#define MBED_CONF_DRIVERS_QSPI_SCK QSPI_FLASH1_SCK                                                // set by library:drivers
+#define MBED_CONF_DRIVERS_UART_SERIAL_RXBUF_SIZE 256                                              // set by library:drivers
+#define MBED_CONF_DRIVERS_UART_SERIAL_TXBUF_SIZE 256                                              // set by library:drivers
+#define MBED_CONF_ESP8266_BUILT_IN_DNS 0                                                          // set by library:esp8266
+#define MBED_CONF_ESP8266_DEBUG 0                                                                 // set by library:esp8266
+#define MBED_CONF_ESP8266_POWER_OFF_TIME_MS 3                                                     // set by library:esp8266
+#define MBED_CONF_ESP8266_POWER_ON_POLARITY 0                                                     // set by library:esp8266
+#define MBED_CONF_ESP8266_POWER_ON_TIME_MS 3                                                      // set by library:esp8266
+#define MBED_CONF_ESP8266_PROVIDE_DEFAULT 0                                                       // set by library:esp8266
+#define MBED_CONF_ESP8266_SERIAL_BAUDRATE 115200                                                  // set by library:esp8266
+#define MBED_CONF_ESP8266_SNTP_ENABLE 0                                                           // set by library:esp8266
+#define MBED_CONF_ESP8266_SNTP_SERVER0 ""                                                         // set by library:esp8266
+#define MBED_CONF_ESP8266_SNTP_SERVER1 ""                                                         // set by library:esp8266
+#define MBED_CONF_ESP8266_SNTP_SERVER2 ""                                                         // set by library:esp8266
+#define MBED_CONF_ESP8266_SNTP_TIMEZONE 0                                                         // set by library:esp8266
+#define MBED_CONF_ESP8266_SOCKET_BUFSIZE 8192                                                     // set by library:esp8266
+#define MBED_CONF_EVENTS_PRESENT 1                                                                // set by library:events
+#define MBED_CONF_EVENTS_SHARED_DISPATCH_FROM_APPLICATION 0                                       // set by library:events
+#define MBED_CONF_EVENTS_SHARED_EVENTSIZE 768                                                     // set by library:events
+#define MBED_CONF_EVENTS_SHARED_HIGHPRIO_EVENTSIZE 256                                            // set by library:events
+#define MBED_CONF_EVENTS_SHARED_HIGHPRIO_STACKSIZE 1024                                           // set by library:events
+#define MBED_CONF_EVENTS_SHARED_STACKSIZE 2048                                                    // set by library:events
+#define MBED_CONF_EVENTS_USE_LOWPOWER_TIMER_TICKER 0                                              // set by library:events
+#define MBED_CONF_FAT_CHAN_FFS_DBG 0                                                              // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_CODE_PAGE 437                                                       // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_FS_EXFAT 0                                                          // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_FS_HEAPBUF 1                                                        // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_FS_LOCK 0                                                           // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_FS_MINIMIZE 0                                                       // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_FS_NOFSINFO 0                                                       // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_FS_NORTC 0                                                          // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_FS_READONLY 0                                                       // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_FS_REENTRANT 0                                                      // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_FS_RPATH 1                                                          // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_FS_TIMEOUT 1000                                                     // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_FS_TINY 1                                                           // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_LFN_BUF 255                                                         // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_LFN_UNICODE 0                                                       // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_MAX_LFN 255                                                         // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_MAX_SS 4096                                                         // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_MIN_SS 512                                                          // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_MULTI_PARTITION 0                                                   // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_NORTC_MDAY 1                                                        // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_NORTC_MON 1                                                         // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_NORTC_YEAR 2017                                                     // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_SFN_BUF 12                                                          // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_STRF_ENCODE 3                                                       // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_STR_VOLUME_ID 0                                                     // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_SYNC_T HANDLE                                                       // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_USE_CHMOD 0                                                         // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_USE_EXPAND 0                                                        // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_USE_FASTSEEK 0                                                      // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_USE_FIND 0                                                          // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_USE_FORWARD 0                                                       // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_USE_LABEL 0                                                         // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_USE_LFN 3                                                           // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_USE_MKFS 1                                                          // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_USE_STRFUNC 0                                                       // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_USE_TRIM 1                                                          // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_VOLUMES 4                                                           // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FF_VOLUME_STRS "RAM", "NAND", "CF", "SD", "SD2", "USB", "USB2", "USB3" // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FLUSH_ON_NEW_CLUSTER 0                                                 // set by library:fat_chan
+#define MBED_CONF_FAT_CHAN_FLUSH_ON_NEW_SECTOR 1                                                  // set by library:fat_chan
+#define MBED_CONF_FILESYSTEM_PRESENT 1                                                            // set by library:filesystem
+#define MBED_CONF_FLASHIAP_BLOCK_DEVICE_BASE_ADDRESS 0xFFFFFFFF // set by library:flashiap-block-device
+#define MBED_CONF_FLASHIAP_BLOCK_DEVICE_SIZE 0                  // set by library:flashiap-block-device
+#define MBED_CONF_GEMALTO_CINTERION_BAUDRATE 115200             // set by library:GEMALTO_CINTERION
+#define MBED_CONF_GEMALTO_CINTERION_PROVIDE_DEFAULT 0           // set by library:GEMALTO_CINTERION
+#define MBED_CONF_GENERIC_AT3GPP_BAUDRATE 115200                // set by library:GENERIC_AT3GPP
+#define MBED_CONF_GENERIC_AT3GPP_PROVIDE_DEFAULT 0              // set by library:GENERIC_AT3GPP
+#define MBED_CONF_LORA_ADR_ON 1                                 // set by library:lora
+#define MBED_CONF_LORA_APPLICATION_EUI                                                                                           \
+    {                                                                                                                            \
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00                                                                           \
+    } // set by library:lora
+#define MBED_CONF_LORA_APPLICATION_KEY                                                                                           \
+    {                                                                                                                            \
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00                           \
+    } // set by library:lora
+#define MBED_CONF_LORA_APPSKEY                                                                                                   \
+    {                                                                                                                            \
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00                           \
+    }                                             // set by library:lora
+#define MBED_CONF_LORA_APP_PORT 15                // set by library:lora
+#define MBED_CONF_LORA_AUTOMATIC_UPLINK_MESSAGE 1 // set by library:lora
+#define MBED_CONF_LORA_DEVICE_ADDRESS 0x00000000  // set by library:lora
+#define MBED_CONF_LORA_DEVICE_EUI                                                                                                \
+    {                                                                                                                            \
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00                                                                           \
+    }                                             // set by library:lora
+#define MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH 5 // set by library:lora
+#define MBED_CONF_LORA_DUTY_CYCLE_ON 1            // set by library:lora
+#define MBED_CONF_LORA_DUTY_CYCLE_ON_JOIN 1       // set by library:lora
+#define MBED_CONF_LORA_FSB_MASK                                                                                                  \
+    {                                                                                                                            \
+        0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x00FF                                                                                   \
+    } // set by library:lora
+#define MBED_CONF_LORA_FSB_MASK_CHINA                                                                                            \
+    {                                                                                                                            \
+        0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF                                                                           \
+    }                                     // set by library:lora
+#define MBED_CONF_LORA_LBT_ON 0           // set by library:lora
+#define MBED_CONF_LORA_MAX_SYS_RX_ERROR 5 // set by library:lora
+#define MBED_CONF_LORA_NB_TRIALS 12       // set by library:lora
+#define MBED_CONF_LORA_NWKSKEY                                                                                                   \
+    {                                                                                                                            \
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00                           \
+    }                                                                     // set by library:lora
+#define MBED_CONF_LORA_OVER_THE_AIR_ACTIVATION 1                          // set by library:lora
+#define MBED_CONF_LORA_PHY EU868                                          // set by library:lora
+#define MBED_CONF_LORA_PUBLIC_NETWORK 1                                   // set by library:lora
+#define MBED_CONF_LORA_TX_MAX_SIZE 64                                     // set by library:lora
+#define MBED_CONF_LORA_UPLINK_PREAMBLE_LENGTH 8                           // set by library:lora
+#define MBED_CONF_LORA_WAKEUP_TIME 5                                      // set by library:lora
+#define MBED_CONF_LWIP_ADDR_TIMEOUT 5                                     // set by library:lwip
+#define MBED_CONF_LWIP_ADDR_TIMEOUT_MODE 1                                // set by library:lwip
+#define MBED_CONF_LWIP_DEBUG_ENABLED 0                                    // set by library:lwip
+#define MBED_CONF_LWIP_DEFAULT_THREAD_STACKSIZE 512                       // set by library:lwip
+#define MBED_CONF_LWIP_DHCP_TIMEOUT 60                                    // set by library:lwip
+#define MBED_CONF_LWIP_ENABLE_PPP_TRACE 0                                 // set by library:lwip
+#define MBED_CONF_LWIP_ETHERNET_ENABLED 1                                 // set by library:lwip
+#define MBED_CONF_LWIP_IPV4_ENABLED 1                                     // set by library:lwip
+#define MBED_CONF_LWIP_IPV6_ENABLED 0                                     // set by library:lwip
+#define MBED_CONF_LWIP_IP_VER_PREF 4                                      // set by library:lwip
+#define MBED_CONF_LWIP_L3IP_ENABLED 0                                     // set by library:lwip
+#define MBED_CONF_LWIP_MBOX_SIZE 8                                        // set by library:lwip
+#define MBED_CONF_LWIP_MEMP_NUM_TCPIP_MSG_INPKT 8                         // set by library:lwip
+#define MBED_CONF_LWIP_MEMP_NUM_TCP_SEG 16                                // set by library:lwip
+#define MBED_CONF_LWIP_MEM_SIZE 1600                                      // set by library:lwip
+#define MBED_CONF_LWIP_NUM_NETBUF 8                                       // set by library:lwip
+#define MBED_CONF_LWIP_NUM_PBUF 8                                         // set by library:lwip
+#define MBED_CONF_LWIP_PBUF_POOL_SIZE 5                                   // set by library:lwip
+#define MBED_CONF_LWIP_PPP_ENABLED 0                                      // set by library:lwip
+#define MBED_CONF_LWIP_PPP_IPV4_ENABLED 0                                 // set by library:lwip
+#define MBED_CONF_LWIP_PPP_IPV6_ENABLED 0                                 // set by library:lwip
+#define MBED_CONF_LWIP_PPP_THREAD_STACKSIZE 768                           // set by library:lwip
+#define MBED_CONF_LWIP_PRESENT 1                                          // set by library:lwip
+#define MBED_CONF_LWIP_RAW_SOCKET_ENABLED 0                               // set by library:lwip
+#define MBED_CONF_LWIP_SOCKET_MAX 4                                       // set by library:lwip
+#define MBED_CONF_LWIP_TCPIP_THREAD_PRIORITY osPriorityNormal             // set by library:lwip
+#define MBED_CONF_LWIP_TCPIP_THREAD_STACKSIZE 1200                        // set by library:lwip
+#define MBED_CONF_LWIP_TCP_CLOSE_TIMEOUT 1000                             // set by library:lwip
+#define MBED_CONF_LWIP_TCP_ENABLED 1                                      // set by library:lwip
+#define MBED_CONF_LWIP_TCP_MAXRTX 6                                       // set by library:lwip
+#define MBED_CONF_LWIP_TCP_MSS 536                                        // set by library:lwip
+#define MBED_CONF_LWIP_TCP_SERVER_MAX 4                                   // set by library:lwip
+#define MBED_CONF_LWIP_TCP_SND_BUF (2 * TCP_MSS)                          // set by library:lwip
+#define MBED_CONF_LWIP_TCP_SOCKET_MAX 4                                   // set by library:lwip
+#define MBED_CONF_LWIP_TCP_SYNMAXRTX 6                                    // set by library:lwip
+#define MBED_CONF_LWIP_TCP_WND (4 * TCP_MSS)                              // set by library:lwip
+#define MBED_CONF_LWIP_UDP_SOCKET_MAX 4                                   // set by library:lwip
+#define MBED_CONF_LWIP_USE_MBED_TRACE 0                                   // set by library:lwip
+#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL 0                      // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL_MASK 0x7fff800         // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL_PAGE 0                 // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_DEVICE_TYPE NET_6LOWPAN_ROUTER // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PANID_FILTER 0xffff            // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PSK_KEY                                                                               \
+    {                                                                                                                            \
+        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf                           \
+    }                                                                                 // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PSK_KEY_ID 1                               // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_SECURITY_MODE NONE                         // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_SEC_LEVEL 5                                // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_HEAP_SIZE 32500                                       // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_HEAP_STAT_INFO NULL                                   // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_MAC_NEIGH_TABLE_SIZE 32                               // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL 22                              // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL_MASK 0x7fff800                  // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL_PAGE 0                          // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_COMMISSIONING_DATASET_TIMESTAMP 0x10000 // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_EXTENDED_PANID                                                                     \
+    {                                                                                                                            \
+        0xf1, 0xb5, 0xa1, 0xb2, 0xc4, 0xd5, 0xa1, 0xbd                                                                           \
+    } // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_ML_PREFIX                                                                          \
+    {                                                                                                                            \
+        0xfd, 0x0, 0x0d, 0xb8, 0x0, 0x0, 0x0, 0x0                                                                                \
+    }                                                                       // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_NETWORK_NAME "Thread Network" // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_PANID 0x0700                  // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_PSKC                                                                               \
+    {                                                                                                                            \
+        0xc8, 0xa6, 0x2e, 0xae, 0xf3, 0x68, 0xf3, 0x46, 0xa9, 0x9e, 0x57, 0x85, 0x98, 0x9d, 0x1c, 0xd0                           \
+    }                                                                             // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_THREAD_DEVICE_TYPE MESH_DEVICE_TYPE_THREAD_ROUTER // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_THREAD_MASTER_KEY                                                                                \
+    {                                                                                                                            \
+        0x10, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff                           \
+    }                                                                           // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_THREAD_PSKD "ABCDEFGH"                          // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_THREAD_SECURITY_POLICY 255                      // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_THREAD_USE_STATIC_LINK_CONFIG 1                 // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_USE_MALLOC_FOR_HEAP 0                           // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_WISUN_BC_CHANNEL_FUNCTION 255                   // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_WISUN_BC_DWELL_INTERVAL 0                       // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_WISUN_BC_FIXED_CHANNEL 65535                    // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_WISUN_BC_INTERVAL 0                             // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_WISUN_DEVICE_TYPE MESH_DEVICE_TYPE_WISUN_ROUTER // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_WISUN_NETWORK_NAME "Wi-SUN Network"             // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_WISUN_OPERATING_CLASS 255                       // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_WISUN_OPERATING_MODE 255                        // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_WISUN_REGULATORY_DOMAIN 3                       // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_WISUN_UC_CHANNEL_FUNCTION 255                   // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_WISUN_UC_DWELL_INTERVAL 255                     // set by library:mbed-mesh-api
+#define MBED_CONF_MBED_MESH_API_WISUN_UC_FIXED_CHANNEL 65535                    // set by library:mbed-mesh-api
+#define MBED_CONF_MCR20A_PROVIDE_DEFAULT 0                                      // set by library:mcr20a
+#define MBED_CONF_NANOSTACK_CONFIGURATION nanostack_full                        // set by library:nanostack
+#define MBED_CONF_NANOSTACK_HAL_CRITICAL_SECTION_USABLE_FROM_INTERRUPT 0        // set by library:nanostack-hal
+#define MBED_CONF_NANOSTACK_HAL_EVENT_LOOP_DISPATCH_FROM_APPLICATION 0          // set by library:nanostack-hal
+#define MBED_CONF_NANOSTACK_HAL_EVENT_LOOP_THREAD_STACK_SIZE 6144               // set by library:nanostack-hal
+#define MBED_CONF_NANOSTACK_HAL_EVENT_LOOP_USE_MBED_EVENTS 0                    // set by library:nanostack-hal
+#define MBED_CONF_NANOSTACK_HAL_KVSTORE_PATH "/kv/"                             // set by library:nanostack-hal
+#define MBED_CONF_NANOSTACK_HAL_USE_KVSTORE 0                                   // set by library:nanostack-hal
+#define MBED_CONF_NSAPI_DEFAULT_MESH_TYPE THREAD                                // set by library:nsapi
+#define MBED_CONF_NSAPI_DEFAULT_STACK LWIP                                      // set by library:nsapi
+#define MBED_CONF_NSAPI_DEFAULT_WIFI_SECURITY NONE                              // set by library:nsapi
+#define MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT 10                                  // set by library:nsapi
+#define MBED_CONF_NSAPI_DNS_CACHE_SIZE 3                                        // set by library:nsapi
+#define MBED_CONF_NSAPI_DNS_RESPONSE_WAIT_TIME 10000                            // set by library:nsapi
+#define MBED_CONF_NSAPI_DNS_RETRIES 1                                           // set by library:nsapi
+#define MBED_CONF_NSAPI_DNS_TOTAL_ATTEMPTS 10                                   // set by library:nsapi
+#define MBED_CONF_NSAPI_PRESENT 1                                               // set by library:nsapi
+#define MBED_CONF_NSAPI_SOCKET_STATS_ENABLED 0                                  // set by library:nsapi
+#define MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT 10                               // set by library:nsapi
+#define MBED_CONF_PLATFORM_CALLBACK_COMPARABLE 1                                // set by library:platform
+#define MBED_CONF_PLATFORM_CALLBACK_NONTRIVIAL 0                                // set by library:platform
+#define MBED_CONF_PLATFORM_CRASH_CAPTURE_ENABLED 0                              // set by library:platform
+#define MBED_CONF_PLATFORM_CTHUNK_COUNT_MAX 8                                   // set by library:platform
+#define MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE 9600                        // set by library:platform
+#define MBED_CONF_PLATFORM_ERROR_ALL_THREADS_INFO 0                             // set by library:platform
+#define MBED_CONF_PLATFORM_ERROR_FILENAME_CAPTURE_ENABLED 0                     // set by library:platform
+#define MBED_CONF_PLATFORM_ERROR_HIST_ENABLED 0                                 // set by library:platform
+#define MBED_CONF_PLATFORM_ERROR_HIST_SIZE 4                                    // set by library:platform
+#define MBED_CONF_PLATFORM_ERROR_REBOOT_MAX 1                                   // set by library:platform
+#define MBED_CONF_PLATFORM_FATAL_ERROR_AUTO_REBOOT_ENABLED 0                    // set by library:platform
+#define MBED_CONF_PLATFORM_MAX_ERROR_FILENAME_LEN 16                            // set by library:platform
+#define MBED_CONF_PLATFORM_MINIMAL_PRINTF_ENABLE_64_BIT 1                       // set by library:platform
+#define MBED_CONF_PLATFORM_MINIMAL_PRINTF_ENABLE_FLOATING_POINT 0               // set by library:platform
+#define MBED_CONF_PLATFORM_MINIMAL_PRINTF_SET_FLOATING_POINT_MAX_DECIMALS 6     // set by library:platform
+#define MBED_CONF_PLATFORM_POLL_USE_LOWPOWER_TIMER 0                            // set by library:platform
+#define MBED_CONF_PLATFORM_STDIO_BAUD_RATE 9600                                 // set by library:platform
+#define MBED_CONF_PLATFORM_STDIO_BUFFERED_SERIAL 0                              // set by library:platform
+#define MBED_CONF_PLATFORM_STDIO_CONVERT_NEWLINES 1                             // set by library:platform
+#define MBED_CONF_PLATFORM_STDIO_CONVERT_TTY_NEWLINES 1                         // set by library:platform
+#define MBED_CONF_PLATFORM_STDIO_FLUSH_AT_EXIT 1                                // set by library:platform
+#define MBED_CONF_PLATFORM_STDIO_MINIMAL_CONSOLE_ONLY 0                         // set by library:platform
+#define MBED_CONF_PLATFORM_USE_MPU 1                                            // set by library:platform
+#define MBED_CONF_PPP_ENABLED 0                                                 // set by library:ppp
+#define MBED_CONF_PPP_ENABLE_TRACE 0                                            // set by library:ppp
+#define MBED_CONF_PPP_IPV4_ENABLED 1                                            // set by library:ppp
+#define MBED_CONF_PPP_IPV6_ENABLED 0                                            // set by library:ppp
+#define MBED_CONF_PPP_MBED_EVENT_QUEUE 0                                        // set by library:ppp
+#define MBED_CONF_PPP_THREAD_STACKSIZE 816                                      // set by library:ppp
+#define MBED_CONF_QUECTEL_BC95_BAUDRATE 9600                                    // set by library:QUECTEL_BC95
+#define MBED_CONF_QUECTEL_BC95_PROVIDE_DEFAULT 0                                // set by library:QUECTEL_BC95
+#define MBED_CONF_QUECTEL_BG96_BAUDRATE 115200                                  // set by library:QUECTEL_BG96
+#define MBED_CONF_QUECTEL_BG96_PROVIDE_DEFAULT 0                                // set by library:QUECTEL_BG96
+#define MBED_CONF_QUECTEL_EC2X_BAUDRATE 115200                                  // set by library:QUECTEL_EC2X
+#define MBED_CONF_QUECTEL_EC2X_PROVIDE_DEFAULT 0                                // set by library:QUECTEL_EC2X
+#define MBED_CONF_QUECTEL_EC2X_START_TIMEOUT 15000                              // set by library:QUECTEL_EC2X
+#define MBED_CONF_QUECTEL_M26_BAUDRATE 115200                                   // set by library:QUECTEL_M26
+#define MBED_CONF_QUECTEL_M26_PROVIDE_DEFAULT 0                                 // set by library:QUECTEL_M26
+#define MBED_CONF_QUECTEL_UG96_BAUDRATE 115200                                  // set by library:QUECTEL_UG96
+#define MBED_CONF_QUECTEL_UG96_PROVIDE_DEFAULT 0                                // set by library:QUECTEL_UG96
+#define MBED_CONF_RM1000_AT_BAUDRATE 230400                                     // set by library:RM1000_AT
+#define MBED_CONF_RM1000_AT_PROVIDE_DEFAULT 0                                   // set by library:RM1000_AT
+#define MBED_CONF_RTOS_API_PRESENT 1                                            // set by library:rtos-api
+#define MBED_CONF_RTOS_EVFLAGS_NUM 0                                            // set by library:rtos
+#define MBED_CONF_RTOS_IDLE_THREAD_STACK_SIZE 512                               // set by library:rtos
+#define MBED_CONF_RTOS_IDLE_THREAD_STACK_SIZE_DEBUG_EXTRA 0                     // set by library:rtos
+#define MBED_CONF_RTOS_IDLE_THREAD_STACK_SIZE_TICKLESS_EXTRA 256                // set by library:rtos
+#define MBED_CONF_RTOS_MAIN_THREAD_STACK_SIZE 4096                              // set by library:rtos
+#define MBED_CONF_RTOS_MSGQUEUE_DATA_SIZE 0                                     // set by library:rtos
+#define MBED_CONF_RTOS_MSGQUEUE_NUM 0                                           // set by library:rtos
+#define MBED_CONF_RTOS_MUTEX_NUM 0                                              // set by library:rtos
+#define MBED_CONF_RTOS_PRESENT 1                                                // set by library:rtos
+#define MBED_CONF_RTOS_SEMAPHORE_NUM 0                                          // set by library:rtos
+#define MBED_CONF_RTOS_THREAD_NUM 0                                             // set by library:rtos
+#define MBED_CONF_RTOS_THREAD_STACK_SIZE 4096                                   // set by library:rtos
+#define MBED_CONF_RTOS_THREAD_USER_STACK_SIZE 0                                 // set by library:rtos
+#define MBED_CONF_RTOS_TIMER_NUM 0                                              // set by library:rtos
+#define MBED_CONF_RTOS_TIMER_THREAD_STACK_SIZE 768                              // set by library:rtos
+#define MBED_CONF_S2LP_PROVIDE_DEFAULT 0                                        // set by library:s2lp
+#define MBED_CONF_SARA4_PPP_BAUDRATE 115200                                     // set by library:SARA4_PPP
+#define MBED_CONF_SARA4_PPP_PROVIDE_DEFAULT 0                                   // set by library:SARA4_PPP
+#define MBED_CONF_STORAGE_DEFAULT_KV kv                                         // set by library:storage
+#define MBED_CONF_STORAGE_FILESYSTEM_BLOCKDEVICE default                        // set by library:storage_filesystem
+#define MBED_CONF_STORAGE_FILESYSTEM_EXTERNAL_BASE_ADDRESS 0                    // set by library:storage_filesystem
+#define MBED_CONF_STORAGE_FILESYSTEM_EXTERNAL_SIZE 0                            // set by library:storage_filesystem
+#define MBED_CONF_STORAGE_FILESYSTEM_FILESYSTEM default                         // set by library:storage_filesystem
+#define MBED_CONF_STORAGE_FILESYSTEM_FOLDER_PATH kvstore                        // set by library:storage_filesystem
+#define MBED_CONF_STORAGE_FILESYSTEM_INTERNAL_BASE_ADDRESS 0                    // set by library:storage_filesystem
+#define MBED_CONF_STORAGE_FILESYSTEM_MOUNT_POINT kv                             // set by library:storage_filesystem
+#define MBED_CONF_STORAGE_FILESYSTEM_NO_RBP_BLOCKDEVICE default                 // set by library:storage_filesystem_no_rbp
+#define MBED_CONF_STORAGE_FILESYSTEM_NO_RBP_EXTERNAL_BASE_ADDRESS 0             // set by library:storage_filesystem_no_rbp
+#define MBED_CONF_STORAGE_FILESYSTEM_NO_RBP_EXTERNAL_SIZE 0                     // set by library:storage_filesystem_no_rbp
+#define MBED_CONF_STORAGE_FILESYSTEM_NO_RBP_FILESYSTEM default                  // set by library:storage_filesystem_no_rbp
+#define MBED_CONF_STORAGE_FILESYSTEM_NO_RBP_FOLDER_PATH kvstore                 // set by library:storage_filesystem_no_rbp
+#define MBED_CONF_STORAGE_FILESYSTEM_NO_RBP_MOUNT_POINT kv                      // set by library:storage_filesystem_no_rbp
+#define MBED_CONF_STORAGE_FILESYSTEM_RBP_INTERNAL_SIZE 0                        // set by library:storage_filesystem
+#define MBED_CONF_STORAGE_STORAGE_TYPE default                                  // set by library:storage
+#define MBED_CONF_STORAGE_TDB_EXTERNAL_BLOCKDEVICE default                      // set by library:storage_tdb_external
+#define MBED_CONF_STORAGE_TDB_EXTERNAL_EXTERNAL_BASE_ADDRESS 0                  // set by library:storage_tdb_external
+#define MBED_CONF_STORAGE_TDB_EXTERNAL_EXTERNAL_SIZE 0                          // set by library:storage_tdb_external
+#define MBED_CONF_STORAGE_TDB_EXTERNAL_INTERNAL_BASE_ADDRESS 0                  // set by library:storage_tdb_external
+#define MBED_CONF_STORAGE_TDB_EXTERNAL_NO_RBP_BLOCKDEVICE default               // set by library:storage_tdb_external_no_rbp
+#define MBED_CONF_STORAGE_TDB_EXTERNAL_NO_RBP_EXTERNAL_BASE_ADDRESS 0           // set by library:storage_tdb_external_no_rbp
+#define MBED_CONF_STORAGE_TDB_EXTERNAL_NO_RBP_EXTERNAL_SIZE 0                   // set by library:storage_tdb_external_no_rbp
+#define MBED_CONF_STORAGE_TDB_EXTERNAL_RBP_INTERNAL_SIZE 0                      // set by library:storage_tdb_external
+#define MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_BASE_ADDRESS 0                  // set by library:storage_tdb_internal
+#define MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_SIZE 0                          // set by library:storage_tdb_internal
+#define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400                                  // set by library:rtos[*]
+#define MBED_CONF_TARGET_CONSOLE_UART 1                                         // set by target:Target
+#define MBED_CONF_TARGET_DEEP_SLEEP_LATENCY 0                                   // set by target:Target
+#define MBED_CONF_TARGET_DEFAULT_ADC_VREF NAN                                   // set by target:Target
+#define MBED_CONF_TARGET_INIT_US_TICKER_AT_BOOT 0                               // set by target:Target
+#define MBED_CONF_TARGET_MPU_ROM_END 0x0fffffff                                 // set by target:Target
+#define MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER 0                              // set by target:Target
+#define MBED_CONF_TARGET_XIP_ENABLE 0                                           // set by target:Target
+#define MBED_CONF_TELIT_HE910_BAUDRATE 115200                                   // set by library:TELIT_HE910
+#define MBED_CONF_TELIT_HE910_PROVIDE_DEFAULT 0                                 // set by library:TELIT_HE910
+#define MBED_CONF_TELIT_ME310_BAUDRATE 115200                                   // set by library:TELIT_ME310
+#define MBED_CONF_TELIT_ME310_PROVIDE_DEFAULT 0                                 // set by library:TELIT_ME310
+#define MBED_CONF_TELIT_ME910_BAUDRATE 115200                                   // set by library:TELIT_ME910
+#define MBED_CONF_TELIT_ME910_PROVIDE_DEFAULT 0                                 // set by library:TELIT_ME910
+#define MBED_CONF_UBLOX_AT_BAUDRATE 115200                                      // set by library:UBLOX_AT
+#define MBED_CONF_UBLOX_AT_PROVIDE_DEFAULT 0                                    // set by library:UBLOX_AT
+#define MBED_CONF_UBLOX_N2XX_BAUDRATE 9600                                      // set by library:UBLOX_N2XX
+#define MBED_CONF_UBLOX_N2XX_PROVIDE_DEFAULT 0                                  // set by library:UBLOX_N2XX
+#define MBED_CONF_UBLOX_PPP_BAUDRATE 115200                                     // set by library:UBLOX_PPP
+#define MBED_CONF_UBLOX_PPP_PROVIDE_DEFAULT 0                                   // set by library:UBLOX_PPP
+#define MBED_CRC_TABLE_SIZE 16                                                  // set by library:drivers
+#define MBED_LFS2_BLOCK_CYCLES 1024                                             // set by library:littlefs2
+#define MBED_LFS2_BLOCK_SIZE 512                                                // set by library:littlefs2
+#define MBED_LFS2_CACHE_SIZE 64                                                 // set by library:littlefs2
+#define MBED_LFS2_ENABLE_INFO 0                                                 // set by library:littlefs2
+#define MBED_LFS2_INTRINSICS 1                                                  // set by library:littlefs2
+#define MBED_LFS2_LOOKAHEAD_SIZE 64                                             // set by library:littlefs2
+#define MBED_LFS_BLOCK_SIZE 512                                                 // set by library:littlefs
+#define MBED_LFS_ENABLE_INFO 0                                                  // set by library:littlefs
+#define MBED_LFS_INTRINSICS 1                                                   // set by library:littlefs
+#define MBED_LFS_LOOKAHEAD 512                                                  // set by library:littlefs
+#define MBED_LFS_PROG_SIZE 64                                                   // set by library:littlefs
+#define MBED_LFS_READ_SIZE 64                                                   // set by library:littlefs
+#define MBED_STACK_DUMP_ENABLED 0                                               // set by library:platform
+#define MEM_ALLOC malloc                                                        // set by library:mbed-trace
+#define MEM_FREE free                                                           // set by library:mbed-trace
+#define PPP_DEBUG 0                                                             // set by library:ppp
+#define SEC_CCM_CFG 1                                                           // set by library:cordio
+#define SMP_DB_MAX_DEVICES 3                                                    // set by library:cordio
+// Macros
+#define MBEDTLS_CIPHER_MODE_CTR                                                   // defined by library:SecureStore
+#define MBEDTLS_CMAC_C                                                            // defined by library:SecureStore
+#define NSAPI_PPP_AVAILABLE (MBED_CONF_PPP_ENABLED || MBED_CONF_LWIP_PPP_ENABLED) // defined by library:ppp
+#define NS_USE_EXTERNAL_MBED_TLS                                                  // defined by library:nanostack
+#define UNITY_INCLUDE_CONFIG_H                                                    // defined by library:utest
+#define WSF_MS_PER_TICK 1                                                         // defined by library:cordio
+#define _RTE_                                                                     // defined by library:rtos
+
+#endif

variants/rak11720/pins_arduino.h

@@ -0,0 +1,7 @@
+#ifndef _PINS_ARDUINO_H_
+#define _PINS_ARDUINO_H_
+
+// API Competibility
+#include "variant.h"
+
+#endif /*_PINS_ARDUINO_H_*/

variants/rak11720/platformio.ini

@@ -0,0 +1,5 @@
+[env:rak11720]
+extends = apollo3_base
+board = wiscore_rak11720
+board_level = extra
+build_flags = ${apollo3_base.build_flags} -Ivariants/rak11720 -DDEVICE_LOCALFILESYSTEM

variants/rak11720/variant.cpp

@@ -0,0 +1,17 @@
+#include "variant.h"
+
+const pin_size_t variantPinCount = 22;
+
+PinState variantPinStates[variantPinCount] = {
+    {D0, 0, NULL, /*NULL, NULL, NULL,*/ NULL},   {D1, 1, NULL, /*NULL, NULL, NULL,*/ NULL},
+    {D2, 2, NULL, /*NULL, NULL, NULL,*/ NULL},   {D3, 3, NULL, /*NULL, NULL, NULL,*/ NULL},
+    {D4, 4, NULL, /*NULL, NULL, NULL,*/ NULL},   {D5, 5, NULL, /*NULL, NULL, NULL,*/ NULL},
+    {D6, 6, NULL, /*NULL, NULL, NULL,*/ NULL},   {D7, 7, NULL, /*NULL, NULL, NULL,*/ NULL},
+    {D8, 8, NULL, /*NULL, NULL, NULL,*/ NULL},   {D9, 9, NULL, /*NULL, NULL, NULL,*/ NULL},
+    {D10, 10, NULL, /*NULL, NULL, NULL,*/ NULL}, {D11, 11, NULL, /*NULL, NULL, NULL,*/ NULL},
+    {D12, 12, NULL, /*NULL, NULL, NULL,*/ NULL}, {D13, 13, NULL, /*NULL, NULL, NULL,*/ NULL},
+    {D14, 14, NULL, /*NULL, NULL, NULL,*/ NULL}, {D15, 15, NULL, /*NULL, NULL, NULL,*/ NULL},
+    {D16, 16, NULL, /*NULL, NULL, NULL,*/ NULL}, {D17, 17, NULL, /*NULL, NULL, NULL,*/ NULL},
+    {D18, 18, NULL, /*NULL, NULL, NULL,*/ NULL}, {D19, 19, NULL, /*NULL, NULL, NULL,*/ NULL},
+    {D20, 20, NULL, /*NULL, NULL, NULL,*/ NULL}, {D21, 21, NULL, /*NULL, NULL, NULL,*/ NULL},
+};

variants/rak11720/variant.h

@@ -0,0 +1,190 @@
+#ifndef _VARIANT_RAK11720_
+#define _VARIANT_RAK11720_
+
+/*----------------------------------------------------------------------------
+ *        Definitions
+ *----------------------------------------------------------------------------*/
+
+// TODO
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+extern const uint32_t g_ADigitalPinMap[];
+#define pgm_read_byte(addr) (*(const unsigned char *)(addr))
+
+#define portOutputRegister(port) (&AM_REGVAL(port + offsetof(GPIO_Type, WTA)))
+#define portInputRegister(port) ((volatile uint32_t *)&AM_REGVAL(port + offsetof(GPIO_Type, RDA)))
+#define portModeRegister(port) ()
+#define digitalPinHasPWM(P) (g_ADigitalPinMap[P] > 1) // FIXME
+#define digitalPinToBitMask(P) ((uint32_t)0x1 << (P % 32))
+#define digitalPinToPinName(P) g_ADigitalPinMap[P]
+
+#define digitalPinToPort(P) (GPIO_BASE + ((P & 0x20) >> 3))
+
+// Interrupts
+#define digitalPinToInterrupt(P) (P) // FIXME
+
+/*----------------------------------------------------------------------------
+ *        Pins
+ *----------------------------------------------------------------------------*/
+
+#define PINS_COUNT (50u)
+#define NUM_DIGITAL_PINS (0u)
+#define NUM_ANALOG_INPUTS (0u)
+#define NUM_ANALOG_OUTPUTS (0u)
+
+#define P44 44 // LED1
+#define P45 45 // LED2
+
+#define P39 39 // UART0_TX
+#define P40 40 // UART0_RX
+#define P42 42 // UART1_TX
+#define P43 43 // UART1_RX
+
+#define P25 25 // I2C2_SDA
+#define P27 27 // I2C2_SCL
+
+#define P1 1 // SPI0_NSS
+#define P5 5 // SPI0_SCK
+#define P6 6 // SPI0_MISO
+#define P7 7 // SPI0_MOSI
+
+#define P20 20 // SWDIO
+#define P21 21 // SWCLK
+#define P41 41 // BOOT0 - SWO
+
+// GP4 - GP36 - GP37 - GP38 - GP44(LED1) -GP45(LED2)
+// ADC9(12), ADC8(13), ADC3(31), ADC4(32), ADC5(33)
+#define P38 38 // IO1
+#define P4 4   // IO2
+#define P37 37 // IO3
+#define P31 31 // IO4 - ADC3(31)
+#define P12 12 // IO5 - ADC9(12)
+#define P36 36 // IO6
+#define P32 32 // IO7 - ADC4(32)
+
+#define P13 13 // AN0 - ADC8(13)
+#define P33 33 // AN1 - ADC5(33)
+
+#define P18 18 // ANT_SW(LORA internal)
+#define P17 17 // NRESET(LORA internal)
+#define P16 16 // BUSY(LORA internal)
+#define P15 15 // DIO1(LORA internal)
+#define P14 14 // DIO2(LORA internal)
+#define P11 11 // SPI_NSS(LORA internal)
+#define P8 8   // SPI_CLK(LORA internal)
+#define P10 10 // SPI_MOSI(LORA internal)
+#define P9 9   // SPI_MISO(LORA internal)
+
+/*
+ * WisBlock Base GPIO definitions
+ */
+
+#define WB_IO1 P38 // SLOT_A SLOT_B
+#define WB_IO2 P4  // SLOT_A SLOT_B
+#define WB_IO3 P37 // SLOT_C
+#define WB_IO4 P31 // SLOT_C
+#define WB_IO5 P12 // SLOT_D
+#define WB_IO6 P36 // SLOT_D
+#define WB_IO7 P32
+#define WB_SW1 0xFF      // IO_SLOT
+#define WB_A0 P13        // IO_SLOT
+#define WB_A1 P33        // IO_SLOT
+#define WB_I2C1_SDA P25  // SENSOR_SLOT IO_SLOT
+#define WB_I2C1_SCL P27  // SENSOR_SLOT IO_SLOT
+#define WB_I2C2_SDA 0xFF // IO_SLOT
+#define WB_I2C2_SCL 0xFF // IO_SLOT
+#define WB_SPI_CS P1     // IO_SLOT
+#define WB_SPI_CLK P5    // IO_SLOT
+#define WB_SPI_MISO P6   // IO_SLOT
+#define WB_SPI_MOSI P7   // IO_SLOT
+#define WB_RXD0 P40      // IO_SLOT
+#define WB_TXD0 P39      // IO_SLOT
+#define WB_RXD1 P43      // SLOT_A IO_SLOT
+#define WB_TXD1 P42      // SLOT_A IO_SLOT
+#define WB_LED1 P44      // IO_SLOT
+#define WB_LED2 P45      // IO_SLOT
+
+// LEDs
+#define PIN_LED1 WB_LED1 // PA0
+#define PIN_LED2 WB_LED2 // PA1
+
+#define LED_BUILTIN PIN_LED1
+#define LED_CONN PIN_LED2
+
+#define LED_GREEN PIN_LED1
+#define LED_BLUE PIN_LED2
+
+#define LED_STATE_ON 1 // State when LED is litted
+
+/*
+ * Analog pins
+ */
+#define PIN_A0 P13
+#define PIN_A1 P33
+
+#define PIN_A3 P5  // channel1
+#define PIN_A4 P31 // channel2
+#define PIN_A5 P32 // channel4
+#define PIN_A6 P36
+#define PIN_A7 P7 // channel6
+
+#define ADC_RESOLUTION 14
+// Other pins
+#define PIN_AREF (0)
+
+static const uint8_t AREF = PIN_AREF;
+
+/*
+ * Serial interfaces
+ */
+#define PIN_SERIAL0_RX WB_RXD0 // PB7
+#define PIN_SERIAL0_TX WB_TXD0 // PB6
+
+#define PIN_SERIAL1_RX WB_RXD1 // PA3
+#define PIN_SERIAL1_TX WB_TXD1 // PA2
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 1
+#define VARIANT_SPI_INTFCS SPI_INTERFACES_COUNT
+
+#define PIN_SPI_CS WB_SPI_CS
+#define PIN_SPI_MISO WB_SPI_MISO
+#define PIN_SPI_MOSI WB_SPI_MOSI
+#define PIN_SPI_SCK WB_SPI_CLK
+
+#define VARIANT_SPI_SDI PIN_SPI_MISO
+#define VARIANT_SPI_SDO PIN_SPI_MOSI
+#define VARIANT_SPI_CLK PIN_SPI_SCK
+
+static const uint8_t SS = PIN_SPI_CS;
+static const uint8_t MOSI = PIN_SPI_MOSI;
+static const uint8_t MISO = PIN_SPI_MISO;
+static const uint8_t SCK = PIN_SPI_SCK;
+
+/*
+ * Wire Interfaces
+ */
+#define WIRE_INTERFACES_COUNT 1
+#define VARIANT_WIRE_INTFCS WIRE_INTERFACES_COUNT
+
+#define PIN_WIRE_SDA WB_I2C1_SDA
+#define PIN_WIRE_SCL WB_I2C1_SCL
+
+#define VARIANT_Wire_SDA PIN_WIRE_SDA
+#define VARIANT_Wire_SCL PIN_WIRE_SCL
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _VARIANT_RAK11720_ */

variants/rak_wismeshtap/platformio.ini

@@ -2,14 +2,13 @@
 [env:rak_wismeshtap]
 extends = nrf52840_base
 board = wiscore_rak4631
-build_flags = ${nrf52840_base.build_flags} -Ivariants/rak_wismeshtap -D RAK_4631
+build_flags = ${nrf52840_base.build_flags} -Ivariants/rak_wismeshtap -DWISMESH_TAP -DRAK_4631
   -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
   -DEINK_HEIGHT=122
   -DMESHTASTIC_EXCLUDE_WIFI=1
-  -DMESHTASTIC_EXCLUDE_WAYPOINT=1
   -DMESHTASTIC_EXCLUDE_DETECTIONSENSOR=1
   -DMESHTASTIC_EXCLUDE_STOREFORWARD=1
   -DMESHTASTIC_EXCLUDE_POWER_TELEMETRY=1

variants/rak_wismeshtap/variant.h

@@ -271,13 +271,8 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 
 #define HAS_RTC 1
 
-#define HAS_ETHERNET 1
-
 #define RAK_4631 1
 
-#define PIN_ETHERNET_RESET 21
-#define PIN_ETHERNET_SS PIN_EINK_CS
-#define ETH_SPI_PORT SPI1
 #define AQ_SET_PIN 10
 
 #ifdef __cplusplus
@@ -311,7 +306,7 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 #define SCREEN_TOUCH_INT WB_IO6
 
 #define CANNED_MESSAGE_MODULE_ENABLE 1
-
+#define USE_VIRTUAL_KEYBOARD 1
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/

variants/seeed-sensecap-indicator/variant.h

@@ -36,12 +36,13 @@
 #define TOUCH_I2C_PORT 0
 #define TOUCH_SLAVE_ADDRESS 0x48
 
-// Buzzer
-#define PIN_BUZZER 19
+// in future, we may want to add a buzzer and add all sensors to the indicator via a data protocol for now only GPS is supported
+// // Buzzer
+// #define PIN_BUZZER 19
 
-#define HAS_GPS 0
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
+#define GPS_RX_PIN 20
+#define GPS_TX_PIN 19
+#define HAS_GPS 1
 
 #define USE_SX1262
 #define USE_SX1268
@@ -62,3 +63,6 @@
 #define SX126X_BUSY LORA_DIO2
 #define SX126X_RESET LORA_RESET
 #define SX126X_DIO2_AS_RF_SWITCH
+
+#define USE_VIRTUAL_KEYBOARD 1
+#define DISPLAY_CLOCK_FRAME 1

variants/t-deck/platformio.ini

@@ -15,5 +15,5 @@ build_flags = ${esp32_base.build_flags}
 
 lib_deps = ${esp32s3_base.lib_deps}
 	lovyan03/LovyanGFX@^1.1.9
-  earlephilhower/ESP8266Audio@^1.9.7
+  earlephilhower/ESP8266Audio@^1.9.9
   earlephilhower/ESP8266SAM@^1.0.1

variants/t-deck/variant.h

@@ -73,6 +73,7 @@
 #define DAC_I2S_BCK 7
 #define DAC_I2S_WS 5
 #define DAC_I2S_DOUT 6
+#define DAC_I2S_MCLK 21 // GPIO lrck mic
 
 // LoRa
 #define USE_SX1262

variants/t-watch-s3/platformio.ini

@@ -9,10 +9,12 @@ build_flags = ${esp32_base.build_flags}
   -DT_WATCH_S3
   -Ivariants/t-watch-s3
   -DPCF8563_RTC=0x51
+  -DHAS_BMA423=1
 
 lib_deps = ${esp32s3_base.lib_deps}
 	lovyan03/LovyanGFX@^1.1.9
   lewisxhe/PCF8563_Library@1.0.1
   adafruit/Adafruit DRV2605 Library@^1.2.2
-  earlephilhower/ESP8266Audio@^1.9.7
-  earlephilhower/ESP8266SAM@^1.0.1
+  earlephilhower/ESP8266Audio@^1.9.9
+  earlephilhower/ESP8266SAM@^1.0.1
+  lewisxhe/SensorLib@0.2.0

variants/t-watch-s3/variant.h

@@ -34,6 +34,7 @@
 #define DAC_I2S_BCK 48
 #define DAC_I2S_WS 15
 #define DAC_I2S_DOUT 46
+#define DAC_I2S_MCLK 0
 
 #define HAS_AXP2101
 
@@ -71,3 +72,6 @@
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
 // Internally the TTGO module hooks the SX1262-DIO2 in to control the TX/RX switch (which is the default for
 // the sx1262interface code)
+
+#define USE_VIRTUAL_KEYBOARD 1
+#define DISPLAY_CLOCK_FRAME 1

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 5
-build = 13
+build = 14