Skip to content

Forward-port master-only fixes to develop#10779

Merged
thebentern merged 6 commits into
developfrom
forward-port-master-fixes
Jun 25, 2026
Merged

Forward-port master-only fixes to develop#10779
thebentern merged 6 commits into
developfrom
forward-port-master-fixes

Conversation

@thebentern

@thebentern thebentern commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

Several fixes and config additions landed directly on master (release line) but were never forward-ported to develop, so they'd be lost when develop next replaces master. This cherry-picks them (with -x provenance, original authors preserved, no squashing).

Commits

Verified excluded (not missing / develop is ahead)

Builds/tests validated by CI on this PR.

thebentern and others added 5 commits June 24, 2026 16:49
…10642)

* Enhance RTC handling with unit test support for system time fallback

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
(cherry picked from commit c7f17a8)
configs for raspberry pi and luckfox lyra zero

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
(cherry picked from commit bfc206a)
…a/Nebra Hat Configs (#10644)

* rebased to master

* Update bin/config.d/lora-ZebraHat_2W.yaml

Co-authored-by: Austin <vidplace7@gmail.com>

* Update bin/config.d/lora-ZebraHat_1W.yaml

Co-authored-by: Austin <vidplace7@gmail.com>

* Update bin/config.d/lora-NebraHat_2W.yaml

Co-authored-by: Austin <vidplace7@gmail.com>

* Update bin/config.d/lora-NebraHat_1W.yaml

Co-authored-by: Austin <vidplace7@gmail.com>

* Remove TX_GAIN_LORA configuration line

* Remove TX_GAIN_LORA configuration line

* Comment out TX_GAIN_LORA configuration

* Comment out TX_GAIN_LORA configuration

* Update lora-ok3506-RAK6421-13300-slot1.yaml

* Update lora-ok3506-RAK6421-13300-slot2.yaml

* Update lora-RAK6421-13300-slot1.yaml

* Update lora-RAK6421-13300-slot2.yaml

---------

Co-authored-by: Austin <vidplace7@gmail.com>
(cherry picked from commit a49729e)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
(cherry picked from commit 4044f4a)
(cherry picked from commit 22d08b4)
@github-actions

Copy link
Copy Markdown
Contributor

⚡ Try this PR in the Web Flasher

Note

Building this pull request… the flash button, badges and supported-board
list will appear here automatically once CI finishes.

@github-actions github-actions Bot added the bugfix Pull request that fixes bugs label Jun 24, 2026
@thebentern thebentern merged commit 8e72b16 into develop Jun 25, 2026
78 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

Firmware Size Report

22 targets | vs develop: 18 increased, 4 decreased, net +1,172 (+1.1 KB)

Target Size vs develop
t-deck-tft 3,802,560 📉 -608
picow 1,237,296 📈 +296
pico2w 1,213,332 📈 +264
wio-e5 234,236 📉 -224
rak3312 2,264,080 📈 +176
Show 17 more target(s)
Target Size vs develop
heltec-ht62-esp32c3-sx1262 2,126,304 📈 +160
heltec-v3 2,255,360 📈 +144
heltec-v4 2,267,760 📈 +144
heltec-vision-master-e213-inkhud 2,216,272 📈 +144
tlora-c6 2,359,696 📈 +144
t-eth-elite 2,482,016 📈 +128
rak3172 181,984 📉 -124
rak11200 1,852,096 📈 +112
seeed-xiao-s3 2,267,856 📈 +112
elecrow-adv-35-tft 3,407,184 📈 +96
seeed_xiao_rp2040 773,560 📈 +96
rak11310 798,080 📉 -88
pico 775,344 📈 +80
seeed_xiao_rp2350 760,992 📈 +56
pico2 762,824 📈 +32
station-g2 2,258,208 📈 +16
station-g3 2,258,224 📈 +16

Updated for cb1e7c1

@thebentern thebentern deleted the forward-port-master-fixes branch June 25, 2026 10:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugfix Pull request that fixes bugs

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants