Improve versions retrieval for GBL creation.

Nerivec · Oct 29, 2024 · 6a337f3 · 6a337f3
1 parent 5055f0d
commit 6a337f3
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 deletions.
diff --git a/manifests/nabucasa/skyconnect_openthread_rcp.yaml b/manifests/nabucasa/skyconnect_openthread_rcp.yaml
@@ -1,13 +1,13 @@
 name: SkyConnect OpenThread RCP
 device: EFR32MG21A020F512IM32
 base_project: src/openthread_rcp
-filename: "{manifest_name}_{ot_rcp_version.split('/')[-1]}_gsdk_{sdk_version}"
+filename: "{manifest_name}_{ot_version}_gsdk_{sdk_version}"
 sdk: "gecko_sdk:4.4.4"
 toolchain: "12.2.1.20221205"
 
 gbl:
   fw_type: openthread_rcp
-  ot_rcp_version: dynamic
+  ot_version: dynamic
   baudrate: 460800
 
 c_defines:

diff --git a/manifests/nabucasa/yellow_openthread_rcp.yaml b/manifests/nabucasa/yellow_openthread_rcp.yaml
@@ -1,13 +1,13 @@
 name: Yellow OpenThread RCP
 device: MGM210PA32JIA
 base_project: src/openthread_rcp
-filename: "{manifest_name}_{ot_rcp_version.split('/')[-1]}_gsdk_{sdk_version}"
+filename: "{manifest_name}_{ot_version}_gsdk_{sdk_version}"
 sdk: "gecko_sdk:4.4.4"
 toolchain: "12.2.1.20221205"
 
 gbl:
   fw_type: openthread_rcp
-  ot_rcp_version: dynamic
+  ot_version: dynamic
   baudrate: 460800
 
 add_components:

diff --git a/tools/create_gbl.py b/tools/create_gbl.py
@@ -164,16 +164,36 @@ def main():
         )
         metadata["ezsp_version"] = zigbee_esf_props["version"][0]
 
+    if "ot_version" in gbl_dynamic:
+        gbl_dynamic.remove("ot_version")
+        ot_esf_props = parse_properties_file(
+            (gsdk_path / "protocol/openthread/esf.properties").read_text()
+        )
+        metadata["ot_version"] = ot_esf_props["version"][0]
+
+    if "ble_version" in gbl_dynamic:
+        gbl_dynamic.remove("ble_version")
+        sl_bt_version_h = parse_c_header_defines(
+            (gsdk_path / "protocol/bluetooth/inc/sl_bt_version.h").read_text()
+        )
+        metadata["ble_version"] = ".".join(
+            [
+                str(sl_bt_version_h["SL_BT_VERSION_MAJOR"]),
+                str(sl_bt_version_h["SL_BT_VERSION_MINOR"]),
+                str(sl_bt_version_h["SL_BT_VERSION_PATCH"]),
+            ]
+        )
+
     if "cpc_version" in gbl_dynamic:
         gbl_dynamic.remove("cpc_version")
-        sl_gsdk_version_h = parse_c_header_defines(
-            (gsdk_path / "platform/common/inc/sl_gsdk_version.h").read_text()
+        sl_platform_version_h = parse_c_header_defines(
+            (gsdk_path / "platform/common/inc/sl_platform_version.h").read_text()
         )
         metadata["cpc_version"] = ".".join(
             [
-                str(sl_gsdk_version_h["SL_GSDK_MAJOR_VERSION"]),
-                str(sl_gsdk_version_h["SL_GSDK_MINOR_VERSION"]),
-                str(sl_gsdk_version_h["SL_GSDK_PATCH_VERSION"]),
+                str(sl_platform_version_h["SL_PLATFORM_MAJOR_VERSION"]),
+                str(sl_platform_version_h["SL_PLATFORM_MINOR_VERSION"]),
+                str(sl_platform_version_h["SL_PLATFORM_PATCH_VERSION"]),
             ]
         )
 
@@ -196,13 +216,6 @@ def main():
         )
         metadata["zwave_version"] = zwave_props["version"][0]
 
-    if "ot_rcp_version" in gbl_dynamic:
-        gbl_dynamic.remove("ot_rcp_version")
-        openthread_config_h = parse_c_header_defines(
-            (project_root / "config/sl_openthread_generic_config.h").read_text()
-        )
-        metadata["ot_rcp_version"] = openthread_config_h["PACKAGE_STRING"]
-
     if "gecko_bootloader_version" in gbl_dynamic:
         gbl_dynamic.remove("gecko_bootloader_version")
         btl_config_h = parse_c_header_defines(