Fix C flag definitions for some EZSP config options (#117)

* Fix C flag definitions

* Fix both manifests

* Fix config

* Swap `c_flag: true` with `type: c_flag`

Author: puddly

manifests/nabucasa/skyconnect_zigbee_ncp.yaml

@@ -10,9 +10,6 @@ gbl:
   ezsp_version: dynamic
   baudrate: 115200
 
-configuration:
-  EMBER_CHILD_TABLE_SIZE: 32
-
 c_defines:
   EMBER_APS_UNICAST_MESSAGE_COUNT: 32
   EMBER_BINDING_TABLE_SIZE: 32
@@ -22,6 +19,10 @@ c_defines:
   EMBER_PACKET_BUFFER_COUNT: 255
   EMBER_SOURCE_ROUTE_TABLE_SIZE: 200
 
+  EMBER_CHILD_TABLE_SIZE:
+    type: c_flag
+    value: 32
+
   SL_IOSTREAM_USART_VCOM_BAUDRATE: 115200
   SL_IOSTREAM_USART_VCOM_FLOW_CONTROL_TYPE: usartHwFlowControlCtsAndRts
 

manifests/nabucasa/yellow_zigbee_ncp.yaml

@@ -14,9 +14,6 @@ add_components:
 - id: simple_led
   instance: [board_activity]
 
-configuration:
-  EMBER_CHILD_TABLE_SIZE: 32
-
 c_defines:
   EMBER_APS_UNICAST_MESSAGE_COUNT: 32
   EMBER_BINDING_TABLE_SIZE: 32
@@ -26,6 +23,10 @@ c_defines:
   EMBER_PACKET_BUFFER_COUNT: 255
   EMBER_SOURCE_ROUTE_TABLE_SIZE: 200
 
+  EMBER_CHILD_TABLE_SIZE:
+    type: c_flag
+    value: 32
+
   SL_IOSTREAM_USART_VCOM_BAUDRATE: 115200
   SL_IOSTREAM_USART_VCOM_FLOW_CONTROL_TYPE: usartHwFlowControlCtsAndRts
 

tools/build_project.py

@@ -441,14 +441,39 @@ def main():
     # Actually search for C defines within config
     unused_defines = set(manifest.get("c_defines", {}).keys())
 
+    # First, populate build flags
+    build_flags = {
+        "C_FLAGS": [],
+        "CXX_FLAGS": [],
+        "LD_FLAGS": [],
+    }
+
+    for define, config in manifest.get("c_defines", {}).items():
+        if not isinstance(config, dict):
+            config = manifest["c_defines"][define] = {"type": "config", "value": config}
+
+        if config["type"] == "config":
+            continue
+        elif config["type"] != "c_flag":
+            raise ValueError(f"Invalid config type: {config['type']}")
+
+        build_flags["C_FLAGS"].append(f"-D{define}={config['value']}")
+        build_flags["CXX_FLAGS"].append(f"-D{define}={config['value']}")
+        unused_defines.remove(define)
+
     for config_root in [args.build_dir / "autogen", args.build_dir / "config"]:
         for config_f in config_root.glob("*.h"):
             config_h_lines = config_f.read_text().split("\n")
             written_config = {}
             new_config_h_lines = []
 
             for index, line in enumerate(config_h_lines):
-                for define, value_template in manifest.get("c_defines", {}).items():
+                for define, config in manifest.get("c_defines", {}).items():
+                    if config["type"] == "c_flag":
+                        continue
+
+                    value_template = config["value"]
+
                     if f"#define {define} " not in line:
                         continue
 
@@ -514,12 +539,6 @@ def main():
             )
         )
 
-    build_flags = {
-        "C_FLAGS": [],
-        "CXX_FLAGS": [],
-        "LD_FLAGS": [],
-    }
-
     # Remove absolute paths from the build for reproducibility
     build_flags["C_FLAGS"] += [
         f"-ffile-prefix-map={str(src.absolute())}={dst}"