diff --git a/dbc/bmw-e39.dbc b/dbc/bmw-e39.dbc index 4b27fe2..e018aa5 100644 --- a/dbc/bmw-e39.dbc +++ b/dbc/bmw-e39.dbc @@ -1,4 +1,4 @@ -VERSION "BMW_E39_0.1.0" +VERSION "BMW-E39_2021.6.6" CM_ "BMW E39 PTCAN Database 500 kbit/s "; CM_ "Original Kayak .kcd by @kmalinich " ; @@ -61,16 +61,16 @@ BO_ 1824 DME_720: 8 DME SG_ EngExhaustGasTemp: 16|8@1+ (4,0) [0|1020] "degC" Vector__XXX SG_ EngineOilTemperature : 24|8@1+ (1,-48) [-48|207] "degC" Vector__XXX SG_ BatteryVoltage : 32|8@1+ (0.1,0) [0|25.5] "volts" Vector__XXX - SG_ VehicleSpeed : 40|16@1+ (1,0) [0|65535] "kph" Vector__XXX + SG_ VehicleSpeed : 40|16@1+ (0.00389105,0) [0|255] "kph" Vector__XXX SG_ FuelPumpDutyCycle : 56|8@1+ (0.3921568627450980,0) [0|100] "%" Vector__XXX BA_DEF_ "DatabaseVersion" STRING ; BA_DEF_ "BusType" STRING ; BA_DEF_ "ProtocolType" STRING ; BA_DEF_ BO_ "VFrameFormat" ENUM "StandardCAN","ExtendedCAN","StandardFD","ExtendedFD","J1939PG" ; +BA_DEF_ BO_ "GenMsgEVName" STRING ; BA_DEF_ BO_ "GenMsgStartTime" INT 0 100000 ; BA_DEF_ BO_ "GenMsgDelayTime" INT 0 100000 ; -BA_DEF_ BO_ "GenMsgEVName" STRING ; BA_DEF_ BO_ "SystemMessageLongSymbol" STRING ; BA_DEF_ SG_ "SystemSignalLongSymbol" STRING ; BA_DEF_ SG_ "GenSigStartValue" INT 0 100000 ; @@ -81,12 +81,12 @@ BA_DEF_DEF_ "ProtocolType" "CAN" ; BA_DEF_DEF_ "VFrameFormat" "StandardCAN" ; BA_DEF_DEF_ "GenMsgStartTime" 0 ; BA_DEF_DEF_ "GenMsgDelayTime" 0 ; -BA_DEF_DEF_ "GenMsgEVName" "Env_Vector__XXX@Signal" ; +BA_DEF_DEF_ "GenMsgEVName" "Env_@NodeName@Signal" ; BA_DEF_DEF_ "SystemMessageLongSymbol" "" ; BA_DEF_DEF_ "SystemSignalLongSymbol" "" ; BA_DEF_DEF_ "GenSigStartValue" 0 ; -BA_ "DatabaseVersion" "21.6.06" ; +BA_ "DatabaseVersion" "BMW-E39_2021.6.6" ; BA_ "BusType" "PTCAN" ; BA_ "ProtocolType" "CAN" ; BA_ "GenSigStartValue" SG_ 1824 EngineCoolantTemperature 48; diff --git a/dbc/bmw-e90.dbc b/dbc/bmw-e90.dbc index c960b62..1c045a4 100644 --- a/dbc/bmw-e90.dbc +++ b/dbc/bmw-e90.dbc @@ -1,6 +1,6 @@ -VERSION "BMW-E90_2021.6.6" +VERSION "BMW-E90_2021.6.8" -NS_ : +NS_ : NS_DESC_ CM_ BA_DEF_ @@ -126,7 +126,7 @@ BO_ 422 ACCEL_1A6: 8 KOMBI SG_ VehicleSpeed : 0|12@1+ (0.103,0) [0|255] "km/h" Vector__XXX SG_ Checksum : 63|8@0+ (1,0) [0|15] "" Vector__XXX -BO_ 436 BRAKE_1B4: 8 KOMBI +BO_ 436 BRAKE_1B4: 8 KOMBI SG_ HandbrakeStatus : 40|8@1+ (0.5,-24) [0|1] "" Vector__XXX BO_ 437 IHKA_1B5: 8 IHKA @@ -134,14 +134,14 @@ BO_ 437 IHKA_1B5: 8 IHKA BO_ 438 DME_1B6: 8 DME BO_ 450 PDC_1C2: 8 PDC - SG_ PdcSensorRearLeft 0|8@1+ (1,0) [0|255] "cm" Vector__XXX - SG_ PdcSensorRearLeftMid 8|8@1+ (1,0) [0|255] "cm" Vector__XXX - SG_ PdcSensorRearRightMid 16|8@1+ (1,0) [0|255] "cm" Vector__XXX - SG_ PdcSensorRearRight 24|8@1+ (1,0) [0|255] "cm" Vector__XXX - SG_ PdcSensorFrontLeft 32|8@1+ (1,0) [0|255] "cm" Vector__XXX - SG_ PdcSensorFrontLeftMid 40|8@1+ (1,0) [0|255] "cm" Vector__XXX - SG_ PdcSensorFrontRightMid 48|8@1+ (1,0) [0|255] "cm" Vector__XXX - SG_ PdcSensorFrontRight 56|8@1+ (1,0) [0|255] "cm" Vector__XXX + SG_ PdcSensorRearLeft : 0|8@1+ (1,0) [0|255] "cm" Vector__XXX + SG_ PdcSensorRearLeftMid : 8|8@1+ (1,0) [0|255] "cm" Vector__XXX + SG_ PdcSensorRearRightMid : 16|8@1+ (1,0) [0|255] "cm" Vector__XXX + SG_ PdcSensorRearRight : 24|8@1+ (1,0) [0|255] "cm" Vector__XXX + SG_ PdcSensorFrontLeft : 32|8@1+ (1,0) [0|255] "cm" Vector__XXX + SG_ PdcSensorFrontLeftMid : 40|8@1+ (1,0) [0|255] "cm" Vector__XXX + SG_ PdcSensorFrontRightMid : 48|8@1+ (1,0) [0|255] "cm" Vector__XXX + SG_ PdcSensorFrontRight : 56|8@1+ (1,0) [0|255] "cm" Vector__XXX BO_ 464 MOTOR_1D0: 8 DME SG_ EngineCoolantTemp : 0|8@1+ (1,-48) [0|207] "degC" Vector__XXX @@ -208,7 +208,7 @@ BO_ 760 DATE_2F8: 8 KOMBI BO_ 762 ACSM_2FA: 8 ACSM -BO_ 764 DOORS_2FC: 7 CAS +BO_ 764 DOOR_2FC: 7 CAS BO_ 784 KOMBI_310: 8 KOMBI @@ -224,7 +224,7 @@ BO_ 823 FUEL_337: 8 EKP BO_ 841 FUEL_349: 5 JBBF SG_ FuelSensorLeft : 0|16@1+ (0.00165108,0) [0|16.5] "gallons" Vector__XXX - SG_ FuelSensorRight: 16|16@1+ (0.00165108,0) [0|16.5] "gallons" Vector__XXX + SG_ FuelSensorRight : 16|16@1+ (0.00165108,0) [0|16.5] "gallons" Vector__XXX BO_ 842 GPS_34A: 5 CCC @@ -261,7 +261,7 @@ BO_ 1007 OBD_3EF: 8 DIA BO_ 1554 RES_612: 8 DME -BO_ 1632 ACK_660: 8 KOMBI +BO_ 1632 ACK_660: 8 KOMBI BO_ 1777 REQ_6F1: 8 DIA @@ -392,8 +392,8 @@ BA_DEF_DEF_ "SystemMessageLongSymbol" "" ; BA_DEF_DEF_ "SystemSignalLongSymbol" "" ; BA_DEF_DEF_ "GenSigStartValue" 0 ; -BA_ "DatabaseVersion" "BMW-E90_2021.6.6" ; -BA_ "BusType" "PTCAN" ; +BA_ "DatabaseVersion" "BMW-E90_2021.6.8" ; +BA_ "BusType" "KCAN" ; BA_ "ProtocolType" "CAN" ; VAL_ 168 BrakeStatus 1 "Pressed" 0 "Released"; @@ -430,4 +430,4 @@ VAL_ 502 TurnSignalLeft 1 "On" 0 "Off"; VAL_ 502 TurnSignalRight 1 "On" 0 "Off"; VAL_ 678 AutoWipers 1 "On" 0 "Off"; VAL_ 847 HandbrakeStatus2 1 "Engaged" 0 "Disengaged"; -VAL_ 944 ReverseGear 1 "Engaged" 0 "Disengaged"; \ No newline at end of file +VAL_ 944 ReverseGear 1 "Engaged" 0 "Disengaged"; diff --git a/dbc/boilerplate.dbc b/dbc/boilerplate.dbc index 043e891..d5f4718 100644 --- a/dbc/boilerplate.dbc +++ b/dbc/boilerplate.dbc @@ -1,10 +1,10 @@ VERSION "1.0.0" -CM_ "----------------------------------------------" ; -CM_ "Boilerplate by @nberlette https://git.io/JGpdF" ; -CM_ "----------------------------------------------" ; +CM_ "-----------------------------------------------" ; +CM_ "Boilerplate by @nberlette https://git.io/canbus" ; +CM_ "-----------------------------------------------" ; -NS_ : +NS_ : NS_DESC_ BO_TX_BU_ BA_DEF_DEF_ @@ -34,7 +34,7 @@ NS_ : BU_EV_REL_ BU_BO_REL_ -BS_: +BS_: BU_: Vector__XXX @@ -58,4 +58,3 @@ BA_DEF_ SG_ "SystemSignalLongSymbol" STRING ; BA_DEF_DEF_ "SystemSignalLongSymbol" ""; BA_ "VFrameFormat" BO_ 123 0; -