Added datetime and timesync to B-LS profile sample.

Author: skarg

zephyr/samples/profiles/b-ls/src/main.c

@@ -13,6 +13,7 @@
 #include "bacnet/bacdef.h"
 /* BACnet Stack core API */
 #include "bacnet/version.h"
+#include "bacnet/datetime.h"
 #include "bacnet/basic/services.h"
 #include "bacnet/basic/sys/mstimer.h"
 #include "bacnet/basic/sys/linear.h"
@@ -140,6 +141,10 @@ static void BACnet_Lighting_Device_Init_Handler(void *context)
 	/* link WriteGroup service to our channel object  */
     Write_Group_Notification.callback = Channel_Write_Group;
     handler_write_group_notification_add(&Write_Group_Notification);
+    apdu_set_unconfirmed_handler(
+        SERVICE_UNCONFIRMED_WRITE_GROUP, handler_write_group);
+    /* initialize timesync callback function. */
+    handler_timesync_set_callback_set(&datetime_timesync);
 	/* done */
 	LOG_INF("BACnet Device ID: %u", Device_Object_Instance_Number());
 	/* set the BACnet Basic Task device object timer for lighting output use */

zephyr/subsys/bacnet_basic/bacnet_basic.c

@@ -135,8 +135,6 @@ void bacnet_basic_init(void)
         SERVICE_CONFIRMED_WRITE_PROPERTY, handler_write_property);
     apdu_set_confirmed_handler(
         SERVICE_CONFIRMED_WRITE_PROP_MULTIPLE, handler_write_property_multiple);
-    apdu_set_unconfirmed_handler(
-        SERVICE_UNCONFIRMED_WRITE_GROUP, handler_write_group);
     apdu_set_confirmed_handler(
         SERVICE_CONFIRMED_SUBSCRIBE_COV, handler_cov_subscribe);
     /* handle communication so we can shutup when asked, or restart */

zephyr/subsys/bacnet_osif/bacnet_datetime.c

@@ -9,100 +9,86 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <time.h>
-#include <sys/time.h>
 /* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
+#include "bacnet/basic/sys/mstimer.h"
 /* BACnet Stack API */
 #include "bacnet/datetime.h"
 
+/* local time */
+static BACNET_DATE_TIME BACnet_Date_Time;
+static struct mstimer Date_Timer;
 
-/* HACK:
- * - Zephyr does not declare timezone in any header file.
- * - The gcc-arm-none-eabi-7-2018-q2-update/bin/arm-none-eabi/lib/thumb/v7e-m/
- *   libc_nano.a 'time' symbol does not resolve '_gettimeofday'
- *
- * TODO: figure out how to link in the real time() and timezone;
+/**
+ * @brief Synchronize the local time from the millisecond timer
  */
-long timezone;
-
-time_t time(time_t *tloc)
+void datetime_sync(void)
 {
-    time_t time = { 0 };
+    bacnet_time_t seconds, elapsed_seconds;
+    unsigned long milliseconds;
 
-    return time;
+    milliseconds = mstimer_elapsed(&Date_Timer);
+    elapsed_seconds = milliseconds/1000UL;
+    if (elapsed_seconds) {
+        mstimer_restart(&Date_Timer);
+        seconds = datetime_seconds_since_epoch(&BACnet_Date_Time);
+        seconds += elapsed_seconds;
+        datetime_since_epoch_seconds(&BACnet_Date_Time, seconds);
+        /* generate a hundredths value */
+        milliseconds -= (elapsed_seconds * 1000UL);
+        BACnet_Date_Time.time.hundredths = milliseconds / 10;
+    }
 }
 
 /**
- * @brief Get the date, time, timezone, and UTC offset from system
- * @param utc_time - the BACnet Date and Time structure to hold UTC time
- * @param local_time - the BACnet Date and Time structure to hold local time
- * @param utc_offset_minutes - number of minutes offset from UTC
- * For example, -6*60 represents 6.00 hours behind UTC/GMT
- * @param true if DST is enabled and active
- * @return true if local time was retrieved
+ * @brief Get the local date and time
+ * @param bdate [out] The date to get
+ * @param btime [out] The time to get
+ * @param utc_offset_minutes [out] The UTC offset in minutes
+ * @param dst_active [out] The DST flag
+ * @return true if successful, false on error
  */
 bool datetime_local(
-    BACNET_DATE * bdate,
-    BACNET_TIME * btime,
-    int16_t * utc_offset_minutes,
-    bool * dst_active)
+    BACNET_DATE *bdate,
+    BACNET_TIME *btime,
+    int16_t *utc_offset_minutes,
+    bool *dst_active)
 {
-    bool status = false;
-    struct tm tblock_st = { 0 };
-    struct tm *tblock = &tblock_st;
-    struct timeval tv;
-
-    if (gettimeofday(&tv, NULL) == 0)
-    {
-        tblock = (struct tm *)localtime((const time_t *)&tv.tv_sec);
+    datetime_sync();
+    if (bdate) {
+        datetime_copy_date(bdate, &BACnet_Date_Time.date);
     }
-    if (tblock) {
-        status = true;
-        /** struct tm
-         *   int    tm_sec   Seconds [0,60].
-         *   int    tm_min   Minutes [0,59].
-         *   int    tm_hour  Hour [0,23].
-         *   int    tm_mday  Day of month [1,31].
-         *   int    tm_mon   Month of year [0,11].
-         *   int    tm_year  Years since 1900.
-         *   int    tm_wday  Day of week [0,6] (Sunday =0).
-         *   int    tm_yday  Day of year [0,365].
-         *   int    tm_isdst Daylight Savings flag.
-         */
-        datetime_set_date(bdate, (uint16_t)tblock->tm_year + 1900,
-                          (uint8_t)tblock->tm_mon + 1,
-                          (uint8_t)tblock->tm_mday);
-        datetime_set_time(btime, (uint8_t)tblock->tm_hour,
-                          (uint8_t)tblock->tm_min, (uint8_t)tblock->tm_sec,
-                          (uint8_t)(tv.tv_usec / 10000));
-        if (dst_active) {
-            /* The value of tm_isdst is:
-               - positive if Daylight Saving Time is in effect,
-               - 0 if Daylight Saving Time is not in effect, and
-               - negative if the information is not available. */
-            if (tblock->tm_isdst > 0) {
-                *dst_active = true;
-            } else {
-                *dst_active = false;
-            }
-        }
-        /* note: timezone is declared in <time.h> stdlib. */
-        if (utc_offset_minutes) {
-            /* timezone is set to the difference, in seconds,
-                between Coordinated Universal Time (UTC) and
-                local standard time */
-            *utc_offset_minutes = timezone / 60;
-        }
+    if (btime) {
+        datetime_copy_time(btime, &BACnet_Date_Time.time);
     }
+    (void)utc_offset_minutes;
+    (void)dst_active;
+
+    return true;
+}
 
-    return status;
+/**
+ * @brief Set the local date and time from a BACnet TimeSynchronization request
+ * @param bdate [in] The date to set
+ * @param btime [in] The time to set
+ * @param utc [in] true if originating from an UTCTimeSynchronization request
+ */
+void datetime_timesync(BACNET_DATE *bdate, BACNET_TIME *btime, bool utc)
+{
+    if (bdate) {
+        datetime_copy_date(&BACnet_Date_Time.date, bdate);
+    }
+    if (btime) {
+        datetime_copy_time(&BACnet_Date_Time.time, btime);
+    }
+    mstimer_restart(&Date_Timer);
+    (void)utc;
 }
 
 /**
- * initialize the date time
+ * @brief Initialize the local date and time timer
  */
 void datetime_init(void)
 {
-    /* nothing to do */
+    mstimer_set(&Date_Timer, 0);
 }