From 110a1a8a56df57a58c41be117551b6f1914beb79 Mon Sep 17 00:00:00 2001
From: Eric Duminil <eric.duminil@gmail.com>
Date: Sat, 12 Feb 2022 14:00:34 +0100
Subject: [PATCH] Rename
---
ampel-firmware/ampel-firmware.ino | 2 +-
ampel-firmware/mqtt.cpp | 2 +-
ampel-firmware/web_config.cpp | 2 +-
ampel-firmware/web_config.h | 2 +-
ampel-firmware/wifi_util.cpp | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ampel-firmware/ampel-firmware.ino b/ampel-firmware/ampel-firmware.ino
index b72d7f1..749a85b 100644
--- a/ampel-firmware/ampel-firmware.ino
+++ b/ampel-firmware/ampel-firmware.ino
@@ -84,7 +84,7 @@ void wifiConnected() {
void wifiFailed() {
Serial.print(F("WiFi - Could not connect to "));
- Serial.println(config::current_ssid()); //TODO: Rename
+ Serial.println(config::selected_ssid()); //TODO: Rename
led_effects::showKITTWheel(color::red);
}
/*****************************************************************
diff --git a/ampel-firmware/mqtt.cpp b/ampel-firmware/mqtt.cpp
index 2366e38..e300baf 100644
--- a/ampel-firmware/mqtt.cpp
+++ b/ampel-firmware/mqtt.cpp
@@ -201,7 +201,7 @@ namespace mqtt {
char payload[75]; // Should be enough for info json...
const char *json_info_format = PSTR("{\"local_ip\":\"%s\", \"ssid\":\"%s\"}");
- snprintf(payload, sizeof(payload), json_info_format, wifi::local_ip, config::current_ssid());
+ snprintf(payload, sizeof(payload), json_info_format, wifi::local_ip, config::selected_ssid());
mqttClient.publish(info_topic, payload);
}
diff --git a/ampel-firmware/web_config.cpp b/ampel-firmware/web_config.cpp
index 43d767e..b6f3656 100644
--- a/ampel-firmware/web_config.cpp
+++ b/ampel-firmware/web_config.cpp
@@ -286,7 +286,7 @@ namespace web_config {
*/
namespace config {
- char* current_ssid() {
+ char* selected_ssid() {
return web_config::iotWebConf->getWifiSsidParameter()->valueBuffer;
}
diff --git a/ampel-firmware/web_config.h b/ampel-firmware/web_config.h
index 69132fc..2d02e2b 100644
--- a/ampel-firmware/web_config.h
+++ b/ampel-firmware/web_config.h
@@ -10,7 +10,7 @@
#endif
namespace config {
- char* current_ssid();
+ char* selected_ssid();
// Sensor
extern uint16_t &measurement_timestep; // [s] Value between 2 and 1800 (range for SCD30 sensor).
extern uint16_t &altitude_above_sea_level; // [m]
diff --git a/ampel-firmware/wifi_util.cpp b/ampel-firmware/wifi_util.cpp
index 852e208..ddf12a1 100644
--- a/ampel-firmware/wifi_util.cpp
+++ b/ampel-firmware/wifi_util.cpp
@@ -41,7 +41,7 @@ namespace wifi {
Serial.print(F("WiFi - Local IP : "));
Serial.println(wifi::local_ip);
Serial.print(F("WiFi - SSID : "));
- Serial.println(config::current_ssid());
+ Serial.println(config::selected_ssid());
}
void defineCommands() {
--
GitLab