Get next race be sorting by end of meeting.
This commit is contained in:
1 parent
c0e71374eb
commit
b67432ed5d
2 files changed
+8
-9
No files matched your search
+8
-6
@@ -82,18 +82,18 @@ static int get_future_meetings_url(char* target, size_t target_size) {
|
||||
time_t now = time(nullptr);
|
||||
struct tm timeinfo, futureTime;
|
||||
|
||||
localtime_r(&now, &timeinfo);
|
||||
gmtime_r(&now, &timeinfo);
|
||||
|
||||
futureTime = timeinfo;
|
||||
futureTime.tm_mon += 2;
|
||||
mktime(&futureTime);
|
||||
|
||||
char date_buffer[12];
|
||||
char fdate_buffer[12];
|
||||
char date_buffer[28];
|
||||
char fdate_buffer[28];
|
||||
|
||||
strftime(date_buffer, sizeof(date_buffer), "%Y-%m-%d", &timeinfo);
|
||||
strftime(date_buffer, sizeof(date_buffer), "%Y-%m-%dT%H:%M:%S+00:00", &timeinfo);
|
||||
|
||||
strftime(fdate_buffer, sizeof(fdate_buffer), "%Y-%m-%d", &futureTime);
|
||||
strftime(fdate_buffer, sizeof(fdate_buffer), "%Y-%m-%dT%H:%M:%S+00:00", &futureTime);
|
||||
|
||||
snprintf(target, target_size, "https://api.openf1.org/v1/meetings?date_end>=%s&date_end<=%s",
|
||||
date_buffer,
|
||||
@@ -118,6 +118,8 @@ int parse_session_json(JsonArray sessions, session_info_t* target, const Semapho
|
||||
JsonObject nextRaceJson = sessions[0];
|
||||
session_info_t localData;
|
||||
|
||||
strptime();
|
||||
|
||||
const char* sessionName = nextRaceJson[F("session_name")];
|
||||
const char* dateStart = nextRaceJson[F("date_start")];
|
||||
const char* circuitName = nextRaceJson[F("circuit_short_name")];
|
||||
@@ -211,7 +213,7 @@ void get_next_race(void *pvParameters) {
|
||||
http.setTimeout(10000);
|
||||
http.setCACert(OPENF1_ROOT_CA);
|
||||
|
||||
char query_url[103];
|
||||
char query_url[150];
|
||||
get_future_meetings_url(query_url, sizeof(query_url));
|
||||
|
||||
const bool requestReady = http.begin(query_url);
|
||||
|
||||
@@ -116,11 +116,8 @@ void display_loop(void *pvParameters) {
|
||||
Paint_Clear(WHITE);
|
||||
|
||||
if (local_data.session_info.date_start[0] != 0) {
|
||||
Serial.print("");
|
||||
Serial.printf("date start: %s\n", local_data.session_info.date_start);
|
||||
Paint_DrawString_EN(10, 22, local_data.session_info.date_start, &Font16, WHITE, BLACK);
|
||||
}
|
||||
|
||||
|
||||
Paint_DrawString_EN(10, 0, counterStr, &Font16, WHITE, BLACK);
|
||||
|
||||
|
||||
Reference in new issue
Block a user