selfdrive/car: ban cereal and capnp (#33208)
* ban cereal and msgq
* common too
* do toyota/values.py
* do all fingerprints
* example without builder
* this still works, but no type checking anymore
* stash
* wtf, how does this work
* okay actually not bad
* safe
* epic!
* stash data_structures.py
* some clean up
* hell yeah
* clean up old file
* add to delete
* delete
This reverts commit 90239b7797ace31ee647a2fdbd67e0c3faa98dcf.
* switch more CarParams stuff over
remove unused
* fix car tests by removing cereal! mypy forgets about dataclass if we wrap it :(
* fix this too
* fix this too
* remove more cereal and add some good hyundai tests
* bunch more typing
* override default with 20hz radar
* temp capnp converter helper
* more lateralTuning
* small union replicator is better than what i was trying, and fixes mypy dynamic typing issues
* can keep all this the same now!
* type ret: CarParams, add more missing structs, revert lateralTuning changes (smaller diff!)
* revert more
* get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :(
would have been `CarParams.NetworkLocation()`
* Revert "get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :("
This reverts commit bb28b228becba932052d2fc5a4389784027435b1.
* remove cereal from car_helpers (TODO: caching)
* remove a bunch of temp lines
* use dataclass_transform!
* remove some car.CarParams from the interfaces
* remove rest of car.CarParams from the interfaces
* same which() API
* sort
* from cereal/cache from fingerprinting!
* more typing
* dataclass to capnp helper for CarParams, cached it since it's kinda slow
* (partial) fix process replay fingerprintig for new API
* latcontrollers take capnp
* forgot this
* fix test_models
* fix unit tests
* not here
* VehicleModel and controller still takes capnp CP since they get it from Params()
* fix modeld test
* more fix
* need to namespace to structs, since CarState is both class and struct
* this was never in the base class?!
* clean that up again
* fix import error
fix import error
* cmts and more structs
* remove some more cereal from toyota + convert CarState to capnp
* bruh this was wrong
* replace more cereal
* EventName is one of the last things...
* replace a bunch more cereal.car
* missing imports
* more
* can fix this typing now
* proper toyota+others CS typing!
* mypy can detect return type of CS.update() now
* fix redeclaration of cruise_buttons type
* mypy is only complaining about events now
* temp fix
* add carControl struct
* replace CarControl
i hope there's no circular imports in hyundai's CC
* fine now
* lol this was wrong too
* fix crash
* include my failed attempts at recursively converting to dataclass (doesn't implicitly convert types/recursively :( )
but attrs does, maybe will switch in the future
* clean up
* try out attr.s for its converter (doesn't work recursively yet, but interesting!)
* Revert "try out attr.s for its converter (doesn't work recursively yet, but interesting!)"
This reverts commit ff2434f7bbd45a4d4bfb21f7d6712d1f1c3bcde9.
* test processes doesn't fail anymore (on toyota)!
* fix honda crash
* stash
* Revert "stash"
This reverts commit c1762af4e776790e4ad1322ad4ce0610157346e0.
* remove a bunch more cereal!
* LET'S GOOO
* fix these tests
* and these
* and that
* stash, something is wrong with hyundai enable
* Revert "stash, something is wrong with hyundai enable"
This reverts commit 39cf327def258e2959fe23cd7a550a858f6d8f03.
* forgot these
* remove cereal from fw_versions
* Revert "remove cereal from fw_versions"
This reverts commit 232b37cd409b55d04b1afc90d4a80c49e710eb56.
* remove rest of the cereal exceptions!
* fix that
* add typing to radard since I didn't realize RI.update() switched from cereal to structs
* and here too!
* add TODO for slots
* needed CS to be capnp, fix comparisons, and type hint car_specific so it's easier to catch type issues (capnp isn't detected by mypy :( )
* remove the struct converter
* save ~4-5% CPU at 100hz, we don't modify after so no need to deepcopy
btw pickle.loads(pickle.dumps()) is faster by ~1% CPU
* deepcopy -> copy: we can technically make a reference, but copy is almost free and less error-prone
saves ~1% CPU
* add non-copying asdict function
* should save ~3% CPU (still 4% above baseline)
* fix that, no dict support
* ~27% decrease in time for 20k iterations on 3X (3.37857 -> 2.4821s)
* give a better name
* fix
* dont support none, capitalize
* sheesh, this called type() on every field
* remove CS.events, clean up
* bump card %
* this was a bug on master!
* add a which enum
* default to pid
* revert
* update refs
* not needed, but consistent
* just Ecu
* don't need to do this in this pr
* clean up
* no cast
* consistent typing
* rm
* fix
* can do this if we're desperate for the last few %
* Revert "can do this if we're desperate for the last few %"
This reverts commit 18e11ac7883a0a56583750b1cc5a2b13011e7299.
* type this
* don't need to convert carControl
* i guess don't support set either
* fix CP type hint
* simplify that
1 year ago
|
|
|
import copy
|
|
|
|
import numpy as np
|
|
|
|
from numbers import Number
|
|
|
|
|
|
|
|
from opendbc.can.packer import CANPacker
|
|
|
|
from openpilot.selfdrive.car import DT_CTRL
|
|
|
|
from openpilot.selfdrive.car.common.numpy_fast import clip, interp
|
|
|
|
from openpilot.selfdrive.car.body import bodycan
|
|
|
|
from openpilot.selfdrive.car.body.values import SPEED_FROM_RPM
|
|
|
|
from openpilot.selfdrive.car.interfaces import CarControllerBase
|
|
|
|
|
|
|
|
|
|
|
|
class PIController:
|
|
|
|
def __init__(self, k_p, k_i, pos_limit=1e308, neg_limit=-1e308, rate=100):
|
|
|
|
self._k_p = k_p
|
|
|
|
self._k_i = k_i
|
|
|
|
if isinstance(self._k_p, Number):
|
|
|
|
self._k_p = [[0], [self._k_p]]
|
|
|
|
if isinstance(self._k_i, Number):
|
|
|
|
self._k_i = [[0], [self._k_i]]
|
|
|
|
|
|
|
|
self.pos_limit = pos_limit
|
|
|
|
self.neg_limit = neg_limit
|
|
|
|
|
|
|
|
self.i_unwind_rate = 0.3 / rate
|
|
|
|
self.i_rate = 1.0 / rate
|
|
|
|
self.speed = 0.0
|
|
|
|
|
|
|
|
self.reset()
|
|
|
|
|
|
|
|
@property
|
|
|
|
def k_p(self):
|
|
|
|
return interp(self.speed, self._k_p[0], self._k_p[1])
|
|
|
|
|
|
|
|
@property
|
|
|
|
def k_i(self):
|
|
|
|
return interp(self.speed, self._k_i[0], self._k_i[1])
|
|
|
|
|
|
|
|
@property
|
|
|
|
def error_integral(self):
|
|
|
|
return self.i/self.k_i
|
|
|
|
|
|
|
|
def reset(self):
|
|
|
|
self.p = 0.0
|
|
|
|
self.i = 0.0
|
|
|
|
self.control = 0
|
|
|
|
|
|
|
|
def update(self, error, speed=0.0, freeze_integrator=False):
|
|
|
|
self.speed = speed
|
|
|
|
|
|
|
|
self.p = float(error) * self.k_p
|
|
|
|
|
|
|
|
i = self.i + error * self.k_i * self.i_rate
|
|
|
|
control = self.p + i
|
|
|
|
|
|
|
|
# Update when changing i will move the control away from the limits
|
|
|
|
# or when i will move towards the sign of the error
|
|
|
|
if ((error >= 0 and (control <= self.pos_limit or i < 0.0)) or
|
|
|
|
(error <= 0 and (control >= self.neg_limit or i > 0.0))) and \
|
|
|
|
not freeze_integrator:
|
|
|
|
self.i = i
|
|
|
|
|
|
|
|
control = self.p + self.i
|
|
|
|
|
|
|
|
self.control = clip(control, self.neg_limit, self.pos_limit)
|
|
|
|
return self.control
|
|
|
|
|
|
|
|
|
|
|
|
MAX_TORQUE = 500
|
|
|
|
MAX_TORQUE_RATE = 50
|
|
|
|
MAX_ANGLE_ERROR = np.radians(7)
|
|
|
|
MAX_POS_INTEGRATOR = 0.2 # meters
|
|
|
|
MAX_TURN_INTEGRATOR = 0.1 # meters
|
|
|
|
|
|
|
|
|
|
|
|
class CarController(CarControllerBase):
|
|
|
|
def __init__(self, dbc_name, CP):
|
|
|
|
super().__init__(dbc_name, CP)
|
|
|
|
self.packer = CANPacker(dbc_name)
|
|
|
|
|
|
|
|
# PIDs
|
|
|
|
self.turn_pid = PIController(110, k_i=11.5, rate=1/DT_CTRL)
|
|
|
|
self.wheeled_speed_pid = PIController(110, k_i=11.5, rate=1/DT_CTRL)
|
|
|
|
|
|
|
|
self.torque_r_filtered = 0.
|
|
|
|
self.torque_l_filtered = 0.
|
|
|
|
|
|
|
|
@staticmethod
|
|
|
|
def deadband_filter(torque, deadband):
|
|
|
|
if torque > 0:
|
|
|
|
torque += deadband
|
|
|
|
else:
|
|
|
|
torque -= deadband
|
|
|
|
return torque
|
|
|
|
|
|
|
|
def update(self, CC, CS, now_nanos):
|
|
|
|
|
|
|
|
torque_l = 0
|
|
|
|
torque_r = 0
|
|
|
|
|
|
|
|
llk_valid = len(CC.orientationNED) > 1 and len(CC.angularVelocity) > 1
|
|
|
|
if CC.enabled and llk_valid:
|
|
|
|
# Read these from the joystick
|
|
|
|
# TODO: this isn't acceleration, okay?
|
|
|
|
speed_desired = CC.actuators.accel / 5.
|
|
|
|
speed_diff_desired = -CC.actuators.steer / 2.
|
|
|
|
|
|
|
|
speed_measured = SPEED_FROM_RPM * (CS.out.wheelSpeeds.fl + CS.out.wheelSpeeds.fr) / 2.
|
|
|
|
speed_error = speed_desired - speed_measured
|
|
|
|
|
|
|
|
torque = self.wheeled_speed_pid.update(speed_error, freeze_integrator=False)
|
|
|
|
|
|
|
|
speed_diff_measured = SPEED_FROM_RPM * (CS.out.wheelSpeeds.fl - CS.out.wheelSpeeds.fr)
|
|
|
|
turn_error = speed_diff_measured - speed_diff_desired
|
|
|
|
freeze_integrator = ((turn_error < 0 and self.turn_pid.error_integral <= -MAX_TURN_INTEGRATOR) or
|
|
|
|
(turn_error > 0 and self.turn_pid.error_integral >= MAX_TURN_INTEGRATOR))
|
|
|
|
torque_diff = self.turn_pid.update(turn_error, freeze_integrator=freeze_integrator)
|
|
|
|
|
|
|
|
# Combine 2 PIDs outputs
|
|
|
|
torque_r = torque + torque_diff
|
|
|
|
torque_l = torque - torque_diff
|
|
|
|
|
|
|
|
# Torque rate limits
|
|
|
|
self.torque_r_filtered = np.clip(self.deadband_filter(torque_r, 10),
|
|
|
|
self.torque_r_filtered - MAX_TORQUE_RATE,
|
|
|
|
self.torque_r_filtered + MAX_TORQUE_RATE)
|
|
|
|
self.torque_l_filtered = np.clip(self.deadband_filter(torque_l, 10),
|
|
|
|
self.torque_l_filtered - MAX_TORQUE_RATE,
|
|
|
|
self.torque_l_filtered + MAX_TORQUE_RATE)
|
|
|
|
torque_r = int(np.clip(self.torque_r_filtered, -MAX_TORQUE, MAX_TORQUE))
|
|
|
|
torque_l = int(np.clip(self.torque_l_filtered, -MAX_TORQUE, MAX_TORQUE))
|
|
|
|
|
|
|
|
can_sends = []
|
|
|
|
can_sends.append(bodycan.create_control(self.packer, torque_l, torque_r))
|
|
|
|
|
selfdrive/car: ban cereal and capnp (#33208)
* ban cereal and msgq
* common too
* do toyota/values.py
* do all fingerprints
* example without builder
* this still works, but no type checking anymore
* stash
* wtf, how does this work
* okay actually not bad
* safe
* epic!
* stash data_structures.py
* some clean up
* hell yeah
* clean up old file
* add to delete
* delete
This reverts commit 90239b7797ace31ee647a2fdbd67e0c3faa98dcf.
* switch more CarParams stuff over
remove unused
* fix car tests by removing cereal! mypy forgets about dataclass if we wrap it :(
* fix this too
* fix this too
* remove more cereal and add some good hyundai tests
* bunch more typing
* override default with 20hz radar
* temp capnp converter helper
* more lateralTuning
* small union replicator is better than what i was trying, and fixes mypy dynamic typing issues
* can keep all this the same now!
* type ret: CarParams, add more missing structs, revert lateralTuning changes (smaller diff!)
* revert more
* get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :(
would have been `CarParams.NetworkLocation()`
* Revert "get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :("
This reverts commit bb28b228becba932052d2fc5a4389784027435b1.
* remove cereal from car_helpers (TODO: caching)
* remove a bunch of temp lines
* use dataclass_transform!
* remove some car.CarParams from the interfaces
* remove rest of car.CarParams from the interfaces
* same which() API
* sort
* from cereal/cache from fingerprinting!
* more typing
* dataclass to capnp helper for CarParams, cached it since it's kinda slow
* (partial) fix process replay fingerprintig for new API
* latcontrollers take capnp
* forgot this
* fix test_models
* fix unit tests
* not here
* VehicleModel and controller still takes capnp CP since they get it from Params()
* fix modeld test
* more fix
* need to namespace to structs, since CarState is both class and struct
* this was never in the base class?!
* clean that up again
* fix import error
fix import error
* cmts and more structs
* remove some more cereal from toyota + convert CarState to capnp
* bruh this was wrong
* replace more cereal
* EventName is one of the last things...
* replace a bunch more cereal.car
* missing imports
* more
* can fix this typing now
* proper toyota+others CS typing!
* mypy can detect return type of CS.update() now
* fix redeclaration of cruise_buttons type
* mypy is only complaining about events now
* temp fix
* add carControl struct
* replace CarControl
i hope there's no circular imports in hyundai's CC
* fine now
* lol this was wrong too
* fix crash
* include my failed attempts at recursively converting to dataclass (doesn't implicitly convert types/recursively :( )
but attrs does, maybe will switch in the future
* clean up
* try out attr.s for its converter (doesn't work recursively yet, but interesting!)
* Revert "try out attr.s for its converter (doesn't work recursively yet, but interesting!)"
This reverts commit ff2434f7bbd45a4d4bfb21f7d6712d1f1c3bcde9.
* test processes doesn't fail anymore (on toyota)!
* fix honda crash
* stash
* Revert "stash"
This reverts commit c1762af4e776790e4ad1322ad4ce0610157346e0.
* remove a bunch more cereal!
* LET'S GOOO
* fix these tests
* and these
* and that
* stash, something is wrong with hyundai enable
* Revert "stash, something is wrong with hyundai enable"
This reverts commit 39cf327def258e2959fe23cd7a550a858f6d8f03.
* forgot these
* remove cereal from fw_versions
* Revert "remove cereal from fw_versions"
This reverts commit 232b37cd409b55d04b1afc90d4a80c49e710eb56.
* remove rest of the cereal exceptions!
* fix that
* add typing to radard since I didn't realize RI.update() switched from cereal to structs
* and here too!
* add TODO for slots
* needed CS to be capnp, fix comparisons, and type hint car_specific so it's easier to catch type issues (capnp isn't detected by mypy :( )
* remove the struct converter
* save ~4-5% CPU at 100hz, we don't modify after so no need to deepcopy
btw pickle.loads(pickle.dumps()) is faster by ~1% CPU
* deepcopy -> copy: we can technically make a reference, but copy is almost free and less error-prone
saves ~1% CPU
* add non-copying asdict function
* should save ~3% CPU (still 4% above baseline)
* fix that, no dict support
* ~27% decrease in time for 20k iterations on 3X (3.37857 -> 2.4821s)
* give a better name
* fix
* dont support none, capitalize
* sheesh, this called type() on every field
* remove CS.events, clean up
* bump card %
* this was a bug on master!
* add a which enum
* default to pid
* revert
* update refs
* not needed, but consistent
* just Ecu
* don't need to do this in this pr
* clean up
* no cast
* consistent typing
* rm
* fix
* can do this if we're desperate for the last few %
* Revert "can do this if we're desperate for the last few %"
This reverts commit 18e11ac7883a0a56583750b1cc5a2b13011e7299.
* type this
* don't need to convert carControl
* i guess don't support set either
* fix CP type hint
* simplify that
1 year ago
|
|
|
new_actuators = copy.copy(CC.actuators)
|
|
|
|
new_actuators.accel = torque_l
|
|
|
|
new_actuators.steer = torque_r
|
|
|
|
new_actuators.steerOutputCan = torque_r
|
|
|
|
|
|
|
|
self.frame += 1
|
|
|
|
return new_actuators, can_sends
|