Compare commits

...

2 Commits

Author SHA1 Message Date
SQFMI 2705fca5ba
Merge pull request #254 from OlegGirko/fix_esp32_compat
Improve portability between different versions of Arduino-ESP32.
2024-07-03 12:24:05 -04:00
Oleg Girko 74b38547fe Improve portability between different versions of Arduino-ESP32.
The BLECharacteristic::getValue() method returns std::string in
older versions of Arduino core for the ESP32 and String in newer
versions.

However, the return value is used in a way that both classes support:
using only length() and c_str() methods.

Hence, replacing explicit type name with auto keyword makes the code
compatible with older and newer versions.

Signed-off-by: Oleg Girko <ol@infoserver.lv>
2024-07-03 16:58:35 +01:00
1 changed files with 2 additions and 2 deletions

View File

@ -38,7 +38,7 @@ public:
};
void otaCallback::onWrite(BLECharacteristic *pCharacteristic) {
String rxData = pCharacteristic->getValue();
auto rxData = pCharacteristic->getValue();
if (!updateFlag) { // If it's the first packet of OTA since bootup, begin OTA
// Serial.println("Begin FW Update");
esp_ota_begin(esp_ota_get_next_update_partition(NULL), OTA_SIZE_UNKNOWN,
@ -127,4 +127,4 @@ bool BLE::begin(const char *localName = "Watchy BLE OTA") {
int BLE::updateStatus() { return status; }
int BLE::howManyBytes() { return bytesReceived; }
int BLE::howManyBytes() { return bytesReceived; }