Pymesh feature added from Pygo to Lopy (#16)

* Squashed all openthread commits into a single one.

esp32/mesh: saving settings in NVM; RSSI is computed considering SNR

lora-mesh: forced Lora MAC as 802.15.4 Extended Address (not random anymore)

esp32/lora: openthread socket UPD packets are 512B max, and 8 are buffered

esp32/lora: added lora.mstatus, role, neighbors, routers micropy commands

esp32/lora: increased mesh task priority (6), delay just 1ms, lora deinit

esp32/lora: added mesh rx callback, increased mpy isr stack; removed server task

esp32/mods added machtouch, frozen python scripts for oled, pytrack and msgpack

esp32: openthread synch'ed with branch openthread_1_Nov from pycom-esp-idf

sigfox task not started, some micropy wrapper for busy channel

Lora sleep time decreased

Lora LBT implemented

openthread: 14 Dev 2018, fixed NVS usage, RSSI without SNR

esp32: openthread cli fixed

esp32: modlora added Border Router

* Squashed all openthread commits into a single one.

esp32/mesh: saving settings in NVM; RSSI is computed considering SNR

lora-mesh: forced Lora MAC as 802.15.4 Extended Address (not random anymore)

esp32/lora: openthread socket UPD packets are 512B max, and 8 are buffered

esp32/lora: added lora.mstatus, role, neighbors, routers micropy commands

esp32/lora: increased mesh task priority (6), delay just 1ms, lora deinit

esp32/lora: added mesh rx callback, increased mpy isr stack; removed server task

esp32/mods added machtouch, frozen python scripts for oled, pytrack and msgpack

esp32: openthread synch'ed with branch openthread_1_Nov from pycom-esp-idf

sigfox task not started, some micropy wrapper for busy channel

Lora sleep time decreased

Lora LBT implemented

openthread: 14 Dev 2018, fixed NVS usage, RSSI without SNR

esp32: openthread cli fixed

esp32: modlora added Border Router

* esp32/application.mk: added group of lora openthread files, buit only if OPENTHREAD flag is enable (yes by default)

* esp32: added modmesh.c as micropy wrapper for mesh commands from modlora.c

* esp32/mods/modmesh: added Mesh.deinit command, removed debug, made functions static

* esp32/lib: updated idf libraries, from idf_v3.1

* esp32/modmesh: modmesh task is started dinamically at Lora.Mesh() and erased at Lora.Mesh.deinit()

Author: Catalin Ioana

esp32/application.mk

@@ -192,11 +192,17 @@ APP_LORA_SRC_C = $(addprefix lora/,\
 	sx1276-board.c \
 	sx1272-board.c \
 	board.c \
+	)
+
+APP_LORA_OPENTHREAD_SRC_C = $(addprefix lora/,\
 	otplat_alarm.c \
 	otplat_radio.c \
 	ot-settings.c \
 	ot-log.c \
-	ot-task.c \
+	)
+
+APP_MOD_MESH_SRC_C = $(addprefix mods/,\
+	modmesh.c \
 	)
 
 APP_LIB_LORA_SRC_C = $(addprefix lib/lora/,\
@@ -305,6 +311,13 @@ ifeq ($(BOARD),$(filter $(BOARD), FIPY GPY))
 OBJ += $(addprefix $(BUILD)/, $(APP_LTE_SRC_C:.c=.o) $(APP_MODS_LTE_SRC_C:.c=.o))
 endif
 
+# add OPENTHREAD code only if flag enabled and for LOPY, LOPY4 and FIPY
+ifeq ($(OPENTHREAD), on)
+ifeq ($(BOARD), $(filter $(BOARD), LOPY LOPY4 FIPY))
+OBJ += $(addprefix $(BUILD)/, $(APP_LORA_OPENTHREAD_SRC_C:.c=.o) $(APP_MOD_MESH_SRC_C:.c=.o))
+endif
+endif # ifeq ($(OPENTHREAD), on)
+
 OBJ += $(addprefix $(BUILD)/, $(APP_MAIN_SRC_C:.c=.o) $(APP_HAL_SRC_C:.c=.o) $(APP_LIB_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(APP_MODS_SRC_C:.c=.o) $(APP_STM_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(APP_FATFS_SRC_C:.c=.o) $(APP_LITTLEFS_SRC_C:.c=.o) $(APP_UTIL_SRC_C:.c=.o) $(APP_TELNET_SRC_C:.c=.o))
@@ -325,6 +338,12 @@ ifeq ($(BOARD),$(filter $(BOARD), FIPY GPY))
 SRC_QSTR += $(APP_MODS_LTE_SRC_C)
 endif
 
+ifeq ($(OPENTHREAD), on)
+ifeq ($(BOARD), $(filter $(BOARD), LOPY LOPY4 FIPY))
+SRC_QSTR += $(APP_MOD_MESH_SRC_C)
+endif
+endif # ifeq ($(OPENTHREAD), on)
+
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=

esp32/bootloader/lib/libbootloader_support.a

@@ -14,7 +14,6 @@
 #include "ot-log.h"
 
 #include "pycom_config.h"
-#include <openthread/types.h>
 #include <openthread/config.h>
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/uart.h>
@@ -73,6 +72,7 @@ void otPlatLogBufHex(const uint8_t *aBuf, uint16_t aBufLength) {
     for (int i = 0; i < aBufLength; i++) {
         length += sprintf(&logString[length], "%x ", aBuf[i]);
     }
+    logString[length++] = '\n';
 }
 
 void otPlatLogFlush(void) {

esp32/bootloader/lib/liblog.a

@@ -12,53 +12,27 @@
 #include <stdbool.h>
 #include <string.h>
 #include "pycom_config.h"
+#include "nvs.h"
 
 #include <openthread/instance.h>
 #include <openthread/ip6.h>
 #include <openthread/platform/settings.h>
+#include "ot-log.h"
 
-#define OT_PLAT_SETTINGS_NUM                    7
-#define OT_PLAT_SETTINGS_VAL_MAX_SIZE         128
-#define OT_PLAT_SETTINGS_MAX_INDEX_PER_KEY     1
-
-typedef struct settings_row_s {
-    int16_t size;
-    uint8_t value[OT_PLAT_SETTINGS_VAL_MAX_SIZE];
-} settings_row_t;
-
-typedef struct settings_s {
-    //uint16_t key; # key is the actual index
-    int8_t rows_num;
-    settings_row_t rows[OT_PLAT_SETTINGS_MAX_INDEX_PER_KEY];
-} settings_t;
-
-settings_t settings[OT_PLAT_SETTINGS_NUM];
-
-void printRow(settings_row_t row) {
-    printf("size %d:", row.size);
-    /*
-     for (int i = 0; i < row.size; i++)
-     printf("%d, ", row.value[i]);
-     */
-    printf("\n");
-}
+#define OT_NVS_NAMESPACE                       "LORA_MESH"
 
-void printKey(settings_t key) {
-    printf(" num_rows: %d", key.rows_num);
-    for (int i = 0; i < key.rows_num; i++) {
-        printf("\nRow %d, ", i);
-        printRow(key.rows[i]);
-    }
-}
+#define OT_PLAT_SETTINGS_NUM					255
+#define OT_PLAT_SETTINGS_VAL_MAX_SIZE 		256
+#define OT_PLAT_SETTINGS_MAX_INDEX_PER_KEY 	256
+
+/* number of chars to store key and index as string, 256 key max, 256 index max, so in hex FFFF 4 chars + 1 termination */
+#define KEY_STRING_CHARS_NUM             5
+
+// returns the string, zzzOutStr, created from integer: 2 hex digits xxxKey and 2 hex digits yyyIndex
+#define KEY_INDEX_TO_STR(xxxKey, yyyIndex, zzzOutStr)              itoa((((xxxKey << 16) | yyyIndex) & 0xFFFF), zzzOutStr, 16)
+
+static nvs_handle ot_nvs_handle;
 
-void otPlatSettingsPrint(void) {
-    printf("----------------------------------------------");
-    for (int i = 0; i < OT_PLAT_SETTINGS_NUM; i++) {
-        printf("\nKey %d: ", i);
-        printKey(settings[i]);
-    }
-    printf("----------------------------------------------\n");
-}
 /**
  * Performs any initialization for the settings subsystem, if necessary.
  *
@@ -69,14 +43,12 @@ void otPlatSettingsPrint(void) {
 
 void otPlatSettingsInit(otInstance *aInstance) {
     (void) aInstance;
-    otPlatLog(OT_LOG_LEVEL_DEBG, 0, "otPlatSettingsInit mem %d B\n",
-            OT_PLAT_SETTINGS_NUM * sizeof(settings_t));
-    for (int i = 0; i < OT_PLAT_SETTINGS_NUM; i++) {
-        settings[i].rows_num = -1;
-        for (int j = 0; j < OT_PLAT_SETTINGS_MAX_INDEX_PER_KEY; j++) {
-            settings[i].rows[j].size = -1;
-        }
+
+    if (nvs_open(OT_NVS_NAMESPACE, NVS_READWRITE, &ot_nvs_handle) != ESP_OK) {
+        otPlatLog(OT_LOG_LEVEL_INFO, 0, "otPlatSettingsInit NOT OK");
     }
+    //nvs_erase_all(ot_nvs_handle);
+    otPlatLog(OT_LOG_LEVEL_INFO, 0, "otPlatSettingsInit ok");
     //printSettings();
 }
 
@@ -126,27 +98,44 @@ void otPlatSettingsInit(otInstance *aInstance) {
 otError otPlatSettingsGet(otInstance *aInstance, uint16_t aKey, int aIndex,
         uint8_t *aValue, uint16_t *aValueLength) {
     (void) aInstance;
-    otPlatLog(OT_LOG_LEVEL_DEBG, 0, "otPlatSettingsGet %d %d %d ", aKey, aIndex,
-            *aValueLength);
+    esp_err_t err;
+    size_t length = 0;
+    char key_str[KEY_STRING_CHARS_NUM];
 
-    if (aKey > OT_PLAT_SETTINGS_NUM)
-        return OT_ERROR_NOT_FOUND;
+    // transform key to string
+    KEY_INDEX_TO_STR(aKey, aIndex, key_str);
 
-    if (aIndex > settings[aKey].rows_num
-            || settings[aKey].rows[aIndex].size < 0) {
-        otPlatLog(OT_LOG_LEVEL_DEBG, 0, " not found\n");
+    otPlatLog(OT_LOG_LEVEL_INFO, 0, "otPlatSettingsGet %d 0x%s %d %d %p", aKey, key_str, aIndex,
+            *aValueLength, aValue);
+
+    if (aKey > OT_PLAT_SETTINGS_NUM || aIndex > OT_PLAT_SETTINGS_MAX_INDEX_PER_KEY) {
+        otPlatLog(OT_LOG_LEVEL_INFO, 0, " not found\n");
         return OT_ERROR_NOT_FOUND;
     }
 
-    if (*aValueLength < settings[aKey].rows[aIndex].size) {
-        aValueLength = NULL;
+    if (aValue == NULL && aValueLength == NULL) {
+        // checking if key exists
+        if (ESP_OK != (err = nvs_get_blob(ot_nvs_handle, key_str, aValue, &length))) {
+            otPlatLog(OT_LOG_LEVEL_INFO, 0, " nvs_get_blob 1 0x%X\n", err);
+            return OT_ERROR_NOT_FOUND;
+        }
+    } else if (aValue == NULL && aValueLength != NULL) {
+        // checking the size of a key
+        if (ESP_OK != (err = nvs_get_blob(ot_nvs_handle, key_str, aValue, &length))) {
+            otPlatLog(OT_LOG_LEVEL_INFO, 0, " nvs_get_blob 2 0x%X\n", err);
+            return OT_ERROR_NOT_FOUND;
+        }
+        *aValueLength = length;
     } else {
-        memcpy(aValue, settings[aKey].rows[aIndex].value,
-                settings[aKey].rows[aIndex].size);
-        *aValueLength = settings[aKey].rows[aIndex].size;
+        length = *aValueLength;
+        if (ESP_OK != (err = nvs_get_blob(ot_nvs_handle, key_str, aValue, &length))) {
+            otPlatLog(OT_LOG_LEVEL_INFO, 0, " nvs_get_blob 3 0x%X\n", err);
+            return OT_ERROR_NOT_FOUND;
+        }
+        *aValueLength = length;
     }
-    otPlatLog(OT_LOG_LEVEL_DEBG, 0, " ok\n");
-    //printSettings();
+
+    otPlatLog(OT_LOG_LEVEL_INFO, 0, " ok\n");
     return OT_ERROR_NONE;
 }
 
@@ -179,25 +168,13 @@ otError otPlatSettingsGet(otInstance *aInstance, uint16_t aKey, int aIndex,
 otError otPlatSettingsSet(otInstance *aInstance, uint16_t aKey,
         const uint8_t *aValue, uint16_t aValueLength) {
     (void) aInstance;
-    otPlatLog(OT_LOG_LEVEL_DEBG, 0, "otPlatSettingsSet key %d len %d", aKey,
-            aValueLength);
 
-    if (aKey > OT_PLAT_SETTINGS_NUM)
-        return OT_ERROR_NOT_IMPLEMENTED;
-
-    if (aValueLength > OT_PLAT_SETTINGS_VAL_MAX_SIZE)
-        return OT_ERROR_NOT_IMPLEMENTED;
-
-    settings[aKey].rows_num = 1;
+    otPlatLog(OT_LOG_LEVEL_INFO, 0, "otPlatSettingsSet key %d len %d", aKey, aValueLength);
 
-    settings[aKey].rows[0].size = aValueLength;
+    // delete all records for this aKey
+    otPlatSettingsDelete(aInstance, aKey, -1);
 
-    if (aValueLength > 0) {
-        memcpy(settings[aKey].rows[0].value, aValue, aValueLength);
-    }
-    otPlatLog(OT_LOG_LEVEL_DEBG, 0, " ok\n");
-    //printSettings();
-    return OT_ERROR_NONE;
+    return otPlatSettingsAdd(aInstance, aKey, aValue, aValueLength);
 }
 
 /// Removes a setting from the setting store
@@ -225,22 +202,35 @@ otError otPlatSettingsSet(otInstance *aInstance, uint16_t aKey,
  */
 otError otPlatSettingsDelete(otInstance *aInstance, uint16_t aKey, int aIndex) {
     (void) aInstance;
-    otPlatLog(OT_LOG_LEVEL_DEBG, 0, "otPlatSettingsDelete %d %d\n", aKey,
-            aIndex);
+    char key_str[KEY_STRING_CHARS_NUM];
 
-    if (aKey > OT_PLAT_SETTINGS_NUM)
-        return OT_ERROR_NOT_FOUND;
+    otPlatLog(OT_LOG_LEVEL_INFO, 0, "otPlatSettingsDelete %d %d", aKey,
+            aIndex);
 
-    if (aIndex >= OT_PLAT_SETTINGS_MAX_INDEX_PER_KEY)
+    if (aKey > OT_PLAT_SETTINGS_NUM || aIndex > OT_PLAT_SETTINGS_MAX_INDEX_PER_KEY)
         return OT_ERROR_NOT_FOUND;
 
-    if (aIndex == -1) {
-        for (int i = 0; i < settings[aKey].rows_num; i++)
-            settings[aKey].rows[i].size = -1;
+    if (aIndex != -1) {
+        // transform key to string
+        KEY_INDEX_TO_STR(aKey, aIndex, key_str);
 
-        settings[aKey].rows_num = -1;
+        if (ESP_OK == nvs_erase_key(ot_nvs_handle, key_str)) {
+            nvs_commit(ot_nvs_handle);
+        }
+    } else {
+        // delete all indexes for this key
+        for (int index = 0; index < OT_PLAT_SETTINGS_MAX_INDEX_PER_KEY; index++) {
+            KEY_INDEX_TO_STR(aKey, index, key_str);
+            // try to erase the key for this index
+            if (ESP_ERR_NVS_NOT_FOUND == nvs_erase_key(ot_nvs_handle, key_str)) {
+                // key is not found, so we're done for this aKey
+                break;
+            }
+        }
+        nvs_commit(ot_nvs_handle);
     }
-    otPlatLog(OT_LOG_LEVEL_DEBG, 0, "otPlatSettingsDelete ok\n");
+
+    otPlatLog(OT_LOG_LEVEL_INFO, 0, "otPlatSettingsDelete ok");
     return OT_ERROR_NONE;
 
 }
@@ -278,10 +268,40 @@ otError otPlatSettingsDelete(otInstance *aInstance, uint16_t aKey, int aIndex) {
  */
 otError otPlatSettingsAdd(otInstance *aInstance, uint16_t aKey,
         const uint8_t *aValue, uint16_t aValueLength) {
+    int index = 0;
+    size_t length = 0;
+    esp_err_t err = ESP_OK;
+    char key_str[KEY_STRING_CHARS_NUM];
+
     (void) aInstance;
-    otPlatLog(OT_LOG_LEVEL_DEBG, 0, "!!!!! otPlatSettingsAdd %d %d %d\n", aKey,
-            *aValue, aValueLength);
-    return OT_ERROR_NOT_IMPLEMENTED;
+
+    otPlatLog(OT_LOG_LEVEL_INFO, 0, "otPlatSettingsAdd %d 0x%p %d", aKey,
+            aValue, aValueLength);
+
+    if (aKey > OT_PLAT_SETTINGS_NUM)
+        return OT_ERROR_NOT_FOUND;
+
+    // search for first index available for aKey
+    for (index = 0; index < OT_PLAT_SETTINGS_MAX_INDEX_PER_KEY; index++) {
+        KEY_INDEX_TO_STR(aKey, index, key_str);
+        // checking if key exists
+        if (ESP_OK != (err = nvs_get_blob(ot_nvs_handle, key_str, NULL, &length))) {
+            otPlatLog(OT_LOG_LEVEL_INFO, 0, "found free index %d\n", index);
+            // key doesn't exist
+            break;
+        }
+    }
+
+    if (ESP_OK != err) {
+        // try to write
+        if (ESP_OK != (err = nvs_set_blob(ot_nvs_handle, key_str, aValue, aValueLength))) {
+            otPlatLog(OT_LOG_LEVEL_INFO, 0, " nvs_set_blob 0x%X\n", err);
+            return OT_ERROR_NOT_IMPLEMENTED;
+        }
+        nvs_commit(ot_nvs_handle);
+        otPlatLog(OT_LOG_LEVEL_INFO, 0, "stored as index %d\n", index);
+    }
+    return OT_ERROR_NONE;
 }
 
 /// Removes all settings from the setting store
@@ -292,12 +312,9 @@ otError otPlatSettingsAdd(otInstance *aInstance, uint16_t aKey,
  *             The OpenThread instance structure.
  */
 void otPlatSettingsWipe(otInstance *aInstance) {
-    for (int i = 0; i < OT_PLAT_SETTINGS_NUM; i++) {
-        settings[i].rows_num = -1;
-        for (int j = 0; j < OT_PLAT_SETTINGS_MAX_INDEX_PER_KEY; j++) {
-            settings[i].rows[j].size = -1;
-        }
-    }
+    nvs_erase_all(ot_nvs_handle);
+    nvs_commit(ot_nvs_handle);
+    otPlatLog(OT_LOG_LEVEL_INFO, 0, "!!!!! otPlatSettingsWipe");
 }
 
 /**