Skip to content

Commit

Permalink
Toyota: add misc adas/toggle signal definitions (commaai#1076)
Browse files Browse the repository at this point in the history 
* Toyota: add signals

* run generator

* better name

* engine running signal
  • Loading branch information
@cydia2020
cydia2020 authored Aug 27, 2024
1 parent 7009381 commit c9650ff
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 4 deletions.
20 changes: 19 additions & 1 deletion opendbc/dbc/generator/toyota/_toyota_2017.dbc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ BO_ 353 DSU_SPEED: 7 XXX

BO_ 452 ENGINE_RPM: 8 CGW
SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
SG_ ENGINE_RUNNING : 27|1@0+ (1,0) [0|1] "" XXX

BO_ 466 PCM_CRUISE: 8 XXX
SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
Expand Down Expand Up @@ -350,9 +351,11 @@ BO_ 1552 BODY_CONTROL_STATE_2: 8 XXX
BO_ 1553 UI_SETTING: 8 XXX
SG_ UNITS : 26|2@0+ (1,0) [0|3] "" XXX
SG_ ODOMETER : 39|32@0+ (1,0) [0|1048575] "" XXX

BO_ 1556 BLINKERS_STATE: 8 XXX
SG_ TURN_SIGNALS : 29|2@0+ (1,0) [0|3] "" XXX
SG_ BLINKER_BUTTON_PRESSED : 15|1@0+ (1,0) [0|1] "" XXX
SG_ HAZARD_LIGHT : 27|1@0+ (1,0) [0|1] "" XXX
SG_ TURN_SIGNALS : 29|2@0+ (1,0) [0|3] "" XXX

BO_ 1568 BODY_CONTROL_STATE: 8 XXX
SG_ METER_DIMMED : 38|1@0+ (1,0) [0|1] "" XXX
Expand Down Expand Up @@ -381,6 +384,20 @@ BO_ 1592 DOOR_LOCKS: 8 XXX
SG_ LOCK_STATUS : 20|1@0+ (1,0) [0|1] "" XXX
SG_ LOCKED_VIA_KEYFOB : 23|1@0+ (1,0) [0|1] "" XXX

BO_ 1779 ADAS_TOGGLE_STATE: 8 XXX
SG_ OK_BUTTON_PRESSED : 15|1@0+ (1,0) [0|1] "" BCM
SG_ SWS_TOGGLE_CMD : 24|1@0+ (1,0) [0|1] "" XXX
SG_ SWS_SENSITIVITY_CMD : 26|2@0+ (1,0) [0|3] "" XXX
SG_ LKAS_ON_CMD : 28|1@0+ (1,0) [0|1] "" XXX
SG_ LKAS_OFF_CMD : 29|1@0+ (1,0) [0|1] "" XXX
SG_ LDA_SENSITIVITY_HI_CMD : 30|1@0+ (1,0) [0|1] "" XXX
SG_ LDA_SENSITIVITY_STD_CMD : 31|1@0+ (1,0) [0|1] "" XXX
SG_ IPAS_TOGGLE : 34|1@0+ (1,0) [0|1] "" XXX
SG_ BSM_TOGGLE_CMD : 37|1@0+ (1,0) [0|1] "" XXX
SG_ IPAS_SONAR_TOGGLE : 38|1@0+ (1,0) [0|1] "" XXX
SG_ PCS_TOGGLE_CMD : 40|1@0+ (1,0) [0|1] "" XXX
SG_ PCS_SENSITIVITY_CMD : 41|1@0+ (1,0) [0|1] "" XXX

CM_ SG_ 36 YAW_RATE "verify";
CM_ SG_ 36 ACCEL_X "x-axis accel";
CM_ SG_ 37 STEER_FRACTION "1/15th of the signal STEER_ANGLE, which is 1.5 deg; note that 0x8 is never set";
Expand Down Expand Up @@ -512,4 +529,5 @@ VAL_ 1552 METER_SLIDER_DIMMED 1 "Dimmed" 0 "Not Dimmed";
VAL_ 1552 UNITS 1 "km (km/L)" 2 "km (L/100km)" 3 "miles (MPG US)" 4 "miles (MPG Imperial)";
VAL_ 1553 UNITS 1 "km" 2 "miles";
VAL_ 1556 TURN_SIGNALS 3 "none" 2 "right" 1 "left";
VAL_ 1556 BLINKER_BUTTON_PRESSED 1 "button pressed" 0 "not pressed";
VAL_ 1592 LOCK_STATUS 0 "locked" 1 "unlocked";
20 changes: 19 additions & 1 deletion opendbc/dbc/toyota_new_mc_pt_generated.dbc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ BO_ 353 DSU_SPEED: 7 XXX

BO_ 452 ENGINE_RPM: 8 CGW
SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
SG_ ENGINE_RUNNING : 27|1@0+ (1,0) [0|1] "" XXX

BO_ 466 PCM_CRUISE: 8 XXX
SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
Expand Down Expand Up @@ -354,9 +355,11 @@ BO_ 1552 BODY_CONTROL_STATE_2: 8 XXX
BO_ 1553 UI_SETTING: 8 XXX
SG_ UNITS : 26|2@0+ (1,0) [0|3] "" XXX
SG_ ODOMETER : 39|32@0+ (1,0) [0|1048575] "" XXX

BO_ 1556 BLINKERS_STATE: 8 XXX
SG_ TURN_SIGNALS : 29|2@0+ (1,0) [0|3] "" XXX
SG_ BLINKER_BUTTON_PRESSED : 15|1@0+ (1,0) [0|1] "" XXX
SG_ HAZARD_LIGHT : 27|1@0+ (1,0) [0|1] "" XXX
SG_ TURN_SIGNALS : 29|2@0+ (1,0) [0|3] "" XXX

BO_ 1568 BODY_CONTROL_STATE: 8 XXX
SG_ METER_DIMMED : 38|1@0+ (1,0) [0|1] "" XXX
Expand Down Expand Up @@ -385,6 +388,20 @@ BO_ 1592 DOOR_LOCKS: 8 XXX
SG_ LOCK_STATUS : 20|1@0+ (1,0) [0|1] "" XXX
SG_ LOCKED_VIA_KEYFOB : 23|1@0+ (1,0) [0|1] "" XXX

BO_ 1779 ADAS_TOGGLE_STATE: 8 XXX
SG_ OK_BUTTON_PRESSED : 15|1@0+ (1,0) [0|1] "" BCM
SG_ SWS_TOGGLE_CMD : 24|1@0+ (1,0) [0|1] "" XXX
SG_ SWS_SENSITIVITY_CMD : 26|2@0+ (1,0) [0|3] "" XXX
SG_ LKAS_ON_CMD : 28|1@0+ (1,0) [0|1] "" XXX
SG_ LKAS_OFF_CMD : 29|1@0+ (1,0) [0|1] "" XXX
SG_ LDA_SENSITIVITY_HI_CMD : 30|1@0+ (1,0) [0|1] "" XXX
SG_ LDA_SENSITIVITY_STD_CMD : 31|1@0+ (1,0) [0|1] "" XXX
SG_ IPAS_TOGGLE : 34|1@0+ (1,0) [0|1] "" XXX
SG_ BSM_TOGGLE_CMD : 37|1@0+ (1,0) [0|1] "" XXX
SG_ IPAS_SONAR_TOGGLE : 38|1@0+ (1,0) [0|1] "" XXX
SG_ PCS_TOGGLE_CMD : 40|1@0+ (1,0) [0|1] "" XXX
SG_ PCS_SENSITIVITY_CMD : 41|1@0+ (1,0) [0|1] "" XXX

CM_ SG_ 36 YAW_RATE "verify";
CM_ SG_ 36 ACCEL_X "x-axis accel";
CM_ SG_ 37 STEER_FRACTION "1/15th of the signal STEER_ANGLE, which is 1.5 deg; note that 0x8 is never set";
Expand Down Expand Up @@ -516,6 +533,7 @@ VAL_ 1552 METER_SLIDER_DIMMED 1 "Dimmed" 0 "Not Dimmed";
VAL_ 1552 UNITS 1 "km (km/L)" 2 "km (L/100km)" 3 "miles (MPG US)" 4 "miles (MPG Imperial)";
VAL_ 1553 UNITS 1 "km" 2 "miles";
VAL_ 1556 TURN_SIGNALS 3 "none" 2 "right" 1 "left";
VAL_ 1556 BLINKER_BUTTON_PRESSED 1 "button pressed" 0 "not pressed";
VAL_ 1592 LOCK_STATUS 0 "locked" 1 "unlocked";

CM_ "toyota_new_mc_pt.dbc starts here";
Expand Down
20 changes: 19 additions & 1 deletion opendbc/dbc/toyota_nodsu_pt_generated.dbc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ BO_ 353 DSU_SPEED: 7 XXX

BO_ 452 ENGINE_RPM: 8 CGW
SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
SG_ ENGINE_RUNNING : 27|1@0+ (1,0) [0|1] "" XXX

BO_ 466 PCM_CRUISE: 8 XXX
SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
Expand Down Expand Up @@ -354,9 +355,11 @@ BO_ 1552 BODY_CONTROL_STATE_2: 8 XXX
BO_ 1553 UI_SETTING: 8 XXX
SG_ UNITS : 26|2@0+ (1,0) [0|3] "" XXX
SG_ ODOMETER : 39|32@0+ (1,0) [0|1048575] "" XXX

BO_ 1556 BLINKERS_STATE: 8 XXX
SG_ TURN_SIGNALS : 29|2@0+ (1,0) [0|3] "" XXX
SG_ BLINKER_BUTTON_PRESSED : 15|1@0+ (1,0) [0|1] "" XXX
SG_ HAZARD_LIGHT : 27|1@0+ (1,0) [0|1] "" XXX
SG_ TURN_SIGNALS : 29|2@0+ (1,0) [0|3] "" XXX

BO_ 1568 BODY_CONTROL_STATE: 8 XXX
SG_ METER_DIMMED : 38|1@0+ (1,0) [0|1] "" XXX
Expand Down Expand Up @@ -385,6 +388,20 @@ BO_ 1592 DOOR_LOCKS: 8 XXX
SG_ LOCK_STATUS : 20|1@0+ (1,0) [0|1] "" XXX
SG_ LOCKED_VIA_KEYFOB : 23|1@0+ (1,0) [0|1] "" XXX

BO_ 1779 ADAS_TOGGLE_STATE: 8 XXX
SG_ OK_BUTTON_PRESSED : 15|1@0+ (1,0) [0|1] "" BCM
SG_ SWS_TOGGLE_CMD : 24|1@0+ (1,0) [0|1] "" XXX
SG_ SWS_SENSITIVITY_CMD : 26|2@0+ (1,0) [0|3] "" XXX
SG_ LKAS_ON_CMD : 28|1@0+ (1,0) [0|1] "" XXX
SG_ LKAS_OFF_CMD : 29|1@0+ (1,0) [0|1] "" XXX
SG_ LDA_SENSITIVITY_HI_CMD : 30|1@0+ (1,0) [0|1] "" XXX
SG_ LDA_SENSITIVITY_STD_CMD : 31|1@0+ (1,0) [0|1] "" XXX
SG_ IPAS_TOGGLE : 34|1@0+ (1,0) [0|1] "" XXX
SG_ BSM_TOGGLE_CMD : 37|1@0+ (1,0) [0|1] "" XXX
SG_ IPAS_SONAR_TOGGLE : 38|1@0+ (1,0) [0|1] "" XXX
SG_ PCS_TOGGLE_CMD : 40|1@0+ (1,0) [0|1] "" XXX
SG_ PCS_SENSITIVITY_CMD : 41|1@0+ (1,0) [0|1] "" XXX

CM_ SG_ 36 YAW_RATE "verify";
CM_ SG_ 36 ACCEL_X "x-axis accel";
CM_ SG_ 37 STEER_FRACTION "1/15th of the signal STEER_ANGLE, which is 1.5 deg; note that 0x8 is never set";
Expand Down Expand Up @@ -516,6 +533,7 @@ VAL_ 1552 METER_SLIDER_DIMMED 1 "Dimmed" 0 "Not Dimmed";
VAL_ 1552 UNITS 1 "km (km/L)" 2 "km (L/100km)" 3 "miles (MPG US)" 4 "miles (MPG Imperial)";
VAL_ 1553 UNITS 1 "km" 2 "miles";
VAL_ 1556 TURN_SIGNALS 3 "none" 2 "right" 1 "left";
VAL_ 1556 BLINKER_BUTTON_PRESSED 1 "button pressed" 0 "not pressed";
VAL_ 1592 LOCK_STATUS 0 "locked" 1 "unlocked";

CM_ "toyota_nodsu_pt.dbc starts here";
Expand Down
20 changes: 19 additions & 1 deletion opendbc/dbc/toyota_tnga_k_pt_generated.dbc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ BO_ 353 DSU_SPEED: 7 XXX

BO_ 452 ENGINE_RPM: 8 CGW
SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
SG_ ENGINE_RUNNING : 27|1@0+ (1,0) [0|1] "" XXX

BO_ 466 PCM_CRUISE: 8 XXX
SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
Expand Down Expand Up @@ -354,9 +355,11 @@ BO_ 1552 BODY_CONTROL_STATE_2: 8 XXX
BO_ 1553 UI_SETTING: 8 XXX
SG_ UNITS : 26|2@0+ (1,0) [0|3] "" XXX
SG_ ODOMETER : 39|32@0+ (1,0) [0|1048575] "" XXX

BO_ 1556 BLINKERS_STATE: 8 XXX
SG_ TURN_SIGNALS : 29|2@0+ (1,0) [0|3] "" XXX
SG_ BLINKER_BUTTON_PRESSED : 15|1@0+ (1,0) [0|1] "" XXX
SG_ HAZARD_LIGHT : 27|1@0+ (1,0) [0|1] "" XXX
SG_ TURN_SIGNALS : 29|2@0+ (1,0) [0|3] "" XXX

BO_ 1568 BODY_CONTROL_STATE: 8 XXX
SG_ METER_DIMMED : 38|1@0+ (1,0) [0|1] "" XXX
Expand Down Expand Up @@ -385,6 +388,20 @@ BO_ 1592 DOOR_LOCKS: 8 XXX
SG_ LOCK_STATUS : 20|1@0+ (1,0) [0|1] "" XXX
SG_ LOCKED_VIA_KEYFOB : 23|1@0+ (1,0) [0|1] "" XXX

BO_ 1779 ADAS_TOGGLE_STATE: 8 XXX
SG_ OK_BUTTON_PRESSED : 15|1@0+ (1,0) [0|1] "" BCM
SG_ SWS_TOGGLE_CMD : 24|1@0+ (1,0) [0|1] "" XXX
SG_ SWS_SENSITIVITY_CMD : 26|2@0+ (1,0) [0|3] "" XXX
SG_ LKAS_ON_CMD : 28|1@0+ (1,0) [0|1] "" XXX
SG_ LKAS_OFF_CMD : 29|1@0+ (1,0) [0|1] "" XXX
SG_ LDA_SENSITIVITY_HI_CMD : 30|1@0+ (1,0) [0|1] "" XXX
SG_ LDA_SENSITIVITY_STD_CMD : 31|1@0+ (1,0) [0|1] "" XXX
SG_ IPAS_TOGGLE : 34|1@0+ (1,0) [0|1] "" XXX
SG_ BSM_TOGGLE_CMD : 37|1@0+ (1,0) [0|1] "" XXX
SG_ IPAS_SONAR_TOGGLE : 38|1@0+ (1,0) [0|1] "" XXX
SG_ PCS_TOGGLE_CMD : 40|1@0+ (1,0) [0|1] "" XXX
SG_ PCS_SENSITIVITY_CMD : 41|1@0+ (1,0) [0|1] "" XXX

CM_ SG_ 36 YAW_RATE "verify";
CM_ SG_ 36 ACCEL_X "x-axis accel";
CM_ SG_ 37 STEER_FRACTION "1/15th of the signal STEER_ANGLE, which is 1.5 deg; note that 0x8 is never set";
Expand Down Expand Up @@ -516,6 +533,7 @@ VAL_ 1552 METER_SLIDER_DIMMED 1 "Dimmed" 0 "Not Dimmed";
VAL_ 1552 UNITS 1 "km (km/L)" 2 "km (L/100km)" 3 "miles (MPG US)" 4 "miles (MPG Imperial)";
VAL_ 1553 UNITS 1 "km" 2 "miles";
VAL_ 1556 TURN_SIGNALS 3 "none" 2 "right" 1 "left";
VAL_ 1556 BLINKER_BUTTON_PRESSED 1 "button pressed" 0 "not pressed";
VAL_ 1592 LOCK_STATUS 0 "locked" 1 "unlocked";

CM_ "toyota_tnga_k_pt.dbc starts here";
Expand Down

0 comments on commit c9650ff

Please sign in to comment.