dandri/MeshCore-mqtt-observer
1
0 Fork 0
mirror of https://github.com/agessaman/MeshCore.git synced 2026-10-23 08:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/ota-branch-switch' into merge/ota-branch-into-observer-firmware-dev

Browse Source 
# Conflicts:
#	.github/workflows/build-observer-firmwares.yml
#	examples/simple_repeater/MyMesh.cpp
#	examples/simple_room_server/MyMesh.cpp
#	src/helpers/ESP32Board.cpp
#	src/helpers/ESP32Board.h
#	test/test_config_serializer/test_config_serializer.cpp
This commit is contained in:
agessaman committed 2026-10-03 15:24:33 -07:00
2 parents 1e23d7c1e4 65d80bc908
commit ee88192acb
17 files changed
+383 -48
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

examples/simple_room_server/MyMesh.cpp
+2 -1
View File
@@ -7,6 +7,7 @@
#if defined(ESP_PLATFORM)
#include <WiFi.h>
#endif
#include <helpers/OtaChannel.h>
#if defined(WITH_MQTT_NEIGHBORS)
#include <helpers/MQTTConnectionPolicy.h> // kSyncedClockEpoch
#endif
@@ -1689,7 +1690,7 @@ void MyMesh::loop() {
}
char ota_reply[160];
if (may_flash && !_cli.getBoard()->otaFromManifest(getFirmwareVer(), false, ota_reply)) {
if (may_flash && !_cli.getBoard()->otaFromManifest(ota_resolve_base(_prefs.ota_channel), getFirmwareVer(), false, ota_reply)) {
Serial.print("OTA: aborted - "); Serial.println(ota_reply);
may_flash = false;
}