Skip to content

Commit 4ab347b

Browse files
sshanesshane
authored
GM: fix up ignition msgs and signals (commaai#953)
* fix up ignition msgs and signals * generate * update * flip * add bcm
1 parent 0aedfe6 commit 4ab347b

File tree

2 files changed

+22
-14
lines changed

2 files changed

+22
-14
lines changed

‎generator/gm/gm_global_a_powertrain.dbc

+11-7
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,13 @@ BO_ 489 EBCMVehicleDynamic: 8 K17_EBCM
156156
SG_ YawRate : 35|12@0- (0.625,0) [0|1] "" NEO
157157
SG_ YawRate2 : 51|12@0- (0.0625,0) [-2047|2047] "grad/s" NEO
158158

159-
BO_ 352 VehicleIgnition: 5 XXX
160-
SG_ Ignition : 7|32@0+ (1,0) [0|4294967295] "" XXX
159+
BO_ 352 BCMImmobilizer: 5 K9_BCM
160+
SG_ ImmobilizerInfo : 7|32@0+ (1,0) [0|4294967295] "" XXX
161161

162-
BO_ 497 VehicleIgnitionAlt: 8 XXX
163-
SG_ Ignition : 5|1@0+ (1,0) [0|1] "" XXX
164-
SG_ ParkBrake : 36|1@0+ (1,0) [0|3] "" XXX
162+
BO_ 497 BCMGeneralPlatformStatus: 8 K9_BCM
163+
SG_ SystemPowerMode : 1|2@0+ (1,0) [0|3] "" XXX
164+
SG_ SystemBackUpPowerMode : 5|2@0+ (1,0) [0|3] "" XXX
165+
SG_ ParkBrakeSwActive : 36|1@0+ (1,0) [0|3] "" XXX
165166

166167
BO_ 501 ECMPRDNL2: 8 K20_ECM
167168
SG_ TransmissionState : 48|4@1+ (1,0) [0|7] "" NEO
@@ -296,11 +297,12 @@ CM_ BU_ K124_ASCM "Active Safety Control Module";
296297
CM_ SG_ 381 MSG17D_AccPower "Need to investigate";
297298
CM_ BO_ 190 "Length varies from 6 to 8 bytes by car";
298299
CM_ SG_ 190 GasPedalAndAcc "ACC baseline is 62";
299-
CM_ SG_ 352 Ignition "Non-zero when ignition is on";
300+
CM_ SG_ 352 ImmobilizerInfo "Non-zero when ignition or accessory mode";
300301
CM_ SG_ 451 GasPedalAndAcc2 "ACC baseline is 62";
301302
CM_ SG_ 481 ACCAlwaysOne "Usually 1 if the car is equipped with ACC";
302303
CM_ SG_ 562 FrictionBrakeUnavailable "1 when ACC brake control is unavailable. Stays high if brake command messages are blocked for a period of time";
303-
CM_ SG_ 497 Ignition "Describes ignition + preconditioning mode, noisy";
304+
CM_ SG_ 497 SystemPowerMode "Describes ignition";
305+
CM_ SG_ 497 SystemBackUpPowerMode "Describes ignition + preconditioning mode, noisy";
304306
CM_ SG_ 501 PRNDL2 "When ManualMode is Active, Value is 13=L1 12=L2 11=L3 ... 4=L10";
305307
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?";
306308
CM_ SG_ 608 ClusterSpeed "Cluster speed signal seems to match dash on newer cars, but is a lower rate and can be noisier.";
@@ -315,6 +317,8 @@ BA_DEF_DEF_ "BusType" "";
315317
BA_ "BusType" "CAN";
316318
BA_ "ProtocolType" "GMLAN";
317319
BA_ "UseGMParameterIDs" 0;
320+
VAL_ 497 SystemPowerMode 3 "Crank Request" 2 "Run" 1 "Accessory" 0 "Off";
321+
VAL_ 497 SystemBackUpPowerMode 3 "Crank Request" 2 "Run" 1 "Accessory" 0 "Off";
318322
VAL_ 481 DistanceButton 1 "Active" 0 "Inactive" ;
319323
VAL_ 481 LKAButton 1 "Active" 0 "Inactive" ;
320324
VAL_ 481 ACCButtons 6 "Cancel" 5 "Main" 3 "Set" 2 "Resume" 1 "None" ;

‎gm_global_a_powertrain_generated.dbc

+11-7
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,13 @@ BO_ 489 EBCMVehicleDynamic: 8 K17_EBCM
176176
SG_ YawRate : 35|12@0- (0.625,0) [0|1] "" NEO
177177
SG_ YawRate2 : 51|12@0- (0.0625,0) [-2047|2047] "grad/s" NEO
178178

179-
BO_ 352 VehicleIgnition: 5 XXX
180-
SG_ Ignition : 7|32@0+ (1,0) [0|4294967295] "" XXX
179+
BO_ 352 BCMImmobilizer: 5 K9_BCM
180+
SG_ ImmobilizerInfo : 7|32@0+ (1,0) [0|4294967295] "" XXX
181181

182-
BO_ 497 VehicleIgnitionAlt: 8 XXX
183-
SG_ Ignition : 5|1@0+ (1,0) [0|1] "" XXX
184-
SG_ ParkBrake : 36|1@0+ (1,0) [0|3] "" XXX
182+
BO_ 497 BCMGeneralPlatformStatus: 8 K9_BCM
183+
SG_ SystemPowerMode : 1|2@0+ (1,0) [0|3] "" XXX
184+
SG_ SystemBackUpPowerMode : 5|2@0+ (1,0) [0|3] "" XXX
185+
SG_ ParkBrakeSwActive : 36|1@0+ (1,0) [0|3] "" XXX
185186

186187
BO_ 501 ECMPRDNL2: 8 K20_ECM
187188
SG_ TransmissionState : 48|4@1+ (1,0) [0|7] "" NEO
@@ -316,11 +317,12 @@ CM_ BU_ K124_ASCM "Active Safety Control Module";
316317
CM_ SG_ 381 MSG17D_AccPower "Need to investigate";
317318
CM_ BO_ 190 "Length varies from 6 to 8 bytes by car";
318319
CM_ SG_ 190 GasPedalAndAcc "ACC baseline is 62";
319-
CM_ SG_ 352 Ignition "Non-zero when ignition is on";
320+
CM_ SG_ 352 ImmobilizerInfo "Non-zero when ignition or accessory mode";
320321
CM_ SG_ 451 GasPedalAndAcc2 "ACC baseline is 62";
321322
CM_ SG_ 481 ACCAlwaysOne "Usually 1 if the car is equipped with ACC";
322323
CM_ SG_ 562 FrictionBrakeUnavailable "1 when ACC brake control is unavailable. Stays high if brake command messages are blocked for a period of time";
323-
CM_ SG_ 497 Ignition "Describes ignition + preconditioning mode, noisy";
324+
CM_ SG_ 497 SystemPowerMode "Describes ignition";
325+
CM_ SG_ 497 SystemBackUpPowerMode "Describes ignition + preconditioning mode, noisy";
324326
CM_ SG_ 501 PRNDL2 "When ManualMode is Active, Value is 13=L1 12=L2 11=L3 ... 4=L10";
325327
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?";
326328
CM_ SG_ 608 ClusterSpeed "Cluster speed signal seems to match dash on newer cars, but is a lower rate and can be noisier.";
@@ -335,6 +337,8 @@ BA_DEF_DEF_ "BusType" "";
335337
BA_ "BusType" "CAN";
336338
BA_ "ProtocolType" "GMLAN";
337339
BA_ "UseGMParameterIDs" 0;
340+
VAL_ 497 SystemPowerMode 3 "Crank Request" 2 "Run" 1 "Accessory" 0 "Off";
341+
VAL_ 497 SystemBackUpPowerMode 3 "Crank Request" 2 "Run" 1 "Accessory" 0 "Off";
338342
VAL_ 481 DistanceButton 1 "Active" 0 "Inactive" ;
339343
VAL_ 481 LKAButton 1 "Active" 0 "Inactive" ;
340344
VAL_ 481 ACCButtons 6 "Cancel" 5 "Main" 3 "Set" 2 "Resume" 1 "None" ;

0 commit comments

Comments
 (0)