Skip to content

Commit

Permalink
Subaru signals update (#474)
Browse files Browse the repository at this point in the history 
* Add global Stop-Start, rename preglobal ES_Distance, update preglobal Forester ES_DashStatus

* run generator
  • Loading branch information
@martinl
martinl authored Dec 15, 2021
1 parent ac1f0e8 commit 2bab99f
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 14 deletions.
6 changes: 6 additions & 0 deletions generator/subaru/_subaru_global.dbc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ BO_ 313 Brake_Pedal: 8 XXX
SG_ Brake_Pedal : 36|12@1+ (1,0) [0|4095] "" XXX
SG_ Signal4 : 48|16@1+ (1,0) [0|65535] "" XXX

BO_ 372 Engine_Stop_Start: 8 XXX
SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
SG_ STOP_START_STATE : 39|2@0+ (1,0) [0|3] "" XXX

BO_ 290 ES_LKAS: 8 XXX
SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
Expand Down Expand Up @@ -157,6 +162,7 @@ BO_ 912 Dashlights: 8 XXX
SG_ SEATBELT_FL : 48|1@1+ (1,0) [0|1] "" XXX
SG_ LEFT_BLINKER : 50|1@1+ (1,0) [0|1] "" XXX
SG_ RIGHT_BLINKER : 51|1@1+ (1,0) [0|1] "" XXX
SG_ STOP_START : 54|1@0+ (1,0) [0|1] "" XXX

BO_ 940 BodyInfo: 8 XXX
SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
Expand Down
6 changes: 3 additions & 3 deletions generator/subaru/_subaru_preglobal_2015.dbc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ BO_ 352 ES_Brake: 8 XXX
SG_ Counter : 48|3@1+ (1,0) [0|7] "" XXX
SG_ Checksum : 56|8@1+ (1,0) [0|255] "" XXX

BO_ 353 ES_CruiseThrottle: 8 XXX
SG_ Throttle_Cruise : 0|12@1+ (1,0) [0|4095] "" XXX
BO_ 353 ES_Distance: 8 XXX
SG_ Cruise_Throttle : 0|12@1+ (1,0) [0|4095] "" XXX
SG_ Signal1 : 12|4@1+ (1,0) [0|15] "" XXX
SG_ Cruise_Activated : 16|1@1+ (1,0) [0|1] "" XXX
SG_ Car_Follow : 16|1@1+ (1,0) [0|1] "" XXX
SG_ Signal2 : 17|3@1+ (1,0) [0|7] "" XXX
SG_ Brake_On : 20|1@1+ (1,0) [0|1] "" XXX
SG_ Distance_Swap : 21|1@1+ (1,0) [0|1] "" XXX
Expand Down
5 changes: 4 additions & 1 deletion generator/subaru/subaru_forester_2017.dbc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ CM_ "IMPORT _subaru_preglobal_2015.dbc";
BO_ 355 ES_DashStatus: 8 XXX
SG_ Not_Ready_Startup : 4|2@1+ (1,0) [0|3] "" XXX
SG_ Cruise_On : 16|1@1+ (1,0) [0|1] "" XXX
SG_ Cruise_Activated : 17|1@0+ (1,0) [0|1] "" XXX
SG_ Cruise_Set_Speed : 24|8@1+ (1,0) [0|255] "" XXX
SG_ Counter : 40|3@1+ (1,0) [0|7] "" XXX
SG_ Cruise_Activated : 54|1@1+ (1,0) [0|1] "" XXX
SG_ Brake : 43|1@1+ (1,0) [0|1] "" XXX
SG_ Car_Follow : 54|1@1+ (1,0) [0|1] "" XXX
SG_ Far_Distance : 56|4@1+ (1,0) [0|1] "" XXX

BO_ 881 Steering_Torque: 8 XXX
SG_ Steering_Motor_Flat : 0|10@1+ (32,0) [0|1000] "" XXX
Expand Down
11 changes: 7 additions & 4 deletions subaru_forester_2017_generated.dbc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ BO_ 352 ES_Brake: 8 XXX
SG_ Counter : 48|3@1+ (1,0) [0|7] "" XXX
SG_ Checksum : 56|8@1+ (1,0) [0|255] "" XXX

BO_ 353 ES_CruiseThrottle: 8 XXX
SG_ Throttle_Cruise : 0|12@1+ (1,0) [0|4095] "" XXX
BO_ 353 ES_Distance: 8 XXX
SG_ Cruise_Throttle : 0|12@1+ (1,0) [0|4095] "" XXX
SG_ Signal1 : 12|4@1+ (1,0) [0|15] "" XXX
SG_ Cruise_Activated : 16|1@1+ (1,0) [0|1] "" XXX
SG_ Car_Follow : 16|1@1+ (1,0) [0|1] "" XXX
SG_ Signal2 : 17|3@1+ (1,0) [0|7] "" XXX
SG_ Brake_On : 20|1@1+ (1,0) [0|1] "" XXX
SG_ Distance_Swap : 21|1@1+ (1,0) [0|1] "" XXX
Expand Down Expand Up @@ -253,9 +253,12 @@ CM_ "subaru_forester_2017.dbc starts here";
BO_ 355 ES_DashStatus: 8 XXX
SG_ Not_Ready_Startup : 4|2@1+ (1,0) [0|3] "" XXX
SG_ Cruise_On : 16|1@1+ (1,0) [0|1] "" XXX
SG_ Cruise_Activated : 17|1@0+ (1,0) [0|1] "" XXX
SG_ Cruise_Set_Speed : 24|8@1+ (1,0) [0|255] "" XXX
SG_ Counter : 40|3@1+ (1,0) [0|7] "" XXX
SG_ Cruise_Activated : 54|1@1+ (1,0) [0|1] "" XXX
SG_ Brake : 43|1@1+ (1,0) [0|1] "" XXX
SG_ Car_Follow : 54|1@1+ (1,0) [0|1] "" XXX
SG_ Far_Distance : 56|4@1+ (1,0) [0|1] "" XXX

BO_ 881 Steering_Torque: 8 XXX
SG_ Steering_Motor_Flat : 0|10@1+ (32,0) [0|1000] "" XXX
Expand Down
6 changes: 6 additions & 0 deletions subaru_global_2017_generated.dbc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ BO_ 313 Brake_Pedal: 8 XXX
SG_ Brake_Pedal : 36|12@1+ (1,0) [0|4095] "" XXX
SG_ Signal4 : 48|16@1+ (1,0) [0|65535] "" XXX

BO_ 372 Engine_Stop_Start: 8 XXX
SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
SG_ STOP_START_STATE : 39|2@0+ (1,0) [0|3] "" XXX

BO_ 290 ES_LKAS: 8 XXX
SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
Expand Down Expand Up @@ -161,6 +166,7 @@ BO_ 912 Dashlights: 8 XXX
SG_ SEATBELT_FL : 48|1@1+ (1,0) [0|1] "" XXX
SG_ LEFT_BLINKER : 50|1@1+ (1,0) [0|1] "" XXX
SG_ RIGHT_BLINKER : 51|1@1+ (1,0) [0|1] "" XXX
SG_ STOP_START : 54|1@0+ (1,0) [0|1] "" XXX

BO_ 940 BodyInfo: 8 XXX
SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
Expand Down
6 changes: 6 additions & 0 deletions subaru_global_2020_hybrid_generated.dbc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ BO_ 313 Brake_Pedal: 8 XXX
SG_ Brake_Pedal : 36|12@1+ (1,0) [0|4095] "" XXX
SG_ Signal4 : 48|16@1+ (1,0) [0|65535] "" XXX

BO_ 372 Engine_Stop_Start: 8 XXX
SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
SG_ STOP_START_STATE : 39|2@0+ (1,0) [0|3] "" XXX

BO_ 290 ES_LKAS: 8 XXX
SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
Expand Down Expand Up @@ -161,6 +166,7 @@ BO_ 912 Dashlights: 8 XXX
SG_ SEATBELT_FL : 48|1@1+ (1,0) [0|1] "" XXX
SG_ LEFT_BLINKER : 50|1@1+ (1,0) [0|1] "" XXX
SG_ RIGHT_BLINKER : 51|1@1+ (1,0) [0|1] "" XXX
SG_ STOP_START : 54|1@0+ (1,0) [0|1] "" XXX

BO_ 940 BodyInfo: 8 XXX
SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
Expand Down
6 changes: 3 additions & 3 deletions subaru_outback_2015_generated.dbc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ BO_ 352 ES_Brake: 8 XXX
SG_ Counter : 48|3@1+ (1,0) [0|7] "" XXX
SG_ Checksum : 56|8@1+ (1,0) [0|255] "" XXX

BO_ 353 ES_CruiseThrottle: 8 XXX
SG_ Throttle_Cruise : 0|12@1+ (1,0) [0|4095] "" XXX
BO_ 353 ES_Distance: 8 XXX
SG_ Cruise_Throttle : 0|12@1+ (1,0) [0|4095] "" XXX
SG_ Signal1 : 12|4@1+ (1,0) [0|15] "" XXX
SG_ Cruise_Activated : 16|1@1+ (1,0) [0|1] "" XXX
SG_ Car_Follow : 16|1@1+ (1,0) [0|1] "" XXX
SG_ Signal2 : 17|3@1+ (1,0) [0|7] "" XXX
SG_ Brake_On : 20|1@1+ (1,0) [0|1] "" XXX
SG_ Distance_Swap : 21|1@1+ (1,0) [0|1] "" XXX
Expand Down
6 changes: 3 additions & 3 deletions subaru_outback_2019_generated.dbc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ BO_ 352 ES_Brake: 8 XXX
SG_ Counter : 48|3@1+ (1,0) [0|7] "" XXX
SG_ Checksum : 56|8@1+ (1,0) [0|255] "" XXX

BO_ 353 ES_CruiseThrottle: 8 XXX
SG_ Throttle_Cruise : 0|12@1+ (1,0) [0|4095] "" XXX
BO_ 353 ES_Distance: 8 XXX
SG_ Cruise_Throttle : 0|12@1+ (1,0) [0|4095] "" XXX
SG_ Signal1 : 12|4@1+ (1,0) [0|15] "" XXX
SG_ Cruise_Activated : 16|1@1+ (1,0) [0|1] "" XXX
SG_ Car_Follow : 16|1@1+ (1,0) [0|1] "" XXX
SG_ Signal2 : 17|3@1+ (1,0) [0|7] "" XXX
SG_ Brake_On : 20|1@1+ (1,0) [0|1] "" XXX
SG_ Distance_Swap : 21|1@1+ (1,0) [0|1] "" XXX
Expand Down

0 comments on commit 2bab99f

Please sign in to comment.