west: Update project generator with CLOUD v2 features

Enzo Frese · Enzo Frese · commit 8a75c5cd0d04 · 2024-07-07T22:00:32.000-03:00
diff --git a/scripts/west_commands/project_generator/jinja_templates/CMakeLists.j2 b/scripts/west_commands/project_generator/jinja_templates/CMakeLists.j2
@@ -23,21 +23,29 @@ set(ENV{FW_NAME} "{{data['project']['fw_name']}}")
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project({{ project_name }})
-{%- if 'subsystem_lte' in data['features']%}
+{%- if 'subsystem-lte' in data['features']%}
 
 add_custom_command(
     COMMAND ../../../scripts/gen-msg-key.py ../codec/cbor-decoder.yaml ../src/msg_key.h
     OUTPUT ../src/msg_key.h
     MAIN_DEPENDENCY ../codec/cbor-decoder.yaml
 )
+
+{%- endif %}
+
+{%- if 'subsystem-lte-v2' in data['features']%}
+
+add_custom_command(
+    COMMAND west gen-codec -d ../codec/cbor-decoder.yaml -e ../codec/cbor-encoder.yaml -o ../src/app_codec.h
+    OUTPUT ../src/app_codec.h
+    DEPENDS ../codec/cbor-decoder.yaml ../codec/cbor-encoder.yaml
+)
+
 {%- endif %}
 {% for file in sources %}
-	{%- if file != 'app_ble_svc.c'%}
+	{%- if file %}
 target_sources(app PRIVATE src/{{ file }})
 	{%- endif %}
-	{%- if file == 'app_ble_svc.c' %}    
-target_sources_ifdef(CONFIG_CTR_BLE app PRIVATE src/app_ble_svc.c)
-	{%- endif%}
 {%- endfor %}
 
 target_precompile_headers(app PRIVATE src/feature.h)
diff --git a/scripts/west_commands/project_generator/jinja_templates/app_cbor_v2_c.j2 b/scripts/west_commands/project_generator/jinja_templates/app_cbor_v2_c.j2
@@ -40,6 +40,10 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
+
+/* ### Preserved code "functions" (begin) */
+/* ^^^ Preserved code "functions" (end) */
+
 {%- macro encode_items(zs, items, prefix='', indent='') %}
     {%- for item in items -%}
         {% for key, sub_items in item.items() %}
@@ -203,6 +207,7 @@ static int encode(zcbor_state_t *zs)
 
 		return 0;
 }
+{%- if data['encoder']%}
 
 int decode(zcbor_state_t *zs, struct app_cbor_received *received)
 {
@@ -247,6 +252,8 @@ int decode(zcbor_state_t *zs, struct app_cbor_received *received)
 	return 0;
 }
 
+{%- endif %}
+
 int app_cbor_encode(zcbor_state_t *zs)
 {
 	int ret;
@@ -265,6 +272,8 @@ int app_cbor_encode(zcbor_state_t *zs)
 	return 0;
 }
 
+{%- if data['encoder']%}
+
 int app_cbor_decode(zcbor_state_t *zs, struct app_cbor_received *received)
 {
 	int ret;
@@ -276,3 +285,5 @@ int app_cbor_decode(zcbor_state_t *zs, struct app_cbor_received *received)
 
 	return 0;
 }
+
+{%- endif %}
diff --git a/scripts/west_commands/project_generator/jinja_templates/app_cbor_v2_h.j2 b/scripts/west_commands/project_generator/jinja_templates/app_cbor_v2_h.j2
@@ -26,6 +26,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+{%- if data['encoder'] %}
 
 struct app_cbor_received {
 {%- for key in data['encoder']['schema']%}
@@ -35,9 +36,12 @@ int32_t {{sub}};
     {%- endfor %}
 {%- endfor %}
 };
+{%- endif %}
 
 int app_cbor_encode(zcbor_state_t *zs);
+{%- if data['encoder'] %}
 int app_cbor_decode(zcbor_state_t *zs, struct app_cbor_received *received);
+{%- endif %}
 
 #ifdef __cplusplus
 }
diff --git a/scripts/west_commands/project_generator/jinja_templates/app_config_new_c.j2 b/scripts/west_commands/project_generator/jinja_templates/app_config_new_c.j2
@@ -1,15 +1,27 @@
 {#- GLOBAL VARIABLES #}
 {%- set variant_name_lower = data['project']['variant']|lower -%}
+
+{#- COM MODES #}
 {%- set config_mode = [] -%}
 {%- set array_mode = ['none'] -%}
-{%- if 'subsystem-lte' in data['features'] and 'subsystem-lrw' in data['features'] -%}
+
+{%- set has_lte = 'subsystem-lte' in data['features'] -%}
+{%- set has_lte_v2 = 'subsystem-lte-v2' in data['features'] -%}
+{%- set has_lrw = 'subsystem-lrw' in data['features'] -%}
+
+{%- if has_lte and has_lrw -%}
     {%- do config_mode.append('NONE') %}
-    {%- do array_mode.append('lte') %}
-    {%- do array_mode.append('lrw') %}
-{%- elif 'subsystem-lte' in data['features'] and 'subsystem-lrw' not in data['features'] -%}
+    {%- do array_mode.extend(['lte', 'lrw']) %}
+{%- elif has_lte_v2 and has_lrw -%}
+ 	{%- do config_mode.append('NONE') %}
+    {%- do array_mode.extend(['lte-v2', 'lrw']) %}
+{%- elif has_lte -%}
     {%- do config_mode.append('LTE') %}
     {%- do array_mode.append('lte') %}
-{%- elif 'subsystem-lte' not in data['features'] and 'subsystem-lrw' in data['features'] -%}
+{%- elif has_lte_v2 -%}
+    {%- do config_mode.append('LTE_V2') %}
+    {%- do array_mode.append('lte-v2') %}
+{%- elif has_lrw -%}
     {%- do config_mode.append('LRW') %}
     {%- do array_mode.append('lrw') %}
 {%- else -%}
diff --git a/scripts/west_commands/project_generator/jinja_templates/app_config_new_h.j2 b/scripts/west_commands/project_generator/jinja_templates/app_config_new_h.j2
@@ -1,15 +1,27 @@
 {#- GLOBAL VARIABLES #}
 {%- set variant_name_lower = data['project']['variant']|lower -%}
+
+{#- COM MODES #}
 {%- set config_mode = [] -%}
 {%- set array_mode = ['none'] -%}
-{%- if 'subsystem-lte' in data['features'] and 'subsystem-lrw' in data['features'] -%}
+
+{%- set has_lte = 'subsystem-lte' in data['features'] -%}
+{%- set has_lte_v2 = 'subsystem-lte-v2' in data['features'] -%}
+{%- set has_lrw = 'subsystem-lrw' in data['features'] -%}
+
+{%- if has_lte and has_lrw -%}
     {%- do config_mode.append('NONE') %}
-    {%- do array_mode.append('lte') %}
-    {%- do array_mode.append('lrw') %}
-{%- elif 'subsystem-lte' in data['features'] and 'subsystem-lrw' not in data['features'] -%}
+    {%- do array_mode.extend(['lte', 'lrw']) %}
+{%- elif has_lte_v2 and has_lrw -%}
+ 	{%- do config_mode.append('NONE') %}
+    {%- do array_mode.extend(['lte_v2', 'lrw']) %}
+{%- elif has_lte -%}
     {%- do config_mode.append('LTE') %}
     {%- do array_mode.append('lte') %}
-{%- elif 'subsystem-lte' not in data['features'] and 'subsystem-lrw' in data['features'] -%}
+{%- elif has_lte_v2 -%}
+    {%- do config_mode.append('LTE_V2') %}
+    {%- do array_mode.append('lte_v2') %}
+{%- elif has_lrw -%}
     {%- do config_mode.append('LRW') %}
     {%- do array_mode.append('lrw') %}
 {%- else -%}
diff --git a/scripts/west_commands/project_generator/project_generator.py b/scripts/west_commands/project_generator/project_generator.py
@@ -473,7 +473,7 @@ def generate_cmake(self, data):
             for root, dirs, files in os.walk(src_dir):
                 # Collect sources
                 for file in files:
-                    if file.endswith(".c") or file == "msg_key.h":
+                    if file.endswith(".c") or file == "msg_key.h" or file == "app_codec.h":
                         file_path = os.path.relpath(os.path.join(root, file), src_dir)
                         sources.append(file_path)
             # Render the template with data
@@ -524,9 +524,18 @@ def yaml_source(self, name, mode, ext):
             apps_dir = os.path.join(self.app_dir, name)
             yaml_dir = apps_dir
         try:
-            with open(yaml_dir, "r") as stream:
-                data = yaml.safe_load(stream)
-                return data
+            if ext != "cbor-encoder.yaml":
+                with open(yaml_dir, "r") as stream:
+                    data = yaml.safe_load(stream)
+                    return data
+            else:
+                try:
+                    with open(yaml_dir, "r") as stream:
+                        data = yaml.safe_load(stream)
+                        return data
+                except:    
+                    log.wrn('The cbor-encoder.yaml file was not found in the project folder.')          
+                    return None
 
         except Exception as e:
             log.err(f"The {ext} file was not found in the project folder. Error: {e}")

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,10 @@`
`40`	`40`	`#include <stddef.h>`
`41`	`41`	`#include <stdint.h>`
`42`	`42`	`#include <stdlib.h>`
	`43`	`+`
	`44`	`+/* ### Preserved code "functions" (begin) */`
	`45`	`+/* ^^^ Preserved code "functions" (end) */`
	`46`	`+`
`43`	`47`	`{%- macro encode_items(zs, items, prefix='', indent='') %}`
`44`	`48`	`{%- for item in items -%}`
`45`	`49`	`{% for key, sub_items in item.items() %}`
`@@ -203,6 +207,7 @@ static int encode(zcbor_state_t *zs)`
`203`	`207`
`204`	`208`	`return 0;`
`205`	`209`	`}`
	`210`	`+{%- if data['encoder']%}`
`206`	`211`
`207`	`212`	`int decode(zcbor_state_t zs, struct app_cbor_received received)`
`208`	`213`	`{`
`@@ -247,6 +252,8 @@ int decode(zcbor_state_t zs, struct app_cbor_received received)`
`247`	`252`	`return 0;`
`248`	`253`	`}`
`249`	`254`
	`255`	`+{%- endif %}`
	`256`	`+`
`250`	`257`	`int app_cbor_encode(zcbor_state_t *zs)`
`251`	`258`	`{`
`252`	`259`	`int ret;`
`@@ -265,6 +272,8 @@ int app_cbor_encode(zcbor_state_t *zs)`
`265`	`272`	`return 0;`
`266`	`273`	`}`
`267`	`274`
	`275`	`+{%- if data['encoder']%}`
	`276`	`+`
`268`	`277`	`int app_cbor_decode(zcbor_state_t zs, struct app_cbor_received received)`
`269`	`278`	`{`
`270`	`279`	`int ret;`
`@@ -276,3 +285,5 @@ int app_cbor_decode(zcbor_state_t zs, struct app_cbor_received received)`
`276`	`285`
`277`	`286`	`return 0;`
`278`	`287`	`}`
	`288`	`+`
	`289`	`+{%- endif %}`