Get device clock synchronization working. Use random value for DevNonce.

Author: danicampora

ports/zephyr/boards/nrf52840dk_nrf52840.conf

@@ -7,13 +7,16 @@ CONFIG_BT_CENTRAL=y
 CONFIG_MICROPY_HEAP_SIZE=98304
 CONFIG_MAIN_STACK_SIZE=8192
 
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
+CONFIG_TEST_RANDOM_GENERATOR=y
+
 CONFIG_MICROPY_CONFIGFILE="mpconfigport_full.h"
 
 # CONFIG_DYNAMIC_THREAD=y
 CONFIG_THREAD_CUSTOM_DATA=y
 CONFIG_THREAD_MONITOR=y
 CONFIG_THREAD_STACK_INFO=y
-
+CONFIG_THREAD_NAME=y
 
 CONFIG_NEWLIB_LIBC=y
 CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y
@@ -24,13 +27,24 @@ CONFIG_LORA_SX126X=y
 CONFIG_SPI=y
 
 CONFIG_LORA=y
-CONFIG_LORA_LOG_LEVEL_DBG=y
 
+# Random number generator required for several LoRaWAN services
+CONFIG_ENTROPY_GENERATOR=y
+
+# LoRaWAN application layer
 CONFIG_LORAWAN=y
-CONFIG_LORAWAN_LOG_LEVEL_DBG=y
 CONFIG_LORAMAC_REGION_EU868=y
-
-CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=8192
-
-CONFIG_TEST_RANDOM_GENERATOR=y
-
+CONFIG_LORAWAN_NVM_SETTINGS=y
+
+# LoRaWAN services required for FUOTA
+CONFIG_LORAWAN_SERVICES=y
+CONFIG_LORAWAN_APP_CLOCK_SYNC=y
+CONFIG_LORAWAN_REMOTE_MULTICAST=y
+CONFIG_LORAWAN_FRAG_TRANSPORT=y
+
+# Flash driver to store firmware image
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+CONFIG_STREAM_FLASH=y
+CONFIG_IMG_MANAGER=y

ports/zephyr/main.c

@@ -60,7 +60,6 @@
 #include "modmachine.h"
 #include "modzephyr.h"
 
-#include "nvmc.h"
 
 static char heap[MICROPY_HEAP_SIZE];
 
@@ -89,8 +88,6 @@ void init_zephyr(void) {
     net_if_ipv6_addr_add(net_if_get_default(), &in6addr_my, NET_ADDR_MANUAL, 0);
     #endif
     #endif
-
-    nvmc_init();
 }
 
 #if MICROPY_VFS

ports/zephyr/modlorawan.c

@@ -39,8 +39,7 @@
 #include <zephyr/device.h>
 #include <zephyr/lorawan/lorawan.h>
 #include <zephyr/kernel.h>
-
-#include "nvmc.h"
+#include <zephyr/random/random.h>
 
 
 #define DEBUG_printf(...)           printk("LoRa: " __VA_ARGS__)
@@ -65,6 +64,14 @@ static bool modlorawan_init_done = false;
 
 static void dl_callback(uint8_t port, bool data_pending, int16_t rssi, int8_t snr, uint8_t len, const uint8_t *hex_data) {
     DEBUG_printf("Port %d, Pending %d, RSSI %ddB, SNR %ddBm\n", port, data_pending, rssi, snr);
+
+    // if (len > 0) {
+    //     printf("Data: ");
+    //     for (int i = 0; i < len; i++) {
+    //         printf("%02x ", hex_data[i]);
+    //     }
+    //     printf("\n");
+    // }
 }
 
 static void lorwan_datarate_changed(enum lorawan_datarate dr) {
@@ -106,9 +113,7 @@ static mp_obj_t mp_lorawan_init(void) {
         lorawan_register_downlink_callback(&downlink_cb);
         lorawan_register_dr_changed_callback(lorwan_datarate_changed);
 
-        uint32_t nonce;
-        nvmc_get(E_NVM_LORAWAN_DEV_NONCE, &nonce);
-        modlorawan_dev_nonce = (uint16_t)nonce;
+        modlorawan_dev_nonce = sys_rand16_get();
         DEBUG_printf("Dev Nonce is %d\n", modlorawan_dev_nonce);
 
         modlorawan_init_done = true;
@@ -133,18 +138,19 @@ static mp_obj_t mp_lorawan_join(void) {
     join_cfg.otaa.nwk_key = app_key;
     join_cfg.otaa.dev_nonce = modlorawan_dev_nonce++;
 
-    if (modlorawan_dev_nonce == 0) {
-        modlorawan_dev_nonce = 1;
-    }
-    nvmc_set(E_NVM_LORAWAN_DEV_NONCE, modlorawan_dev_nonce);
-
     DEBUG_printf("Joining network over OTAA\n");
     ret = lorawan_join(&join_cfg);
     if (ret < 0) {
         DEBUG_printf("ERROR: lorawan_join_network failed: %d\n", ret);
         mp_raise_OSError(MP_EFAULT);
     }
 
+    /*
+     * Clock synchronization is required to schedule the multicast session
+     * in class C mode. It can also be used independent of FUOTA.
+     */
+    lorawan_clock_sync_run();
+
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_0(mp_lorawan_join_obj, mp_lorawan_join);

ports/zephyr/modtime.c

@@ -26,13 +26,23 @@
  */
 
 #include <zephyr/kernel.h>
+#include <zephyr/lorawan/lorawan.h>
 
 #include "py/obj.h"
 
+
+#define LORAWAN_GPS_TO_UNIX_TIME_OFFSET                     315964735
+
+
 static mp_obj_t mp_time_time_get(void) {
-    /* The absence of FP support is deliberate. The Zephyr port uses
-     * single precision floats so the fraction component will start to
-     * lose precision on devices with a long uptime.
-     */
-    return mp_obj_new_int(k_uptime_get() / 1000);
+    uint32_t gps_time;
+    if (lorawan_clock_sync_get(&gps_time) < 0) {
+        /* The absence of FP support is deliberate. The Zephyr port uses
+        * single precision floats so the fraction component will start to
+        * lose precision on devices with a long uptime.
+        */
+        return mp_obj_new_int(k_uptime_get() / 1000);
+    } else {
+        return mp_obj_new_int(gps_time + LORAWAN_GPS_TO_UNIX_TIME_OFFSET);
+    }
 }

ports/zephyr/nvmc.c

@@ -92,7 +92,7 @@ void nvmc_init (void) {
             printk("NVM signature set failed!\n");
         }
 
-        if (!nvmc_set (E_NVM_LORAWAN_DEV_NONCE, 1)) {
+        if (!nvmc_set (E_NVM_LORAWAN_DEV_NONCE, 0)) {
             printk("NVM charge completed clear failed!\n");
         }
     }