Using mynewt extended shell api with streamer

Author: ncasaril

Kbuild

@@ -52,6 +52,7 @@ uwbcore-y	+= porting/dpl/kernel/src/stats.o
 uwbcore-y	+= porting/dpl/kernel/src/stats_sysfs.o
 uwbcore-y	+= porting/dpl_lib/src/dpl_mbuf.o
 uwbcore-y	+= porting/dpl_lib/src/dpl_mempool.o
+uwbcore-y	+= porting/dpl_lib/src/streamer.o
 uwbcore-y	+= hw/drivers/uwb/src/uwb.o
 uwbcore-y	+= lib/cir/src/cir.o
 uwbcore-y	+= lib/cir/src/cir_json.o

apps/uwb_desense/Kbuild

@@ -20,3 +20,4 @@ uwb_desense-y	+= ../../lib/uwb_rf_tests/desense/src/desense.o
 uwb_desense-y	+= ../../lib/uwb_rf_tests/desense/src/desense_cli.o
 uwb_desense-y	+= ../../lib/uwb_rf_tests/desense/src/desense_sysfs.o
 uwb_desense-y	+= ../../lib/uwb_rf_tests/desense/src/desense_debugfs.o
+uwb_desense-y	+= ../../porting/dpl_lib/src/streamer.o

lib/panmaster/src/panmaster_cli.c

@@ -31,13 +31,14 @@
 
 #include <shell/shell.h>
 #include <console/console.h>
+#include <streamer/streamer.h>
 
 #include "panmaster/panmaster.h"
 #include "panmaster_priv.h"
 #include "imgmgr/imgmgr.h"
 #include <bootutil/image.h>
 
-static int panmaster_cli_cmd(int argc, char **argv);
+static int panmaster_cli_cmd(const struct shell_cmd *cmd, int argc, char **argv, struct streamer *streamer);
 
 #if MYNEWT_VAL(SHELL_CMD_HELP)
 const struct shell_param cmd_pm_param[] = {
@@ -58,15 +59,7 @@ const struct shell_cmd_help cmd_pm_help = {
 };
 #endif
 
-
-static struct shell_cmd shell_panmaster_cmd = {
-    .sc_cmd = "panm",
-    .sc_cmd_func = panmaster_cli_cmd,
-#if MYNEWT_VAL(SHELL_CMD_HELP)
-    .help = &cmd_pm_help
-#endif
-};
-
+static struct shell_cmd shell_panmaster_cmd = SHELL_CMD_EXT("panm", panmaster_cli_cmd, &cmd_pm_help);
 
 static void
 list_nodes_load_cb(struct panmaster_node *node, void *cb_arg)
@@ -82,7 +75,7 @@ list_nodes_load_cb(struct panmaster_node *node, void *cb_arg)
 
 #define LIST_NODES_BLK_NNODES (32)
 static void
-list_nodes_blk()
+list_nodes_blk(struct streamer *streamer)
 {
     int i,j;
     struct panmaster_node_idx *node_idx;
@@ -94,7 +87,7 @@ list_nodes_blk()
     lne.nodes = (struct panmaster_node*)malloc(lne_nodes_sz);
 
     if (!lne.nodes) {
-        console_printf("err:mem\n");
+        streamer_printf(streamer, "err:mem\n");
         return;
     }
 
@@ -104,7 +97,7 @@ list_nodes_blk()
 
     panmaster_node_idx(&node_idx, &num_nodes);
     os_gettimeofday(&utctime, &timezone);
-    console_printf("#idx, addr, role, slot, p,  lease, euid,             flags,          date-added, fw-ver\n");
+    streamer_printf(streamer, "#idx, addr, role, slot, p,  lease, euid,             flags,          date-added, fw-ver\n");
     for (i=0;i<num_nodes;i+=LIST_NODES_BLK_NNODES) {
         lne.index_off = i;
         lne.index_max = i+LIST_NODES_BLK_NNODES;
@@ -117,39 +110,39 @@ list_nodes_blk()
                 continue;
             }
 
-            console_printf("%4d, ", i+j);
-            console_printf("%4x, ", lne.nodes[j].addr);
+            streamer_printf(streamer, "%4d, ", i+j);
+            streamer_printf(streamer, "%4x, ", lne.nodes[j].addr);
             int slot_id = node_idx[lne.nodes[j].index].slot_id;
             if (lne.nodes[j].has_perm_slot) {
                 slot_id = lne.nodes[j].slot_id;
             }
-            console_printf("%4X, ", lne.nodes[j].role);
+            streamer_printf(streamer, "%4X, ", lne.nodes[j].role);
             if (slot_id != 0xffff) {
-                console_printf("%4d, ", slot_id);
+                streamer_printf(streamer, "%4d, ", slot_id);
             } else {
-                console_printf("    , ");
+                streamer_printf(streamer, "    , ");
             }
-            console_printf("%s, ", (lne.nodes[j].has_perm_slot)?"p":" ");
+            streamer_printf(streamer, "%s, ", (lne.nodes[j].has_perm_slot)?"p":" ");
 
             if (node_idx[lne.nodes[j].index].lease_ends) {
                 os_get_uptime(&tv);
                 int32_t le_ms = node_idx[lne.nodes[j].index].lease_ends;
                 int32_t now_ms = tv.tv_sec*1000 + tv.tv_usec/1000;
                 le_ms = le_ms - now_ms;
                 if (le_ms < 0) le_ms = 0;
-                console_printf("%4ld.%ld, ", le_ms/1000, (le_ms-1000*(le_ms/1000))/100);
+                streamer_printf(streamer, "%4ld.%ld, ", le_ms/1000, (le_ms-1000*(le_ms/1000))/100);
             } else {
-                console_printf("      , ");
+                streamer_printf(streamer, "      , ");
             }
 
-            console_printf("%016llX, ", lne.nodes[j].euid);
-            console_printf("%5X, ", lne.nodes[j].flags);
+            streamer_printf(streamer, "%016llX, ", lne.nodes[j].euid);
+            streamer_printf(streamer, "%5X, ", lne.nodes[j].flags);
 
             utctime.tv_sec = lne.nodes[j].first_seen_utc;
             utctime.tv_usec = 0;
             datetime_format(&utctime, &timezone, buf, sizeof(buf));
             buf[19]='\0';
-            console_printf("%s, ", buf);
+            streamer_printf(streamer, "%s, ", buf);
             struct image_version fw_ver = {
                 .iv_major = lne.nodes[j].fw_ver.iv_major,
                 .iv_minor = lne.nodes[j].fw_ver.iv_minor,
@@ -158,8 +151,8 @@ list_nodes_blk()
             };
             imgr_ver_str(&fw_ver, ver_str);
 
-            console_printf("%s", ver_str);
-            console_printf("\n");
+            streamer_printf(streamer, "%s", ver_str);
+            streamer_printf(streamer, "\n");
         }
     }
     free(lne.nodes);
@@ -169,7 +162,8 @@ static void
 dump_cb(struct panmaster_node *n, void *cb_arg)
 {
     char ver_str[32];
-    console_printf("%3d %04x %016llx %x %x %d %d ", n->index, n->addr, n->euid,
+    struct streamer *streamer = (struct streamer *)cb_arg;
+    streamer_printf(streamer, "%3d %04x %016llx %x %x %d %d ", n->index, n->addr, n->euid,
                    n->flags, n->role, n->has_perm_slot, n->slot_id);
 
     struct image_version fw_ver = {
@@ -179,19 +173,19 @@ dump_cb(struct panmaster_node *n, void *cb_arg)
         .iv_build_num = n->fw_ver.iv_build_num,
     };
     imgr_ver_str(&fw_ver, ver_str);
-    console_printf("%s\n", ver_str);
+    streamer_printf(streamer, "%s\n", ver_str);
 
 }
 
 static void
-dump(void)
+dump(struct streamer *streamer)
 {
-    console_printf("# index addr euid flags role pslot slot_id fw-ver\n");
-    panmaster_load(dump_cb, 0);
+    streamer_printf(streamer, "# index addr euid flags role pslot slot_id fw-ver\n");
+    panmaster_load(dump_cb, streamer);
 }
 
 static int
-panmaster_cli_cmd(int argc, char **argv)
+panmaster_cli_cmd(const struct shell_cmd *cmd, int argc, char **argv, struct streamer *streamer)
 {
     int rc;
     int slot_id, role;
@@ -200,14 +194,14 @@ panmaster_cli_cmd(int argc, char **argv)
     struct panmaster_node *node;
 
     if (argc < 2) {
-        console_printf("Too few args\n");
+        streamer_printf(streamer, "Too few args\n");
         return 0;
     }
     if (!strcmp(argv[1], "list")) {
-        list_nodes_blk();
+        list_nodes_blk(streamer);
     } else if (!strcmp(argv[1], "add")) {
         if (argc < 3) {
-            console_printf("euid needed\n");
+            streamer_printf(streamer, "euid needed\n");
             return 0;
         }
         euid = strtoll(argv[2], NULL, 16);
@@ -223,21 +217,21 @@ panmaster_cli_cmd(int argc, char **argv)
         rc = panmaster_idx_find_node(euid, 0, &node);
         panmaster_postprocess();
         if (!rc) {
-            console_printf("Added node euid: 0x%llX, addr 0x%X\n",
+            streamer_printf(streamer, "Added node euid: 0x%llX, addr 0x%X\n",
                            euid, node->addr);
         } else {
-            console_printf("Add node err\n");
+            streamer_printf(streamer, "Add node err\n");
         }
     } else if (!strcmp(argv[1], "del")) {
         if (argc < 3) {
-            console_printf("euid needed\n");
+            streamer_printf(streamer, "euid needed\n");
             return 0;
         }
         euid = strtoll(argv[2], NULL, 16);
         panmaster_delete_node(euid);
     } else if (!strcmp(argv[1], "pslot")) {
         if (argc < 4) {
-            console_printf("euid+slot_id needed\n");
+            streamer_printf(streamer, "euid+slot_id needed\n");
             return 0;
         }
         euid = strtoll(argv[2], NULL, 16);
@@ -248,23 +242,23 @@ panmaster_cli_cmd(int argc, char **argv)
 
         rc = panmaster_idx_find_node(euid, 0, &node);
         if (!rc) {
-            console_printf("0x%llX: pslot -> ", euid);
+            streamer_printf(streamer, "0x%llX: pslot -> ", euid);
             if (slot_id > -1) {
                 node->slot_id = slot_id;
                 node->has_perm_slot = 1;
-                console_printf("%d\n ", slot_id);
+                streamer_printf(streamer, "%d\n ", slot_id);
             } else {
                 node->slot_id = 0;
                 node->has_perm_slot = 0;
-                console_printf("<removed>\n");
+                streamer_printf(streamer, "<removed>\n");
             }
             panmaster_save_node(node);
         } else {
-            console_printf("err\n");
+            streamer_printf(streamer, "err\n");
         }
     } else if (!strcmp(argv[1], "role")) {
         if (argc < 4) {
-            console_printf("euid+role needed\n");
+            streamer_printf(streamer, "euid+role needed\n");
             return 0;
         }
         euid = strtoll(argv[2], NULL, 16);
@@ -275,11 +269,11 @@ panmaster_cli_cmd(int argc, char **argv)
 
         rc = panmaster_idx_find_node(euid, 0, &node);
         if (!rc) {
-            console_printf("0x%llX: role -> %d\n ", euid, role);
+            streamer_printf(streamer, "0x%llX: role -> %d\n ", euid, role);
             node->role = role;
             panmaster_save_node(node);
         } else {
-            console_printf("err\n");
+            streamer_printf(streamer, "err\n");
         }
     } else if (!strcmp(argv[1], "clear")) {
         panmaster_clear_list();
@@ -288,9 +282,9 @@ panmaster_cli_cmd(int argc, char **argv)
     } else if (!strcmp(argv[1], "sort")) {
         panmaster_sort();
     } else if (!strcmp(argv[1], "dump")) {
-        dump();
+        dump(streamer);
     } else {
-        console_printf("Unknown cmd\n");
+        streamer_printf(streamer, "Unknown cmd\n");
     }
     return 0;
 }

lib/tofdb/src/tofdb_cli.c

@@ -30,13 +30,14 @@
 
 #include <shell/shell.h>
 #include <console/console.h>
+#include <streamer/streamer.h>
 
 #include "uwb_rng/uwb_rng.h"
 #include "tofdb/tofdb.h"
 
 struct tofdb_node* tofdb_get_nodes();
 
-static int tofdb_cli_cmd(int argc, char **argv);
+static int tofdb_cli_cmd(const struct shell_cmd *cmd, int argc, char **argv, struct streamer *streamer);
 
 #if MYNEWT_VAL(SHELL_CMD_HELP)
 const struct shell_param cmd_tofdb_param[] = {
@@ -49,65 +50,57 @@ const struct shell_cmd_help cmd_tofdb_help = {
 };
 #endif
 
-
-static struct shell_cmd shell_tofdb_cmd = {
-    .sc_cmd = "tdb",
-    .sc_cmd_func = tofdb_cli_cmd,
-#if MYNEWT_VAL(SHELL_CMD_HELP)
-    .help = &cmd_tofdb_help
-#endif
-};
-
+static struct shell_cmd shell_tofdb_cmd = SHELL_CMD_EXT("tdb", tofdb_cli_cmd, &cmd_tofdb_help);
 
 static void
-list_nodes()
+list_nodes(struct streamer *streamer)
 {
     int i;
     struct tofdb_node *nodes;
     struct os_timeval tv;
 
     nodes = tofdb_get_nodes();
-    console_printf("#idx, addr,    tof,  tof(m),    #,  stddev, age(s)\n");
+    streamer_printf(streamer, "#idx, addr,    tof,  tof(m),    #,  stddev, age(s)\n");
     for (i=0;i<MYNEWT_VAL(TOFDB_MAXNUM_NODES);i++) {
         if (!nodes[i].addr) {
             continue;
         }
-        console_printf("%4d, ", i);
-        console_printf("%4x, ", nodes[i].addr);
-        console_printf("%6ld, ", (uint32_t)nodes[i].tof);
+        streamer_printf(streamer, "%4d, ", i);
+        streamer_printf(streamer, "%4x, ", nodes[i].addr);
+        streamer_printf(streamer, "%6ld, ", (uint32_t)nodes[i].tof);
         float ave = nodes[i].tof;
         float stddev = uwb_rng_tof_to_meters((uint32_t)sqrtf(nodes[i].sum_sq/nodes[i].num - ave*ave));
         ave = uwb_rng_tof_to_meters((uint32_t)(nodes[i].sum/nodes[i].num));
-        console_printf("%3d.%03d, ", (int)ave, (int)(fabsf(ave-(int)ave)*1000));
-        console_printf("%4ld, ", nodes[i].num);
+        streamer_printf(streamer, "%3d.%03d, ", (int)ave, (int)(fabsf(ave-(int)ave)*1000));
+        streamer_printf(streamer, "%4ld, ", nodes[i].num);
         if (nodes[i].num>1) {
-            console_printf("%3d.%03d, ", (int)stddev, (int)(fabsf(stddev-(int)stddev)*1000));
+            streamer_printf(streamer, "%3d.%03d, ", (int)stddev, (int)(fabsf(stddev-(int)stddev)*1000));
         } else {
-            console_printf("%7s, ","");
+            streamer_printf(streamer, "%7s, ","");
         }
 
         if (nodes[i].last_updated) {
             os_get_uptime(&tv);
             uint32_t age = os_cputime_ticks_to_usecs(os_cputime_get32() -
                                                      nodes[i].last_updated);
             uint32_t age_s = age/1000000;
-            console_printf("%4ld.%ld", age_s, (age-1000000*(age_s))/100000);
+            streamer_printf(streamer, "%4ld.%ld", age_s, (age-1000000*(age_s))/100000);
         }
-        console_printf("\n");
+        streamer_printf(streamer, "\n");
     }
 }
 
 
 static int
-tofdb_cli_cmd(int argc, char **argv)
+tofdb_cli_cmd(const struct shell_cmd *cmd, int argc, char **argv, struct streamer *streamer)
 {
     if (argc < 2) {
         return 0;
     }
     if (!strcmp(argv[1], "list")) {
-        list_nodes();
+        list_nodes(streamer);
     } else {
-        console_printf("Unknown cmd\n");
+        streamer_printf(streamer, "Unknown cmd\n");
     }
     return 0;
 }

lib/uwb_rf_tests/desense/include/desense/desense.h

@@ -40,8 +40,7 @@ extern "C" {
 
 #include <uwb/uwb.h>
 #include <uwb/uwb_ftypes.h>
-
-typedef int (*desense_out_cb_t)(const char *fmt, ...);
+#include <streamer/streamer.h>
 
 //! Structure of desense test parameters
 struct desense_test_parameters {
@@ -118,8 +117,8 @@ int desense_listen(struct uwb_desense_instance * desense);
 int desense_txon(struct uwb_desense_instance * desense, uint16_t length, uint32_t delay_ns);
 int desense_txoff(struct uwb_desense_instance * desense);
 
-void desense_dump_data(struct uwb_desense_instance * desense, desense_out_cb_t cb);
-void desense_dump_stats(struct uwb_desense_instance * desense, desense_out_cb_t cb);
+void desense_dump_data(struct uwb_desense_instance * desense, struct streamer *streamer);
+void desense_dump_stats(struct uwb_desense_instance * desense, struct streamer *streamer);
 
 int desense_cli_register(void);
 int desense_cli_down(int reason);