From 412a14d2cca07c236626c37c55c49db3af132e35 Mon Sep 17 00:00:00 2001 From: ReFil <31960031+ReFil@users.noreply.github.com> Date: Tue, 2 Mar 2021 18:14:57 +0000 Subject: [PATCH] fixes and more data --- ocelot_can.dbc | 29 +++++++++++++- ...adster.dbc => ocelot_smart_roadster_pt.dbc | 38 +++++-------------- 2 files changed, 36 insertions(+), 31 deletions(-) rename ocelot_smart_roadster.dbc => ocelot_smart_roadster_pt.dbc (64%) diff --git a/ocelot_can.dbc b/ocelot_can.dbc index 3647d36..65954f6 100644 --- a/ocelot_can.dbc +++ b/ocelot_can.dbc @@ -1,7 +1,7 @@ VERSION "" -NS_ : +NS_ : NS_DESC_ CM_ BA_DEF_ @@ -33,12 +33,27 @@ NS_ : BS_: -BU_: EPAS HIM PED EON IBST SAS +BU_: EPAS HIM PED EON IBST SAS EPAS TOYOTASAS VAL_TABLE_ BRAKEMODE 3 "Reserved" 2 "Position Control" 1 "Relative Control" 0 "Disengadged" ; VAL_TABLE_ STATUS 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; +VAL_TABLE_ STEERINGMODE 3 "Reserved" 2 "Position Control" 1 "Torque Control" 0 "Disengadged" ; VAL_TABLE_ YESNO 1 "Yes" 0 "No" ; +BO_ 741 STEERING_COMMAND: 5 EON + SG_ REQUESTED_STEER_TORQUE : 29|11@1- (0.5,0) [-512|511.5] "Nm" EPAS + SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" EPAS + SG_ REQUESTED_STEER_ANGLE : 14|15@1- (0.1,0) [-1638.4|1638.3] "deg" EPAS + SG_ STEER_MODE : 12|2@1+ (1,0) [0|3] "" EPAS + SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" EPAS + +BO_ 608 STEERING_STATUS: 5 EPAS + SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" EON + SG_ STATUS : 15|4@0+ (1,0) [0|15] "" EON + SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" EON + SG_ STEERING_TORQUE_EPS : 29|11@1- (0.8,0) [-819.2|818.4] "Nm" EON + SG_ STEERING_TORQUE_DRIVER : 18|11@1- (0.8,0) [-819.2|818.4] "Nm" EON + SG_ STEERING_OK : 16|1@1+ (1,0) [0|1] "" EON BO_ 527 BRAKE_STATUS: 4 IBST SG_ BRAKE_PEDAL_POSITION : 18|14@1+ (0.015625,-5) [-5|47] "mm" EON @@ -83,13 +98,23 @@ BO_ 869 HIM_CTRLS: 3 HIM SG_ STATE : 11|4@0+ (1,0) [0|15] "" EON SG_ CHECKSUM : 16|8@1+ (1,0) [0|255] "" EON +BO_ 1059 TOYOTA_STEERING_ANGLE_SENSOR3: 1 TOYOTASAS +BO_ 1222 TOYOTA_STEERING_ANGLE_SENSOR2: 8 TOYOTASAS + +BO_ 37 TOYOTA_STEERING_ANGLE_SENSOR1: 8 TOYOTASAS + SG_ TOYOTA_STEER_RATE : 35|12@0- (1,0) [-2000|2000] "deg/s" EON + SG_ TOYOTA_STEER_FRACTION : 39|4@0- (0.1,0) [-0.7|0.7] "deg" EON + SG_ TOYOTA_STEER_ANGLE : 3|12@0- (1.5,0) [-500|500] "deg" EON VAL_ 527 IBOOSTER_BRAKE_APPLIED 1 "Yes" 0 "No" ; VAL_ 527 BRAKE_OK 1 "Yes" 0 "No" ; VAL_ 527 STATUS 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; VAL_ 526 BRAKE_MODE 3 "Reserved" 2 "Position Control" 1 "Relative Control" 0 "Disengadged" ; + VAL_ 741 STEER_MODE 3 "Reserved" 2 "Position Control" 1 "Torque Control" 0 "Disengadged" ; + VAL_ 608 STATUS 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; + VAL_ 608 STEERING_OK 1 "Yes" 0 "No" ; VAL_ 870 ENABLED 1 "Yes" 0 "No" ; VAL_ 512 ENABLE 1 "Yes" 0 "No" ; VAL_ 869 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; diff --git a/ocelot_smart_roadster.dbc b/ocelot_smart_roadster_pt.dbc similarity index 64% rename from ocelot_smart_roadster.dbc rename to ocelot_smart_roadster_pt.dbc index 19fbd9d..610b2da 100644 --- a/ocelot_smart_roadster.dbc +++ b/ocelot_smart_roadster_pt.dbc @@ -33,27 +33,14 @@ NS_ : BS_: -BU_: EON EPAS TOYOTASAS SMART +BU_: EON SMART VAL_TABLE_ BRAKEMODE 3 "Reserved" 2 "Position Control" 1 "Relative Control" 0 "Disengadged" ; VAL_TABLE_ STATUS 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; VAL_TABLE_ STEERINGMODE 3 "Reserved" 2 "Position Control" 1 "Torque Control" 0 "Disengadged" ; VAL_TABLE_ YESNO 1 "Yes" 0 "No" ; -BO_ 741 STEERING_COMMAND: 5 EON - SG_ REQUESTED_STEER_TORQUE : 29|11@1- (0.5,0) [-512|511.5] "Nm" EPAS - SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" EPAS - SG_ REQUESTED_STEER_ANGLE : 14|15@1- (0.1,0) [-1638.4|1638.3] "deg" EPAS - SG_ STEER_MODE : 12|2@1+ (1,0) [0|3] "" EPAS - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" EPAS -BO_ 608 STEERING_STATUS: 5 EPAS - SG_ COUNTER : 12|4@1+ (1,0) [0|15] "" EON - SG_ STATUS : 11|4@0+ (1,0) [0|15] "" EON - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" EON - SG_ STEERING_TORQUE_EPS : 29|11@1- (0.8,0) [-819.2|818.4] "Nm" EON - SG_ STEERING_TORQUE_DRIVER : 18|11@1- (0.8,0) [-819.2|818.4] "Nm" EON - SG_ STEERING_OK : 16|1@1+ (1,0) [0|1] "" EON BO_ 1585 SMART_ROADSTER_MESSAGE8: 8 SMART @@ -69,16 +56,11 @@ BO_ 568 SMART_ROADSTER_MESSAGE3: 8 SMART BO_ 528 SMART_ROADSTER_MESSAGE2: 8 SMART -BO_ 128 SMART_ROADSTER_MESSAGE1: 8 SMART - -BO_ 1059 TOYOTA_STEERING_ANGLE_SENSOR3: 1 TOYOTASAS - -BO_ 1222 TOYOTA_STEERING_ANGLE_SENSOR2: 8 TOYOTASAS - -BO_ 37 TOYOTA_STEERING_ANGLE_SENSOR1: 8 TOYOTASAS - SG_ TOYOTA_STEER_RATE : 35|12@0- (1,0) [-2000|2000] "deg/s" EON - SG_ TOYOTA_STEER_FRACTION : 39|4@0- (0.1,0) [-0.7|0.7] "deg" EON - SG_ TOYOTA_STEER_ANGLE : 3|12@0- (1.5,0) [-500|500] "deg" EON +BO_ 128 SMARTROADSTERWHEELSPEEDS: 8 SMART + SG_ WHEELSPEED_RR : 55|16@0+ (1,0) [0|65535] "" EON + SG_ WHEELSPEED_RL : 39|16@0+ (1,0) [0|65535] "" EON + SG_ WHEELSPEED_FR : 23|16@0+ (1,0) [0|65535] "mph" EON + SG_ WHEELSPEED_FL : 7|16@0+ (1,0) [0|65535] "mph" EON BO_ 194 SMARTSTEERINGANGLESENSOR: 8 SMART SG_ SMART_STEER_RATE_SIGN : 31|1@1+ (1,0) [0|0] "" EON @@ -101,7 +83,7 @@ BO_ 144 ABS: 8 SMART SG_ BRAKEPEDAL : 2|1@1+ (1,0) [0|0] "" EON SG_ VEHICLESPEED : 45|6@0- (1,0) [0|0] "mph" EON -BO_ 400 Gearbox: 8 SMART +BO_ 400 GEARBOX: 8 SMART SG_ GEARPOSITION : 0|8@1+ (1,0) [0|0] "" EON BO_ 520 WHEELSPEEDS: 8 SMART @@ -118,9 +100,7 @@ BA_DEF_DEF_ "GenMsgBackgroundColor" "#1e1e1e"; BA_DEF_DEF_ "GenMsgForegroundColor" "#ffffff"; BA_DEF_DEF_ "isj1939dbc" 0; -VAL_ 741 STEER_MODE 3 "Reserved" 2 "Position Control" 1 "Torque Control" 0 "Disengadged" ; -VAL_ 608 STATUS 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; -VAL_ 608 STEERING_OK 1 "Yes" 0 "No" ; + VAL_ 544 RIGHT_DOOR 0 "Open" 1 "Closed" ; VAL_ 544 LEFT_DOOR 0 "Open" 1 "Closed" ; VAL_ 544 LEFT_SIGNAL 0 "Off" 1 "On" ; @@ -128,4 +108,4 @@ VAL_ 544 RIGHT_SIGNAL 0 "Off" 1 "On" ; VAL_ 544 SIDELIGHTS 0 "Off" 1 "On" ; VAL_ 144 ESP_STATUS 0 "On" 1 "Off" ; VAL_ 144 BRAKEPEDAL 0 "Not_pressed" 1 "Pressed" ; -VAL_ 400 GEARPOSITION 8 "Neutral" 4 "Reverse" 76 "Auto" 16 "Manual" ; +VAL_ 400 GEARPOSITION 8 "N" 4 "R" 76 "D" 16 "M" ;