west: Fix project generator config modes

Author: Enzo Frese

scripts/west_commands/project_generator/jinja_templates/CMakeLists.j2

@@ -38,7 +38,7 @@ add_custom_command(
 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
+    DEPENDS ../codec/cbor-decoder.yaml 
 )
 
 {%- endif %}

scripts/west_commands/project_generator/jinja_templates/app_config_new_c.j2

@@ -142,15 +142,11 @@ const struct ctr_config_item items[] = {
 
 {%- endfor %}
 {#- MODE LTE-LRW #}
-{%- if config_mode %}
 
-#if defined(FEATURE_SUBSYSTEM_LTE) || defined(FEATURE_SUBSYSTEM_LRW)
 	CTR_CONFIG_ITEM_ENUM("mode", m_config_interim.mode, ((const char*[]){ {%- for mode in array_mode %}"{{mode}}"{% if not loop.last %}, {% endif %}{% endfor -%} }), "Set communication mode", APP_CONFIG_MODE_{{config_mode[0]}}),
-#endif /* defined(FEATURE_SUBSYSTEM_LTE) || defined(FEATURE_SUBSYSTEM_LRW) */
-{%- endif %}
 
-/* ### Preserved code "config" (begin) */
-/* ^^^ Preserved code "config" (end) */
+	/* ### Preserved code "config" (begin) */
+	/* ^^^ Preserved code "config" (end) */
 
 };
 /* clang-format on */

scripts/west_commands/project_generator/jinja_templates/app_config_new_h.j2

@@ -64,19 +64,18 @@ extern "C" {
 {# White line #}
 {#- K1 #}
 {%- for feature in data['features'] %}
-	{%- if feature == 'hardware_chester_k1' %}
+	{%- if feature == 'hardware-chester-k1' %}
 #define APP_CONFIG_CHANNEL_COUNT 4  
 	{% endif %}
 {%- endfor %}
 
 {#- MODE LTE-LRW #}
-{%- if config_mode %}
 enum app_config_mode {
 	{%- for mode in array_mode %}
 	APP_CONFIG_MODE_{{ mode | upper }} = {{loop.index0}},
 	{%- endfor %}
 };
-{% endif -%}
+{# wline #}
 
 {#- MODE ENUM #}
 {%- for parameter in data['parameters'] %}

scripts/west_commands/project_generator/jinja_templates/k_config.j2

@@ -189,7 +189,7 @@ config CTR_MACHINE_PROBE
 {#- MB7066_A #} 
 	{%- if feature == 'hardware-chester-mb7066-a' %}
 # {{ feature | upper }} 
-config SHIELD_CTR_A
+config SHIELD_CTR_MB7066_A
 	bool "Enable SHIELD_CTR_MB7066_A"
 	default y 
 

scripts/west_commands/project_generator/project_generator.py

@@ -446,14 +446,14 @@ def cbor(self):
         # Generate app_cbor.c
         self.generate_file(
             "src",
-            "app_cbor_test.c",
+            "app_cbor.c",
             "app_cbor_v2_c.j2",
             **merged_dict,
         )
         # Generate app_cbor.c
         self.generate_file(
             "src",
-            "app_cbor_test.h",
+            "app_cbor.h",
             "app_cbor_v2_h.j2",
             **merged_dict,
         )
@@ -473,7 +473,11 @@ 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" or file == "app_codec.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
@@ -533,8 +537,10 @@ def yaml_source(self, name, mode, ext):
                     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.')          
+                except:
+                    log.wrn(
+                        "The cbor-encoder.yaml file was not found in the project folder."
+                    )
                     return None
 
         except Exception as e: