From 7994ffa766f5367dc39e9474a59b2b9abe3d3f64 Mon Sep 17 00:00:00 2001 From: Kevin Roscom Date: Wed, 23 Feb 2022 00:11:37 -0600 Subject: [PATCH] unify actuators and ocelot --- ocelot_controls.dbc | 57 ++++----------------------------------------- 1 file changed, 5 insertions(+), 52 deletions(-) diff --git a/ocelot_controls.dbc b/ocelot_controls.dbc index 5542dd3..1c5cb7b 100644 --- a/ocelot_controls.dbc +++ b/ocelot_controls.dbc @@ -33,69 +33,22 @@ NS_ : BS_: -BU_: EON PED IBST EPAS GAS_ACTUATOR BRAKE_ACTUATOR STEER_ACTUATOR +BU_: EON PED IBST EPAS 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_ YESNO 1 "Yes" 0 "No" ; -BO_ 256 ACTUATOR_GAS_COMMAND: 6 EON - SG_ GAS_COMMAND : 8|16@1+ (0.275676,-33.3567) [0|1] "" GAS_ACTUATOR - SG_ GAS_COMMAND2 : 24|16@1+ (0.13629,-32.71) [0|1] "" GAS_ACTUATOR - SG_ ENABLE : 47|1@1+ (1,0) [0|1] "" GAS_ACTUATOR - SG_ COUNTER : 40|4@1+ (1,0) [0|15] "" GAS_ACTUATOR - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" GAS_ACTUATOR - -BO_ 257 ACTUATOR_GAS_SENSOR: 6 GAS_ACTUATOR - SG_ PED_GAS : 8|16@1+ (0.275676,-33.3567) [0|1] "" EON - SG_ PED_GAS2 : 24|16@1+ (0.13629,-32.71) [0|1] "" EON - SG_ STATE : 44|4@1+ (1,0) [0|15] "" EON - SG_ COUNTER : 40|4@1+ (1,0) [0|15] "" EON - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" EON - -BO_ 270 ACTUATOR_BRAKE_COMMAND: 6 EON - SG_ BRAKE_POSITION_COMMAND : 32|12@1+ (0.015625,-5) [-5|47] "mm" BRAKE_ACTUATOR - SG_ BRAKE_RELATIVE_COMMAND : 16|16@1+ (0.0078125,-252) [-252|252] "" BRAKE_ACTUATOR - SG_ BRAKE_MODE : 12|2@1+ (1,0) [0|3] "" BRAKE_ACTUATOR - SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" BRAKE_ACTUATOR - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" BRAKE_ACTUATOR - -BO_ 271 ACTUATOR_BRAKE_STATUS: 5 BRAKE_ACTUATOR - SG_ BRAKE_PEDAL_POSITION : 20|12@1+ (0.015625,-5) [-5|47] "mm" EON - SG_ BRAKE_APPLIED : 18|1@1+ (1,0) [0|1] "" EON - SG_ DRIVER_BRAKE_APPLIED : 17|1@1+ (1,0) [0|1] "" EON - SG_ BRAKE_OK : 16|1@1+ (1,0) [0|1] "" EON - SG_ STATUS : 12|4@1+ (1,0) [0|15] "" EON - SG_ EXT_STATUS1 : 32|4@1+ (1,0) [0|15] "" EON - SG_ EXT_STATUS2 : 36|4@1+ (1,0) [0|15] "" EON - SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" EON - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" EON - -BO_ 302 ACTUATOR_STEERING_COMMAND: 6 EON - SG_ REQUESTED_STEER_TORQUE : 32|16@1- (0.5,0) [-512|511.5] "Nm" STEER_ACTUATOR - SG_ REQUESTED_STEER_ANGLE : 16|16@1- (0.1,0) [-1638.4|1638.3] "deg" STEER_ACTUATOR - SG_ STEER_MODE : 12|2@1+ (1,0) [0|3] "" STEER_ACTUATOR - SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" STEER_ACTUATOR - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" STEER_ACTUATOR - -BO_ 303 ACTUATOR_STEERING_STATUS: 7 STEER_ACTUATOR - SG_ STEERING_TORQUE_EPS : 40|16@1- (0.8,0) [-819.2|818.4] "Nm" EON - SG_ STEERING_TORQUE_DRIVER : 24|16@1- (0.8,0) [-819.2|818.4] "Nm" EON - SG_ STEERING_OK : 16|1@1+ (1,0) [0|1] "" EON - SG_ STATUS : 12|4@1+ (1,0) [0|15] "" EON - SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" EON - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" EON - BO_ 512 PEDAL_GAS_COMMAND: 6 EON - SG_ GAS_COMMAND : 8|16@1+ (0.275676,-33.3567) [0|1] "" PED - SG_ GAS_COMMAND2 : 24|16@1+ (0.13629,-32.71) [0|1] "" PED + SG_ GAS_COMMAND : 8|16@1+ (1,0) [0|1] "" PED + SG_ GAS_COMMAND2 : 24|16@1+ (1,0) [0|1] "" PED SG_ ENABLE : 47|1@1+ (1,0) [0|1] "" PED SG_ COUNTER : 40|4@1+ (1,0) [0|15] "" PED SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" PED BO_ 513 PEDAL_GAS_SENSOR: 6 PED - SG_ PED_GAS : 8|16@1+ (0.275676,-33.3567) [0|1] "" EON - SG_ PED_GAS2 : 24|16@1+ (0.13629,-32.71) [0|1] "" EON + SG_ PED_GAS : 8|16@1+ (1,0) [0|1] "" EON + SG_ PED_GAS2 : 24|16@1+ (1,0) [0|1] "" EON SG_ STATE : 44|4@1+ (1,0) [0|15] "" EON SG_ COUNTER : 40|4@1+ (1,0) [0|15] "" EON SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" EON