diff --git a/selfdrive/carrot/carrot_man.py b/selfdrive/carrot/carrot_man.py index e1314da..a773c61 100644 --- a/selfdrive/carrot/carrot_man.py +++ b/selfdrive/carrot/carrot_man.py @@ -895,8 +895,6 @@ class CarrotServ: self.gas_override_speed = 0 self.source_last = "none" - self.turn_speed_ratio = 1.0 - self.gpsDelayTimeAdjust = 2.0 self.debugText = "" @@ -1344,14 +1342,10 @@ class CarrotServ: distanceTraveled = sm['selfdriveState'].distanceTraveled delta_dist = distanceTraveled - self.totalDistance self.totalDistance = distanceTraveled - steer_torque = sm['carControl'].actuators.steer - turn_speed_ratio = np.interp(abs(steer_torque), [0.8, 1.0], [1.0, 0.6]) - self.turn_speed_ratio = self.turn_speed_ratio * 0.9 + turn_speed_ratio * 0.1 else: v_ego = v_ego_kph = 0 delta_dist = 0 CS = None - self.turn_speed_ratio = 1.0 #self.bearing = self.nPosAngle #self._update_gps(v_ego, sm) self.bearing = self._update_gps(v_ego, sm) @@ -1458,13 +1452,6 @@ class CarrotServ: if desired_speed < self.gas_override_speed: source = "gas" desired_speed = self.gas_override_speed - - if self.turn_speed_ratio < 0.95: - if self.turn_speed_ratio < 0.5: - print("ERROR: turn_speed_ratio < 0.5", self.turn_speed_ratio) - else: - desired_speed *= self.turn_speed_ratio - source += "T" self.debugText = ""#f"desired={desired_speed:.1f},{source},g={self.gas_override_speed:.0f}"