diff --git a/src/SensorsTask.h b/src/SensorsTask.h index 270e4c8..b5cb9e2 100644 --- a/src/SensorsTask.h +++ b/src/SensorsTask.h @@ -140,7 +140,7 @@ protected: this->initBleNotify = false; // Connect to the remote BLE Server. - BLEAddress bleServerAddress(settings.sensors.indoor.bleAddresss); + BLEAddress bleServerAddress(settings.sensors.indoor.bleAddress); if (!pBleClient->connect(bleServerAddress)) { Log.swarningln(FPSTR(L_SENSORS_BLE), "Failed connecting to device at %s", bleServerAddress.toString().c_str()); return; diff --git a/src/Settings.h b/src/Settings.h index f2046d6..43dfa27 100644 --- a/src/Settings.h +++ b/src/Settings.h @@ -130,7 +130,7 @@ struct Settings { struct { SensorType type = SensorType::MANUAL; byte gpio = DEFAULT_SENSOR_INDOOR_GPIO; - uint8_t bleAddresss[6] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + uint8_t bleAddress[6] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; float offset = 0.0f; } indoor; } sensors; diff --git a/src/utils.h b/src/utils.h index 4876fcc..779c09b 100644 --- a/src/utils.h +++ b/src/utils.h @@ -410,14 +410,14 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) { sprintf( bleAddress, "%02x:%02x:%02x:%02x:%02x:%02x", - src.sensors.indoor.bleAddresss[0], - src.sensors.indoor.bleAddresss[1], - src.sensors.indoor.bleAddresss[2], - src.sensors.indoor.bleAddresss[3], - src.sensors.indoor.bleAddresss[4], - src.sensors.indoor.bleAddresss[5] + src.sensors.indoor.bleAddress[0], + src.sensors.indoor.bleAddress[1], + src.sensors.indoor.bleAddress[2], + src.sensors.indoor.bleAddress[3], + src.sensors.indoor.bleAddress[4], + src.sensors.indoor.bleAddress[5] ); - dst["sensors"]["indoor"]["bleAddresss"] = String(bleAddress); + dst["sensors"]["indoor"]["bleAddress"] = String(bleAddress); dst["sensors"]["indoor"]["offset"] = roundd(src.sensors.indoor.offset, 2); if (!safe) { @@ -1250,13 +1250,13 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false } #if USE_BLE - if (!src["sensors"]["indoor"]["bleAddresss"].isNull()) { - String value = src["sensors"]["indoor"]["bleAddresss"].as(); + if (!src["sensors"]["indoor"]["bleAddress"].isNull()) { + String value = src["sensors"]["indoor"]["bleAddress"].as(); int tmp[6]; if(sscanf(value.c_str(), "%02x:%02x:%02x:%02x:%02x:%02x", &tmp[0], &tmp[1], &tmp[2], &tmp[3], &tmp[4], &tmp[5]) == 6) { for(uint8_t i = 0; i < 6; i++) { - if (dst.sensors.indoor.bleAddresss[i] != (uint8_t) tmp[i]) { - dst.sensors.indoor.bleAddresss[i] = (uint8_t) tmp[i]; + if (dst.sensors.indoor.bleAddress[i] != (uint8_t) tmp[i]) { + dst.sensors.indoor.bleAddress[i] = (uint8_t) tmp[i]; changed = true; } }