starred/OpenEPaperLink
1
0
Fork 0
mirror of https://github.com/OpenEPaperLink/OpenEPaperLink.git synced 2026-03-21 12:05:51 +01:00
Code Issues 1.2k Packages Projects Releases 10 Wiki Activity

Merge pull request #329 from skiphansen/oepl_pr_13

Browse Source 
Change Fahrenheit/ mph /mm Units option to Fahrenheit / mph / in.
This commit is contained in:
Skip Hansen
2024-06-04 08:23:18 -07:00
committed by GitHub
parent 6a636b5b54 eca64ee3c3
commit 1d1845580b
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ESP32_AP-Flasher/src/contentmanager.cpp
View File

@@ -855,7 +855,7 @@ void drawWeather(String &filename, JsonObject &cfgobj, const tagRecord *taginfo,
const String tz = cfgobj["#tz"];
String units = "";
if (cfgobj["units"] == "1") {
units += "&temperature_unit=fahrenheit&windspeed_unit=mph";
units += "&temperature_unit=fahrenheit&windspeed_unit=mph&precipitation_unit=inch";
}
DynamicJsonDocument doc(1000);
@@ -940,7 +940,7 @@ void drawForecast(String &filename, JsonObject &cfgobj, const tagRecord *taginfo
String tz = cfgobj["#tz"];
String units = "";
if (cfgobj["units"] == "1") {
units += "&temperature_unit=fahrenheit&windspeed_unit=mph";
units += "&temperature_unit=fahrenheit&windspeed_unit=mph&precipitation_unit=inch";
}
DynamicJsonDocument doc(2000);
@@ -990,10 +990,19 @@ void drawForecast(String &filename, JsonObject &cfgobj, const tagRecord *taginfo
}
if (loc["rain"]) {
const int8_t rain = round(daily["precipitation_sum"][dag].as<double>());
if (rain > 0) {
drawString(spr, String(rain) + "mm", dag * column1 + loc["rain"][0].as<int>(), loc["rain"][1], day[2], TC_DATUM, (rain > 10 ? imageParams.highlightColor : TFT_BLACK));
}
if (cfgobj["units"] == "0") {
const int8_t rain = round(daily["precipitation_sum"][dag].as<double>());
if (rain > 0) {
drawString(spr, String(rain) + "mm", dag * column1 + loc["rain"][0].as<int>(), loc["rain"][1], day[2], TC_DATUM, (rain > 10 ? imageParams.highlightColor : TFT_BLACK));
}
} else {
double fRain = daily["precipitation_sum"][dag].as<double>();
fRain = round(fRain*100.0) / 100.0;
if (fRain > 0.0) {
// inch, display if > .01 inches
drawString(spr, String(fRain) + "in", dag * column1 + loc["rain"][0].as<int>(), loc["rain"][1], day[2], TC_DATUM, (fRain > 0.5 ? imageParams.highlightColor : TFT_BLACK));
}
}
}
drawString(spr, String(tmin) + " ", dag * column1 + day[0].as<int>(), day[4], day[2], TR_DATUM, (tmin < 0 ? imageParams.highlightColor : TFT_BLACK));

4
ESP32_AP-Flasher/wwwroot/content_cards.json
View File

@@ -103,7 +103,7 @@
"type": "select",
"options": {
"0": "-Celcius / Beaufort / millimeters",
"1": "Fahrenheit / mph / millimeters"
"1": "Fahrenheit / mph / inches"
}
},
{
@@ -144,7 +144,7 @@
"type": "select",
"options": {
"0": "-Celcius / Beaufort / millimeters",
"1": "Fahrenheit / mph / millimeters"
"1": "Fahrenheit / mph / inches"
}
},
{