Target list based on JSON and support for any combination of targets

Author: lucasssvaz

tools/config_editor/app.py

@@ -24,6 +24,7 @@
 """
 
 import argparse
+import json
 import os
 import platform
 import sys
@@ -95,6 +96,7 @@ class ConfigEditorApp(App):
     ROOT_PATH = os.path.abspath(os.path.join(SCRIPT_PATH, "..", ".."))
 
     # Set the application options
+    supported_targets = []
     setting_enable_copy = True
 
     # Options to be set by the command line arguments
@@ -119,7 +121,8 @@ def on_mount(self) -> None:
         print("Python version: " + sys.version)
         print("Root path: " + self.ROOT_PATH)
         print("Script path: " + self.SCRIPT_PATH)
-        print("Target: " + str(self.setting_target))
+        print("Supported Targets: " + ", ".join(self.supported_targets))
+        print("Default targets: " + self.setting_target)
         print("Enable Copy: " + str(self.setting_enable_copy))
         print("Arduino Path: " + str(self.setting_arduino_path))
         print("Arduino Branch: " + str(self.setting_arduino_branch))
@@ -136,6 +139,9 @@ def arduino_default_path():
     else: # Windows and MacOS
         return os.path.join(home, "Documents", "Arduino", "hardware", "espressif", "esp32")
 
+def check_arduino_path():
+    return os.path.isdir(arduino_default_path())
+
 def main() -> None:
     # Set the PYTHONUNBUFFERED environment variable to "1" to disable the output buffering
     os.environ['PYTHONUNBUFFERED'] = "1"
@@ -147,21 +153,39 @@ def main() -> None:
 
     app = ConfigEditorApp()
 
+    target_choices = []
+
+    # Parse build JSON file
+    build_json_path = os.path.join(app.ROOT_PATH, "configs", "builds.json")
+    if os.path.isfile(build_json_path):
+        with open(build_json_path, "r") as build_json_file:
+            build_json = json.load(build_json_file)
+            for target in build_json["targets"]:
+                try:
+                    default = False if target["skip"] else True
+                except:
+                    default = True
+                target_choices.append((target["target"], default))
+    else:
+        print("Error: configs/builds.json file not found.")
+        exit(1)
+
+    target_choices.sort(key=lambda x: x[0])
+
     parser = argparse.ArgumentParser(description="Configure and compile the ESP32 Arduino static libraries")
 
-    target_choices = ("all", "esp32", "esp32s2", "esp32s3", "esp32c2", "esp32c3", "esp32c6", "esp32h2")
     parser.add_argument("-t", "--target",
                         metavar="<target>",
                         type=str,
-                        default="all",
-                        choices=target_choices,
+                        default="default",
                         required=False,
-                        help="Target to be compiled. Choose from: " + ", ".join(target_choices))
+                        help="Comma separated list of targets to be compiled. Choose from: " + ", ".join([x[0] for x in target_choices])
+                             + ". Default: All except " + ", ".join([x[0] for x in target_choices if not x[1]]))
 
     parser.add_argument("--copy",
                         type=bool,
                         action=argparse.BooleanOptionalAction,
-                        default=True,
+                        default=True if check_arduino_path() else False,
                         required=False,
                         help="Enable/disable copying the compiled libraries to arduino-esp32. Enabled by default")
 
@@ -205,6 +229,12 @@ def main() -> None:
     args = parser.parse_args()
 
     # Set the options in the app
+    if args.target.strip() == "default":
+        args.target = ",".join([x[0] for x in target_choices if x[1]])
+    elif args.target.strip() == "all":
+        args.target = ",".join([x[0] for x in target_choices])
+
+    app.supported_targets = [x[0] for x in target_choices]
     app.setting_target = args.target
     app.setting_enable_copy = args.copy
     app.setting_arduino_path = os.path.abspath(args.arduino_path)

tools/config_editor/compile.py

@@ -72,12 +72,15 @@ def compile_libs(self) -> None:
 
         label = self.query_one("#compile-title", Static)
         self.child_process = None
-        target = self.app.setting_target
+        if self.app.setting_target == ",".join(self.app.supported_targets):
+            target = "all targets"
+        else:
+            target = self.app.setting_target.replace(",", ", ").upper()
 
-        label.update("Compiling for " + target.upper())
-        self.print_info("======== Compiling for " + target.upper() + " ========")
+        label.update("Compiling for " + target)
+        self.print_info("======== Compiling for " + target + " ========")
 
-        command = ["./build.sh", "-t", target, "-D", self.app.setting_debug_level]
+        command = ["./build.sh", "-t", self.app.setting_target, "-D", self.app.setting_debug_level]
 
         #command.append("--help") # For testing output without compiling
 
@@ -112,14 +115,14 @@ def compile_libs(self) -> None:
             print("Process might have terminated")
 
         if not self.child_process:
-            self.print_error("Compilation failed for " + target.upper() + "Child process failed to start")
-            label.update("Compilation failed for " + target.upper() + "Child process failed to start")
+            self.print_error("Compilation failed for " + target + "Child process failed to start")
+            label.update("Compilation failed for " + target + "Child process failed to start")
             return
         else:
             self.child_process.wait()
 
         if self.child_process.returncode != 0:
-            self.print_error("Compilation failed for " + target.upper() + ". Return code: " + str(self.child_process.returncode))
+            self.print_error("Compilation failed for " + target + ". Return code: " + str(self.child_process.returncode))
             self.print_error("Errors:")
             try:
                 for error in self.child_process.stderr:
@@ -128,10 +131,10 @@ def compile_libs(self) -> None:
                 self.child_process.stderr.close()
             except Exception as e:
                 print("Error reading child process errors: " + str(e))
-            label.update("Compilation failed for " + target.upper())
+            label.update("Compilation failed for " + target)
         else:
-            self.print_success("Compilation successful for " + target.upper())
-            label.update("Compilation successful for " + target.upper())
+            self.print_success("Compilation successful for " + target)
+            label.update("Compilation successful for " + target)
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
         # Event handler called when a button is pressed

tools/config_editor/settings.py

@@ -1,10 +1,12 @@
+import math
+
 from textual import on
 from textual.app import ComposeResult
 from textual.binding import Binding
 from textual.containers import VerticalScroll, Container, Horizontal
 from textual.screen import Screen
 from textual.events import ScreenResume
-from textual.widgets import Header, Button, Switch, Label, Footer
+from textual.widgets import Header, Button, Switch, Label, Footer, Checkbox
 
 from widgets import LabelledInput, LabelledSelect
 
@@ -17,7 +19,6 @@ class SettingsScreen(Screen):
         Binding("escape", "app.pop_screen", "Discard")
     ]
 
-    target_select: LabelledSelect
     enable_copy_switch: Switch
     arduino_path_input: LabelledInput
     arduino_branch_input: LabelledInput
@@ -26,7 +27,13 @@ class SettingsScreen(Screen):
     idf_debug_select: LabelledSelect
 
     def action_save(self) -> None:
-        self.app.setting_target = self.target_select.get_select_value()
+        checkboxes = self.query(Checkbox)
+        self.app.setting_target = ""
+        for checkbox in checkboxes:
+            if checkbox.value:
+                if self.app.setting_target:
+                    self.app.setting_target += ","
+                self.app.setting_target += checkbox.id.replace("-checkbox", "")
         print("Target setting updated: " + self.app.setting_target)
 
         self.app.setting_enable_copy = self.enable_copy_switch.value
@@ -61,7 +68,12 @@ def on_button_pressed(self, event: Button.Pressed) -> None:
     def on_resume(self) -> None:
         # Event handler called every time the screen is activated
         print("Settings screen resumed. Updating settings.")
-        self.target_select.set_select_value(self.app.setting_target)
+        targets = self.app.setting_target.split(",")
+        checkboxes = self.query(Checkbox)
+        for checkbox in checkboxes:
+            checkbox.value = False
+            if checkbox.id.replace("-checkbox", "") in targets:
+                checkbox.value = True
         self.enable_copy_switch.value = self.app.setting_enable_copy
         if self.app.setting_enable_copy:
             self.arduino_path_input.visible = True
@@ -85,18 +97,11 @@ def compose(self) -> ComposeResult:
         # Compose the target selection screen
         yield Header()
         with VerticalScroll(id="settings-scroll-container"):
-            target_options = [
-                ("All", "all"),
-                ("ESP32", "esp32"),
-                ("ESP32-S2", "esp32s2"),
-                ("ESP32-S3", "esp32s3"),
-                ("ESP32-C2 (ESP8684)", "esp32c2"),
-                ("ESP32-C3", "esp32c3"),
-                ("ESP32-C6", "esp32c6"),
-                ("ESP32-H2", "esp32h2")
-            ]
-            self.target_select = LabelledSelect("Compilation Target", target_options, allow_blank=False, id="target-select")
-            yield self.target_select
+
+            yield Label("Compilation Targets", id="settings-target-label")
+            with Container(id="settings-target-container"):
+                for target in self.app.supported_targets:
+                    yield Checkbox(target.upper(), id=target + "-checkbox")
 
             with Horizontal(classes="settings-switch-container"):
                 self.enable_copy_switch = Switch(value=self.app.setting_enable_copy, id="enable-copy-switch")
@@ -136,4 +141,9 @@ def compose(self) -> ComposeResult:
     def on_mount(self) -> None:
         # Event handler called when the screen is mounted for the first time
         self.sub_title = "Settings"
+        target_container = self.query_one("#settings-target-container")
+        # Height needs to be 3 for each row of targets + 1
+        height_value = str(int(math.ceil(len(self.app.supported_targets) / int(target_container.styles.grid_size_columns)) * 3 + 1))
+        print("Target container height: " + height_value)
+        target_container.styles.height = height_value
         print("Settings screen mounted")

tools/config_editor/style.tcss

@@ -128,6 +128,20 @@ Button {
     align: center middle;
 }
 
+#settings-target-label {
+    margin-left: 1;
+}
+
+#settings-target-container {
+    layout: grid;
+    grid-size: 4;
+}
+
+#settings-target-container Checkbox {
+    width: 100%;
+    margin-right: -1;
+}
+
 .settings-button {
     margin: 1;
     min-width: 100%;