From 6df4390494428b23be75a73839b63ad4364f6268 Mon Sep 17 00:00:00 2001 From: Fabio Pintus Date: Fri, 25 Feb 2022 17:02:36 +0100 Subject: [PATCH] readme improvements, fix in thing definitions --- Samples/AZX_Docs/html/annotated.html | 2 +- Samples/AZX_Docs/html/app__cfg_8h.html | 2 +- Samples/AZX_Docs/html/app__cfg_8h_source.html | 2 +- Samples/AZX_Docs/html/azx__log_8h.html | 2 +- Samples/AZX_Docs/html/azx__log_8h_source.html | 2 +- Samples/AZX_Docs/html/azx__tasks_8h.html | 2 +- .../AZX_Docs/html/azx__tasks_8h_source.html | 2 +- Samples/AZX_Docs/html/azx__utils_8h.html | 2 +- .../AZX_Docs/html/azx__utils_8h_source.html | 2 +- .../html/azx_tasks_example_8c-example.html | 2 +- Samples/AZX_Docs/html/classes.html | 2 +- .../dir_0045f852bf8045b6d5abd9c9eb54a446.html | 2 +- Samples/AZX_Docs/html/examples.html | 2 +- Samples/AZX_Docs/html/files.html | 2 +- Samples/AZX_Docs/html/functions.html | 2 +- Samples/AZX_Docs/html/functions_vars.html | 2 +- Samples/AZX_Docs/html/globals.html | 2 +- Samples/AZX_Docs/html/globals_defs.html | 2 +- Samples/AZX_Docs/html/globals_enum.html | 2 +- Samples/AZX_Docs/html/globals_eval.html | 2 +- Samples/AZX_Docs/html/globals_func.html | 2 +- Samples/AZX_Docs/html/globals_type.html | 2 +- Samples/AZX_Docs/html/graph_legend.html | 2 +- Samples/AZX_Docs/html/group__log_conf.html | 2 +- Samples/AZX_Docs/html/group__log_usage.html | 2 +- Samples/AZX_Docs/html/group__task_usage.html | 2 +- Samples/AZX_Docs/html/index.html | 2 +- Samples/AZX_Docs/html/modules.html | 2 +- .../struct_a_z_x___l_o_g___c_f_g___t.html | 2 +- ...a_z_x___t_a_s_k_s___m_e_s_s_a_g_e___t.html | 2 +- .../BRAVO_Environment_BSEC_Demo/Makefile.in | 2 +- Samples/BRAVO_LED_Demo/Makefile.in | 2 +- Samples/BRAVO_MultiSensorsDemo/Makefile.in | 2 +- .../bravo_MultiSensorsDemo_thing_def.json | 49 ++++- Samples/BRAVO_Rotation_Demo/Makefile.in | 2 +- .../json/bravo_3D-RotationDemo_thing_def.json | 133 +++++++++++- Samples/BRAVO_Tampering_Demo/Makefile.in | 2 +- Samples/BRAVO_Time_Series_Demo/Makefile.in | 2 +- Samples/README.md | 196 ++++++++++-------- 39 files changed, 322 insertions(+), 128 deletions(-) diff --git a/Samples/AZX_Docs/html/annotated.html b/Samples/AZX_Docs/html/annotated.html index 05013a9..5a9fb94 100644 --- a/Samples/AZX_Docs/html/annotated.html +++ b/Samples/AZX_Docs/html/annotated.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/app__cfg_8h.html b/Samples/AZX_Docs/html/app__cfg_8h.html index e0f3863..6689306 100644 --- a/Samples/AZX_Docs/html/app__cfg_8h.html +++ b/Samples/AZX_Docs/html/app__cfg_8h.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/app__cfg_8h_source.html b/Samples/AZX_Docs/html/app__cfg_8h_source.html index 47754e5..525f8a7 100644 --- a/Samples/AZX_Docs/html/app__cfg_8h_source.html +++ b/Samples/AZX_Docs/html/app__cfg_8h_source.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/azx__log_8h.html b/Samples/AZX_Docs/html/azx__log_8h.html index 4fd44ee..35a6fd6 100644 --- a/Samples/AZX_Docs/html/azx__log_8h.html +++ b/Samples/AZX_Docs/html/azx__log_8h.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/azx__log_8h_source.html b/Samples/AZX_Docs/html/azx__log_8h_source.html index 2fe7594..f5e2b8e 100644 --- a/Samples/AZX_Docs/html/azx__log_8h_source.html +++ b/Samples/AZX_Docs/html/azx__log_8h_source.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/azx__tasks_8h.html b/Samples/AZX_Docs/html/azx__tasks_8h.html index 8c6ec66..a7b93f9 100644 --- a/Samples/AZX_Docs/html/azx__tasks_8h.html +++ b/Samples/AZX_Docs/html/azx__tasks_8h.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/azx__tasks_8h_source.html b/Samples/AZX_Docs/html/azx__tasks_8h_source.html index 9162527..0fe16cc 100644 --- a/Samples/AZX_Docs/html/azx__tasks_8h_source.html +++ b/Samples/AZX_Docs/html/azx__tasks_8h_source.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/azx__utils_8h.html b/Samples/AZX_Docs/html/azx__utils_8h.html index 168b34e..b685a8e 100644 --- a/Samples/AZX_Docs/html/azx__utils_8h.html +++ b/Samples/AZX_Docs/html/azx__utils_8h.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/azx__utils_8h_source.html b/Samples/AZX_Docs/html/azx__utils_8h_source.html index 37c4db2..3c10cd3 100644 --- a/Samples/AZX_Docs/html/azx__utils_8h_source.html +++ b/Samples/AZX_Docs/html/azx__utils_8h_source.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/azx_tasks_example_8c-example.html b/Samples/AZX_Docs/html/azx_tasks_example_8c-example.html index 7d27798..1c489a9 100644 --- a/Samples/AZX_Docs/html/azx_tasks_example_8c-example.html +++ b/Samples/AZX_Docs/html/azx_tasks_example_8c-example.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/classes.html b/Samples/AZX_Docs/html/classes.html index 01c2d3b..736e0e3 100644 --- a/Samples/AZX_Docs/html/classes.html +++ b/Samples/AZX_Docs/html/classes.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/dir_0045f852bf8045b6d5abd9c9eb54a446.html b/Samples/AZX_Docs/html/dir_0045f852bf8045b6d5abd9c9eb54a446.html index 800d670..58ef5e1 100644 --- a/Samples/AZX_Docs/html/dir_0045f852bf8045b6d5abd9c9eb54a446.html +++ b/Samples/AZX_Docs/html/dir_0045f852bf8045b6d5abd9c9eb54a446.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/examples.html b/Samples/AZX_Docs/html/examples.html index 26746fb..1503e0c 100644 --- a/Samples/AZX_Docs/html/examples.html +++ b/Samples/AZX_Docs/html/examples.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/files.html b/Samples/AZX_Docs/html/files.html index e5af532..e2f026f 100644 --- a/Samples/AZX_Docs/html/files.html +++ b/Samples/AZX_Docs/html/files.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/functions.html b/Samples/AZX_Docs/html/functions.html index 3ffe585..c7d417c 100644 --- a/Samples/AZX_Docs/html/functions.html +++ b/Samples/AZX_Docs/html/functions.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/functions_vars.html b/Samples/AZX_Docs/html/functions_vars.html index 2424691..09941fb 100644 --- a/Samples/AZX_Docs/html/functions_vars.html +++ b/Samples/AZX_Docs/html/functions_vars.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/globals.html b/Samples/AZX_Docs/html/globals.html index 88539bb..f9e4854 100644 --- a/Samples/AZX_Docs/html/globals.html +++ b/Samples/AZX_Docs/html/globals.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/globals_defs.html b/Samples/AZX_Docs/html/globals_defs.html index 67910a7..c911f46 100644 --- a/Samples/AZX_Docs/html/globals_defs.html +++ b/Samples/AZX_Docs/html/globals_defs.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/globals_enum.html b/Samples/AZX_Docs/html/globals_enum.html index ec8e183..753afd7 100644 --- a/Samples/AZX_Docs/html/globals_enum.html +++ b/Samples/AZX_Docs/html/globals_enum.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/globals_eval.html b/Samples/AZX_Docs/html/globals_eval.html index c8e6d4a..9b07e97 100644 --- a/Samples/AZX_Docs/html/globals_eval.html +++ b/Samples/AZX_Docs/html/globals_eval.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/globals_func.html b/Samples/AZX_Docs/html/globals_func.html index 53c66b4..989ca35 100644 --- a/Samples/AZX_Docs/html/globals_func.html +++ b/Samples/AZX_Docs/html/globals_func.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/globals_type.html b/Samples/AZX_Docs/html/globals_type.html index 90784bb..20718ed 100644 --- a/Samples/AZX_Docs/html/globals_type.html +++ b/Samples/AZX_Docs/html/globals_type.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/graph_legend.html b/Samples/AZX_Docs/html/graph_legend.html index 9e7972f..4bc6410 100644 --- a/Samples/AZX_Docs/html/graph_legend.html +++ b/Samples/AZX_Docs/html/graph_legend.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/group__log_conf.html b/Samples/AZX_Docs/html/group__log_conf.html index a957be7..907aa14 100644 --- a/Samples/AZX_Docs/html/group__log_conf.html +++ b/Samples/AZX_Docs/html/group__log_conf.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/group__log_usage.html b/Samples/AZX_Docs/html/group__log_usage.html index 507de1d..eae0357 100644 --- a/Samples/AZX_Docs/html/group__log_usage.html +++ b/Samples/AZX_Docs/html/group__log_usage.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/group__task_usage.html b/Samples/AZX_Docs/html/group__task_usage.html index 9bb638d..57c3826 100644 --- a/Samples/AZX_Docs/html/group__task_usage.html +++ b/Samples/AZX_Docs/html/group__task_usage.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/index.html b/Samples/AZX_Docs/html/index.html index 21b5ee6..ff1df0d 100644 --- a/Samples/AZX_Docs/html/index.html +++ b/Samples/AZX_Docs/html/index.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/modules.html b/Samples/AZX_Docs/html/modules.html index 9d4e343..f6e6fa5 100644 --- a/Samples/AZX_Docs/html/modules.html +++ b/Samples/AZX_Docs/html/modules.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/struct_a_z_x___l_o_g___c_f_g___t.html b/Samples/AZX_Docs/html/struct_a_z_x___l_o_g___c_f_g___t.html index 6ddb5ef..6f5f6e9 100644 --- a/Samples/AZX_Docs/html/struct_a_z_x___l_o_g___c_f_g___t.html +++ b/Samples/AZX_Docs/html/struct_a_z_x___l_o_g___c_f_g___t.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/AZX_Docs/html/struct_a_z_x___t_a_s_k_s___m_e_s_s_a_g_e___t.html b/Samples/AZX_Docs/html/struct_a_z_x___t_a_s_k_s___m_e_s_s_a_g_e___t.html index db494f4..59f69c6 100644 --- a/Samples/AZX_Docs/html/struct_a_z_x___t_a_s_k_s___m_e_s_s_a_g_e___t.html +++ b/Samples/AZX_Docs/html/struct_a_z_x___t_a_s_k_s___m_e_s_s_a_g_e___t.html @@ -34,7 +34,7 @@ Logo
AZX (AppZone eXtensions) documentation -  1.0.12 +  1.0.13
A set of companion utilities that make AZ development easier
diff --git a/Samples/BRAVO_Environment_BSEC_Demo/Makefile.in b/Samples/BRAVO_Environment_BSEC_Demo/Makefile.in index 460a053..ca03cf1 100644 --- a/Samples/BRAVO_Environment_BSEC_Demo/Makefile.in +++ b/Samples/BRAVO_Environment_BSEC_Demo/Makefile.in @@ -16,7 +16,7 @@ LWM2M = 1 ## ---- do not touch below this line -SW_VER = 1.0.12 +SW_VER = 1.0.13 CLEAN_BEFORE_BUILD = clean diff --git a/Samples/BRAVO_LED_Demo/Makefile.in b/Samples/BRAVO_LED_Demo/Makefile.in index a0ec67f..d7a60be 100644 --- a/Samples/BRAVO_LED_Demo/Makefile.in +++ b/Samples/BRAVO_LED_Demo/Makefile.in @@ -16,7 +16,7 @@ LWM2M = 1 ## ---- do not touch below this line -SW_VER = 1.0.12 +SW_VER = 1.0.13 CLEAN_BEFORE_BUILD = clean diff --git a/Samples/BRAVO_MultiSensorsDemo/Makefile.in b/Samples/BRAVO_MultiSensorsDemo/Makefile.in index 460a053..ca03cf1 100644 --- a/Samples/BRAVO_MultiSensorsDemo/Makefile.in +++ b/Samples/BRAVO_MultiSensorsDemo/Makefile.in @@ -16,7 +16,7 @@ LWM2M = 1 ## ---- do not touch below this line -SW_VER = 1.0.12 +SW_VER = 1.0.13 CLEAN_BEFORE_BUILD = clean diff --git a/Samples/BRAVO_MultiSensorsDemo/json/bravo_MultiSensorsDemo_thing_def.json b/Samples/BRAVO_MultiSensorsDemo/json/bravo_MultiSensorsDemo_thing_def.json index 879b116..0d0aaff 100644 --- a/Samples/BRAVO_MultiSensorsDemo/json/bravo_MultiSensorsDemo_thing_def.json +++ b/Samples/BRAVO_MultiSensorsDemo/json/bravo_MultiSensorsDemo_thing_def.json @@ -1 +1,48 @@ -[{"key":"bravo_environmental_thingdef","name":"Bravo Board - EnvironmentalDemo thing definition","version":4,"autoDefProps":false,"autoDefAttrs":false,"properties":{"prop_humidity":{"name":"Humidity","unit":"%RH","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false},"prop_iaq":{"name":"IAQ","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false},"prop_pressure":{"name":"Pressure","unit":"mbar","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false},"prop_temp":{"name":"Temp","unit":"\u00b0C","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false}},"tunnelAdHoc":false,"locations":{"noDecode":false,"simpleMode":false}}] \ No newline at end of file +[ +{ + "key":"bravo_multisensorsdemo", + "name":"Bravo Board - MultiSensorsDemo thing definition", + "version":2, + "autoDefProps":false, + "autoDefAttrs":false, + "properties": + { + "prop_accuracy":{"name":"3D_accuracy","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false}, + "prop_humidity":{"name":"Humidity","unit":"%RH","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false}, + "prop_iaq":{"name":"IAQ","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false}, + "prop_pressure":{"name":"Pressure","unit":"mbar","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false}, + "prop_temp":{"name":"Temp","unit":"\u00b0C","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false}, + "prop_w":{"name":"3D_w","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false}, + "prop_x":{"name":"3D_x","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false}, + "prop_y":{"name":"3D_y","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false}, + "prop_z":{"name":"3D_z","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false} + }, + "attributes": + { + "attr_tamper_state":{"name":"tamper state","searchable":false}}, + "alarms": + { + "tamper_state": + { + "name":"tamper state", + "states": + [ + {"name":"STILL","color":"#FFFFFF"}, + {"name":"WALKING","color":"#160FF7"}, + {"name":"RUNNING","color":"#05F2FA"}, + {"name":"ON BICICLE","color":"#08FC59"}, + {"name":"IN VEHICLE","color":"#F2FA08"}, + {"name":"TILTING","color":"#F79A0F"}, + {"name":"TAMPERING","color":"#F70F0F"} + ], + "searchable":false + } + }, + "tunnelAdHoc":false, + "locations": + { + "noDecode":false, + "simpleMode":false + } +} +] \ No newline at end of file diff --git a/Samples/BRAVO_Rotation_Demo/Makefile.in b/Samples/BRAVO_Rotation_Demo/Makefile.in index ab27a29..3894b3a 100644 --- a/Samples/BRAVO_Rotation_Demo/Makefile.in +++ b/Samples/BRAVO_Rotation_Demo/Makefile.in @@ -16,7 +16,7 @@ LWM2M = 1 ## ---- do not touch below this line -SW_VER = 1.0.12 +SW_VER = 1.0.13 CLEAN_BEFORE_BUILD = clean diff --git a/Samples/BRAVO_Rotation_Demo/json/bravo_3D-RotationDemo_thing_def.json b/Samples/BRAVO_Rotation_Demo/json/bravo_3D-RotationDemo_thing_def.json index 0e17fdc..e91333f 100644 --- a/Samples/BRAVO_Rotation_Demo/json/bravo_3D-RotationDemo_thing_def.json +++ b/Samples/BRAVO_Rotation_Demo/json/bravo_3D-RotationDemo_thing_def.json @@ -1 +1,132 @@ -[{"key":"bravo_multisensorsdemo","name":"Bravo Board - MultiSensorsDemo thing definition","version":2,"autoDefProps":false,"autoDefAttrs":false,"properties":{"prop_accuracy":{"name":"3D_accuracy","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false},"prop_humidity":{"name":"Humidity","unit":"%RH","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false},"prop_iaq":{"name":"IAQ","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false},"prop_pressure":{"name":"Pressure","unit":"mbar","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false},"prop_temp":{"name":"Temp","unit":"\u00b0C","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false},"prop_w":{"name":"3D_w","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false},"prop_x":{"name":"3D_x","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false},"prop_y":{"name":"3D_y","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false},"prop_z":{"name":"3D_z","calcAggregates":true,"scale":"$(value)","deDuplicate":false,"searchable":false}},"attributes":{"attr_tamper_state":{"name":"tamper state","searchable":false}},"alarms":{"tamper_state":{"name":"tamper state","states":[{"name":"STILL","color":"#FFFFFF"},{"name":"WALKING","color":"#160FF7"},{"name":"RUNNING","color":"#05F2FA"},{"name":"ON BICICLE","color":"#08FC59"},{"name":"IN VEHICLE","color":"#F2FA08"},{"name":"TILTING","color":"#F79A0F"},{"name":"TAMPERING","color":"#F70F0F"}],"searchable":false}},"tunnelAdHoc":false,"locations":{"noDecode":false,"simpleMode":false}}] \ No newline at end of file +[ +{ + "key": "bravo_3d-rotationdemo", + "name": "Bravo Board - 3D-RotationDemo thing definition", + "version": 1, + "autoDefProps": false, + "autoDefAttrs": false, + "properties": { + "prop_accuracy": { + "name": "3D_accuracy", + "calcAggregates": true, + "scale": "$(value)", + "deDuplicate": false, + "searchable": false, + "overrideDisplay": "0", + "data_type": "", + "calc": "", + "series": "", + "period": "", + "period_unit": "", + "min_value": "", + "max_value": "", + "gauge_thresholds": "", + "gauge_color1": "", + "gauge_color2": "", + "gauge_color3": "", + "gauge_threshold1": "", + "gauge_threshold2": "", + "gauge_min": "", + "gauge_max": "" + }, + "prop_w": { + "name": "3D_w", + "calcAggregates": true, + "scale": "$(value)", + "deDuplicate": false, + "searchable": false, + "overrideDisplay": "0", + "data_type": "", + "calc": "", + "series": "", + "period": "", + "period_unit": "", + "min_value": "", + "max_value": "", + "gauge_thresholds": "", + "gauge_color1": "", + "gauge_color2": "", + "gauge_color3": "", + "gauge_threshold1": "", + "gauge_threshold2": "", + "gauge_min": "", + "gauge_max": "" + }, + "prop_x": { + "name": "3D_x", + "calcAggregates": true, + "scale": "$(value)", + "deDuplicate": false, + "searchable": false, + "overrideDisplay": "0", + "data_type": "", + "calc": "", + "series": "", + "period": "", + "period_unit": "", + "min_value": "", + "max_value": "", + "gauge_thresholds": "", + "gauge_color1": "", + "gauge_color2": "", + "gauge_color3": "", + "gauge_threshold1": "", + "gauge_threshold2": "", + "gauge_min": "", + "gauge_max": "" + }, + "prop_y": { + "name": "3D_y", + "calcAggregates": true, + "scale": "$(value)", + "deDuplicate": false, + "searchable": false, + "overrideDisplay": "0", + "data_type": "", + "calc": "", + "series": "", + "period": "", + "period_unit": "", + "min_value": "", + "max_value": "", + "gauge_thresholds": "", + "gauge_color1": "", + "gauge_color2": "", + "gauge_color3": "", + "gauge_threshold1": "", + "gauge_threshold2": "", + "gauge_min": "", + "gauge_max": "" + }, + "prop_z": { + "name": "3D_z", + "calcAggregates": true, + "scale": "$(value)", + "deDuplicate": false, + "searchable": false, + "overrideDisplay": "0", + "data_type": "", + "calc": "", + "series": "", + "period": "", + "period_unit": "", + "min_value": "", + "max_value": "", + "gauge_thresholds": "", + "gauge_color1": "", + "gauge_color2": "", + "gauge_color3": "", + "gauge_threshold1": "", + "gauge_threshold2": "", + "gauge_min": "", + "gauge_max": "" + } + }, + "tunnelAdHoc":false, + "locations": + { + "noDecode":false, + "simpleMode":false + } +} +] \ No newline at end of file diff --git a/Samples/BRAVO_Tampering_Demo/Makefile.in b/Samples/BRAVO_Tampering_Demo/Makefile.in index ab27a29..3894b3a 100644 --- a/Samples/BRAVO_Tampering_Demo/Makefile.in +++ b/Samples/BRAVO_Tampering_Demo/Makefile.in @@ -16,7 +16,7 @@ LWM2M = 1 ## ---- do not touch below this line -SW_VER = 1.0.12 +SW_VER = 1.0.13 CLEAN_BEFORE_BUILD = clean diff --git a/Samples/BRAVO_Time_Series_Demo/Makefile.in b/Samples/BRAVO_Time_Series_Demo/Makefile.in index 1668271..d016cfc 100644 --- a/Samples/BRAVO_Time_Series_Demo/Makefile.in +++ b/Samples/BRAVO_Time_Series_Demo/Makefile.in @@ -16,7 +16,7 @@ LWM2M = 1 ## ---- do not touch below this line -SW_VER = 1.0.12 +SW_VER = 1.0.13 CLEAN_BEFORE_BUILD = clean diff --git a/Samples/README.md b/Samples/README.md index 25a2ad5..f6af56a 100644 --- a/Samples/README.md +++ b/Samples/README.md @@ -4,7 +4,7 @@ -Package Version: **1.0.12** +Package Version: **1.0.13** Firmware Version: **30.01.XX0.0** @@ -17,6 +17,22 @@ This package goal is to provide sample source code for Bravo EVK kickstart. ## Deployment Instructions +### Binaries releases + +The sample applications are available as source code, so they can be built with user's preferences. For testing purposes, binary releases are available at the link https://github.com/telit/IoT-AppZone-BravoSamples/releases. For each release, a set of archive files is provided, with the following naming convention: + +`bravo_sample_apps___.zip.` + +For example, **bravo_sample_apps_1.0.10_30_01_XX0_USB0.zip** will contain the binary files for Bravo Samples version 1.0.10, built for ME910C1 firmware 30.01.xx0, with logs output on USB0 port. + +Each archive has the following structure: + - `` Folder + - `m2mapz.bin` file + - `` Folder + - `m2mapz.bin` + ... + +--- To manually deploy the Sample application on the devices perform the following steps: @@ -77,7 +93,7 @@ The applications code follow the structure below: ## Applications -### Bravo Multi Sensors demo +### Bravo Environment demo @@ -86,30 +102,28 @@ The applications code follow the structure below: --- - Connect to LWM2M Portal -- Retrieve environment information with BSEC library sensor, Tampering and 3D vector rotation with BHI library sensors +- Retrieve environment information with BSEC library sensor --- #### Prerequisites on the module -This application requires the files **object_26242.xml**, **object_26250.xml** and **object_26251.xml** (provided) to be stored into module's `/mod/` folder, along with the application binary itself. +This application requires the file **object_26251.xml** (provided) to be stored into module's `/mod/` folder, along with the application binary itself. To load it, use -`AT#M2MWRITE=/mod/object_26242.xml,1358` -`AT#M2MWRITE=/mod/object_26250.xml,2249` `AT#M2MWRITE=/mod/object_26251.xml,1971` -And at each prompt, send the file content in raw mode. +And at prompt, send the file content in raw mode. #### Prerequisites on the OneEdge Portal -This application requires the **object_26242.xml**, **object_26250.xml** and **object_26251.xml** content to be stored in your OneEdge organization object registry. The latter can be accessed from the link https:///lwm2m/object_registry +This application requires the **object_26251.xml** content to be stored in your OneEdge organization object registry. The latter can be accessed from the link https:///lwm2m/object_registry where could be for example `portal-dev.telit.com`. open the xml file in a notepad tool, select all the content and copy it. Then, in the object registry webpage, press "New Object" button on the right and paste the content of the xml file, then press Add button. -Now from Developer webpage, go in **Thing Definitions** page from the list on the left and press `Import` button on the right. Press `Attach File` and provide `json/bravo_MultiSensorsDemo_thing_def.json` from the project root, then press `Import`. +Now from Developer webpage, go in **Thing Definitions** page from the list on the left and press `Import` button on the right. Press `Attach File` and provide `json/bravo_EnvironmentalDemo_thing_def.json` from the project root, then press `Import`. -Again from the Developer webpage, select **Device Profiles**, `Import` button, `Attach File` and provide `json/bravo_MultiSensors_device_profile.json`, then press `Import`. +Again from the Developer webpage, select **Device Profiles**, `Import` button, `Attach File` and provide `json/bravo_EnvironmentalDemo_device_profile.json`, then press `Import`. #### Local run @@ -142,12 +156,12 @@ Please note: all the apps using BSEC library configure the device with the **18v --- -MultiSensors Demo application. Debug prints on **MAIN UART** +Environment Demo application. Debug prints on **MAIN UART** -### Bravo LwM2M Time Series demo +### Bravo Multi Sensors demo @@ -157,36 +171,29 @@ MultiSensors Demo application. Debug prints on **MAIN UART** - Connect to LWM2M Portal - Retrieve environment information with BSEC library sensor, Tampering and 3D vector rotation with BHI library sensors -- Push data to OneEdge portal as time series using Opaque resources with dedicated objects --- #### Prerequisites on the module -This application requires the files **object_32001.xml** and **object_32002.xml** (provided) to be stored into module's `/XML/` folder, along with the application binary itself. - -To load them, use - -`AT#M2MWRITE=/XML/object_32001.xml,2272` -`AT#M2MWRITE=/XML/object_32002.xml,2365` +This application requires the files **object_26242.xml**, **object_26250.xml** and **object_26251.xml** (provided) to be stored into module's `/mod/` folder, along with the application binary itself. +To load it, use +`AT#M2MWRITE=/mod/object_26242.xml,1358` +`AT#M2MWRITE=/mod/object_26250.xml,2249` +`AT#M2MWRITE=/mod/object_26251.xml,1971` And at each prompt, send the file content in raw mode. #### Prerequisites on the OneEdge Portal -Please refer to the **80654NT11932A_OneEdge_Use_Case_Time-series** App Note. It can be obtained from the Telit [Download Zone](https://www.telit.com/support-training/download-zone/) or by requesting it to ts-oneedge@telit.com. - - -#### Simulated data -To run the code on a generic ME910C1 device, it is possible to build the code disabling the Bosch related functionalities. To do so, please refer to [Makefile.in](Makefile.in) file and edit the BOSCH_BSEC variable as below. +This application requires the **object_26242.xml**, **object_26250.xml** and **object_26251.xml** content to be stored in your OneEdge organization object registry. The latter can be accessed from the link https:///lwm2m/object_registry +where could be for example `portal-dev.telit.com`. open the xml file in a notepad tool, select all the content and copy it. Then, in the object registry webpage, press "New Object" button on the right and paste the content of the xml file, then press Add button. -``` -BOSCH_BSEC = 0 -``` +Now from Developer webpage, go in **Thing Definitions** page from the list on the left and press `Import` button on the right. Press `Attach File` and provide `json/bravo_MultiSensorsDemo_thing_def.json` from the project root, then press `Import`. -This will disable all Bosch dependencies and build the app with a simplified logic, simulating sensors data. +Again from the Developer webpage, select **Device Profiles**, `Import` button, `Attach File` and provide `json/bravo_MultiSensors_device_profile.json`, then press `Import`. #### Local run @@ -219,12 +226,12 @@ Please note: all the apps using BSEC library configure the device with the **18v --- -Time Series Demo application. Debug prints on **MAIN UART** +MultiSensors Demo application. Debug prints on **MAIN UART** -### Bravo Tampering demo +### Bravo LED demo @@ -233,92 +240,113 @@ Time Series Demo application. Debug prints on **MAIN UART** --- - Connect to LWM2M Portal -- Retrieve movement information from BMI160 sensor -- Update portal about current status (IDLE, TAMPER, WALKING... ) +- Register the instances for LEDs +- React to value modification of object 3311 resource 5850 (On/Off) value from the OneEdge portal +- Restore LEDs status at startup according to the LWM2M values --- #### Prerequisites -This application requires the file **object_26242.xml** (provided) to be stored into module's `/mod/` folder, along with the application binary itself. +This application requires the file **object_3311.xml** (provided) to be stored into module's `/mod/` folder, along with the application binary itself. -To load it, use +To load it, use -`AT#M2MWRITE=/mod/object_26242.xml,1358` +`AT#M2MWRITE=/mod/object_3311.xml,3734` -And at prompt, send the file content in raw mode. +And at prompt, send the file content in raw mode. #### Prerequisites on the OneEdge Portal -This application requires the **object_26242.xml** content to be stored in your OneEdge organization object registry. The latter can be accessed from the link https:///lwm2m/object_registry +This application requires the **object_3311.xml** content to be stored in your OneEdge organization object registry. The latter can be accessed from the link https:///lwm2m/object_registry where could be for example `portal-dev.telit.com`. open the xml file in a notepad tool, select all the content and copy it. Then, in the object registry webpage, press "New Object" button on the right and paste the content of the xml file, then press Add button. -Now from Developer webpage, go in **Thing Definitions** page from the list on the left and press `Import` button on the right. Press `Attach File` and provide `json/bravo_TamperDemo_thing_def.json` from the project root, then press `Import`. +--- -Again from the Developer webpage, select **Device Profiles**, `Import` button, `Attach File` and provide `json/bravo_TamperDemo_device_profile.json`, then press `Import`. -Lastly, from the Developer webpage, select **Triggers**, `Actions` menu on the right, `Import` , `Attach File` and provide `json/bravo_TamperDemo_triggers.json`, then press `Import`. Now open the trigger **bravo_TamperDemo_state_trigger** by pressing the View button (the eye icon on the left) and be sure to press the `play` button, and that the trigger status is 'started'. +LED management through IPSO object 3311 Demo application. Debug prints on **MAIN UART** -#### Local run -For testing purposes, it is possible to build the project without the LWM2M functionality. To do so, edit the [Makefile.in](Makefile.in) file at the line -``` -LWM2M = 1 -``` -and set the variable to 0 +### Bravo LwM2M Time Series demo -``` -LWM2M = 0 -``` +**Features** -Tampering Demo application. Debug prints on **MAIN UART** +--- +- Connect to LWM2M Portal +- Retrieve environment information with BSEC library sensor, Tampering and 3D vector rotation with BHI library sensors +- Push data to OneEdge portal as time series using Opaque resources with dedicated objects +--- +#### Prerequisites on the module -### Bravo LED demo +This application requires the files **object_32001.xml** and **object_32002.xml** (provided) to be stored into module's `/XML/` folder, along with the application binary itself. +To load them, use +`AT#M2MWRITE=/XML/object_32001.xml,2272` +`AT#M2MWRITE=/XML/object_32002.xml,2365` -**Features** ---- -- Connect to LWM2M Portal -- Register the instances for LEDs -- React to value modification of object 3311 resource 5850 (On/Off) value from the OneEdge portal -- Restore LEDs status at startup according to the LWM2M values +And at each prompt, send the file content in raw mode. ---- +#### Prerequisites on the OneEdge Portal -#### Prerequisites +Please refer to the **80654NT11932A_OneEdge_Use_Case_Time-series** App Note. It can be obtained from the Telit [Download Zone](https://www.telit.com/support-training/download-zone/) or by requesting it to ts-oneedge@telit.com. -This application requires the file **object_3311.xml** (provided) to be stored into module's `/mod/` folder, along with the application binary itself. -To load it, use +#### Simulated data +To run the code on a generic ME910C1 device, it is possible to build the code disabling the Bosch related functionalities. To do so, please refer to [Makefile.in](Makefile.in) file and edit the BOSCH_BSEC variable as below. -`AT#M2MWRITE=/mod/object_3311.xml,3734` +``` +BOSCH_BSEC = 0 +``` -And at prompt, send the file content in raw mode. +This will disable all Bosch dependencies and build the app with a simplified logic, simulating sensors data. -#### Prerequisites on the OneEdge Portal -This application requires the **object_3311.xml** content to be stored in your OneEdge organization object registry. The latter can be accessed from the link https:///lwm2m/object_registry -where could be for example `portal-dev.telit.com`. open the xml file in a notepad tool, select all the content and copy it. Then, in the object registry webpage, press "New Object" button on the right and paste the content of the xml file, then press Add button. +#### Local run + +For testing purposes, it is possible to build the project without the LWM2M functionality. To do so, edit the [Makefile.in](Makefile.in) file at the line + +``` +LWM2M = 1 +``` + +and set the variable to 0 + +``` +LWM2M = 0 +``` + + + + +**External Libraries** + +To build the application it is required to put `libalgobsec.ar` file into the project's BOSCH/BSEC folder. The library can be retrieved at the link +https://www.bosch-sensortec.com/software-tools/software/bsec/ . Download the BSEC 1.4.8.0 v3 version archive, then extract the library `libalgobsec.a` from the ZIP file and rename as `libalgobsec.ar`. It can be found in the archive directory +*BSEC_1.4.8.0_Generic_Release_updated_v3/algo/normal_version/bin/gcc/Cortex_A7/without_FPIC* + + +Please note: all the apps using BSEC library configure the device with the **18v3s_4d** option. If a different version of the library is in use, please replace the BOSCH/BME680/bsec_serialized_configurations_iaq.c file in the project with the one inside `BSEC_x.x.x.x_Generic_Release/config/generic_18v_3s_4d/` + --- -LED management through IPSO object 3311 Demo application. Debug prints on **MAIN UART** +Time Series Demo application. Debug prints on **MAIN UART** -### Bravo Environment demo +### Bravo Tampering demo @@ -327,29 +355,31 @@ LED management through IPSO object 3311 Demo application. Debug prints on **MAIN --- - Connect to LWM2M Portal -- Retrieve environment information with BSEC library sensor +- Retrieve movement information from BMI160 sensor +- Update portal about current status (IDLE, TAMPER, WALKING... ) --- -#### Prerequisites on the module +#### Prerequisites -This application requires the file **object_26251.xml** (provided) to be stored into module's `/mod/` folder, along with the application binary itself. +This application requires the file **object_26242.xml** (provided) to be stored into module's `/mod/` folder, along with the application binary itself. To load it, use -`AT#M2MWRITE=/mod/object_26251.xml,1971` +`AT#M2MWRITE=/mod/object_26242.xml,1358` And at prompt, send the file content in raw mode. #### Prerequisites on the OneEdge Portal -This application requires the **object_26251.xml** content to be stored in your OneEdge organization object registry. The latter can be accessed from the link https:///lwm2m/object_registry +This application requires the **object_26242.xml** content to be stored in your OneEdge organization object registry. The latter can be accessed from the link https:///lwm2m/object_registry where could be for example `portal-dev.telit.com`. open the xml file in a notepad tool, select all the content and copy it. Then, in the object registry webpage, press "New Object" button on the right and paste the content of the xml file, then press Add button. -Now from Developer webpage, go in **Thing Definitions** page from the list on the left and press `Import` button on the right. Press `Attach File` and provide `json/bravo_EnvironmentalDemo_thing_def.json` from the project root, then press `Import`. +Now from Developer webpage, go in **Thing Definitions** page from the list on the left and press `Import` button on the right. Press `Attach File` and provide `json/bravo_TamperDemo_thing_def.json` from the project root, then press `Import`. -Again from the Developer webpage, select **Device Profiles**, `Import` button, `Attach File` and provide `json/bravo_EnvironmentalDemo_device_profile.json`, then press `Import`. +Again from the Developer webpage, select **Device Profiles**, `Import` button, `Attach File` and provide `json/bravo_TamperDemo_device_profile.json`, then press `Import`. +Lastly, from the Developer webpage, select **Triggers**, `Actions` menu on the right, `Import` , `Attach File` and provide `json/bravo_TamperDemo_triggers.json`, then press `Import`. Now open the trigger **bravo_TamperDemo_state_trigger** by pressing the View button (the eye icon on the left) and be sure to press the `play` button, and that the trigger status is 'started'. #### Local run @@ -367,21 +397,7 @@ LWM2M = 0 - -**External Libraries** - -To build the application it is required to put `libalgobsec.ar` file into the project's BOSCH/BSEC folder. The library can be retrieved at the link -https://www.bosch-sensortec.com/software-tools/software/bsec/ . Download the BSEC 1.4.8.0 v3 version archive, then extract the library `libalgobsec.a` from the ZIP file and rename as `libalgobsec.ar`. It can be found in the archive directory -*BSEC_1.4.8.0_Generic_Release_updated_v3/algo/normal_version/bin/gcc/Cortex_A7/without_FPIC* - - -Please note: all the apps using BSEC library configure the device with the **18v3s_4d** option. If a different version of the library is in use, please replace the BOSCH/BME680/bsec_serialized_configurations_iaq.c file in the project with the one inside `BSEC_x.x.x.x_Generic_Release/config/generic_18v_3s_4d/` - - ---- - - -Environment Demo application. Debug prints on **MAIN UART** +Tampering Demo application. Debug prints on **MAIN UART**