pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-28 18:47:40 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #214 from geeksville/dev

Browse Source 
Dev
This commit is contained in:
Kevin Hester 2020-06-23 15:39:28 -07:00 committed by GitHub
commit 27fdab7c8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/version.sh
View File

@ -1,3 +1,3 @@
export VERSION=0.7.8 export VERSION=0.7.9

1
docs/software/TODO.md
View File

@ -2,6 +2,7 @@
You probably don't care about this section - skip to the next one. You probably don't care about this section - skip to the next one.
- check BLE handle stability across sleep - stress test sleep/wake - btu_init_core calls gatt_init - which assigns handles global
- test BLE software update again - test BLE software update again
- @feh123 Sony Xperia Z1 C6903 running Android 5.1.1 - @feh123 Sony Xperia Z1 C6903 running Android 5.1.1
- first message sent is still doubled for some people - first message sent is still doubled for some people

5
src/esp32/BluetoothSoftwareUpdate.cpp
View File

@ -76,6 +76,7 @@ class DataCharacteristic : public CallbackCharacteristic
crc.update(data, len); crc.update(data, len);
Update.write(data, len); Update.write(data, len);
updateActualSize += len; updateActualSize += len;
powerFSM.trigger(EVENT_RECEIVED_TEXT_MSG); // Not exactly correct, but we want to force the device to not sleep now
} }
}; };
@ -123,9 +124,11 @@ class CRC32Characteristic : public CallbackCharacteristic
void bluetoothRebootCheck() void bluetoothRebootCheck()
{ {
if (rebootAtMsec && millis() > rebootAtMsec) if (rebootAtMsec && millis() > rebootAtMsec) {
DEBUG_MSG("Rebooting for update\n");
ESP.restart(); ESP.restart();
} }
}
/* /*
See bluetooth-api.md See bluetooth-api.md