Fixed Google Calendar example for all Inkplates

Author: rsoric

examples/Inkplate10/Projects/Inkplate10_Google_Calendar/Inkplate10_Google_Calendar.ino

@@ -106,14 +106,14 @@ void setup()
     display.setTextWrap(false);
     display.setTextColor(0, 7);
 
-    delay(5000);
-    network.begin();
+    // Connect Inkplate to the WiFi network
+    network.begin(ssid, pass);
 
-    // Keep trying to get data if it fails the first time
-    Serial.print("Failed getting data, retrying");
-    while (!network.getData(data))
+    // Get the data from Google Calendar
+    // Repeat attempts until data is fully downloaded
+    Serial.println("Getting data... ");
+    while (!network.getData(calendarURL, data))
     {
-        Serial.print('.');
         delay(1000);
     }
 
@@ -375,7 +375,7 @@ bool drawEvent(entry *event, int day, int beginY, int maxHeigth, int *heigthNeed
             // Gets text bounds
             display.getTextBounds(line, 0, 0, &xt1, &yt1, &w, &h);
 
-            if (w > (1200 / 3))
+            if (w > (800 / 3))
             {
                 for (int j = i - 1; j > max(-1, i - 4); --j)
                     line[j] = '.';
@@ -442,12 +442,12 @@ void drawData()
         char *timeStart = strstr(data + i, "DTSTART:") + 8;
         char *timeEnd = strstr(data + i, "DTEND:") + 6;
 
-        if (summary && summary < end)
+        if (summary && summary < end && (summary - data) > 0)
         {
             strncpy(entries[entriesNum].name, summary, strchr(summary, '\n') - summary);
             entries[entriesNum].name[strchr(summary, '\n') - summary] = 0;
         }
-        if (location && location < end)
+        if (location && location < end && (location - data) > 0)
         {
             strncpy(entries[entriesNum].location, location, strchr(location, '\n') - location);
             entries[entriesNum].location[strchr(location, '\n') - location] = 0;

examples/Inkplate10/Projects/Inkplate10_Google_Calendar/Network.cpp

@@ -16,27 +16,24 @@ Distributed as-is; no warranty is given.
 
 #include "Network.h"
 
-#include <HTTPClient.h>
-#include <WiFi.h>
-#include <WiFiClientSecure.h>
-
-void Network::begin()
+// Connect Inkplate to the WiFi
+void Network::begin(char *ssid, char *pass)
 {
     // Initiating wifi, like in BasicHttpClient example
     WiFi.mode(WIFI_STA);
     WiFi.begin(ssid, pass);
 
+    // Waiting to WiFi connect
     int cnt = 0;
     Serial.print(F("Waiting for WiFi to connect..."));
     while ((WiFi.status() != WL_CONNECTED))
     {
+        // Prints a dot every second that wifi isn't connected
         Serial.print(F("."));
         delay(1000);
         ++cnt;
 
-        WiFi.reconnect();
-        delay(5000);
-
+        // If it doesn't connect to wifi in 10 seconds, reset the ESP
         if (cnt == 10)
         {
             Serial.println("Can't connect to WIFI, restarting");
@@ -46,14 +43,14 @@ void Network::begin()
     }
     Serial.println(F(" connected"));
 
-    // Find internet time
+    // Find and print internet time, the timezone will be added later
     setTime();
 }
 
 // Gets time from ntp server
-void Network::getTime(char *timeStr, long offSet)
+void Network::getTime(char *timeStr, long offSet, int timeZone)
 {
-    // Get seconds since 1.1.1970.
+    // Get seconds since 1.1.1970. and add timezone
     time_t nowSecs = time(nullptr) + (long)timeZone * 3600L + offSet;
 
     // Used to store time
@@ -64,19 +61,18 @@ void Network::getTime(char *timeStr, long offSet)
     strcpy(timeStr, asctime(&timeinfo));
 }
 
-// Function to get all war data from web
-bool Network::getData(char *data)
+// Function to get all raw data from the web
+bool Network::getData(char *calendarURL, char *data)
 {
     // Variable to store fail
     bool f = 0;
 
-    // If not connected to wifi reconnect wifi
+    // If not connected to WiFi, reconnect wifi
     if (WiFi.status() != WL_CONNECTED)
     {
         WiFi.reconnect();
 
-        delay(5000);
-
+        // Waiting to WiFi connect again
         int cnt = 0;
         Serial.println(F("Waiting for WiFi to reconnect..."));
         while ((WiFi.status() != WL_CONNECTED))
@@ -86,9 +82,7 @@ bool Network::getData(char *data)
             delay(1000);
             ++cnt;
 
-            WiFi.reconnect();
-            delay(5000);
-
+            // If it doesn't connect to wifi in 10 seconds, reset the ESP
             if (cnt == 10)
             {
                 Serial.println("Can't connect to WIFI, restart initiated.");
@@ -100,28 +94,46 @@ bool Network::getData(char *data)
 
     // Http object used to make get request
     HTTPClient http;
-
     http.getStream().setTimeout(10);
     http.getStream().flush();
+    http.getStream().setNoDelay(true);
 
     // Begin http by passing url to it
     http.begin(calendarURL);
 
     delay(300);
 
+    int attempts = 1;
+
+    // Download data until it's a verified complete download
     // Actually do request
     int httpCode = http.GET();
 
     if (httpCode == 200)
     {
         long n = 0;
-        while (http.getStream().available())
-            data[n++] = http.getStream().read();
+
+        long now = millis();
+
+        while (millis() - now < DOWNLOAD_TIMEOUT)
+        {
+            while (http.getStream().available())
+            {
+                data[n++] = http.getStream().read();
+                now = millis();
+            }
+        }
+
         data[n++] = 0;
+
+        // If the calendar doesn't contain this string - it's invalid
+        if(strstr(data, "END:VCALENDAR") == NULL) f = 1;
     }
     else
     {
-        Serial.println(httpCode);
+        // In case there was another HTTP code, break from the function
+        Serial.print("HTTP Code: ");
+        Serial.print(httpCode);
         f = 1;
     }
 
@@ -131,6 +143,7 @@ bool Network::getData(char *data)
     return !f;
 }
 
+// Find internet time
 void Network::setTime()
 {
     // Used for setting correct time
@@ -145,13 +158,13 @@ void Network::setTime()
         yield();
         nowSecs = time(nullptr);
     }
-
     Serial.println();
 
     // Used to store time info
     struct tm timeinfo;
     gmtime_r(&nowSecs, &timeinfo);
 
+    // Print the current time without adding a timezone
     Serial.print(F("Current time: "));
     Serial.print(asctime(&timeinfo));
 }

examples/Inkplate10/Projects/Inkplate10_Google_Calendar/Network.h

@@ -15,32 +15,24 @@ Distributed as-is; no warranty is given.
 */
 
 #include "Arduino.h"
-
-#include <HTTPClient.h>
-#include <WiFi.h>
-#include <WiFiClientSecure.h>
-
-// To get timeZone from main file
-extern int timeZone;
-
-// Wifi ssid and password
-extern char ssid[];
-extern char pass[];
-
-extern char calendarURL[];
+#include "HTTPClient.h"
+#include "WiFi.h"
+#include "WiFiClientSecure.h"
 
 #ifndef NETWORK_H
 #define NETWORK_H
 
+#define DOWNLOAD_TIMEOUT 1000
+
 // All functions defined in Network.cpp
 
 class Network
 {
   public:
     // Functions we can access in main file
-    void begin();
-    void getTime(char *timeStr, long offset = 0);
-    bool getData(char *data);
+    void begin(char *ssid, char *pass);
+    void getTime(char *timeStr, long offset = 0, int timeZone = 0);
+    bool getData(char *calendarURL, char *data);
 
   private:
     // Functions called from within our class

examples/Inkplate2/Projects/Inkplate2_Google_Calendar/Inkplate2_Google_Calendar.ino

@@ -109,10 +109,11 @@ void setup()
 
     network.begin(ssid, pass); // Connect to wifi and get data
 
-    // Keep trying to get data if it fails the first time
-    while (!network.getData(data, calendarURL))
+    // Get the data from Google Calendar
+    // Repeat attempts until data is fully downloaded
+    Serial.println("Getting data... ");
+    while (!network.getData(calendarURL, data))
     {
-        Serial.println("Failed getting data, retrying");
         delay(1000);
     }
 
@@ -343,13 +344,13 @@ void getEvents()
         char *timeStart = strstr(data + i, "DTSTART:") + 8;
         char *timeEnd = strstr(data + i, "DTEND:") + 6;
 
-        if (summary && summary < end)
+        if (summary && summary < end && (summary - data) > 0)
         {
             strncpy(entries[entriesNum].name, summary,
                     strchr(summary, '\n') - summary); // Copy summary to struct variable name
             entries[entriesNum].name[strchr(summary, '\n') - summary] = 0;
         }
-        if (location && location < end)
+        if (location && location < end && (location - data) > 0)
         {
             strncpy(entries[entriesNum].location, location,
                     strchr(location, '\n') - location); // Copy location to struct variable location

examples/Inkplate2/Projects/Inkplate2_Google_Calendar/Network.cpp

@@ -101,18 +101,17 @@ void Network::getTime(char *timeStr, long offSet, struct tm *timeinfo, int timeZ
  * 
  * @return              True if succcessful, false if there was an error
  */
-bool Network::getData(char *data, char *calendarURL)
+bool Network::getData(char *calendarURL, char *data)
 {
     // Variable to store fail
     bool f = 0;
 
-    // If not connected to wifi reconnect wifi
+    // If not connected to WiFi, reconnect wifi
     if (WiFi.status() != WL_CONNECTED)
     {
         WiFi.reconnect();
 
-        delay(5000);
-
+        // Waiting to WiFi connect again
         int cnt = 0;
         Serial.println(F("Waiting for WiFi to reconnect..."));
         while ((WiFi.status() != WL_CONNECTED))
@@ -122,9 +121,7 @@ bool Network::getData(char *data, char *calendarURL)
             delay(1000);
             ++cnt;
 
-            WiFi.reconnect();
-            delay(5000);
-
+            // If it doesn't connect to wifi in 10 seconds, reset the ESP
             if (cnt == 10)
             {
                 Serial.println("Can't connect to WIFI, restart initiated.");
@@ -134,29 +131,53 @@ bool Network::getData(char *data, char *calendarURL)
         }
     }
 
+    // Http object used to make get request
+    HTTPClient http;
+    http.getStream().setTimeout(10);
+    http.getStream().flush();
+    http.getStream().setNoDelay(true);
+
     // Begin http by passing url to it
-    bool sleep = WiFi.getSleep();
-    WiFi.setSleep(false);
+    http.begin(calendarURL);
+
+    delay(300);
 
-    // WiFiClientSecure object used to make GET request
-    WiFiClientSecure client;
+    int attempts = 1;
 
-    int result = getRequest(&client, "calendar.google.com", calendarURL);
-    if (result == 0)
+    // Download data until it's a verified complete download
+    // Actually do request
+    int httpCode = http.GET();
+
+    if (httpCode == 200)
     {
-        Serial.println("HTTP Error!");
-        Serial.println("Restarting...");
-        delay(100);
-        ESP.restart();
-    }
+        long n = 0;
+
+        long now = millis();
+
+        while (millis() - now < DOWNLOAD_TIMEOUT)
+        {
+            while (http.getStream().available())
+            {
+                data[n++] = http.getStream().read();
+                now = millis();
+            }
+        }
 
-    long n = 0;
-    while (client.available())
-        data[n++] = client.read();
-    data[n++] = 0;
-    delayMicroseconds(2);
+        data[n++] = 0;
 
-    client.stop();
+        // If the calendar doesn't contain this string - it's invalid
+        if(strstr(data, "END:VCALENDAR") == NULL) f = 1;
+    }
+    else
+    {
+        // In case there was another HTTP code, break from the function
+        Serial.print("HTTP Code: ");
+        Serial.print(httpCode);
+        f = 1;
+    }
+
+    // end http
+    http.end();
 
     return !f;
 }
@@ -251,4 +272,4 @@ bool Network::getRequest(WiFiClientSecure *client, char *_api_root_url, char *_a
         (void)client->read();
 
     return true;
-}
+}