Split NTP and clock functions

openBeken_win32_mvsc2017.vcxproj

@@ -242,7 +242,9 @@
     <ClCompile Include="src\driver\drv_max72xx_single.c" />
     <ClCompile Include="src\driver\drv_mcp9808.c" />
     <ClCompile Include="src\driver\drv_ntp.c" />
-    <ClCompile Include="src\driver\drv_ntp_events.c" />
+    <ClCompile Include="src\driver\drv_deviceclock.c" />
+    <ClCompile Include="src\libraries\obktime\obktime.c" />
+    <ClCompile Include="src\driver\drv_timed_events.c" />
     <ClCompile Include="src\driver\drv_openWeatherMap.c" />
     <ClCompile Include="src\driver\drv_pinMutex.c" />
     <ClCompile Include="src\driver\drv_pir.c" />

openBeken_win32_mvsc2017.vcxproj.filters

@@ -62,7 +62,7 @@
     <ClCompile Include="src\driver\drv_max72xx_single.c" />
     <ClCompile Include="src\driver\drv_mcp9808.c" />
     <ClCompile Include="src\driver\drv_ntp.c" />
-    <ClCompile Include="src\driver\drv_ntp_events.c" />
+    <ClCompile Include="src\driver\drv_timed_events.c" />
     <ClCompile Include="src\driver\drv_pt6523.c" />
     <ClCompile Include="src\driver\drv_pwmToggler.c" />
     <ClCompile Include="src\driver\drv_pwrCal.c" />

platforms/BL602/bouffalo.mk

@@ -1,7 +1,7 @@
 # Component Makefile
 #
 ## These include paths would be exported to project level
-COMPONENT_ADD_INCLUDEDIRS += src/ src/httpserver/ src/httpclient/ src/cmnds/ src/logging/ src/hal/bl602/ src/mqtt/ src/cJSON src/base64 src/driver src/devicegroups src/bitmessage src/littlefs libraries/berry/src include/
+COMPONENT_ADD_INCLUDEDIRS += src/ src/httpserver/ src/httpclient/ src/cmnds/ src/logging/ src/hal/bl602/ src/mqtt/ src/cJSON src/base64 src/driver src/devicegroups src/bitmessage src/littlefs libraries/berry/src src/libraries/obktime/ include/
 
 ## not be exported to project level
 COMPONENT_PRIV_INCLUDEDIRS :=
@@ -15,6 +15,6 @@ COMPONENT_SRCS :=
 COMPONENT_OBJS := $(patsubst %.c,%.o, $(COMPONENT_SRCS))
 COMPONENT_OBJS := $(patsubst %.S,%.o, $(COMPONENT_OBJS))
 
-COMPONENT_SRCDIRS := src/ src/jsmn src/httpserver src/httpclient src/cmnds src/logging src/hal/bl602 src/mqtt src/i2c src/cJSON src/base64 src/driver src/devicegroups src/bitmessage src/littlefs src/hal/generic libraries/berry/src src/berry src/berry/modules src/libraries/IRremoteESP8266/src
+COMPONENT_SRCDIRS := src/ src/jsmn src/httpserver src/httpclient src/cmnds src/logging src/hal/bl602 src/mqtt src/i2c src/cJSON src/base64 src/driver src/devicegroups src/bitmessage src/littlefs src/hal/generic libraries/berry/src src/berry src/berry/modules src/libraries/obktime src/libraries/IRremoteESP8266/src
 
 COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive

platforms/obk_main.cmake

@@ -98,7 +98,9 @@ set(OBKM_SRC
 	${OBK_SRCS}driver/drv_max72xx_single.c
 	${OBK_SRCS}driver/drv_mcp9808.c
 	${OBK_SRCS}driver/drv_ntp.c
-	${OBK_SRCS}driver/drv_ntp_events.c
+	${OBK_SRCS}driver/drv_deviceclock.c
+	${OBK_SRCS}libraries/obktime/obktime.c
+	${OBK_SRCS}driver/drv_timed_events.c
 	${OBK_SRCS}driver/drv_openWeatherMap.c
 	${OBK_SRCS}driver/drv_pir.c
 	${OBK_SRCS}driver/drv_pixelAnim.c

platforms/obk_main.mk

@@ -117,7 +117,9 @@ OBKM_SRC  += $(OBK_SRCS)driver/drv_max72xx_internal.c
 OBKM_SRC  += $(OBK_SRCS)driver/drv_max72xx_single.c
 OBKM_SRC  += $(OBK_SRCS)driver/drv_mcp9808.c
 OBKM_SRC  += $(OBK_SRCS)driver/drv_ntp.c
-OBKM_SRC  += $(OBK_SRCS)driver/drv_ntp_events.c
+OBKM_SRC  += $(OBK_SRCS)driver/drv_deviceclock.c
+OBKM_SRC  += $(OBK_SRCS)libraries/obktime/obktime.c
+OBKM_SRC  += $(OBK_SRCS)driver/drv_timed_events.c
 OBKM_SRC  += $(OBK_SRCS)driver/drv_openWeatherMap.c
 OBKM_SRC  += $(OBK_SRCS)driver/drv_pir.c
 OBKM_SRC  += $(OBK_SRCS)driver/drv_pixelAnim.c

src/cmnds/cmd_if.c

@@ -7,6 +7,7 @@
 #include "../driver/drv_public.h"
 #include "../driver/drv_battery.h"
 #include "../driver/drv_ntp.h"
+#include "../driver/drv_deviceclock.h"
 #include "../hal/hal_flashVars.h"
 #include <ctype.h> // isspace
 
@@ -276,50 +277,50 @@ float getFailedBoots(const char *s) {
 float getUpTime(const char *s) {
 	return g_secondsElapsed;
 }
+#if ENABLE_LOCAL_CLOCK || ENABLE_NTP
 float getWeekDay(const char *s) {
-	return NTP_GetWeekDay();
+	return CLOCK_GetWeekDay();
 }
 float getMinute(const char *s) {
-	return NTP_GetMinute();
+	return CLOCK_GetMinute();
 }
 float getHour(const char *s) {
-	return NTP_GetHour();
+	return CLOCK_GetHour();
 }
 float getSecond(const char *s) {
-	return NTP_GetSecond();
+	return CLOCK_GetSecond();
 }
 float getYear(const char *s) {
-	return NTP_GetYear();
+	return CLOCK_GetYear();
 }
 float getMonth(const char *s) {
-	return NTP_GetMonth();
+	return CLOCK_GetMonth();
 }
 float getMDay(const char *s) {
-	return NTP_GetMDay();
+	return CLOCK_GetMDay();
 }
-
+#endif
 #ifdef ENABLE_NTP
 
-float getNTPOn(const char* s)
-{
+float getNTPOn(const char *s) {
 	return NTP_IsTimeSynced();
 }
-
 #endif
+#if ENABLE_CLOCK_DST
 
-#if ENABLE_NTP_DST
 float isDST(const char *s){
 	return Time_IsDST();
 }
 #endif
 
-#if ENABLE_NTP_SUNRISE_SUNSET
+#if ENABLE_CLOCK_SUNRISE_SUNSET
+
 
 float getSunrise(const char *s) {
-	return NTP_GetSunrise();
+	return CLOCK_GetSunrise();
 }
 float getSunset(const char *s) {
-	return NTP_GetSunset();
+	return CLOCK_GetSunset();
 }
 
 #endif
@@ -444,71 +445,69 @@ const constant_t g_constants[] = {
 	//cnstdetail:"descr":"Current value of energy counter from energy metering chip",
 	//cnstdetail:"requires":""}
 	{"$energy", &getEnergy},
+	//cnstdetail:{"name":"$yesterday",
+	//cnstdetail:"title":"$yesterday",
+	//cnstdetail:"descr":"Yesterdays energy consuption",
+	//cnstdetail:"requires":""}
+	{ "$yesterday", &getYesterday },
+	//cnstdetail:{"name":"$today",
+	//cnstdetail:"title":"$today",
+	//cnstdetail:"descr":"Todays energy consuption",
+	//cnstdetail:"requires":""}
+	{ "$today", &getToday },
+#endif	//ENABLE_DRIVER_BL0937
+#if ENABLE_LOCAL_CLOCK || ENABLE_NTP
 	//cnstdetail:{"name":"$day",
 	//cnstdetail:"title":"$day",
-	//cnstdetail:"descr":"Current weekday from NTP",
+	//cnstdetail:"descr":"Current weekday from device clock",
 	//cnstdetail:"requires":""}
-#endif	//ENABLE_DRIVER_BL0937
-#ifdef ENABLE_NTP
 	{"$day", &getWeekDay},
 	//cnstdetail:{"name":"$hour",
 	//cnstdetail:"title":"$hour",
-	//cnstdetail:"descr":"Current hour from NTP",
+	//cnstdetail:"descr":"Current hour from device clock",
 	//cnstdetail:"requires":""}
 	{"$hour", &getHour},
 	//cnstdetail:{"name":"$minute",
 	//cnstdetail:"title":"$minute",
-	//cnstdetail:"descr":"Current minute from NTP",
+	//cnstdetail:"descr":"Current minute from device clock",
 	//cnstdetail:"requires":""}
 	{ "$minute", &getMinute },
 	//cnstdetail:{"name":"$second",
 	//cnstdetail:"title":"$second",
-	//cnstdetail:"descr":"Current second from NTP",
+	//cnstdetail:"descr":"Current second from device clock",
 	//cnstdetail:"requires":""}
 	{ "$second", &getSecond },
 	//cnstdetail:{"name":"$mday",
 	//cnstdetail:"title":"$mday",
-	//cnstdetail:"descr":"Current mday from NTP",
+	//cnstdetail:"descr":"Current mday from device clock",
 	//cnstdetail:"requires":""}
 	{ "$mday", &getMDay },
 	//cnstdetail:{"name":"$month",
 	//cnstdetail:"title":"$month",
-	//cnstdetail:"descr":"Current month from NTP",
+	//cnstdetail:"descr":"Current month from device clock",
 	//cnstdetail:"requires":""}
 	{ "$month", &getMonth },
 	//cnstdetail:{"name":"$year",
 	//cnstdetail:"title":"$year",
-	//cnstdetail:"descr":"Current Year from NTP",
+	//cnstdetail:"descr":"Current Year from device clock",
 	//cnstdetail:"requires":""}
 	{ "$year", &getYear },
-#ifdef ENABLE_DRIVER_BL0937
-	//cnstdetail:{"name":"$yesterday",
-	//cnstdetail:"title":"$yesterday",
-	//cnstdetail:"descr":"",
-	//cnstdetail:"requires":""}
-	{ "$yesterday", &getYesterday },
-	//cnstdetail:{"name":"$today",
-	//cnstdetail:"title":"$today",
-	//cnstdetail:"descr":"",
-	//cnstdetail:"requires":""}
-	{ "$today", &getToday },
-#endif
-#if ENABLE_NTP_DST
+#if ENABLE_CLOCK_DST
 	//cnstdetail:{"name":"$isDST",
 	//cnstdetail:"title":"$isDST",
-	//cnstdetail:"descr":"",
+	//cnstdetail:"descr":"Returns 1 if DST (daylight saving time) is active, otherwise 0",
 	//cnstdetail:"requires":""}
 	{ "$isDST", &isDST },
 #endif
-#if ENABLE_NTP_SUNRISE_SUNSET
+#if ENABLE_CLOCK_SUNRISE_SUNSET
 	//cnstdetail:{"name":"$sunrise",
 	//cnstdetail:"title":"$sunrise",
-	//cnstdetail:"descr":"Next sunrise as a TimerSeconds from midnight",
+	//cnstdetail:"descr":"Next sunrise as a TimerSeconds from midnight - will also print time to log",
 	//cnstdetail:"requires":""}
 	{ "$sunrise", &getSunrise },
 	//cnstdetail:{"name":"$sunset",
 	//cnstdetail:"title":"$sunset",
-	//cnstdetail:"descr":"Next sunset as a TimerSeconds from midnight",
+	//cnstdetail:"descr":"Next sunset as a TimerSeconds from midnight - will also print time to log",
 	//cnstdetail:"requires":""}
 	{ "$sunset", &getSunset },
 #endif
@@ -517,7 +516,7 @@ const constant_t g_constants[] = {
 	//cnstdetail:"descr":"Returns 1 if NTP is on and already synced (so device has correct time), otherwise 0.",
 	//cnstdetail:"requires":""}
 	{ "$NTPOn", &getNTPOn },
-#endif	//ENABLE_NTP
+#endif	// ENABLE_LOCAL_CLOCK || ENABLE_NTP
 #ifdef ENABLE_DRIVER_BATTERY
 	//cnstdetail:{"name":"$batteryVoltage",
 	//cnstdetail:"title":"$batteryVoltage",