mirror of
https://github.com/sunnypilot/sunnypilot.git
synced 2026-02-24 10:03:53 +08:00
8fc38619c0
* min_steer_speed alert (with adjusted hysteresis) for all cars, abstracted gas pre_enable event
* move lines a bit
* more GM cleanup
* typo
* move espDisabled to carState packet
* brought back min steer speed alert only in hyundai. It's a bit tricky and behavior should be changed
* ops, wrong change
* bug
* update cereal
* update ref
old-commit-hash: 9685a5a743
125 lines
5.2 KiB
Python
125 lines
5.2 KiB
Python
from cereal import car
|
|
from common.numpy_fast import mean
|
|
from selfdrive.config import Conversions as CV
|
|
from opendbc.can.can_define import CANDefine
|
|
from opendbc.can.parser import CANParser
|
|
from selfdrive.car.interfaces import CarStateBase
|
|
from selfdrive.car.gm.values import DBC, CAR, AccState, CanBus, \
|
|
CruiseButtons, is_eps_status_ok, \
|
|
STEER_THRESHOLD, SUPERCRUISE_CARS
|
|
|
|
|
|
class CarState(CarStateBase):
|
|
def __init__(self, CP):
|
|
super().__init__(CP)
|
|
can_define = CANDefine(DBC[CP.carFingerprint]['pt'])
|
|
self.shifter_values = can_define.dv["ECMPRDNL"]["PRNDL"]
|
|
|
|
def update(self, pt_cp):
|
|
ret = car.CarState.new_message()
|
|
|
|
self.prev_cruise_buttons = self.cruise_buttons
|
|
self.cruise_buttons = pt_cp.vl["ASCMSteeringButton"]['ACCButtons']
|
|
|
|
ret.wheelSpeeds.fl = pt_cp.vl["EBCMWheelSpdFront"]['FLWheelSpd'] * CV.KPH_TO_MS
|
|
ret.wheelSpeeds.fr = pt_cp.vl["EBCMWheelSpdFront"]['FRWheelSpd'] * CV.KPH_TO_MS
|
|
ret.wheelSpeeds.rl = pt_cp.vl["EBCMWheelSpdRear"]['RLWheelSpd'] * CV.KPH_TO_MS
|
|
ret.wheelSpeeds.rr = pt_cp.vl["EBCMWheelSpdRear"]['RRWheelSpd'] * CV.KPH_TO_MS
|
|
ret.vEgoRaw = mean([ret.wheelSpeeds.fl, ret.wheelSpeeds.fr, ret.wheelSpeeds.rl, ret.wheelSpeeds.rr])
|
|
ret.vEgo, ret.aEgo = self.update_speed_kf(ret.vEgoRaw)
|
|
ret.standstill = ret.vEgoRaw < 0.01
|
|
|
|
ret.steeringAngle = pt_cp.vl["PSCMSteeringAngle"]['SteeringWheelAngle']
|
|
ret.gearShifter = self.parse_gear_shifter(self.shifter_values.get(pt_cp.vl["ECMPRDNL"]['PRNDL'], None))
|
|
ret.brake = pt_cp.vl["EBCMBrakePedalPosition"]['BrakePedalPosition'] / 0xd0
|
|
# Brake pedal's potentiometer returns near-zero reading even when pedal is not pressed.
|
|
if ret.brake < 10/0xd0:
|
|
ret.brake = 0.
|
|
|
|
ret.gas = pt_cp.vl["AcceleratorPedal"]['AcceleratorPedal'] / 254.
|
|
ret.gasPressed = ret.gas > 1e-5
|
|
|
|
ret.steeringTorque = pt_cp.vl["PSCMStatus"]['LKADriverAppldTrq']
|
|
ret.steeringPressed = abs(ret.steeringTorque) > STEER_THRESHOLD
|
|
|
|
# 1 - open, 0 - closed
|
|
ret.doorOpen = (pt_cp.vl["BCMDoorBeltStatus"]['FrontLeftDoor'] == 1 or
|
|
pt_cp.vl["BCMDoorBeltStatus"]['FrontRightDoor'] == 1 or
|
|
pt_cp.vl["BCMDoorBeltStatus"]['RearLeftDoor'] == 1 or
|
|
pt_cp.vl["BCMDoorBeltStatus"]['RearRightDoor'] == 1)
|
|
|
|
# 1 - latched
|
|
ret.seatbeltUnlatched = pt_cp.vl["BCMDoorBeltStatus"]['LeftSeatBelt'] == 0
|
|
ret.leftBlinker = pt_cp.vl["BCMTurnSignals"]['TurnSignals'] == 1
|
|
ret.rightBlinker = pt_cp.vl["BCMTurnSignals"]['TurnSignals'] == 2
|
|
|
|
if self.car_fingerprint in SUPERCRUISE_CARS:
|
|
self.park_brake = False
|
|
ret.cruiseState.available = False
|
|
ret.espDisabled = False
|
|
regen_pressed = False
|
|
self.pcm_acc_status = int(pt_cp.vl["ASCMActiveCruiseControlStatus"]['ACCCmdActive'])
|
|
else:
|
|
self.park_brake = pt_cp.vl["EPBStatus"]['EPBClosed']
|
|
ret.cruiseState.available = bool(pt_cp.vl["ECMEngineStatus"]['CruiseMainOn'])
|
|
ret.espDisabled = pt_cp.vl["ESPStatus"]['TractionControlOn'] != 1
|
|
self.pcm_acc_status = pt_cp.vl["AcceleratorPedal2"]['CruiseState']
|
|
if self.car_fingerprint == CAR.VOLT:
|
|
regen_pressed = bool(pt_cp.vl["EBCMRegenPaddle"]['RegenPaddle'])
|
|
else:
|
|
regen_pressed = False
|
|
|
|
# Regen braking is braking
|
|
ret.brakePressed = ret.brake > 1e-5 or regen_pressed
|
|
ret.cruiseState.enabled = self.pcm_acc_status != AccState.OFF
|
|
ret.cruiseState.standstill = self.pcm_acc_status == AccState.STANDSTILL
|
|
|
|
# 0 - inactive, 1 - active, 2 - temporary limited, 3 - failed
|
|
self.lkas_status = pt_cp.vl["PSCMStatus"]['LKATorqueDeliveredStatus']
|
|
self.steer_warning = not is_eps_status_ok(self.lkas_status, self.car_fingerprint)
|
|
|
|
return ret
|
|
|
|
@staticmethod
|
|
def get_can_parser(CP):
|
|
# this function generates lists for signal, messages and initial values
|
|
signals = [
|
|
# sig_name, sig_address, default
|
|
("BrakePedalPosition", "EBCMBrakePedalPosition", 0),
|
|
("FrontLeftDoor", "BCMDoorBeltStatus", 0),
|
|
("FrontRightDoor", "BCMDoorBeltStatus", 0),
|
|
("RearLeftDoor", "BCMDoorBeltStatus", 0),
|
|
("RearRightDoor", "BCMDoorBeltStatus", 0),
|
|
("LeftSeatBelt", "BCMDoorBeltStatus", 0),
|
|
("RightSeatBelt", "BCMDoorBeltStatus", 0),
|
|
("TurnSignals", "BCMTurnSignals", 0),
|
|
("AcceleratorPedal", "AcceleratorPedal", 0),
|
|
("ACCButtons", "ASCMSteeringButton", CruiseButtons.UNPRESS),
|
|
("SteeringWheelAngle", "PSCMSteeringAngle", 0),
|
|
("FLWheelSpd", "EBCMWheelSpdFront", 0),
|
|
("FRWheelSpd", "EBCMWheelSpdFront", 0),
|
|
("RLWheelSpd", "EBCMWheelSpdRear", 0),
|
|
("RRWheelSpd", "EBCMWheelSpdRear", 0),
|
|
("PRNDL", "ECMPRDNL", 0),
|
|
("LKADriverAppldTrq", "PSCMStatus", 0),
|
|
("LKATorqueDeliveredStatus", "PSCMStatus", 0),
|
|
]
|
|
|
|
if CP.carFingerprint == CAR.VOLT:
|
|
signals += [
|
|
("RegenPaddle", "EBCMRegenPaddle", 0),
|
|
]
|
|
if CP.carFingerprint in SUPERCRUISE_CARS:
|
|
signals += [
|
|
("ACCCmdActive", "ASCMActiveCruiseControlStatus", 0)
|
|
]
|
|
else:
|
|
signals += [
|
|
("TractionControlOn", "ESPStatus", 0),
|
|
("EPBClosed", "EPBStatus", 0),
|
|
("CruiseMainOn", "ECMEngineStatus", 0),
|
|
("CruiseState", "AcceleratorPedal2", 0),
|
|
]
|
|
|
|
return CANParser(DBC[CP.carFingerprint]['pt'], signals, [], CanBus.POWERTRAIN)
|