diff --git a/.github/workflows/ros2-build.yml b/.github/workflows/ros2-build.yml index ec88ec02..ec09c96a 100644 --- a/.github/workflows/ros2-build.yml +++ b/.github/workflows/ros2-build.yml @@ -100,7 +100,7 @@ jobs: Environment Overrides: - UAV_SIM=false (already set in hardware config) - UAV_MISSION=mission_name - - UAV_DEBUG=true/false + - VERBOSE=true/false - UAV_LAUNCH_PARAMS=/path/to/custom/params.yaml EOF diff --git a/controls/sae_2025_ws/src/integration/frontend/src/App.jsx b/controls/sae_2025_ws/src/integration/frontend/src/App.jsx index 768ec1a3..7cfc5f22 100644 --- a/controls/sae_2025_ws/src/integration/frontend/src/App.jsx +++ b/controls/sae_2025_ws/src/integration/frontend/src/App.jsx @@ -12,8 +12,8 @@ const LAUNCH_PARAM_FIELDS = [ help: 'Mission profile identifier used by launch.', }, { - key: 'uav_debug', - label: 'UAV debug', + key: 'verbose', + label: 'Verbose', type: 'boolean', help: 'Enable extra UAV-side debug outputs.', }, @@ -85,7 +85,7 @@ const LAUNCH_PARAM_CORE_FIELDS = [ ].map(key => LAUNCH_PARAM_FIELD_MAP[key]).filter(Boolean) const LAUNCH_PARAM_TOGGLE_FIELDS = [ - 'uav_debug', + 'verbose', 'vision_debug', 'auto_launch', 'use_camera', diff --git a/controls/sae_2025_ws/src/uav/launch/launch_params.yaml b/controls/sae_2025_ws/src/uav/launch/launch_params.yaml index 2eec284f..95c31e5e 100644 --- a/controls/sae_2025_ws/src/uav/launch/launch_params.yaml +++ b/controls/sae_2025_ws/src/uav/launch/launch_params.yaml @@ -1,6 +1,6 @@ # launch_params.yaml mission_name: straight_waypoints -uav_debug: false +verbose: false vision_debug: false auto_launch: true airframe: standard_vtol # Enter a preset below or a valid airframe ID (integer), either custom or from PX4 diff --git a/controls/sae_2025_ws/src/uav/launch/launch_params_hardware.yaml b/controls/sae_2025_ws/src/uav/launch/launch_params_hardware.yaml index 909d8506..047c5a15 100644 --- a/controls/sae_2025_ws/src/uav/launch/launch_params_hardware.yaml +++ b/controls/sae_2025_ws/src/uav/launch/launch_params_hardware.yaml @@ -3,7 +3,7 @@ # Copy this to launch_params.yaml or set UAV_LAUNCH_PARAMS env var mission_name: basic -uav_debug: false +verbose: false vision_debug: false auto_launch: true vehicle_type: 0 # 0 for quadrotor, 1 for tiltrotor VTOL, 2 for fixed-wing, 3 for standard VTOL diff --git a/controls/sae_2025_ws/src/uav/launch/main.launch.py b/controls/sae_2025_ws/src/uav/launch/main.launch.py index 34ce8a5d..90d06974 100644 --- a/controls/sae_2025_ws/src/uav/launch/main.launch.py +++ b/controls/sae_2025_ws/src/uav/launch/main.launch.py @@ -35,7 +35,7 @@ def launch_setup(context, *args, **kwargs): # Load launch parameters from the YAML file. params = load_launch_parameters() mission_name = params.get("mission_name", "basic") - uav_debug_bool = params.get("uav_debug", False) + verbose_bool = params.get("verbose", False) vision_debug_bool = params.get("vision_debug", False) use_camera_bool = params.get("use_camera", True) save_vision_milliseconds = params.get("save_vision_milliseconds", 0) @@ -171,7 +171,7 @@ def launch_setup(context, *args, **kwargs): output="screen", parameters=[ { - "debug": uav_debug_bool, + "debug": verbose_bool, "mode_map": YAML_PATH, "servo_only": servo_only_bool, "camera_offsets": camera_offsets,