From 24c33ff82abb8a07bb9741c6c5167a0ab97de3c3 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 17 Apr 2023 14:49:04 -0700 Subject: [PATCH 1/5] new infotainment sigs --- generator/subaru/subaru_global_2017.dbc | 4 +++- subaru_global_2017_generated.dbc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/generator/subaru/subaru_global_2017.dbc b/generator/subaru/subaru_global_2017.dbc index a2903dc7af..ebd4b5d45a 100644 --- a/generator/subaru/subaru_global_2017.dbc +++ b/generator/subaru/subaru_global_2017.dbc @@ -56,6 +56,8 @@ BO_ 576 CruiseControl: 8 XXX BO_ 803 INFOTAINMENT_STATUS: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX + SG_ CHANGES_0_2 : 15|4@0+ (1,0) [0|15] "" XXX + SG_ STATIC : 19|4@0+ (1,0) [0|15] "" XXX SG_ LKAS_State_Infotainment : 22|3@0+ (1,0) [0|8191] "" XXX CM_ SG_ 545 Cruise_Throttle "RPM-like output signal"; @@ -65,4 +67,4 @@ CM_ SG_ 545 Cruise_Soft_Disable "Eyesight Temporary disable, sets CruiseControl CM_ SG_ 546 Cruise_RPM "ES RPM output for ECM and TCM"; CM_ SG_ 546 Signal3 "0 when cruise_activated = 1"; 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"; \ No newline at end of file +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/subaru_global_2017_generated.dbc b/subaru_global_2017_generated.dbc index 1c73c36773..4b175dfecd 100644 --- a/subaru_global_2017_generated.dbc +++ b/subaru_global_2017_generated.dbc @@ -319,6 +319,8 @@ BO_ 576 CruiseControl: 8 XXX BO_ 803 INFOTAINMENT_STATUS: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX + SG_ CHANGES_0_2 : 15|4@0+ (1,0) [0|15] "" XXX + SG_ STATIC : 19|4@0+ (1,0) [0|15] "" XXX SG_ LKAS_State_Infotainment : 22|3@0+ (1,0) [0|8191] "" XXX CM_ SG_ 545 Cruise_Throttle "RPM-like output signal"; @@ -328,4 +330,4 @@ CM_ SG_ 545 Cruise_Soft_Disable "Eyesight Temporary disable, sets CruiseControl CM_ SG_ 546 Cruise_RPM "ES RPM output for ECM and TCM"; CM_ SG_ 546 Signal3 "0 when cruise_activated = 1"; 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"; \ No newline at end of file +VAL_ 72 Gear 2 "N" 3 "R" 4 "P" 121 "D" 137 "1" 145 "2" 153 "3" 161 "4" 169 "5" 177 "6"; From 13e53622efacb713dad065c4f6e42de89e45a082 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 17 Apr 2023 16:04:40 -0700 Subject: [PATCH 2/5] better names --- generator/subaru/subaru_global_2017.dbc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/generator/subaru/subaru_global_2017.dbc b/generator/subaru/subaru_global_2017.dbc index ebd4b5d45a..f6eba39d9d 100644 --- a/generator/subaru/subaru_global_2017.dbc +++ b/generator/subaru/subaru_global_2017.dbc @@ -56,8 +56,8 @@ BO_ 576 CruiseControl: 8 XXX BO_ 803 INFOTAINMENT_STATUS: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX - SG_ CHANGES_0_2 : 15|4@0+ (1,0) [0|15] "" XXX - SG_ STATIC : 19|4@0+ (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|8191] "" XXX CM_ SG_ 545 Cruise_Throttle "RPM-like output signal"; @@ -66,5 +66,7 @@ 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 one 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"; From a7a82f0e5ed8860ec1de2a8160a74a9074e39a77 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 17 Apr 2023 16:04:54 -0700 Subject: [PATCH 3/5] generate --- subaru_global_2017_generated.dbc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/subaru_global_2017_generated.dbc b/subaru_global_2017_generated.dbc index 4b175dfecd..0df4181fa4 100644 --- a/subaru_global_2017_generated.dbc +++ b/subaru_global_2017_generated.dbc @@ -319,8 +319,8 @@ BO_ 576 CruiseControl: 8 XXX BO_ 803 INFOTAINMENT_STATUS: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX - SG_ CHANGES_0_2 : 15|4@0+ (1,0) [0|15] "" XXX - SG_ STATIC : 19|4@0+ (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|8191] "" XXX CM_ SG_ 545 Cruise_Throttle "RPM-like output signal"; @@ -329,5 +329,7 @@ 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 one 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"; From f813e4cbd465f8afe361c7cbc1ab02fd3f720dd9 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 17 Apr 2023 16:29:56 -0700 Subject: [PATCH 4/5] another static bit signal (set on a forster) --- generator/subaru/subaru_global_2017.dbc | 4 +++- subaru_global_2017_generated.dbc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/generator/subaru/subaru_global_2017.dbc b/generator/subaru/subaru_global_2017.dbc index f6eba39d9d..46e4e6a580 100644 --- a/generator/subaru/subaru_global_2017.dbc +++ b/generator/subaru/subaru_global_2017.dbc @@ -58,7 +58,8 @@ BO_ 803 INFOTAINMENT_STATUS: 8 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|8191] "" 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"; @@ -67,6 +68,7 @@ CM_ SG_ 545 Cruise_Soft_Disable "Eyesight Temporary disable, sets CruiseControl 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 one some cars"; +CM_ SG_ 803 Signal2 "Seems to be static, set only one 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"; diff --git a/subaru_global_2017_generated.dbc b/subaru_global_2017_generated.dbc index 0df4181fa4..3ab2b8ebfa 100644 --- a/subaru_global_2017_generated.dbc +++ b/subaru_global_2017_generated.dbc @@ -321,7 +321,8 @@ BO_ 803 INFOTAINMENT_STATUS: 8 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|8191] "" 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"; @@ -330,6 +331,7 @@ CM_ SG_ 545 Cruise_Soft_Disable "Eyesight Temporary disable, sets CruiseControl 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 one some cars"; +CM_ SG_ 803 Signal2 "Seems to be static, set only one 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"; From d58ad382c1c58d8144f3c42fc1122a10dbe3ef05 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 17 Apr 2023 16:49:27 -0700 Subject: [PATCH 5/5] generate --- generator/subaru/subaru_global_2017.dbc | 4 ++-- subaru_global_2017_generated.dbc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/generator/subaru/subaru_global_2017.dbc b/generator/subaru/subaru_global_2017.dbc index 46e4e6a580..0d358aea06 100644 --- a/generator/subaru/subaru_global_2017.dbc +++ b/generator/subaru/subaru_global_2017.dbc @@ -67,8 +67,8 @@ 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 one some cars"; -CM_ SG_ 803 Signal2 "Seems to be static, set only one some cars"; +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"; diff --git a/subaru_global_2017_generated.dbc b/subaru_global_2017_generated.dbc index 3ab2b8ebfa..b572d1b644 100644 --- a/subaru_global_2017_generated.dbc +++ b/subaru_global_2017_generated.dbc @@ -330,8 +330,8 @@ 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 one some cars"; -CM_ SG_ 803 Signal2 "Seems to be static, set only one some cars"; +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";