Add chffr metrics for cars

master
Andy Haden 2017-09-08 18:44:47 -07:00 committed by George Hotz
parent e2dd3732ca
commit 135baae2c1
8 changed files with 30 additions and 10 deletions

View File

@ -304,7 +304,6 @@ BO_TX_BU_ 506 : NEO,ADAS;
BO_TX_BU_ 780 : NEO,ADAS;
BO_TX_BU_ 829 : NEO,ADAS;
CM_ SG_ 419 GEAR "10 = reverse, 11 = transition";
CM_ SG_ 490 LONG_ACCEL "wheel speed derivative, noisy and zero snapping";
CM_ SG_ 780 CRUISE_SPEED "255 = no speed";
@ -319,3 +318,7 @@ VAL_ 506 CHIME 4 "double_chime" 3 "single_chime" 2 "continuous_chime" 1 "repeati
VAL_ 506 FCW 3 "fcw" 2 "fcw" 1 "fcw" 0 "no_fcw" ;
VAL_ 780 HUD_LEAD 3 "no_car" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
CM_ "CHFFR_METRIC 342 STEER_ANGLE STEER_ANGLE 0.36 180
CHFFR_METRIC 380 ENGINE_RPM ENGINE_RPM 1 0
CHFFR_METRIC 804 ENGINE_TEMPERATURE ENGINE_TEMPERATURE 1 0";

View File

@ -1,7 +1,7 @@
VERSION ""
NS_ :
NS_ :
NS_DESC_
CM_
BA_DEF_
@ -302,3 +302,6 @@ BO_TX_BU_ 829 : NEO,ADAS;
BO_TX_BU_ 862 : NEO,ADAS;
BO_TX_BU_ 927 : NEO,ADAS;
CM_ "CHFFR_METRIC 342 STEER_ANGLE STEER_ANGLE 0.36 180
CHFFR_METRIC 380 ENGINE_RPM ENGINE_RPM 1 0
CHFFR_METRIC 804 ENGINE_TEMPERATURE ENGINE_TEMPERATURE 1 0";

View File

@ -1,7 +1,7 @@
VERSION ""
NS_ :
NS_ :
NS_DESC_
CM_
BA_DEF_
@ -324,6 +324,10 @@ BO_TX_BU_ 862 : NEO,ADAS;
BO_TX_BU_ 927 : NEO,ADAS;
CM_ "CHFFR_METRIC 330 STEER_ANGLE STEER_ANGLE 0.36 180
CHFFR_METRIC 380 ENGINE_RPM ENGINE_RPM 1 0
CHFFR_METRIC 804 ENGINE_TEMPERATURE ENGINE_TEMPERATURE 1 0";
CM_ SG_ 401 GEAR "10 = reverse, 11 = transition";
CM_ SG_ 490 LONG_ACCEL "wheel speed derivative, noisy and zero snapping";
CM_ SG_ 780 CRUISE_SPEED "255 = no speed";

View File

@ -347,6 +347,8 @@ BO_ 1670 XXX_39: 8 XXX
CM_ "CHFFR_METRIC 330 STEER_ANGLE STEER_ANGLE 0.36 180
CHFFR_METRIC 380 ENGINE_RPM ENGINE_RPM 1 0";
CM_ SG_ 450 EPB_STATE "3: On, 2: Disengaging, 1: Engaging, 0: Off";
CM_ SG_ 780 HUD_LEAD "0: blank, 1: no car, 2: car, 3: ACC Off";

View File

@ -310,3 +310,7 @@ BO_TX_BU_ 399 : NEO,CAM;
BO_TX_BU_ 506 : NEO,CAM;
BO_TX_BU_ 780 : NEO,CAM;
BO_TX_BU_ 829 : NEO,CAM;
CM_ "CHFFR_METRIC 342 STEER_ANGLE STEER_ANGLE 0.36 180
CHFFR_METRIC 380 ENGINE_RPM ENGINE_RPM 1 0
CHFFR_METRIC 804 ENGINE_TEMPERATURE ENGINE_TEMPERATURE 1 0";

View File

@ -63,7 +63,7 @@ BO_ 642 NEW_MSG_2: 8 XXX
CM_ "CHFFR_METRIC 2 STEER_ANGLE STEER_ANGLE 0.36 180";
VAL_ 324 BrakeApplied 1 "On" 0 "Off" ;
VAL_ 324 CruiseEnabled 1 "On" 0 "Off" ;

View File

@ -1,7 +1,7 @@
VERSION ""
NS_ :
NS_ :
NS_DESC_
CM_
BA_DEF_
@ -67,7 +67,7 @@ BO_ 1160 DAS_steeringControl: 4 NEO
SG_ DAS_steeringControlCounter : 19|4@0+ (1,0) [0|0] "" EPAS
SG_ DAS_steeringAngleRequest : 6|15@0+ (0.1,-1638.35) [-1638.35|1638.35] "deg" EPAS
SG_ DAS_steeringHapticRequest : 7|1@0+ (1,0) [0|0] "" EPAS
BO_ 257 GTW_epasControl: 3 NEO
SG_ GTW_epasControlChecksum : 16|8@1+ (1,0) [0|255] "" NEO
SG_ GTW_epasControlCounter : 12|4@1+ (1,0) [0|15] "" NEO
@ -127,7 +127,7 @@ BO_ 280 DI_torque2: 6 DI
SG_ DI_epbParkRequest : 38|1@1+ (1,0) [0|0] "" NEO
SG_ DI_epbInterfaceReady : 39|1@1+ (1,0) [0|0] "" NEO
SG_ DI_torque2Checksum : 40|8@1+ (1,0) [0|0] "" NEO
BO_ 309 ESP_135h: 5 ESP
SG_ ESP_135hChecksum : 16|8@1+ (1,0) [0|255] "" NEO
SG_ ESP_135hCounter : 12|4@1+ (1,0) [0|15] "" NEO
@ -166,7 +166,7 @@ BO_ 792 GTW_carState: 8 GTW
SG_ MONTH : 12|4@1+ (1,0) [0|14] "Month" NEO
SG_ SECOND : 18|6@1+ (1,0) [0|61] "s" NEO
SG_ YEAR : 1|7@1+ (1,2000) [2000|2125] "Year" NEO
BO_ 872 DI_state: 8 DI
SG_ DI_aebState : 44|3@1+ (1,0) [5|6] "" NEO
SG_ DI_analogSpeed : 20|12@1+ (0.10,0) [0|409.40] "speed" NEO
@ -224,7 +224,7 @@ BO_ 69 STW_ACTN_RQ: 8 STW
SG_ WprSw6Posn : 48|3@1+ (1,0) [0|0] "" NEO
SG_ MC_STW_ACTN_RQ : 52|4@1+ (1,0) [0|15] "" NEO
SG_ CRC_STW_ACTN_RQ : 56|8@1+ (1,0) [0|0] "" NEO
BO_ 643 BODY_R1: 8 GTW
SG_ AirTemp_Insd : 40|8@1+ (0.25,0) [0|63.5] "C" NEO
SG_ AirTemp_Outsd : 56|8@1+ (0.5,-40) [-40|86.5] "C" NEO
@ -403,3 +403,6 @@ VAL_ 904 MCU_clusterReadyForDrive 0 "NO_SNA" 1 "YES" ;
VAL_ 1160 DAS_steeringAngleRequest 16384 "ZERO_ANGLE" ;
VAL_ 1160 DAS_steeringControlType 1 "ANGLE_CONTROL" 3 "DISABLED" 0 "NONE" 2 "RESERVED" ;
VAL_ 1160 DAS_steeringHapticRequest 1 "ACTIVE" 0 "IDLE" ;
CM_ "CHFFR_METRIC 1160 DAS_steeringAngleRequest STEER_ANGLE 0.1098666 180
CHFFR_METRIC 264 DI_motorRPM ENGINE_RPM 1 0";

View File

@ -125,7 +125,7 @@ BO_ 1042 LKAS_HUD: 8 XXX
SG_ TWO_BEEPS : 12|1@0+ (1,0) [0|1] "" XXX
SG_ ADJUSTING_CAMERA : 13|1@0+ (1,0) [0|1] "" XXX
SG_ LDA_MALFUNCTION : 15|1@0+ (1,0) [0|1] "" XXX
CM_ SG_ 36 ACCEL_Y "unit is tbd";
CM_ SG_ 36 YAW_RATE "verify";
@ -148,3 +148,4 @@ VAL_ 1042 BARRIERS 3 "both" 2 "right" 1 "left" 0 "none";
VAL_ 1042 RIGHT_LINE 3 "orange" 2 "double" 1 "solid" 0 "none";
VAL_ 1042 LEFT_LINE 3 "orange" 2 "double" 1 "solid" 0 "none";
CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";