pull/33478/head
Shane Smiskol 8 months ago
parent ba761a973c
commit 757353e797
  1. 2
      selfdrive/controls/controlsd.py
  2. 5
      selfdrive/controls/lib/alertmanager.py

@ -105,7 +105,7 @@ class Controls:
ignore_alive=ignore, ignore_avg_freq=ignore+['radarState', 'testJoystick'], ignore_valid=['testJoystick', ],
frequency=int(1/DT_CTRL))
self.joystick_mode = self.params.get_bool("JoystickDebugMode")
self.joystick_mode = False # self.params.get_bool("JoystickDebugMode")
# read params
self.is_metric = self.params.get_bool("IsMetric")

@ -33,7 +33,6 @@ class AlertEntry:
return frame <= self.end_frame
def just_added(self, frame: int) -> bool:
print('just added', frame, self.last_frame)
return frame == (self.last_frame + 1) and self.active(frame)
class AlertManager:
@ -44,9 +43,7 @@ class AlertManager:
for alert in alerts:
entry = self.alerts[alert.alert_type]
entry.alert = alert
print('active', entry.active(frame), 'just added', entry.just_added(frame))
if not entry.just_added(frame):# or not entry.active(frame):
print('RESET FRAME!')
if not entry.just_added(frame):
entry.start_frame = frame
min_end_frame = entry.start_frame + alert.duration
entry.end_frame = max(frame + 1, min_end_frame)

Loading…
Cancel
Save