|
|
@ -8,7 +8,7 @@
|
|
|
|
#include "image.h"
|
|
|
|
#include "image.h"
|
|
|
|
#include "download.h"
|
|
|
|
#include "download.h"
|
|
|
|
#include "faceWeather.h"
|
|
|
|
#include "faceWeather.h"
|
|
|
|
#include "faceWeatherIcons.h"
|
|
|
|
#include "faceWeather/icons.h"
|
|
|
|
|
|
|
|
|
|
|
|
#include <Fonts/FreeMono12pt7b.h> // weekday - month year
|
|
|
|
#include <Fonts/FreeMono12pt7b.h> // weekday - month year
|
|
|
|
#include <Fonts/FreeMonoBold9pt7b.h> //
|
|
|
|
#include <Fonts/FreeMonoBold9pt7b.h> //
|
|
|
@ -18,10 +18,8 @@
|
|
|
|
void showFaceCalendar();
|
|
|
|
void showFaceCalendar();
|
|
|
|
void display_calender();
|
|
|
|
void display_calender();
|
|
|
|
void display_picture();
|
|
|
|
void display_picture();
|
|
|
|
void display_time();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const char faceCalendarPicture[] = "/calendarPhoto.jpg";
|
|
|
|
const char faceCalendarPicture[] = "/calendarPhoto.jpg";
|
|
|
|
|
|
|
|
|
|
|
|
unsigned long lastCalendarDataUpdate = 0;
|
|
|
|
unsigned long lastCalendarDataUpdate = 0;
|
|
|
|
|
|
|
|
|
|
|
|
void setupFaceCalendar()
|
|
|
|
void setupFaceCalendar()
|
|
|
@ -40,11 +38,6 @@ void loopFaceCalendar()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void playlistFaceCalendar()
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
showFaceCalendar();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void showFaceCalendar()
|
|
|
|
void showFaceCalendar()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
GFXcanvas1 *canvas = displayGetCanvas();
|
|
|
|
GFXcanvas1 *canvas = displayGetCanvas();
|
|
|
@ -65,7 +58,8 @@ bool updateCalendarData()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
String url = NVS.getString("playlist.images");
|
|
|
|
String url = NVS.getString("playlist.images");
|
|
|
|
|
|
|
|
|
|
|
|
if (!url.isEmpty()) {
|
|
|
|
if (!url.isEmpty())
|
|
|
|
|
|
|
|
{
|
|
|
|
url += "390x384.jpg";
|
|
|
|
url += "390x384.jpg";
|
|
|
|
return downloadFile(url, faceCalendarPicture);
|
|
|
|
return downloadFile(url, faceCalendarPicture);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -176,42 +170,3 @@ void display_picture()
|
|
|
|
|
|
|
|
|
|
|
|
ImageFlushBuffer();
|
|
|
|
ImageFlushBuffer();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void display_time()
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
int16_t x1, y1;
|
|
|
|
|
|
|
|
uint16_t w, h;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//display time
|
|
|
|
|
|
|
|
canvas->setFont(&FreeMonoBold9pt7b); // LARGE_FONT
|
|
|
|
|
|
|
|
canvas->setTextSize(1);
|
|
|
|
|
|
|
|
canvas->setTextColor(COLOR_BG);
|
|
|
|
|
|
|
|
int16_t time_base_y = 60;
|
|
|
|
|
|
|
|
int16_t time_base_x = 25;
|
|
|
|
|
|
|
|
canvas->getTextBounds("03", time_base_x, time_base_y, &x1, &y1, &w, &h); // 03 is arbitrary text to get the height and width
|
|
|
|
|
|
|
|
canvas->fillRect(time_base_x - 10, time_base_y - h - 10, w + 15, time_base_y + h + 10, GxEPD_WHITE);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
canvas->setCursor(time_base_x, time_base_y);
|
|
|
|
|
|
|
|
if (now.hour < 10)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
canvas->print("0");
|
|
|
|
|
|
|
|
canvas->print(now.hour);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
canvas->println(now.hour);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
canvas->setCursor(time_base_x, time_base_y + h + 10);
|
|
|
|
|
|
|
|
if (now.min < 10)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
canvas->print("0");
|
|
|
|
|
|
|
|
canvas->print(now.min);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
canvas->println(now.min);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|