diff --git a/include/osw_config_keys.h b/include/osw_config_keys.h index 367e6722c..ab19dafee 100644 --- a/include/osw_config_keys.h +++ b/include/osw_config_keys.h @@ -55,6 +55,7 @@ extern OswConfigKeyDropDown dateFormat; extern OswConfigKeyFloat daylightOffset; extern OswConfigKeyBool timeFormat; extern OswConfigKeyShort timeZone; +extern OswConfigKeyShort dualTimeZone; extern OswConfigKeyShort resetDay; #if OSW_PLATFORM_ENVIRONMENT_ACCELEROMETER == 1 extern OswConfigKeyInt stepsPerDay; diff --git a/src/osw_config_keys.cpp b/src/osw_config_keys.cpp index 2e6e7643a..4e9921a0d 100644 --- a/src/osw_config_keys.cpp +++ b/src/osw_config_keys.cpp @@ -61,8 +61,8 @@ OswConfigKeyDropDown dateFormat("e", "Date & Time", "Date format", "mm/dd/yyyy,d OswConfigKeyFloat daylightOffset("f", "Date & Time", "Daylight offset", "Daylight saving time offset in hours (e.g. 0.5 = 30 min)", CONFIG_DAYLIGHTOFFSET); OswConfigKeyBool timeFormat("g", "Date & Time", "Use 24h time format?", nullptr, true); -OswConfigKeyShort timeZone("h", "Date & Time", "Timezone", "Number of offset hours (e.g. 2 = Berlin).", - CONFIG_TIMEZONE); +OswConfigKeyShort timeZone("h", "Date & Time", "Timezone", "Number of offset hours (e.g. 2 = Berlin).", CONFIG_TIMEZONE); +OswConfigKeyShort dualTimeZone("h1", "Date & Time", "Dual Timezone", "Number of offset hours of target country (e.g. 0 = UTC).", 0); OswConfigKeyShort resetDay("r", "Date & Time", "Day of the week", "Choose the day of the week to reset the number of steps (e.g. 1-7 are days, 0 is disabled).", 0); #if OSW_PLATFORM_ENVIRONMENT_ACCELEROMETER == 1 @@ -73,14 +73,14 @@ OswConfigKeyBool stepsHistoryClear("o", "Fitness", "Clear historical days", "In // ...and also here, if you want to load them during boot and make them available in the configuration ui OswConfigKey *oswConfigKeys[] = { - #ifdef OSW_FEATURE_WIFI +#ifdef OSW_FEATURE_WIFI // wifi &OswConfigAllKeys::hostname, &OswConfigAllKeys::wifiSsid, &OswConfigAllKeys::wifiPass, - #ifdef OSW_FEATURE_WIFI_ONBOOT - &OswConfigAllKeys::wifiBootEnabled, - #endif +#ifdef OSW_FEATURE_WIFI_ONBOOT + &OswConfigAllKeys::wifiBootEnabled, +#endif &OswConfigAllKeys::wifiAlwaysNTPEnabled, &OswConfigAllKeys::wifiAutoAP, - #endif +#endif // display &OswConfigAllKeys::settingDisplayTimeout, &OswConfigAllKeys::settingDisplayBrightness, &OswConfigAllKeys::settingDisplayOverlays, &OswConfigAllKeys::settingDisplayOverlaysOnWatchScreen, @@ -94,7 +94,7 @@ OswConfigKey *oswConfigKeys[] = { &OswConfigAllKeys::lightSleepEnabled, // date + time &OswConfigAllKeys::dateFormat, &OswConfigAllKeys::daylightOffset, &OswConfigAllKeys::timeZone, - &OswConfigAllKeys::timeFormat, &OswConfigAllKeys::resetDay, + &OswConfigAllKeys::dualTimeZone, &OswConfigAllKeys::timeFormat, &OswConfigAllKeys::resetDay, // colors &OswConfigAllKeys::themeBackgroundColor, &OswConfigAllKeys::themeBackgroundDimmedColor, &OswConfigAllKeys::themeForegroundColor, &OswConfigAllKeys::themeForegroundDimmedColor,