From 40941908fa19fa0d2c31acb29f8f1fe7fe33933e Mon Sep 17 00:00:00 2001 From: Tyler Perkins Date: Thu, 23 Dec 2021 22:25:09 -0500 Subject: [PATCH] Fix default weather string --- src/panel/weather.cpp | 6 +++--- src/panel/weather_config.hpp | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/panel/weather.cpp b/src/panel/weather.cpp index 804edf4..d589820 100644 --- a/src/panel/weather.cpp +++ b/src/panel/weather.cpp @@ -130,9 +130,9 @@ void weather::update() { if(!WEATHER_METRIC){ - temp_today = (temp_today * 1.8) + 32; - temp_tommorow = (temp_tommorow * 1.8) + 32; - temp_day_after = (temp_day_after * 1.8) + 32; + temp_today = (int)(temp_today * 1.8) + 32; + temp_tommorow = (int)(temp_tommorow * 1.8) + 32; + temp_day_after = (int)(temp_day_after * 1.8) + 32; } json_string.clear(); diff --git a/src/panel/weather_config.hpp b/src/panel/weather_config.hpp index a6755b8..498fe85 100644 --- a/src/panel/weather_config.hpp +++ b/src/panel/weather_config.hpp @@ -16,8 +16,7 @@ namespace dashboard::panel { constexpr char WEATHER_TITLE[] = "Weather"; //Cuyahoga Falls Weather Feed - //static const char* WEATHER_URL_SOURCE = "https://www.7timer.info/bin/civil.php?lon=41.13&lat=-81.48&unit=british&output=json&tzshift=0"; - constexpr char WEATHER_URL_SOURCE[] = "https://www.7timer.info/bin/civil.php?lon=41.13&lat=-81.48&unit=british&output=json&tzshift=0"; + constexpr char WEATHER_URL_SOURCE[] = "https://www.7timer.info/bin/civil.php?lon=-81.48&lat=41.134&unit=metric&output=json&tzshift=0"; //Default time the slide is shown on screen, in ms //Default 15s