Skip to content

Commit

Permalink
Squashed 'opendbc/' changes from 2ae0327ea..ce723756f
Browse files Browse the repository at this point in the history
ce723756f Fixed up sign on Driver Torque, added unit (commaai#233)
bd72c72be Added ProPilot HUD messages (commaai#231)
f308ca62e Subaru: added counter and checksum to brake msg
d1f76d609 Add Motor_20 CRC support (commaai#229)
6252718a9 Add STEER_ANGLE to all STEER_TORUQE_SENSOR messages (commaai#228)
c0b426126 Revert "add angle field in torque sensor message to all cars (commaai#227)"
bd82848c7 add angle field in torque sensor message to all cars (commaai#227)
56f0259df Lexus CTH fix: brake pressed is on bit 5 like corolla and rav4
9b6ca31b2 fix: Replicate changes done on _honda_2017.dbc (commaai#225)
1bd26d0a6 Added messages. Cleaned up endianness (commaai#226)
44b9e74fa Revert "Toyota: add checksum to BRAKE_MODULE (commaai#224)"
8b18c92e2 Toyota: add checksum to BRAKE_MODULE (commaai#224)
2bab4d6d7 Add Honda-Bosch lane line detection signals. (commaai#223)
a1aa3b78f Cleanup of Nissan DBC (commaai#218)
c1f764828 reverting changes to Chrysler: speed message seems different from car to car
2de8e9e82 Chrysler: Speed msg is 5 bytes
f4ac315ed Chrysler: add counter to 514
0fb62cf86 Toyota Blind Spot Monitor (TSS2-only?) (commaai#219)

git-subtree-dir: opendbc
git-subtree-split: ce723756f75d7efb74a9664a1761079641923683
  • Loading branch information
Vehicle Researcher authored and jyoung8607 committed Apr 18, 2020
1 parent 1eae471 commit fe875e9
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
14 changes: 14 additions & 0 deletions generator/toyota/_toyota_nodsu_bsm.dbc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
BO_ 1014 BSM: 8 XXX
SG_ L_ADJACENT : 0|1@0+ (1,0) [0|1] "" XXX
SG_ L_APPROACHING : 8|1@0+ (1,0) [0|1] "" XXX
SG_ R_ADJACENT : 1|1@0+ (1,0) [0|1] "" XXX
SG_ R_APPROACHING : 10|1@0+ (1,0) [0|1] "" XXX
SG_ ADJACENT_ENABLED : 7|1@0+ (1,0) [0|1] "" XXX
SG_ APPROACHING_ENABLED : 15|1@0+ (1,0) [0|1] "" XXX

CM_ SG_ 1014 L_ADJACENT "vehicle adjacent left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
CM_ SG_ 1014 L_APPROACHING "vehicle approaching from left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
CM_ SG_ 1014 R_ADJACENT "vehicle adjacent right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
CM_ SG_ 1014 R_APPROACHING "vehicle approaching from right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
CM_ SG_ 1014 ADJACENT_ENABLED "when BSM is enabled in settings, this is on along with APPROACHING_ENABLED. this controls bsm alert visibility";
CM_ SG_ 1014 APPROACHING_ENABLED "when BSM is enabled in settings, this is on along with ADJACENT_ENABLED. this controls bsm alert visibility";
18 changes: 18 additions & 0 deletions opendbc/toyota_camry_hybrid_2018_pt_generated.dbc
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
CM_ "AUTOGENERATED FILE, DO NOT EDIT"


CM_ "Imported file _toyota_nodsu_bsm.dbc starts here"
BO_ 1014 BSM: 8 XXX
SG_ L_ADJACENT : 0|1@0+ (1,0) [0|1] "" XXX
SG_ L_APPROACHING : 8|1@0+ (1,0) [0|1] "" XXX
SG_ R_ADJACENT : 1|1@0+ (1,0) [0|1] "" XXX
SG_ R_APPROACHING : 10|1@0+ (1,0) [0|1] "" XXX
SG_ ADJACENT_ENABLED : 7|1@0+ (1,0) [0|1] "" XXX
SG_ APPROACHING_ENABLED : 15|1@0+ (1,0) [0|1] "" XXX

CM_ SG_ 1014 L_ADJACENT "vehicle adjacent left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
CM_ SG_ 1014 L_APPROACHING "vehicle approaching from left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
CM_ SG_ 1014 R_ADJACENT "vehicle adjacent right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
CM_ SG_ 1014 R_APPROACHING "vehicle approaching from right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
CM_ SG_ 1014 ADJACENT_ENABLED "when BSM is enabled in settings, this is on along with APPROACHING_ENABLED. this controls bsm alert visibility";
CM_ SG_ 1014 APPROACHING_ENABLED "when BSM is enabled in settings, this is on along with ADJACENT_ENABLED. this controls bsm alert visibility";


CM_ "Imported file _comma.dbc starts here"
BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
Expand Down Expand Up @@ -363,6 +380,7 @@ CM_ "toyota_camry_hybrid_2018_pt.dbc starts here"




BO_ 295 GEAR_PACKET: 8 XXX
SG_ CAR_MOVEMENT : 39|8@0- (1,0) [0|255] "" XXX
SG_ COUNTER : 55|8@0+ (1,0) [0|255] "" XXX
Expand Down

0 comments on commit fe875e9

Please sign in to comment.