From 2e0b8158ea0be3d085ae4df17acb54813005852b Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 22 Nov 2022 14:15:13 -0800 Subject: [PATCH 1/3] add cruise state signal --- generator/gm/gm_global_a_powertrain.dbc | 2 ++ gm_global_a_powertrain_generated.dbc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/generator/gm/gm_global_a_powertrain.dbc b/generator/gm/gm_global_a_powertrain.dbc index 5f6da2732d..6125c1a23b 100644 --- a/generator/gm/gm_global_a_powertrain.dbc +++ b/generator/gm/gm_global_a_powertrain.dbc @@ -225,6 +225,7 @@ BO_ 842 EBCMWheelSpdRear: 5 K17_EBCM BO_ 869 ASCM_365: 4 K124_ASCM BO_ 880 ASCMActiveCruiseControlStatus: 6 K124_ASCM + SG_ ACCCruiseState : 8|3@1+ (1,0) [0|7] "" XXX SG_ ACCLeadCar : 44|1@0+ (1,0) [0|0] "" Vector__XXX SG_ ACCAlwaysOne2 : 32|1@0+ (1,0) [0|0] "" Vector__XXX SG_ ACCAlwaysOne : 0|1@0+ (1,0) [0|0] "" Vector__XXX @@ -288,6 +289,7 @@ CM_ SG_ 497 Ignition "Describes ignition + preconditioning mode, noisy"; CM_ SG_ 501 PRNDL2 "When ManualMode is Active, Value is 13=L1 12=L2 11=L3 ... 4=L10"; CM_ SG_ 532 UserBrakePressure "can be lower than other brake position signals when the brakes are pre-filled from ACC braking and the user presses on the brakes. user-only pressure?"; CM_ SG_ 761 UserBrakePressure2 "Similar to BRAKE_RELATED->UserBrakePressure"; +CM_ SG_ 880 ACCCruiseState "2 when adaptive, 5 when non-adaptive. quickly transitions to 3 when going from non-adaptive to adaptive"; CM_ SG_ 1001 VehicleSpeed "Spinouts show here on 2wd. Speed derived from right front wheel (drive tire)"; BA_DEF_ "UseGMParameterIDs" INT 0 0; BA_DEF_ "ProtocolType" STRING ; diff --git a/gm_global_a_powertrain_generated.dbc b/gm_global_a_powertrain_generated.dbc index a251bb96e8..083a970417 100644 --- a/gm_global_a_powertrain_generated.dbc +++ b/gm_global_a_powertrain_generated.dbc @@ -245,6 +245,7 @@ BO_ 842 EBCMWheelSpdRear: 5 K17_EBCM BO_ 869 ASCM_365: 4 K124_ASCM BO_ 880 ASCMActiveCruiseControlStatus: 6 K124_ASCM + SG_ ACCCruiseState : 8|3@1+ (1,0) [0|7] "" XXX SG_ ACCLeadCar : 44|1@0+ (1,0) [0|0] "" Vector__XXX SG_ ACCAlwaysOne2 : 32|1@0+ (1,0) [0|0] "" Vector__XXX SG_ ACCAlwaysOne : 0|1@0+ (1,0) [0|0] "" Vector__XXX @@ -308,6 +309,7 @@ CM_ SG_ 497 Ignition "Describes ignition + preconditioning mode, noisy"; CM_ SG_ 501 PRNDL2 "When ManualMode is Active, Value is 13=L1 12=L2 11=L3 ... 4=L10"; CM_ SG_ 532 UserBrakePressure "can be lower than other brake position signals when the brakes are pre-filled from ACC braking and the user presses on the brakes. user-only pressure?"; CM_ SG_ 761 UserBrakePressure2 "Similar to BRAKE_RELATED->UserBrakePressure"; +CM_ SG_ 880 ACCCruiseState "2 when adaptive, 5 when non-adaptive. quickly transitions to 3 when going from non-adaptive to adaptive"; CM_ SG_ 1001 VehicleSpeed "Spinouts show here on 2wd. Speed derived from right front wheel (drive tire)"; BA_DEF_ "UseGMParameterIDs" INT 0 0; BA_DEF_ "ProtocolType" STRING ; From fe110cc78ad4b5dcd596a44b86b2d92d8cd7c5d0 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 22 Nov 2022 14:21:02 -0800 Subject: [PATCH 2/3] values --- generator/gm/gm_global_a_powertrain.dbc | 2 +- gm_global_a_powertrain_generated.dbc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generator/gm/gm_global_a_powertrain.dbc b/generator/gm/gm_global_a_powertrain.dbc index 6125c1a23b..b907e70a63 100644 --- a/generator/gm/gm_global_a_powertrain.dbc +++ b/generator/gm/gm_global_a_powertrain.dbc @@ -289,7 +289,6 @@ CM_ SG_ 497 Ignition "Describes ignition + preconditioning mode, noisy"; CM_ SG_ 501 PRNDL2 "When ManualMode is Active, Value is 13=L1 12=L2 11=L3 ... 4=L10"; CM_ SG_ 532 UserBrakePressure "can be lower than other brake position signals when the brakes are pre-filled from ACC braking and the user presses on the brakes. user-only pressure?"; CM_ SG_ 761 UserBrakePressure2 "Similar to BRAKE_RELATED->UserBrakePressure"; -CM_ SG_ 880 ACCCruiseState "2 when adaptive, 5 when non-adaptive. quickly transitions to 3 when going from non-adaptive to adaptive"; CM_ SG_ 1001 VehicleSpeed "Spinouts show here on 2wd. Speed derived from right front wheel (drive tire)"; BA_DEF_ "UseGMParameterIDs" INT 0 0; BA_DEF_ "ProtocolType" STRING ; @@ -308,6 +307,7 @@ VAL_ 452 CruiseState 4 "Standstill" 3 "Faulted" 1 "Active" 0 "Off" ; VAL_ 309 PRNDL 3 "R" 2 "D" 1 "N" 0 "P" ; VAL_ 309 ESPButton 1 "Active" 0 "Inactive" ; VAL_ 384 LKASteeringCmdActive 1 "Active" 0 "Inactive" ; +VAL_ 880 ACCCruiseState 2 "Adaptive" 3 "Transitioning to adaptive" 5 "Non-adaptive" ; VAL_ 880 ACCLeadCar 1 "Present" 0 "Not Present" ; VAL_ 880 ACCGapLevel 3 "Far" 2 "Med" 1 "Near" 0 "Inactive" ; VAL_ 880 ACCResumeButton 1 "Pressed" 0 "Depressed" ; diff --git a/gm_global_a_powertrain_generated.dbc b/gm_global_a_powertrain_generated.dbc index 083a970417..381a730a4e 100644 --- a/gm_global_a_powertrain_generated.dbc +++ b/gm_global_a_powertrain_generated.dbc @@ -309,7 +309,6 @@ CM_ SG_ 497 Ignition "Describes ignition + preconditioning mode, noisy"; CM_ SG_ 501 PRNDL2 "When ManualMode is Active, Value is 13=L1 12=L2 11=L3 ... 4=L10"; CM_ SG_ 532 UserBrakePressure "can be lower than other brake position signals when the brakes are pre-filled from ACC braking and the user presses on the brakes. user-only pressure?"; CM_ SG_ 761 UserBrakePressure2 "Similar to BRAKE_RELATED->UserBrakePressure"; -CM_ SG_ 880 ACCCruiseState "2 when adaptive, 5 when non-adaptive. quickly transitions to 3 when going from non-adaptive to adaptive"; CM_ SG_ 1001 VehicleSpeed "Spinouts show here on 2wd. Speed derived from right front wheel (drive tire)"; BA_DEF_ "UseGMParameterIDs" INT 0 0; BA_DEF_ "ProtocolType" STRING ; @@ -328,6 +327,7 @@ VAL_ 452 CruiseState 4 "Standstill" 3 "Faulted" 1 "Active" 0 "Off" ; VAL_ 309 PRNDL 3 "R" 2 "D" 1 "N" 0 "P" ; VAL_ 309 ESPButton 1 "Active" 0 "Inactive" ; VAL_ 384 LKASteeringCmdActive 1 "Active" 0 "Inactive" ; +VAL_ 880 ACCCruiseState 2 "Adaptive" 3 "Transitioning to adaptive" 5 "Non-adaptive" ; VAL_ 880 ACCLeadCar 1 "Present" 0 "Not Present" ; VAL_ 880 ACCGapLevel 3 "Far" 2 "Med" 1 "Near" 0 "Inactive" ; VAL_ 880 ACCResumeButton 1 "Pressed" 0 "Depressed" ; From cbb1029664f2fd29aa9404c4471f07be0b147078 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 22 Nov 2022 14:55:56 -0800 Subject: [PATCH 3/3] accurate --- generator/gm/gm_global_a_powertrain.dbc | 2 +- gm_global_a_powertrain_generated.dbc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generator/gm/gm_global_a_powertrain.dbc b/generator/gm/gm_global_a_powertrain.dbc index b907e70a63..f9b49a697c 100644 --- a/generator/gm/gm_global_a_powertrain.dbc +++ b/generator/gm/gm_global_a_powertrain.dbc @@ -307,7 +307,7 @@ VAL_ 452 CruiseState 4 "Standstill" 3 "Faulted" 1 "Active" 0 "Off" ; VAL_ 309 PRNDL 3 "R" 2 "D" 1 "N" 0 "P" ; VAL_ 309 ESPButton 1 "Active" 0 "Inactive" ; VAL_ 384 LKASteeringCmdActive 1 "Active" 0 "Inactive" ; -VAL_ 880 ACCCruiseState 2 "Adaptive" 3 "Transitioning to adaptive" 5 "Non-adaptive" ; +VAL_ 880 ACCCruiseState 2 "Adaptive" 3 "Adaptive" 4 "Non-adaptive" 5 "Non-adaptive" ; VAL_ 880 ACCLeadCar 1 "Present" 0 "Not Present" ; VAL_ 880 ACCGapLevel 3 "Far" 2 "Med" 1 "Near" 0 "Inactive" ; VAL_ 880 ACCResumeButton 1 "Pressed" 0 "Depressed" ; diff --git a/gm_global_a_powertrain_generated.dbc b/gm_global_a_powertrain_generated.dbc index 381a730a4e..2d823bd4b3 100644 --- a/gm_global_a_powertrain_generated.dbc +++ b/gm_global_a_powertrain_generated.dbc @@ -327,7 +327,7 @@ VAL_ 452 CruiseState 4 "Standstill" 3 "Faulted" 1 "Active" 0 "Off" ; VAL_ 309 PRNDL 3 "R" 2 "D" 1 "N" 0 "P" ; VAL_ 309 ESPButton 1 "Active" 0 "Inactive" ; VAL_ 384 LKASteeringCmdActive 1 "Active" 0 "Inactive" ; -VAL_ 880 ACCCruiseState 2 "Adaptive" 3 "Transitioning to adaptive" 5 "Non-adaptive" ; +VAL_ 880 ACCCruiseState 2 "Adaptive" 3 "Adaptive" 4 "Non-adaptive" 5 "Non-adaptive" ; VAL_ 880 ACCLeadCar 1 "Present" 0 "Not Present" ; VAL_ 880 ACCGapLevel 3 "Far" 2 "Med" 1 "Near" 0 "Inactive" ; VAL_ 880 ACCResumeButton 1 "Pressed" 0 "Depressed" ;