Merge opendbc subtree

SippieCup · Mar 17, 2018 · 19010d3 · 19010d3
2 parents 02968cd + 4188b54
commit 19010d3
Show file tree

Hide file tree

Showing 35 changed files with 2,774 additions and 1,687 deletions.
diff --git a/opendbc/acura_ilx_2016_can_generated.dbc b/opendbc/acura_ilx_2016_can_generated.dbc
@@ -1,4 +1,24 @@
 CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+
+
+CM_ "Imported file _comma.dbc starts here"
+BO_ 512 GAS_COMMAND: 6 EON
+ SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR
+ SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR
+ SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR
+ SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" INTERCEPTOR
+ SG_ CHECKSUM : 43|4@0+ (1,0) [0|3] "" INTERCEPTOR
+
+BO_ 513 GAS_SENSOR: 6 INTERCEPTOR
+ SG_ INTERCEPTOR_GAS : 7|16@0+ (0.253984064,-83.3) [0|1] "" EON
+ SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" EON
+ SG_ STATE : 39|8@0+ (1,0) [0|255] "" EON
+ SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" EON
+ SG_ CHECKSUM : 43|4@0+ (1,0) [0|3] "" EON
+
+VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ;
+
+
 CM_ "Imported file _honda_2017.dbc starts here"
 VERSION ""
 
@@ -36,9 +56,9 @@ NS_ :
 BU_: EBCM ADAS PCM EPS VSA SCM BDY XXX EPB EON
 
 BO_ 344 ENGINE_DATA: 8 PCM
- SG_ XMISSION_SPEED : 7|16@0+ (0.002759506,0) [0|70] "m/s" EON
+ SG_ XMISSION_SPEED : 7|16@0+ (0.01,0) [0|250] "kph" EON
  SG_ ENGINE_RPM : 23|16@0+ (1,0) [0|15000] "rpm" EON
- SG_ XMISSION_SPEED2 : 39|16@0+ (0.002759506,0) [0|70] "m/s" EON
+ SG_ XMISSION_SPEED2 : 39|16@0+ (0.01,0) [0|250] "kph" EON
  SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
  SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON
  SG_ ODOMETER : 55|8@0+ (0.010588,0) [0|255] "km" XXX
@@ -77,7 +97,7 @@ BO_ 490 VEHICLE_DYNAMICS: 8 VSA
  SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
 
 BO_ 506 BRAKE_COMMAND: 8 ADAS
- SG_ COMPUTER_BRAKE : 7|10@0+ (0.003906248,0) [0|1] "" EBCM
+ SG_ COMPUTER_BRAKE : 7|10@0+ (1,0) [0|1] "" EBCM
  SG_ ZEROS_BOH : 13|5@0+ (1,0) [0|1] "" EBCM
  SG_ COMPUTER_BRAKE_REQUEST : 8|1@0+ (1,0) [0|1] "" EBCM
  SG_ CRUISE_BOH2 : 23|3@0+ (1,0) [0|1] "" EBCM
@@ -96,17 +116,6 @@ BO_ 506 BRAKE_COMMAND: 8 ADAS
  SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EBCM
  SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EBCM
 
-BO_ 512 GAS_COMMAND: 3 EON
- SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR
- SG_ COUNTER : 21|2@0+ (1,0) [0|3] "" INTERCEPTOR
- SG_ CHECKSUM : 19|4@0+ (1,0) [0|3] "" INTERCEPTOR
-
-BO_ 513 GAS_SENSOR: 5 INTERCEPTOR
- SG_ INTERCEPTOR_GAS : 7|16@0+ (0.253984064,-83.3) [0|1] "" EON
- SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" EON
- SG_ COUNTER : 37|2@0+ (1,0) [0|3] "" EON
- SG_ CHECKSUM : 35|4@0+ (1,0) [0|3] "" EON
-
 BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA
  SG_ WHEEL_SPEED_FL : 7|8@0+ (1,0) [0|255] "mph" EON
  SG_ WHEEL_SPEED_FR : 15|8@0+ (1,0) [0|255] "mph" EON
@@ -135,9 +144,8 @@ BO_ 777 LOCK_STATUS: 8 XXX
  SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
 
 BO_ 780 ACC_HUD: 8 ADAS
- SG_ PCM_SPEED : 7|16@0+ (0.002759506,0) [0|100] "m/s" BDY
- SG_ PCM_GAS : 23|7@0+ (1,0) [0|127] "" BDY
- SG_ ZEROS_BOH : 16|1@0+ (1,0) [0|255] "" BDY
+ SG_ PCM_SPEED : 7|16@0+ (0.01,0) [0|250] "kph" BDY
+ SG_ PCM_GAS : 23|8@0+ (1,0) [0|127] "" BDY
  SG_ CRUISE_SPEED : 31|8@0+ (1,0) [0|255] "" BDY
  SG_ DTC_MODE : 39|1@0+ (1,0) [0|1] "" BDY
  SG_ BOH : 38|1@0+ (1,0) [0|1] "" BDY
@@ -154,6 +162,8 @@ BO_ 780 ACC_HUD: 8 ADAS
  SG_ BOH_5 : 41|1@0+ (1,0) [0|3] "" BDY
  SG_ CRUISE_CONTROL_LABEL : 40|1@0+ (1,0) [0|3] "" BDY
  SG_ HUD_DISTANCE_3 : 52|1@0+ (1,0) [0|1] "" BDY
+ SG_ SET_ME_X03_2 : 55|2@0+ (1,0) [0|3] "" BDY
+ SG_ SET_ME_X01 : 48|1@0+ (1,0) [0|1] "" BDY
  SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" BDY
  SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" BDY
 
@@ -169,6 +179,7 @@ BO_ 804 CRUISE: 8 PCM
 
 BO_ 829 LKAS_HUD: 5 ADAS
  SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY
+ SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY
  SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY
  SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY
  SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY
@@ -217,6 +228,8 @@ VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
 
 CM_ "acura_ilx_2016_can.dbc starts here"
 
+
+
 BO_ 145 KINEMATICS: 8 XXX
  SG_ LAT_ACCEL : 7|10@0+ (0.02,-512) [-20|20] "m/s2" EON