enable randome picture auto update and some code improvements

pull/1/head
Thomas Ballmann 4 years ago
parent ea088dd6f5
commit 896c8e447f

@ -15,36 +15,35 @@
#include <Fonts/FreeSans24pt7b.h> // current day #include <Fonts/FreeSans24pt7b.h> // current day
#include <Fonts/FreeSansBold24pt7b.h> // current day #include <Fonts/FreeSansBold24pt7b.h> // current day
bool downloadRandomePicture();
void showFaceCalendar(); void showFaceCalendar();
void display_calender(); void display_calender();
void display_picture(); void display_picture();
void display_time(); void display_time();
const char faceCalendarPicutreJson[] = "/calendarPhoto.json"; const char faceCalendarPicutreJson[] = "/calendarPhoto.json";
const char faceCalendarPicture[] = "/calendarPhoto.png"; const char faceCalendarPicture[] = "/calendarPhoto.bin";
const char faceCalendarPictureUrl[] = "http://sonic/paperdash/unsplash.php?&w=390&h=384&fm=jpg"; // TODO load from settings
bool triggerUpdateCalendar = false; unsigned long lastCalendarDataUpdate = 0;
void setupFaceCalendar() void setupFaceCalendar()
{ {
lastCalendarDataUpdate = millis();
} }
void loopFaceCalendar() void loopFaceCalendar()
{ {
if (triggerUpdateCalendar) // update every 10 min
if ((millis() - lastCalendarDataUpdate) >= 600000)
{ {
triggerUpdateCalendar = false; Serial.println(&now, "update calendar data @ %A, %B %d %Y %H:%M:%S");
Serial.println("...triggerUpdateCalendar"); lastCalendarDataUpdate = millis();
updateCalendarData();
downloadRandomePicture();
} }
} }
void playlistFaceCalendar() void playlistFaceCalendar()
{ {
// TODO update picture every x seconds
showFaceCalendar(); showFaceCalendar();
} }
@ -61,22 +60,12 @@ void showFaceCalendar()
displayFlush(); displayFlush();
} }
bool downloadRandomePicture()
{
String pictureUrl = "http://sonic/unsplash.php?"; // TODO
pictureUrl += "&w=390&h=384"; // size
pictureUrl += "&fm=png"; // format
return downloadFile(pictureUrl, faceCalendarPicture);
}
/** /**
* download and update calendar data * download and update calendar data
*/ */
bool updateCalendarData() bool updateCalendarData()
{ {
triggerUpdateCalendar = true; return downloadFile(faceCalendarPictureUrl, faceCalendarPicture);
return true;
} }
void display_calender() void display_calender()

Loading…
Cancel
Save