Subaru: cruise_rpm and cruise_throttle are 13 bits (#995)

* fix cruise throttle * and es_status * generator
commaai · Dec 30, 2023 · 40d9c72 · 40d9c72
1 parent 89042da
commit 40d9c72
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/generator/subaru/_subaru_global.dbc b/generator/subaru/_subaru_global.dbc
@@ -275,6 +275,7 @@ BO_ 289 ES_STATIC_2: 8 XXX
  SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
  SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
  SG_ SET_3 : 15|2@1+ (1,0) [0|3] "" XXX
+ SG_ Cruise_Fault : 18|1@0+ (1,0) [0|1] "" XXX
 
 CM_ SG_ 64 Throttle_Combo "Throttle Cruise + Pedal";
 CM_ SG_ 313 Brake_Lights "Driver or Cruise Brake on";

diff --git a/generator/subaru/subaru_global_2017.dbc b/generator/subaru/subaru_global_2017.dbc
@@ -16,8 +16,8 @@ BO_ 545 ES_Distance: 8 XXX
  SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
  SG_ Signal1 : 12|3@1+ (1,0) [0|7] "" XXX
  SG_ Cruise_Fault : 15|1@1+ (1,0) [0|1] "" XXX
- SG_ Cruise_Throttle : 16|12@1+ (1,0) [0|4095] "" XXX
- SG_ Signal2 : 28|4@1+ (1,0) [0|15] "" XXX
+ SG_ Cruise_Throttle : 16|13@1+ (1,0) [0|4095] "" XXX
+ SG_ Signal2 : 29|3@1+ (1,0) [0|15] "" XXX
  SG_ Car_Follow : 32|1@1+ (1,0) [0|1] "" XXX
  SG_ Low_Speed_Follow : 33|1@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Soft_Disable : 34|1@1+ (1,0) [0|1] "" XXX
@@ -38,8 +38,7 @@ BO_ 546 ES_Status: 8 XXX
  SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
  SG_ Signal1 : 12|3@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Fault : 15|1@1+ (1,0) [0|1] "" XXX
- SG_ Cruise_RPM : 16|12@1+ (1,0) [0|4095] "" XXX
- SG_ Signal2 : 28|1@0+ (1,0) [0|1] "" XXX
+ SG_ Cruise_RPM : 16|13@1+ (1,0) [0|4095] "" XXX
  SG_ Cruise_Activated : 29|1@0+ (1,0) [0|1] "" XXX
  SG_ Brake_Lights : 30|1@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Hold : 31|1@1+ (1,0) [0|1] "" XXX

diff --git a/subaru_global_2017_generated.dbc b/subaru_global_2017_generated.dbc
@@ -279,6 +279,7 @@ BO_ 289 ES_STATIC_2: 8 XXX
  SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
  SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
  SG_ SET_3 : 15|2@1+ (1,0) [0|3] "" XXX
+ SG_ Cruise_Fault : 18|1@0+ (1,0) [0|1] "" XXX
 
 CM_ SG_ 64 Throttle_Combo "Throttle Cruise + Pedal";
 CM_ SG_ 313 Brake_Lights "Driver or Cruise Brake on";
@@ -322,8 +323,8 @@ BO_ 545 ES_Distance: 8 XXX
  SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
  SG_ Signal1 : 12|3@1+ (1,0) [0|7] "" XXX
  SG_ Cruise_Fault : 15|1@1+ (1,0) [0|1] "" XXX
- SG_ Cruise_Throttle : 16|12@1+ (1,0) [0|4095] "" XXX
- SG_ Signal2 : 28|4@1+ (1,0) [0|15] "" XXX
+ SG_ Cruise_Throttle : 16|13@1+ (1,0) [0|4095] "" XXX
+ SG_ Signal2 : 29|3@1+ (1,0) [0|15] "" XXX
  SG_ Car_Follow : 32|1@1+ (1,0) [0|1] "" XXX
  SG_ Low_Speed_Follow : 33|1@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Soft_Disable : 34|1@1+ (1,0) [0|1] "" XXX
@@ -344,8 +345,7 @@ BO_ 546 ES_Status: 8 XXX
  SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
  SG_ Signal1 : 12|3@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Fault : 15|1@1+ (1,0) [0|1] "" XXX
- SG_ Cruise_RPM : 16|12@1+ (1,0) [0|4095] "" XXX
- SG_ Signal2 : 28|1@0+ (1,0) [0|1] "" XXX
+ SG_ Cruise_RPM : 16|13@1+ (1,0) [0|4095] "" XXX
  SG_ Cruise_Activated : 29|1@0+ (1,0) [0|1] "" XXX
  SG_ Brake_Lights : 30|1@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Hold : 31|1@1+ (1,0) [0|1] "" XXX

diff --git a/subaru_global_2020_hybrid_generated.dbc b/subaru_global_2020_hybrid_generated.dbc
@@ -279,6 +279,7 @@ BO_ 289 ES_STATIC_2: 8 XXX
  SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
  SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
  SG_ SET_3 : 15|2@1+ (1,0) [0|3] "" XXX
+ SG_ Cruise_Fault : 18|1@0+ (1,0) [0|1] "" XXX
 
 CM_ SG_ 64 Throttle_Combo "Throttle Cruise + Pedal";
 CM_ SG_ 313 Brake_Lights "Driver or Cruise Brake on";