mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-08-01 17:56:12 +00:00
JakubandClaude Opus 4.8
f5b3213f80
Merge 254 upstream commits. Highlights relevant to the Wio fork: native NRF52 companion power-saving (sleep when !hasPendingWork), preamble 16->32 for SF<9, generic sensor-registration model, CMD_SEND_RAW_PACKET, isEink() display abstraction, KEEP_DISPLAY_ON_USB, contacts-sync/transient fixes. Conflicts resolved (11 files): - buzzer.h/.cpp: keep NRF52 include guard + our begin()->startup(); fold in upstream doc comment. - platformio (wio + eink): keep our slim env layout, add upstream kiss_modem env (+ debug_tool=stlink on eink ble). - GxEPDDisplay.h: take upstream isEink() override. - EnvironmentSensorManager.h: take upstream's wider #if guard. - DataStore.cpp: take upstream saveContacts(filter) signature, keep our ::openWrite (member openWrite would shadow the global 2-arg overload). - main.cpp: keep our watchdog init + add board.onBootComplete(); adopt upstream's `if(!hasPendingWork()) sleep` loop. - MyMesh.h: version -> v1.16-solo.0, build date 6 Jun 2026. - MyMesh.cpp: keep both CMD codes (SCREENSHOT 66 + RAW_PACKET 65), both field inits, both handlers, our screenshot fns + upstream saveContacts/save_filter, upstream hasPendingWork() + our MyMeshBot include. - UITask.cpp: keep our solo splash/clock page/snprintf/buzzer init; merge auto-off (+ opt-in KEEP_DISPLAY_ON_USB); merge low-batt shutdown (our EMA + prefs threshold + upstream's !isExternalPowered() guard and eink-aware delay). Post-merge drift fixes (upstream API/architecture changes, not conflicts): - applyTxPower(): radio_set_tx_power() removed upstream -> radio_driver.setTxPower(). - Sensor refactor dropped the per-sensor *_initialized flags our getAvailableLPPTypes() relied on; removed that override and the SENSORS page now derives available LPP types from the populated sensors_lpp buffer. README kept ours via .gitattributes merge=ours. Builds verified on all 5 Wio envs (dual, eink dual, radio_ble, dual_dev, eink_dual_dev). Not yet hardware-verified. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
83 lines
2.4 KiB
INI
83 lines
2.4 KiB
INI
[WioTrackerL1Eink]
|
|
extends = nrf52_base
|
|
board = seeed-wio-tracker-l1
|
|
board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
|
|
board_upload.maximum_size = 708608
|
|
build_flags = ${nrf52_base.build_flags}
|
|
${sensor_base.build_flags}
|
|
-I lib/nrf52/s140_nrf52_7.3.0_API/include
|
|
-I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52
|
|
-I variants/wio-tracker-l1
|
|
-I examples/companion_radio/ui-new
|
|
-I lib/GxEPD2-patch/src
|
|
-D WIO_TRACKER_L1
|
|
-D WIO_TRACKER_L1_EINK
|
|
-D USE_SX1262
|
|
-D RADIO_CLASS=CustomSX1262
|
|
-D WRAPPER_CLASS=CustomSX1262Wrapper
|
|
-D LORA_TX_POWER=22
|
|
-D SX126X_CURRENT_LIMIT=140
|
|
-D SX126X_RX_BOOSTED_GAIN=1
|
|
-D EINK_DISPLAY_MODEL=GxEPD2_213_B74
|
|
-D DISPLAY_ROTATION=1
|
|
-D GPS_BAUD_RATE=9600
|
|
-D ENV_PIN_SDA=PIN_WIRE1_SDA
|
|
-D ENV_PIN_SCL=PIN_WIRE1_SCL
|
|
-D DISABLE_DIAGNOSTIC_OUTPUT
|
|
-D AUTO_OFF_MILLIS=0
|
|
-D MAX_CONTACTS=350
|
|
-D MAX_GROUP_CHANNELS=40
|
|
-D OFFLINE_QUEUE_SIZE=256
|
|
-D DISPLAY_CLASS=GxEPDDisplay
|
|
-D UI_HAS_JOYSTICK=1
|
|
-D UI_HAS_JOYSTICK_UPDOWN=1
|
|
-D PIN_BUZZER=12
|
|
-D QSPIFLASH=1
|
|
-D FIRMWARE_SOLO_BUILD=1
|
|
-D MESHCORE_VERSION='"1.15"'
|
|
-D UI_SENSORS_PAGE=1
|
|
-D BLE_PIN_CODE=123456
|
|
build_src_filter = ${nrf52_base.build_src_filter}
|
|
+<WioTrackerL1Board.cpp>
|
|
+<../variants/wio-tracker-l1>
|
|
+<helpers/ui/GxEPDDisplay.cpp>
|
|
+<helpers/ui/MomentaryButton.cpp>
|
|
+<helpers/ui/buzzer.cpp>
|
|
+<helpers/nrf52/SerialBLEInterface.cpp>
|
|
+<helpers/sensors>
|
|
+<../examples/companion_radio/*.cpp>
|
|
+<../examples/companion_radio/ui-new/*.cpp>
|
|
lib_deps = ${nrf52_base.lib_deps}
|
|
${sensor_base.lib_deps}
|
|
adafruit/Adafruit GFX Library @ ^1.12.1
|
|
adafruit/RTClib @ ^2.1.3
|
|
zinggjm/GxEPD2 @ 1.6.2
|
|
bakercp/CRC32 @ ^2.0.0
|
|
densaugeo/base64 @ ~1.4.0
|
|
end2endzone/NonBlockingRTTTL@^1.3.0
|
|
|
|
; BLE only
|
|
[env:WioTrackerL1Eink_companion_radio_ble]
|
|
extends = WioTrackerL1Eink
|
|
extra_scripts = post:create-uf2.py
|
|
debug_tool=stlink
|
|
|
|
; Dual BLE+USB
|
|
[env:WioTrackerL1Eink_companion_dual]
|
|
extends = WioTrackerL1Eink
|
|
build_flags = ${WioTrackerL1Eink.build_flags}
|
|
-D DUAL_SERIAL=1
|
|
extra_scripts = post:create-uf2.py
|
|
|
|
; Dual BLE+USB with screenshot support (development/debug)
|
|
[env:WioTrackerL1Eink_companion_dual_dev]
|
|
extends = WioTrackerL1Eink
|
|
build_flags = ${WioTrackerL1Eink.build_flags}
|
|
-D DUAL_SERIAL=1
|
|
-D ENABLE_SCREENSHOT
|
|
|
|
[env:WioTrackerL1Eink_kiss_modem]
|
|
extends = WioTrackerL1Eink
|
|
build_src_filter = ${WioTrackerL1Eink.build_src_filter}
|
|
+<../examples/kiss_modem/>
|