firmware/src/esp32
Kevin Hester 76269b397f Merge remote-tracking branch 'root/master' into dev1.2
# Conflicts:
#	src/esp32/main-esp32.cpp
#	src/mesh/generated/deviceonly.pb.h
#	src/mesh/generated/mesh.pb.h
2021-03-27 16:44:42 +08:00
..
BluetoothSoftwareUpdate.cpp add reboot message 2021-03-27 10:19:59 +08:00
BluetoothSoftwareUpdate.h add reboot message 2021-03-27 10:19:59 +08:00
CallbackCharacteristic.h unify activity detection in PhoneAPI, turn off BLE API while serial API in use 2020-06-08 16:06:59 -07:00
ESP32CryptoEngine.cpp oops - fix failed text message rx 2021-03-06 14:21:20 +08:00
main-esp32.cpp Merge remote-tracking branch 'root/master' into dev1.2 2021-03-27 16:44:42 +08:00
NimbleSoftwareUpdate.c bug #496 - allow update clients to program SPIFFS region 2020-11-16 08:56:32 +08:00
SimpleAllocator.cpp complete ble ota move 2020-05-14 14:22:11 -07:00
SimpleAllocator.h complete ble ota move 2020-05-14 14:22:11 -07:00