split hybrid and ice, and split old_lkas

martinl · Jul 11, 2023 · 55675e9 · 55675e9
1 parent 5de70b4
commit 55675e9
Show file tree

Hide file tree

Showing 10 changed files with 503 additions and 204 deletions.
diff --git a/generator/subaru/_subaru_global.dbc b/generator/subaru/_subaru_global.dbc
@@ -120,13 +120,6 @@ BO_ 372 Engine_Stop_Start: 8 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
- SG_ SET_1 : 12|1@0+ (1,0) [0|1] "" XXX
- SG_ LKAS_Output : 16|13@1- (-1,0) [-8191|8191] "" XXX
- SG_ LKAS_Request : 29|1@0+ (1,0) [0|1] "" XXX
-
 BO_ 544 ES_Brake: 8 XXX
  SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
  SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
@@ -139,6 +132,48 @@ BO_ 544 ES_Brake: 8 XXX
  SG_ Cruise_Activated : 39|1@1+ (1,0) [0|1] "" XXX
  SG_ Signal3 : 40|24@1+ (1,0) [0|16777215] "" XXX
 
+BO_ 545 ES_Distance: 8 XXX
+ SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" 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_ Car_Follow : 32|1@1+ (1,0) [0|1] "" XXX
+ SG_ Signal3 : 33|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Soft_Disable : 34|1@1+ (1,0) [0|1] "" XXX
+ SG_ Signal7 : 35|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Brake_Active : 36|1@1+ (1,0) [0|1] "" XXX
+ SG_ Distance_Swap : 37|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_EPB : 38|1@1+ (1,0) [0|1] "" XXX
+ SG_ Signal4 : 39|1@0+ (1,0) [0|1] "" XXX
+ SG_ Close_Distance : 40|8@1+ (0.019607,0) [0|5] "m" XXX
+ SG_ Signal5 : 48|8@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Cancel : 56|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Set : 57|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Resume : 58|1@1+ (1,0) [0|1] "" XXX
+ SG_ Signal6 : 59|5@1+ (1,0) [0|1] "" XXX
+
+BO_ 546 ES_Status: 8 XXX
+ SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" 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_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
+ SG_ Signal3 : 32|32@1+ (1,0) [0|1] "" XXX
+
+BO_ 576 CruiseControl: 8 XXX
+ SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
+ SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
+ SG_ Signal1 : 12|28@1+ (1,0) [0|268435455] "" XXX
+ SG_ Cruise_On : 40|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Activated : 41|1@1+ (1,0) [0|1] "" XXX
+ SG_ Signal2 : 42|22@1+ (1,0) [0|4194303] "" XXX
+
 BO_ 577 Cruise_Status: 8 XXX
  SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
  SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
@@ -237,12 +272,26 @@ BO_ 1677 Dash_State: 8 XXX
  SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
  SG_ Units : 29|3@1+ (1,0) [0|7] "" XXX
 
+BO_ 803 ES_Infotainment: 8 XXX
+ SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
+ SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
+ SG_ LKAS_Blue_Lines : 15|4@0+ (1,0) [0|15] "" XXX
+ SG_ Signal1 : 19|4@0+ (1,0) [0|15] "" XXX
+ SG_ LKAS_State_Infotainment : 22|3@0+ (1,0) [0|7] "" XXX
+ SG_ Signal2 : 24|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";
 CM_ SG_ 544 Cruise_Brake_Lights "1 = switch on brake lights";
 CM_ SG_ 544 Brake_Pressure "Winds down after cruise disabled. Also can be non-zero when likely preparing for AEB";
 CM_ SG_ 544 Signal3 "Usually goes to 2 if AEB_Status is 4";
 CM_ SG_ 544 AEB_Status "Occasionally is 4 instead of 8 while Brake_Pressure is non-zero, unsure why";
+CM_ SG_ 545 Cruise_Throttle "RPM-like output signal";
+CM_ SG_ 545 Cruise_EPB "1 = Electric Parking Brake set";
+CM_ SG_ 545 Distance_Swap "Switch from Close to Far distance";
+CM_ SG_ 545 Cruise_Soft_Disable "Eyesight Temporary disable, sets CruiseControl Activated = 0";
+CM_ SG_ 546 Cruise_RPM "ES RPM output for ECM and TCM";
+CM_ SG_ 546 Signal3 "0 when cruise_activated = 1";
 CM_ SG_ 801 PCB_Off "Pre-Collision Braking off";
 CM_ SG_ 801 Brake_Lights "Driver or Cruise brake on";
 CM_ SG_ 801 Cruise_State "0 = Normal, 1 = Hold+User Brake, 2 = Ready, 3 = Hold";
@@ -260,3 +309,7 @@ CM_ SG_ 802 LKAS_Right_Line_Visible "0 = Off, 1 = White, 2 = Green, 3 = Orange";
 CM_ SG_ 912 UNITS "0 = Metric, 1 = Imperial";
 CM_ SG_ 912 ICY_ROAD "1 = DASHLIGHT ON, 2 = WARNING, 3 = OFF";
 VAL_ 544 AEB_Status 12 "AEB related" 8 "AEB actuation" 4 "AEB related" 0 "No AEB actuation";
+VAL_ 803 LKAS_Blue_Lines 0 "no modifier" 2 "changes lines to blue";
+VAL_ 803 LKAS_State_Infotainment 0 "none" 2 "Obstacle Detected" 3 "Keep Hands On Wheel" 4 "Keep Hands On Wheel Off";
+CM_ SG_ 803 Signal1 "Seems to be static, set only on some cars";
+CM_ SG_ 803 Signal2 "Seems to be static, set only on some cars";
diff --git a/generator/subaru/_subaru_global_hybrid.dbc b/generator/subaru/_subaru_global_hybrid.dbc
@@ -0,0 +1,16 @@
+BO_ 39 Cruise_Status_2: 8 XXX
+ SG_ Cruise_Activated : 37|1@0+ (1,0) [0|1] "" XXX
+
+BO_ 295 Transmission: 8 XXX
+ SG_ Gear : 44|4@1+ (1,0) [0|15] "" XXX
+
+BO_ 360 Throttle_Hybrid: 8 XXX
+ SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
+ SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
+ SG_ Throttle_Pedal : 32|8@1+ (1,0) [0|255] "" XXX
+
+BO_ 550 Brake_Hybrid: 8 XXX
+ SG_ Brake_Pedal : 24|8@1+ (1,0) [0|1] "" XXX
+ SG_ Brake : 37|1@1+ (1,0) [0|1] "" XXX
+
+VAL_ 295 Gear 0 "P" 1 "R" 3 "D";
diff --git a/generator/subaru/_subaru_global_ice.dbc b/generator/subaru/_subaru_global_ice.dbc
@@ -0,0 +1,12 @@
+BO_ 72 Transmission: 8 XXX
+ SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
+ SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
+ SG_ Gear : 24|8@1+ (1,0) [0|255] "" XXX
+ SG_ RPM : 40|16@1+ (1,0) [0|65535] "" XXX
+
+BO_ 73 CVT: 8 XXX
+ SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
+ SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
+ SG_ CVT_Gear : 24|8@1+ (1,0) [0|255] "" XXX
+
+VAL_ 72 Gear 2 "N" 3 "R" 4 "P" 121 "D" 137 "1" 145 "2" 153 "3" 161 "4" 169 "5" 177 "6";
diff --git a/generator/subaru/_subaru_global_old_lkas.dbc b/generator/subaru/_subaru_global_old_lkas.dbc
@@ -0,0 +1,6 @@
+BO_ 292 ES_LKAS: 8 XXX
+ SG_ CHECKSUM : 0|8@1+ (1,0) [0|1] "" XXX
+ SG_ COUNTER : 8|4@1+ (1,0) [0|1] "" XXX
+ SG_ SET_3 : 60|2@1+ (1,0) [0|1] "" XXX
+ SG_ LKAS_Output : 40|17@1- (-1,0) [0|1] "" XXX
+ SG_ LKAS_Request : 12|1@1+ (1,0) [0|1] "" XXX
diff --git a/generator/subaru/subaru_global_2017.dbc b/generator/subaru/subaru_global_2017.dbc
@@ -1,74 +1,3 @@
 CM_ "IMPORT _subaru_global.dbc";
-
-BO_ 72 Transmission: 8 XXX
- SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
- SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ Gear : 24|8@1+ (1,0) [0|255] "" XXX
- SG_ RPM : 40|16@1+ (1,0) [0|65535] "" XXX
-
-BO_ 73 CVT: 8 XXX
- SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
- SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ CVT_Gear : 24|8@1+ (1,0) [0|255] "" XXX
-
-BO_ 545 ES_Distance: 8 XXX
- SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" 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_ Car_Follow : 32|1@1+ (1,0) [0|1] "" XXX
- SG_ Signal3 : 33|1@1+ (1,0) [0|1] "" XXX
- SG_ Cruise_Soft_Disable : 34|1@1+ (1,0) [0|1] "" XXX
- SG_ Signal7 : 35|1@1+ (1,0) [0|1] "" XXX
- SG_ Cruise_Brake_Active : 36|1@1+ (1,0) [0|1] "" XXX
- SG_ Distance_Swap : 37|1@1+ (1,0) [0|1] "" XXX
- SG_ Cruise_EPB : 38|1@1+ (1,0) [0|1] "" XXX
- SG_ Signal4 : 39|1@0+ (1,0) [0|1] "" XXX
- SG_ Close_Distance : 40|8@1+ (0.019607,0) [0|5] "m" XXX
- SG_ Signal5 : 48|8@1+ (1,0) [0|1] "" XXX
- SG_ Cruise_Cancel : 56|1@1+ (1,0) [0|1] "" XXX
- SG_ Cruise_Set : 57|1@1+ (1,0) [0|1] "" XXX
- SG_ Cruise_Resume : 58|1@1+ (1,0) [0|1] "" XXX
- SG_ Signal6 : 59|5@1+ (1,0) [0|1] "" XXX
-
-BO_ 546 ES_Status: 8 XXX
- SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" 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_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
- SG_ Signal3 : 32|32@1+ (1,0) [0|1] "" XXX
-
-BO_ 576 CruiseControl: 8 XXX
- SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
- SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ Signal1 : 12|28@1+ (1,0) [0|268435455] "" XXX
- SG_ Cruise_On : 40|1@1+ (1,0) [0|1] "" XXX
- SG_ Cruise_Activated : 41|1@1+ (1,0) [0|1] "" XXX
- SG_ Signal2 : 42|22@1+ (1,0) [0|4194303] "" XXX
-
-BO_ 803 ES_Infotainment: 8 XXX
- SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
- SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ LKAS_Blue_Lines : 15|4@0+ (1,0) [0|15] "" XXX
- SG_ Signal1 : 19|4@0+ (1,0) [0|15] "" XXX
- SG_ LKAS_State_Infotainment : 22|3@0+ (1,0) [0|7] "" XXX
- SG_ Signal2 : 24|1@0+ (1,0) [0|1] "" XXX
-
-CM_ SG_ 545 Cruise_Throttle "RPM-like output signal";
-CM_ SG_ 545 Cruise_EPB "1 = Electric Parking Brake set";
-CM_ SG_ 545 Distance_Swap "Switch from Close to Far distance";
-CM_ SG_ 545 Cruise_Soft_Disable "Eyesight Temporary disable, sets CruiseControl Activated = 0";
-CM_ SG_ 546 Cruise_RPM "ES RPM output for ECM and TCM";
-CM_ SG_ 546 Signal3 "0 when cruise_activated = 1";
-CM_ SG_ 803 Signal1 "Seems to be static, set only on some cars";
-CM_ SG_ 803 Signal2 "Seems to be static, set only on some cars";
-VAL_ 803 LKAS_Blue_Lines 0 "no modifier" 2 "changes lines to blue";
-VAL_ 803 LKAS_State_Infotainment 0 "none" 2 "Obstacle Detected" 3 "Keep Hands On Wheel" 4 "Keep Hands On Wheel Off";
-VAL_ 72 Gear 2 "N" 3 "R" 4 "P" 121 "D" 137 "1" 145 "2" 153 "3" 161 "4" 169 "5" 177 "6";
+CM_ "IMPORT _subaru_global_ice.dbc";
+CM_ "IMPORT _subaru_global_old_lkas.dbc";
diff --git a/generator/subaru/subaru_global_2020_hybrid.dbc b/generator/subaru/subaru_global_2020_hybrid.dbc
@@ -1,18 +1,3 @@
 CM_ "IMPORT _subaru_global.dbc";
-
-BO_ 39 Cruise_Status_2: 8 XXX
- SG_ Cruise_Activated : 37|1@0+ (1,0) [0|1] "" XXX
-
-BO_ 295 Transmission: 8 XXX
- SG_ Gear : 44|4@1+ (1,0) [0|15] "" XXX
-
-BO_ 360 Throttle_Hybrid: 8 XXX
- SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
- SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ Throttle_Pedal : 32|8@1+ (1,0) [0|255] "" XXX
-
-BO_ 550 Brake_Hybrid: 8 XXX
- SG_ Brake_Pedal : 24|8@1+ (1,0) [0|1] "" XXX
- SG_ Brake : 37|1@1+ (1,0) [0|1] "" XXX
-
-VAL_ 295 Gear 0 "P" 1 "R" 3 "D";
+CM_ "IMPORT _subaru_global_hybrid.dbc";
+CM_ "IMPORT _subaru_global_old_lkas.dbc";
diff --git a/generator/subaru/subaru_global_2022.dbc b/generator/subaru/subaru_global_2022.dbc
@@ -1,14 +1,9 @@
-CM_ "IMPORT subaru_global_2017.dbc";
+CM_ "IMPORT _subaru_global.dbc";
+CM_ "IMPORT _subaru_global_ice.dbc";
 
-BO_ 292 ES_LKAS_2: 8 XXX
+BO_ 292 ES_LKAS: 8 XXX
  SG_ CHECKSUM : 0|8@1+ (1,0) [0|1] "" XXX
  SG_ COUNTER : 8|4@1+ (1,0) [0|1] "" XXX
- SG_ LKAS_Request : 12|1@1+ (1,0) [0|1] "" XXX
- SG_ LKAS_Output : 40|17@1- (-1,0) [0|1] "" XXX
  SG_ SET_3 : 60|2@1+ (1,0) [0|1] "" XXX
-
-BO_ 282 EPS_LKAS: 8 XXX
- SG_ CHECKSUM : 0|8@1+ (1,0) [0|1] "" XXX
- SG_ COUNTER : 8|4@1+ (1,0) [0|1] "" XXX
- SG_ LKAS_OUTPUT_SENSOR_1 : 24|17@1- (1,0) [0|1] "" XXX
- SG_ LKAS_OUTPUT_SENSOR_2 : 47|17@1- (1,0) [0|1] "" XXX
+ SG_ LKAS_Output : 40|17@1- (-1,0) [0|1] "" XXX
+ SG_ LKAS_Request : 12|1@1+ (1,0) [0|1] "" XXX