Rel V0.7

Author: Thomas Arlitt

M5PaperCalendar.ino

@@ -2,7 +2,7 @@
 
   Digital Calendar on M5Paper
   The M5PAPER is equipped with an e-ink screen with a resolution of 540*960 @ 4.7" and supports 16 levels of grayscale display.
-                               Btn P/R/
+                               Btn L/P/R
                                    |
 	 +-----------------------------°-------------------+
 	 | 0/0   ePaper  960 x 540                         |
@@ -46,6 +46,7 @@
   V0.4  05.12.2021: Small bug fixes, show "+" if read data was ok
   V0.5  18.12.2021: Tuned the mini calendar, renamed "pure clock" to "today", some bug fixes
   V0.6  22.12.2021: Worked on the today page
+  V0.7  23.12.2021: Added the next event to today page
 
 
   Important note:
@@ -58,7 +59,7 @@
 
  *********************************************************************/
 
-#define FIRMWARE "0.6 - 2021-12-22"
+#define FIRMWARE "0.7 - 2021-12-23"
 
  /**************************************************************************************
  **     Libraries
@@ -116,7 +117,9 @@ int     sht30Humidity;    // SHT30 humidity
 const int calEntryCount = 10;
 const int calEntryMuellCount = 10;
 bool rC = false;
+bool rTC = false;
 String calendarOK = "x";
+String calendarTOK = "x";
 
 struct calendarEntries {
 	String calStartDate;
@@ -286,6 +289,7 @@ void loop() {
 		printTime();
 		printDate();
 		printWeather();
+		printNextEvent();
 		Serial.println(page);
 	}
 	if (M5.BtnP.wasPressed()) {
@@ -327,7 +331,10 @@ void loop() {
 
 	if (currentTime.hour != oldHour) {
 		oldHour = currentTime.hour;
-		if (page == 1) printWeather();
+		if (page == 1) {
+			printWeather();
+			printNextEvent();
+		}
 		if (page == 2) eventList();
 		if (page == 3) {
 			getSHT30Values();

M5PaperCalendar.vcxproj

@@ -3,7 +3,6 @@
 // the functions to draw the calendar
 
 #pragma once
-//#include "myUtils.h"
 
 // calendar helper: leap year?
 bool isLeapYear(int year) {

__vm/Compile.vmps.xml

@@ -1,12 +1,9 @@
 // myToday.h
 
 // functions for the pure clock page
-// tbd: shows time, date, the next event, the current weather
+// shows time, date, the next event, the current weather
 
 #pragma once
-//#include "Icons.h"
-//#include "myWeather.h"
-
 
 void printTime() {
 	char timeString[16];
@@ -61,8 +58,6 @@ void printDate() {
 	myToday.drawString(buf1, 5, 75);
 	myToday.pushCanvas(5, 390, UPDATE_MODE_GC16);
 	myToday.deleteCanvas();
-
-
 }
 
 void printFrame() {
@@ -99,7 +94,6 @@ void printFrame() {
 
 	myToday.pushCanvas(0, 0, UPDATE_MODE_GC16);
 	myToday.deleteCanvas();
-
 }
 
 void printWeather() {
@@ -109,7 +103,7 @@ void printWeather() {
 
 	Serial.println("weather OK? " + String(rTW));
 	if (rTW) getLocalTime(&weatherTime);
-	
+
 	myToday.createCanvas(330, 135);
 
 	String icon = weather.hourlyIcon[0];
@@ -151,3 +145,69 @@ void printWeather() {
 	myToday.deleteCanvas();
 
 }
+
+void printNextEvent() {
+	byte p = 0;
+	int checkDay;
+	int checkMonth;
+	int checkYear;
+	int checkMin;
+	int checkHour;
+
+
+	rTC = readCalendar();
+
+	Serial.println("Calendar OK? " + String(rTC));
+
+	M5.RTC.getTime(&currentTime);
+	M5.RTC.getDate(&currentDate);
+
+	tmElements_t currentNow = { 0, currentTime.min, currentTime.hour, 0, currentDate.day, currentDate.mon, currentDate.year - 1970 };
+	time_t currentNowTime = makeTime(currentNow);
+
+	//Serial.println("CurrentNow: " + String(currentNowTime));
+
+	for (byte r = 0; r < 11; r++) {
+		checkDay = calEnt[r].calStartDate.substring(0, 2).toInt();
+		checkMonth = calEnt[r].calStartDate.substring(3, 5).toInt();
+		checkYear = calEnt[r].calStartDate.substring(6, 10).toInt();
+		checkHour = calEnt[r].calStartTime.substring(0, 2).toInt();
+		checkMin = calEnt[r].calStartTime.substring(3, 5).toInt();
+
+		//Serial.println(String(checkMin) + " " + String(checkHour) + " " + String(checkDay) + " " + String(checkMonth) + " " + String(checkYear));
+
+		tmElements_t calEvent = { 0, checkMin, checkHour, 0, checkDay, checkMonth, checkYear - 1970 };
+		time_t calEventTime = makeTime(calEvent);
+
+		//Serial.println("calEventTime: " + String(calEventTime));
+
+		if (currentNowTime <= calEventTime && calEnt[r].calAllDay == "false") {
+			p = r;
+			break;
+		}
+		if (calEnt[r].calStartDate == "") break;
+	}
+
+	//Serial.println("p = " + String(p));
+
+	myToday.createCanvas(600, 135);
+
+	myToday.setTextSize(36);
+	myToday.setTextDatum(TL_DATUM);
+	if (!rTC) {
+		myToday.drawString("Fehler beim Holen der Daten", 5, 20);
+	}
+	else {
+		myToday.drawString(calEnt[p].calTitle, 5, 10);
+		myToday.setTextSize(24);
+		int x = 5, y = 50, s = 25;
+		myToday.fillCircle(x + s / 2, y + s / 3, s / 3, MYBLACK);
+		myToday.fillTriangle(x + s / 2, y + s, (x + s / 2) - s / 3.75, y + s / 2, (x + s / 2) + s / 3.5, y + s / 2, MYBLACK);
+		myToday.fillCircle(x + s / 2, y + s / 3, s / 6, MYWHITE);
+		myToday.drawString(calEnt[p].calLocation, 35, 50);
+		myToday.drawString(calEnt[p].calStartDate + " / " + calEnt[p].calStartTime, 5, 80);
+	}
+
+	myToday.pushCanvas(355, 210, UPDATE_MODE_GC16);
+	myToday.deleteCanvas();
+}

__vm/Upload.vmps.xml

@@ -3,9 +3,6 @@
 // all the functions for weather
 
 #pragma once
-//#include "Icons.h"
-//#include "myUtils.h"
-
 
 /* Convert UTC time to local time */
 time_t LocalTime(time_t time) {