mirror of
https://github.com/dragonpilot/dragonpilot.git
synced 2026-07-14 01:12:06 +08:00
toyota door lock controller
This commit is contained in:
@@ -224,6 +224,8 @@ std::unordered_map<std::string, uint32_t> keys = {
|
||||
{"dp_nav_free_map", PERSISTENT},
|
||||
{"dp_nav_name", PERSISTENT},
|
||||
{"dp_nav_traffic", PERSISTENT},
|
||||
{"dp_toyota_auto_lock", PERSISTENT},
|
||||
{"dp_toyota_auto_unlock", PERSISTENT},
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
@@ -8,6 +8,8 @@ from openpilot.selfdrive.car.toyota.values import CAR, STATIC_DSU_MSGS, NO_STOP_
|
||||
UNSUPPORTED_DSU_CAR
|
||||
from opendbc.can.packer import CANPacker
|
||||
|
||||
from dp_ext.selfdrive.car.toyota.door_lock_controller import DoorLockController
|
||||
|
||||
SteerControlType = car.CarParams.SteerControlType
|
||||
VisualAlert = car.CarControl.HUDControl.VisualAlert
|
||||
|
||||
@@ -41,6 +43,8 @@ class CarController(CarControllerBase):
|
||||
self.packer = CANPacker(dbc_name)
|
||||
self.gas = 0
|
||||
self.accel = 0
|
||||
# dp
|
||||
self.dlc = DoorLockController()
|
||||
|
||||
def update(self, CC, CS, now_nanos):
|
||||
actuators = CC.actuators
|
||||
@@ -51,6 +55,10 @@ class CarController(CarControllerBase):
|
||||
# *** control msgs ***
|
||||
can_sends = []
|
||||
|
||||
result = self.dlc.process(CS.out.gearShifter, CS.out.vEgo, CS.out.doorOpen)
|
||||
if result:
|
||||
can_sends.append(make_can_msg(result[0], result[1], result[2]))
|
||||
|
||||
# *** steer torque ***
|
||||
new_steer = int(round(actuators.steer * self.params.STEER_MAX))
|
||||
apply_steer = apply_meas_steer_torque_limits(new_steer, self.last_steer, CS.out.steeringTorqueEps, self.params)
|
||||
|
||||
@@ -56,6 +56,8 @@ def manager_init() -> None:
|
||||
("dp_nav_free_map", "0"),
|
||||
("dp_nav_name", "0"),
|
||||
("dp_nav_traffic", "0"),
|
||||
("dp_toyota_auto_lock", "0"),
|
||||
("dp_toyota_auto_unlock", "0"),
|
||||
]
|
||||
if not PC:
|
||||
default_params.append(("LastUpdateTime", datetime.datetime.now(datetime.UTC).replace(tzinfo=None).isoformat().encode('utf8')))
|
||||
|
||||
Reference in New Issue
Block a user