Merge pull request #364 from eduazocar/feature/storage_sc

firmware/sys/shell_extended: Added `stg` commands functions and `se_*` fixes

Author: CW-75

examples/shell_extended/Kconfig

@@ -1 +1 @@
-rsource "../../firmware/sys/Kconfig"
+rsource "../../firmware/Kconfig.debug"

examples/shell_extended/Makefile

@@ -4,10 +4,14 @@ include ../Makefile.common
 
 # Include the shell extended module, shell and shell commands modules
 # will be implicitly included.
+USEMODULE += shell_commands
 USEMODULE += shell_extended
+# USEMODULE+= border_router
 
 # Include desired modules where shell extended is enabled.
+USEMODULE += radio
 USEMODULE += uniqueid
 USEMODULE += net_tools
+USEMODULE += storage
 
 include $(RIOTBASE)/Makefile.include

firmware/default_params.h

@@ -63,7 +63,7 @@ typedef struct {
     uint16_t freq;
 } settings_ifaces_t;
 
-#define IF_KEY ("IFKEY")
+#define IF_KEY (uint8_t*)("IFKEY")
 
 /**
  * @name storage address this address will be the storage keys

firmware/sys/Kconfig

@@ -1,3 +1,6 @@
+
+rsource "../../firmware/Kconfig.debug"
+
 menu "System"
 rsource "uniqueid/Kconfig"
 rsource "serialization/Kconfig"

firmware/sys/shell_extended/Makefile.include

@@ -1,2 +1,5 @@
 USEMODULE_INCLUDES_shell_extended := $(LAST_MAKEFILEDIR)/include
 USEMODULE_INCLUDES += $(USEMODULE_INCLUDES_shell_extended)
+ifneq (,$(filter storage,$(USEMODULE)))
+  USEMODULE_INCLUDES += $(RIOTBASE)/../firmware
+endif

firmware/sys/shell_extended/se_net_tools.c

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /**
- * @brief   Extends the shell functionality for uniqueid
+ * @brief   Extends the shell functionality for net_tools
  * @author  Luis A. Ruiz    <luisan00@hotmail.com>
  * @author  Eduardo Azócar  <eduazocarv@gmail.com>
  */
@@ -46,11 +46,11 @@ void net_tools_usage(void) {
 int net_tools_cmd(int argc, char **argv) {
     (void)argc;
     (void)argv;
-
-    if ((strcmp(argv[1], "help") == 0)) {
+    if ((argc < 3) || (argc > 6) || (strcmp(argv[1], "help") == 0)) {
         net_tools_usage();
         return 0;
     }
+
     if ((strcmp(argv[2], "add") == 0)) {
         int if_idx = atoi(argv[1]);
         char ip[40] = "";
@@ -62,13 +62,16 @@ int net_tools_cmd(int argc, char **argv) {
         }
 #if MODULE_UNIQUEID
         if (strcmp(argv[3], "ipuid") == 0) {
+            if (argc < 6) {
+                net_tools_usage();
+                return -1;
+            }
             check_inp_addr(argv[4], &addr, &prefix);
             if ((strcmp(argv[5], "static") == 0)) {
                 set_ipv6_by_uid(if_idx, &addr, prefix, UNIQUEID_STATIC_MODE);
                 DEBUG("ipv6 address: %s\n", ipv6_addr_to_str(ip, &addr, sizeof(ip)));
                 return 0;
-            }
-            if ((strcmp(argv[5], "random") == 0)) {
+            } else if ((strcmp(argv[5], "random") == 0)) {
                 set_ipv6_by_uid(if_idx, &addr, prefix, UNIQUEID_RANDOM_MODE);
                 DEBUG("ipv6 address: %s\n", ipv6_addr_to_str(ip, &addr, sizeof(ip)));
                 return 0;
@@ -91,14 +94,10 @@ int net_tools_cmd(int argc, char **argv) {
         }
         show_iface_info(if_idx);
         return 0;
-    }
-
-    if ((argc < 5) || (argc > 5)) {
-        puts("net-tools command needs at least one argument");
+    } else {
         net_tools_usage();
-        return 1;
+        return 0;
     }
-    return 0;
 }
 
 void show_iface_info(kernel_pid_t iface_idx) {

firmware/sys/shell_extended/se_storage.c

@@ -14,44 +14,120 @@
  * limitations under the License.
  */
 /**
- * @brief   Extends the shell functionality for uniqueid
+ * @brief   Extends the shell functionality for storage
  * @author  Luis A. Ruiz    <luisan00@hotmail.com>
  * @author  Eduardo Azócar  <eduazocarv@gmail.com>
  */
 
 #include <stdio.h>
 #include <string.h>
 #include "storage.h"
-
-#if MODULE_RADIO
+#include "storage_register.h"
+#include "default_params.h"
 #include "radio.h"
-#endif
 #if MODULE_RPL_PROTOCOL
 #include "rpl_protocol.h"
 #endif
+int8_t stg_save_if_settings(void);
+int8_t stg_del_if_settings(void);
+int8_t stg_load_if_settings(void);
+void build_if_settings(settings_ifaces_t *if_sets, uint8_t num_ifaces);
 
 void storage_usage(void) {
     puts("Storage tool");
     puts("Usage:  stg [save|load|show]");
+    puts("\t\t\t->[iface]");
+    printf("%" PRIu16 " Bytes. \n", sizeof(settings_ifaces_t));
     puts("");
 }
 
 int storage_cmd(int argc, char **argv) {
     (void)argc;
     (void)argv;
-
     if ((argc < 2) || (argc > 2) || (strcmp(argv[1], "help") == 0)) {
-        void storage_usage(void);
+        storage_usage();
         return 0;
     }
-
     if (strcmp(argv[1], "save") == 0) {
-        puts("ToDo: Save all firmware params in mtd storage");
+        stg_save_if_settings();
     } else if (strcmp(argv[1], "load") == 0) {
-        puts("Todo: Load firmware params from mtd storage and are processed");
+        stg_load_if_settings();
     } else if (strcmp(argv[1], "show") == 0) {
         puts("Todo:  show all firmware params saved in mtd storage");
+    } else if (strcmp(argv[1], "del") == 0) {
+        stg_del_if_settings();
     }
-
     return 0;
 }
+
+int8_t stg_save_if_settings(void) {
+    int8_t ret = 0;
+    uint8_t ifaces = gnrc_netif_numof();
+    settings_ifaces_t settings_if[ifaces];
+    build_if_settings(settings_if, ifaces);
+    mtd_reg_del(IF_KEY, sizeof(settings_if));
+    ret = mtd_save_reg(settings_if, IF_KEY, sizeof(settings_if));
+    if (ret < 0) {
+        printf("Failed saving/overwriting the register\n");
+        return ret;
+    }
+    return ret;
+}
+
+int8_t stg_del_if_settings(void) {
+    int8_t ret = 0;
+    uint8_t ifaces = gnrc_netif_numof();
+    ret = mtd_reg_del(IF_KEY, ifaces * sizeof(settings_ifaces_t));
+    return ret;
+}
+
+int8_t stg_load_if_settings(void) {
+    int8_t ret = 0;
+    uint8_t ifaces = gnrc_netif_numof();
+    settings_ifaces_t settings_if[ifaces];
+    ret = mtd_load_reg(settings_if, IF_KEY, sizeof(settings_if));
+    if (ret < 0) {
+        printf("The register doesn't exists, first you need to save the interface info\n");
+        return ret;
+    }
+    for (size_t i = 0; i < ifaces; i++) {
+        printf("Netif_id: %" PRId16 "\n", settings_if[i].id);
+        if (settings_if[i].type == 1) {
+            if (set_netopt_tx_power(settings_if[i].tx_power) < 0) {
+                printf("Failed: loading radio settings [tx_power]\n");
+            }
+            if (set_netopt_channel(settings_if[i].channel) < 0) {
+                printf("Failed: loading radio settings [channel]\n");
+            }
+            printf("Type: Radio iface\n");
+            printf("id: %" PRId16 "\n", settings_if[i].id);
+            printf("Tx power %" PRId16 "\n", settings_if[i].tx_power);
+            printf("Channel: %" PRIu16 "\n", settings_if[i].channel);
+        }
+    }
+    return ret;
+}
+
+void build_if_settings(settings_ifaces_t *if_sets, uint8_t num_ifaces) {
+    gnrc_netif_t *netif = NULL;
+    for (uint8_t i = 0; i < num_ifaces; i++) {
+        netif = gnrc_netif_iter(netif);
+        if (netif->ops != NULL) {
+            if_sets[i].id = netif->pid;
+        }
+        switch (netif->device_type) {
+        case NETDEV_TYPE_IEEE802154:
+            if_sets[i].type = 1;
+            if (get_netopt_tx_power(&if_sets[i].tx_power) < 0) {
+                puts("Err Loading Tx_power");
+            }
+            if (get_netopt_channel(&if_sets[i].channel) < 0) {
+                puts("Err Loading ");
+            }
+            break;
+        default:
+            if_sets[i].type = 0;
+            break;
+        }
+    }
+}

firmware/sys/storage/storage_internal.c

@@ -27,7 +27,6 @@
 #include "mtd.h"
 #include "storage_internal.h"
 
-
 #if (CONFIG_DEBUG_STORAGE) || (DOXYGEN)
 /**
  * @brief KCONFIG_PARAMETER TO SET DEBUG MODE
@@ -146,4 +145,4 @@ int8_t mtd_dump(void) {
         return -1;
     }
     return 0;
-}
+}

tests/driver_radio/main.c

@@ -39,6 +39,7 @@ void test_set_netopt_tx_power(void) {
 
 void test_get_netopt_tx_power(void) {
     int16_t txpower=0;
+    xtimer_sleep(5);
     int8_t err =  get_netopt_tx_power(&txpower);
     printf("Tx Power: %"PRId16"\n", txpower);
     TEST_ASSERT_EQUAL_INT(0, err);

tests/net_net_tools/main.c

@@ -77,7 +77,7 @@ void test_rm_global_addr(void) {
     TEST_ASSERT_EQUAL_INT(0, err);
 }
 
-test_set_ipv6(void) {
+void test_set_ipv6(void) {
     ipv6_addr_t ip;
     int err = 0;
     uint8_t iface = get_wired_iface();