mirror
/
meshtastic-firmware
kopia lustrzana https://github.com/meshtastic/firmware
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

WIP - more progress switching to dynamic alloc

pull/6/head
geeksville 2020-02-23 11:46:58 -08:00
rodzic 76100e23eb
commit bf640bec3c
1 zmienionych plików z 11 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

27
lib/BluetoothOTA/src/BluetoothSoftwareUpdate.cpp
Wyświetl plik

@ -56,8 +56,7 @@ public:
} }
}; };
static BLECharacteristic swUpdateResultCharacteristic("5e134862-7411-4424-ac4a-210937432c77", BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_NOTIFY); static BLECharacteristic *resultC;
class CRC32Characteristic : public CallbackCharacteristic class CRC32Characteristic : public CallbackCharacteristic
{ {
@ -96,24 +95,18 @@ public:
} }
result = Update.getError(); result = Update.getError();
} }
swUpdateResultCharacteristic.setValue(&result, 1); assert(resultC);
swUpdateResultCharacteristic.notify(); resultC->setValue(&result, 1);
resultC->notify();
} }
}; };
static TotalSizeCharacteristic swUpdateTotalSizeCharacteristic;
static DataCharacteristic swUpdateDataCharacteristic;
static CRC32Characteristic swUpdateCRC32Characteristic;
void bluetoothRebootCheck() void bluetoothRebootCheck()
{ {
if (rebootAtMsec && millis() > rebootAtMsec) if (rebootAtMsec && millis() > rebootAtMsec)
ESP.restart(); ESP.restart();
} }
/* /*
SoftwareUpdateService UUID cb0b9a0b-a84c-4c0d-bdbb-442e3144ee30 SoftwareUpdateService UUID cb0b9a0b-a84c-4c0d-bdbb-442e3144ee30
@ -130,12 +123,14 @@ BLEService *createUpdateService(BLEServer *server)
// Create the BLE Service // Create the BLE Service
BLEService *service = server->createService("cb0b9a0b-a84c-4c0d-bdbb-442e3144ee30"); BLEService *service = server->createService("cb0b9a0b-a84c-4c0d-bdbb-442e3144ee30");
addWithDesc(service, &swUpdateTotalSizeCharacteristic, "total image size"); resultC = new (btPool) BLECharacteristic("5e134862-7411-4424-ac4a-210937432c77", BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_NOTIFY);
addWithDesc(service, &swUpdateDataCharacteristic, "data");
addWithDesc(service, &swUpdateCRC32Characteristic, "crc32");
addWithDesc(service, &swUpdateResultCharacteristic, "result code");
swUpdateResultCharacteristic.addDescriptor(new (btPool) BLE2902()); // Needed so clients can request notification addWithDesc(service, new (btPool) TotalSizeCharacteristic, "total image size");
addWithDesc(service, new (btPool) DataCharacteristic, "data");
addWithDesc(service, new (btPool) CRC32Characteristic, "crc32");
addWithDesc(service, resultC, "result code");
resultC->addDescriptor(new (btPool) BLE2902()); // Needed so clients can request notification
return service; return service;
} }