Compare commits

..

11 Commits

Author SHA1 Message Date
Ben Meadors
e2b274bba8 Missed one 2026-01-15 14:10:26 -06:00
Ben Meadors
d07db5a850 Derp 2026-01-15 13:31:27 -06:00
Ben Meadors
72acd8f58d Guards 2026-01-15 13:04:12 -06:00
Ben Meadors
fb4486c74b Guards 2026-01-15 12:05:36 -06:00
Ben Meadors
89be78ef0f Merge branch 'master' into meshtastic-ota 2026-01-15 11:56:02 -06:00
Jake-B
f7a374600c Partition header check for OTA type 2026-01-15 12:37:03 -05:00
Ben Meadors
6574af0551 Trunk fmt 2026-01-14 16:16:38 -06:00
Ben Meadors
16feccec2a Merge remote-tracking branch 'origin/master' into meshtastic-ota 2026-01-14 16:11:53 -06:00
Jake-B
59ca02aca0 OTA protobuf changes 2025-12-27 19:10:26 -05:00
Jake-B
7a5d4ad43c Incorporate ota_hash in AdminMessage protobuf 2025-12-25 12:03:25 -05:00
Jake-B
e93abf85c0 Initial commit of combined BLE and WiFi OTA 2025-12-21 20:38:44 -05:00
4 changed files with 6 additions and 7 deletions

View File

@@ -119,7 +119,7 @@ lib_deps =
[device-ui_base]
lib_deps =
# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
https://github.com/meshtastic/device-ui/archive/3480b731d28b10d73414cf0dd7975bff745de8cf.zip
https://github.com/meshtastic/device-ui/archive/5a870c623a4e9ab7a7abe3d02950536f107d1a31.zip
; Common libs for environmental measurements in telemetry module
[environmental_base]

View File

@@ -50,10 +50,9 @@ int StatusLEDModule::handleStatusUpdate(const meshtastic::Status *arg)
break;
}
case meshtastic::BluetoothStatus::ConnectionState::CONNECTED: {
if (ble_state != connected) {
ble_state = connected;
PAIRING_LED_starttime = millis();
}
ble_state = connected;
PAIRING_LED_starttime = millis();
break;
}
}

View File

@@ -65,7 +65,7 @@ lib_deps =
# renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
# renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
https://github.com/lewisxhe/XPowersLib/archive/v0.3.3.zip
https://github.com/lewisxhe/XPowersLib/archive/v0.3.2.zip
# renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
rweather/Crypto@0.4.0

View File

@@ -28,7 +28,7 @@ lib_deps =
${environmental_extra.lib_deps}
${radiolib_base.lib_deps}
# renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
lewisxhe/XPowersLib@0.3.3
lewisxhe/XPowersLib@0.3.2
# renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
# renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto