fixed openmeteo example

stefangranatir · stefangranatir · commit 36d185ac8c3d · 2026-02-11T10:02:39.000+01:00
diff --git a/examples/Inkplate10/Projects/Inkplate10_OpenAI_Image_Slideshow/Inkplate10_OpenAI_Image_Slideshow.ino b/examples/Inkplate10/Projects/Inkplate10_OpenAI_Image_Slideshow/Inkplate10_OpenAI_Image_Slideshow.ino
@@ -23,7 +23,7 @@
 #define SLEEP_DURATION_IN_MINS 30*60 
 
 // Format of the image to be downloaded and displayed (PNG is recommended for best compatibility)
-Image::Format imageFormat = Image::PNG;
+ImageColor::Format imageFormat = ImageColor::PNG;
 
 // WiFi credentials (replace with your own SSID and password)
 const char* ssid = "YOUR_SSID_HERE";
diff --git a/examples/Inkplate10/Projects/Inkplate10_OpenMeteo_Weather_Station/Inkplate10_OpenMeteo_Weather_Station.ino b/examples/Inkplate10/Projects/Inkplate10_OpenMeteo_Weather_Station/Inkplate10_OpenMeteo_Weather_Station.ino
@@ -30,8 +30,8 @@
 #include "src/includes.h" // Include necessary libraries and dependencies for Inkplate and networking
 
 // --- WiFi Configuration ---
-const char *ssid = "Soldered-testingPurposes";
-const char *password = "Testing443";
+const char *ssid = "Soldered Electronics";
+const char *password = "dasduino";
 
 // --- User and Location Info ---
 String myUsername = "Username"; // User's name to be displayed on screen
diff --git a/examples/Inkplate10/Projects/Inkplate10_OpenMeteo_Weather_Station/src/Gui.cpp b/examples/Inkplate10/Projects/Inkplate10_OpenMeteo_Weather_Station/src/Gui.cpp
@@ -131,7 +131,7 @@ const uint8_t *Gui::getBatteryIcon(int percentage)
 }
 
 // --- Draw Temperature & Precipitation Graph ---
-void Gui::drawTemperaturePrecipGraph(WeatherData *weatherData, Network::UserInfo *userInfo)
+void Gui::drawTemperaturePrecipGraph(WeatherData *weatherData, NetworkFunctions::UserInfo *userInfo)
 {
     // Layout values for graph placement
     int graphX = 425;
@@ -261,7 +261,7 @@ void Gui::drawTemperaturePrecipGraph(WeatherData *weatherData, Network::UserInfo
 }
 
 // --- Display All Weather Data ---
-void Gui::displayWeatherData(WeatherData *weatherData, Network::UserInfo *userInfo)
+void Gui::displayWeatherData(WeatherData *weatherData, NetworkFunctions::UserInfo *userInfo)
 {
     // Section 1: Main info
     inkplate.setFont(&FreeSansBold24pt7b);
diff --git a/examples/Inkplate10/Projects/Inkplate10_OpenMeteo_Weather_Station/src/Gui.h b/examples/Inkplate10/Projects/Inkplate10_OpenMeteo_Weather_Station/src/Gui.h
@@ -12,15 +12,15 @@ class Gui
 public:
     Gui(Inkplate &inkplate);
     void drawBackground();
-    void displayWeatherData(WeatherData *weatherData, Network::UserInfo *userInfo);
+    void displayWeatherData(WeatherData *weatherData, NetworkFunctions::UserInfo *userInfo);
     void wifiError();
     void apiError();
     int batteryLevel;
     double voltage;
 
 private:
     Inkplate &inkplate;
-    void drawTemperaturePrecipGraph(WeatherData *weatherData, Network::UserInfo *userInfo);
+    void drawTemperaturePrecipGraph(WeatherData *weatherData, NetworkFunctions::UserInfo *userInfo);
     const uint8_t* getWeatherIcon(int code);
     const uint8_t* getBatteryIcon(int percentage);
     int voltageToPercentage(double voltage);
diff --git a/examples/Inkplate4TEMPERA/Projects/Inkplate4TEMPERA_OpenAI_Image_Slideshow/Inkplate4TEMPERA_OpenAI_Image_Slideshow.ino b/examples/Inkplate4TEMPERA/Projects/Inkplate4TEMPERA_OpenAI_Image_Slideshow/Inkplate4TEMPERA_OpenAI_Image_Slideshow.ino
@@ -23,7 +23,7 @@
 #define SLEEP_DURATION_IN_MINS 30*60 
 
 // Format of the image to be downloaded and displayed (PNG is recommended for best compatibility)
-Image::Format imageFormat = Image::PNG;
+ImageColor::Format imageFormat = ImageColor::PNG;
 
 // WiFi credentials (replace with your own SSID and password)
 const char* ssid = "YOUR_SSID_HERE";
diff --git a/examples/Inkplate5/Projects/Inkplate5_OpenAI_Image_Slideshow/Inkplate5_OpenAI_Image_Slideshow.ino b/examples/Inkplate5/Projects/Inkplate5_OpenAI_Image_Slideshow/Inkplate5_OpenAI_Image_Slideshow.ino
@@ -22,7 +22,7 @@
 #define SLEEP_DURATION_IN_MINS 30*60 
 
 // Format of the image to be downloaded and displayed (PNG is recommended for best compatibility)
-Image::Format imageFormat = Image::PNG;
+ImageColor::Format imageFormat = ImageColor::PNG;
 
 // WiFi credentials (replace with your own SSID and password)
 const char* ssid = "YOUR_SSID_HERE";
diff --git a/examples/Inkplate5V2/Projects/Inkplate5V2_OpenAI_Image_Slideshow/Inkplate5V2_OpenAI_Image_Slideshow.ino b/examples/Inkplate5V2/Projects/Inkplate5V2_OpenAI_Image_Slideshow/Inkplate5V2_OpenAI_Image_Slideshow.ino
@@ -23,7 +23,7 @@
 #define SLEEP_DURATION_IN_MINS 30*60 
 
 // Format of the image to be downloaded and displayed (PNG is recommended for best compatibility)
-Image::Format imageFormat = Image::PNG;
+ImageColor::Format imageFormat = ImageColor::PNG;
 
 // WiFi credentials (replace with your own SSID and password)
 const char* ssid = "YOUR_SSID_HERE";
diff --git a/examples/Inkplate6/Projects/Inkplate6_OpenAI_Image_Slideshow/Inkplate6_OpenAI_Image_Slideshow.ino b/examples/Inkplate6/Projects/Inkplate6_OpenAI_Image_Slideshow/Inkplate6_OpenAI_Image_Slideshow.ino
@@ -23,7 +23,7 @@
 #define SLEEP_DURATION_IN_MINS 30*60 
 
 // Format of the image to be downloaded and displayed (PNG is recommended for best compatibility)
-Image::Format imageFormat = Image::PNG;
+ImageColor::Format imageFormat = ImageColor::PNG;
 
 // WiFi credentials (replace with your own SSID and password)
 const char* ssid = "YOUR_SSID_HERE";
diff --git a/examples/Inkplate6FLICK/Projects/Inkplate6FLICK_OpenAI_Image_Slideshow/Inkplate6FLICK_OpenAI_Image_Slideshow.ino b/examples/Inkplate6FLICK/Projects/Inkplate6FLICK_OpenAI_Image_Slideshow/Inkplate6FLICK_OpenAI_Image_Slideshow.ino
@@ -23,7 +23,7 @@
 #define SLEEP_DURATION_IN_MINS 30*60 
 
 // Format of the image to be downloaded and displayed (PNG is recommended for best compatibility)
-Image::Format imageFormat = Image::PNG;
+ImageColor::Format imageFormat = ImageColor::PNG;
 
 // WiFi credentials (replace with your own SSID and password)
 const char* ssid = "YOUR_SSID_HERE";
diff --git a/examples/Inkplate6PLUS/Projects/Inkplate6PLUS_OpenAI_Image_Slideshow/Inkplate6PLUS_OpenAI_Image_Slideshow.ino b/examples/Inkplate6PLUS/Projects/Inkplate6PLUS_OpenAI_Image_Slideshow/Inkplate6PLUS_OpenAI_Image_Slideshow.ino
@@ -22,7 +22,7 @@
 #define SLEEP_DURATION_IN_MINS 30*60 
 
 // Format of the image to be downloaded and displayed (PNG is recommended for best compatibility)
-Image::Format imageFormat = Image::PNG;
+ImageColor::Format imageFormat = ImageColor::PNG;
 
 // WiFi credentials (replace with your own SSID and password)
 const char* ssid = "YOUR_SSID_HERE";
diff --git a/examples/Inkplate6PLUS/Projects/Inkplate6PLUS_Quotables/Network.cpp b/examples/Inkplate6PLUS/Projects/Inkplate6PLUS_Quotables/Network.cpp
@@ -76,7 +76,7 @@ void NetworkFunctions::begin()
 
 }
 
-bool Network::getData(char* text, char* auth)
+bool NetworkFunctions::getData(char* text, char* auth)
 {
     bool f = 0;
 
diff --git a/examples/Inkplate7/Advanced/RTC/Inkplate7_RTC_Alarm/Network.cpp b/examples/Inkplate7/Advanced/RTC/Inkplate7_RTC_Alarm/Network.cpp
@@ -22,7 +22,7 @@ Distributed as-is; no warranty is given.
 
 #include "Inkplate.h"
 
-void Network::begin(char *ssid, char *pass)
+void NetworkFunctions::begin(char *ssid, char *pass)
 {
     // Initiating wifi, like in BasicHttpClient example
     WiFi.mode(WIFI_STA);
@@ -50,7 +50,7 @@ void Network::begin(char *ssid, char *pass)
 }
 
 // Get time from NTP server
-void Network::getTime(tm *t, int timeZone)
+void NetworkFunctions::getTime(tm *t, int timeZone)
 {
     // Get seconds since 1.1.1970.
     time_t nowSecs = time(nullptr) + timeZone * 3600ULL;
@@ -62,7 +62,7 @@ void Network::getTime(tm *t, int timeZone)
 }
 
 // Function for initial time setting ovet the ntp server
-void Network::setTime()
+void NetworkFunctions::setTime()
 {
     // Used for setting correct time
     configTime(0, 0, "pool.ntp.org", "time.nist.gov");
diff --git a/examples/Inkplate7/Projects/Inkplate7_Crypto_Currency_Tracker/Network.cpp b/examples/Inkplate7/Projects/Inkplate7_Crypto_Currency_Tracker/Network.cpp
@@ -38,7 +38,7 @@
  * 
  * @returns     none
 */
-void Network::begin(char * ssid, char * pass)
+void NetworkFunctions::begin(char * ssid, char * pass)
 {
     // Initiating wifi, like in BasicHttpClient example
     WiFi.mode(WIFI_STA);
@@ -74,7 +74,7 @@ void Network::begin(char * ssid, char * pass)
  * 
  * @returns     none
 */
-void Network::getTime(char *timeStr, int timeZone)
+void NetworkFunctions::getTime(char *timeStr, int timeZone)
 {
     // Get seconds since 1.1.1970.
     time_t nowSecs = time(nullptr);
@@ -106,7 +106,7 @@ void Network::getTime(char *timeStr, int timeZone)
  * 
  * @returns     True if successful, false if not
 */
-bool Network::getData(double *data, char * currency)
+bool NetworkFunctions::getData(double *data, char * currency)
 {
     // Dynamic Json from ArduinoJson library
     DynamicJsonDocument doc(30000);
@@ -188,7 +188,7 @@ bool Network::getData(double *data, char * currency)
  * 
  * @returns     None
 */
-void Network::setTime()
+void NetworkFunctions::setTime()
 {
     // Used for setting correct time
     configTime(0, 0, "pool.ntp.org", "time.nist.gov");
diff --git a/examples/Inkplate7/Projects/Inkplate7_Daily_Weather_Station/Network.cpp b/examples/Inkplate7/Projects/Inkplate7_Daily_Weather_Station/Network.cpp
@@ -18,7 +18,7 @@
 // They have been declared in seperate file to increase readability
 #include "Network.h"
 
-void Network::begin(char *ssid, char *pass)
+void NetworkFunctions::begin(char *ssid, char *pass)
 {
     // Initiating wifi
     WiFi.mode(WIFI_STA);
@@ -46,7 +46,7 @@ void Network::begin(char *ssid, char *pass)
 }
 
 // Gets time from ntp server
-void Network::getTime(char *timeStr)
+void NetworkFunctions::getTime(char *timeStr)
 {
     // Get seconds since 1.1.1970.
     time_t nowSecs = time(nullptr);
@@ -81,7 +81,7 @@ void formatWind(char *str, float wind)
     dtostrf(wind, 2, 0, str);
 }
 
-bool Network::getData(char *lat, char *lon, char *apiKey, char *city, char *temp1, char *temp2, char *temp3,
+bool NetworkFunctions::getData(char *lat, char *lon, char *apiKey, char *city, char *temp1, char *temp2, char *temp3,
                       char *temp4, char *currentTemp, char *currentWind, char *currentTime, char *currentWeather,
                       char *currentWeatherAbbr, char *abbr1, char *abbr2, char *abbr3, char *abbr4, uint8_t *hours)
 {
@@ -224,7 +224,7 @@ bool Network::getData(char *lat, char *lon, char *apiKey, char *city, char *temp
     return 1;
 }
 
-void Network::setTime()
+void NetworkFunctions::setTime()
 {
     // Used for setting correct time
     configTime(0, 0, "pool.ntp.org", "time.nist.gov");
diff --git a/examples/Inkplate7/Projects/Inkplate7_Google_Calendar/Network.cpp b/examples/Inkplate7/Projects/Inkplate7_Google_Calendar/Network.cpp
@@ -17,7 +17,7 @@ Distributed as-is; no warranty is given.
 #include "Network.h"
 
 // Connect Inkplate to the WiFi
-void Network::begin(char *ssid, char *pass)
+void NetworkFunctions::begin(char *ssid, char *pass)
 {
     // Initiating wifi, like in BasicHttpClient example
     WiFi.mode(WIFI_STA);
@@ -48,7 +48,7 @@ void Network::begin(char *ssid, char *pass)
 }
 
 // Gets time from ntp server
-void Network::getTime(char *timeStr, long offSet, int timeZone)
+void NetworkFunctions::getTime(char *timeStr, long offSet, int timeZone)
 {
     // Get seconds since 1.1.1970. and add timezone
     time_t nowSecs = time(nullptr) + (long)timeZone * 3600L + offSet;
@@ -62,7 +62,7 @@ void Network::getTime(char *timeStr, long offSet, int timeZone)
 }
 
 // Function to get all raw data from the web
-bool Network::getData(char *calendarURL, char *data)
+bool NetworkFunctions::getData(char *calendarURL, char *data)
 {
     // Variable to store fail
     bool f = 0;
@@ -144,7 +144,7 @@ bool Network::getData(char *calendarURL, char *data)
 }
 
 // Find internet time
-void Network::setTime()
+void NetworkFunctions::setTime()
 {
     // Used for setting correct time
     configTime(0, 0, "pool.ntp.org", "time.nist.gov");
diff --git a/examples/Inkplate7/Projects/Inkplate7_Hourly_Weather_Station/Network.cpp b/examples/Inkplate7/Projects/Inkplate7_Hourly_Weather_Station/Network.cpp
@@ -21,7 +21,7 @@ Distributed as-is; no warranty is given.
 // They have been declared in seperate file to increase readability
 #include "Network.h"
 
-void Network::begin(char *ssid, char *pass)
+void NetworkFunctions::begin(char *ssid, char *pass)
 {
     // Initiating wifi
     WiFi.mode(WIFI_STA);
@@ -52,7 +52,7 @@ void Network::begin(char *ssid, char *pass)
 }
 
 // Gets time from ntp server
-void Network::getTime(char *timeStr, int timeZone)
+void NetworkFunctions::getTime(char *timeStr, int timeZone)
 {
     // Get seconds since 1.1.1970.
     time_t nowSecs = time(nullptr);
@@ -97,7 +97,7 @@ void formatWind(char *str, float wind)
     dtostrf(wind, 2, 0, str);
 }
 
-bool Network::getData(char *lat, char *lon, char *apiKey, char *temp1, char *temp2, char *temp3, char *temp4,
+bool NetworkFunctions::getData(char *lat, char *lon, char *apiKey, char *temp1, char *temp2, char *temp3, char *temp4,
                       char *currentTemp, char *currentWind, char *currentTime, char *currentWeather,
                       char *currentWeatherAbbr, char *abbr1, char *abbr2, char *abbr3, char *abbr4, int *timeZone)
 {
@@ -208,7 +208,7 @@ bool Network::getData(char *lat, char *lon, char *apiKey, char *temp1, char *tem
     return !f;
 }
 
-void Network::setTime()
+void NetworkFunctions::setTime()
 {
     // Used for setting correct time
     configTime(0, 0, "pool.ntp.org", "time.nist.gov");
@@ -233,7 +233,7 @@ void Network::setTime()
     Serial.print(asctime(&timeinfo));
 }
 
-void Network::getHours(char *hour1, char *hour2, char *hour3, char *hour4, int timeZone)
+void NetworkFunctions::getHours(char *hour1, char *hour2, char *hour3, char *hour4, int timeZone)
 {
     // Format hours info
     sprintf(hour1, "%2ldh", (dataEpoch / 3600L + timeZone + 24) % 24);
diff --git a/examples/Inkplate7/Projects/Inkplate7_News_API/Network.cpp b/examples/Inkplate7/Projects/Inkplate7_News_API/Network.cpp
@@ -16,7 +16,7 @@
 #include "Network.h"
 
 // Connect Inkplate to the WiFi
-void Network::begin(char *ssid, char *pass)
+void NetworkFunctions::begin(char *ssid, char *pass)
 {
     // Initiating wifi, like in BasicHttpClient example
     WiFi.mode(WIFI_STA);
@@ -41,7 +41,7 @@ void Network::begin(char *ssid, char *pass)
 }
 
 // Get data from the News API
-struct news *Network::getData(char *apiKey)
+struct news *NetworkFunctions::getData(char *apiKey)
 {
     // Pointer to the struct where will be stored the news data
     struct news *ent = NULL;
diff --git a/examples/Inkplate7/Projects/Inkplate7_Quotables/Network.cpp b/examples/Inkplate7/Projects/Inkplate7_Quotables/Network.cpp
@@ -34,7 +34,7 @@ extern Inkplate display;
 ArduinoJson::StaticJsonDocument<30000> doc; // Still technically deprecated, but clarifies the source
 
 
-void Network::begin(char *ssid, char *pass)
+void NetworkFunctions::begin(char *ssid, char *pass)
 {
     // Initiating wifi, like in BasicHttpClient example
     WiFi.mode(WIFI_STA);
@@ -63,7 +63,7 @@ void Network::begin(char *ssid, char *pass)
 
 }
 
-bool Network::getData(char* text, char* auth)
+bool NetworkFunctions::getData(char* text, char* auth)
 {
     bool f = 0;
 
diff --git a/examples/Inkplate7/Projects/Inkplate7_World_Clock/Network.cpp b/examples/Inkplate7/Projects/Inkplate7_World_Clock/Network.cpp
@@ -25,7 +25,7 @@
  * 
  * @returns         None
 */
-void Network::begin(char *ssid, char *pass)
+void NetworkFunctions::begin(char *ssid, char *pass)
 {
     // Initiating wifi, like in BasicHttpClient example
     WiFi.mode(WIFI_STA);
@@ -71,7 +71,7 @@ void Network::begin(char *ssid, char *pass)
  * 
  * @returns         True if OK, false if there was an error
 */
-bool Network::getData(char *city, int *hours, int *minutes)
+bool NetworkFunctions::getData(char *city, int *hours, int *minutes)
 {
     // Create the JSON doc to store time
     DynamicJsonDocument doc(1024);
@@ -168,7 +168,7 @@ bool Network::getData(char *city, int *hours, int *minutes)
  * 
  * @returns         The full name of the city, 0 if it's not found
 */
-char *Network::getFullCityName(char *city)
+char *NetworkFunctions::getFullCityName(char *city)
 {
     static char fullName[33];
     // Check the abbreviation for each city
@@ -192,7 +192,7 @@ char *Network::getFullCityName(char *city)
  * 
  * @returns         True if successful, false if not
 */
-bool Network::getAllCities()
+bool NetworkFunctions::getAllCities()
 {
     // Create the JSON doc to store time
     DynamicJsonDocument doc(24576);

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ const uint8_t *Gui::getBatteryIcon(int percentage)`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`// --- Draw Temperature & Precipitation Graph ---`
`134`		`-void Gui::drawTemperaturePrecipGraph(WeatherData weatherData, Network::UserInfo userInfo)`
	`134`	`+void Gui::drawTemperaturePrecipGraph(WeatherData weatherData, NetworkFunctions::UserInfo userInfo)`
`135`	`135`	`{`
`136`	`136`	`// Layout values for graph placement`
`137`	`137`	`int graphX = 425;`
`@@ -261,7 +261,7 @@ void Gui::drawTemperaturePrecipGraph(WeatherData *weatherData, Network::UserInfo`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`// --- Display All Weather Data ---`
`264`		`-void Gui::displayWeatherData(WeatherData weatherData, Network::UserInfo userInfo)`
	`264`	`+void Gui::displayWeatherData(WeatherData weatherData, NetworkFunctions::UserInfo userInfo)`
`265`	`265`	`{`
`266`	`266`	`// Section 1: Main info`
`267`	`267`	`inkplate.setFont(&FreeSansBold24pt7b);`