feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed irgendwas with timezones

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-11-21 03:55:37 +01:00
parent f9083d44b4
commit 33d273bbad
9 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/espchrono

Submodule components/espchrono updated: 4d2e9305dc...1955671291

6
main/displays/menus/timesettingsmenu.cpp
View File

@@ -1,5 +1,7 @@
#include "timesettingsmenu.h" #include "timesettingsmenu.h"
#include "sdkconfig.h"
// 3rdparty lib includes // 3rdparty lib includes
#include <espchrono.h> #include <espchrono.h>
#include <fmt/core.h> #include <fmt/core.h>
@@ -32,7 +34,11 @@ class CurrentLocalDateTimeText : public virtual espgui::TextInterface
public: public:
std::string text() const override std::string text() const override
{ {
#ifdef CONFIG_ESPCHRONO_SUPPORT_DEFAULT_TIMEZONE
return fmt::format("local: {}", espchrono::toString(espchrono::toDateTime(espchrono::local_clock::now()))); return fmt::format("local: {}", espchrono::toString(espchrono::toDateTime(espchrono::local_clock::now())));
#else
return "TODO";
#endif
} }
}; };

1
main/ledstrip.h
View File

@@ -7,7 +7,6 @@
#include <FastLED.h> #include <FastLED.h>
#ifdef FEATURE_LEDSTRIP #ifdef FEATURE_LEDSTRIP
#define crgb_iterator __gnu_cxx::__normal_iterator<CRGB *, std::vector<CRGB>>
enum Bobbycar_Side enum Bobbycar_Side
{ {
FRONT_RIGHT, FRONT_RIGHT,

16
main/time_bobbycar.cpp
View File

@@ -10,6 +10,22 @@
// 3rdparty lib includes // 3rdparty lib includes
#include <espstrutils.h> #include <espstrutils.h>
// local includes
#include "globals.h"
espchrono::time_zone get_default_timezone() noexcept
{
using namespace espchrono;
return time_zone{minutes32{settings.timeSettings.timezoneOffset}, settings.timeSettings.daylightSavingMode};
}
#ifdef CONFIG_ESPCHRONO_SUPPORT_DEFAULT_TIMEZONE
espchrono::time_zone espchrono::get_default_timezone() noexcept
{
return ::get_default_timezone();
}
#endif
namespace { namespace {
constexpr const char * const TAG = "BOBBYTIME"; constexpr const char * const TAG = "BOBBYTIME";
} // namespace } // namespace

10
main/time_bobbycar.h
View File

@@ -1,15 +1,11 @@
#pragma once #pragma once
#include "sdkconfig.h"
// 3rdparty lib includes // 3rdparty lib includes
#include <espchrono.h> #include <espchrono.h>
// local includes espchrono::time_zone get_default_timezone() noexcept;
#include "globals.h"
auto espchrono::local_clock::timezone() noexcept -> time_zone
{
return time_zone{minutes32{settings.timeSettings.timezoneOffset}, settings.timeSettings.daylightSavingMode};
}
#ifdef FEATURE_NTP #ifdef FEATURE_NTP
void initTime(); void initTime();

6
sdkconfig_comred
View File

@@ -180,6 +180,12 @@ CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP_INFO=y
CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP=3 CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP=3
# end of Simple Async HTTP Request # end of Simple Async HTTP Request
#
# espchrono Configuration
#
# CONFIG_ESPCHRONO_SUPPORT_DEFAULT_TIMEZONE is not set
# end of espchrono Configuration
# #
# ESP Config lib settings # ESP Config lib settings
# #

6
sdkconfig_feedc0de
View File

@@ -180,6 +180,12 @@ CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP_INFO=y
CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP=3 CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP=3
# end of Simple Async HTTP Request # end of Simple Async HTTP Request
#
# espchrono Configuration
#
CONFIG_ESPCHRONO_SUPPORT_DEFAULT_TIMEZONE=y
# end of espchrono Configuration
# #
# ESP Config lib settings # ESP Config lib settings
# #

6
sdkconfig_mick
View File

@@ -180,6 +180,12 @@ CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP_INFO=y
CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP=3 CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP=3
# end of Simple Async HTTP Request # end of Simple Async HTTP Request
#
# espchrono Configuration
#
CONFIG_ESPCHRONO_SUPPORT_DEFAULT_TIMEZONE=y
# end of espchrono Configuration
# #
# ESP Config lib settings # ESP Config lib settings
# #

6
sdkconfig_peter
View File

@@ -180,6 +180,12 @@ CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP_INFO=y
CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP=3 CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP=3
# end of Simple Async HTTP Request # end of Simple Async HTTP Request
#
# espchrono Configuration
#
CONFIG_ESPCHRONO_SUPPORT_DEFAULT_TIMEZONE=y
# end of espchrono Configuration
# #
# ESP Config lib settings # ESP Config lib settings
# #