2.5dB could be a more appropriate attenuation for heltec ADCs (#2511)

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>

.github/workflows/main_matrix.yml

@@ -23,9 +23,9 @@ jobs:
       matrix:
         include:
           - board: rak11200
-          - board: tlora-v2-1-1.6
+          - board: tlora-v2-1-1_6
           - board: tbeam
-          - board: heltec-v2.1
+          - board: heltec-v2_1
           - board: meshtastic-diy-v1
           - board: rak4631
           - board: t-echo
@@ -33,6 +33,7 @@ jobs:
           - board: m5stack-coreink
           - board: tbeam-s3-core
           - board: tlora-t3s3-v1
+          #- board: rak11310
 
     runs-on: ubuntu-latest
     steps:
@@ -57,13 +58,13 @@ jobs:
           - board: tlora-v2
           - board: tlora-v1
           - board: tlora_v1_3
-          - board: tlora-v2-1-1.6
-          - board: tlora-v2-1-1.8
+          - board: tlora-v2-1-1_6
+          - board: tlora-v2-1-1_8
           - board: tbeam
           - board: heltec-v1
-          - board: heltec-v2.0
-          - board: heltec-v2.1
-          - board: tbeam0.7
+          - board: heltec-v2_0
+          - board: heltec-v2_1
+          - board: tbeam0_7
           - board: meshtastic-diy-v1
           - board: meshtastic-dr-dev
           - board: nano-g1
@@ -103,16 +104,17 @@ jobs:
     with:
       board: ${{ matrix.board }}
 
-  # build-rpi2040:
-  #   strategy:
-  #     fail-fast: false
-  #     max-parallel: 2
-  #     matrix:
-  #       include:
-  #         - board: pico
-  #   uses: ./.github/workflows/build_rpi2040.yml
-  #   with:
-  #     board: ${{ matrix.board }}
+  build-rpi2040:
+    strategy:
+      fail-fast: false
+      max-parallel: 2
+      matrix:
+        include:
+          - board: pico
+          - board: rak11310
+    uses: ./.github/workflows/build_rpi2040.yml
+    with:
+      board: ${{ matrix.board }}
 
   build-native:
     runs-on: ubuntu-latest
@@ -186,7 +188,8 @@ jobs:
 
   gather-artifacts:
     runs-on: ubuntu-latest
-    needs: [build-esp32, build-esp32-s3, build-nrf52, build-native] #, build-rpi2040]
+    needs:
+      [build-esp32, build-esp32-s3, build-nrf52, build-native, build-rpi2040]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

.gitignore

@@ -30,3 +30,4 @@ __pycache__
 venv/
 release/
 .vscode/extensions.json
+/compile_commands.json

.trunk/.gitignore

@@ -5,3 +5,4 @@
 plugins
 user_trunk.yaml
 user.yaml
+shims

.trunk/trunk.yaml

@@ -1,36 +1,37 @@
 version: 0.1
 cli:
-  version: 1.7.0
+  version: 1.9.1
 plugins:
   sources:
     - id: trunk
-      ref: v0.0.14
+      ref: v0.0.17
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - ruff@0.0.260
-    - yamllint@1.30.0
+    - taplo@0.7.0
+    - ruff@0.0.265
+    - yamllint@1.31.0
     - isort@5.12.0
-    - markdownlint@0.33.0
+    - markdownlint@0.34.0
     - oxipng@8.0.0
     - svgo@3.0.2
-    - actionlint@1.6.23
+    - actionlint@1.6.24
     - flake8@6.0.0
     - hadolint@2.12.0
     - shfmt@3.5.0
     - shellcheck@0.9.0
     - black@23.3.0
     - git-diff-check
-    - gitleaks@8.16.2
+    - gitleaks@8.16.3
     - clang-format@14.0.0
-    - prettier@2.8.7
+    - prettier@2.8.8
   disabled:
     - taplo@0.7.0
     - shellcheck@0.9.0
     - shfmt@3.5.0
     - oxipng@8.0.0
     - actionlint@1.6.22
-    - markdownlint@0.33.0
+    - markdownlint@0.34.0
     - hadolint@2.12.0
     - svgo@3.0.2
 runtimes:

arch/esp32/esp32.ini

@@ -1,12 +1,15 @@
 ; Common settings for ESP targes, mixin with extends = esp32_base
 [esp32_base]
 extends = arduino_base
-platform = platformio/espressif32@^6.1.0
+platform = platformio/espressif32@^6.2.0
+
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040> -<mesh/eth/>
+
 upload_speed = 921600
 debug_init_break = tbreak setup
 monitor_filters = esp32_exception_decoder
+
 board_build.filesystem = littlefs
 
 # Remove -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL for low level BLE logging.
@@ -34,6 +37,7 @@ lib_deps =
   ${environmental_base.lib_deps}
   https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
   h2zero/NimBLE-Arduino@^1.4.0
+  jgromes/RadioLib@^6.0.0
   https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6
   https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
 

arch/esp32/esp32c3.ini

@@ -1,44 +1,5 @@
 [esp32c3_base]
-extends = arduino_base
-platform = platformio/espressif32@^6.1.0
-build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040> -<mesh/eth/>
-upload_speed = 961200
+extends = esp32_base
+
 monitor_speed = 115200
-debug_init_break = tbreak setup
 monitor_filters = esp32_c3_exception_decoder
-board_build.filesystem = littlefs
-
-# Remove -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL for low level BLE logging.
-# See library directory for BLE logging possible values: .pio/libdeps/tbeam/NimBLE-Arduino/src/log_common/log_common.h
-# This overrides the BLE logging default of LOG_LEVEL_INFO (1) from: .pio/libdeps/tbeam/NimBLE-Arduino/src/esp_nimble_cfg.h
-build_flags =
-  ${arduino_base.build_flags} 
-  -Wall 
-  -Wextra 
-  -Isrc/platform/esp32 
-  -std=c++11 
-  -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG 
-  -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG 
-  -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL
-  -DCONFIG_BT_NIMBLE_ENABLED 
-  -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
-  -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
-  -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
-  ;-DDEBUG_HEAP
-  
-lib_deps =
-  ${arduino_base.lib_deps}
-  ${networking_base.lib_deps}
-  ${environmental_base.lib_deps}
-  https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
-  h2zero/NimBLE-Arduino@^1.4.0
-  https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6
-  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
-lib_ignore = 
-  segger_rtt
-  ESP32 BLE Arduino
-
-; customize the partition table
-; http://docs.platformio.org/en/latest/platforms/espressif32.html#partition-tables
-board_build.partitions = partition-table.csv

arch/esp32/esp32s2.ini

@@ -1,47 +1,16 @@
 [esp32s2_base]
-extends = arduino_base
-platform = platformio/espressif32@^6.1.0
+extends = esp32_base
+
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040> -<mesh/eth/> -<nimble/>
-upload_speed = 961200
+  ${esp32_base.build_src_filter} -<nimble/>
+
 monitor_speed = 115200
-debug_init_break = tbreak setup
-monitor_filters = esp32_exception_decoder
-board_build.filesystem = littlefs
 
-# Remove -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL for low level BLE logging.
-# See library directory for BLE logging possible values: .pio/libdeps/tbeam/NimBLE-Arduino/src/log_common/log_common.h
-# This overrides the BLE logging default of LOG_LEVEL_INFO (1) from: .pio/libdeps/tbeam/NimBLE-Arduino/src/esp_nimble_cfg.h
 build_flags =
-  ${arduino_base.build_flags} 
-  -Wall 
-  -Wextra 
-  -Isrc/platform/esp32 
-  -std=c++11 
-  -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG 
-  -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG 
-  -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL
-  -DAXP_DEBUG_PORT=Serial 
-  -DCONFIG_BT_NIMBLE_ENABLED 
-  -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
-  -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
-  -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
+  ${esp32_base.build_flags} 
   -DHAS_BLUETOOTH=0
-  ;-DDEBUG_HEAP
   
-lib_deps =
-  ${arduino_base.lib_deps}
-  ${networking_base.lib_deps}
-  ${environmental_base.lib_deps}
-  https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
-  https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6
-  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
-
 lib_ignore = 
-  segger_rtt
-  ESP32 BLE Arduino
-
-; customize the partition table
-; http://docs.platformio.org/en/latest/platforms/espressif32.html#partition-tables
-board_build.partitions = partition-table.csv
+  ${esp32_base.lib_ignore} 
+  NimBLE-Arduino
 

arch/esp32/esp32s3.ini

@@ -1,47 +1,5 @@
 [esp32s3_base]
-extends = arduino_base
-platform = platformio/espressif32@^6.1.0
-build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040> -<mesh/eth/>
-upload_speed = 961200
+extends = esp32_base
+
 monitor_speed = 115200
-debug_init_break = tbreak setup
-monitor_filters = esp32_exception_decoder
-board_build.filesystem = littlefs
-
-# Remove -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL for low level BLE logging.
-# See library directory for BLE logging possible values: .pio/libdeps/tbeam/NimBLE-Arduino/src/log_common/log_common.h
-# This overrides the BLE logging default of LOG_LEVEL_INFO (1) from: .pio/libdeps/tbeam/NimBLE-Arduino/src/esp_nimble_cfg.h
-build_flags =
-  ${arduino_base.build_flags} 
-  -Wall 
-  -Wextra 
-  -Isrc/platform/esp32 
-  -std=c++11 
-  -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG 
-  -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG 
-  -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL
-  -DAXP_DEBUG_PORT=Serial 
-  -DCONFIG_BT_NIMBLE_ENABLED 
-  -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
-  -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
-  -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
-  ;-DDEBUG_HEAP
-  
-lib_deps =
-  ${arduino_base.lib_deps}
-  ${networking_base.lib_deps}
-  ${environmental_base.lib_deps}
-  https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
-  h2zero/NimBLE-Arduino@^1.4.0
-  https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6
-  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
-
-lib_ignore = 
-  segger_rtt
-  ESP32 BLE Arduino
-
-; customize the partition table
-; http://docs.platformio.org/en/latest/platforms/espressif32.html#partition-tables
-board_build.partitions = partition-table.csv
 

arch/nrf52/nrf52.ini

@@ -1,18 +1,20 @@
 [nrf52_base]
 ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
-platform = platformio/nordicnrf52@^9.5.0
-
+platform = platformio/nordicnrf52@^9.6.0
 extends = arduino_base
+
 build_type = debug ; I'm debugging with ICE a lot now
 build_flags = 
   ${arduino_base.build_flags} -Wno-unused-variable 
   -Isrc/platform/nrf52
+
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/rp2040> -<mesh/eth/>
+
+lib_deps=
+  ${arduino_base.lib_deps}
+  jgromes/RadioLib@^6.0.0
+
 lib_ignore =
   BluetoothOTA
-  
-; Note: By default no lora device is created for this build - it uses a simulated interface
-[env:feather_nrf52832]
-extends = nrf52_base
-board = adafruit_feather_nrf52832  
+

arch/nrf52/nrf52832.ini

@@ -0,0 +1,7 @@
+[nrf52832_base]
+extends = nrf52_base
+
+build_flags = ${nrf52_base.build_flags} 
+
+lib_deps =
+  ${nrf52_base.lib_deps}

arch/nrf52/nrf52840.ini

@@ -1,14 +1,9 @@
 [nrf52840_base]
 extends = nrf52_base
+
 build_flags = ${nrf52_base.build_flags} 
+
 lib_deps =
-  ${arduino_base.lib_deps}
+  ${nrf52_base.lib_deps}
   ${environmental_base.lib_deps}
   https://github.com/Kongduino/Adafruit_nRFCrypto.git#e31a8825ea3300b163a0a3c1ddd5de34e10e1371
-
-; Note: By default no lora device is created for this build - it uses a simulated interface
-[env:nrf52840dk]
-extends = nrf52840_base
-board = nrf52840_dk
-
-

arch/portduino/portduino.ini

@@ -2,6 +2,7 @@
 [portduino_base]
 platform = https://github.com/meshtastic/platform-native.git#096b3c3e9c5c8e19d4c3b6cd803fffef2a9be4c5
 framework = arduino
+
 build_src_filter = 
   ${env.build_src_filter} 
   -<platform/esp32/> 
@@ -16,8 +17,14 @@ build_src_filter =
   -<modules/Telemetry/AirQualityTelemetry.cpp>
   -<modules/Telemetry/Sensor>
   +<../variants/portduino>
+
 lib_deps =
   ${env.lib_deps}
   ${networking_base.lib_deps}
   rweather/Crypto@^0.4.0
-build_flags = ${arduino_base.build_flags} -fPIC -Isrc/platform/portduino
+  jgromes/RadioLib@^6.0.0
+
+build_flags =
+  ${arduino_base.build_flags}
+  -fPIC
+  -Isrc/platform/portduino

arch/rp2040/rp2040.ini

@@ -1,7 +1,9 @@
 ; Common settings for rp2040 Processor based targets
 [rp2040_base]
-platform = https://github.com/maxgerhardt/platform-raspberrypi.git#9f8c10e50b5acd18e7bfd32638199c655be73a5b
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#0c33219f53faa035e188925ea1324f472e8b93d2
 extends = arduino_base
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#3.2.1
+
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
 build_flags = 
@@ -11,9 +13,12 @@ build_flags =
 #  -D _POSIX_THREADS
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/nrf52/> -<platform/stm32wl> -<mesh/eth/>
+
 lib_ignore =
   BluetoothOTA
+
 lib_deps =
   ${arduino_base.lib_deps}
   ${environmental_base.lib_deps}
-  https://github.com/kokke/tiny-AES-c.git#f06ac37fc31dfdaca2e0d9bec83f90d5663c319b
+  jgromes/RadioLib@^6.0.0
+  https://github.com/kokke/tiny-AES-c.git#f06ac37fc31dfdaca2e0d9bec83f90d5663c319b

arch/stm32/stm32wl5e.ini

@@ -2,17 +2,19 @@
 platform = platformio/ststm32@^15.4.1
 board = generic_wl5e
 framework = arduino
+
 build_type = debug
-build_flags = 
+build_flags =
   ${arduino_base.build_flags}
   -Isrc/platform/stm32wl -g
-  -DHAL_SUBGHZ_MODULE_ENABLED
-#  Arduino/PlatformIO framework-arduinoststm32 package does not presently have SUBGHZSPI support
-#  -DPIN_SPI_MOSI=PINSUBGHZSPIMOSI -DPIN_SPI_MISO=PINSUBGHZSPIMISO -DPIN_SPI_SCK=PINSUBGHZSPISCK
-build_src_filter = 
+
+build_src_filter =
   ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<mqtt/> -<graphics> -<input> -<buzz> -<modules/Telemetry> -<platform/nrf52> -<platform/portduino> -<platform/rp2040>
+
 lib_deps =
   ${env.lib_deps}
+  jgromes/RadioLib@^6.0.0
   https://github.com/kokke/tiny-AES-c.git#f06ac37fc31dfdaca2e0d9bec83f90d5663c319b
-lib_ignore = 
-  mathertel/OneButton@^2.0.3
+
+lib_ignore =
+  https://github.com/mathertel/OneButton#2.1.0

boards/wiscore_rak11300.json

@@ -0,0 +1,40 @@
+{
+  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2E8A",
+        "usb_pid": "0x000A"
+      }
+    },
+    "core": "earlephilhower",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-DARDUINO_GENERIC_RP2040 -DRASPBERRY_PI_PICO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
+    "f_cpu": "133000000L",
+    "hwids": [
+      ["0x2E8A", "0x00C0"],
+      ["0x2E8A", "0x000A"]
+    ],
+    "mcu": "rp2040",
+    "variant": "WisBlock_RAK11300_Board"
+  },
+  "debug": {
+    "jlink_device": "RP2040_M0_0",
+    "openocd_target": "rp2040.cfg",
+    "svd_path": "rp2040.svd"
+  },
+  "frameworks": ["arduino"],
+  "name": "WisBlock RAK11300",
+  "upload": {
+    "maximum_ram_size": 270336,
+    "maximum_size": 2097152,
+    "require_upload_port": true,
+    "native_usb": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": false,
+    "protocol": "picotool",
+    "protocols": ["cmsis-dap", "raspberrypi-swd", "picotool", "picoprobe"]
+  },
+  "url": "https://docs.rakwireless.com/",
+  "vendor": "RAKwireless"
+}

platformio.ini

@@ -7,12 +7,12 @@ default_envs = tbeam
 ;default_envs = tbeam-s3-core
 ;default_envs = tbeam0.7
 ;default_envs = heltec-v1
-;default_envs = heltec-v2.0
-;default_envs = heltec-v2.1
+;default_envs = heltec-v2_0
+;default_envs = heltec-v2_1
 ;default_envs = tlora-v1
 ;default_envs = tlora_v1_3
 ;default_envs = tlora-v2
-;default_envs = tlora-v2-1-1.6
+;default_envs = tlora-v2-1-1_6
 ;default_envs = tlora-t3s3-v1
 ;default_envs = lora-relay-v1 # nrf board
 ;default_envs = t-echo
@@ -21,7 +21,7 @@ default_envs = tbeam
 ;default_envs = nano-g1
 ;default_envs = pca10059_diy_eink
 ;default_envs = meshtastic-diy-v1
-;default_envs = meshtastic-diy-v1.1
+;default_envs = meshtastic-diy-v1_1
 ;default_envs = meshtastic-dr-dev
 ;default_envs = m5stack-coreink
 ;default_envs = rak4631
@@ -31,7 +31,7 @@ extra_configs =
   variants/*/platformio.ini
 
 [env]
-extra_scripts = bin/platformio-custom.py 
+extra_scripts = bin/platformio-custom.py
 
 ; note: we add src to our include search path so that lmic_project_config can override
 ; note: TINYGPS_OPTION_NO_CUSTOM_FIELDS is VERY important.  We don't use custom fields and somewhere in that pile
@@ -39,8 +39,8 @@ extra_scripts = bin/platformio-custom.py
 ; FIXME: fix lib/BluetoothOTA dependency back on src/ so we can remove -Isrc
 ; The Radiolib stuff will speed up building considerably. Exclud all the stuff we dont need.
 build_flags = -Wno-missing-field-initializers
-  -Wno-format 
-  -Isrc -Isrc/mesh -Isrc/mesh/generated -Isrc/gps -Isrc/buzz -Wl,-Map,.pio/build/output.map 
+  -Wno-format
+  -Isrc -Isrc/mesh -Isrc/mesh/generated -Isrc/gps -Isrc/buzz -Wl,-Map,.pio/build/output.map
   -DUSE_THREAD_NAMES
   -DTINYGPS_OPTION_NO_CUSTOM_FIELDS
   -DPB_ENABLE_MALLOC=1
@@ -59,16 +59,13 @@ build_flags = -Wno-missing-field-initializers
 monitor_speed = 115200
 
 lib_deps =
-  https://github.com/meshtastic/esp8266-oled-ssd1306.git#b38094e03dfa964fbc0e799bc374e91a605c1223 ; ESP8266_SSD1306 
-  mathertel/OneButton@^2.0.3 ; OneButton library for non-blocking button debounce
+  https://github.com/meshtastic/esp8266-oled-ssd1306.git#b38094e03dfa964fbc0e799bc374e91a605c1223 ; ESP8266_SSD1306
+  https://github.com/mathertel/OneButton#2.1.0 ; OneButton library for non-blocking button debounce
   https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
   https://github.com/meshtastic/TinyGPSPlus.git#127ad674ef85f0201cb68a065879653ed94792c4
   https://github.com/meshtastic/ArduinoThread.git#72921ac222eed6f526ba1682023cee290d9aa1b3
   nanopb/Nanopb@^0.4.7
   erriez/ErriezCRC32@^1.0.1
-  ; temp: do this till > 5.7.0 release to keep (some) SX1262 and SX1280 working - resolves -705 error during init
-  https://github.com/jgromes/RadioLib.git#45c5859338590b7eede23cb2f95284c3fb0cf08e
-  ; jgromes/RadioLib@^5.7.0
 
 ; Used for the code analysis in PIO Home / Inspect
 check_tool = cppcheck
@@ -90,14 +87,14 @@ lib_deps =
 build_flags = ${env.build_flags} -Os -DRADIOLIB_SPI_PARANOID=0
 build_src_filter = ${env.build_src_filter} -<platform/portduino/>
 
-; Common libs for communicating over TCP/IP networks such as MQTT 
+; Common libs for communicating over TCP/IP networks such as MQTT
 [networking_base]
 lib_deps =
   knolleary/PubSubClient@^2.8
   arduino-libraries/NTPClient@^3.1.0
   arcao/Syslog@^2.0.0
 
-; Common libs for environmental measurements in telemetry module 
+; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)
 [environmental_base]
 lib_deps =
@@ -105,7 +102,8 @@ lib_deps =
   adafruit/Adafruit Unified Sensor@^1.1.9
   adafruit/Adafruit BMP280 Library@^2.6.6
   adafruit/Adafruit BME280 Library@^2.2.2
-  https://github.com/meshtastic/BSEC-Arduino-library.git#452f9a7ffa8b53e1debe2c454fe375dfad98b507
+  https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.5.2400
+  boschsensortec/BME68x Sensor Library@^1.1.40407
   adafruit/Adafruit MCP9808 Library@^2.0.0
   adafruit/Adafruit INA260 Library@^1.5.0
   adafruit/Adafruit INA219@^1.2.0
@@ -114,4 +112,4 @@ lib_deps =
   adafruit/Adafruit SHT31 Library@^2.2.0
   adafruit/Adafruit PM25 AQI Sensor@^1.0.6
   adafruit/Adafruit MPU6050@^2.2.4
-  adafruit/Adafruit LIS3DH@^1.2.4
+  adafruit/Adafruit LIS3DH@^1.2.4

src/ButtonThread.h

@@ -51,7 +51,7 @@ class ButtonThread : public concurrency::OSThread
         pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT_PULLUP_SENSE);
 #endif
         userButton.attachClick(userButtonPressed);
-        userButton.setClickTicks(300);
+        userButton.setClickMs(300);
         userButton.attachDuringLongPress(userButtonPressedLong);
         userButton.attachDoubleClick(userButtonDoublePressed);
         userButton.attachMultiClick(userButtonMultiPressed);

src/DebugConfiguration.h

@@ -28,6 +28,7 @@
 #define DEBUG_PORT (*console) // Serial debug port
 
 #ifdef USE_SEGGER
+#define DEBUG_PORT
 #define LOG_DEBUG(...) SEGGER_RTT_printf(0, __VA_ARGS__)
 #define LOG_INFO(...) SEGGER_RTT_printf(0, __VA_ARGS__)
 #define LOG_WARN(...) SEGGER_RTT_printf(0, __VA_ARGS__)

src/GPSStatus.h

@@ -138,8 +138,9 @@ class GPSStatus : public Status
                 LOG_DEBUG("New GPS pos@%x:3 lat=%f, lon=%f, alt=%d, pdop=%.2f, track=%.2f, speed=%.2f, sats=%d\n", p.timestamp,
                           p.latitude_i * 1e-7, p.longitude_i * 1e-7, p.altitude, p.PDOP * 1e-2, p.ground_track * 1e-5,
                           p.ground_speed * 1e-2, p.sats_in_view);
-            } else
+            } else {
                 LOG_DEBUG("No GPS lock\n");
+            }
             onNewStatus.notifyObservers(this);
         }
         return 0;

src/Power.cpp

@@ -17,6 +17,26 @@
 #define DELAY_FOREVER portMAX_DELAY
 #endif
 
+#if defined(BATTERY_PIN) && defined(ARCH_ESP32)
+
+#ifndef BAT_MEASURE_ADC_UNIT // ADC1 is default
+static const adc1_channel_t adc_channel = ADC_CHANNEL;
+static const adc_unit_t unit = ADC_UNIT_1;
+#else // ADC2
+static const adc2_channel_t adc_channel = ADC_CHANNEL;
+static const adc_unit_t unit = ADC_UNIT_2;
+RTC_NOINIT_ATTR uint64_t RTC_reg_b;
+
+#endif // BAT_MEASURE_ADC_UNIT
+
+esp_adc_cal_characteristics_t *adc_characs = (esp_adc_cal_characteristics_t *)calloc(1, sizeof(esp_adc_cal_characteristics_t));
+#ifndef ADC_ATTENUATION
+static const adc_atten_t atten = ADC_ATTEN_DB_11;
+#else
+static const adc_atten_t atten = ADC_ATTENUATION;
+#endif
+#endif // BATTERY_PIN && ARCH_ESP32
+
 #ifdef HAS_PMU
 #include "XPowersAXP192.tpp"
 #include "XPowersAXP2101.tpp"
@@ -128,18 +148,41 @@ class AnalogBatteryLevel : public HasBatteryLevel
             // Set the number of samples, it has an effect of increasing sensitivity, especially in complex electromagnetic
             // environment.
             uint32_t raw = 0;
+#ifdef ARCH_ESP32
+#ifndef BAT_MEASURE_ADC_UNIT // ADC1
+            for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
+                raw += adc1_get_raw(adc_channel);
+            }
+#else  // ADC2
+            int32_t adc_buf = 0;
+            for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
+                // ADC2 wifi bug workaround, see
+                // https://github.com/espressif/arduino-esp32/issues/102
+                WRITE_PERI_REG(SENS_SAR_READ_CTRL2_REG, RTC_reg_b);
+                SET_PERI_REG_MASK(SENS_SAR_READ_CTRL2_REG, SENS_SAR2_DATA_INV);
+                adc2_get_raw(adc_channel, ADC_WIDTH_BIT_12, &adc_buf);
+                raw += adc_buf;
+            }
+#endif // BAT_MEASURE_ADC_UNIT
+#else  // !ARCH_ESP32
             for (uint32_t i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
                 raw += analogRead(BATTERY_PIN);
             }
+#endif
             raw = raw / BATTERY_SENSE_SAMPLES;
-
             float scaled;
+#ifdef ARCH_ESP32
+            scaled = esp_adc_cal_raw_to_voltage(raw, adc_characs);
+            scaled *= operativeAdcMultiplier;
+#else
 #ifndef VBAT_RAW_TO_SCALED
             scaled = 1000.0 * operativeAdcMultiplier * (AREF_VOLTAGE / 1024.0) * raw;
 #else
             scaled = VBAT_RAW_TO_SCALED(raw); // defined in variant.h
-#endif
-            // LOG_DEBUG("battery gpio %d raw val=%u scaled=%u\n", BATTERY_PIN, raw, (uint32_t)(scaled));
+#endif // VBAT RAW TO SCALED
+#endif // ARCH_ESP32
+       // LOG_DEBUG("battery gpio %d raw val=%u scaled=%u\n", BATTERY_PIN, raw, (uint32_t)(scaled));
+
             last_read_value = scaled;
             return scaled;
         } else {
@@ -147,7 +190,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
         }
 #else
         return 0;
-#endif
+#endif // BATTERY_PIN
     }
 
     /**
@@ -228,25 +271,48 @@ bool Power::analogInit()
     // disable any internal pullups
     pinMode(BATTERY_PIN, INPUT);
 
-#ifdef ARCH_ESP32
-    // ESP32 needs special analog stuff
-    adcAttachPin(BATTERY_PIN);
+#ifndef BATTERY_SENSE_RESOLUTION_BITS
+#define BATTERY_SENSE_RESOLUTION_BITS 10
 #endif
+
+#ifdef ARCH_ESP32 // ESP32 needs special analog stuff
+
+#ifndef ADC_WIDTH // max resolution by default
+    static const adc_bits_width_t width = ADC_WIDTH_BIT_12;
+#else
+    static const adc_bits_width_t width = ADC_WIDTH;
+#endif
+#ifndef BAT_MEASURE_ADC_UNIT // ADC1
+    adc1_config_width(width);
+    adc1_config_channel_atten(adc_channel, atten);
+#else // ADC2
+    adc2_config_channel_atten(adc_channel, atten);
+    // ADC2 wifi bug workaround
+    RTC_reg_b = READ_PERI_REG(SENS_SAR_READ_CTRL2_REG);
+#endif
+    // calibrate ADC
+    esp_adc_cal_value_t val_type = esp_adc_cal_characterize(unit, atten, width, DEFAULT_VREF, adc_characs);
+    // show ADC characterization base
+    if (val_type == ESP_ADC_CAL_VAL_EFUSE_TP) {
+        LOG_INFO("ADCmod: ADC characterization based on Two Point values stored in eFuse\n");
+    } else if (val_type == ESP_ADC_CAL_VAL_EFUSE_VREF) {
+        LOG_INFO("ADCmod: ADC characterization based on reference voltage stored in eFuse\n");
+    } else {
+        LOG_INFO("ADCmod: ADC characterization based on default reference voltage\n");
+    }
+#endif // ARCH_ESP32
+
 #ifdef ARCH_NRF52
 #ifdef VBAT_AR_INTERNAL
     analogReference(VBAT_AR_INTERNAL);
 #else
     analogReference(AR_INTERNAL); // 3.6V
 #endif
-#endif
-
-#ifndef BATTERY_SENSE_RESOLUTION_BITS
-#define BATTERY_SENSE_RESOLUTION_BITS 10
-#endif
-
-    // adcStart(BATTERY_PIN);
     analogReadResolution(BATTERY_SENSE_RESOLUTION_BITS); // Default of 12 is not very linear. Recommended to use 10 or 11
                                                          // depending on needed resolution.
+
+#endif // ARCH_NRF52
+
     batteryLevel = &analogLevel;
     return true;
 #else
@@ -302,7 +368,7 @@ void Power::readPowerStatus()
 {
     if (batteryLevel) {
         bool hasBattery = batteryLevel->isBatteryConnect();
-        int batteryVoltageMv = 0;
+        uint32_t batteryVoltageMv = 0;
         int8_t batteryChargePercent = 0;
         if (hasBattery) {
             batteryVoltageMv = batteryLevel->getBattVoltage();
@@ -365,8 +431,8 @@ void Power::readPowerStatus()
 
 #endif
 
-        // If we have a battery at all and it is less than 10% full, force deep sleep if we have more than 10 low readings in a
-        // row
+        // If we have a battery at all and it is less than 10% full, force deep sleep if we have more than 10 low readings in
+        // a row
         if (powerStatus2.getHasBattery() && !powerStatus2.getHasUSB()) {
             if (batteryLevel->getBattVoltage() < MIN_BAT_MILLIVOLTS) {
                 low_voltage_counter++;
@@ -444,10 +510,10 @@ int32_t Power::runOnce()
  * Init the power manager chip
  *
  * axp192 power
-    DCDC1 0.7-3.5V @ 1200mA max -> OLED // If you turn this off you'll lose comms to the axp192 because the OLED and the axp192
- share the same i2c bus, instead use ssd1306 sleep mode DCDC2 -> unused DCDC3 0.7-3.5V @ 700mA max -> ESP32 (keep this on!) LDO1
- 30mA -> charges GPS backup battery // charges the tiny J13 battery by the GPS to power the GPS ram (for a couple of days), can
- not be turned off LDO2 200mA -> LORA LDO3 200mA -> GPS
+    DCDC1 0.7-3.5V @ 1200mA max -> OLED // If you turn this off you'll lose comms to the axp192 because the OLED and the
+ axp192 share the same i2c bus, instead use ssd1306 sleep mode DCDC2 -> unused DCDC3 0.7-3.5V @ 700mA max -> ESP32 (keep this
+ on!) LDO1 30mA -> charges GPS backup battery // charges the tiny J13 battery by the GPS to power the GPS ram (for a couple of
+ days), can not be turned off LDO2 200mA -> LORA LDO3 200mA -> GPS
  *
  */
 bool Power::axpChipInit()
@@ -574,7 +640,8 @@ bool Power::axpChipInit()
         // t-beam s3 core
         /**
          * gnss module power channel
-         * The default ALDO4 is off, you need to turn on the GNSS power first, otherwise it will be invalid during initialization
+         * The default ALDO4 is off, you need to turn on the GNSS power first, otherwise it will be invalid during
+         * initialization
          */
         PMU->setPowerChannelVoltage(XPOWERS_ALDO4, 3300);
         PMU->enablePowerOutput(XPOWERS_ALDO4);

src/SerialConsole.cpp

@@ -31,7 +31,7 @@ SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port), con
                       // setDestination(&noopPrint); for testing, try turning off 'all' debug output and see what leaks
 
     Port.begin(SERIAL_BAUD);
-#if defined(ARCH_NRF52) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
+#if defined(ARCH_NRF52) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(ARCH_RP2040)
     time_t timeout = millis();
     while (!Port) {
         if ((millis() - timeout) < 5000) {

src/concurrency/NotifiedWorkerThread.cpp

@@ -31,12 +31,14 @@ IRAM_ATTR bool NotifiedWorkerThread::notifyCommon(uint32_t v, bool overwrite)
         runASAP = true;
 
         notification = v;
-        if (debugNotification)
+        if (debugNotification) {
             LOG_DEBUG("setting notification %d\n", v);
+        }
         return true;
     } else {
-        if (debugNotification)
+        if (debugNotification) {
             LOG_DEBUG("dropping notification %d\n", v);
+        }
         return false;
     }
 }
@@ -64,8 +66,9 @@ bool NotifiedWorkerThread::notifyLater(uint32_t delay, uint32_t v, bool overwrit
 
     if (didIt) {                   // If we didn't already have something queued, override the delay to be larger
         setIntervalFromNow(delay); // a new version of setInterval relative to the current time
-        if (debugNotification)
+        if (debugNotification) {
             LOG_DEBUG("delaying notification %u\n", delay);
+        }
     }
 
     return didIt;

src/concurrency/OSThread.cpp

@@ -61,14 +61,17 @@ bool OSThread::shouldRun(unsigned long time)
 {
     bool r = Thread::shouldRun(time);
 
-    if (showRun && r)
+    if (showRun && r) {
         LOG_DEBUG("Thread %s: run\n", ThreadName.c_str());
+    }
 
-    if (showWaiting && enabled && !r)
+    if (showWaiting && enabled && !r) {
         LOG_DEBUG("Thread %s: wait %lu\n", ThreadName.c_str(), interval);
+    }
 
-    if (showDisabled && !enabled)
+    if (showDisabled && !enabled) {
         LOG_DEBUG("Thread %s: disabled\n", ThreadName.c_str());
+    }
 
     return r;
 }

src/configuration.h

@@ -124,6 +124,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MPU6050_ADDR 0x68
 #define LIS3DH_ADR 0x18
 
+// -----------------------------------------------------------------------------
+// LED
+// -----------------------------------------------------------------------------
+#define NCP5623_ADDR 0x38
+
 // -----------------------------------------------------------------------------
 // Security
 // -----------------------------------------------------------------------------

src/detect/ScanI2C.h

@@ -33,6 +33,7 @@ class ScanI2C
         PMSA0031,
         MPU6050,
         LIS3DH,
+        NCP5623,
     } DeviceType;
 
     // typedef uint8_t DeviceAddress;

src/detect/ScanI2CTwoWire.cpp

@@ -213,6 +213,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port)
                 break;
 
                 SCAN_SIMPLE_CASE(ST7567_ADDRESS, SCREEN_ST7567, "st7567 display found\n")
+                SCAN_SIMPLE_CASE(NCP5623_ADDR, NCP5623, "NCP5623 RGB LED found\n");
 
 #ifdef HAS_PMU
                 SCAN_SIMPLE_CASE(XPOWERS_AXP192_AXP2101_ADDRESS, PMU_AXP192_AXP2101, "axp192/axp2101 PMU found\n")

src/gps/NMEAWPL.cpp

@@ -1,5 +1,7 @@
 #include "NMEAWPL.h"
 #include "GeoCoord.h"
+#include "RTC.h"
+#include <time.h>
 
 /* -------------------------------------------
  *        1       2 3        4 5    6
@@ -56,12 +58,18 @@ uint32_t printWPL(char *buf, size_t bufsz, const meshtastic_Position &pos, const
 uint32_t printGGA(char *buf, size_t bufsz, const meshtastic_Position &pos)
 {
     GeoCoord geoCoord(pos.latitude_i, pos.longitude_i, pos.altitude);
-    uint32_t len =
-        snprintf(buf, bufsz, "$GNGGA,%06u.%03u,%02d%07.4f,%c,%03d%07.4f,%c,%u,%02u,%04u,%04d,%c,%04d,%c,%d,%04d", pos.time / 1000,
-                 pos.time % 1000, 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(), pos.fix_type,
-                 pos.sats_in_view, pos.HDOP, geoCoord.getAltitude(), 'M', pos.altitude_geoidal_separation, 'M', 0, 0);
+    tm *t = localtime((time_t *)&pos.timestamp);
+    if (getRTCQuality() > 0) { // use the device clock if we got time from somewhere. If not, use the GPS timestamp.
+        uint32_t rtc_sec = getValidTime(RTCQuality::RTCQualityDevice);
+        t = localtime((time_t *)&rtc_sec);
+    }
+
+    uint32_t len = snprintf(
+        buf, bufsz, "$GNGGA,%02d%02d%02d.%02d,%02d%07.4f,%c,%03d%07.4f,%c,%u,%02u,%04u,%04d,%c,%04d,%c,%d,%04d", t->tm_hour,
+        t->tm_min, t->tm_sec, pos.timestamp_millis_adjust, 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(), pos.fix_quality,
+        pos.sats_in_view, pos.HDOP, geoCoord.getAltitude(), 'M', pos.altitude_geoidal_separation, 'M', 0, 0);
 
     uint32_t chk = 0;
     for (uint32_t i = 1; i < len; i++) {

src/graphics/Screen.cpp

@@ -1239,8 +1239,10 @@ void Screen::setFrames()
 
     moduleFrames = MeshModule::GetMeshModulesWithUIFrames();
     LOG_DEBUG("Showing %d module frames\n", moduleFrames.size());
+#ifdef DEBUG_PORT
     int totalFrameCount = MAX_NUM_NODES + NUM_EXTRA_FRAMES + moduleFrames.size();
     LOG_DEBUG("Total frame count: %d\n", totalFrameCount);
+#endif
 
     // We don't show the node info our our node (if we have it yet - we should)
     size_t numnodes = nodeDB.getNumNodes();

src/main.cpp

@@ -100,6 +100,8 @@ uint8_t kb_model;
 ScanI2C::DeviceAddress rtc_found = ScanI2C::ADDRESS_NONE;
 // The I2C address of the Accelerometer (if found)
 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)
 ATECCX08A atecc;
@@ -159,6 +161,7 @@ static OSThread *buttonThread;
 uint32_t ButtonThread::longPressTime = 0;
 #endif
 static OSThread *accelerometerThread;
+SPISettings spiSettings(4000000, MSBFIRST, SPI_MODE0);
 
 RadioInterface *rIf = NULL;
 
@@ -234,8 +237,6 @@ void setup()
 
     fsInit();
 
-    router = new ReliableRouter();
-
 #ifdef I2C_SDA1
     Wire1.begin(I2C_SDA1, I2C_SCL1);
 #endif
@@ -346,6 +347,8 @@ void setup()
      * nodeTelemetrySensorsMap singleton. This wraps that logic in a temporary scope to declare the temporary field
      * "found".
      */
+    // Only one supported RGB LED currently
+    rgb_found = i2cScanner->find(ScanI2C::DeviceType::NCP5623);
 
 #if !defined(ARCH_PORTDUINO)
     auto acc_info = i2cScanner->firstAccelerometer();
@@ -413,6 +416,8 @@ void setup()
     // If we're taking on the repeater role, use flood router
     if (config.device.role == meshtastic_Config_DeviceConfig_Role_REPEATER)
         router = new FloodingRouter();
+    else
+        router = new ReliableRouter();
 
 #if HAS_BUTTON
     // Buttons. Moved here cause we need NodeDB to be initialized
@@ -442,7 +447,21 @@ void setup()
 
     // Init our SPI controller (must be before screen and lora)
     initSPI();
-#ifndef ARCH_ESP32
+#ifdef ARCH_RP2040
+#ifdef HW_SPI1_DEVICE
+    SPI1.setSCK(RF95_SCK);
+    SPI1.setTX(RF95_MOSI);
+    SPI1.setRX(RF95_MISO);
+    pinMode(RF95_NSS, OUTPUT);
+    digitalWrite(RF95_NSS, HIGH);
+    SPI1.begin(false);
+#else                      // HW_SPI1_DEVICE
+    SPI.setSCK(RF95_SCK);
+    SPI.setTX(RF95_MOSI);
+    SPI.setRX(RF95_MISO);
+    SPI.begin(false);
+#endif                     // HW_SPI1_DEVICE
+#elif !defined(ARCH_ESP32) // ARCH_RP2040
     SPI.begin();
 #else
     // ESP32
@@ -457,10 +476,11 @@ void setup()
 
     gps = createGps();
 
-    if (gps)
+    if (gps) {
         gpsStatus->observe(&gps->newStatus);
-    else
+    } else {
         LOG_WARN("No GPS found - running without GPS\n");
+    }
 
     nodeStatus->observe(&nodeDB.newStatus);
 
@@ -503,6 +523,12 @@ void setup()
     digitalWrite(SX126X_ANT_SW, 1);
 #endif
 
+#ifdef HW_SPI1_DEVICE
+    LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI1, spiSettings);
+#else // HW_SPI1_DEVICE
+    LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
+#endif
+
     // radio init MUST BE AFTER service.init, so we have our radio config settings (from nodedb init)
 
 #if !HAS_RADIO && defined(ARCH_PORTDUINO)
@@ -520,7 +546,7 @@ void setup()
 
 #if defined(RF95_IRQ)
     if (!rIf) {
-        rIf = new RF95Interface(RF95_NSS, RF95_IRQ, RF95_RESET, RF95_DIO1, SPI);
+        rIf = new RF95Interface(RadioLibHAL, RF95_NSS, RF95_IRQ, RF95_RESET, RF95_DIO1);
         if (!rIf->init()) {
             LOG_WARN("Failed to find RF95 radio\n");
             delete rIf;
@@ -533,7 +559,7 @@ void setup()
 
 #if defined(USE_SX1262)
     if (!rIf) {
-        rIf = new SX1262Interface(SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY, SPI);
+        rIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
         if (!rIf->init()) {
             LOG_WARN("Failed to find SX1262 radio\n");
             delete rIf;
@@ -546,7 +572,7 @@ void setup()
 
 #if defined(USE_SX1268)
     if (!rIf) {
-        rIf = new SX1268Interface(SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY, SPI);
+        rIf = new SX1268Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
         if (!rIf->init()) {
             LOG_WARN("Failed to find SX1268 radio\n");
             delete rIf;
@@ -559,7 +585,7 @@ void setup()
 
 #if defined(USE_LLCC68)
     if (!rIf) {
-        rIf = new LLCC68Interface(SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY, SPI);
+        rIf = new LLCC68Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
         if (!rIf->init()) {
             LOG_WARN("Failed to find LLCC68 radio\n");
             delete rIf;
@@ -572,7 +598,7 @@ void setup()
 
 #if defined(USE_SX1280)
     if (!rIf) {
-        rIf = new SX1280Interface(SX128X_CS, SX128X_DIO1, SX128X_RESET, SX128X_BUSY, SPI);
+        rIf = new SX1280Interface(RadioLibHAL, SX128X_CS, SX128X_DIO1, SX128X_RESET, SX128X_BUSY);
         if (!rIf->init()) {
             LOG_WARN("Failed to find SX1280 radio\n");
             delete rIf;
@@ -660,6 +686,7 @@ extern meshtastic_DeviceMetadata getDeviceMetadata()
     deviceMetadata.role = config.device.role;
     deviceMetadata.position_flags = config.position.position_flags;
     deviceMetadata.hw_model = HW_VENDOR;
+    deviceMetadata.hasRemoteHardware = moduleConfig.remote_hardware.enabled;
     return deviceMetadata;
 }
 
@@ -707,4 +734,4 @@ void loop()
         mainDelay.delay(delayMsec);
     }
     // if (didWake) LOG_DEBUG("wake!\n");
-}
+}

src/main.h

@@ -8,6 +8,7 @@
 #include "memGet.h"
 #include "mesh/generated/meshtastic/config.pb.h"
 #include "mesh/generated/meshtastic/telemetry.pb.h"
+#include <SPI.h>
 #include <map>
 #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
 #include <SparkFun_ATECCX08a_Arduino_Library.h>
@@ -26,6 +27,7 @@ extern ScanI2C::DeviceAddress cardkb_found;
 extern uint8_t kb_model;
 extern ScanI2C::DeviceAddress rtc_found;
 extern ScanI2C::DeviceAddress accelerometer_found;
+extern ScanI2C::FoundDevice rgb_found;
 
 extern bool eink_found;
 extern bool pmu_found;
@@ -65,3 +67,6 @@ extern bool runASAP;
 void nrf52Setup(), esp32Setup(), nrf52Loop(), esp32Loop(), clearBonds();
 
 meshtastic_DeviceMetadata getDeviceMetadata();
+
+// FIXME, we default to 4MHz SPI, SPI mode 0, check if the datasheet says it can really do that
+extern SPISettings spiSettings;

src/mesh/Channels.cpp

@@ -108,8 +108,9 @@ CryptoKey Channels::getKey(ChannelIndex chIndex)
             if (ch.role == meshtastic_Channel_Role_SECONDARY) {
                 LOG_DEBUG("Unset PSK for secondary channel %s. using primary key\n", ch.settings.name);
                 k = getKey(primaryIndex);
-            } else
+            } else {
                 LOG_WARN("User disabled encryption\n");
+            }
         } else if (k.length == 1) {
             // Convert the short single byte variants of psk into variant that can be used more generally
 

src/mesh/LLCC68Interface.cpp

@@ -2,8 +2,8 @@
 #include "configuration.h"
 #include "error.h"
 
-LLCC68Interface::LLCC68Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy,
-                                 SPIClass &spi)
-    : SX126xInterface(cs, irq, rst, busy, spi)
+LLCC68Interface::LLCC68Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                                 RADIOLIB_PIN_TYPE busy)
+    : SX126xInterface(hal, cs, irq, rst, busy)
 {
 }

src/mesh/LLCC68Interface.h

@@ -6,12 +6,13 @@
  * Our adapter for LLCC68 radios
  * https://www.semtech.com/products/wireless-rf/lora-core/llcc68
  * ⚠️⚠️⚠️
- * Be aware that LLCC68 does not support Spreading Factor 12 (SF12) and will not work on the default "Long Slow" channel.
+ * Be aware that LLCC68 does not support Spreading Factor 12 (SF12) and will not work on the "LongSlow" and "VLongSlow" channels.
  * You must change the channel if you get `Critical Error #3` with this module.
  * ⚠️⚠️⚠️
  */
 class LLCC68Interface : public SX126xInterface<LLCC68>
 {
   public:
-    LLCC68Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy, SPIClass &spi);
+    LLCC68Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                    RADIOLIB_PIN_TYPE busy);
 };

src/mesh/MeshModule.cpp

@@ -179,9 +179,10 @@ void MeshModule::callPlugins(const meshtastic_MeshPacket &mp, RxSource src)
         }
     }
 
-    if (!moduleFound)
+    if (!moduleFound) {
         LOG_DEBUG("No modules interested in portnum=%d, src=%s\n", mp.decoded.portnum,
                   (src == RX_SRC_LOCAL) ? "LOCAL" : "REMOTE");
+    }
 }
 
 meshtastic_MeshPacket *MeshModule::allocReply()

src/mesh/NodeDB.cpp

@@ -349,6 +349,11 @@ void NodeDB::init()
     if (channelFileCRC != crc32Buffer(&channelFile, sizeof(channelFile)))
         saveWhat |= SEGMENT_CHANNELS;
 
+    if (!devicestate.node_remote_hardware_pins) {
+        meshtastic_NodeRemoteHardwarePin empty[12] = {meshtastic_RemoteHardwarePin_init_default};
+        memcpy(devicestate.node_remote_hardware_pins, empty, sizeof(empty));
+    }
+
     saveToDisk(saveWhat);
 }
 
@@ -468,8 +473,9 @@ void NodeDB::loadFromDisk()
         }
     }
 
-    if (loadProto(oemConfigFile, meshtastic_OEMStore_size, sizeof(meshtastic_OEMStore), &meshtastic_OEMStore_msg, &oemStore))
+    if (loadProto(oemConfigFile, meshtastic_OEMStore_size, sizeof(meshtastic_OEMStore), &meshtastic_OEMStore_msg, &oemStore)) {
         LOG_INFO("Loaded OEMStore\n");
+    }
 }
 
 /** Save a protobuf from a file, return true for success */
@@ -494,10 +500,12 @@ bool NodeDB::saveProto(const char *filename, size_t protoSize, const pb_msgdesc_
         f.close();
 
         // brief window of risk here ;-)
-        if (FSCom.exists(filename) && !FSCom.remove(filename))
+        if (FSCom.exists(filename) && !FSCom.remove(filename)) {
             LOG_WARN("Can't remove old pref file\n");
-        if (!renameFile(filenameTmp.c_str(), filename))
+        }
+        if (!renameFile(filenameTmp.c_str(), filename)) {
             LOG_ERROR("Error: can't rename new pref file\n");
+        }
     } else {
         LOG_ERROR("Can't write prefs\n");
 #ifdef ARCH_NRF52
@@ -802,10 +810,11 @@ void recordCriticalError(meshtastic_CriticalErrorCode code, uint32_t address, co
     // Print error to screen and serial port
     String lcd = String("Critical error ") + code + "!\n";
     screen->print(lcd.c_str());
-    if (filename)
+    if (filename) {
         LOG_ERROR("NOTE! Recording critical error %d at %s:%lu\n", code, filename, address);
-    else
+    } else {
         LOG_ERROR("NOTE! Recording critical error %d, address=0x%lx\n", code, address);
+    }
 
     // Record error to DB
     myNodeInfo.error_code = code;

src/mesh/PhoneAPI.cpp

@@ -423,8 +423,9 @@ int PhoneAPI::onNotify(uint32_t newValue)
     if (state == STATE_SEND_PACKETS) {
         LOG_INFO("Telling client we have new packets %u\n", newValue);
         onNowHasData(newValue);
-    } else
+    } else {
         LOG_DEBUG("(Client not yet interested in packets)\n");
+    }
 
     return 0;
 }

src/mesh/RF95Interface.cpp

@@ -11,9 +11,9 @@
 
 #define POWER_DEFAULT 17 // How much power to use if the user hasn't set a power level
 
-RF95Interface::RF95Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy,
-                             SPIClass &spi)
-    : RadioLibInterface(cs, irq, rst, busy, spi)
+RF95Interface::RF95Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                             RADIOLIB_PIN_TYPE busy)
+    : RadioLibInterface(hal, cs, irq, rst, busy)
 {
     LOG_WARN("RF95Interface(cs=%d, irq=%d, rst=%d, busy=%d)\n", cs, irq, rst, busy);
 }

src/mesh/RF95Interface.h

@@ -12,7 +12,8 @@ class RF95Interface : public RadioLibInterface
     RadioLibRF95 *lora = NULL; // Either a RFM95 or RFM96 depending on what was stuffed on this board
 
   public:
-    RF95Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy, SPIClass &spi);
+    RF95Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                  RADIOLIB_PIN_TYPE busy);
 
     // TODO: Verify that this irq flag works with RFM95 / SX1276 radios the way it used to
     bool isIRQPending() override { return lora->getIRQFlags() & RADIOLIB_SX127X_MASK_IRQ_FLAG_VALID_HEADER; }
@@ -39,7 +40,7 @@ class RF95Interface : public RadioLibInterface
     /**
      * Enable a particular ISR callback glue function
      */
-    virtual void enableInterrupt(void (*callback)()) { lora->setDio0Action(callback); }
+    virtual void enableInterrupt(void (*callback)()) { lora->setDio0Action(callback, RISING); }
 
     /** can we detect a LoRa preamble on the current channel? */
     virtual bool isChannelActive() override;

src/mesh/RadioInterface.cpp

@@ -241,6 +241,7 @@ uint32_t RadioInterface::getTxDelayMsecWeighted(float snr)
 
 void printPacket(const char *prefix, const meshtastic_MeshPacket *p)
 {
+#ifdef DEBUG_PORT
     std::string out = DEBUG_PORT.mt_sprintf("%s (id=0x%08x fr=0x%02x to=0x%02x, WantAck=%d, HopLim=%d Ch=0x%x", prefix, p->id,
                                             p->from & 0xff, p->to & 0xff, p->want_ack, p->hop_limit, p->channel);
     if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
@@ -283,6 +284,7 @@ void printPacket(const char *prefix, const meshtastic_MeshPacket *p)
 
     out += ")";
     LOG_DEBUG("%s\n", out.c_str());
+#endif
 }
 
 RadioInterface::RadioInterface()

src/mesh/RadioLibInterface.cpp

@@ -9,26 +9,23 @@
 #include <pb_decode.h>
 #include <pb_encode.h>
 
-// FIXME, we default to 4MHz SPI, SPI mode 0, check if the datasheet says it can really do that
-static SPISettings spiSettings(4000000, MSBFIRST, SPI_MODE0);
-
-void LockingModule::SPIbeginTransaction()
+void LockingArduinoHal::spiBeginTransaction()
 {
     spiLock->lock();
 
-    Module::SPIbeginTransaction();
+    ArduinoHal::spiBeginTransaction();
 }
 
-void LockingModule::SPIendTransaction()
+void LockingArduinoHal::spiEndTransaction()
 {
     spiLock->unlock();
 
-    Module::SPIendTransaction();
+    ArduinoHal::spiEndTransaction();
 }
 
-RadioLibInterface::RadioLibInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy,
-                                     SPIClass &spi, PhysicalLayer *_iface)
-    : NotifiedWorkerThread("RadioIf"), module(cs, irq, rst, busy, spi, spiSettings), iface(_iface)
+RadioLibInterface::RadioLibInterface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                                     RADIOLIB_PIN_TYPE busy, PhysicalLayer *_iface)
+    : NotifiedWorkerThread("RadioIf"), module(hal, cs, irq, rst, busy), iface(_iface)
 {
     instance = this;
 #if defined(ARCH_STM32WL) && defined(USE_SX1262)
@@ -81,8 +78,9 @@ bool RadioLibInterface::canSendImmediately()
     bool busyRx = isReceiving && isActivelyReceiving();
 
     if (busyTx || busyRx) {
-        if (busyTx)
+        if (busyTx) {
             LOG_WARN("Can not send yet, busyTx\n");
+        }
         // If we've been trying to send the same packet more than one minute and we haven't gotten a
         // TX IRQ from the radio, the radio is probably broken.
         if (busyTx && (millis() - lastTxStart > 60000)) {
@@ -91,8 +89,9 @@ bool RadioLibInterface::canSendImmediately()
             // reboot in 5 seconds when this condition occurs.
             rebootAtMsec = lastTxStart + 65000;
         }
-        if (busyRx)
+        if (busyRx) {
             LOG_WARN("Can not send yet, busyRx\n");
+        }
         return false;
     } else
         return true;
@@ -167,9 +166,9 @@ meshtastic_QueueStatus RadioLibInterface::getQueueStatus()
 bool RadioLibInterface::canSleep()
 {
     bool res = txQueue.empty();
-    if (!res) // only print debug messages if we are vetoing sleep
+    if (!res) { // only print debug messages if we are vetoing sleep
         LOG_DEBUG("radio wait to sleep, txEmpty=%d\n", res);
-
+    }
     return res;
 }
 
@@ -407,4 +406,4 @@ void RadioLibInterface::startSend(meshtastic_MeshPacket *txp)
         // bits
         enableInterrupt(isrTxLevel0);
     }
-}
+}

src/mesh/RadioLibInterface.h

@@ -13,35 +13,18 @@
 #define INTERRUPT_ATTR
 #endif
 
+#define RADIOLIB_PIN_TYPE uint32_t
+
 /**
- * A wrapper for the RadioLib Module class, that adds mutex for SPI bus access
+ * We need to override the RadioLib ArduinoHal class to add mutex protection for SPI bus access
  */
-class LockingModule : public Module
+class LockingArduinoHal : public ArduinoHal
 {
   public:
-    /*!
-      \brief Extended SPI-based module constructor.
+    LockingArduinoHal(SPIClass &spi, SPISettings spiSettings) : ArduinoHal(spi, spiSettings){};
 
-      \param cs Arduino pin to be used as chip select.
-
-      \param irq Arduino pin to be used as interrupt/GPIO.
-
-      \param rst Arduino pin to be used as hardware reset for the module.
-
-      \param gpio Arduino pin to be used as additional interrupt/GPIO.
-
-      \param spi SPI interface to be used, can also use software SPI implementations.
-
-      \param spiSettings SPI interface settings.
-    */
-    LockingModule(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE gpio, SPIClass &spi,
-                  SPISettings spiSettings)
-        : Module(cs, irq, rst, gpio, spi, spiSettings)
-    {
-    }
-
-    void SPIbeginTransaction() override;
-    void SPIendTransaction() override;
+    void spiBeginTransaction() override;
+    void spiEndTransaction() override;
 };
 
 class RadioLibInterface : public RadioInterface, protected concurrency::NotifiedWorkerThread
@@ -73,7 +56,7 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
 
     float currentLimit = 100; // 100mA OCP - Should be acceptable for RFM95/SX127x chipset.
 
-    LockingModule module; // The HW interface to the radio
+    Module module; // The HW interface to the radio
 
     /**
      * provides lowest common denominator RadioLib API
@@ -99,8 +82,8 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
     virtual void enableInterrupt(void (*)()) = 0;
 
   public:
-    RadioLibInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy, SPIClass &spi,
-                      PhysicalLayer *iface = NULL);
+    RadioLibInterface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                      RADIOLIB_PIN_TYPE busy, PhysicalLayer *iface = NULL);
 
     virtual ErrorCode send(meshtastic_MeshPacket *p) override;
 

src/mesh/RadioLibRF95.cpp

@@ -79,5 +79,5 @@ bool RadioLibRF95::isReceiving()
 
 uint8_t RadioLibRF95::readReg(uint8_t addr)
 {
-    return _mod->SPIreadRegister(addr);
+    return mod->SPIreadRegister(addr);
 }

src/mesh/ReliableRouter.cpp

@@ -104,13 +104,14 @@ void ReliableRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtas
 
     if (p->to == ourNode) { // ignore ack/nak/want_ack packets that are not address to us (we only handle 0 hop reliability)
         if (p->want_ack) {
-            if (MeshModule::currentReply)
+            if (MeshModule::currentReply) {
                 LOG_DEBUG("Some other module has replied to this message, no need for a 2nd ack\n");
-            else if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag)
+            } else if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
                 sendAckNak(meshtastic_Routing_Error_NONE, getFrom(p), p->id, p->channel);
-            else
+            } else {
                 // Send a 'NO_CHANNEL' error on the primary channel if want_ack packet destined for us cannot be decoded
                 sendAckNak(meshtastic_Routing_Error_NO_CHANNEL, getFrom(p), p->id, channels.getPrimaryIndex());
+            }
         }
 
         // We consider an ack to be either a !routing packet with a request ID or a routing packet with !error

src/mesh/Router.cpp

@@ -211,8 +211,10 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
     if (!config.lora.override_duty_cycle && myRegion->dutyCycle < 100) {
         float hourlyTxPercent = airTime->utilizationTXPercent();
         if (hourlyTxPercent > myRegion->dutyCycle) {
+#ifdef DEBUG_PORT
             uint8_t silentMinutes = airTime->getSilentMinutes(hourlyTxPercent, myRegion->dutyCycle);
             LOG_WARN("Duty cycle limit exceeded. Aborting send for now, you can send again in %d minutes.\n", silentMinutes);
+#endif
             meshtastic_Routing_Error err = meshtastic_Routing_Error_DUTY_CYCLE_LIMIT;
             if (getFrom(p) == nodeDB.getNodeNum()) { // only send NAK to API, not to the mesh
                 abortSendAndNak(err, p);
@@ -479,9 +481,9 @@ void Router::perhapsHandleReceived(meshtastic_MeshPacket *p)
     // assert(radioConfig.has_preferences);
     bool ignore = is_in_repeated(config.lora.ignore_incoming, p->from);
 
-    if (ignore)
+    if (ignore) {
         LOG_DEBUG("Ignoring incoming message, 0x%x is in our ignore list\n", p->from);
-    else if (ignore |= shouldFilterReceived(p)) {
+    } else if (ignore |= shouldFilterReceived(p)) {
         LOG_DEBUG("Incoming message was filtered 0x%x\n", p->from);
     }
 

src/mesh/SX1262Interface.cpp

@@ -2,8 +2,8 @@
 #include "configuration.h"
 #include "error.h"
 
-SX1262Interface::SX1262Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy,
-                                 SPIClass &spi)
-    : SX126xInterface(cs, irq, rst, busy, spi)
+SX1262Interface::SX1262Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                                 RADIOLIB_PIN_TYPE busy)
+    : SX126xInterface(hal, cs, irq, rst, busy)
 {
 }

src/mesh/SX1262Interface.h

@@ -8,5 +8,6 @@
 class SX1262Interface : public SX126xInterface<SX1262>
 {
   public:
-    SX1262Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy, SPIClass &spi);
+    SX1262Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                    RADIOLIB_PIN_TYPE busy);
 };

src/mesh/SX1268Interface.cpp

@@ -2,9 +2,9 @@
 #include "configuration.h"
 #include "error.h"
 
-SX1268Interface::SX1268Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy,
-                                 SPIClass &spi)
-    : SX126xInterface(cs, irq, rst, busy, spi)
+SX1268Interface::SX1268Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                                 RADIOLIB_PIN_TYPE busy)
+    : SX126xInterface(hal, cs, irq, rst, busy)
 {
 }
 

src/mesh/SX1268Interface.h

@@ -10,5 +10,6 @@ class SX1268Interface : public SX126xInterface<SX1268>
   public:
     virtual float getFreq() override;
 
-    SX1268Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy, SPIClass &spi);
+    SX1268Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                    RADIOLIB_PIN_TYPE busy);
 };

src/mesh/SX126xInterface.cpp

@@ -9,9 +9,9 @@
 #endif
 
 template <typename T>
-SX126xInterface<T>::SX126xInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy,
-                                    SPIClass &spi)
-    : RadioLibInterface(cs, irq, rst, busy, spi, &lora), lora(&module)
+SX126xInterface<T>::SX126xInterface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                                    RADIOLIB_PIN_TYPE busy)
+    : RadioLibInterface(hal, cs, irq, rst, busy, &lora), lora(&module)
 {
     LOG_WARN("SX126xInterface(cs=%d, irq=%d, rst=%d, busy=%d)\n", cs, irq, rst, busy);
 }
@@ -60,16 +60,19 @@ template <typename T> bool SX126xInterface<T>::init()
     LOG_DEBUG("Current limit set to %f\n", currentLimit);
     LOG_DEBUG("Current limit set result %d\n", res);
 
-#ifdef SX126X_E22
+#if defined(SX126X_E22)
     // E22 Emulation explicitly requires DIO2 as RF switch, so set it to TRUE again for good measure. In case somebody defines
     // SX126X_TX for an E22 Module
-    if (res == RADIOLIB_ERR_NONE)
+    if (res == RADIOLIB_ERR_NONE) {
+        LOG_DEBUG("SX126X_E22 mode enabled. Setting DIO2 as RF Switch\n");
         res = lora.setDio2AsRfSwitch(true);
+    }
 #endif
 
 #if defined(SX126X_TXEN) && (SX126X_TXEN != RADIOLIB_NC)
     // lora.begin sets Dio2 as RF switch control, which is not true if we are manually controlling RX and TX
     if (res == RADIOLIB_ERR_NONE) {
+        LOG_DEBUG("SX126X_TX/RX EN pins defined. Setting RF Switch: RXEN=%i, TXEN=%i\n", SX126X_RXEN, SX126X_TXEN);
         res = lora.setDio2AsRfSwitch(false);
         lora.setRfSwitchPins(SX126X_RXEN, SX126X_TXEN);
     }
@@ -176,8 +179,9 @@ template <typename T> void SX126xInterface<T>::setStandby()
 
     int err = lora.standby();
 
-    if (err != RADIOLIB_ERR_NONE)
+    if (err != RADIOLIB_ERR_NONE) {
         LOG_DEBUG("SX126x standby failed with error %d\n", err);
+    }
 
     assert(err == RADIOLIB_ERR_NONE);
 

src/mesh/SX126xInterface.h

@@ -9,7 +9,8 @@
 template <class T> class SX126xInterface : public RadioLibInterface
 {
   public:
-    SX126xInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy, SPIClass &spi);
+    SX126xInterface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                    RADIOLIB_PIN_TYPE busy);
 
     /// Initialise the Driver transport hardware and software.
     /// Make sure the Driver is properly configured before calling init().

src/mesh/SX1280Interface.cpp

@@ -2,8 +2,8 @@
 #include "configuration.h"
 #include "error.h"
 
-SX1280Interface::SX1280Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy,
-                                 SPIClass &spi)
-    : SX128xInterface(cs, irq, rst, busy, spi)
+SX1280Interface::SX1280Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                                 RADIOLIB_PIN_TYPE busy)
+    : SX128xInterface(hal, cs, irq, rst, busy)
 {
 }

src/mesh/SX1280Interface.h

@@ -9,5 +9,6 @@
 class SX1280Interface : public SX128xInterface<SX1280>
 {
   public:
-    SX1280Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy, SPIClass &spi);
+    SX1280Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                    RADIOLIB_PIN_TYPE busy);
 };

src/mesh/SX128xInterface.cpp

@@ -9,9 +9,9 @@
 #endif
 
 template <typename T>
-SX128xInterface<T>::SX128xInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy,
-                                    SPIClass &spi)
-    : RadioLibInterface(cs, irq, rst, busy, spi, &lora), lora(&module)
+SX128xInterface<T>::SX128xInterface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                                    RADIOLIB_PIN_TYPE busy)
+    : RadioLibInterface(hal, cs, irq, rst, busy, &lora), lora(&module)
 {
     LOG_WARN("SX128xInterface(cs=%d, irq=%d, rst=%d, busy=%d)\n", cs, irq, rst, busy);
 }
@@ -151,8 +151,9 @@ template <typename T> void SX128xInterface<T>::setStandby()
 
     int err = lora.standby();
 
-    if (err != RADIOLIB_ERR_NONE)
+    if (err != RADIOLIB_ERR_NONE) {
         LOG_ERROR("SX128x standby failed with error %d\n", err);
+    }
 
     assert(err == RADIOLIB_ERR_NONE);
 

src/mesh/SX128xInterface.h

@@ -9,7 +9,8 @@
 template <class T> class SX128xInterface : public RadioLibInterface
 {
   public:
-    SX128xInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy, SPIClass &spi);
+    SX128xInterface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                    RADIOLIB_PIN_TYPE busy);
 
     /// Initialise the Driver transport hardware and software.
     /// Make sure the Driver is properly configured before calling init().

src/mesh/TypedQueue.h

@@ -74,7 +74,7 @@ template <class T> class TypedQueue
     concurrency::OSThread *reader = NULL;
 
   public:
-    TypedQueue(int maxElements) {}
+    explicit TypedQueue(int maxElements) {}
 
     int numFree() { return 1; } // Always claim 1 free, because we can grow to any size
 

src/mesh/generated/meshtastic/admin.pb.c

@@ -12,6 +12,9 @@ PB_BIND(meshtastic_AdminMessage, meshtastic_AdminMessage, 2)
 PB_BIND(meshtastic_HamParameters, meshtastic_HamParameters, AUTO)
 
 
+PB_BIND(meshtastic_NodeRemoteHardwarePinsResponse, meshtastic_NodeRemoteHardwarePinsResponse, 2)
+
+
 
 
 

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

@@ -6,9 +6,10 @@
 #include <pb.h>
 #include "meshtastic/channel.pb.h"
 #include "meshtastic/config.pb.h"
+#include "meshtastic/connection_status.pb.h"
+#include "meshtastic/deviceonly.pb.h"
 #include "meshtastic/mesh.pb.h"
 #include "meshtastic/module_config.pb.h"
-#include "meshtastic/connection_status.pb.h"
 
 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.
@@ -70,6 +71,13 @@ typedef struct _meshtastic_HamParameters {
     char short_name[6];
 } meshtastic_HamParameters;
 
+/* Response envelope for node_remote_hardware_pins */
+typedef struct _meshtastic_NodeRemoteHardwarePinsResponse {
+    /* Nodes and their respective remote hardware GPIO pins */
+    pb_size_t node_remote_hardware_pins_count;
+    meshtastic_NodeRemoteHardwarePin node_remote_hardware_pins[16];
+} meshtastic_NodeRemoteHardwarePinsResponse;
+
 /* This message is handled by the Admin module and is responsible for all settings/channel read/write operations.
  This message is used to do settings operations to both remote AND local nodes.
  (Prior to 1.2 these operations were done via special ToRadio operations) */
@@ -111,6 +119,10 @@ typedef struct _meshtastic_AdminMessage {
         meshtastic_DeviceConnectionStatus get_device_connection_status_response;
         /* Setup a node for licensed amateur (ham) radio operation */
         meshtastic_HamParameters set_ham_mode;
+        /* Get the mesh's nodes with their available gpio pins for RemoteHardware module use */
+        bool get_node_remote_hardware_pins_request;
+        /* Respond with the mesh's nodes with their available gpio pins for RemoteHardware module use */
+        meshtastic_NodeRemoteHardwarePinsResponse get_node_remote_hardware_pins_response;
         /* Set the owner for this node */
         meshtastic_User set_owner;
         /* Set channels (using the new API).
@@ -168,17 +180,21 @@ extern "C" {
 
 
 
+
 /* Initializer values for message structs */
 #define meshtastic_AdminMessage_init_default     {0, {0}}
 #define meshtastic_HamParameters_init_default    {"", 0, 0, ""}
+#define meshtastic_NodeRemoteHardwarePinsResponse_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, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default}}
 #define meshtastic_AdminMessage_init_zero        {0, {0}}
 #define meshtastic_HamParameters_init_zero       {"", 0, 0, ""}
+#define meshtastic_NodeRemoteHardwarePinsResponse_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, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero}}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_HamParameters_call_sign_tag   1
 #define meshtastic_HamParameters_tx_power_tag    2
 #define meshtastic_HamParameters_frequency_tag   3
 #define meshtastic_HamParameters_short_name_tag  4
+#define meshtastic_NodeRemoteHardwarePinsResponse_node_remote_hardware_pins_tag 1
 #define meshtastic_AdminMessage_get_channel_request_tag 1
 #define meshtastic_AdminMessage_get_channel_response_tag 2
 #define meshtastic_AdminMessage_get_owner_request_tag 3
@@ -196,6 +212,8 @@ extern "C" {
 #define meshtastic_AdminMessage_get_device_connection_status_request_tag 16
 #define meshtastic_AdminMessage_get_device_connection_status_response_tag 17
 #define meshtastic_AdminMessage_set_ham_mode_tag 18
+#define meshtastic_AdminMessage_get_node_remote_hardware_pins_request_tag 19
+#define meshtastic_AdminMessage_get_node_remote_hardware_pins_response_tag 20
 #define meshtastic_AdminMessage_set_owner_tag    32
 #define meshtastic_AdminMessage_set_channel_tag  33
 #define meshtastic_AdminMessage_set_config_tag   34
@@ -230,6 +248,8 @@ X(a, STATIC,   ONEOF,    STRING,   (payload_variant,get_ringtone_response,get_ri
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,get_device_connection_status_request,get_device_connection_status_request),  16) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,get_device_connection_status_response,get_device_connection_status_response),  17) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_ham_mode,set_ham_mode),  18) \
+X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,get_node_remote_hardware_pins_request,get_node_remote_hardware_pins_request),  19) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,get_node_remote_hardware_pins_response,get_node_remote_hardware_pins_response),  20) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_owner,set_owner),  32) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_channel,set_channel),  33) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_config,set_config),  34) \
@@ -253,6 +273,7 @@ X(a, STATIC,   ONEOF,    INT32,    (payload_variant,nodedb_reset,nodedb_reset),
 #define meshtastic_AdminMessage_payload_variant_get_device_metadata_response_MSGTYPE meshtastic_DeviceMetadata
 #define meshtastic_AdminMessage_payload_variant_get_device_connection_status_response_MSGTYPE meshtastic_DeviceConnectionStatus
 #define meshtastic_AdminMessage_payload_variant_set_ham_mode_MSGTYPE meshtastic_HamParameters
+#define meshtastic_AdminMessage_payload_variant_get_node_remote_hardware_pins_response_MSGTYPE meshtastic_NodeRemoteHardwarePinsResponse
 #define meshtastic_AdminMessage_payload_variant_set_owner_MSGTYPE meshtastic_User
 #define meshtastic_AdminMessage_payload_variant_set_channel_MSGTYPE meshtastic_Channel
 #define meshtastic_AdminMessage_payload_variant_set_config_MSGTYPE meshtastic_Config
@@ -266,16 +287,25 @@ X(a, STATIC,   SINGULAR, STRING,   short_name,        4)
 #define meshtastic_HamParameters_CALLBACK NULL
 #define meshtastic_HamParameters_DEFAULT NULL
 
+#define meshtastic_NodeRemoteHardwarePinsResponse_FIELDLIST(X, a) \
+X(a, STATIC,   REPEATED, MESSAGE,  node_remote_hardware_pins,   1)
+#define meshtastic_NodeRemoteHardwarePinsResponse_CALLBACK NULL
+#define meshtastic_NodeRemoteHardwarePinsResponse_DEFAULT NULL
+#define meshtastic_NodeRemoteHardwarePinsResponse_node_remote_hardware_pins_MSGTYPE meshtastic_NodeRemoteHardwarePin
+
 extern const pb_msgdesc_t meshtastic_AdminMessage_msg;
 extern const pb_msgdesc_t meshtastic_HamParameters_msg;
+extern const pb_msgdesc_t meshtastic_NodeRemoteHardwarePinsResponse_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_AdminMessage_fields &meshtastic_AdminMessage_msg
 #define meshtastic_HamParameters_fields &meshtastic_HamParameters_msg
+#define meshtastic_NodeRemoteHardwarePinsResponse_fields &meshtastic_NodeRemoteHardwarePinsResponse_msg
 
 /* Maximum encoded size of messages (where known) */
-#define meshtastic_AdminMessage_size             234
+#define meshtastic_AdminMessage_size             500
 #define meshtastic_HamParameters_size            32
+#define meshtastic_NodeRemoteHardwarePinsResponse_size 496
 
 #ifdef __cplusplus
 } /* extern "C" */

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

@@ -18,7 +18,7 @@ typedef enum _meshtastic_Config_DeviceConfig_Role {
    Same as a client except packets will not hop over this node, does not contribute to routing packets for mesh. */
     meshtastic_Config_DeviceConfig_Role_CLIENT_MUTE = 1,
     /* Router device role.
-   Mesh packets will prefer to be routed over this node. This node will not be used by client apps. 
+   Mesh packets will prefer to be routed over this node. This node will not be used by client apps.
    The wifi/ble radios and the oled screen will be put to sleep.
    This mode may still potentially have higher power usage due to it's preference in message rebroadcasting on the mesh. */
     meshtastic_Config_DeviceConfig_Role_ROUTER = 2,
@@ -233,6 +233,9 @@ typedef struct _meshtastic_Config_DeviceConfig {
     uint32_t node_info_broadcast_secs;
     /* Treat double tap interrupt on supported accelerometers as a button press if set to true */
     bool double_tap_as_button_press;
+    /* If true, device is considered to be "managed" by a mesh administrator
+ Clients should then limit available configuration and administrative options inside the user interface */
+    bool is_managed;
 } meshtastic_Config_DeviceConfig;
 
 /* Position Config */
@@ -290,7 +293,7 @@ typedef struct _meshtastic_Config_PowerConfig {
  0 for default of 1 minute */
     uint32_t wait_bluetooth_secs;
     /* Mesh Super Deep Sleep Timeout Seconds
- While in Light Sleep if this value is exceeded we will lower into super deep sleep 
+ While in Light Sleep if this value is exceeded we will lower into super deep sleep
  for sds_secs (default 1 year) or a button press
  0 for default of two hours, MAXUINT for disabled */
     uint32_t mesh_sds_timeout_secs;
@@ -353,7 +356,7 @@ typedef struct _meshtastic_Config_DisplayConfig {
     /* Automatically toggles to the next page on the screen like a carousel, based the specified interval in seconds.
  Potentially useful for devices without user buttons. */
     uint32_t auto_screen_carousel_secs;
-    /* If this is set, the displayed compass will always point north. if unset, the old behaviour 
+    /* If this is set, the displayed compass will always point north. if unset, the old behaviour
  (top of display is heading direction) is used. */
     bool compass_north_top;
     /* Flip screen vertically, for cases that mount the screen upside down */
@@ -416,7 +419,7 @@ typedef struct _meshtastic_Config_LoRaConfig {
  If using the hash algorithm the channel number will be: hash(channel_name) %
  NUM_CHANNELS (Where num channels depends on the regulatory region). */
     uint16_t channel_num;
-    /* If true, duty cycle limits will be exceeded and thus you're possibly not following 
+    /* If true, duty cycle limits will be exceeded and thus you're possibly not following
  the local regulations if you're not a HAM.
  Has no effect if the duty cycle of the used region is 100%. */
     bool override_duty_cycle;
@@ -529,7 +532,7 @@ extern "C" {
 
 /* Initializer values for message structs */
 #define meshtastic_Config_init_default           {0, {meshtastic_Config_DeviceConfig_init_default}}
-#define meshtastic_Config_DeviceConfig_init_default {_meshtastic_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN, 0, 0}
+#define meshtastic_Config_DeviceConfig_init_default {_meshtastic_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN, 0, 0, 0}
 #define meshtastic_Config_PositionConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_Config_PowerConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_Config_NetworkConfig_init_default {0, "", "", "", 0, _meshtastic_Config_NetworkConfig_AddressMode_MIN, false, meshtastic_Config_NetworkConfig_IpV4Config_init_default, ""}
@@ -538,7 +541,7 @@ extern "C" {
 #define meshtastic_Config_LoRaConfig_init_default {0, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _meshtastic_Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}}
 #define meshtastic_Config_BluetoothConfig_init_default {0, _meshtastic_Config_BluetoothConfig_PairingMode_MIN, 0}
 #define meshtastic_Config_init_zero              {0, {meshtastic_Config_DeviceConfig_init_zero}}
-#define meshtastic_Config_DeviceConfig_init_zero {_meshtastic_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN, 0, 0}
+#define meshtastic_Config_DeviceConfig_init_zero {_meshtastic_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN, 0, 0, 0}
 #define meshtastic_Config_PositionConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_Config_PowerConfig_init_zero  {0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_Config_NetworkConfig_init_zero {0, "", "", "", 0, _meshtastic_Config_NetworkConfig_AddressMode_MIN, false, meshtastic_Config_NetworkConfig_IpV4Config_init_zero, ""}
@@ -556,6 +559,7 @@ extern "C" {
 #define meshtastic_Config_DeviceConfig_rebroadcast_mode_tag 6
 #define meshtastic_Config_DeviceConfig_node_info_broadcast_secs_tag 7
 #define meshtastic_Config_DeviceConfig_double_tap_as_button_press_tag 8
+#define meshtastic_Config_DeviceConfig_is_managed_tag 9
 #define meshtastic_Config_PositionConfig_position_broadcast_secs_tag 1
 #define meshtastic_Config_PositionConfig_position_broadcast_smart_enabled_tag 2
 #define meshtastic_Config_PositionConfig_fixed_position_tag 3
@@ -650,7 +654,8 @@ X(a, STATIC,   SINGULAR, UINT32,   button_gpio,       4) \
 X(a, STATIC,   SINGULAR, UINT32,   buzzer_gpio,       5) \
 X(a, STATIC,   SINGULAR, UENUM,    rebroadcast_mode,   6) \
 X(a, STATIC,   SINGULAR, UINT32,   node_info_broadcast_secs,   7) \
-X(a, STATIC,   SINGULAR, BOOL,     double_tap_as_button_press,   8)
+X(a, STATIC,   SINGULAR, BOOL,     double_tap_as_button_press,   8) \
+X(a, STATIC,   SINGULAR, BOOL,     is_managed,        9)
 #define meshtastic_Config_DeviceConfig_CALLBACK NULL
 #define meshtastic_Config_DeviceConfig_DEFAULT NULL
 
@@ -765,7 +770,7 @@ extern const pb_msgdesc_t meshtastic_Config_BluetoothConfig_msg;
 
 /* Maximum encoded size of messages (where known) */
 #define meshtastic_Config_BluetoothConfig_size   10
-#define meshtastic_Config_DeviceConfig_size      28
+#define meshtastic_Config_DeviceConfig_size      30
 #define meshtastic_Config_DisplayConfig_size     28
 #define meshtastic_Config_LoRaConfig_size        77
 #define meshtastic_Config_NetworkConfig_IpV4Config_size 20

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

@@ -15,5 +15,8 @@ PB_BIND(meshtastic_ChannelFile, meshtastic_ChannelFile, 2)
 PB_BIND(meshtastic_OEMStore, meshtastic_OEMStore, 2)
 
 
+PB_BIND(meshtastic_NodeRemoteHardwarePin, meshtastic_NodeRemoteHardwarePin, AUTO)
+
+
 
 

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

@@ -7,6 +7,7 @@
 #include "meshtastic/channel.pb.h"
 #include "meshtastic/localonly.pb.h"
 #include "meshtastic/mesh.pb.h"
+#include "meshtastic/module_config.pb.h"
 
 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.
@@ -24,6 +25,51 @@ typedef enum _meshtastic_ScreenFonts {
 } meshtastic_ScreenFonts;
 
 /* Struct definitions */
+/* The on-disk saved channels */
+typedef struct _meshtastic_ChannelFile {
+    /* The channels our node knows about */
+    pb_size_t channels_count;
+    meshtastic_Channel channels[8];
+    /* A version integer used to invalidate old save files when we make
+ incompatible changes This integer is set at build time and is private to
+ NodeDB.cpp in the device code. */
+    uint32_t version;
+} meshtastic_ChannelFile;
+
+typedef PB_BYTES_ARRAY_T(2048) meshtastic_OEMStore_oem_icon_bits_t;
+typedef PB_BYTES_ARRAY_T(32) meshtastic_OEMStore_oem_aes_key_t;
+/* This can be used for customizing the firmware distribution. If populated,
+ show a secondary bootup screen with custom logo and text for 2.5 seconds. */
+typedef struct _meshtastic_OEMStore {
+    /* The Logo width in Px */
+    uint32_t oem_icon_width;
+    /* The Logo height in Px */
+    uint32_t oem_icon_height;
+    /* The Logo in XBM bytechar format */
+    meshtastic_OEMStore_oem_icon_bits_t oem_icon_bits;
+    /* Use this font for the OEM text. */
+    meshtastic_ScreenFonts oem_font;
+    /* Use this font for the OEM text. */
+    char oem_text[40];
+    /* The default device encryption key, 16 or 32 byte */
+    meshtastic_OEMStore_oem_aes_key_t oem_aes_key;
+    /* A Preset LocalConfig to apply during factory reset */
+    bool has_oem_local_config;
+    meshtastic_LocalConfig oem_local_config;
+    /* A Preset LocalModuleConfig to apply during factory reset */
+    bool has_oem_local_module_config;
+    meshtastic_LocalModuleConfig oem_local_module_config;
+} meshtastic_OEMStore;
+
+/* RemoteHardwarePins associated with a node */
+typedef struct _meshtastic_NodeRemoteHardwarePin {
+    /* The node_num exposing the available gpio pin */
+    uint32_t node_num;
+    /* The the available gpio pin for usage with RemoteHardware module */
+    bool has_pin;
+    meshtastic_RemoteHardwarePin pin;
+} meshtastic_NodeRemoteHardwarePin;
+
 /* This message is never sent over the wire, but it is used for serializing DB
  state to flash in the device code
  FIXME, since we write this each time we enter deep sleep (and have infinite
@@ -61,44 +107,11 @@ typedef struct _meshtastic_DeviceState {
  Might be null */
     bool has_rx_waypoint;
     meshtastic_MeshPacket rx_waypoint;
+    /* The mesh's nodes with their available gpio pins for RemoteHardware module */
+    pb_size_t node_remote_hardware_pins_count;
+    meshtastic_NodeRemoteHardwarePin node_remote_hardware_pins[12];
 } meshtastic_DeviceState;
 
-/* The on-disk saved channels */
-typedef struct _meshtastic_ChannelFile {
-    /* The channels our node knows about */
-    pb_size_t channels_count;
-    meshtastic_Channel channels[8];
-    /* A version integer used to invalidate old save files when we make
- incompatible changes This integer is set at build time and is private to
- NodeDB.cpp in the device code. */
-    uint32_t version;
-} meshtastic_ChannelFile;
-
-typedef PB_BYTES_ARRAY_T(2048) meshtastic_OEMStore_oem_icon_bits_t;
-typedef PB_BYTES_ARRAY_T(32) meshtastic_OEMStore_oem_aes_key_t;
-/* This can be used for customizing the firmware distribution. If populated,
- show a secondary bootup screen with custom logo and text for 2.5 seconds. */
-typedef struct _meshtastic_OEMStore {
-    /* The Logo width in Px */
-    uint32_t oem_icon_width;
-    /* The Logo height in Px */
-    uint32_t oem_icon_height;
-    /* The Logo in XBM bytechar format */
-    meshtastic_OEMStore_oem_icon_bits_t oem_icon_bits;
-    /* Use this font for the OEM text. */
-    meshtastic_ScreenFonts oem_font;
-    /* Use this font for the OEM text. */
-    char oem_text[40];
-    /* The default device encryption key, 16 or 32 byte */
-    meshtastic_OEMStore_oem_aes_key_t oem_aes_key;
-    /* A Preset LocalConfig to apply during factory reset */
-    bool has_oem_local_config;
-    meshtastic_LocalConfig oem_local_config;
-    /* A Preset LocalModuleConfig to apply during factory reset */
-    bool has_oem_local_module_config;
-    meshtastic_LocalModuleConfig oem_local_module_config;
-} meshtastic_OEMStore;
-
 
 #ifdef __cplusplus
 extern "C" {
@@ -114,24 +127,18 @@ extern "C" {
 #define meshtastic_OEMStore_oem_font_ENUMTYPE meshtastic_ScreenFonts
 
 
+
 /* Initializer values for message structs */
-#define meshtastic_DeviceState_init_default      {false, meshtastic_MyNodeInfo_init_default, false, meshtastic_User_init_default, 0, {meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default}, 0, {meshtastic_MeshPacket_init_default}, false, meshtastic_MeshPacket_init_default, 0, 0, 0, false, meshtastic_MeshPacket_init_default}
+#define meshtastic_DeviceState_init_default      {false, meshtastic_MyNodeInfo_init_default, false, meshtastic_User_init_default, 0, {meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_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}}
 #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_OEMStore_init_default         {0, 0, {0, {0}}, _meshtastic_ScreenFonts_MIN, "", {0, {0}}, false, meshtastic_LocalConfig_init_default, false, meshtastic_LocalModuleConfig_init_default}
-#define meshtastic_DeviceState_init_zero         {false, meshtastic_MyNodeInfo_init_zero, false, meshtastic_User_init_zero, 0, {meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero}, 0, {meshtastic_MeshPacket_init_zero}, false, meshtastic_MeshPacket_init_zero, 0, 0, 0, false, meshtastic_MeshPacket_init_zero}
+#define meshtastic_NodeRemoteHardwarePin_init_default {0, false, meshtastic_RemoteHardwarePin_init_default}
+#define meshtastic_DeviceState_init_zero         {false, meshtastic_MyNodeInfo_init_zero, false, meshtastic_User_init_zero, 0, {meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_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}}
 #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}
 #define meshtastic_OEMStore_init_zero            {0, 0, {0, {0}}, _meshtastic_ScreenFonts_MIN, "", {0, {0}}, false, meshtastic_LocalConfig_init_zero, false, meshtastic_LocalModuleConfig_init_zero}
+#define meshtastic_NodeRemoteHardwarePin_init_zero {0, false, meshtastic_RemoteHardwarePin_init_zero}
 
 /* Field tags (for use in manual encoding/decoding) */
-#define meshtastic_DeviceState_my_node_tag       2
-#define meshtastic_DeviceState_owner_tag         3
-#define meshtastic_DeviceState_node_db_tag       4
-#define meshtastic_DeviceState_receive_queue_tag 5
-#define meshtastic_DeviceState_rx_text_message_tag 7
-#define meshtastic_DeviceState_version_tag       8
-#define meshtastic_DeviceState_no_save_tag       9
-#define meshtastic_DeviceState_did_gps_reset_tag 11
-#define meshtastic_DeviceState_rx_waypoint_tag   12
 #define meshtastic_ChannelFile_channels_tag      1
 #define meshtastic_ChannelFile_version_tag       2
 #define meshtastic_OEMStore_oem_icon_width_tag   1
@@ -142,6 +149,18 @@ extern "C" {
 #define meshtastic_OEMStore_oem_aes_key_tag      6
 #define meshtastic_OEMStore_oem_local_config_tag 7
 #define meshtastic_OEMStore_oem_local_module_config_tag 8
+#define meshtastic_NodeRemoteHardwarePin_node_num_tag 1
+#define meshtastic_NodeRemoteHardwarePin_pin_tag 2
+#define meshtastic_DeviceState_my_node_tag       2
+#define meshtastic_DeviceState_owner_tag         3
+#define meshtastic_DeviceState_node_db_tag       4
+#define meshtastic_DeviceState_receive_queue_tag 5
+#define meshtastic_DeviceState_rx_text_message_tag 7
+#define meshtastic_DeviceState_version_tag       8
+#define meshtastic_DeviceState_no_save_tag       9
+#define meshtastic_DeviceState_did_gps_reset_tag 11
+#define meshtastic_DeviceState_rx_waypoint_tag   12
+#define meshtastic_DeviceState_node_remote_hardware_pins_tag 13
 
 /* Struct field encoding specification for nanopb */
 #define meshtastic_DeviceState_FIELDLIST(X, a) \
@@ -153,7 +172,8 @@ X(a, STATIC,   OPTIONAL, MESSAGE,  rx_text_message,   7) \
 X(a, STATIC,   SINGULAR, UINT32,   version,           8) \
 X(a, STATIC,   SINGULAR, BOOL,     no_save,           9) \
 X(a, STATIC,   SINGULAR, BOOL,     did_gps_reset,    11) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  rx_waypoint,      12)
+X(a, STATIC,   OPTIONAL, MESSAGE,  rx_waypoint,      12) \
+X(a, STATIC,   REPEATED, MESSAGE,  node_remote_hardware_pins,  13)
 #define meshtastic_DeviceState_CALLBACK NULL
 #define meshtastic_DeviceState_DEFAULT NULL
 #define meshtastic_DeviceState_my_node_MSGTYPE meshtastic_MyNodeInfo
@@ -162,6 +182,7 @@ X(a, STATIC,   OPTIONAL, MESSAGE,  rx_waypoint,      12)
 #define meshtastic_DeviceState_receive_queue_MSGTYPE meshtastic_MeshPacket
 #define meshtastic_DeviceState_rx_text_message_MSGTYPE meshtastic_MeshPacket
 #define meshtastic_DeviceState_rx_waypoint_MSGTYPE meshtastic_MeshPacket
+#define meshtastic_DeviceState_node_remote_hardware_pins_MSGTYPE meshtastic_NodeRemoteHardwarePin
 
 #define meshtastic_ChannelFile_FIELDLIST(X, a) \
 X(a, STATIC,   REPEATED, MESSAGE,  channels,          1) \
@@ -184,19 +205,29 @@ X(a, STATIC,   OPTIONAL, MESSAGE,  oem_local_module_config,   8)
 #define meshtastic_OEMStore_oem_local_config_MSGTYPE meshtastic_LocalConfig
 #define meshtastic_OEMStore_oem_local_module_config_MSGTYPE meshtastic_LocalModuleConfig
 
+#define meshtastic_NodeRemoteHardwarePin_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   node_num,          1) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  pin,               2)
+#define meshtastic_NodeRemoteHardwarePin_CALLBACK NULL
+#define meshtastic_NodeRemoteHardwarePin_DEFAULT NULL
+#define meshtastic_NodeRemoteHardwarePin_pin_MSGTYPE meshtastic_RemoteHardwarePin
+
 extern const pb_msgdesc_t meshtastic_DeviceState_msg;
 extern const pb_msgdesc_t meshtastic_ChannelFile_msg;
 extern const pb_msgdesc_t meshtastic_OEMStore_msg;
+extern const pb_msgdesc_t meshtastic_NodeRemoteHardwarePin_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_DeviceState_fields &meshtastic_DeviceState_msg
 #define meshtastic_ChannelFile_fields &meshtastic_ChannelFile_msg
 #define meshtastic_OEMStore_fields &meshtastic_OEMStore_msg
+#define meshtastic_NodeRemoteHardwarePin_fields &meshtastic_NodeRemoteHardwarePin_msg
 
 /* Maximum encoded size of messages (where known) */
 #define meshtastic_ChannelFile_size              638
-#define meshtastic_DeviceState_size              22364
-#define meshtastic_OEMStore_size                 3041
+#define meshtastic_DeviceState_size              22736
+#define meshtastic_NodeRemoteHardwarePin_size    29
+#define meshtastic_OEMStore_size                 3137
 
 #ifdef __cplusplus
 } /* extern "C" */

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

@@ -156,8 +156,8 @@ extern const pb_msgdesc_t meshtastic_LocalModuleConfig_msg;
 #define meshtastic_LocalModuleConfig_fields &meshtastic_LocalModuleConfig_msg
 
 /* Maximum encoded size of messages (where known) */
-#define meshtastic_LocalConfig_size              456
-#define meshtastic_LocalModuleConfig_size        439
+#define meshtastic_LocalConfig_size              458
+#define meshtastic_LocalModuleConfig_size        533
 
 #ifdef __cplusplus
 } /* extern "C" */

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

@@ -719,6 +719,8 @@ typedef struct _meshtastic_DeviceMetadata {
     uint32_t position_flags;
     /* Device hardware model */
     meshtastic_HardwareModel hw_model;
+    /* Has Remote Hardware enabled */
+    bool hasRemoteHardware;
 } meshtastic_DeviceMetadata;
 
 /* Packets from the radio to the phone will appear on the fromRadio characteristic.
@@ -855,7 +857,7 @@ extern "C" {
 #define meshtastic_Compressed_init_default       {_meshtastic_PortNum_MIN, {0, {0}}}
 #define meshtastic_NeighborInfo_init_default     {0, 0, 0, {meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default}}
 #define meshtastic_Neighbor_init_default         {0, 0}
-#define meshtastic_DeviceMetadata_init_default   {"", 0, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_Role_MIN, 0, _meshtastic_HardwareModel_MIN}
+#define meshtastic_DeviceMetadata_init_default   {"", 0, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_Role_MIN, 0, _meshtastic_HardwareModel_MIN, 0}
 #define meshtastic_Position_init_zero            {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN, _meshtastic_Position_AltSource_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_User_init_zero                {"", "", "", {0}, _meshtastic_HardwareModel_MIN, 0}
 #define meshtastic_RouteDiscovery_init_zero      {0, {0, 0, 0, 0, 0, 0, 0, 0}}
@@ -872,7 +874,7 @@ extern "C" {
 #define meshtastic_Compressed_init_zero          {_meshtastic_PortNum_MIN, {0, {0}}}
 #define meshtastic_NeighborInfo_init_zero        {0, 0, 0, {meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero}}
 #define meshtastic_Neighbor_init_zero            {0, 0}
-#define meshtastic_DeviceMetadata_init_zero      {"", 0, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_Role_MIN, 0, _meshtastic_HardwareModel_MIN}
+#define meshtastic_DeviceMetadata_init_zero      {"", 0, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_Role_MIN, 0, _meshtastic_HardwareModel_MIN, 0}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_Position_latitude_i_tag       1
@@ -987,6 +989,7 @@ extern "C" {
 #define meshtastic_DeviceMetadata_role_tag       7
 #define meshtastic_DeviceMetadata_position_flags_tag 8
 #define meshtastic_DeviceMetadata_hw_model_tag   9
+#define meshtastic_DeviceMetadata_hasRemoteHardware_tag 10
 #define meshtastic_FromRadio_id_tag              1
 #define meshtastic_FromRadio_packet_tag          2
 #define meshtastic_FromRadio_my_info_tag         3
@@ -1210,7 +1213,8 @@ X(a, STATIC,   SINGULAR, BOOL,     hasBluetooth,      5) \
 X(a, STATIC,   SINGULAR, BOOL,     hasEthernet,       6) \
 X(a, STATIC,   SINGULAR, UENUM,    role,              7) \
 X(a, STATIC,   SINGULAR, UINT32,   position_flags,    8) \
-X(a, STATIC,   SINGULAR, UENUM,    hw_model,          9)
+X(a, STATIC,   SINGULAR, UENUM,    hw_model,          9) \
+X(a, STATIC,   SINGULAR, BOOL,     hasRemoteHardware,  10)
 #define meshtastic_DeviceMetadata_CALLBACK NULL
 #define meshtastic_DeviceMetadata_DEFAULT NULL
 
@@ -1254,7 +1258,7 @@ extern const pb_msgdesc_t meshtastic_DeviceMetadata_msg;
 /* Maximum encoded size of messages (where known) */
 #define meshtastic_Compressed_size               243
 #define meshtastic_Data_size                     270
-#define meshtastic_DeviceMetadata_size           44
+#define meshtastic_DeviceMetadata_size           46
 #define meshtastic_FromRadio_size                330
 #define meshtastic_LogRecord_size                81
 #define meshtastic_MeshPacket_size               321

src/mesh/generated/meshtastic/module_config.pb.c

@@ -36,6 +36,10 @@ PB_BIND(meshtastic_ModuleConfig_TelemetryConfig, meshtastic_ModuleConfig_Telemet
 PB_BIND(meshtastic_ModuleConfig_CannedMessageConfig, meshtastic_ModuleConfig_CannedMessageConfig, AUTO)
 
 
+PB_BIND(meshtastic_RemoteHardwarePin, meshtastic_RemoteHardwarePin, AUTO)
+
+
+
 
 
 

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

@@ -10,6 +10,15 @@
 #endif
 
 /* Enum definitions */
+typedef enum _meshtastic_RemoteHardwarePinType {
+    /* Unset/unused */
+    meshtastic_RemoteHardwarePinType_UNKNOWN = 0,
+    /* GPIO pin can be read (if it is high / low) */
+    meshtastic_RemoteHardwarePinType_DIGITAL_READ = 1,
+    /* GPIO pin can be written to (high / low) */
+    meshtastic_RemoteHardwarePinType_DIGITAL_WRITE = 2
+} meshtastic_RemoteHardwarePinType;
+
 /* Baudrate for codec2 voice */
 typedef enum _meshtastic_ModuleConfig_AudioConfig_Audio_Baud {
     meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_DEFAULT = 0,
@@ -103,12 +112,6 @@ typedef struct _meshtastic_ModuleConfig_MQTTConfig {
     char root[16];
 } meshtastic_ModuleConfig_MQTTConfig;
 
-/* RemoteHardwareModule Config */
-typedef struct _meshtastic_ModuleConfig_RemoteHardwareConfig {
-    /* Whether the Module is enabled */
-    bool enabled;
-} meshtastic_ModuleConfig_RemoteHardwareConfig;
-
 /* Audio Config for codec2 voice */
 typedef struct _meshtastic_ModuleConfig_AudioConfig {
     /* Whether Audio is enabled */
@@ -208,7 +211,7 @@ typedef struct _meshtastic_ModuleConfig_RangeTestConfig {
     bool enabled;
     /* Send out range test messages from this node */
     uint32_t sender;
-    /* Bool value indicating that this node should save a RangeTest.csv file. 
+    /* Bool value indicating that this node should save a RangeTest.csv file.
  ESP32 Only */
     bool save;
 } meshtastic_ModuleConfig_RangeTestConfig;
@@ -262,6 +265,27 @@ typedef struct _meshtastic_ModuleConfig_CannedMessageConfig {
     bool send_bell;
 } meshtastic_ModuleConfig_CannedMessageConfig;
 
+/* A GPIO pin definition for remote hardware module */
+typedef struct _meshtastic_RemoteHardwarePin {
+    /* GPIO Pin number (must match Arduino) */
+    uint8_t gpio_pin;
+    /* Name for the GPIO pin (i.e. Front gate, mailbox, etc) */
+    char name[15];
+    /* Type of GPIO access available to consumers on the mesh */
+    meshtastic_RemoteHardwarePinType type;
+} meshtastic_RemoteHardwarePin;
+
+/* RemoteHardwareModule Config */
+typedef struct _meshtastic_ModuleConfig_RemoteHardwareConfig {
+    /* Whether the Module is enabled */
+    bool enabled;
+    /* Whether the Module allows consumers to read / write to pins not defined in available_pins */
+    bool allow_undefined_pin_access;
+    /* Exposes the available pins to the mesh for reading and writing */
+    pb_size_t available_pins_count;
+    meshtastic_RemoteHardwarePin available_pins[4];
+} meshtastic_ModuleConfig_RemoteHardwareConfig;
+
 /* Module Config */
 typedef struct _meshtastic_ModuleConfig {
     pb_size_t which_payload_variant;
@@ -293,6 +317,10 @@ extern "C" {
 #endif
 
 /* Helper constants for enums */
+#define _meshtastic_RemoteHardwarePinType_MIN meshtastic_RemoteHardwarePinType_UNKNOWN
+#define _meshtastic_RemoteHardwarePinType_MAX meshtastic_RemoteHardwarePinType_DIGITAL_WRITE
+#define _meshtastic_RemoteHardwarePinType_ARRAYSIZE ((meshtastic_RemoteHardwarePinType)(meshtastic_RemoteHardwarePinType_DIGITAL_WRITE+1))
+
 #define _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MIN meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_DEFAULT
 #define _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MAX meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B
 #define _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_ARRAYSIZE ((meshtastic_ModuleConfig_AudioConfig_Audio_Baud)(meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B+1))
@@ -325,11 +353,13 @@ extern "C" {
 #define meshtastic_ModuleConfig_CannedMessageConfig_inputbroker_event_ccw_ENUMTYPE meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar
 #define meshtastic_ModuleConfig_CannedMessageConfig_inputbroker_event_press_ENUMTYPE meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar
 
+#define meshtastic_RemoteHardwarePin_type_ENUMTYPE meshtastic_RemoteHardwarePinType
+
 
 /* Initializer values for message structs */
 #define meshtastic_ModuleConfig_init_default     {0, {meshtastic_ModuleConfig_MQTTConfig_init_default}}
 #define meshtastic_ModuleConfig_MQTTConfig_init_default {0, "", "", "", 0, 0, 0, ""}
-#define meshtastic_ModuleConfig_RemoteHardwareConfig_init_default {0}
+#define meshtastic_ModuleConfig_RemoteHardwareConfig_init_default {0, 0, 0, {meshtastic_RemoteHardwarePin_init_default, meshtastic_RemoteHardwarePin_init_default, meshtastic_RemoteHardwarePin_init_default, meshtastic_RemoteHardwarePin_init_default}}
 #define meshtastic_ModuleConfig_AudioConfig_init_default {0, 0, _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MIN, 0, 0, 0, 0}
 #define meshtastic_ModuleConfig_SerialConfig_init_default {0, 0, 0, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Baud_MIN, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MIN}
 #define meshtastic_ModuleConfig_ExternalNotificationConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
@@ -337,9 +367,10 @@ extern "C" {
 #define meshtastic_ModuleConfig_RangeTestConfig_init_default {0, 0, 0}
 #define meshtastic_ModuleConfig_TelemetryConfig_init_default {0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_ModuleConfig_CannedMessageConfig_init_default {0, 0, 0, 0, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, 0, 0, "", 0}
+#define meshtastic_RemoteHardwarePin_init_default {0, "", _meshtastic_RemoteHardwarePinType_MIN}
 #define meshtastic_ModuleConfig_init_zero        {0, {meshtastic_ModuleConfig_MQTTConfig_init_zero}}
 #define meshtastic_ModuleConfig_MQTTConfig_init_zero {0, "", "", "", 0, 0, 0, ""}
-#define meshtastic_ModuleConfig_RemoteHardwareConfig_init_zero {0}
+#define meshtastic_ModuleConfig_RemoteHardwareConfig_init_zero {0, 0, 0, {meshtastic_RemoteHardwarePin_init_zero, meshtastic_RemoteHardwarePin_init_zero, meshtastic_RemoteHardwarePin_init_zero, meshtastic_RemoteHardwarePin_init_zero}}
 #define meshtastic_ModuleConfig_AudioConfig_init_zero {0, 0, _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MIN, 0, 0, 0, 0}
 #define meshtastic_ModuleConfig_SerialConfig_init_zero {0, 0, 0, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Baud_MIN, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MIN}
 #define meshtastic_ModuleConfig_ExternalNotificationConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
@@ -347,6 +378,7 @@ extern "C" {
 #define meshtastic_ModuleConfig_RangeTestConfig_init_zero {0, 0, 0}
 #define meshtastic_ModuleConfig_TelemetryConfig_init_zero {0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_ModuleConfig_CannedMessageConfig_init_zero {0, 0, 0, 0, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, 0, 0, "", 0}
+#define meshtastic_RemoteHardwarePin_init_zero   {0, "", _meshtastic_RemoteHardwarePinType_MIN}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_ModuleConfig_MQTTConfig_enabled_tag 1
@@ -357,7 +389,6 @@ extern "C" {
 #define meshtastic_ModuleConfig_MQTTConfig_json_enabled_tag 6
 #define meshtastic_ModuleConfig_MQTTConfig_tls_enabled_tag 7
 #define meshtastic_ModuleConfig_MQTTConfig_root_tag 8
-#define meshtastic_ModuleConfig_RemoteHardwareConfig_enabled_tag 1
 #define meshtastic_ModuleConfig_AudioConfig_codec2_enabled_tag 1
 #define meshtastic_ModuleConfig_AudioConfig_ptt_pin_tag 2
 #define meshtastic_ModuleConfig_AudioConfig_bitrate_tag 3
@@ -412,6 +443,12 @@ extern "C" {
 #define meshtastic_ModuleConfig_CannedMessageConfig_enabled_tag 9
 #define meshtastic_ModuleConfig_CannedMessageConfig_allow_input_source_tag 10
 #define meshtastic_ModuleConfig_CannedMessageConfig_send_bell_tag 11
+#define meshtastic_RemoteHardwarePin_gpio_pin_tag 1
+#define meshtastic_RemoteHardwarePin_name_tag    2
+#define meshtastic_RemoteHardwarePin_type_tag    3
+#define meshtastic_ModuleConfig_RemoteHardwareConfig_enabled_tag 1
+#define meshtastic_ModuleConfig_RemoteHardwareConfig_allow_undefined_pin_access_tag 2
+#define meshtastic_ModuleConfig_RemoteHardwareConfig_available_pins_tag 3
 #define meshtastic_ModuleConfig_mqtt_tag         1
 #define meshtastic_ModuleConfig_serial_tag       2
 #define meshtastic_ModuleConfig_external_notification_tag 3
@@ -458,9 +495,12 @@ X(a, STATIC,   SINGULAR, STRING,   root,              8)
 #define meshtastic_ModuleConfig_MQTTConfig_DEFAULT NULL
 
 #define meshtastic_ModuleConfig_RemoteHardwareConfig_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, BOOL,     enabled,           1)
+X(a, STATIC,   SINGULAR, BOOL,     enabled,           1) \
+X(a, STATIC,   SINGULAR, BOOL,     allow_undefined_pin_access,   2) \
+X(a, STATIC,   REPEATED, MESSAGE,  available_pins,    3)
 #define meshtastic_ModuleConfig_RemoteHardwareConfig_CALLBACK NULL
 #define meshtastic_ModuleConfig_RemoteHardwareConfig_DEFAULT NULL
+#define meshtastic_ModuleConfig_RemoteHardwareConfig_available_pins_MSGTYPE meshtastic_RemoteHardwarePin
 
 #define meshtastic_ModuleConfig_AudioConfig_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, BOOL,     codec2_enabled,    1) \
@@ -544,6 +584,13 @@ X(a, STATIC,   SINGULAR, BOOL,     send_bell,        11)
 #define meshtastic_ModuleConfig_CannedMessageConfig_CALLBACK NULL
 #define meshtastic_ModuleConfig_CannedMessageConfig_DEFAULT NULL
 
+#define meshtastic_RemoteHardwarePin_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   gpio_pin,          1) \
+X(a, STATIC,   SINGULAR, STRING,   name,              2) \
+X(a, STATIC,   SINGULAR, UENUM,    type,              3)
+#define meshtastic_RemoteHardwarePin_CALLBACK NULL
+#define meshtastic_RemoteHardwarePin_DEFAULT NULL
+
 extern const pb_msgdesc_t meshtastic_ModuleConfig_msg;
 extern const pb_msgdesc_t meshtastic_ModuleConfig_MQTTConfig_msg;
 extern const pb_msgdesc_t meshtastic_ModuleConfig_RemoteHardwareConfig_msg;
@@ -554,6 +601,7 @@ extern const pb_msgdesc_t meshtastic_ModuleConfig_StoreForwardConfig_msg;
 extern const pb_msgdesc_t meshtastic_ModuleConfig_RangeTestConfig_msg;
 extern const pb_msgdesc_t meshtastic_ModuleConfig_TelemetryConfig_msg;
 extern const pb_msgdesc_t meshtastic_ModuleConfig_CannedMessageConfig_msg;
+extern const pb_msgdesc_t meshtastic_RemoteHardwarePin_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_ModuleConfig_fields &meshtastic_ModuleConfig_msg
@@ -566,6 +614,7 @@ extern const pb_msgdesc_t meshtastic_ModuleConfig_CannedMessageConfig_msg;
 #define meshtastic_ModuleConfig_RangeTestConfig_fields &meshtastic_ModuleConfig_RangeTestConfig_msg
 #define meshtastic_ModuleConfig_TelemetryConfig_fields &meshtastic_ModuleConfig_TelemetryConfig_msg
 #define meshtastic_ModuleConfig_CannedMessageConfig_fields &meshtastic_ModuleConfig_CannedMessageConfig_msg
+#define meshtastic_RemoteHardwarePin_fields &meshtastic_RemoteHardwarePin_msg
 
 /* Maximum encoded size of messages (where known) */
 #define meshtastic_ModuleConfig_AudioConfig_size 19
@@ -573,11 +622,12 @@ extern const pb_msgdesc_t meshtastic_ModuleConfig_CannedMessageConfig_msg;
 #define meshtastic_ModuleConfig_ExternalNotificationConfig_size 40
 #define meshtastic_ModuleConfig_MQTTConfig_size  220
 #define meshtastic_ModuleConfig_RangeTestConfig_size 10
-#define meshtastic_ModuleConfig_RemoteHardwareConfig_size 2
+#define meshtastic_ModuleConfig_RemoteHardwareConfig_size 96
 #define meshtastic_ModuleConfig_SerialConfig_size 26
 #define meshtastic_ModuleConfig_StoreForwardConfig_size 22
 #define meshtastic_ModuleConfig_TelemetryConfig_size 26
 #define meshtastic_ModuleConfig_size             223
+#define meshtastic_RemoteHardwarePin_size        21
 
 #ifdef __cplusplus
 } /* extern "C" */

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

@@ -77,9 +77,9 @@ typedef enum _meshtastic_PortNum {
  Maintained by Github user a-f-G-U-C (a Meshtastic contributor)
  Project files at https://github.com/a-f-G-U-C/Meshtastic-ZPS */
     meshtastic_PortNum_ZPS_APP = 68,
-    /* Used to let multiple instances of Linux native applications communicate 
+    /* Used to let multiple instances of Linux native applications communicate
  as if they did using their LoRa chip.
- Maintained by GitHub user GUVWAF. 
+ Maintained by GitHub user GUVWAF.
  Project files at https://github.com/GUVWAF/Meshtasticator */
     meshtastic_PortNum_SIMULATOR_APP = 69,
     /* Provides a traceroute functionality to show the route a packet towards

src/modules/AdminModule.cpp

@@ -50,6 +50,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
     // if handled == false, then let others look at this message also if they want
     bool handled = false;
     assert(r);
+    bool fromOthers = mp.from != 0 && mp.from != nodeDB.getNodeNum();
 
     switch (r->which_payload_variant) {
 
@@ -175,6 +176,14 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
         handleGetDeviceConnectionStatus(mp);
         break;
     }
+    case meshtastic_AdminMessage_get_module_config_response_tag: {
+        LOG_INFO("Client is receiving a get_module_config response.\n");
+        if (fromOthers && r->get_module_config_response.which_payload_variant ==
+                              meshtastic_AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG) {
+            handleGetModuleConfigResponse(mp, r);
+        }
+        break;
+    }
 #ifdef ARCH_PORTDUINO
     case meshtastic_AdminMessage_exit_simulator_tag:
         LOG_INFO("Exiting simulator\n");
@@ -205,6 +214,29 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
     return handled;
 }
 
+void AdminModule::handleGetModuleConfigResponse(const meshtastic_MeshPacket &mp, meshtastic_AdminMessage *r)
+{
+    // Skip if it's disabled or no pins are exposed
+    if (!r->get_module_config_response.payload_variant.remote_hardware.enabled ||
+        !r->get_module_config_response.payload_variant.remote_hardware.available_pins) {
+        LOG_DEBUG("Remote hardware module disabled or no vailable_pins. Skipping...\n");
+        return;
+    }
+    for (uint8_t i = 0; i < devicestate.node_remote_hardware_pins_count; i++) {
+        if (devicestate.node_remote_hardware_pins[i].node_num == 0 || !devicestate.node_remote_hardware_pins[i].has_pin) {
+            continue;
+        }
+        for (uint8_t j = 0; j < sizeof(r->get_module_config_response.payload_variant.remote_hardware.available_pins); j++) {
+            auto availablePin = r->get_module_config_response.payload_variant.remote_hardware.available_pins[j];
+            if (i < devicestate.node_remote_hardware_pins_count) {
+                devicestate.node_remote_hardware_pins[i].node_num = mp.from;
+                devicestate.node_remote_hardware_pins[i].pin = availablePin;
+            }
+            i++;
+        }
+    }
+}
+
 /**
  * Setter methods
  */
@@ -487,6 +519,28 @@ void AdminModule::handleGetModuleConfig(const meshtastic_MeshPacket &req, const
     }
 }
 
+void AdminModule::handleGetNodeRemoteHardwarePins(const meshtastic_MeshPacket &req)
+{
+    meshtastic_AdminMessage r = meshtastic_AdminMessage_init_default;
+    r.which_payload_variant = meshtastic_AdminMessage_get_node_remote_hardware_pins_response_tag;
+    for (uint8_t i = 0; i < devicestate.node_remote_hardware_pins_count; i++) {
+        if (devicestate.node_remote_hardware_pins[i].node_num == 0 || !devicestate.node_remote_hardware_pins[i].has_pin) {
+            continue;
+        }
+        r.get_node_remote_hardware_pins_response.node_remote_hardware_pins[i] = devicestate.node_remote_hardware_pins[i];
+    }
+    for (uint8_t i = 0; i < moduleConfig.remote_hardware.available_pins_count; i++) {
+        if (!moduleConfig.remote_hardware.available_pins[i].gpio_pin) {
+            continue;
+        }
+        meshtastic_NodeRemoteHardwarePin nodePin = meshtastic_NodeRemoteHardwarePin_init_default;
+        nodePin.node_num = nodeDB.getNodeNum();
+        nodePin.pin = moduleConfig.remote_hardware.available_pins[i];
+        r.get_node_remote_hardware_pins_response.node_remote_hardware_pins[i + 12] = nodePin;
+    }
+    myReply = allocDataProtobuf(r);
+}
+
 void AdminModule::handleGetDeviceMetadata(const meshtastic_MeshPacket &req)
 {
     meshtastic_AdminMessage r = meshtastic_AdminMessage_init_default;
@@ -499,9 +553,8 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
 {
     meshtastic_AdminMessage r = meshtastic_AdminMessage_init_default;
 
-    meshtastic_DeviceConnectionStatus conn;
+    meshtastic_DeviceConnectionStatus conn = meshtastic_DeviceConnectionStatus_init_zero;
 
-    conn.wifi = {0};
 #if HAS_WIFI
     conn.has_wifi = true;
     conn.wifi.has_status = true;
@@ -517,11 +570,8 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
         conn.wifi.status.is_mqtt_connected = mqtt && mqtt->connected();
         conn.wifi.status.is_syslog_connected = false; // FIXME wire this up
     }
-#else
-    conn.has_wifi = false;
 #endif
 
-    conn.ethernet = {0};
 #if HAS_ETHERNET
     conn.has_ethernet = true;
     conn.ethernet.has_status = true;
@@ -533,8 +583,6 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
     } else {
         conn.ethernet.status.is_connected = false;
     }
-#else
-    conn.has_ethernet = false;
 #endif
 
 #if HAS_BLUETOOTH

src/modules/AdminModule.h

@@ -26,15 +26,18 @@ class AdminModule : public ProtobufModule<meshtastic_AdminMessage>
     bool hasOpenEditTransaction = false;
 
     void saveChanges(int saveWhat, bool shouldReboot = true);
+
     /**
      * Getters
      */
+    void handleGetModuleConfigResponse(const meshtastic_MeshPacket &req, meshtastic_AdminMessage *p);
     void handleGetOwner(const meshtastic_MeshPacket &req);
     void handleGetConfig(const meshtastic_MeshPacket &req, uint32_t configType);
     void handleGetModuleConfig(const meshtastic_MeshPacket &req, uint32_t configType);
     void handleGetChannel(const meshtastic_MeshPacket &req, uint32_t channelIndex);
     void handleGetDeviceMetadata(const meshtastic_MeshPacket &req);
     void handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &req);
+    void handleGetNodeRemoteHardwarePins(const meshtastic_MeshPacket &req);
     /**
      * Setters
      */

src/modules/ExternalNotificationModule.cpp

@@ -8,6 +8,17 @@
 #include "mesh/generated/meshtastic/rtttl.pb.h"
 #include <Arduino.h>
 
+#include "main.h"
+
+#ifdef RAK4630
+#include <NCP5623.h>
+NCP5623 rgb;
+
+uint8_t red = 0;
+uint8_t green = 0;
+uint8_t blue = 0;
+#endif
+
 #ifndef PIN_BUZZER
 #define PIN_BUZZER false
 #endif
@@ -73,6 +84,15 @@ int32_t ExternalNotificationModule::runOnce()
                 millis()) {
                 getExternal(2) ? setExternalOff(2) : setExternalOn(2);
             }
+#ifdef RAK4630
+            if (rgb_found.type == ScanI2C::NCP5623) {
+                green = (green + 50) % 255;
+                red = abs(red - green) % 255;
+                blue = abs(blue / red) % 255;
+
+                rgb.setColor(red, green, blue);
+            }
+#endif
         }
 
         // now let the PWM buzzer play
@@ -84,6 +104,7 @@ int32_t ExternalNotificationModule::runOnce()
                 rtttl::begin(config.device.buzzer_gpio, rtttlConfig.ringtone);
             }
         }
+
         return 25;
     }
 }
@@ -106,6 +127,11 @@ void ExternalNotificationModule::setExternalOn(uint8_t index)
         digitalWrite(output, (moduleConfig.external_notification.active ? true : false));
         break;
     }
+#ifdef RAK4630
+    if (rgb_found.type == ScanI2C::NCP5623) {
+        rgb.setColor(red, green, blue);
+    }
+#endif
 }
 
 void ExternalNotificationModule::setExternalOff(uint8_t index)
@@ -126,6 +152,15 @@ void ExternalNotificationModule::setExternalOff(uint8_t index)
         digitalWrite(output, (moduleConfig.external_notification.active ? false : true));
         break;
     }
+
+#ifdef RAK4630
+    if (rgb_found.type == ScanI2C::NCP5623) {
+        red = 0;
+        green = 0;
+        blue = 0;
+        rgb.setColor(red, green, blue);
+    }
+#endif
 }
 
 bool ExternalNotificationModule::getExternal(uint8_t index)
@@ -200,6 +235,12 @@ ExternalNotificationModule::ExternalNotificationModule()
                 LOG_INFO("Using Pin %i in PWM mode\n", config.device.buzzer_gpio);
             }
         }
+#ifdef RAK4630
+        if (rgb_found.type == ScanI2C::NCP5623) {
+            rgb.begin();
+            rgb.setCurrent(10);
+        }
+#endif
     } else {
         LOG_INFO("External Notification Module Disabled\n");
         disable();
@@ -300,7 +341,6 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
                     nagCycleCutoff = millis() + moduleConfig.external_notification.output_ms;
                 }
             }
-
             setIntervalFromNow(0); // run once so we know if we should do something
         }
 

src/modules/PositionModule.cpp

@@ -112,8 +112,9 @@ meshtastic_MeshPacket *PositionModule::allocReply()
     if (getRTCQuality() < RTCQualityDevice) {
         LOG_INFO("Stripping time %u from position send\n", p.time);
         p.time = 0;
-    } else
+    } else {
         LOG_INFO("Providing time to mesh %u\n", p.time);
+    }
 
     LOG_INFO("Position reply: time=%i, latI=%i, lonI=-%i\n", p.time, p.latitude_i, p.longitude_i);
 

src/modules/RemoteHardwareModule.cpp

@@ -18,7 +18,7 @@
 static void pinModes(uint64_t mask, uint8_t mode)
 {
     for (uint64_t i = 0; i < NUM_GPIOS; i++) {
-        if (mask & (1 << i)) {
+        if (mask & (1ULL << i)) {
             pinMode(i, mode);
         }
     }
@@ -29,13 +29,10 @@ static uint64_t digitalReads(uint64_t mask)
 {
     uint64_t res = 0;
 
-    // The Arduino docs show to run pinMode(). But, when testing, found it is best not to.
-    // If the line below is uncommented, read will flip the pin to the default of the second
-    // argument in pinModes(), which will make the read turn the PIN "on".
-    // pinModes(mask, INPUT_PULLUP);
+    pinModes(mask, INPUT_PULLUP);
 
     for (uint64_t i = 0; i < NUM_GPIOS; i++) {
-        uint64_t m = 1 << i;
+        uint64_t m = 1ULL << i;
         if (mask & m) {
             if (digitalRead(i)) {
                 res |= m;
@@ -56,7 +53,7 @@ bool RemoteHardwareModule::handleReceivedProtobuf(const meshtastic_MeshPacket &r
 {
     if (moduleConfig.remote_hardware.enabled) {
         auto p = *pptr;
-        LOG_INFO("Received RemoteHardware typ=%d\n", p.type);
+        LOG_INFO("Received RemoteHardware type=%d\n", p.type);
 
         switch (p.type) {
         case meshtastic_HardwareMessage_Type_WRITE_GPIOS:
@@ -64,7 +61,7 @@ bool RemoteHardwareModule::handleReceivedProtobuf(const meshtastic_MeshPacket &r
             screen->print("Write GPIOs\n");
 
             for (uint8_t i = 0; i < NUM_GPIOS; i++) {
-                uint64_t mask = 1 << i;
+                uint64_t mask = 1ULL << i;
                 if (p.gpio_mask & mask) {
                     digitalWrite(i, (p.gpio_value & mask) ? 1 : 0);
                 }

src/modules/ReplyModule.cpp

@@ -8,10 +8,12 @@
 meshtastic_MeshPacket *ReplyModule::allocReply()
 {
     assert(currentRequest); // should always be !NULL
+#ifdef DEBUG_PORT
     auto req = *currentRequest;
     auto &p = req.decoded;
     // The incoming message is in p.payload
     LOG_INFO("Received message from=0x%0x, id=%d, msg=%.*s\n", req.from, req.id, p.payload.size, p.payload.bytes);
+#endif
 
     screen->print("Sending reply\n");
 

src/modules/Telemetry/AirQualityTelemetry.cpp

@@ -59,6 +59,7 @@ int32_t AirQualityTelemetryModule::runOnce()
 bool AirQualityTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
 {
     if (t->which_variant == meshtastic_Telemetry_air_quality_metrics_tag) {
+#ifdef DEBUG_PORT
         const char *sender = getSenderShortName(mp);
 
         LOG_INFO("(Received from %s): pm10_standard=%i, pm25_standard=%i, pm100_standard=%i\n", sender,
@@ -68,7 +69,7 @@ bool AirQualityTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPack
         LOG_INFO("                  | PM1.0(Environmental)=%i, PM2.5(Environmental)=%i, PM10.0(Environmental)=%i\n",
                  t->variant.air_quality_metrics.pm10_environmental, t->variant.air_quality_metrics.pm25_environmental,
                  t->variant.air_quality_metrics.pm100_environmental);
-
+#endif
         // release previous packet before occupying a new spot
         if (lastMeasurementPacket != nullptr)
             packetPool.release(lastMeasurementPacket);

src/modules/Telemetry/DeviceTelemetry.cpp

@@ -31,12 +31,13 @@ int32_t DeviceTelemetryModule::runOnce()
 bool DeviceTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
 {
     if (t->which_variant == meshtastic_Telemetry_device_metrics_tag) {
+#ifdef DEBUG_PORT
         const char *sender = getSenderShortName(mp);
 
         LOG_INFO("(Received from %s): air_util_tx=%f, channel_utilization=%f, battery_level=%i, voltage=%f\n", sender,
                  t->variant.device_metrics.air_util_tx, t->variant.device_metrics.channel_utilization,
                  t->variant.device_metrics.battery_level, t->variant.device_metrics.voltage);
-
+#endif
         nodeDB.updateTelemetry(getFrom(&mp), *t, RX_SRC_RADIO);
     }
     return false; // Let others look at this message also if they want

src/modules/Telemetry/EnvironmentTelemetry.cpp

@@ -52,7 +52,7 @@ SHT31Sensor sht31Sensor;
 
 int32_t EnvironmentTelemetryModule::runOnce()
 {
-    int32_t result = INT32_MAX;
+    uint32_t result = UINT32_MAX;
     /*
         Uncomment the preferences below if you want to use the module
         without having to configure it from the PythonAPI or WebUI.
@@ -98,8 +98,12 @@ int32_t EnvironmentTelemetryModule::runOnce()
         return result;
     } else {
         // if we somehow got to a second run of this module with measurement disabled, then just wait forever
-        if (!moduleConfig.telemetry.environment_measurement_enabled)
-            return result;
+        if (!moduleConfig.telemetry.environment_measurement_enabled) {
+            return disable();
+        } else {
+            if (bme680Sensor.hasSensor())
+                result = bme680Sensor.runTrigger();
+        }
 
         uint32_t now = millis();
         if (((lastSentToMesh == 0) ||
@@ -107,13 +111,14 @@ int32_t EnvironmentTelemetryModule::runOnce()
             airTime->isTxAllowedAirUtil()) {
             sendTelemetry();
             lastSentToMesh = now;
-        } else if (service.isToPhoneQueueEmpty()) {
+        } else if (((lastSentToPhone == 0) || ((now - lastSentToPhone) >= sendToPhoneIntervalMs)) &&
+                   (service.isToPhoneQueueEmpty())) {
             // Just send to phone when it's not our time to send to mesh yet
             // Only send while queue is empty (phone assumed connected)
             sendTelemetry(NODENUM_BROADCAST, true);
         }
     }
-    return sendToPhoneIntervalMs;
+    return min(sendToPhoneIntervalMs, result);
 }
 
 bool EnvironmentTelemetryModule::wantUIFrame()
@@ -183,6 +188,7 @@ void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiSt
 bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
 {
     if (t->which_variant == meshtastic_Telemetry_environment_metrics_tag) {
+#ifdef DEBUG_PORT
         const char *sender = getSenderShortName(mp);
 
         LOG_INFO("(Received from %s): barometric_pressure=%f, current=%f, gas_resistance=%f, relative_humidity=%f, "
@@ -190,7 +196,7 @@ bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPac
                  sender, t->variant.environment_metrics.barometric_pressure, t->variant.environment_metrics.current,
                  t->variant.environment_metrics.gas_resistance, t->variant.environment_metrics.relative_humidity,
                  t->variant.environment_metrics.temperature, t->variant.environment_metrics.voltage);
-
+#endif
         // release previous packet before occupying a new spot
         if (lastMeasurementPacket != nullptr)
             packetPool.release(lastMeasurementPacket);
@@ -204,6 +210,7 @@ bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPac
 bool EnvironmentTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
 {
     meshtastic_Telemetry m;
+    bool valid = false;
     m.time = getTime();
     m.which_variant = meshtastic_Telemetry_environment_metrics_tag;
 
@@ -215,50 +222,52 @@ bool EnvironmentTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
     m.variant.environment_metrics.voltage = 0;
 
     if (sht31Sensor.hasSensor())
-        sht31Sensor.getMetrics(&m);
+        valid = sht31Sensor.getMetrics(&m);
     if (lps22hbSensor.hasSensor())
-        lps22hbSensor.getMetrics(&m);
+        valid = lps22hbSensor.getMetrics(&m);
     if (shtc3Sensor.hasSensor())
-        shtc3Sensor.getMetrics(&m);
+        valid = shtc3Sensor.getMetrics(&m);
     if (bmp280Sensor.hasSensor())
-        bmp280Sensor.getMetrics(&m);
+        valid = bmp280Sensor.getMetrics(&m);
     if (bme280Sensor.hasSensor())
-        bme280Sensor.getMetrics(&m);
+        valid = bme280Sensor.getMetrics(&m);
     if (bme680Sensor.hasSensor())
-        bme680Sensor.getMetrics(&m);
+        valid = bme680Sensor.getMetrics(&m);
     if (mcp9808Sensor.hasSensor())
-        mcp9808Sensor.getMetrics(&m);
+        valid = mcp9808Sensor.getMetrics(&m);
     if (ina219Sensor.hasSensor())
-        ina219Sensor.getMetrics(&m);
+        valid = ina219Sensor.getMetrics(&m);
     if (ina260Sensor.hasSensor())
-        ina260Sensor.getMetrics(&m);
+        valid = ina260Sensor.getMetrics(&m);
 
-    LOG_INFO(
-        "(Sending): barometric_pressure=%f, current=%f, gas_resistance=%f, relative_humidity=%f, temperature=%f, voltage=%f\n",
-        m.variant.environment_metrics.barometric_pressure, m.variant.environment_metrics.current,
-        m.variant.environment_metrics.gas_resistance, m.variant.environment_metrics.relative_humidity,
-        m.variant.environment_metrics.temperature, m.variant.environment_metrics.voltage);
+    if (valid) {
+        LOG_INFO("(Sending): barometric_pressure=%f, current=%f, gas_resistance=%f, relative_humidity=%f, temperature=%f, "
+                 "voltage=%f\n",
+                 m.variant.environment_metrics.barometric_pressure, m.variant.environment_metrics.current,
+                 m.variant.environment_metrics.gas_resistance, m.variant.environment_metrics.relative_humidity,
+                 m.variant.environment_metrics.temperature, m.variant.environment_metrics.voltage);
 
-    sensor_read_error_count = 0;
+        sensor_read_error_count = 0;
 
-    meshtastic_MeshPacket *p = allocDataProtobuf(m);
-    p->to = dest;
-    p->decoded.want_response = false;
-    if (config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR)
-        p->priority = meshtastic_MeshPacket_Priority_RELIABLE;
-    else
-        p->priority = meshtastic_MeshPacket_Priority_MIN;
-    // release previous packet before occupying a new spot
-    if (lastMeasurementPacket != nullptr)
-        packetPool.release(lastMeasurementPacket);
+        meshtastic_MeshPacket *p = allocDataProtobuf(m);
+        p->to = dest;
+        p->decoded.want_response = false;
+        if (config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR)
+            p->priority = meshtastic_MeshPacket_Priority_RELIABLE;
+        else
+            p->priority = meshtastic_MeshPacket_Priority_MIN;
+        // release previous packet before occupying a new spot
+        if (lastMeasurementPacket != nullptr)
+            packetPool.release(lastMeasurementPacket);
 
-    lastMeasurementPacket = packetPool.allocCopy(*p);
-    if (phoneOnly) {
-        LOG_INFO("Sending packet to phone\n");
-        service.sendToPhone(p);
-    } else {
-        LOG_INFO("Sending packet to mesh\n");
-        service.sendToMesh(p, RX_SRC_LOCAL, true);
+        lastMeasurementPacket = packetPool.allocCopy(*p);
+        if (phoneOnly) {
+            LOG_INFO("Sending packet to phone\n");
+            service.sendToPhone(p);
+        } else {
+            LOG_INFO("Sending packet to mesh\n");
+            service.sendToMesh(p, RX_SRC_LOCAL, true);
+        }
     }
-    return true;
+    return valid;
 }

src/modules/Telemetry/EnvironmentTelemetry.h

@@ -39,5 +39,6 @@ class EnvironmentTelemetryModule : private concurrency::OSThread, public Protobu
     meshtastic_MeshPacket *lastMeasurementPacket;
     uint32_t sendToPhoneIntervalMs = SECONDS_IN_MINUTE * 1000; // Send to phone every minute
     uint32_t lastSentToMesh = 0;
+    uint32_t lastSentToPhone = 0;
     uint32_t sensor_read_error_count = 0;
 };

src/modules/Telemetry/Sensor/BME680Sensor.cpp

@@ -6,21 +6,41 @@
 
 BME680Sensor::BME680Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_BME680, "BME680") {}
 
+int32_t BME680Sensor::runTrigger()
+{
+    if (!bme680.run()) {
+        checkStatus("runTrigger");
+    }
+    return 35;
+}
+
 int32_t BME680Sensor::runOnce()
 {
-    LOG_INFO("Init sensor: %s with the BSEC Library\n", sensorName);
+
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
-    bme680.begin(nodeTelemetrySensorsMap[sensorType], Wire);
-    if (bme680.bsecStatus == BSEC_OK) {
-        bme680.setConfig(bsec_config_iaq);
-        loadState();
-        bme680.updateSubscription(sensorList, 13, BSEC_SAMPLE_RATE_LP);
+    if (!bme680.begin(nodeTelemetrySensorsMap[sensorType], Wire))
+        checkStatus("begin");
+
+    if (bme680.status == BSEC_OK) {
         status = 1;
+        if (!bme680.setConfig(bsec_config_iaq)) {
+            checkStatus("setConfig");
+            status = 0;
+        }
+        loadState();
+        if (!bme680.updateSubscription(sensorList, ARRAY_LEN(sensorList), BSEC_SAMPLE_RATE_LP)) {
+            checkStatus("updateSubscription");
+            status = 0;
+        }
+        LOG_INFO("Init sensor: %s with the BSEC Library version %d.%d.%d.%d \n", sensorName, bme680.version.major,
+                 bme680.version.minor, bme680.version.major_bugfix, bme680.version.minor_bugfix);
     } else {
         status = 0;
     }
+    if (status == 0)
+        LOG_DEBUG("BME680Sensor::runOnce: bme680.status %d\n", bme680.status);
 
     return initI2CSensor();
 }
@@ -29,11 +49,13 @@ void BME680Sensor::setup() {}
 
 bool BME680Sensor::getMetrics(meshtastic_Telemetry *measurement)
 {
-    bme680.run();
-    measurement->variant.environment_metrics.temperature = bme680.temperature;
-    measurement->variant.environment_metrics.relative_humidity = bme680.humidity;
-    measurement->variant.environment_metrics.barometric_pressure = bme680.pressure / 100.0F;
-    measurement->variant.environment_metrics.gas_resistance = bme680.gasResistance / 1000.0;
+    if (bme680.getData(BSEC_OUTPUT_RAW_PRESSURE).signal == 0)
+        return false;
+    measurement->variant.environment_metrics.temperature = bme680.getData(BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_TEMPERATURE).signal;
+    measurement->variant.environment_metrics.relative_humidity =
+        bme680.getData(BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY).signal;
+    measurement->variant.environment_metrics.barometric_pressure = bme680.getData(BSEC_OUTPUT_RAW_PRESSURE).signal / 100.0F;
+    measurement->variant.environment_metrics.gas_resistance = bme680.getData(BSEC_OUTPUT_RAW_GAS).signal / 1000.0;
     // Check if we need to save state to filesystem (every STATE_SAVE_PERIOD ms)
     updateState();
     return true;
@@ -62,12 +84,13 @@ void BME680Sensor::updateState()
     bool update = false;
     if (stateUpdateCounter == 0) {
         /* First state update when IAQ accuracy is >= 3 */
-        if (bme680.iaqAccuracy >= 3) {
-            LOG_DEBUG("%s state update IAQ accuracy %u >= 3\n", sensorName, bme680.iaqAccuracy);
+        accuracy = bme680.getData(BSEC_OUTPUT_IAQ).accuracy;
+        if (accuracy >= 3) {
+            LOG_DEBUG("%s state update IAQ accuracy %u >= 3\n", sensorName, accuracy);
             update = true;
             stateUpdateCounter++;
         } else {
-            LOG_DEBUG("%s not updated, IAQ accuracy is %u >= 3\n", sensorName, bme680.iaqAccuracy);
+            LOG_DEBUG("%s not updated, IAQ accuracy is %u >= 3\n", sensorName, accuracy);
         }
     } else {
         /* Update every STATE_SAVE_PERIOD minutes */
@@ -89,10 +112,12 @@ void BME680Sensor::updateState()
             file.flush();
             file.close();
             // brief window of risk here ;-)
-            if (FSCom.exists(bsecConfigFileName) && !FSCom.remove(bsecConfigFileName))
+            if (FSCom.exists(bsecConfigFileName) && !FSCom.remove(bsecConfigFileName)) {
                 LOG_WARN("Can't remove old state file\n");
-            if (!renameFile(filenameTmp.c_str(), bsecConfigFileName))
+            }
+            if (!renameFile(filenameTmp.c_str(), bsecConfigFileName)) {
                 LOG_ERROR("Error: can't rename new state file\n");
+            }
 
         } else {
             LOG_INFO("Can't write %s state (File: %s).\n", sensorName, bsecConfigFileName);
@@ -101,4 +126,17 @@ void BME680Sensor::updateState()
 #else
     LOG_ERROR("ERROR: Filesystem not implemented\n");
 #endif
-}
+}
+
+void BME680Sensor::checkStatus(String functionName)
+{
+    if (bme680.status < BSEC_OK)
+        LOG_ERROR("%s BSEC2 code: %s\n", functionName.c_str(), String(bme680.status).c_str());
+    else if (bme680.status > BSEC_OK)
+        LOG_WARN("%s BSEC2 code: %s\n", functionName.c_str(), String(bme680.status).c_str());
+
+    if (bme680.sensor.status < BME68X_OK)
+        LOG_ERROR("%s BME68X code: %s\n", functionName.c_str(), String(bme680.sensor.status).c_str());
+    else if (bme680.sensor.status > BME68X_OK)
+        LOG_WARN("%s BME68X code: %s\n", functionName.c_str(), String(bme680.sensor.status).c_str());
+}

src/modules/Telemetry/Sensor/BME680Sensor.h

@@ -1,41 +1,38 @@
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
-#include <bsec.h>
+#include <bsec2.h>
 
 #define STATE_SAVE_PERIOD UINT32_C(360 * 60 * 1000) // That's 6 hours worth of millis()
 
-const uint8_t bsec_config_iaq[] = {
-#include <config/generic_33v_3s_4d/bsec_iaq.txt>
-};
+#include "bme680_iaq_33v_3s_4d/bsec_iaq.h"
 
 class BME680Sensor : virtual public TelemetrySensor
 {
   private:
-    Bsec bme680;
+    Bsec2 bme680;
 
   protected:
     virtual void setup() override;
     const char *bsecConfigFileName = "/prefs/bsec.dat";
     uint8_t bsecState[BSEC_MAX_STATE_BLOB_SIZE] = {0};
+    uint8_t accuracy = 0;
     uint16_t stateUpdateCounter = 0;
-    bsec_virtual_sensor_t sensorList[13] = {BSEC_OUTPUT_IAQ,
-                                            BSEC_OUTPUT_STATIC_IAQ,
-                                            BSEC_OUTPUT_CO2_EQUIVALENT,
-                                            BSEC_OUTPUT_BREATH_VOC_EQUIVALENT,
-                                            BSEC_OUTPUT_RAW_TEMPERATURE,
-                                            BSEC_OUTPUT_RAW_PRESSURE,
-                                            BSEC_OUTPUT_RAW_HUMIDITY,
-                                            BSEC_OUTPUT_RAW_GAS,
-                                            BSEC_OUTPUT_STABILIZATION_STATUS,
-                                            BSEC_OUTPUT_RUN_IN_STATUS,
-                                            BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_TEMPERATURE,
-                                            BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY,
-                                            BSEC_OUTPUT_GAS_PERCENTAGE};
+    bsecSensor sensorList[9] = {BSEC_OUTPUT_IAQ,
+                                BSEC_OUTPUT_RAW_TEMPERATURE,
+                                BSEC_OUTPUT_RAW_PRESSURE,
+                                BSEC_OUTPUT_RAW_HUMIDITY,
+                                BSEC_OUTPUT_RAW_GAS,
+                                BSEC_OUTPUT_STABILIZATION_STATUS,
+                                BSEC_OUTPUT_RUN_IN_STATUS,
+                                BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_TEMPERATURE,
+                                BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY};
     void loadState();
     void updateState();
+    void checkStatus(String functionName);
 
   public:
     BME680Sensor();
+    int32_t runTrigger();
     virtual int32_t runOnce() override;
     virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
 };

src/modules/Telemetry/Sensor/bme680_iaq_33v_3s_4d/bsec_iaq.c

@@ -0,0 +1,82 @@
+#include "bsec_iaq.h"
+
+const uint8_t bsec_config_iaq[1974] = {
+    0,   0,   4,   2,   189, 1,   0,   0,   0,   0,   0,   0,   158, 7,   0,   0,   176, 0,   1,   0,   0,   192, 168, 71,  64,
+    49,  119, 76,  0,   0,   97,  69,  0,   0,   97,  69,  137, 65,  0,   191, 205, 204, 204, 190, 0,   0,   64,  191, 225, 122,
+    148, 190, 10,  0,   3,   0,   0,   0,   96,  64,  23,  183, 209, 56,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    0,   205, 204, 204, 189, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   128, 63,  0,   0,   0,   0,   0,   0,   128, 63,
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   128, 63,  0,   0,   0,   0,   0,   0,   128, 63,  0,   0,   0,   0,   0,
+    0,   0,   0,   0,   0,   128, 63,  0,   0,   0,   0,   0,   0,   128, 63,  82,  73,  157, 188, 95,  41,  203, 61,  118, 224,
+    108, 63,  155, 230, 125, 63,  191, 14,  124, 63,  0,   0,   160, 65,  0,   0,   32,  66,  0,   0,   160, 65,  0,   0,   32,
+    66,  0,   0,   32,  66,  0,   0,   160, 65,  0,   0,   32,  66,  0,   0,   160, 65,  8,   0,   2,   0,   236, 81,  133, 66,
+    16,  0,   3,   0,   10,  215, 163, 60,  10,  215, 35,  59,  10,  215, 35,  59,  13,  0,   5,   0,   0,   0,   0,   0,   100,
+    35,  41,  29,  86,  88,  0,   9,   0,   229, 208, 34,  62,  0,   0,   0,   0,   0,   0,   0,   0,   218, 27,  156, 62,  225,
+    11,  67,  64,  0,   0,   160, 64,  0,   0,   0,   0,   0,   0,   0,   0,   94,  75,  72,  189, 93,  254, 159, 64,  66,  62,
+    160, 191, 0,   0,   0,   0,   0,   0,   0,   0,   33,  31,  180, 190, 138, 176, 97,  64,  65,  241, 99,  190, 0,   0,   0,
+    0,   0,   0,   0,   0,   167, 121, 71,  61,  165, 189, 41,  192, 184, 30,  189, 64,  12,  0,   10,  0,   0,   0,   0,   0,
+    0,   0,   0,   0,   13,  5,   11,  0,   1,   1,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,
+    128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128,
+    63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,
+    0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,
+    0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,
+    128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128,
+    63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,
+    0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,
+    0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,
+    128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128,
+    63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,
+    0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,
+    0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,
+    128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128,
+    63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,
+    0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,
+    0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,
+    128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128,
+    63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,
+    0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,
+    0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,
+    128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128,
+    63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,
+    0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,
+    0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,
+    128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128,
+    63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,
+    0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,
+    0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,
+    128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128,
+    63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,
+    0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,
+    0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,
+    128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128,
+    63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,
+    0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,
+    0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,
+    128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128,
+    63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,
+    0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,
+    0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,
+    128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128,
+    63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,
+    0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  10,  10,  4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   128, 63,  0,   0,   128, 63,
+    0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,
+    0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   128, 63,  0,   0,   0,   88,  1,   254,
+    0,   2,   1,   5,   48,  117, 100, 0,   44,  1,   112, 23,  151, 7,   132, 3,   197, 0,   92,  4,   144, 1,   64,  1,   64,
+    1,   144, 1,   48,  117, 48,  117, 48,  117, 48,  117, 100, 0,   100, 0,   100, 0,   48,  117, 48,  117, 48,  117, 100, 0,
+    100, 0,   48,  117, 48,  117, 8,   7,   8,   7,   8,   7,   8,   7,   8,   7,   100, 0,   100, 0,   100, 0,   100, 0,   48,
+    117, 48,  117, 48,  117, 100, 0,   100, 0,   100, 0,   48,  117, 48,  117, 100, 0,   100, 0,   255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 44,  1,   44,  1,   44,  1,   44,  1,   44,  1,   44,  1,   44,  1,   44,  1,   44,  1,   44,  1,   44,
+    1,   44,  1,   44,  1,   44,  1,   255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 112, 23,  112, 23,  112, 23,  112, 23,
+    8,   7,   8,   7,   8,   7,   8,   7,   112, 23,  112, 23,  112, 23,  112, 23,  112, 23,  112, 23,  255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 112, 23,  112, 23,  112, 23,  112, 23,  255, 255, 255, 255,
+    220, 5,   220, 5,   255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 220, 5,   220, 5,   220, 5,   255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 44,  1,   0,   5,   10,  5,
+    0,   2,   0,   10,  0,   30,  0,   5,   0,   5,   0,   5,   0,   5,   0,   5,   0,   5,   0,   64,  1,   100, 0,   100, 0,
+    100, 0,   200, 0,   200, 0,   200, 0,   64,  1,   64,  1,   64,  1,   10,  0,   0,   0,   0,   0,   21,  122, 0,   0};

src/modules/Telemetry/Sensor/bme680_iaq_33v_3s_4d/bsec_iaq.h

@@ -0,0 +1,3 @@
+#include <stdint.h>
+
+extern const uint8_t bsec_config_iaq[1974];

src/modules/TextMessageModule.cpp

@@ -7,8 +7,10 @@ TextMessageModule *textMessageModule;
 
 ProcessMessage TextMessageModule::handleReceived(const meshtastic_MeshPacket &mp)
 {
+#ifdef DEBUG_PORT
     auto &p = mp.decoded;
     LOG_INFO("Received text msg from=0x%0x, id=0x%x, msg=%.*s\n", mp.from, mp.id, p.payload.size, p.payload.bytes);
+#endif
 
     // We only store/display messages destined for us.
     // Keep a copy of the most recent text message.

src/modules/TraceRouteModule.cpp

@@ -47,6 +47,7 @@ void TraceRouteModule::appendMyID(meshtastic_RouteDiscovery *updated)
 
 void TraceRouteModule::printRoute(meshtastic_RouteDiscovery *r, uint32_t origin, uint32_t dest)
 {
+#ifdef DEBUG_PORT
     LOG_INFO("Route traced:\n");
     LOG_INFO("0x%x --> ", origin);
     for (uint8_t i = 0; i < r->route_count; i++) {
@@ -56,6 +57,7 @@ void TraceRouteModule::printRoute(meshtastic_RouteDiscovery *r, uint32_t origin,
         LOG_INFO("0x%x\n", dest);
     else
         LOG_INFO("...\n");
+#endif
 }
 
 meshtastic_MeshPacket *TraceRouteModule::allocReply()

src/modules/WaypointModule.cpp

@@ -7,8 +7,10 @@ WaypointModule *waypointModule;
 
 ProcessMessage WaypointModule::handleReceived(const meshtastic_MeshPacket &mp)
 {
+#ifdef DEBUG_PORT
     auto &p = mp.decoded;
     LOG_INFO("Received waypoint msg from=0x%0x, id=0x%x, msg=%.*s\n", mp.from, mp.id, p.payload.size, p.payload.bytes);
+#endif
 
     // We only store/display messages destined for us.
     // Keep a copy of the most recent text message.

src/modules/esp32/AudioModule.cpp

@@ -195,8 +195,9 @@ int32_t AudioModule::runOnce()
                                        .tx_desc_auto_clear = true,
                                        .fixed_mclk = 0};
             res = i2s_driver_install(I2S_PORT, &i2s_config, 0, NULL);
-            if (res != ESP_OK)
+            if (res != ESP_OK) {
                 LOG_ERROR("Failed to install I2S driver: %d\n", res);
+            }
 
             const i2s_pin_config_t pin_config = {
                 .bck_io_num = moduleConfig.audio.i2s_sck,
@@ -204,12 +205,14 @@ int32_t AudioModule::runOnce()
                 .data_out_num = moduleConfig.audio.i2s_din ? moduleConfig.audio.i2s_din : I2S_PIN_NO_CHANGE,
                 .data_in_num = moduleConfig.audio.i2s_sd ? moduleConfig.audio.i2s_sd : I2S_PIN_NO_CHANGE};
             res = i2s_set_pin(I2S_PORT, &pin_config);
-            if (res != ESP_OK)
+            if (res != ESP_OK) {
                 LOG_ERROR("Failed to set I2S pin config: %d\n", res);
+            }
 
             res = i2s_start(I2S_PORT);
-            if (res != ESP_OK)
+            if (res != ESP_OK) {
                 LOG_ERROR("Failed to start I2S: %d\n", res);
+            }
 
             radio_state = RadioState::rx;
 

src/modules/esp32/RangeTestModule.cpp

@@ -53,7 +53,8 @@ int32_t RangeTestModule::runOnce()
 
             if (moduleConfig.range_test.sender) {
                 LOG_INFO("Initializing Range Test Module -- Sender\n");
-                return (5000); // Sending first message 5 seconds after initilization.
+                started = millis(); // make a note of when we started
+                return (5000);      // Sending first message 5 seconds after initilization.
             } else {
                 LOG_INFO("Initializing Range Test Module -- Receiver\n");
                 return disable();
@@ -77,7 +78,13 @@ int32_t RangeTestModule::runOnce()
                     rangeTestModuleRadio->sendPayload();
                 }
 
-                return (senderHeartbeat);
+                // If we have been running for more than 8 hours, turn module back off
+                if (millis() - started > 28800000) {
+                    LOG_INFO("Range Test Module - Disabling after 8 hours\n");
+                    return disable();
+                } else {
+                    return (senderHeartbeat);
+                }
             } else {
                 return disable();
                 // This thread does not need to run as a receiver

src/modules/esp32/RangeTestModule.h

@@ -9,6 +9,7 @@
 class RangeTestModule : private concurrency::OSThread
 {
     bool firstTime = 1;
+    unsigned long started = 0;
 
   public:
     RangeTestModule();

src/mqtt/MQTT.cpp

@@ -461,8 +461,9 @@ std::string MQTT::downstreamPacketToJson(meshtastic_MeshPacket *mp)
                     msgPayload["current"] = new JSONValue(decoded->variant.environment_metrics.current);
                 }
                 jsonObj["payload"] = new JSONValue(msgPayload);
-            } else
+            } else {
                 LOG_ERROR("Error decoding protobuf for telemetry message!\n");
+            }
         };
         break;
     }
@@ -479,8 +480,9 @@ std::string MQTT::downstreamPacketToJson(meshtastic_MeshPacket *mp)
                 msgPayload["shortname"] = new JSONValue(decoded->short_name);
                 msgPayload["hardware"] = new JSONValue(decoded->hw_model);
                 jsonObj["payload"] = new JSONValue(msgPayload);
-            } else
+            } else {
                 LOG_ERROR("Error decoding protobuf for nodeinfo message!\n");
+            }
         };
         break;
     }
@@ -503,6 +505,15 @@ std::string MQTT::downstreamPacketToJson(meshtastic_MeshPacket *mp)
                 if ((int)decoded->altitude) {
                     msgPayload["altitude"] = new JSONValue((int)decoded->altitude);
                 }
+                if ((int)decoded->ground_speed) {
+                    msgPayload["ground_speed"] = new JSONValue((int)decoded->ground_speed);
+                }
+                if (int(decoded->ground_track)) {
+                    msgPayload["ground_track"] = new JSONValue((int)decoded->ground_track);
+                }
+                if (int(decoded->sats_in_view)) {
+                    msgPayload["sats_in_view"] = new JSONValue((int)decoded->sats_in_view);
+                }
                 jsonObj["payload"] = new JSONValue(msgPayload);
             } else {
                 LOG_ERROR("Error decoding protobuf for position message!\n");

src/platform/esp32/architecture.h

@@ -39,6 +39,9 @@
 #ifndef HAS_CPU_SHUTDOWN
 #define HAS_CPU_SHUTDOWN 1
 #endif
+#ifndef DEFAULT_VREF
+#define DEFAULT_VREF 1100
+#endif
 
 #if defined(HAS_AXP192) || defined(HAS_AXP2101)
 #define HAS_PMU
@@ -132,4 +135,4 @@
 #define RF95_NSS 18
 #endif
 
-#define SERIAL0_RX_GPIO 3 // Always GPIO3 on ESP32
+#define SERIAL0_RX_GPIO 3 // Always GPIO3 on ESP32

src/platform/rp2040/main-rp2040.cpp

@@ -21,10 +21,10 @@ void getMacAddr(uint8_t *dmac)
 {
     pico_unique_board_id_t src;
     pico_get_unique_board_id(&src);
-    dmac[5] = src.id[0];
-    dmac[4] = src.id[1];
-    dmac[3] = src.id[2];
-    dmac[2] = src.id[3];
-    dmac[1] = src.id[4];
-    dmac[0] = src.id[5];
-}
+    dmac[5] = src.id[7];
+    dmac[4] = src.id[6];
+    dmac[3] = src.id[5];
+    dmac[2] = src.id[4];
+    dmac[1] = src.id[3];
+    dmac[0] = src.id[2];
+}

src/power.h

@@ -1,7 +1,10 @@
 #pragma once
 #include "PowerStatus.h"
 #include "concurrency/OSThread.h"
-
+#ifdef ARCH_ESP32
+#include <esp_adc_cal.h>
+#include <soc/adc_channel.h>
+#endif
 /**
  * Per @spattinson
  * MIN_BAT_MILLIVOLTS seems high. Typical 18650 are different chemistry to LiPo, even for LiPos that chart seems a bit off, other
@@ -14,6 +17,10 @@
 
 #define BAT_MILLIVOLTS_FULL 4100
 #define BAT_MILLIVOLTS_EMPTY 3500
+#ifdef BAT_MEASURE_ADC_UNIT
+extern RTC_NOINIT_ATTR uint64_t RTC_reg_b;
+#include "soc/sens_reg.h" // needed for adc pin reset
+#endif
 
 class Power : private concurrency::OSThread
 {
@@ -45,4 +52,4 @@ class Power : private concurrency::OSThread
 #endif
 };
 
-extern Power *power;
+extern Power *power;

src/sleep.cpp

@@ -132,6 +132,7 @@ void initDeepSleep()
       support busted boards, assume button one was pressed wakeButtons = ((uint64_t)1) << buttons.gpios[0];
       */
 
+#ifdef DEBUG_PORT
     // If we booted because our timer ran out or the user pressed reset, send those as fake events
     const char *reason = "reset"; // our best guess
     RESET_REASON hwReason = rtc_get_reset_reason(0);
@@ -150,6 +151,7 @@ void initDeepSleep()
 
     LOG_INFO("Booted, wake cause %d (boot count %d), reset_reason=%s\n", wakeCause, bootCount, reason);
 #endif
+#endif
 }
 
 bool doPreflightSleep()
@@ -309,8 +311,13 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r
     // assert(esp_sleep_enable_uart_wakeup(0) == ESP_OK);
 #endif
 #ifdef BUTTON_PIN
+#if SOC_PM_SUPPORT_EXT_WAKEUP
     esp_sleep_enable_ext0_wakeup((gpio_num_t)(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN),
                                  LOW); // when user presses, this button goes low
+#else
+    esp_sleep_enable_gpio_wakeup();
+    gpio_wakeup_enable((gpio_num_t)BUTTON_PIN, GPIO_INTR_LOW_LEVEL);
+#endif
 #endif
 #if defined(LORA_DIO1) && (LORA_DIO1 != RADIOLIB_NC)
     gpio_wakeup_enable((gpio_num_t)LORA_DIO1, GPIO_INTR_HIGH_LEVEL); // SX126x/SX128x interrupt, active high
@@ -324,23 +331,27 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r
         gpio_wakeup_enable((gpio_num_t)PMU_IRQ, GPIO_INTR_LOW_LEVEL); // pmu irq
 #endif
     auto res = esp_sleep_enable_gpio_wakeup();
-    if (res != ESP_OK)
+    if (res != ESP_OK) {
         LOG_DEBUG("esp_sleep_enable_gpio_wakeup result %d\n", res);
+    }
     assert(res == ESP_OK);
     res = esp_sleep_enable_timer_wakeup(sleepUsec);
-    if (res != ESP_OK)
+    if (res != ESP_OK) {
         LOG_DEBUG("esp_sleep_enable_timer_wakeup result %d\n", res);
+    }
     assert(res == ESP_OK);
     res = esp_light_sleep_start();
-    if (res != ESP_OK)
+    if (res != ESP_OK) {
         LOG_DEBUG("esp_light_sleep_start result %d\n", res);
+    }
     assert(res == ESP_OK);
 
     esp_sleep_wakeup_cause_t cause = esp_sleep_get_wakeup_cause();
 #ifdef BUTTON_PIN
-    if (cause == ESP_SLEEP_WAKEUP_GPIO)
+    if (cause == ESP_SLEEP_WAKEUP_GPIO) {
         LOG_INFO("Exit light sleep gpio: btn=%d\n",
                  !digitalRead(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN));
+    }
 #endif
 
     return cause;

suppressions.txt

@@ -36,6 +36,7 @@ cstyleCast
 // ignore stuff that is not ours
 *:.pio/*
 *:*/libdeps/*
+*:*/generated/*
 noExplicitConstructor:*/mqtt/*
 postfixOperator:*/mqtt/*
 
@@ -44,3 +45,5 @@ missingOverride
 virtualCallInConstructor
 
 passedByValue:*/RedirectablePrint.h
+
+internalAstError:*/CrossPlatformCryptoEngine.cpp

variants/Dongle_nRF52840-pca10059-v1/platformio.ini

@@ -3,6 +3,7 @@ extends = nrf52840_base
 board = nordic_pca10059
 board_level = extra
 build_flags = ${nrf52840_base.build_flags} -Ivariants/Dongle_nRF52840-pca10059-v1 -D NORDIC_PCA10059
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/Dongle_nRF52840-pca10059-v1>
 lib_deps = 
   ${nrf52840_base.lib_deps}

variants/MakePython_nRF52840_eink/platformio.ini

@@ -3,6 +3,7 @@ board_level = extra
 extends = nrf52840_base
 board = nordic_pca10059
 build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_eink -D PRIVATE_HW
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
   -D PIN_EINK_EN
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MakePython_nRF52840_eink>
 lib_deps = 

variants/MakePython_nRF52840_oled/platformio.ini

@@ -3,6 +3,7 @@ board_level = extra
 extends = nrf52840_base
 board = nordic_pca10059
 build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_oled -D PRIVATE_HW
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MakePython_nRF52840_oled>
 lib_deps = 
   ${nrf52840_base.lib_deps}

variants/ai-c3/platformio.ini

@@ -2,7 +2,7 @@
 extends = esp32c3_base
 board = esp32-c3-devkitm-1
 board_level = extra
-build_flags = 
-  ${esp32_base.build_flags}
+build_flags = ${esp32c3_base.build_flags}
   -D PRIVATE_HW
   -I variants/ai-c3
+

variants/ai-c3/variant.h

@@ -1,26 +1,30 @@
-// #define BUTTON_NEED_PULLUP // if set we need to turn on the internal CPU pullup during sleep
+#define SDA 0
+#define SCL 1
+#define I2C_SDA SDA
+#define I2C_SCL SCL
 
-#define I2C_SDA 8
-#define I2C_SCL 9
-
-#define BUTTON_PIN 0
+#define BUTTON_PIN 9 // BOOT button
+#define LED_PIN 30   // RGB LED
 
 #define USE_RF95
-#undef RF95_SCK
 #define RF95_SCK 4
-#undef RF95_MISO
 #define RF95_MISO 5
-#undef RF95_MOSI
 #define RF95_MOSI 6
-#undef RF95_NSS
 #define RF95_NSS 7
 
-#define LORA_DIO0 10 // a No connect on the SX1262 module
-#define LORA_DIO1 3  // a No connect on the SX1262 module
+#define LORA_DIO0 10
+#define LORA_DIO1 3
 #define LORA_RESET 2
 
+// WaveShare Core1262-868M
+// https://www.waveshare.com/wiki/Core1262-868M
+#define USE_SX1262
+#define SX126X_CS RF95_NSS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY 10
+#define SX126X_RESET LORA_RESET
+#define SX126X_E22 // use DIO2 as RF switch
+
+#define HAS_GPS 0
 #undef GPS_RX_PIN
 #undef GPS_TX_PIN
-
-#define HAS_SCREEN 0
-#define HAS_GPS 0

variants/diy/dr-dev/variant.h

@@ -2,6 +2,8 @@
 #define HAS_SCREEN 0
 #define I2C_SDA 4
 #define I2C_SCL 5
+#define BATTERY_PIN 34
+#define ADC_CHANNEL ADC1_GPIO34_CHANNEL
 
 // GPS
 #undef GPS_RX_PIN
@@ -67,4 +69,4 @@
 #define USE_SX1262
 //#define USE_SX1268
 //#define USE_LLCC68
-#define SX126X_E22
+#define SX126X_E22

variants/diy/platformio.ini

@@ -11,7 +11,7 @@ build_flags =
   -I variants/diy/v1
 
 ; Meshtastic DIY v1.1 new schematic based on ESP32-WROOM-32 & SX1262/SX1268 modules
-[env:meshtastic-diy-v1.1]
+[env:meshtastic-diy-v1_1]
 extends = esp32_base
 board = esp32doit-devkit-v1
 board_level = extra