Renamed to stop conflicting symbol on ESP8266

Author: jeremypoulter

src/app_config.cpp

@@ -47,7 +47,7 @@ String mqtt_vrms;
 String mqtt_announce_topic;
 
 // Time
-String time_zone;
+String timezone;
 
 // 24-bits of Flags
 uint32_t flags;
@@ -86,7 +86,7 @@ ConfigOpt *opts[] =
   new ConfigOptDefenition<String>(sntp_hostname, SNTP_DEFAULT_HOST, "sntp_hostname", "sh"),
 
 // Time
-  new ConfigOptDefenition<String>(time_zone, "", "time_zone", "tz"),
+  new ConfigOptDefenition<String>(timezone, "", "time_zone", "tz"),
 
 // EMONCMS SERVER strings
   new ConfigOptDefenition<String>(emoncms_server, "https://data.openevse.com/emoncms", "emoncms_server", "es"),
@@ -169,7 +169,7 @@ void config_changed(String name)
   DBUGF("%s changed", name.c_str());
 
   if(name == "time_zone") {
-    config_set_timezone(time_zone);
+    config_set_timezone(timezone);
   } else if(name == "flags") {
     divertmode_update((config_divert_enabled() && 1 == config_charge_mode()) ? DIVERT_MODE_ECO : DIVERT_MODE_NORMAL);
     if(mqtt_connected() != config_mqtt_enabled()) {

src/app_config.h

@@ -43,7 +43,7 @@ extern String mqtt_vrms;
 extern String mqtt_announce_topic;
 
 // Time
-extern String time_zone;
+extern String timezone;
 
 // Divert settings
 extern double divert_attack_smoothing_factor;

src/app_config_v1.cpp

@@ -181,8 +181,8 @@ config_load_v1_settings() {
   EEPROM_read_string(EEPROM_SNTP_HOST_START, EEPROM_SNTP_HOST_SIZE, sntp_hostname);
 
   // Timezone
-  EEPROM_read_string(EEPROM_TIME_ZONE_START, EEPROM_TIME_ZONE_SIZE, time_zone);
-  config_set_timezone(time_zone);
+  EEPROM_read_string(EEPROM_TIME_ZONE_START, EEPROM_TIME_ZONE_SIZE, timezone);
+  config_set_timezone(timezone);
 
   EEPROM.end();
 }