sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "stash"

Browse Source 
This reverts commit c1762af4e7.
pull/33208/head
Shane Smiskol 1 year ago
parent c1762af4e7
commit 7558a02c91
3 changed files with 83 additions and 198 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 112
      selfdrive/car/car_specific.py
  2. 3
      selfdrive/car/card.py
  3. 166
      selfdrive/car/interfaces.py

112
selfdrive/car/car_specific.py
Unescape View File

@ -1,112 +0,0 @@
import copy
import json
import os
import numpy as np
import tomllib
from abc import abstractmethod, ABC
from enum import StrEnum
from typing import Any, NamedTuple
from collections.abc import Callable
from functools import cache
from cereal import car
from openpilot.common.basedir import BASEDIR
from openpilot.common.simple_kalman import KF1D, get_kalman_gain
from openpilot.selfdrive.car import DT_CTRL, apply_hysteresis, gen_empty_fingerprint, scale_rot_inertia, scale_tire_stiffness, get_friction, STD_CARGO_KG
from openpilot.selfdrive.car import structs
from openpilot.selfdrive.car.interfaces import MAX_CTRL_SPEED
from openpilot.selfdrive.car.can_definitions import CanData, CanRecvCallable, CanSendCallable
from openpilot.selfdrive.car.conversions import Conversions as CV
from openpilot.selfdrive.car.helpers import clip
from openpilot.selfdrive.car.values import PLATFORMS
from openpilot.selfdrive.controls.lib.events import Events
ButtonType = structs.CarState.ButtonEvent.Type
GearShifter = structs.CarState.GearShifter
EventName = car.CarEvent.EventName
def create_common_events(CP: structs.CarParams, cs_out, extra_gears=None, pcm_enable=True, allow_enable=True,
enable_buttons=(ButtonType.accelCruise, ButtonType.decelCruise)):
events = Events()
if cs_out.doorOpen:
events.add(EventName.doorOpen)
if cs_out.seatbeltUnlatched:
events.add(EventName.seatbeltNotLatched)
if cs_out.gearShifter != GearShifter.drive and (extra_gears is None or
cs_out.gearShifter not in extra_gears):
events.add(EventName.wrongGear)
if cs_out.gearShifter == GearShifter.reverse:
events.add(EventName.reverseGear)
if not cs_out.cruiseState.available:
events.add(EventName.wrongCarMode)
if cs_out.espDisabled:
events.add(EventName.espDisabled)
if cs_out.espActive:
events.add(EventName.espActive)
if cs_out.stockFcw:
events.add(EventName.stockFcw)
if cs_out.stockAeb:
events.add(EventName.stockAeb)
if cs_out.vEgo > MAX_CTRL_SPEED:
events.add(EventName.speedTooHigh)
if cs_out.cruiseState.nonAdaptive:
events.add(EventName.wrongCruiseMode)
if cs_out.brakeHoldActive and CP.openpilotLongitudinalControl:
events.add(EventName.brakeHold)
if cs_out.parkingBrake:
events.add(EventName.parkBrake)
if cs_out.accFaulted:
events.add(EventName.accFaulted)
if cs_out.steeringPressed:
events.add(EventName.steerOverride)
if cs_out.brakePressed and cs_out.standstill:
events.add(EventName.preEnableStandstill)
if cs_out.gasPressed:
events.add(EventName.gasPressedOverride)
if cs_out.vehicleSensorsInvalid:
events.add(EventName.vehicleSensorsInvalid)
# Handle button presses
for b in cs_out.buttonEvents:
# Enable OP long on falling edge of enable buttons (defaults to accelCruise and decelCruise, overridable per-port)
if not CP.pcmCruise and (b.type in enable_buttons and not b.pressed):
events.add(EventName.buttonEnable)
# Disable on rising and falling edge of cancel for both stock and OP long
if b.type == ButtonType.cancel:
events.add(EventName.buttonCancel)
# Handle permanent and temporary steering faults
self.steering_unpressed = 0 if cs_out.steeringPressed else self.steering_unpressed + 1
if cs_out.steerFaultTemporary:
if cs_out.steeringPressed and (not self.CS.out.steerFaultTemporary or self.no_steer_warning):
self.no_steer_warning = True
else:
self.no_steer_warning = False
# if the user overrode recently, show a less harsh alert
if self.silent_steer_warning or cs_out.standstill or self.steering_unpressed < int(1.5 / DT_CTRL):
self.silent_steer_warning = True
events.add(EventName.steerTempUnavailableSilent)
else:
events.add(EventName.steerTempUnavailable)
else:
self.no_steer_warning = False
self.silent_steer_warning = False
if cs_out.steerFaultPermanent:
events.add(EventName.steerUnavailable)
# we engage when pcm is active (rising edge)
# enabling can optionally be blocked by the car interface
if pcm_enable:
if cs_out.cruiseState.enabled and not self.CS.out.cruiseState.enabled and allow_enable:
events.add(EventName.pcmEnable)
elif not cs_out.cruiseState.enabled:
events.add(EventName.pcmDisable)
return events
def create_car_events(CP: structs.CarParams, cs_out: car.CarState):
events = create_common_events(CP, cs_out)

3
selfdrive/car/card.py
Unescape View File

@ -17,7 +17,6 @@ from openpilot.common.swaglog import cloudlog, ForwardingHandler
from openpilot.selfdrive.pandad import can_capnp_to_list, can_list_to_can_capnp from openpilot.selfdrive.pandad import can_capnp_to_list, can_list_to_can_capnp
from openpilot.selfdrive.car import DT_CTRL, carlog, structs from openpilot.selfdrive.car import DT_CTRL, carlog, structs
from openpilot.selfdrive.car.can_definitions import CanData, CanRecvCallable, CanSendCallable from openpilot.selfdrive.car.can_definitions import CanData, CanRecvCallable, CanSendCallable
from openpilot.selfdrive.car.car_specific import create_car_events
from openpilot.selfdrive.car.fw_versions import ObdCallback from openpilot.selfdrive.car.fw_versions import ObdCallback
from openpilot.selfdrive.car.car_helpers import get_car from openpilot.selfdrive.car.car_helpers import get_car
from openpilot.selfdrive.car.interfaces import CarInterfaceBase from openpilot.selfdrive.car.interfaces import CarInterfaceBase
@ -201,8 +200,6 @@ class Car:
# self.events.add_from_msg(CS.events) # self.events.add_from_msg(CS.events)
car_events = create_car_events(self.CP)
if self.CP.notCar: if self.CP.notCar:
# wait for everything to init first # wait for everything to init first
if self.sm.frame > int(5. / DT_CTRL) and self.initialized_prev: if self.sm.frame > int(5. / DT_CTRL) and self.initialized_prev:

166
selfdrive/car/interfaces.py
Unescape View File

@ -12,8 +12,8 @@ from functools import cache
from cereal import car from cereal import car
from openpilot.common.basedir import BASEDIR from openpilot.common.basedir import BASEDIR
from openpilot.common.simple_kalman import KF1D, get_kalman_gain from openpilot.common.simple_kalman import KF1D, get_kalman_gain
from openpilot.selfdrive.car import DT_CTRL, apply_hysteresis, gen_empty_fingerprint, scale_rot_inertia, scale_tire_stiffness, get_friction, structs, \ from openpilot.selfdrive.car import DT_CTRL, apply_hysteresis, gen_empty_fingerprint, scale_rot_inertia, scale_tire_stiffness, get_friction, STD_CARGO_KG
STD_CARGO_KG from openpilot.selfdrive.car import structs
from openpilot.selfdrive.car.can_definitions import CanData, CanRecvCallable, CanSendCallable from openpilot.selfdrive.car.can_definitions import CanData, CanRecvCallable, CanSendCallable
from openpilot.selfdrive.car.conversions import Conversions as CV from openpilot.selfdrive.car.conversions import Conversions as CV
from openpilot.selfdrive.car.helpers import clip from openpilot.selfdrive.car.helpers import clip
@ -258,92 +258,92 @@ class CarInterfaceBase(ABC):
ret.cruiseState.speedCluster = ret.cruiseState.speed ret.cruiseState.speedCluster = ret.cruiseState.speed
# copy back for next iteration # copy back for next iteration
# TODO: do we need to copy?
if self.CS is not None: if self.CS is not None:
self.CS.out = copy.deepcopy(ret) self.CS.out = copy.deepcopy(ret)
return ret return ret
# def create_common_events(self, cs_out, extra_gears=None, pcm_enable=True, allow_enable=True,
# enable_buttons=(ButtonType.accelCruise, ButtonType.decelCruise)): def create_common_events(self, cs_out, extra_gears=None, pcm_enable=True, allow_enable=True,
# events = Events() enable_buttons=(ButtonType.accelCruise, ButtonType.decelCruise)):
# events = Events()
# if cs_out.doorOpen:
# events.add(EventName.doorOpen) if cs_out.doorOpen:
# if cs_out.seatbeltUnlatched: events.add(EventName.doorOpen)
# events.add(EventName.seatbeltNotLatched) if cs_out.seatbeltUnlatched:
# if cs_out.gearShifter != GearShifter.drive and (extra_gears is None or events.add(EventName.seatbeltNotLatched)
# cs_out.gearShifter not in extra_gears): if cs_out.gearShifter != GearShifter.drive and (extra_gears is None or
# events.add(EventName.wrongGear) cs_out.gearShifter not in extra_gears):
# if cs_out.gearShifter == GearShifter.reverse: events.add(EventName.wrongGear)
# events.add(EventName.reverseGear) if cs_out.gearShifter == GearShifter.reverse:
# if not cs_out.cruiseState.available: events.add(EventName.reverseGear)
# events.add(EventName.wrongCarMode) if not cs_out.cruiseState.available:
# if cs_out.espDisabled: events.add(EventName.wrongCarMode)
# events.add(EventName.espDisabled) if cs_out.espDisabled:
# if cs_out.espActive: events.add(EventName.espDisabled)
# events.add(EventName.espActive) if cs_out.espActive:
# if cs_out.stockFcw: events.add(EventName.espActive)
# events.add(EventName.stockFcw) if cs_out.stockFcw:
# if cs_out.stockAeb: events.add(EventName.stockFcw)
# events.add(EventName.stockAeb) if cs_out.stockAeb:
# if cs_out.vEgo > MAX_CTRL_SPEED: events.add(EventName.stockAeb)
# events.add(EventName.speedTooHigh) if cs_out.vEgo > MAX_CTRL_SPEED:
# if cs_out.cruiseState.nonAdaptive: events.add(EventName.speedTooHigh)
# events.add(EventName.wrongCruiseMode) if cs_out.cruiseState.nonAdaptive:
# if cs_out.brakeHoldActive and self.CP.openpilotLongitudinalControl: events.add(EventName.wrongCruiseMode)
# events.add(EventName.brakeHold) if cs_out.brakeHoldActive and self.CP.openpilotLongitudinalControl:
# if cs_out.parkingBrake: events.add(EventName.brakeHold)
# events.add(EventName.parkBrake) if cs_out.parkingBrake:
# if cs_out.accFaulted: events.add(EventName.parkBrake)
# events.add(EventName.accFaulted) if cs_out.accFaulted:
# if cs_out.steeringPressed: events.add(EventName.accFaulted)
# events.add(EventName.steerOverride) if cs_out.steeringPressed:
# if cs_out.brakePressed and cs_out.standstill: events.add(EventName.steerOverride)
# events.add(EventName.preEnableStandstill) if cs_out.brakePressed and cs_out.standstill:
# if cs_out.gasPressed: events.add(EventName.preEnableStandstill)
# events.add(EventName.gasPressedOverride) if cs_out.gasPressed:
# if cs_out.vehicleSensorsInvalid: events.add(EventName.gasPressedOverride)
# events.add(EventName.vehicleSensorsInvalid) if cs_out.vehicleSensorsInvalid:
# events.add(EventName.vehicleSensorsInvalid)
# # Handle button presses
# for b in cs_out.buttonEvents: # Handle button presses
# # Enable OP long on falling edge of enable buttons (defaults to accelCruise and decelCruise, overridable per-port) for b in cs_out.buttonEvents:
# if not self.CP.pcmCruise and (b.type in enable_buttons and not b.pressed): # Enable OP long on falling edge of enable buttons (defaults to accelCruise and decelCruise, overridable per-port)
# events.add(EventName.buttonEnable) if not self.CP.pcmCruise and (b.type in enable_buttons and not b.pressed):
# # Disable on rising and falling edge of cancel for both stock and OP long events.add(EventName.buttonEnable)
# if b.type == ButtonType.cancel: # Disable on rising and falling edge of cancel for both stock and OP long
# events.add(EventName.buttonCancel) if b.type == ButtonType.cancel:
# events.add(EventName.buttonCancel)
# # Handle permanent and temporary steering faults
# self.steering_unpressed = 0 if cs_out.steeringPressed else self.steering_unpressed + 1 # Handle permanent and temporary steering faults
# if cs_out.steerFaultTemporary: self.steering_unpressed = 0 if cs_out.steeringPressed else self.steering_unpressed + 1
# if cs_out.steeringPressed and (not self.CS.out.steerFaultTemporary or self.no_steer_warning): if cs_out.steerFaultTemporary:
# self.no_steer_warning = True if cs_out.steeringPressed and (not self.CS.out.steerFaultTemporary or self.no_steer_warning):
# else: self.no_steer_warning = True
# self.no_steer_warning = False else:
# self.no_steer_warning = False
# # if the user overrode recently, show a less harsh alert
# if self.silent_steer_warning or cs_out.standstill or self.steering_unpressed < int(1.5 / DT_CTRL): # if the user overrode recently, show a less harsh alert
# self.silent_steer_warning = True if self.silent_steer_warning or cs_out.standstill or self.steering_unpressed < int(1.5 / DT_CTRL):
# events.add(EventName.steerTempUnavailableSilent) self.silent_steer_warning = True
# else: events.add(EventName.steerTempUnavailableSilent)
# events.add(EventName.steerTempUnavailable) else:
# else: events.add(EventName.steerTempUnavailable)
# self.no_steer_warning = False else:
# self.silent_steer_warning = False self.no_steer_warning = False
# if cs_out.steerFaultPermanent: self.silent_steer_warning = False
# events.add(EventName.steerUnavailable) if cs_out.steerFaultPermanent:
# events.add(EventName.steerUnavailable)
# # we engage when pcm is active (rising edge)
# # enabling can optionally be blocked by the car interface # we engage when pcm is active (rising edge)
# if pcm_enable: # enabling can optionally be blocked by the car interface
# if cs_out.cruiseState.enabled and not self.CS.out.cruiseState.enabled and allow_enable: if pcm_enable:
# events.add(EventName.pcmEnable) if cs_out.cruiseState.enabled and not self.CS.out.cruiseState.enabled and allow_enable:
# elif not cs_out.cruiseState.enabled: events.add(EventName.pcmEnable)
# events.add(EventName.pcmDisable) elif not cs_out.cruiseState.enabled:
# events.add(EventName.pcmDisable)
# return events
return events
class RadarInterfaceBase(ABC): class RadarInterfaceBase(ABC):

Write Preview
Loading…
Cancel
Save