diff --git a/CMakeLists.txt b/CMakeLists.txt index ce3a8f2..21c085f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.13) set(CMAKE_C_STANDARD 11) -set(CMAKE_CXX_STANDARD 23) +set(CMAKE_CXX_STANDARD 20) # Initialise pico_sdk from installed location # (note this can come from environment, CMake cache etc) @@ -21,7 +21,7 @@ if (PICO_SDK_VERSION_STRING VERSION_LESS "1.4.0") message(FATAL_ERROR "Raspberry Pi Pico SDK version 1.4.0 (or later) required. Your version is ${PICO_SDK_VERSION_STRING}") endif() -project(abfall VERSION "1.2.2" LANGUAGES C CXX ASM) +project(abfall VERSION "1.1.0" LANGUAGES C CXX ASM) # Initialise the Raspberry Pi Pico SDK pico_sdk_init() diff --git a/src/http_client.cpp b/src/http_client.cpp index 4809783..c899c6c 100644 --- a/src/http_client.cpp +++ b/src/http_client.cpp @@ -49,7 +49,7 @@ std::string HttpClient::retrieveWasteDatesAsCsv() { std::string result(""); - err_t err = httpc_get_file_dns("hornet.brodbeck-online.de", port, "/abfall/abfall.csv", + err_t err = httpc_get_file_dns("beenas.brodbeck-online.de", port, "/abfall/abfall.csv", &m_settings, body_callback, nullptr, nullptr); // If there was an error, return empty result. @@ -75,4 +75,4 @@ std::string HttpClient::retrieveWasteDatesAsCsv() { #endif return result; -} +} \ No newline at end of file diff --git a/src/utils.cpp b/src/utils.cpp index d07a4f4..9c8caf2 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -261,14 +261,11 @@ void add_one_day(datetime_t &dt) { dt.year += 1; dt.month = 1; dt.day = 1; - dt.dotw = (dt.dotw + 1) % 7; } else if (dt.day == daysPerMonth[dt.month]) { dt.month = (dt.month + 1) % 12; dt.day = 1; - dt.dotw = (dt.dotw + 1) % 7; } else { dt.day += 1; - dt.dotw = (dt.dotw + 1) % 7; } } diff --git a/src/ws2812.cpp b/src/ws2812.cpp index d21074b..edf35b7 100644 --- a/src/ws2812.cpp +++ b/src/ws2812.cpp @@ -1,12 +1,10 @@ #include "ws2812.h" -#include - WS2812::WS2812(uint gpio, PIO pio, uint sm) : m_pio{pio}, m_gpio{gpio}, m_sm{sm} { init(); } WS2812::~WS2812() { deinit(); } -void WS2812::switchColor(Color color) { putPixel(std::to_underlying(color)); } +void WS2812::switchColor(Color color) { putPixel(static_cast(color)); } void WS2812::blinkReady() { for (int i = 0; i < 2; i++) {