mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-06-21 14:02:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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 68d98307703a24296ff7aafd99503ea6af4b231b.
This commit is contained in:
Shane Smiskol
2023-05-30 15:33:02 -07:00
committed by GitHub
parent 4b4b31450c
commit 439a30aae4
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/car/hyundai/carstate.py
+3
View File
@@ -486,6 +486,8 @@ class CarState(CarStateBase):
if not (CP.flags & HyundaiFlags.CANFD_CAMERA_SCC.value) and not CP.openpilotLongitudinalControl:
signals += [
("COUNTER", "SCC_CONTROL"),
("CHECKSUM", "SCC_CONTROL"),
("ACCMode", "SCC_CONTROL"),
("VSetDis", "SCC_CONTROL"),
("CRUISE_STANDSTILL", "SCC_CONTROL"),
@@ -528,6 +530,7 @@ class CarState(CarStateBase):
elif CP.flags & HyundaiFlags.CANFD_CAMERA_SCC:
signals += [
("COUNTER", "SCC_CONTROL"),
("CHECKSUM", "SCC_CONTROL"),
("NEW_SIGNAL_1", "SCC_CONTROL"),
("MainMode_ACC", "SCC_CONTROL"),
("ACCMode", "SCC_CONTROL"),
selfdrive/car/subaru/carstate.py
+5
View File
@@ -110,6 +110,7 @@ class CarState(CarStateBase):
def get_global_es_distance_signals():
signals = [
("COUNTER", "ES_Distance"),
("CHECKSUM", "ES_Distance"),
("Signal1", "ES_Distance"),
("Cruise_Fault", "ES_Distance"),
("Cruise_Throttle", "ES_Distance"),
@@ -251,6 +252,7 @@ class CarState(CarStateBase):
else:
signals = [
("COUNTER", "ES_DashStatus"),
("CHECKSUM", "ES_DashStatus"),
("PCB_Off", "ES_DashStatus"),
("LDW_Off", "ES_DashStatus"),
("Signal1", "ES_DashStatus"),
@@ -278,6 +280,7 @@ class CarState(CarStateBase):
("Cruise_State", "ES_DashStatus"),
("COUNTER", "ES_LKAS_State"),
("CHECKSUM", "ES_LKAS_State"),
("LKAS_Alert_Msg", "ES_LKAS_State"),
("Signal1", "ES_LKAS_State"),
("LKAS_ACTIVE", "ES_LKAS_State"),
@@ -305,6 +308,8 @@ class CarState(CarStateBase):
if CP.flags & SubaruFlags.SEND_INFOTAINMENT:
signals += [
("COUNTER", "INFOTAINMENT_STATUS"),
("CHECKSUM", "INFOTAINMENT_STATUS"),
("LKAS_State_Infotainment", "INFOTAINMENT_STATUS"),
("LKAS_Blue_Lines", "INFOTAINMENT_STATUS"),
("Signal1", "INFOTAINMENT_STATUS"),