Remove sim module. Update dependencies. Disable sim script output print

lsy_drone_racing/control/trajectory_controller.py

@@ -42,8 +42,8 @@ def __init__(self, initial_obs: dict[str, NDArray[np.floating]], initial_info: d
                 [0.2, -1.8, 0.65],
                 [1.1, -1.35, 1.1],
                 [0.2, 0.0, 0.65],
-                [0.0, 0.75, 0.525],
-                [0.0, 0.75, 1.1],
+                [0.0, 0.7, 0.525],
+                [0.0, 0.7, 1.1],
                 [-0.5, -0.5, 1.1],
                 [-0.5, -1.0, 1.1],
             ]

lsy_drone_racing/envs/drone_racing_deploy_env.py

@@ -28,12 +28,12 @@
 
 import gymnasium
 import numpy as np
+from crazyflow.control.control import thrust_curve
+from crazyflow.sim.symbolic import symbolic_attitude
 from gymnasium import spaces
 from scipy.spatial.transform import Rotation as R
 
 from lsy_drone_racing.control.closing_controller import ClosingController
-from lsy_drone_racing.sim.drone import Drone
-from lsy_drone_racing.sim.sim import Sim
 from lsy_drone_racing.utils import check_gate_pass
 from lsy_drone_racing.utils.import_utils import get_ros_package_path, pycrazyswarm
 from lsy_drone_racing.utils.ros_utils import check_drone_start_pos, check_race_track
@@ -111,17 +111,7 @@ def __init__(self, config: dict | Munch):
             names += [f"gate{g}" for g in range(1, len(config.env.track.gates) + 1)]
             names += [f"obstacle{g}" for g in range(1, len(config.env.track.obstacles) + 1)]
         self.vicon = Vicon(track_names=names, timeout=5)
-        self.symbolic = None
-        if config.env.symbolic:
-            sim = Sim(
-                track=config.env.track,
-                sim_freq=config.sim.sim_freq,
-                ctrl_freq=config.sim.ctrl_freq,
-                disturbances=getattr(config.sim, "disturbances", {}),
-                randomization=getattr(config.env, "randomization", {}),
-                physics=config.sim.physics,
-            )
-            self.symbolic = sim.symbolic()
+        self.symbolic = symbolic_attitude(config.env.freq) if config.env.symbolic else None
         self._last_pos = np.zeros(3)
 
         self.gates_visited = np.array([False] * len(config.env.track.gates))
@@ -153,7 +143,7 @@ def reset(
         info["low_level_ctrl_freq"] = self.config.sim.ctrl_freq
         info["env_freq"] = self.config.env.freq
         info["drone_mass"] = 0.033  # Crazyflie 2.1 mass in kg
-        return self.obs, info
+        return self.obs(), info
 
     def step(
         self, action: NDArray[np.floating]
@@ -175,7 +165,7 @@ def step(
         if self.target_gate >= len(self.config.env.track.gates):
             self.target_gate = -1
         terminated = self.target_gate == -1
-        return self.obs, -1.0, terminated, False, self.info
+        return self.obs(), -1.0, terminated, False, self.info
 
     def close(self):
         """Close the environment by stopping the drone and landing back at the starting position."""
@@ -189,7 +179,7 @@ def close(self):
             self.config.env.freq = freq_new
             t_step_ctrl = 1 / self.config.env.freq
 
-            obs = self.obs
+            obs = self.obs()
             obs["acc"] = np.array(
                 [0, 0, 0]
             )  # TODO, use actual value when avaiable or do one step to calculate from velocity
@@ -211,15 +201,14 @@ def close(self):
                     action[10:],
                 )
                 self.cf.cmdFullState(pos, vel, acc, yaw, rpy_rate)
-                obs = self.obs
+                obs = self.obs()
                 obs["acc"] = np.array([0, 0, 0])
                 controller.step_callback(action, obs, 0, True, False, info)
                 time.sleep(t_step_ctrl)
 
         self.cf.notifySetpointsStop()
         self.cf.land(0.05, 2.0)
 
-    @property
     def obs(self) -> dict:
         """Return the observation of the environment."""
         drone = self.vicon.drone_name
@@ -312,7 +301,6 @@ def __init__(self, config: dict | Munch):
         """
         super().__init__(config)
         self.action_space = gymnasium.spaces.Box(low=-1, high=1, shape=(4,))
-        self.drone = Drone("mellinger")
 
     def step(
         self, action: NDArray[np.floating]
@@ -329,12 +317,11 @@ def step(
         assert action.shape == self.action_space.shape, f"Invalid action shape: {action.shape}"
         collective_thrust, rpy = action[0], action[1:]
         rpy_deg = np.rad2deg(rpy)
-        collective_thrust = self.drone._thrust_to_pwms(collective_thrust)
-        self.cf.cmdVel(*rpy_deg, collective_thrust)
+        self.cf.cmdVel(*rpy_deg, thrust_curve(collective_thrust))
         current_pos = self.vicon.pos[self.vicon.drone_name]
         self.target_gate += self.gate_passed(current_pos, self._last_pos)
         self._last_pos[:] = current_pos
         if self.target_gate >= len(self.config.env.track.gates):
             self.target_gate = -1
         terminated = self.target_gate == -1
-        return self.obs, -1.0, terminated, False, self.info
+        return self.obs(), -1.0, terminated, False, self.info

lsy_drone_racing/envs/drone_racing_env.py

@@ -39,7 +39,7 @@
 from gymnasium import spaces
 from scipy.spatial.transform import Rotation as R
 
-from lsy_drone_racing.envs.utils import randomize_sim_fn
+from lsy_drone_racing.envs.randomize import randomize_sim_fn
 from lsy_drone_racing.utils import check_gate_pass
 
 if TYPE_CHECKING:
@@ -87,8 +87,8 @@ class DroneRacingEnv(gymnasium.Env):
     low-level controller.
     """
 
-    gate_spec_path = Path(__file__).parents[1] / "sim/assets/gate.xml"
-    obstacle_spec_path = Path(__file__).parents[1] / "sim/assets/obstacle.xml"
+    gate_spec_path = Path(__file__).parent / "assets/gate.xml"
+    obstacle_spec_path = Path(__file__).parent / "assets/obstacle.xml"
 
     def __init__(self, config: dict):
         """Initialize the DroneRacingEnv.
@@ -176,7 +176,7 @@ def reset(
         # the sim.reset_hook function, so we don't need to explicitly do it here
         self.sim.reset()
 
-        # TODO: Add randomization of gates, obstacles, drone, and disturbances
+        # TODO: Add disturbances
         self.target_gate = 0
         self._steps = 0
         self._last_drone_pos[:] = self.sim.data.states.pos[0, 0]
@@ -201,7 +201,6 @@ def step(
         """
         assert action.shape == self.action_space.shape, f"Invalid action shape: {action.shape}"
         # TODO: Add action noise
-        # TODO: Check why sim is being compiled twice
         self.sim.state_control(action.reshape((1, 1, 13)).astype(np.float32))
         self.sim.step(self.sim.freq // self.config.env.freq)
         self.target_gate += self.gate_passed()
@@ -435,7 +434,6 @@ def step(
         """
         assert action.shape == self.action_space.shape, f"Invalid action shape: {action.shape}"
         # TODO: Add action noise
-        # TODO: Check why sim is being compiled twice
         self.sim.attitude_control(action.reshape((1, 1, 4)).astype(np.float32))
         self.sim.step(self.sim.freq // self.config.env.freq)
         self.target_gate += self.gate_passed()