From 8440fc7960877d9045b5b0884ca580d6b3fa0f9c Mon Sep 17 00:00:00 2001 From: SQFMI Date: Fri, 6 May 2022 22:28:55 -0400 Subject: [PATCH 1/4] Update library.properties --- library.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library.properties b/library.properties index 56da205..d6e9c59 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Watchy -version=1.4.0 +version=1.4.0-dev author=SQFMI maintainer=SQFMI sentence=Watchy - An Open Source E-Paper Watch by SQFMI From c5ddfb4e7b22edd31363f8ebf96c8fa507dfda16 Mon Sep 17 00:00:00 2001 From: SQFMI Date: Fri, 6 May 2022 22:29:08 -0400 Subject: [PATCH 2/4] Update library.json --- library.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library.json b/library.json index be4de92..c66d5e5 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "Watchy", - "version": "1.4.0", + "version": "1.4.0-dev", "description": "Watchy - An Open Source E-Paper Watch by SQFMI", "authors": [ { From 819606e892007e08ebfa87d4434a7ac10d7591d0 Mon Sep 17 00:00:00 2001 From: ITCactus Date: Fri, 5 Aug 2022 15:07:56 +0200 Subject: [PATCH 3/4] fix "LibVer" info on "About Watchy" screen --- src/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.h b/src/config.h index f5ff21f..a556a69 100644 --- a/src/config.h +++ b/src/config.h @@ -72,5 +72,5 @@ #define HARDWARE_VERSION_MAJOR 1 #define HARDWARE_VERSION_MINOR 0 // Versioning -#define WATCHY_LIB_VER "1.4.0" +#define WATCHY_LIB_VER "1.4.1" #endif From 5e451fbf049152129d2af961577d2a483c55a3d5 Mon Sep 17 00:00:00 2001 From: Alex-K37 Date: Sat, 26 Nov 2022 22:07:29 +0100 Subject: [PATCH 4/4] fixed compilation error: ambiguous overload for 'operator=' .pio/libdeps/watchy/Watchy/src/Watchy.cpp: In member function 'weatherData Watchy::getWeatherData(String, String, String, String, String, uint8_t)': .pio/libdeps/watchy/Watchy/src/Watchy.cpp:620:48: error: ambiguous overload for 'operator=' (operand types are 'String' and 'JSONVar') responseObject["weather"][0]["main"]; ^ In file included from /home/krupp/.platformio/packages/framework-arduinoespressif32/cores/esp32/Arduino.h:166, from .pio/libdeps/watchy/Watchy/src/Watchy.h:4, from .pio/libdeps/watchy/Watchy/src/Watchy.cpp:1: /home/build/.platformio/packages/framework-arduinoespressif32/cores/esp32/WString.h:102:18: note: candidate: 'String& String::operator=(const String&)' String & operator =(const String &rhs); ^~~~~~~~ /home/build/.platformio/packages/framework-arduinoespressif32/cores/esp32/WString.h:103:18: note: candidate: 'String& String::operator=(const char*)' String & operator =(const char *cstr); ^~~~~~~~ --- src/Watchy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Watchy.cpp b/src/Watchy.cpp index fab4405..778b9e2 100644 --- a/src/Watchy.cpp +++ b/src/Watchy.cpp @@ -617,7 +617,7 @@ weatherData Watchy::getWeatherData(String cityID, String units, String lang, currentWeather.weatherConditionCode = int(responseObject["weather"][0]["id"]); currentWeather.weatherDescription = - responseObject["weather"][0]["main"]; + JSONVar::stringify(responseObject["weather"][0]["main"]); // sync NTP during weather API call and use timezone of city syncNTP(long(responseObject["timezone"])); } else {