Commit b744b42
committed
merge: observer-firmware-dev into observer-firmware at v1.17.0
The planned wholesale dev -> prod merge at upstream MeshCore 1.17.0. Production
now adopts the dev lineage in full; the two release channels stay separated by
workflow, not by branch content.
Resolution: prod's tree is now identical to observer-firmware-dev. Prod's 23
observer commits were sibling hand-ports of features dev implements more fully
(neighbors, max-active-slots, retain policy, MeshRank routing, SNMP, deferred
OTA), so dev's implementation wins throughout. Verified no prod-only content was
lost: MQTT broker presets are at parity (34 both sides), and the sensor_base
build flags that prod added for Heltec/RAK3112/Xiao S3 WIO are all present.
Three files auto-merged into an inconsistent mix and were forced to dev:
- examples/simple_repeater/MyMesh.h: kept BOTH lineages' WITH_MQTT_NEIGHBORS
blocks, redeclaring neighbor_discover[] and declaring sendAnonRegionsReq()
twice with different return types. Would not have compiled.
- src/helpers/MQTTDefaults.h: duplicate neighbors default assignments (dev
already sets them further down).
- .wt-station-g3-prod: stray tracked build worktree, untracked on dev and
covered by dev's .gitignore '.wt-*/' rule.
Prod's station-g3 OTA hotfix (5000391) hardcoded the production manifest URL
in build_flags; dropped in favour of dev's env, since build.sh already defaults
OTA_MANIFEST_BASE to the production URL when the beta workflow does not override
it. Verified on the built binary.
Channels after this merge:
- observer-firmware -> v1.17.0, tag observer-mqtt-latest, manifest /v
- observer-firmware-dev -> v1.17.0, tag observer-mqtt-beta-latest, manifest /beta/v
The beta workflow now also lives on prod but only triggers on the dev branch.429 files changed
Lines changed: 30519 additions & 3406 deletions
File tree
- .github
- actions/setup-build-environment
- workflows
- .vscode
- boards
- docs
- examples
- companion_radio
- ui-new
- ui-orig
- ui-tiny
- kiss_modem
- simple_repeater
- simple_room_server
- simple_secure_chat
- simple_sensor
- scripts
- src
- helpers
- bridges
- esp32
- ethernet
- RAK13800
- ch390
- nrf52
- radiolib
- sensors
- sim
- stm32
- ui
- test
- mocks
- helpers
- test_config_serializer
- test_kiss_modem
- test_mesh_tables
- test_mqtt_connection_policy
- test_mqtt_lifecycle
- test_mqtt_packet_filter
- test_mqtt_packet_queue_policy
- test_mqtt_payload_builder
- test_mqtt_prefs_atomic_store
- test_mqtt_prefs_codec
- test_mqtt_presets
- test_mqtt_reply_format
- test_mqtt_runtime_buffer_lifecycle
- test_mqtt_topic_router
- test_observer_validation
- test_topic_template
- test_utf8_helpers
- test_webconfig_batch
- test_webconfig_keys
- variants
- ebyte_eora_s3
- gat562_30s_mesh_kit
- gat562_mesh_evb_pro
- gat562_mesh_tracker_pro
- gat562_mesh_watch13
- heltec_ct62
- heltec_e213
- heltec_e290
- heltec_mesh_solar
- heltec_rc32
- heltec_t096
- heltec_t114
- heltec_t190
- heltec_t1
- heltec_tower_v2
- heltec_tracker_v2
- heltec_tracker
- heltec_v2
- heltec_v3
- heltec_v4_r8
- heltec_v4
- heltec_wireless_paper
- ikoka_handheld_nrf
- ikoka_nano_nrf
- ikoka_stick_nrf
- keepteen_lt1
- lilygo_t3s3_sx1276
- lilygo_t3s3
- lilygo_t_impulse_plus
- lilygo_tbeam_1w
- lilygo_tbeam_SX1262
- lilygo_tbeam_SX1276
- lilygo_tbeam_supreme_SX1262
- lilygo_tdeck
- lilygo_techo_card
- lilygo_techo_lite
- lilygo_techo
- lilygo_teth_elite
- lilygo_tlora_v2_1
- m5stack_unit_c6l
- mesh_pocket
- meshadventurer
- meshnology_w12
- meshtiny
- meshtracker_x1
- minewsemi_me25ls01
- muziworks_r1_neo
- nano_g2_ultra
- nibble_screen_connect
- nibble_zero_connect
- promicro
- rak11310
- rak3112
- rak3401
- rak3x72
- rak4631
- rak_wismesh_tag
- rpi_picow
- sensecap_indicator-espnow
- sensecap_solar
- station_g2
- station_g3_esp32
- t1000-e
- tenstar_c3
- thinknode_m1
- thinknode_m2
- thinknode_m3
- thinknode_m5
- thinknode_m6
- thinknode_m7
- thinknode_m9
- tiny_relay
- wio-e5-dev
- wio-e5-mini
- wio-tracker-l1
- xiao_c3
- xiao_c6
- xiao_nrf52
- xiao_rp2040
- xiao_s3_wio
- xiao_s3
- webui
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
29 | | - | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
0 commit comments