cars: explicitly add counter/checksum messages (#28341)

* hkg canfd: add counter/checksum

* add explicitly to subaru

* same for ES_LKAS_State

* and ES_DashStatus

* aaand INFOTAINMENT_STATUS

* and preglobal ES_Distance

* Revert "and preglobal ES_Distance"

This reverts commit 68d9830770.
old-commit-hash: 439a30aae4
beeps
Shane Smiskol 2 years ago committed by GitHub
parent 8de2d08c0b
commit a072c467b5
  1. 3
      selfdrive/car/hyundai/carstate.py
  2. 5
      selfdrive/car/subaru/carstate.py

@ -486,6 +486,8 @@ class CarState(CarStateBase):
if not (CP.flags & HyundaiFlags.CANFD_CAMERA_SCC.value) and not CP.openpilotLongitudinalControl: if not (CP.flags & HyundaiFlags.CANFD_CAMERA_SCC.value) and not CP.openpilotLongitudinalControl:
signals += [ signals += [
("COUNTER", "SCC_CONTROL"),
("CHECKSUM", "SCC_CONTROL"),
("ACCMode", "SCC_CONTROL"), ("ACCMode", "SCC_CONTROL"),
("VSetDis", "SCC_CONTROL"), ("VSetDis", "SCC_CONTROL"),
("CRUISE_STANDSTILL", "SCC_CONTROL"), ("CRUISE_STANDSTILL", "SCC_CONTROL"),
@ -528,6 +530,7 @@ class CarState(CarStateBase):
elif CP.flags & HyundaiFlags.CANFD_CAMERA_SCC: elif CP.flags & HyundaiFlags.CANFD_CAMERA_SCC:
signals += [ signals += [
("COUNTER", "SCC_CONTROL"), ("COUNTER", "SCC_CONTROL"),
("CHECKSUM", "SCC_CONTROL"),
("NEW_SIGNAL_1", "SCC_CONTROL"), ("NEW_SIGNAL_1", "SCC_CONTROL"),
("MainMode_ACC", "SCC_CONTROL"), ("MainMode_ACC", "SCC_CONTROL"),
("ACCMode", "SCC_CONTROL"), ("ACCMode", "SCC_CONTROL"),

@ -110,6 +110,7 @@ class CarState(CarStateBase):
def get_global_es_distance_signals(): def get_global_es_distance_signals():
signals = [ signals = [
("COUNTER", "ES_Distance"), ("COUNTER", "ES_Distance"),
("CHECKSUM", "ES_Distance"),
("Signal1", "ES_Distance"), ("Signal1", "ES_Distance"),
("Cruise_Fault", "ES_Distance"), ("Cruise_Fault", "ES_Distance"),
("Cruise_Throttle", "ES_Distance"), ("Cruise_Throttle", "ES_Distance"),
@ -251,6 +252,7 @@ class CarState(CarStateBase):
else: else:
signals = [ signals = [
("COUNTER", "ES_DashStatus"), ("COUNTER", "ES_DashStatus"),
("CHECKSUM", "ES_DashStatus"),
("PCB_Off", "ES_DashStatus"), ("PCB_Off", "ES_DashStatus"),
("LDW_Off", "ES_DashStatus"), ("LDW_Off", "ES_DashStatus"),
("Signal1", "ES_DashStatus"), ("Signal1", "ES_DashStatus"),
@ -278,6 +280,7 @@ class CarState(CarStateBase):
("Cruise_State", "ES_DashStatus"), ("Cruise_State", "ES_DashStatus"),
("COUNTER", "ES_LKAS_State"), ("COUNTER", "ES_LKAS_State"),
("CHECKSUM", "ES_LKAS_State"),
("LKAS_Alert_Msg", "ES_LKAS_State"), ("LKAS_Alert_Msg", "ES_LKAS_State"),
("Signal1", "ES_LKAS_State"), ("Signal1", "ES_LKAS_State"),
("LKAS_ACTIVE", "ES_LKAS_State"), ("LKAS_ACTIVE", "ES_LKAS_State"),
@ -305,6 +308,8 @@ class CarState(CarStateBase):
if CP.flags & SubaruFlags.SEND_INFOTAINMENT: if CP.flags & SubaruFlags.SEND_INFOTAINMENT:
signals += [ signals += [
("COUNTER", "INFOTAINMENT_STATUS"),
("CHECKSUM", "INFOTAINMENT_STATUS"),
("LKAS_State_Infotainment", "INFOTAINMENT_STATUS"), ("LKAS_State_Infotainment", "INFOTAINMENT_STATUS"),
("LKAS_Blue_Lines", "INFOTAINMENT_STATUS"), ("LKAS_Blue_Lines", "INFOTAINMENT_STATUS"),
("Signal1", "INFOTAINMENT_STATUS"), ("Signal1", "INFOTAINMENT_STATUS"),

Loading…
Cancel
Save