updated google cal and open meteo apps

for inkplates:
2
4 tempera
5v2
6
6 color
6 flick
6 plus
10

Author: mtoldi

examples/Inkplate10/Projects/Inkplate10_Google_Calendar/Inkplate10_Google_Calendar.ino

@@ -18,14 +18,18 @@ Before You Start:
 
 #include "src/includes.h" // Include necessary libraries and dependencies for Inkplate and networking
 
+// --- WiFi Configuration ---
 const char *ssid = "Soldered-testingPurposes";
 const char *password = "Testing443";
 
-int timeZone = 2; // timeZone is the number in (UTC + number) in your time zone UTC + 2 for Osijek, UTC - 4 for New York City
-
-String calendarID = "[email protected]";
+// --- User Info ---
+String calendarID = "[email protected]";
 String apiKey = "yourapikey";
 
+int timeZone = 2; // timeZone is the number in (UTC + number) in your time zone | UTC + 2 for Osijek, UTC - 4 for New York City
+const char  *ntpServer = "pool.ntp.org";  // in case you want to use a different one
+
+// --- Device and Data Objects ---
 Inkplate inkplate(INKPLATE_3BIT);
 calendarData calendar;
 Network network(calendarID, apiKey);
@@ -59,7 +63,7 @@ void setup()
   }
   else
   {
-    configTime(timeZone * 3600, 0, "pool.ntp.org", "time.nist.gov");
+    configTime(timeZone * 3600, 0, ntpServer);
     // Fetch and display calendar
     if (network.fetchCalendar(&calendar))
     {
@@ -73,7 +77,7 @@ void setup()
     }
   }
   // Sleep to save power; wakes every 10 minutes
-  esp_sleep_enable_timer_wakeup(TIME_TO_SLEEP * uS_TO_S_FACTOR); // Activate wake-up timer -- wake up after 30mins here
+  esp_sleep_enable_timer_wakeup(TIME_TO_SLEEP * uS_TO_S_FACTOR); // Activate wake-up timer
   esp_deep_sleep_start();                                        // Put ESP32 into deep sleep.
 }
 

examples/Inkplate10/Projects/Inkplate10_Google_Calendar/src/Gui.h

@@ -3,7 +3,7 @@
 #include <Inkplate.h>
 #include "calendarData.h"
 
-#define MAX_SUMMARY_LENGTH 32
+#define MAX_SUMMARY_LENGTH 28
 
 class Gui {
 public:

examples/Inkplate10/Projects/Inkplate10_OpenMeteo_Weather_Station/Inkplate10_OpenMeteo_Weather_Station.ino

@@ -21,6 +21,12 @@
   By default, the app uses the metric system.
   To switch to Imperial units, change the metricUnits to "bool metricUnits = false;"
 */
+
+// Next 3 lines are a precaution, you can ignore those, and the example would also work without them
+#if !defined(ARDUINO_INKPLATE10) && !defined(ARDUINO_INKPLATE10V2)
+#error "Wrong board selection for this example, please select e-radionica Inkplate10 or Soldered Inkplate10 in the boards menu."
+#endif
+
 #include "src/includes.h" // Include necessary libraries and dependencies for Inkplate and networking
 
 // --- WiFi Configuration ---
@@ -76,7 +82,7 @@ void setup()
     {
         configTime(timeZone * 3600, 0, ntpServer); // Set local time via NTP server
         // Gather battery and city info
-        userInfo.voltage = inkplate.readBattery();
+        gui.voltage = inkplate.readBattery();
         userInfo.city = myCity;
         userInfo.username = myUsername;
         userInfo.useMetric = metricUnits;

examples/Inkplate10/Projects/Inkplate10_OpenMeteo_Weather_Station/src/Gui.cpp

@@ -66,6 +66,14 @@ void Gui::apiError()
     inkplate.display();
 }
 
+int Gui::voltageToPercentage(double voltage) {
+    if (voltage >= 4.2) return 100;
+    if (voltage <= 3.0) return 0;
+  
+    // Simple linear approximation
+    return (int)(((voltage - 3.0) / (4.2 - 3.0)) * 100);
+}
+
 // Weather Icons based on open-meteo api code
 const uint8_t *Gui::getWeatherIcon(int code)
 {
@@ -274,15 +282,18 @@ void Gui::displayWeatherData(WeatherData *weatherData, Network::UserInfo *userIn
     inkplate.println(weatherData->weatherDescription);
 
     // Section 2: User Info and Battery
+
+    batteryLevel = voltageToPercentage(voltage);
+
     inkplate.setFont(&FreeSans12pt7b);
     inkplate.setTextColor(7);
 
     int yUser = 55;
 
-    inkplate.drawBitmap(800, 25, getBatteryIcon(userInfo->batteryLevel), 48, 48, 7);
+    inkplate.drawBitmap(800, 25, getBatteryIcon(batteryLevel), 48, 48, 7);
 
     inkplate.setCursor(850, yUser);
-    inkplate.print(userInfo->batteryLevel);
+    inkplate.print(batteryLevel);
     inkplate.println("%");
 
     yUser += 50;

examples/Inkplate10/Projects/Inkplate10_OpenMeteo_Weather_Station/src/Gui.h

@@ -15,12 +15,15 @@ class Gui
     void displayWeatherData(WeatherData *weatherData, Network::UserInfo *userInfo);
     void wifiError();
     void apiError();
+    int batteryLevel;
+    double voltage;
 
 private:
     Inkplate &inkplate;
     void drawTemperaturePrecipGraph(WeatherData *weatherData, Network::UserInfo *userInfo);
     const uint8_t* getWeatherIcon(int code);
     const uint8_t* getBatteryIcon(int percentage);
+    int voltageToPercentage(double voltage);
 
 };
 

examples/Inkplate10/Projects/Inkplate10_OpenMeteo_Weather_Station/src/Network.cpp

@@ -1,7 +1,7 @@
 #include "Network.h"
 #include <WiFi.h>          
 #include <HTTPClient.h>     
-#include "weatherData.h"     
+#include "WeatherData.h"     
 
 #include <ArduinoJson.h>     
 
@@ -45,14 +45,6 @@ String Network::extractTime(String dateTime) {
   return "??:??";
 }
 
-int Network::voltageToPercentage(double voltage) {
-  if (voltage >= 4.2) return 100;
-  if (voltage <= 3.0) return 0;
-
-  // Simple linear approximation
-  return (int)(((voltage - 3.0) / (4.2 - 3.0)) * 100);
-}
-
 String Network::getFormattedTime() {
   struct tm timeinfo;
   if (!getLocalTime(&timeinfo)) {
@@ -126,8 +118,6 @@ void Network::fetchWeatherData(WeatherData* weatherData, UserInfo* userInfo, con
 
     HTTPClient http;
 
-    String fake = "http://this.does.not.exist";  // fake url for api error testing
-
     if (userInfo->useMetric == true){
       userInfo->temperatureLabel = " C";
       userInfo->speedLabel = " km/h";
@@ -152,7 +142,6 @@ void Network::fetchWeatherData(WeatherData* weatherData, UserInfo* userInfo, con
         deserializeJson(doc, payload);  // Deserialize the JSON payload
 
         // UserInfo Data
-        userInfo->batteryLevel = voltageToPercentage(userInfo->voltage);
         userInfo->lastUpdated = getFormattedTime();
         userInfo->currentHour = getCurrentHour();
         userInfo->lastUpdatedDate = extractDate(userInfo->lastUpdated);

examples/Inkplate10/Projects/Inkplate10_OpenMeteo_Weather_Station/src/Network.h

@@ -13,8 +13,6 @@ class Network {
     // --- Struct UserInfo ---
     struct UserInfo {
       String lastUpdated;
-      int batteryLevel;
-      double voltage;
       int currentHour;
       String city;
       String username;
@@ -35,7 +33,6 @@ class Network {
     String extractDate(String dateTime);
     String extractTime(String dateTime);
     String extractSun(String dateTime);
-    int voltageToPercentage(double voltage);
     String getFormattedTime();
     int getCurrentHour();
     String getDayName(int dayIndex);

examples/Inkplate2/Projects/Inkplate2_Google_Calendar/Inkplate2_Google_Calendar.ino

@@ -16,17 +16,25 @@ Before You Start:
       Make sure your calendar is public under "Access permissions" in calendar settings.
 */
 
+// Next 3 lines are a precaution, you can ignore those, and the example would also work without them
+#ifndef ARDUINO_INKPLATE2
+#error "Wrong board selection for this example, please select Soldered Inkplate 2 in the boards menu."
+#endif
+
 #include "src/includes.h" // Include necessary libraries and dependencies for Inkplate and networking
 
 // --- WiFi Configuration ---
 const char *ssid = "Soldered-testingPurposes";
 const char *password = "Testing443";
 
-int timeZone = 2; // timeZone is the number in (UTC + number) in your time zone UTC + 2 for Osijek, UTC - 4 for New York City
-
-String calendarID = "[email protected]";
+// --- User Info ---
+String calendarID = "[email protected]";
 String apiKey = "yourapikey";
 
+int timeZone = 2; // timeZone is the number in (UTC + number) in your time zone | UTC + 2 for Osijek, UTC - 4 for New York City
+const char  *ntpServer = "pool.ntp.org";  // in case you want to use a different one
+
+// --- Device and Data Objects ---
 Inkplate inkplate;
 calendarData calendar;
 Network network(calendarID, apiKey);
@@ -60,7 +68,7 @@ void setup()
   }
   else
   {
-    configTime(timeZone * 3600, 0, "pool.ntp.org");
+    configTime(timeZone * 3600, 0, ntpServer);
     // Fetch and display calendar
     if (network.fetchCalendar(&calendar))
     {
@@ -74,7 +82,7 @@ void setup()
     }
   }
   // Sleep to save power; wakes every 10 minutes
-  esp_sleep_enable_timer_wakeup(TIME_TO_SLEEP * uS_TO_S_FACTOR); // Activate wake-up timer -- wake up after 30mins here
+  esp_sleep_enable_timer_wakeup(TIME_TO_SLEEP * uS_TO_S_FACTOR); // Activate wake-up timer 
   esp_deep_sleep_start();                                        // Put ESP32 into deep sleep.
 }
 

examples/Inkplate2/Projects/Inkplate2_Google_Calendar/src/Gui.cpp

@@ -5,7 +5,7 @@
 #include "fonts/FreeSans12pt7b.h"
 #include "fonts/FreeSans18pt7b.h"
 #include "fonts/FreeSans9pt7b.h"
-#include "fonts/FreeSans6pt7b.h"
+#include "fonts/FreeSans7pt7b.h"
 #include "fonts/FreeSansBold24pt7b.h"
 
 Gui::Gui(Inkplate &inkplate) : inkplate(inkplate) {}
@@ -41,7 +41,7 @@ void Gui::wifiError()
 {
     inkplate.clearDisplay();
     inkplate.setTextColor(INKPLATE2_BLACK);
-    inkplate.setFont(&FreeSans6pt7b);
+    inkplate.setFont(&FreeSans7pt7b);
     inkplate.setCursor(10, 20);
     inkplate.print("WiFi connection failed.");
     inkplate.setCursor(10, 50);
@@ -72,7 +72,7 @@ void Gui::showCalendar(calendarData *calendar)
     // === Calendar Events ===
     Event *events = calendar->getEvents();
     int eventCount = calendar->getEventCount();
-    int y = 12;
+    int y = 20;
     int x = 40;
 
     String lastDate = "";
@@ -110,16 +110,16 @@ void Gui::showCalendar(calendarData *calendar)
             inkplate.println(eventDate);
 
             // Short Day (under date)
-            inkplate.setFont(&FreeSans6pt7b);
-            inkplate.setCursor(5, y + 15);
+            inkplate.setFont(&FreeSans7pt7b);
+            inkplate.setCursor(5, y + 18);
             inkplate.println(getShortDayName(timeStruct.tm_wday));
 
             lastDate = eventDate;
         }
 
-        inkplate.setFont(&FreeSans6pt7b);
+        inkplate.setFont(&FreeSans7pt7b);
         int yLineStart = y;
-        int xTime = 175;
+        int xTime = 170;
 
         // Draw event summary and time
         inkplate.setCursor(x, y);
@@ -130,15 +130,17 @@ void Gui::showCalendar(calendarData *calendar)
         }
         inkplate.println(summary);
         inkplate.setCursor(xTime, y);
-        inkplate.setFont(&FreeSans6pt7b);
+        inkplate.setFont(&FreeSans7pt7b);
         inkplate.println(formatHour(events[i].startTime));
         inkplate.setTextColor(2);
-        y += 10;
-        inkplate.setFont(&FreeSans6pt7b);
+        y += 12;
+        inkplate.setFont(&FreeSans7pt7b);
         inkplate.setCursor(xTime, y);
         inkplate.println(formatHour(events[i].endTime));
         y += 16;
 
+        inkplate.drawLine(33, yLineStart - 12, 33, y - 12, 1);
+
         counter = i;
 
         if (y >= 85)  // Stop drawing if out of vertical space
@@ -151,7 +153,7 @@ void Gui::showCalendar(calendarData *calendar)
     if (counter == eventCount - 1 && y < 90)
     {
         inkplate.setTextColor(1);
-        inkplate.setFont(&FreeSans6pt7b);
+        inkplate.setFont(&FreeSans7pt7b);
         inkplate.setCursor(10, y + 5);
         inkplate.println("No more events in the next 2 weeks!");
     }
@@ -163,7 +165,7 @@ void Gui::showCalendar(calendarData *calendar)
 void Gui::showError(const String &message)
 {
     inkplate.clearDisplay();
-    inkplate.setFont(&FreeSans6pt7b);
+    inkplate.setFont(&FreeSans7pt7b);
     inkplate.setTextColor(INKPLATE2_BLACK);
     inkplate.setCursor(10, 10);
     inkplate.println("Error:");

examples/Inkplate2/Projects/Inkplate2_Google_Calendar/src/Gui.h

@@ -3,7 +3,7 @@
 #include <Inkplate.h>
 #include "calendarData.h"
 
-#define MAX_SUMMARY_LENGTH 22
+#define MAX_SUMMARY_LENGTH 15
 
 class Gui {
 public: