More on retrieving and parsing dates.

This commit is contained in:
Martin Brodbeck 2023-01-02 17:24:58 +01:00
parent 10eff684df
commit 861f9af1f9
5 changed files with 127 additions and 9 deletions

View file

@ -17,6 +17,11 @@
"cmake.generator": "Unix Makefiles", "cmake.generator": "Unix Makefiles",
"cortex-debug.openocdPath": "${env:HOME}/pico/openocd/src/openocd", "cortex-debug.openocdPath": "${env:HOME}/pico/openocd/src/openocd",
"files.associations": { "files.associations": {
"string": "cpp" "string": "cpp",
"string_view": "cpp",
"deque": "cpp",
"unordered_map": "cpp",
"vector": "cpp",
"chrono": "cpp"
}, },
} }

View file

@ -34,18 +34,29 @@ int main() {
printf("Attempt %d for retrieving data.\n", i); printf("Attempt %d for retrieving data.\n", i);
csv = client.retrieveWasteDatesAsCsv(); csv = client.retrieveWasteDatesAsCsv();
if (csv.length() > 0) { if (csv.length() > 0) {
printf("Data received!\n");
break; break;
} }
} }
printf("%s\n", csv.c_str());
if (csv.length() == 0) {
printf("Error getting data. Exiting!");
cyw43_arch_deinit();
return 1;
}
char datetime_buf[256]; char datetime_buf[256];
char *datetime_str = &datetime_buf[0]; char *datetime_str = &datetime_buf[0];
datetime_t dt; datetime_t dt;
auto dates = parseCsv(csv);
printf("Number of Dates: %d\n", dates.size());
while (true) { while (true) {
rtc_get_datetime(&dt); rtc_get_datetime(&dt);
datetime_to_str(datetime_str, sizeof(datetime_buf), &dt); datetime_to_str(datetime_str, sizeof(datetime_buf), &dt);
// printf("DateTime: %s\n", datetime_str); // printf("DateTime: %s\n", datetime_str);
led.switchColor(Color::OFF); led.switchColor(Color::OFF);

View file

@ -22,11 +22,10 @@ err_t headers_callback(httpc_state_t *connection, void *arg, struct pbuf *hdr, u
err_t body_callback(void *arg, struct altcp_pcb *conn, struct pbuf *p, err_t err) { err_t body_callback(void *arg, struct altcp_pcb *conn, struct pbuf *p, err_t err) {
bool *test = (bool *)arg; bool *test = (bool *)arg;
printf("..."); //printf("...");
pbuf_copy_partial(p, myBuffer, p->tot_len, 0); pbuf_copy_partial(p, myBuffer, p->tot_len, 0);
// printf("%s", myBuffer); // printf("%s", myBuffer);
// TODO: Parse CSV
*test = true; *test = true;
return ERR_OK; return ERR_OK;
@ -47,13 +46,19 @@ std::string HttpClient::retrieveWasteDatesAsCsv() {
&m_settings, body_callback, &m_received, nullptr); &m_settings, body_callback, &m_received, nullptr);
//printf("Status %d\n", err); //printf("Status %d\n", err);
printf("Waiting for waste dates "); //printf("Waiting for waste dates ");
uint wait_count = 0;
while (m_received == false) { while (m_received == false) {
sleep_ms(100); ++wait_count;
//printf(".");
if (wait_count >= 10) {
return test;
}
sleep_ms(1000);
} }
printf(" received.\n"); //printf(" received.\n");
test.append(myBuffer); test.append(myBuffer);

View file

@ -1,6 +1,85 @@
#include "utils.h" #include "utils.h"
#include <algorithm>
#include <iostream>
#include <sstream>
using std::istringstream;
using std::string; using std::string;
using namespace std::chrono;
std::vector<WasteDate> parseCsv(const std::string &csv) {
istringstream stream(csv);
string line;
std::vector<WasteDate> dates;
// Get rid of the first line
std::getline(stream, line);
while (std::getline(stream, line)) {
string delimiter = ";";
size_t pos = 0;
string token;
uint tokenPos = 0;
while ((pos = line.find(delimiter)) != std::string::npos) {
token = line.substr(0, pos);
// std::cout << token << std::endl;
if (token.length() > 0) {
istringstream liness(token);
string day_str, month_str, year_str;
getline(liness, day_str, '.');
getline(liness, month_str, '.');
getline(liness, year_str, '.');
int day = atoi(day_str.c_str());
int month = atoi(month_str.c_str());
int year = atoi(year_str.c_str());
year_month_day date{std::chrono::year{year}, std::chrono::month{(uint)month},
std::chrono::day{(uint)day}};
std::vector<WasteDate>::iterator it;
WasteDate wd;
it = std::find_if(dates.begin(), dates.end(),
[&date](const WasteDate &x) { return date == x.date; });
if (it == dates.end()) {
wd.date = date;
dates.push_back(wd);
wd = dates.back();
} else {
wd = *it;
}
switch (tokenPos) {
case 0:
printf("Gelber Sack: %s\n", token.c_str());
wd.wasteTypes.push_back(Waste::GelberSack);
break;
case 1:
printf("Papiertonne: %s\n", token.c_str());
wd.wasteTypes.push_back(Waste::Papiertonne);
break;
case 2:
printf("Biotonne: %s\n", token.c_str());
wd.wasteTypes.push_back(Waste::Biotonne);
break;
case 3:
printf("Restmüll: %s\n", token.c_str());
wd.wasteTypes.push_back(Waste::Restmuell);
break;
case 4:
printf("Problemstoffmobil: %s\n", token.c_str());
wd.wasteTypes.push_back(Waste::Problemstoffmobil);
break;
}
}
line.erase(0, pos + delimiter.length());
++tokenPos;
}
}
return dates;
}
int wifi_setup_impl(uint32_t country, const string &ssid, const string &pw, bool firstTry) { int wifi_setup_impl(uint32_t country, const string &ssid, const string &pw, bool firstTry) {
if (firstTry) { if (firstTry) {

View file

@ -1,8 +1,26 @@
#pragma once #pragma once
#include <chrono>
#include <string> #include <string>
#include <vector>
#include "pico/cyw43_arch.h" #include "pico/cyw43_arch.h"
static int wifi_setup_impl(uint32_t country, const std::string &ssid, const std::string &pw, bool firstTry = true); enum class Waste {
Restmuell,
GelberSack,
Papiertonne,
Biotonne,
Problemstoffmobil,
};
struct WasteDate {
std::chrono::year_month_day date;
std::vector<Waste> wasteTypes;
};
std::vector<WasteDate> parseCsv(const std::string& csv);
static int wifi_setup_impl(uint32_t country, const std::string &ssid, const std::string &pw,
bool firstTry = true);
void wifi_setup(); void wifi_setup();