Launchpad and other separation

.github/scripts/process_and_convert.py

@@ -3,6 +3,7 @@
 import requests
 from zipfile import ZipFile
 
+
 def download_and_extract(url, extract_to):
     print(url)
     try:
@@ -11,29 +12,22 @@ def download_and_extract(url, extract_to):
         zip_path = os.path.join(extract_to, os.path.basename(url))
         with open(zip_path, "wb") as f:
             f.write(response.content)
-        with ZipFile(zip_path, 'r') as zip_ref:
+        with ZipFile(zip_path, "r") as zip_ref:
             zip_ref.extractall(extract_to)
         os.remove(zip_path)
     except requests.RequestException as e:
         print(f"Error downloading from {url}: {e}")
     except zipfile.BadZipFile as e:
         print(f"Error unpacking archive: {e}")
 
+
 def update_manifest(root, file, chip, version):
-    manifest_path = os.path.join('ti', 'manifest.json')
+    manifest_path = os.path.join("ti", "manifest.json")
     link = f"https://raw.githubusercontent.com/xyzroe/XZG/zb_fws/{root}/{file}"
-    root = root.replace('ti/', '')
-    data = {
-        chip: {
-            file: {
-                "ver": version,
-                "link": link,
-                "notes": ""
-            }
-        }
-    }
+    root = root.replace("ti/", "")
+    data = {chip: {file: {"ver": version, "link": link, "notes": ""}}}
     if os.path.exists(manifest_path):
-        with open(manifest_path, 'r+') as f:
+        with open(manifest_path, "r+") as f:
             manifest = json.load(f)
             if root not in manifest:
                 manifest[root] = {}
@@ -42,26 +36,27 @@ def update_manifest(root, file, chip, version):
             if file not in manifest[root][chip]:
                 manifest[root][chip][file] = data[chip][file]
             else:
-                manifest[root][chip][file]['ver'] = data[chip][file]['ver']
-                manifest[root][chip][file]['link'] = data[chip][file]['link']
-                manifest[root][chip][file].setdefault('notes', "")
+                manifest[root][chip][file]["ver"] = data[chip][file]["ver"]
+                manifest[root][chip][file]["link"] = data[chip][file]["link"]
+                manifest[root][chip][file].setdefault("notes", "")
             f.seek(0)
             json.dump(manifest, f, indent=4)
             f.truncate()
     else:
-        with open(manifest_path, 'w') as f:
+        with open(manifest_path, "w") as f:
             json.dump({root: data}, f, indent=4)
 
-with open('task.json', 'r') as f:
-    print('Read task.json')
+
+with open("task.json", "r") as f:
+    print("Read task.json")
     tasks = json.load(f)
     for task in tasks:
-        dir_path = os.path.join('ti', task['type'])
+        dir_path = os.path.join("ti", task["type"])
         os.makedirs(dir_path, exist_ok=True)
-        download_and_extract(task['link'], dir_path)
+        download_and_extract(task["link"], dir_path)
 
 print("hex2bin")
-for root, dirs, files in os.walk('ti'):
+for root, dirs, files in os.walk("ti"):
     for file in files:
         if file.endswith(".hex"):
             print(file)
@@ -73,42 +68,51 @@ def update_manifest(root, file, chip, version):
                 os.remove(hex_path)
             except Exception as e:
                 print(f"Error converting file {hex_path}: {e}")
-                
+
 print("update manifest")
-for root, dirs, files in os.walk('ti'):
+for root, dirs, files in os.walk("ti"):
     for file in files:
         if file.endswith(".bin"):
             print(file)
             bin_path = os.path.join(root, file)
             # Extract chip and version from the file name
-            parts = file.split('_')
+            parts = file.split("_")
             chip_mapping = {
-                "2652P_": "CC2652P",
-                "1352P_": "CC2652P",
+                "CC2652P_launchpad": "CC2652P2_launchpad",
+                "1352P_RFS": "CC2652P2_launchpad",
+                "CC2652PSIP": "CC2652P2_launchpad",
+                "2652P_other": "CC2652P2_other",
+                "1352P_E72": "CC2652P2_other",
                 "1352P7_": "CC2652P7",
-                "2652RB_": "CC2652RB"
+                "2652RB_": "CC2652RB",
             }
 
-            current_chip = '_'.join(parts[:-1])  # Chip is everything before the date part
+            current_chip = "_".join(
+                parts[:-1]
+            )  # Chip is everything before the date part
 
             chip = None
             for key, value in chip_mapping.items():
                 if key in current_chip:
                     chip = value
                     break
-                
+
             if chip is None:
                 chip = current_chip
-
-            version = parts[-1].split('.')[0]  # Assuming the version is the last part before '.bin'
+
+            version = parts[-1].split(".")[
+                0
+            ]  # Assuming the version is the last part before '.bin'
             update_manifest(root, file, chip, version)
 
+
 def clean_directory(directory):
     print("clean directory")
     for root, dirs, files in os.walk(directory):
         for file in files:
             if not (file.endswith(".bin") or file == "manifest.json"):
                 os.remove(os.path.join(root, file))
 
+
 # Calling the clean_directory function to remove unwanted files
-clean_directory('ti')
+clean_directory("ti")

ti/manifest.json

@@ -217,7 +217,7 @@
     },
     "thread": {
         "CC2652P": {
-            "rcp_LP_CC2652P_SIP_tirtos7_ticlang_20240506.bin": {
+            "rcp_LP_CC2652PSIP_tirtos7_ticlang_20240506.bin": {
                 "ver": "20240506",
                 "link": "https://raw.githubusercontent.com/xyzroe/XZG/zb_fws/ti/thread/rcp_LP_CC2652P_SIP_tirtos7_ticlang_20240506.bin",
                 "notes": "Special build from @mercenaruss"