new version 1.2.2

Reviewed-on: #3

CMakeLists.txt

@@ -3,7 +3,7 @@
 cmake_minimum_required(VERSION 3.13)
 
 set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 
 # 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.0.0" LANGUAGES C CXX ASM)
+project(abfall VERSION "1.2.2" LANGUAGES C CXX ASM)
 
 # Initialise the Raspberry Pi Pico SDK
 pico_sdk_init()

src/CMakeLists.txt

@@ -51,7 +51,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     pico_enable_stdio_usb(${CMAKE_PROJECT_NAME} 0)
 else()
     pico_enable_stdio_uart(${CMAKE_PROJECT_NAME} 0)
-    pico_enable_stdio_usb(${CMAKE_PROJECT_NAME} 1)
+    pico_enable_stdio_usb(${CMAKE_PROJECT_NAME} 0)
 endif()  
 
 target_link_libraries(${CMAKE_PROJECT_NAME}

src/abfall.cpp

@@ -1,7 +1,6 @@
 #include <cstdio>
 
 #include <algorithm>
-#include <chrono>
 #include <iostream>
 #include <string>
 
@@ -30,8 +29,8 @@ int main() {
 
 #ifdef DEBUG
     printf("!!! DEBUG mode !!!\n");
-#endif
     printf("Firmware version: %s\n", PROJECT_VERSION);
+#endif
 
     wifi_enable(); // Enable Wifi in order to set time and retrieve data
 
@@ -83,11 +82,12 @@ int main() {
 
         rtc_get_datetime(&dt);
 
-        chrono::year_month_day tomorrowYMD(chrono::year{dt.year},
+        datetime_t tomorrowYMD = dt;
-                                           chrono::month{static_cast<unsigned>(dt.month)},
+        add_one_day(tomorrowYMD);
-                                           chrono::day{static_cast<unsigned>(dt.day + 1)});
+
-        auto it = std::find_if(dates.begin(), dates.end(), [&tomorrowYMD](const WasteDate &date) {
+        auto it = std::find_if(dates.begin(), dates.end(), [&tomorrowYMD](const WasteDate &x) {
-            return date.date == tomorrowYMD;
+            return tomorrowYMD.year == x.date.year && tomorrowYMD.month == x.date.month &&
+                   tomorrowYMD.day == x.date.day;
         });
 
         int8_t hour = isDST(dt) ? dt.hour + 1 : dt.hour;

src/http_client.cpp

@@ -1,6 +1,5 @@
 #include "http_client.h"
 
-#include <iostream>
 #include <memory>
 
 std::unique_ptr<char[]> myBodyBuffer = nullptr;
@@ -50,7 +49,7 @@ std::string HttpClient::retrieveWasteDatesAsCsv() {
 
     std::string result("");
 
-    err_t err = httpc_get_file_dns("beenas.brodbeck-online.de", port, "/abfall/abfall.csv",
+    err_t err = httpc_get_file_dns("hornet.brodbeck-online.de", port, "/abfall/abfall.csv",
                                    &m_settings, body_callback, nullptr, nullptr);
 
     // If there was an error, return empty result.
@@ -72,8 +71,8 @@ std::string HttpClient::retrieveWasteDatesAsCsv() {
     received = false;
 
 #ifdef DEBUG
-    std::cout << result << std::endl;
+    printf("%s", result.c_str());
 #endif
 
     return result;
-}
+}

src/utils.cpp

@@ -1,15 +1,16 @@
 #include "utils.h"
 
+#include <cmath>
+
 #include <algorithm>
 #include <iostream>
 #include <sstream>
 
-#include "pico/sleep.h"
-#include "pico/stdlib.h"
-// #include "stdlib.h"
 #include "hardware/clocks.h"
 #include "hardware/rosc.h"
 #include "hardware/structs/scb.h"
+#include "pico/sleep.h"
+#include "pico/stdlib.h"
 
 using namespace std;
 
@@ -36,17 +37,42 @@ bool isDST(const datetime_t &dt) {
     return previousSunday < 25;
 }
 
-chrono::year_month_day stringToDate(const std::string &dateStr) {
+int8_t calcDotw(int year, int month, int day) {
+    int mon;
+    if (month > 2)
+        mon = month; // for march to december month code is same as month
+    else {
+        mon = (12 + month); // for Jan and Feb, month code will be 13 and 14
+        year--;             // decrease year for month Jan and Feb
+    }
+    int y = year % 100; // last two digit
+    int c = year / 100; // first two digit
+    int w = (day + floor((13 * (mon + 1)) / 5) + y + floor(y / 4) + floor(c / 4) - (2 * c));
+    w = (w % 7) - 1;
+    return w;
+}
+
+datetime_t stringToDate(const std::string &dateStr) {
     istringstream partss(dateStr);
     string day_str, month_str, year_str;
+
     getline(partss, day_str, '.');
     getline(partss, month_str, '.');
     getline(partss, year_str, '.');
+
     int day = atoi(day_str.c_str());
     int month = atoi(month_str.c_str());
     int year = atoi(year_str.c_str());
-    chrono::year_month_day date{chrono::year{year}, chrono::month{(uint)month},
+
-                                chrono::day{(uint)day}};
+    datetime_t date;
+    date.year = year;
+    date.month = month;
+    date.day = day;
+    date.dotw = calcDotw(year, month, day);
+    date.hour = 0;
+    date.min = 0;
+    date.sec = 0;
+
     return date;
 }
 
@@ -83,8 +109,10 @@ std::vector<WasteDate> parseCsv(const std::string &csv) {
 
             // Take existing date or create a new one.
             std::vector<WasteDate>::iterator it;
-            it = std::find_if(wasteDates.begin(), wasteDates.end(),
+            it = std::find_if(wasteDates.begin(), wasteDates.end(), [&date](const WasteDate &x) {
-                              [&date](const WasteDate &x) { return date == x.date; });
+                return date.year == x.date.year && date.month == x.date.month &&
+                       date.day == x.date.day;
+            });
             if (it == wasteDates.end()) {
                 WasteDate wd;
                 wd.date = date;
@@ -213,7 +241,9 @@ void recover_from_sleep(uint scb_orig, uint clock0_orig, uint clock1_orig) {
 }
 
 void perform_sleep(datetime_t &untilDt) {
+#ifdef DEBUG
     printf("Going to sleep...\n");
+#endif
     uart_default_tx_wait_blocking();
 
     sleep_goto_sleep_until(&untilDt, nullptr);
@@ -231,11 +261,14 @@ 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;
     }
 }
 

src/utils.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <chrono>
 #include <string>
 #include <vector>
 
@@ -15,7 +14,7 @@ enum class Waste {
 };
 
 struct WasteDate {
-    std::chrono::year_month_day date;
+    datetime_t date;
     std::vector<Waste> wasteTypes;
 };
 
@@ -33,6 +32,6 @@ void recover_from_sleep(uint scb_orig, uint clock0_orig, uint clock1_orig);
 
 void perform_sleep(datetime_t &untilDt);
 
-//void add_one_day(datetime_t &dt);
+void add_one_day(datetime_t &dt);
 
 void add_one_hour(datetime_t &dt);

src/ws2812.cpp

@@ -1,10 +1,12 @@
 #include "ws2812.h"
 
+#include <utility>
+
 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(static_cast<uint32_t>(color)); }
+void WS2812::switchColor(Color color) { putPixel(std::to_underlying(color)); }
 
 void WS2812::blinkReady() {
     for (int i = 0; i < 2; i++) {