spacecruft
/
nopenpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Dos (#1795)

pull/1787/head
robbederks 2020-06-29 12:47:48 +02:00 committed by GitHub
parent ce80684f7e
commit df86c476c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cereal

@ -1 +1 @@
Subproject commit 4e3541ae432cf719ae67546c50e01ae580738a38 Subproject commit 7f6df092efdc64fbab56d1f8804ce40ccd77dee5

2
selfdrive/controls/controlsd.py
View File

@ -62,7 +62,7 @@ class Controls:
# wait for one health and one CAN packet # wait for one health and one CAN packet
hw_type = messaging.recv_one(self.sm.sock['health']).health.hwType hw_type = messaging.recv_one(self.sm.sock['health']).health.hwType
has_relay = hw_type in [HwType.blackPanda, HwType.uno] has_relay = hw_type in [HwType.blackPanda, HwType.uno, HwType.dos]
print("Waiting for CAN messages...") print("Waiting for CAN messages...")
messaging.get_one_can(self.can_sock) messaging.get_one_can(self.can_sock)

4
selfdrive/controls/lib/events.py
View File

@ -188,10 +188,10 @@ def calibration_incomplete_alert(CP, sm, metric):
Priority.LOWEST, VisualAlert.none, AudibleAlert.none, 0., 0., .2) Priority.LOWEST, VisualAlert.none, AudibleAlert.none, 0., 0., .2)
def no_gps_alert(CP, sm, metric): def no_gps_alert(CP, sm, metric):
two = sm['health'].hwType == log.HealthData.HwType.uno gps_integrated = sm['health'].hwType in [log.HealthData.HwType.uno, log.HealthData.HwType.dos]
return Alert( return Alert(
"Poor GPS reception", "Poor GPS reception",
"If sky is visible, contact support" if two else "Check GPS antenna placement", "If sky is visible, contact support" if gps_integrated else "Check GPS antenna placement",
AlertStatus.normal, AlertSize.mid, AlertStatus.normal, AlertSize.mid,
Priority.LOWER, VisualAlert.none, AudibleAlert.none, 0., 0., .2, creation_delay=300.) Priority.LOWER, VisualAlert.none, AudibleAlert.none, 0., 0., .2, creation_delay=300.)

2
selfdrive/thermald/thermald.py
View File

@ -213,7 +213,7 @@ def thermald_thread():
# Setup fan handler on first connect to panda # Setup fan handler on first connect to panda
if handle_fan is None and health.health.hwType != log.HealthData.HwType.unknown: if handle_fan is None and health.health.hwType != log.HealthData.HwType.unknown:
is_uno = health.health.hwType == log.HealthData.HwType.uno is_uno = health.health.hwType == log.HealthData.HwType.uno
has_relay = health.health.hwType in [log.HealthData.HwType.blackPanda, log.HealthData.HwType.uno] has_relay = health.health.hwType in [log.HealthData.HwType.blackPanda, log.HealthData.HwType.uno, log.HealthData.HwType.dos]
if is_uno or not ANDROID: if is_uno or not ANDROID:
cloudlog.info("Setting up UNO fan handler") cloudlog.info("Setting up UNO fan handler")

2
tools/carcontrols/debug_controls.py
View File

@ -26,7 +26,7 @@ def steer_thread():
# wait for health and CAN packets # wait for health and CAN packets
hw_type = messaging.recv_one(health).health.hwType hw_type = messaging.recv_one(health).health.hwType
has_relay = hw_type in [HwType.blackPanda, HwType.uno] has_relay = hw_type in [HwType.blackPanda, HwType.uno, HwType.dos]
print("Waiting for CAN messages...") print("Waiting for CAN messages...")
messaging.get_one_can(logcan) messaging.get_one_can(logcan)