From dca662ccab169a1e304fa64f28116ffb07401890 Mon Sep 17 00:00:00 2001 From: Frank Dietrich Date: Sat, 10 Sep 2022 17:34:30 +0200 Subject: [PATCH 1/2] Change byte order of base MAC in the SoftAP SSID. --- src/configServer.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/configServer.cpp b/src/configServer.cpp index aa820fc3..51b61d9b 100644 --- a/src/configServer.cpp +++ b/src/configServer.cpp @@ -39,6 +39,7 @@ #include "utils/https.h" #include "utils/timeutils.h" #include "obsimprov.h" +#include using namespace httpsserver; @@ -764,13 +765,14 @@ static void createImprovServer() { void startServer(ObsConfig *obsConfig) { theObsConfig = obsConfig; - const uint64_t chipid_num = ESP.getEfuseMac(); - String esp_chipid = String((uint16_t)(chipid_num >> 32), HEX); - esp_chipid += String((uint32_t)chipid_num, HEX); - esp_chipid.toUpperCase(); - OBS_ID = "OpenBikeSensor-" + esp_chipid; - OBS_ID_SHORT = "OBS-" + String((uint16_t)(ESP.getEfuseMac() >> 32), HEX); - OBS_ID_SHORT.toUpperCase(); + uint8_t mac[6]; + esp_efuse_mac_get_default(mac); + + char ssid[28]; + snprintf(esp_chipid, sizeof(esp_chipid), "OpenBikeSensor-%02X%02X%02X%02X%02X%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); + + OBS_ID = String(ssid); + OBS_ID_SHORT = "OBS-" + OBS_ID.substring(15,19); displayTest->clear(); displayTest->showTextOnGrid(0, 0, "Ver.:"); From 666e87a4cc162232f14e83cafc473011b49ad5ef Mon Sep 17 00:00:00 2001 From: Frank Dietrich Date: Sat, 10 Sep 2022 18:23:34 +0200 Subject: [PATCH 2/2] Fix typos which lead the build to fail. --- src/configServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configServer.cpp b/src/configServer.cpp index 51b61d9b..93c7a4cc 100644 --- a/src/configServer.cpp +++ b/src/configServer.cpp @@ -769,7 +769,7 @@ void startServer(ObsConfig *obsConfig) { esp_efuse_mac_get_default(mac); char ssid[28]; - snprintf(esp_chipid, sizeof(esp_chipid), "OpenBikeSensor-%02X%02X%02X%02X%02X%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); + snprintf(ssid, sizeof(ssid), "OpenBikeSensor-%02X%02X%02X%02X%02X%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); OBS_ID = String(ssid); OBS_ID_SHORT = "OBS-" + OBS_ID.substring(15,19);