Commit Graph

2676 Commits

Author SHA1 Message Date
Nick Dunklee
c7be216f27 fix(sensors): improve sensor initialization and handling to prevent hangs and handle growth
This is a medium-ish refactor to attempt to clean up sensor handling logic both for board stability and future potential growth before the code becomes all spaghetti and meatballs.

I'd be curious to see if anyone running sensors out there that knows how to build and flash MeshCore code could give this a try and see how it behaves. It is working fine on my end on multiple nodes.

PR notes are gigantic because it is a fundamental behavior repair for sensors, so I wanted to over-explain. Also, if it hadn't been mentioned previously, push-back is always welcome. I'm just spending my time trying to clean up / fix / enhance this corner of the firmware, and want to contribute my improvements back to the project.

**Problem:**

Current MeshCore code makes no attempt to see what sensors are actually available on the I2C bus at startup and blindly tries to interact with sensors. This has some very bad side-effects, like if a sensor that is unsupported, or has a weird initialization process, the MeshCore node will just hang at boot and never successfully start up and ostensibly looks bricked, or the INA226 and SHT4X both sharing the same address and the code just silently fighting.

The current implementation also gloms sensor readouts from the MCU and environment sensors onto the same telemetry channel, with some arbitrary exceptions for incrementing channels based on certain behavioral situations. The MCU temperature and external temperature sensors would appear on channel 1, and it wouldn't be possible to tell which sensor the temperature value was coming from.

Per [CayenneLPP](https://github.com/myDevicesIoT/CayenneLPP): *Data Channel: Uniquely identifies each sensor in the device across frames, eg. “indoor sensor”* So this channel division implementation falls inline with what CayenneLPP intended. There are up to 256 channels available. So I tried to model this change in that behavioral style.

**Proposed Improvement:**

This implementation scans the I2C bus for what devices are present, sets each sensor to its own CayenneLPP channel, and keeps MCU telemetry on channel 1 only. So Channel 1 is always "self" and no confusion can result.

Details:
  - Channel 1 is always the MCU and things about it, so you always know that telemetry is from the board itself. Exception is GPS, GPS stays on channel 1 as well since it is "about the board" even though it's a bit gray-area as GPS can often be a secondary chip.
  - Each sensor board is allocated to a dedicated CayenneLPP channel, so if you are reading from that channel, you know the data is from that sensor only. (Sensors emitting more than one of the same type of measurement are exceptions.)
  - `scanI2CBus()` probes addresses 0x08–0x77 with raw `beginTransmission`/`endTransmission`. No sensor library is touched until after this completes. This will prevent sensor-based boot hangs, unknown or unresponsive devices never reach a library init call.
  - Created `SENSOR_TABLE` a compile-time array that is gated by the existing `ENV_INCLUDE_*` macros. A sentinel `{ 0, nullptr, nullptr, nullptr }` at the end keeps the array non-empty regardless of which sensors are enabled, avoiding zero-length array warnings.
  - When `begin()` is called, scan first, then loop: skip if address not detected, skip if `init()` returns 0, otherwise register one ActiveSensor entry per sub-channel.
  - `querySensors()` I replaced the entire #ifdef chain with a 3-line loop.
  - T1000-E has its own T1000SensorManager, so it should be completely unaffected by this change.
  - SHT4X quirky initialization behavior is retained.
  - MLX90614  - git commits around this didn't have any notes as to why it is reporting ambient temperature on a separate channel as well as the object temperature, as the ambient temperature is used internally to compute the object temperature and not really needed for the sensor's purpose - just the same, kept the existing behavior of reporting the ambient temperature one channel above the channel assigned to the sensor
  - All `bool *_initialized` fields are gone, replaced with `ActiveSensor _active_sensors[16]` (query function pointer and sub-channel index) and `_active_sensor_count. SensorDef` lives entirely in the `.cpp` so the header has no dependency on it.
  - Details on the INA226 and SHT4X: both default to address 0x44, the old code had a bug and would have both begin() calls fire and they would just fight each other silently. In the new code, the respective sensor code is only called if the device is actually present, however, if both were present simultaneously, SHT4X comes first in the table and would win, and INA226 would return false and be skipped. The INA226 has 16 possible addresses that are configurable in the hardware itself, so in a potential scenario where both sensors would be present, the person implementing that design could take that into account.
  - BME680 gas resistance will now transmit on the same channel as the rest of BME680 telemetry which is inline with CayenneLPP standards. Coupling this PR with https://github.com/meshcore-dev/MeshCore/pull/2146 streamline the whole sensor telemetry, and with https://github.com/meshcore-dev/MeshCore/pull/2149 will overall improve BME680 handling. The gas resistance sensor actually has a binary library to make it more useful, calibration, accounting for age of sensor, and other improvements, but since that adds more flash consumption, I have omitted that in PRs thus far.
 - RAK12035 and other current upstream dev branch changes integrated.
2026-04-17 22:23:21 -06:00
liamcottle
cfe4b0b9a5 bleuart service stay registered first to prevent gatt cache issues on android when already paired 2026-04-18 14:43:47 +12:00
Liam Cottle
77d737beb9 Merge pull request #2323 from txkbaldlaw/updated-companion-dfu-from-mt
Add support for Companion BLE OTA updates on nRF devices
2026-04-18 12:17:16 +12:00
txkbaldlaw
96a16c238a Additional Update to FAQs regarding Companion OTA 2026-04-17 16:17:12 -05:00
txkbaldlaw
4f9764b1b4 Update FAQ to include Companion OTA DFU updates 2026-04-17 10:56:51 -05:00
Scott Powell
d7a3d41843 Merge branch 'default-scope' into dev 2026-04-17 16:30:19 +10:00
Scott Powell
91f3fa0bdf * CLI: 'region put ...' now defaults to flood allowed 2026-04-17 15:11:10 +10:00
Scott Powell
7cdb056cb3 * CLI: 'region default ...' now auto-creates the region 2026-04-17 15:02:04 +10:00
Scott Powell
77d02e844f * bug fix 2026-04-17 14:38:03 +10:00
Scott Powell
d3ba89c8bb * doco: "region default" 2026-04-17 13:49:57 +10:00
txkbaldlaw
b898e7a04e Add DFU to BLE Stack 2026-04-16 16:04:30 -05:00
Scott Powell
df1e12de3e * Repeater, room server: rule change for sendFloodReply() 2026-04-16 13:22:39 +10:00
Scott Powell
d2fdd6fad4 * companion: FIRMWARE_VER_CODE now bumped to 11 2026-04-15 20:47:17 +10:00
Scott Powell
576e9dfd45 * bug fix 2026-04-15 15:44:22 +10:00
Scott Powell
4131a455a2 * repeater: refactored 'region' CLI commands -> CommonCLI
* room server: added RegionMap, and new CommonCLI wiring, default_scope handling
* sensor: only minimal RegionMap wiring. Still needs work to handle default-scope
2026-04-15 13:32:49 +10:00
Scott Powell
569cfe177a * repeater: default-scope support 2026-04-14 17:51:34 +10:00
Liam Cottle
9f680d1744 Merge pull request #2302 from recrof/patch-2
xiao nrf52 companion usb: Add OFFLINE_QUEUE_SIZE=256
2026-04-14 18:36:50 +12:00
Rastislav Vysoky
bd05eca9f5 Add OFFLINE_QUEUE_SIZE=256 for xiao nrf52 companion usb 2026-04-13 21:09:56 +02:00
Huw Duddy
49221fc159 Merge pull request #2298 from TheMalkavien/fix/waveshare-rp2040-rx-sensitivity
Fixes #2294 : RX path not enabled on Waveshare RP2040
2026-04-14 01:36:26 +10:00
Scott Powell
efdd2b6a6c * companion: simplified the CMD_GET / CMD_SET _DEFAULT_FLOOD_SCOPE 2026-04-13 23:11:21 +10:00
Scott Powell
d131e8ae35 * companion: RegionMap now used in Datastore
* companion: new CMD_SET_DEFAULT_FLOOD_SCOPE
* support for regional builds with DEFAULT_REGION_SCOPE
2026-04-13 21:06:53 +10:00
Liam Cottle
748f9cfdda Merge pull request #2072 from robekl/fix-t1000e-pin-comments
Fix T1000-E pin comments
2026-04-13 02:27:19 +12:00
Liam Cottle
7e4d5f723a Merge pull request #2102 from robekl/docs-gps-output-format
docs: align gps output description with CLI
2026-04-13 01:51:51 +12:00
Liam Cottle
3ff8b17660 Merge pull request #1833 from olanwe/set-wifi-offline-queue-sizes
Set OFFLINE_QUEUE_SIZE=256 for missing WiFi companion environments
2026-04-13 01:41:07 +12:00
liamcottle
7d8d66c3e6 fix compilation error in wifi variants due to not enough ram 2026-04-13 01:03:32 +12:00
Malkavien
8056344b86 fix(waveshare-rp2040): add SX126X_RXEN=17 to restore RX sensitivity
The Waveshare RP2040-LoRa board has an RF switch with two complementary
control lines:
- DIO2 (CTRL)  -- driven automatically by the SX1262 chip: HIGH on TX,
  LOW on RX
- GPIO17 (!CTRL) -- was not configured in MeshCore, so it floated and
  the switch never properly selected the LNA/RX path

Without this pin driven, the RF switch never switches to RX mode,
resulting in completely degraded reception. TX was unaffected because
DIO2 alone is sufficient to activate the TX path.

Adding SX126X_RXEN=17 lets RadioLib drive GPIO17 as the complement of
DIO2, so the switch correctly routes the signal to the LNA on receive.

Reference: https://files.waveshare.com/wiki/RP2040-LoRa/Rp2040-lora-sch.pdf
2026-04-12 14:49:42 +02:00
Scott Powell
6a939ed8f8 * RegionMap: new 'default' region 2026-04-12 22:06:10 +10:00
Liam Cottle
a9de5bfc0c Merge pull request #1612 from weebl2000/default-button-low
Default button polarity to active-LOW across all firmware types
2026-04-12 23:30:28 +12:00
Liam Cottle
612aa66fc8 Merge pull request #2075 from pcmoore/working-ina3221
RFE: allow for INA3221 macro overrides in platform.io files
2026-04-12 22:49:17 +12:00
Liam Cottle
f2b61f1ce5 Merge pull request #1425 from thomasabbott/tcxo_voltage_fix_rp2040
RP2040 Update SX126X_DIO3_TCXO_VOLTAGE to 1.8 V
2026-04-12 22:45:00 +12:00
Liam Cottle
c92cd219d1 Merge pull request #2164 from Snayler/dev
Fix Heltec Wireless Paper battery reading
2026-04-12 21:17:42 +12:00
Snayler
d360931aa7 Merge branch 'meshcore-dev:dev' into dev 2026-04-10 18:31:52 +01:00
Scott Powell
3b32f35288 * Companion: default scope 2026-04-10 17:01:41 +10:00
Liam Cottle
be780491ac Merge pull request #2263 from jirogit/fix/thinknode-m5-wifi-credentials
fix: remove real WiFi credentials from ThinkNode M5 variant
2026-04-06 21:23:40 +12:00
me
d9cfd075a5 fix: remove real WiFi credentials from ThinkNode M5 variant
variants/thinknode_m5/platformio.ini contained actual WiFi SSID and
password credentials (Livebox-633C) committed by mistake. Replaced
with placeholder values consistent with other variants (myssid/mypwd).
2026-04-05 22:50:59 -07:00
Wessel Nieboer
057542625b Fix T1000E press=high 2026-04-04 13:19:13 +02:00
Wessel Nieboer
0a13ac7fc7 Default button polarity to active-LOW across all firmware types
Nearly all LoRa boards use a boot button that pulls to ground when
pressed.
2026-04-04 13:19:13 +02:00
Andy Shinn
fb726e48c2 Allows us to have custom PlatformIO envs and configs (#2234) 2026-04-04 17:34:29 +13:00
Liam Cottle
0afd5a9336 Merge pull request #2244 from jirogit/fix/generic-espnow-advert-name
fix: correct ADVERT_NAME for Generic ESPNow room server (was 'Heltec Room')
2026-04-04 17:24:50 +13:00
Liam Cottle
d04ff17b8c Merge pull request #2243 from jirogit/fix/thinknode-m5-advert-name
fix: correct ADVERT_NAME for ThinkNode M5 (was M2)
2026-04-04 17:23:44 +13:00
jirogit
6769b74df6 fix: correct ADVERT_NAME for Generic ESPNow room server (was 'Heltec Room')
env:Generic_ESPNOW_room_svr was using 'Heltec Room' as ADVERT_NAME,
causing Generic ESPNow room server nodes to advertise with the wrong
device name on the mesh.
2026-04-03 19:08:15 -07:00
jirogit
ce32d91ecb fix: correct ADVERT_NAME for ThinkNode M5 (was M2)
Repeater and Room Server environments in variants/thinknode_m5/platformio.ini
were using 'Thinknode M2' as the ADVERT_NAME, causing M5 nodes to advertise
with the wrong device name on the mesh.

- env:ThinkNode_M5_Repeater: 'Thinknode M2 Repeater' -> 'Thinknode M5 Repeater'
- env:ThinkNode_M5_room_server: 'Thinknode M2 Room Server' -> 'Thinknode M5 Room Server'
2026-04-03 18:55:39 -07:00
KPrivitt
27f732653b Added RAK12035 Soil Moisture and Temperature Sensor (#2223) 2026-04-03 22:54:24 +13:00
ripplebiz
f5c0a7440d Merge pull request #2227 from Quency-D/fix-BME680
Fixed the initialization error of the BME680 sensor.
2026-04-02 15:51:26 +11:00
Liam Cottle
d0450bca99 Merge pull request #2228 from liamcottle/refactor/gat562-mesh-watch
Refactor GAT562 Mesh Watch
2026-04-02 17:19:12 +13:00
Quency-D
2cbe0c0398 Fixed the initialization error of the BME680 sensor. 2026-04-02 10:24:17 +08:00
Liam Cottle
b934daa990 Merge pull request #2007 from khudson/r1neo
Muzi Works R1 Neo support
2026-04-02 00:36:44 +13:00
Liam Cottle
fcad0dc7ed Apply suggestion from @weebl2000
Co-authored-by: Wessel <wessel@weebl.me>
2026-04-02 00:27:58 +13:00
Liam Cottle
8fc9e1736c Apply suggestion from @weebl2000
Co-authored-by: Wessel <wessel@weebl.me>
2026-04-02 00:23:52 +13:00
liamcottle
b37201db89 double press top button to go back on gat562 mesh watch 2026-04-01 21:51:32 +13:00