Archives/device-epd
2
0
Fork 0
mirror of https://github.com/paperdash/device-epd.git synced 2024-11-10 07:10:32 +00:00
Code Issues Projects Releases Wiki Activity

download weather data + improve face layout #16

Browse Source
This commit is contained in:
Thomas Ballmann 2020-03-02 22:37:31 +01:00
parent 1c124c1a40
commit a78e8fbcd0
1 changed files with 93 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
src/faceWeather.cpp
View File

@ -6,6 +6,7 @@
#include "download.h" #include "download.h"
#include <Fonts/FreeSansBold24pt7b.h> // current day #include <Fonts/FreeSansBold24pt7b.h> // current day
#include <Fonts/FreeSansBold18pt7b.h> // current day
const char faceWeatherCurrent[] = "/weatherCurrent.json"; const char faceWeatherCurrent[] = "/weatherCurrent.json";
const char faceWeatherForecast[] = "/weatherForecast.json"; const char faceWeatherForecast[] = "/weatherForecast.json";
@ -13,34 +14,15 @@ faceWeatherData weatherData;
// TODO use theme color // TODO use theme color
void display_current(); void render_current();
void display_forecast(); void render_forecast();
bool downloadWeatherData();
void readWeatherData();
void setupFaceWeather() void setupFaceWeather()
{ {
} }
void updateData()
{
String url;
// http://api.openweathermap.org/data/2.5/weather?id=2766824&APPID=883b3c87223430d6f3a399645f8ba12b&lang=de&cnt=3&units=metric
// http://api.openweathermap.org/data/2.5/forecast?id=2766824&APPID=883b3c87223430d6f3a399645f8ba12b&lang=de
// https://openweathermap.org/current
url = "http://api.openweathermap.org/data/2.5/weather?";
url += "APPID=883b3c87223430d6f3a399645f8ba12b"; // api key
url += "&id=2766824"; // location
url += "&lang=de&units=metric"; // settings
downloadFile(url, faceWeatherCurrent);
// https://openweathermap.org/forecast5
url = "http://api.openweathermap.org/data/2.5/forecast?";
url += "APPID=883b3c87223430d6f3a399645f8ba12b"; // api key
url += "&id=2766824"; // location
url += "&lang=de&cnt=3&units=metric"; // settings
downloadFile(url, faceWeatherForecast);
}
void loopFaceWeather() void loopFaceWeather()
{ {
display.setRotation(0); display.setRotation(0);
@ -50,13 +32,13 @@ void loopFaceWeather()
display.setTextColor(GxEPD_WHITE); display.setTextColor(GxEPD_WHITE);
display.setTextSize(1); display.setTextSize(1);
display_current(); render_current();
display_forecast(); render_forecast();
display.nextPage(); display.nextPage();
} }
void display_current() void render_current()
{ {
// temperature // temperature
display.setFont(&FreeSansBold24pt7b); display.setFont(&FreeSansBold24pt7b);
@ -68,7 +50,8 @@ void display_current()
const uint *icon = getIconById("02n", 192); // 192 const uint *icon = getIconById("02n", 192); // 192
if (icon) if (icon)
{ {
display.drawBitmap(272, 30, (uint8_t *)icon + 4, icon[0], icon[1], GxEPD_WHITE); //display.drawInvertedBitmap(224, 30, myIcon, 192, 192, GxEPD_WHITE);
display.drawBitmap(224, 30, (uint8_t *)icon + 4, icon[0], icon[1], GxEPD_WHITE);
} }
// text // text
@ -86,41 +69,112 @@ void display_current()
display.println("-3°"); display.println("-3°");
} }
void display_forecast() void render_forecast()
{ {
const uint *icon; const uint *icon;
// line forecast // line forecast
//display.drawLine(0, 250, 640, 250, GxEPD_WHITE);
display.drawRect(0, 250, 640, 2, GxEPD_WHITE); display.drawRect(0, 250, 640, 2, GxEPD_WHITE);
display.drawLine(210, 250, 210, 384, GxEPD_WHITE); display.drawLine(160, 250, 160, 384, GxEPD_WHITE);
display.drawLine(420, 250, 420, 384, GxEPD_WHITE); display.drawLine(320, 250, 320, 384, GxEPD_WHITE);
// 210 per block display.drawLine(480, 250, 480, 384, GxEPD_WHITE);
// 160 per block
display.setTextSize(1);
display.setFont(&FreeSansBold18pt7b);
char label[20];
int16_t tbx, tby;
uint16_t tbw, tbh, x;
uint16_t tempRangeY = 260 + 64 + 40;
// day +1 // day +1
icon = getIconById("03d", 96); icon = getIconById("03d", 64);
if (icon) if (icon)
{ {
display.drawBitmap(0 + 57, 260, (uint8_t *)icon + 4, icon[0], icon[1], GxEPD_WHITE); display.drawBitmap(0 + 48, 260, (uint8_t *)icon + 4, icon[0], icon[1], GxEPD_WHITE);
sprintf(label, "%2d ... %2d", -3, 11);
display.getTextBounds(label, 0, 0, &tbx, &tby, &tbw, &tbh);
x = ((160 - tbw) / 2) - tbx;
display.setCursor(x, tempRangeY);
display.print(label);
} }
// day +2 // day +2
icon = getIconById("09d", 96); icon = getIconById("09d", 64);
if (icon) if (icon)
{ {
display.drawBitmap(210 + 57, 260, (uint8_t *)icon + 4, icon[0], icon[1], GxEPD_WHITE); display.drawBitmap(160 + 48, 260, (uint8_t *)icon + 4, icon[0], icon[1], GxEPD_WHITE);
sprintf(label, "%2d ... %2d", 0, 7);
display.getTextBounds(label, 0, 0, &tbx, &tby, &tbw, &tbh);
x = ((160 - tbw) / 2) - tbx;
display.setCursor(160 + x, tempRangeY);
display.print(label);
} }
// day +3 // day +3
icon = getIconById("13d", 96); icon = getIconById("13d", 64);
if (icon) if (icon)
{ {
display.drawBitmap(410 + 57, 260, (uint8_t *)icon + 4, icon[0], icon[1], GxEPD_WHITE); display.drawBitmap(320 + 48, 260, (uint8_t *)icon + 4, icon[0], icon[1], GxEPD_WHITE);
sprintf(label, "%2d ... %2d", 1, 21);
display.getTextBounds(label, 0, 0, &tbx, &tby, &tbw, &tbh);
x = ((160 - tbw) / 2) - tbx;
display.setCursor(320 + x, tempRangeY);
display.print(label);
}
// day +4
icon = getIconById("13d", 64);
if (icon)
{
display.drawBitmap(480 + 48, 260, (uint8_t *)icon + 4, icon[0], icon[1], GxEPD_WHITE);
sprintf(label, "%2d ... %2d", 19, 35);
display.getTextBounds(label, 0, 0, &tbx, &tby, &tbw, &tbh);
x = ((160 - tbw) / 2) - tbx;
display.setCursor(480 + x, tempRangeY);
display.print(label);
} }
} }
void loadConfiguration() // @todo load params from settings
// @see https://openweathermap.org/appid#work
// @note no more than one time every 10 minutes for one location
bool downloadWeatherData()
{
String url;
// http://api.openweathermap.org/data/2.5/weather?id=2766824&APPID=883b3c87223430d6f3a399645f8ba12b&lang=de&cnt=3&units=metric
// http://api.openweathermap.org/data/2.5/forecast?id=2766824&APPID=883b3c87223430d6f3a399645f8ba12b&lang=de
// https://openweathermap.org/current
url = "http://api.openweathermap.org/data/2.5/weather?";
url += "APPID=883b3c87223430d6f3a399645f8ba12b"; // api key
url += "&id=2766824"; // location
url += "&lang=de&units=metric"; // settings
if (!downloadFile(url, faceWeatherCurrent))
{
return false;
}
// https://openweathermap.org/forecast5
url = "http://api.openweathermap.org/data/2.5/forecast?";
url += "APPID=883b3c87223430d6f3a399645f8ba12b"; // api key
url += "&id=2766824"; // location
url += "&lang=de&cnt=3&units=metric"; // settings
if (!downloadFile(url, faceWeatherForecast))
{
return false;
}
return true;
}
void readWeatherData()
{ {
SPIFFS.begin(); SPIFFS.begin();
File file; File file;