stattypes: remove from all users

kmarkus · Jan 6, 2020 · b4a8111 · b4a8111
1 parent 2c9aee5
commit b4a8111
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 26 deletions.
diff --git a/docs/user/tutorial.rst b/docs/user/tutorial.rst
@@ -362,7 +362,6 @@ The code is the following.
    {
       imports = {
          "stdtypes",
-         "stattypes",
          "ptrig",
          "lfds_cyclic",
          "logger",
@@ -561,13 +560,12 @@ the libraries
      ubx_node_init(&ni, "platform_and_control");
    const char *modules[8];
    modules[0]= "/usr/local/lib/ubx/0.6/stdtypes.so";
-   modules[1]= "/usr/local/lib/ubx/0.6/stattypes.so";
-   modules[2]= "/usr/local/lib/ubx/0.6/ptrig.so";
-   modules[3]= "/usr/local/lib/ubx/0.6/platform_2dof.so";
-   modules[4]= "/usr/local/lib/ubx/0.6/platform_2dof_control.so";
-   modules[5]= "/usr/local/lib/ubx/0.6/webif.so";
-   modules[6]= "/usr/local/lib/ubx/0.6/logger.so";
-   modules[7]= "/usr/local/lib/ubx/0.6/lfds_cyclic.so";
+   modules[1]= "/usr/local/lib/ubx/0.6/ptrig.so";
+   modules[2]= "/usr/local/lib/ubx/0.6/platform_2dof.so";
+   modules[3]= "/usr/local/lib/ubx/0.6/platform_2dof_control.so";
+   modules[4]= "/usr/local/lib/ubx/0.6/webif.so";
+   modules[5]= "/usr/local/lib/ubx/0.6/logger.so";
+   modules[6]= "/usr/local/lib/ubx/0.6/lfds_cyclic.so";
      /* load modules */
    for (int i=0; i<LEN_VEC(modules);i++)
      if(ubx_module_load(&ni, modules[i]) != 0){

diff --git a/examples/platform/platform_launch/main.c b/examples/platform/platform_launch/main.c
@@ -18,13 +18,12 @@ int main()
   ubx_node_init(&ni, "platform_and_control");
   const char *modules[8];
   modules[0]= "/usr/local/lib/ubx/0.6/stdtypes.so";
-  modules[1]= "/usr/local/lib/ubx/0.6/stattypes.so";
-  modules[2]= "/usr/local/lib/ubx/0.6/ptrig.so";
-  modules[3]= "/usr/local/lib/ubx/0.6/platform_2dof.so";
-  modules[4]= "/usr/local/lib/ubx/0.6/platform_2dof_control.so";
-  modules[5]= "/usr/local/lib/ubx/0.6/webif.so";
-  modules[6]= "/usr/local/lib/ubx/0.6/logger.so";
-  modules[7]= "/usr/local/lib/ubx/0.6/lfds_cyclic.so";
+  modules[1]= "/usr/local/lib/ubx/0.6/ptrig.so";
+  modules[2]= "/usr/local/lib/ubx/0.6/platform_2dof.so";
+  modules[3]= "/usr/local/lib/ubx/0.6/platform_2dof_control.so";
+  modules[4]= "/usr/local/lib/ubx/0.6/webif.so";
+  modules[5]= "/usr/local/lib/ubx/0.6/logger.so";
+  modules[6]= "/usr/local/lib/ubx/0.6/lfds_cyclic.so";
   /* load modules */
   for (unsigned int i=0; i<(LEN_VEC(modules));i++)
     if(ubx_module_load(&ni, modules[i]) != 0){

diff --git a/examples/platform/platform_launch/platform_2dof_and_control.usc b/examples/platform/platform_launch/platform_2dof_and_control.usc
@@ -10,7 +10,6 @@ return bd.system
 {
    imports = {
       "stdtypes",
-      "stattypes",
       "ptrig",
       "lfds_cyclic",
       "logger",

diff --git a/examples/systemmodels/composition/rndchain.usc b/examples/systemmodels/composition/rndchain.usc
@@ -19,7 +19,7 @@ return bd.system
    },
 
    imports = {
-      "stdtypes", "stattypes", "random", "ptrig", "lfds_cyclic", "logger",
+      "stdtypes", "random", "ptrig", "lfds_cyclic", "logger",
    },
 
    blocks = {

diff --git a/examples/systemmodels/composition/rndchain1.usc b/examples/systemmodels/composition/rndchain1.usc
@@ -3,7 +3,7 @@
 return bd.system
 {
    imports = {
-      "stdtypes", "stattypes", "random", "trig",
+      "stdtypes", "random", "trig",
    },
 
    blocks = {

diff --git a/examples/systemmodels/mqueue_test_recv.usc b/examples/systemmodels/mqueue_test_recv.usc
@@ -15,7 +15,6 @@ return bd.system
 {
    imports = {
       "stdtypes",
-      "stattypes",
       "ptrig",
       "random",
       "mqueue",

diff --git a/examples/systemmodels/mqueue_test_send.usc b/examples/systemmodels/mqueue_test_send.usc
@@ -12,7 +12,6 @@ return bd.system
 {
    imports = {
       "stdtypes",
-      "stattypes",
       "ptrig",
       "random",
       "mqueue",

diff --git a/examples/systemmodels/node_config_demo.json b/examples/systemmodels/node_config_demo.json
@@ -1,7 +1,6 @@
 {
   "imports": [
     "stdtypes",
-    "stattypes",
     "random",
     "ptrig",
     "lfds_cyclic"

diff --git a/examples/systemmodels/node_config_demo.usc b/examples/systemmodels/node_config_demo.usc
@@ -6,7 +6,6 @@ return bd.system
 {
    imports = {
       "stdtypes",
-      "stattypes",
       "random",
       "ptrig",
       "lfds_cyclic"

diff --git a/examples/systemmodels/trig_rnd_hexdump.usc b/examples/systemmodels/trig_rnd_hexdump.usc
@@ -10,7 +10,7 @@ logger_report_conf = [[
 return bd.system
 {
    imports = {
-      "stattypes", "stdtypes", "ptrig",
+      "stdtypes", "ptrig",
       "logger", "random", "lfds_cyclic",
       "hexdump"
    },

diff --git a/tests/test_ptrig.lua b/tests/test_ptrig.lua
@@ -44,7 +44,7 @@ end
 ]]
 
 local sys1 = bd.system {
-   imports = { "stdtypes", "stattypes", "ptrig", "ramp_uint64", "lfds_cyclic", "luablock" },
+   imports = { "stdtypes", "ptrig", "ramp_uint64", "lfds_cyclic", "luablock" },
    blocks = {
       { name="ramp", type="ramp_uint64" },
       { name="tester", type="lua/luablock" },
@@ -101,7 +101,7 @@ local block_dur_us = {
 
 
 local sys2 = bd.system {
-   imports = { "stdtypes", "stattypes", "ptrig", "lfds_cyclic", "luablock" },
+   imports = { "stdtypes", "ptrig", "lfds_cyclic", "luablock" },
    blocks = {
       { name="tb1", type="lua/luablock" },
       { name="tb2", type="lua/luablock" },

diff --git a/tools/ubx_genblock b/tools/ubx_genblock
@@ -640,7 +640,6 @@ return bd.system
 {
    imports = {
       "stdtypes",
-      "stattypes",
       "ptrig",
       "lfds_cyclic",
       "logger",