cfg -> config

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 },
 };

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)