From 620a4d77d3473836e3ed10ebf6423f4c2f188f14 Mon Sep 17 00:00:00 2001
From: Eric Duminil <eric.duminil@gmail.com>
Date: Sun, 9 May 2021 00:14:00 +0200
Subject: [PATCH] cfg -> config
---
ampel-firmware/save_config.h | 8 ++++----
generate_ampel_config_h.py | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ampel-firmware/save_config.h b/ampel-firmware/save_config.h
index 8040065..17234df 100644
--- a/ampel-firmware/save_config.h
+++ b/ampel-firmware/save_config.h
@@ -35,8 +35,8 @@ static constexpr char CFG_KEY_WIFI_PASSWORD[] PROGMEM = "wifi_password";
static constexpr char CFG_KEY_WIFI_TIMEOUT[] PROGMEM = "wifi_timeout";
static constexpr char CFG_KEY_AUTO_CALIBRATE_SENSOR[] PROGMEM = "auto_calibrate_sensor";
static constexpr ConfigShapeEntry configShape[] PROGMEM = {
- { Config_Type_String, sizeof(cfg::wifi_ssid)-1, CFG_KEY_WIFI_SSID, cfg::wifi_ssid },
- { Config_Type_Password, sizeof(cfg::wifi_password)-1, CFG_KEY_WIFI_PASSWORD, cfg::wifi_password },
- { Config_Type_UInt, 0, CFG_KEY_WIFI_TIMEOUT, &cfg::wifi_timeout },
- { Config_Type_Bool, 0, CFG_KEY_AUTO_CALIBRATE_SENSOR, &cfg::auto_calibrate_sensor },
+ { Config_Type_String, sizeof(config::wifi_ssid)-1, CFG_KEY_WIFI_SSID, config::wifi_ssid },
+ { Config_Type_Password, sizeof(config::wifi_password)-1, CFG_KEY_WIFI_PASSWORD, config::wifi_password },
+ { Config_Type_UInt, 0, CFG_KEY_WIFI_TIMEOUT, &config::wifi_timeout },
+ { Config_Type_Bool, 0, CFG_KEY_AUTO_CALIBRATE_SENSOR, &config::auto_calibrate_sensor },
};
diff --git a/generate_ampel_config_h.py b/generate_ampel_config_h.py
index 8ed34a7..63164a6 100755
--- a/generate_ampel_config_h.py
+++ b/generate_ampel_config_h.py
@@ -52,8 +52,8 @@ enum ConfigShapeId {""", file=h)
for cfgtype, cfgkey in entries:
print(" { Config_Type_", cfgtype,
- ", sizeof(cfg::" + cfgkey + ")-1" if cfgtype in ('String', 'Password') else ", 0",
+ ", sizeof(config::" + cfgkey + ")-1" if cfgtype in ('String', 'Password') else ", 0",
", CFG_KEY_", cfgkey.upper(),
", ", "" if cfgtype in ('String', 'Password') else "&",
- "cfg::", cfgkey, " },", sep='', file=h)
+ "config::", cfgkey, " },", sep='', file=h)
print("};", file=h)
--
GitLab