Merge pull request #215 from SolderedElectronics/dev

Dev to master, library update.

Author: BornaBiro

.github/workflows/compile.yml

@@ -55,7 +55,6 @@ jobs:
           fqbn: ${{ matrix.board.fqbn }}
           libraries: |
             - source-path: ./
-            - name: "Adafruit BME680 Library"
             - name: ArduinoJson
             - name: Time
             - source-url: https://github.com/SolderedElectronics/Soldered-MFRC522-RFID-Reader-Arduino-Library.git

README.md

@@ -53,6 +53,12 @@ pip3 install pyserial
 apt install python-is-python3
 ```
 
+In case you're getting an [error](https://github.com/SolderedElectronics/Inkplate-Arduino-library/issues/212) while trying to install pyserial, run the following command:
+
+```
+apt install python3-serial
+```
+
 ### Micropython
 
 If you are looking for micropython support, please find all details [here](https://github.com/SolderedElectronics/Inkplate-micropython).

examples/Inkplate10/Advanced/Communications/Inkplate10_EasyC/Inkplate10_EasyC.ino

@@ -22,7 +22,7 @@
 #error "Wrong board selection for this example, please select e-radionica Inkplate10 or Soldered Inkplate10 in the boards menu."
 #endif
 
-#include "BME680-SOLDERED.h" // Soldered library for BME680 Sensor
+#include <BME680-SOLDERED.h> // Soldered library for BME680 Sensor
 #include "Inkplate.h"        // Include Inkplate library to the sketch
 #include "icons.h"           
 
@@ -32,6 +32,9 @@ BME680 bme680; // Create an object on Soldered BME680 library (with no arguments
 
 int n = 0; // Variable that keep track on how many times screen has been partially updated
 
+// Add temperature offset to calibrate the sensor
+const float temperatureOffset = 0.0;
+
 void setup()
 {
     display.begin();        // Init Inkplate library (you should call this function ONLY ONCE)
@@ -59,7 +62,7 @@ void loop()
 
     // Display the temperature icon and measured value
     display.setCursor(493, 65);
-    display.print(bme680.readTemperature());
+    display.print(bme680.readTemperature() + temperatureOffset);
     display.print(" *C");
     display.drawImage(temperature_icon, 220, 40, temperature_icon_w, temperature_icon_h,
                       BLACK); // Arguments are: array variable name, start X, start Y, size X, size Y, color
@@ -99,4 +102,7 @@ void loop()
 
     // Wait a little bit between readings
     delay(10000);
+
+    // If you want to save energy, instead of the delay function, you can use deep sleep as we used in DeepSleep
+    // examples
 }

examples/Inkplate10/Advanced/RTC/Inkplate10_RTC_Alarm/Inkplate10_RTC_Alarm.ino

@@ -32,7 +32,7 @@ uint8_t hour = 12;
 uint8_t minutes = 50;
 uint8_t seconds = 30;
 
-// Set date and weekday (NOTE: In weekdays 0 means Sunday, 1 menas Monday, ...)
+// Set date and weekday (NOTE: In weekdays 0 means Sunday, 1 means Monday, ...)
 uint8_t weekday = 1;
 uint8_t day = 20;
 uint8_t month = 2;

examples/Inkplate10/Advanced/RTC/Inkplate10_RTC_Simple/Inkplate10_RTC_Simple.ino

@@ -32,7 +32,7 @@ uint8_t hour = 12;
 uint8_t minutes = 50;
 uint8_t seconds = 30;
 
-// Set date and weekday (NOTE: In weekdays 0 means Sunday, 1 menas Monday, ...)
+// Set date and weekday (NOTE: In weekdays 0 means Sunday, 1 means Monday, ...)
 uint8_t weekday = 4;
 uint8_t day = 11;
 uint8_t month = 11;

examples/Inkplate10/Advanced/RTC/Inkplate10_RTC_Timer/Inkplate10_RTC_Timer.ino

@@ -28,7 +28,7 @@ uint8_t hour = 12;
 uint8_t minutes = 50;
 uint8_t seconds = 30;
 
-// Set date and weekday (NOTE: In weekdays 0 means Sunday, 1 menas Monday, ...)
+// Set date and weekday (NOTE: In weekdays 0 means Sunday, 1 means Monday, ...)
 uint8_t weekday = 4;
 uint8_t day = 11;
 uint8_t month = 11;
@@ -44,7 +44,7 @@ void setup()
     display.display();      // Put clear image on display
     display.setTextSize(5); // Set text to be 5 times bigger than classic 5x7 px text
 
-    pinMode(39, INPUT_PULLUP);
+    pinMode(39, INPUT_PULLUP); // Set RTC INT pin on ESP32 GPIO39 as input with pullup resistor enabled
 
     display.rtcSetTime(hour, minutes, seconds);    // Send time to RTC
     display.rtcSetDate(weekday, day, month, year); // Send date to RTC
@@ -62,7 +62,7 @@ void setup()
      *   int_pulse
      *       true = interrupt generate a pulse; false = interrupt follows timer flag
      */
-    display.rtcTimerSet(Inkplate::TIMER_CLOCK_1HZ, countdown_time, false, false);
+    display.rtcTimerSet(Inkplate::TIMER_CLOCK_1HZ, countdown_time, true, false);
 }
 
 // Variable that keeps count on how much screen has been partially updated

examples/Inkplate10/Advanced/WEB_WiFi/Inkplate10_Show_JPG_With_HTTPClient/Inkplate10_Show_JPG_With_HTTPClient.ino

@@ -32,7 +32,7 @@ Inkplate display(INKPLATE_1BIT);
 char *ssid = ""; // Your WiFi SSID
 char *pass = ""; // Your WiFi password
 
-// Optionally
+// Add the URL of the image you want to show on Inkplate
 String url = "https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/dev/examples/Inkplate10/Advanced/WEB_WiFi/Inkplate10_Show_JPG_With_HTTPClient/image.jpg";
 
 /***********************************************/

examples/Inkplate10/Diagnostics/Inkplate10_Factory_Programming_VCOM/Inkplate10_Factory_Programming_VCOM.ino

@@ -13,7 +13,7 @@
  *
  *              Tests will also be done, to pass all tests:
  *              - Edit the WiFi information in test.cpp.
- *              - Connect a slave device via EasyC on address 0x28 (you may change this in test.cpp also).
+ *              - Connect a slave device via EasyC on address 0x30 (you may change this in test.cpp also).
  *                In the InkplateEasyCTester folder, you can find the code for uploading to Dasduino Core 
  *                or Dasduino ConnectPlus to convert Dasduino to an I2C slave device for testing an easyC connector
  *                if you don't have a device with address 0x30.

examples/Inkplate10/Diagnostics/Inkplate10_RTC_Calibration/Inkplate10_RTC_Calibration.ino

@@ -26,6 +26,8 @@ Inkplate display(INKPLATE_1BIT); // Create an object on Inkplate library and als
 #define REFRESH_DELAY 1000 // Delay between refreshes
 unsigned long time1;       // Time for measuring refresh in millis
 
+#define MAX_PARTIAL_UPDATES 9 // How many partial updates to do before a full refresh
+
 // Variable that keeps count on how much screen has been partially updated
 int n = 0;
 
@@ -60,7 +62,6 @@ void setup()
     // The real offset depends on the mode and it is equal to the: offset in ppm for specific mode * offset value in
     // decimal. For example: mode 0 (4.34 ppm), offset value 15 = + 65.1 ppm every 2 hours
     // See 8.2.3 in the datasheet for more details
-    
     display.rtcSetClockOffset(1, -63); 
 
     // How to calculate this offset?
@@ -126,7 +127,7 @@ void loop()
         display.setCursor(480, 380);        // Set position of the text
         printTime(hours, minutes, seconds); // Print the time on screen
 
-        if (n > 9) // Check if you need to do full refresh or you can do partial update
+        if (n > MAX_PARTIAL_UPDATES) // Check if you need to do full refresh or you can do partial update
         {
             display.display(true); // Do a full refresh
             n = 0;

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;