pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-03 04:15:53 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

ble software update fixes

Browse Source
This commit is contained in:
geeksville 2020-05-15 10:16:10 -07:00
parent 5ec5248fe4
commit 6961853ed7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/esp32/BluetoothSoftwareUpdate.cpp
View File

@ -40,10 +40,11 @@ class TotalSizeCharacteristic : public CallbackCharacteristic
crc.reset(); crc.reset();
bool canBegin = Update.begin(len); bool canBegin = Update.begin(len);
DEBUG_MSG("Setting update size %u, result %d\n", len, canBegin); DEBUG_MSG("Setting update size %u, result %d\n", len, canBegin);
if (!canBegin) if (!canBegin) {
// Indicate failure by forcing the size to 0 // Indicate failure by forcing the size to 0
c->setValue(0UL); uint32_t zero = 0;
else { c->setValue(zero);
} else {
// This totally breaks abstraction to up up into the app layer for this, but quick hack to make sure we only // This totally breaks abstraction to up up into the app layer for this, but quick hack to make sure we only
// talk to one service during the sw update. // talk to one service during the sw update.
// DEBUG_MSG("FIXME, crufty shutdown of mesh bluetooth for sw update."); // DEBUG_MSG("FIXME, crufty shutdown of mesh bluetooth for sw update.");
@ -113,12 +114,13 @@ class CRC32Characteristic : public CallbackCharacteristic
rebootAtMsec = millis() + 5000; rebootAtMsec = millis() + 5000;
} else { } else {
DEBUG_MSG("Error Occurred. Error #: %d\n", Update.getError()); DEBUG_MSG("Error Occurred. Error #: %d\n", Update.getError());
if (RadioLibInterface::instance)
RadioLibInterface::instance->startReceive(); // Resume radio
} }
result = Update.getError(); result = Update.getError();
} }
if (RadioLibInterface::instance)
RadioLibInterface::instance->startReceive(); // Resume radio
assert(resultC); assert(resultC);
resultC->setValue(&result, 1); resultC->setValue(&result, 1);
resultC->notify(); resultC->notify();