From c6665ed11b8d8c998e46f8dbee30e70a7d451e5e Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 12 Aug 2022 18:29:30 -0700 Subject: [PATCH] GM: fix set speed scaling (#679) Move scaling into DBC for GM cruise setpoint --- cadillac_ct6_powertrain.dbc | 2 +- generator/gm/gm_global_a_powertrain.dbc | 2 +- gm_global_a_powertrain_generated.dbc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cadillac_ct6_powertrain.dbc b/cadillac_ct6_powertrain.dbc index 9cbcc5f..2d0bb12 100644 --- a/cadillac_ct6_powertrain.dbc +++ b/cadillac_ct6_powertrain.dbc @@ -182,7 +182,7 @@ BO_ 880 ASCMActiveCruiseControlStatus: 6 K124_ASCM 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 - SG_ ACCSpeedSetpoint : 19|12@0+ (1,0) [0|0] "km/h" NEO + SG_ ACCSpeedSetpoint : 19|12@0+ (0.0625,0) [0|255.9375] "km/h" NEO SG_ ACCGapLevel : 21|2@0+ (1,0) [0|0] "" NEO SG_ ACCResumeButton : 1|1@0+ (1,0) [0|0] "" NEO SG_ ACCCmdActive : 23|1@0+ (1,0) [0|0] "" NEO diff --git a/generator/gm/gm_global_a_powertrain.dbc b/generator/gm/gm_global_a_powertrain.dbc index 0e6e4fb..85bdc43 100644 --- a/generator/gm/gm_global_a_powertrain.dbc +++ b/generator/gm/gm_global_a_powertrain.dbc @@ -213,7 +213,7 @@ BO_ 880 ASCMActiveCruiseControlStatus: 6 K124_ASCM 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 - SG_ ACCSpeedSetpoint : 19|12@0+ (1,0) [0|0] "km/h" NEO + SG_ ACCSpeedSetpoint : 19|12@0+ (0.0625,0) [0|255.9375] "km/h" NEO SG_ ACCGapLevel : 21|2@0+ (1,0) [0|0] "" NEO SG_ ACCResumeButton : 1|1@0+ (1,0) [0|0] "" NEO SG_ ACCCmdActive : 23|1@0+ (1,0) [0|0] "" NEO diff --git a/gm_global_a_powertrain_generated.dbc b/gm_global_a_powertrain_generated.dbc index 4f47c13..7aea559 100644 --- a/gm_global_a_powertrain_generated.dbc +++ b/gm_global_a_powertrain_generated.dbc @@ -233,7 +233,7 @@ BO_ 880 ASCMActiveCruiseControlStatus: 6 K124_ASCM 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 - SG_ ACCSpeedSetpoint : 19|12@0+ (1,0) [0|0] "km/h" NEO + SG_ ACCSpeedSetpoint : 19|12@0+ (0.0625,0) [0|255.9375] "km/h" NEO SG_ ACCGapLevel : 21|2@0+ (1,0) [0|0] "" NEO SG_ ACCResumeButton : 1|1@0+ (1,0) [0|0] "" NEO SG_ ACCCmdActive : 23|1@0+ (1,0) [0|0] "" NEO