From 783a892751ce1ad731836a2ef91c37fba4f7f71e Mon Sep 17 00:00:00 2001
From: Justin Newberry <justin@comma.ai>
Date: Tue, 29 Aug 2023 10:08:58 -0700
Subject: [PATCH] Subaru: preglobal normalize signals to global (#929)

---
 generator/subaru/_subaru_preglobal_2015.dbc | 11 ++++++-----
 subaru_forester_2017_generated.dbc          | 11 ++++++-----
 subaru_outback_2015_generated.dbc           | 11 ++++++-----
 subaru_outback_2019_generated.dbc           | 11 ++++++-----
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/generator/subaru/_subaru_preglobal_2015.dbc b/generator/subaru/_subaru_preglobal_2015.dbc
index 060efea..2cc56e1 100644
--- a/generator/subaru/_subaru_preglobal_2015.dbc
+++ b/generator/subaru/_subaru_preglobal_2015.dbc
@@ -123,10 +123,11 @@ BO_ 338 Stalk: 8 XXX
 
 BO_ 352 ES_Brake: 8 XXX
  SG_ Brake_Pressure : 0|16@1+ (1,0) [0|255] "" XXX
- SG_ Brake_Light : 20|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Brake_Lights : 20|1@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Fault : 21|1@1+ (1,0) [0|1] "" XXX
- SG_ Brake_On : 22|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Brake_Active : 22|1@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Activated : 23|1@1+ (1,0) [0|1] "" XXX
+ SG_ SET_1 : 45|1@0+ (1,0) [0|1] "" XXX
  SG_ COUNTER : 48|3@1+ (1,0) [0|7] "" XXX
  SG_ Checksum : 56|8@1+ (1,0) [0|255] "" XXX
 
@@ -135,7 +136,7 @@ BO_ 353 ES_Distance: 8 XXX
  SG_ Signal1 : 12|4@1+ (1,0) [0|15] "" 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_ Cruise_Brake_Active : 20|1@1+ (1,0) [0|1] "" XXX
  SG_ Distance_Swap : 21|1@1+ (1,0) [0|1] "" XXX
  SG_ Standstill : 22|1@1+ (1,0) [0|1] "" XXX
  SG_ Signal3 : 23|1@1+ (1,0) [0|1] "" XXX
@@ -150,10 +151,10 @@ BO_ 353 ES_Distance: 8 XXX
  SG_ Signal7 : 51|5@1+ (1,0) [0|31] "" XXX
  SG_ Checksum : 56|8@1+ (1,0) [0|255] "" XXX
 
-BO_ 354 ES_RPM: 8 XXX
+BO_ 354 ES_Status: 8 XXX
  SG_ Brake : 8|1@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Activated : 9|1@1+ (1,0) [0|1] "" XXX
- SG_ RPM : 16|16@1+ (1,0) [0|65535] "" XXX
+ SG_ Cruise_RPM : 16|16@1+ (1,0) [0|65535] "" XXX
  SG_ Checksum : 32|8@1+ (1,0) [0|255] "" XXX
  SG_ COUNTER : 48|3@1+ (1,0) [0|7] "" XXX
 
diff --git a/subaru_forester_2017_generated.dbc b/subaru_forester_2017_generated.dbc
index 1455c69..3ba563e 100644
--- a/subaru_forester_2017_generated.dbc
+++ b/subaru_forester_2017_generated.dbc
@@ -127,10 +127,11 @@ BO_ 338 Stalk: 8 XXX
 
 BO_ 352 ES_Brake: 8 XXX
  SG_ Brake_Pressure : 0|16@1+ (1,0) [0|255] "" XXX
- SG_ Brake_Light : 20|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Brake_Lights : 20|1@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Fault : 21|1@1+ (1,0) [0|1] "" XXX
- SG_ Brake_On : 22|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Brake_Active : 22|1@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Activated : 23|1@1+ (1,0) [0|1] "" XXX
+ SG_ SET_1 : 45|1@0+ (1,0) [0|1] "" XXX
  SG_ COUNTER : 48|3@1+ (1,0) [0|7] "" XXX
  SG_ Checksum : 56|8@1+ (1,0) [0|255] "" XXX
 
@@ -139,7 +140,7 @@ BO_ 353 ES_Distance: 8 XXX
  SG_ Signal1 : 12|4@1+ (1,0) [0|15] "" 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_ Cruise_Brake_Active : 20|1@1+ (1,0) [0|1] "" XXX
  SG_ Distance_Swap : 21|1@1+ (1,0) [0|1] "" XXX
  SG_ Standstill : 22|1@1+ (1,0) [0|1] "" XXX
  SG_ Signal3 : 23|1@1+ (1,0) [0|1] "" XXX
@@ -154,10 +155,10 @@ BO_ 353 ES_Distance: 8 XXX
  SG_ Signal7 : 51|5@1+ (1,0) [0|31] "" XXX
  SG_ Checksum : 56|8@1+ (1,0) [0|255] "" XXX
 
-BO_ 354 ES_RPM: 8 XXX
+BO_ 354 ES_Status: 8 XXX
  SG_ Brake : 8|1@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Activated : 9|1@1+ (1,0) [0|1] "" XXX
- SG_ RPM : 16|16@1+ (1,0) [0|65535] "" XXX
+ SG_ Cruise_RPM : 16|16@1+ (1,0) [0|65535] "" XXX
  SG_ Checksum : 32|8@1+ (1,0) [0|255] "" XXX
  SG_ COUNTER : 48|3@1+ (1,0) [0|7] "" XXX
 
diff --git a/subaru_outback_2015_generated.dbc b/subaru_outback_2015_generated.dbc
index 6f97c89..4a6a0d3 100644
--- a/subaru_outback_2015_generated.dbc
+++ b/subaru_outback_2015_generated.dbc
@@ -127,10 +127,11 @@ BO_ 338 Stalk: 8 XXX
 
 BO_ 352 ES_Brake: 8 XXX
  SG_ Brake_Pressure : 0|16@1+ (1,0) [0|255] "" XXX
- SG_ Brake_Light : 20|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Brake_Lights : 20|1@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Fault : 21|1@1+ (1,0) [0|1] "" XXX
- SG_ Brake_On : 22|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Brake_Active : 22|1@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Activated : 23|1@1+ (1,0) [0|1] "" XXX
+ SG_ SET_1 : 45|1@0+ (1,0) [0|1] "" XXX
  SG_ COUNTER : 48|3@1+ (1,0) [0|7] "" XXX
  SG_ Checksum : 56|8@1+ (1,0) [0|255] "" XXX
 
@@ -139,7 +140,7 @@ BO_ 353 ES_Distance: 8 XXX
  SG_ Signal1 : 12|4@1+ (1,0) [0|15] "" 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_ Cruise_Brake_Active : 20|1@1+ (1,0) [0|1] "" XXX
  SG_ Distance_Swap : 21|1@1+ (1,0) [0|1] "" XXX
  SG_ Standstill : 22|1@1+ (1,0) [0|1] "" XXX
  SG_ Signal3 : 23|1@1+ (1,0) [0|1] "" XXX
@@ -154,10 +155,10 @@ BO_ 353 ES_Distance: 8 XXX
  SG_ Signal7 : 51|5@1+ (1,0) [0|31] "" XXX
  SG_ Checksum : 56|8@1+ (1,0) [0|255] "" XXX
 
-BO_ 354 ES_RPM: 8 XXX
+BO_ 354 ES_Status: 8 XXX
  SG_ Brake : 8|1@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Activated : 9|1@1+ (1,0) [0|1] "" XXX
- SG_ RPM : 16|16@1+ (1,0) [0|65535] "" XXX
+ SG_ Cruise_RPM : 16|16@1+ (1,0) [0|65535] "" XXX
  SG_ Checksum : 32|8@1+ (1,0) [0|255] "" XXX
  SG_ COUNTER : 48|3@1+ (1,0) [0|7] "" XXX
 
diff --git a/subaru_outback_2019_generated.dbc b/subaru_outback_2019_generated.dbc
index 908a9fd..2493ad4 100644
--- a/subaru_outback_2019_generated.dbc
+++ b/subaru_outback_2019_generated.dbc
@@ -127,10 +127,11 @@ BO_ 338 Stalk: 8 XXX
 
 BO_ 352 ES_Brake: 8 XXX
  SG_ Brake_Pressure : 0|16@1+ (1,0) [0|255] "" XXX
- SG_ Brake_Light : 20|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Brake_Lights : 20|1@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Fault : 21|1@1+ (1,0) [0|1] "" XXX
- SG_ Brake_On : 22|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Brake_Active : 22|1@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Activated : 23|1@1+ (1,0) [0|1] "" XXX
+ SG_ SET_1 : 45|1@0+ (1,0) [0|1] "" XXX
  SG_ COUNTER : 48|3@1+ (1,0) [0|7] "" XXX
  SG_ Checksum : 56|8@1+ (1,0) [0|255] "" XXX
 
@@ -139,7 +140,7 @@ BO_ 353 ES_Distance: 8 XXX
  SG_ Signal1 : 12|4@1+ (1,0) [0|15] "" 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_ Cruise_Brake_Active : 20|1@1+ (1,0) [0|1] "" XXX
  SG_ Distance_Swap : 21|1@1+ (1,0) [0|1] "" XXX
  SG_ Standstill : 22|1@1+ (1,0) [0|1] "" XXX
  SG_ Signal3 : 23|1@1+ (1,0) [0|1] "" XXX
@@ -154,10 +155,10 @@ BO_ 353 ES_Distance: 8 XXX
  SG_ Signal7 : 51|5@1+ (1,0) [0|31] "" XXX
  SG_ Checksum : 56|8@1+ (1,0) [0|255] "" XXX
 
-BO_ 354 ES_RPM: 8 XXX
+BO_ 354 ES_Status: 8 XXX
  SG_ Brake : 8|1@1+ (1,0) [0|1] "" XXX
  SG_ Cruise_Activated : 9|1@1+ (1,0) [0|1] "" XXX
- SG_ RPM : 16|16@1+ (1,0) [0|65535] "" XXX
+ SG_ Cruise_RPM : 16|16@1+ (1,0) [0|65535] "" XXX
  SG_ Checksum : 32|8@1+ (1,0) [0|255] "" XXX
  SG_ COUNTER : 48|3@1+ (1,0) [0|7] "" XXX