Skip to content

Sync upstream/dev (bb870313) into integration - #63

Merged
marcelverdult merged 27 commits into
integrationfrom
claude/sync-upstream-dev-20261112-cdc32f
Nov 12, 2026
Merged

marcelverdult merged 27 commits into
integrationfrom
claude/sync-upstream-dev-20261112-cdc32f

Conversation

@marcelverdult

Copy link
Copy Markdown
Owner

Merge of upstream/dev bb87031 (24 commits) into integration 5e32b39. Conflicts in CommonCLI.cpp (advert.loc as rows in the step 13 CLI tables, 4 new tests), platformio.ini and run-unit-tests.yml (rak13302 test revert). Details and checks: docs/refactoring/sync-upstream-dev-20261112.md.

Maxwell456 and others added 27 commits November 8, 2026 16:34
Move TimeSeriesData from simple_sensor into src/helpers and drive it with
monotonic uptime, so RTC changes cannot stall recording or break queries.
Keep the old RTCClock* overloads as deprecated for custom sensor sketches.

Record 24h of battery, noise floor, TX/RX airtime % and MCU temperature on
repeaters and answer the existing 0x04 min/max/avg request using the same
format as sensor nodes. No packets are sent by this feature.
REPEATER_HISTORY_SLOTS=0 removes it; default off on STM32/RP2040.

Add native tests for TimeSeriesData and document the request and channels.
…-history

Add min/max/avg history queries to repeaters
…e on Station G2/G3

The probe list was wired only in variants/promicro/target.cpp. It is now the
default list of NmeaGpsDriver when GPS_BAUD_PROBE_LIST is set, so a variant
enables baud autodetection with a build flag alone.

Station G2 and G3 enable it: their Grove UART connector is used with M5Stack
Unit GPS modules, which default to 115200.
…gps-baud-probe-list

GPS: GPS_BAUD_PROBE_LIST as a build flag for any NmeaGpsDriver; enable on Station G2/G3
When the last GPS time check passed but there is no current trusted fix
(e.g. the GPS is asleep between periodic fixes), gps guard showed
"time rej nofix", which reads like a rejection although the clock is fine.
Show "time wait" instead. A real rejection without a trusted fix (GPS time
arriving while fixes are rejected) still shows "rej nofix".
The remote-CLI reply buffers in onPeerDataRecv() (repeater, room server,
sensor) and BaseChatMesh were sized temp[166] for a 5-byte datagram
header plus 161 bytes of reply. But MyMesh::handleCommand() first
reflects a 3-byte correlation prefix (e.g. 'aa|') into the reply, after
which CommonCLI commands may write up to 160 chars + NUL into the
remaining 158 bytes -- overflowing the buffer by 2 bytes (e.g. a full
'regions' listing via exportTo(reply, 160)).

Triggering this remotely crashes the node (observed as an unresponsive
repeater after a prefixed 'regions' query); the 2 out-of-bounds bytes
are a printable region-name character and a NUL.

Size the buffers for the full worst case instead:
5 header + 3 prefix + 160 reply + 1 NUL = 169.

Verified with a host ASan harness reproducing the exact layout:
prefixed 'regions' with a 25-region listing overflowed temp[166]
(BufStream::write, RegionMap.cpp) and now passes clean with temp[169];
unprefixed (serial) path unaffected.
…-buffer-overflow

Fix stack-buffer overflow in CLI reply buffers
…repeater-history"

This reverts commit f678f6a, reversing
changes made to b8ae75d.
Revert "Merge pull request meshcore-dev#3784 from Maxwell456/feature/repeater-his…
companion_radio: rewrite mdns part removing String class
…emoval

gps_guard: remove time alert telemetry
CommonCLI: get/set loc to replace gps advert command
…gps-guard-time-wait

GPS guard: show "time wait" instead of "rej nofix" between fixes
meshcore-dev#3813 removed the telemetry channel for the GPS time alert. Remove the
docs sentence that still described it and the now unused
GpsGuard::getAlertOffset().
…-guard-alert-telemetry

GPS guard: drop leftovers of the alert telemetry channel
Add a 16-byte zeroed tail behind the 100-byte NMEA buffer. MicroNMEA's
fixed-width field skips can read a few bytes past the end of a malformed
sentence; with the tail those reads land on NUL bytes.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…ffer-tail

GPS: stop MicroNMEA reading past the NMEA buffer
fix for mdns string not compiling due to ambiguous overload
Conflicts: CommonCLI.cpp (advert.loc as get/set table rows), platformio.ini and
run-unit-tests.yml (rak13302 test revert 0147165: env and test dir gone).
@marcelverdult
marcelverdult merged commit be73563 into integration Nov 12, 2026
1 check passed
@marcelverdult
marcelverdult deleted the claude/sync-upstream-dev-20261112-cdc32f branch November 12, 2026 18:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants