mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-08-08 12:55:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

brakeLights -> brakeLightsDEPRECATED

Browse Source
This commit is contained in:
DevTekVE
2023-10-16 06:10:29 +00:00
committed by Jason Wen
parent 6a730bd8dd
commit 2559c299cd
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/car/chrysler/carstate.py
+1 -1
View File
@@ -46,7 +46,7 @@ class CarState(CarStateBase):
# brake pedal
ret.brake = 0
ret.brakePressed = cp.vl["ESP_1"]['Brake_Pedal_State'] == 1 # Physical brake pedal switch
ret.brakeLights = bool(cp.vl["ESP_1"]["BRAKE_PRESSED_ACC"])
ret.brakeLightsDEPRECATED = bool(cp.vl["ESP_1"]["BRAKE_PRESSED_ACC"])
# gas pedal
ret.gas = cp.vl["ECM_5"]["Accelerator_Position"]
selfdrive/car/honda/carstate.py
+2 -2
View File
@@ -248,11 +248,11 @@ class CarState(CarStateBase):
if self.CP.carFingerprint in (CAR.CIVIC, CAR.ODYSSEY, CAR.ODYSSEY_CHN, CAR.CRV_5G, CAR.ACCORD, CAR.ACCORDH, CAR.CIVIC_BOSCH,
CAR.CIVIC_BOSCH_DIESEL, CAR.CRV_HYBRID, CAR.INSIGHT, CAR.ACURA_RDX_3G, CAR.HONDA_E):
ret.brakeLights = bool(cp.vl["ACC_CONTROL"]['BRAKE_LIGHTS'] != 0 or ret.brake > 0.4) if not self.CP.openpilotLongitudinalControl else \
ret.brakeLightsDEPRECATED = bool(cp.vl["ACC_CONTROL"]['BRAKE_LIGHTS'] != 0 or ret.brake > 0.4) if not self.CP.openpilotLongitudinalControl else \
bool(ret.brake > 0.4)
elif self.CP.carFingerprint in HONDA_BOSCH and self.CP.carFingerprint not in (CAR.CIVIC, CAR.ODYSSEY, CAR.ODYSSEY_CHN, CAR.CRV_5G, CAR.ACCORD, CAR.ACCORDH, CAR.CIVIC_BOSCH,
CAR.CIVIC_BOSCH_DIESEL, CAR.CRV_HYBRID, CAR.INSIGHT, CAR.ACURA_RDX_3G, CAR.HONDA_E) and self.CP.carFingerprint not in HONDA_BOSCH_RADARLESS:
ret.brakeLights = bool(cp.vl["ACC_CONTROL"]['BRAKE_LIGHTS'] != 0 or ret.brake > 0.4) if not self.CP.openpilotLongitudinalControl else \
ret.brakeLightsDEPRECATED = bool(cp.vl["ACC_CONTROL"]['BRAKE_LIGHTS'] != 0 or ret.brake > 0.4) if not self.CP.openpilotLongitudinalControl else \
bool(ret.brake > 0.4)
if self.CP.carFingerprint in HONDA_BOSCH:
selfdrive/car/hyundai/carstate.py
+2 -2
View File
@@ -134,7 +134,7 @@ class CarState(CarStateBase):
ret.brakePressed = cp.vl["TCS13"]["DriverBraking"] != 0
ret.brakeHoldActive = cp.vl["TCS15"]["AVH_LAMP"] == 2 # 0 OFF, 1 ERROR, 2 ACTIVE, 3 READY
ret.parkingBrake = cp.vl["TCS13"]["PBRAKE_ACT"] == 1
ret.brakeLights = bool(cp.vl["TCS13"]["BrakeLight"])
ret.brakeLightsDEPRECATED = bool(cp.vl["TCS13"]["BrakeLight"])
ret.accFaulted = cp.vl["TCS13"]["ACCEnable"] != 0 # 0 ACC CONTROL ENABLED, 1-3 ACC CONTROL DISABLED
if self.CP.carFingerprint in (HYBRID_CAR | EV_CAR):
@@ -229,7 +229,7 @@ class CarState(CarStateBase):
else:
ret.gasPressed = bool(cp.vl[self.accelerator_msg_canfd]["ACCELERATOR_PEDAL_PRESSED"])
ret.brakePressed = ret.brakeLights = cp.vl["TCS"]["DriverBraking"] == 1
ret.brakePressed = ret.brakeLightsDEPRECATED = cp.vl["TCS"]["DriverBraking"] == 1
ret.doorOpen = cp.vl["DOORS_SEATBELTS"]["DRIVER_DOOR"] == 1
ret.seatbeltUnlatched = cp.vl["DOORS_SEATBELTS"]["DRIVER_SEATBELT"] == 0
selfdrive/car/interfaces.py
+1 -1
View File
@@ -448,7 +448,7 @@ class CarInterfaceBase(ABC):
cs_out.madsEnabled = CS.madsEnabled
cs_out.accEnabled = CS.accEnabled
cs_out.disengageByBrake = CS.disengageByBrake
cs_out.brakeLights |= cs_out.brakePressed or cs_out.brakeHoldActive or cs_out.parkingBrake or cs_out.regenBraking
cs_out.brakeLightsDEPRECATED |= cs_out.brakePressed or cs_out.brakeHoldActive or cs_out.parkingBrake or cs_out.regenBraking
return cs_out, CS
selfdrive/car/subaru/carstate.py
+1 -1
View File
@@ -36,7 +36,7 @@ class CarState(CarStateBase):
brake_msg = "ES_Brake" if self.car_fingerprint in PREGLOBAL_CARS else "ES_DashStatus"
brake_sig = "Cruise_Brake_Lights" if self.car_fingerprint in PREGLOBAL_CARS else "Brake_Lights"
ret.brakeLights = bool(cp_cam.vl[brake_msg][brake_sig])
ret.brakeLightsDEPRECATED = bool(cp_cam.vl[brake_msg][brake_sig])
cp_wheels = cp_body if self.car_fingerprint in GLOBAL_GEN2 else cp
ret.wheelSpeeds = self.get_wheel_speeds(
selfdrive/car/toyota/carstate.py
+1 -1
View File
@@ -81,7 +81,7 @@ class CarState(CarStateBase):
ret.brakePressed = cp.vl["BRAKE_MODULE"]["BRAKE_PRESSED"] != 0
ret.brakeHoldActive = cp.vl["ESP_CONTROL"]["BRAKE_HOLD_ACTIVE"] == 1
ret.brakeLights = bool(cp.vl["ESP_CONTROL"]["BRAKE_LIGHTS_ACC"])
ret.brakeLightsDEPRECATED = bool(cp.vl["ESP_CONTROL"]["BRAKE_LIGHTS_ACC"])
if self.CP.enableGasInterceptor:
ret.gas = (cp.vl["GAS_SENSOR"]["INTERCEPTOR_GAS"] + cp.vl["GAS_SENSOR"]["INTERCEPTOR_GAS2"]) // 2
ret.gasPressed = ret.gas > 805
selfdrive/car/volkswagen/carstate.py
+2 -2
View File
@@ -73,7 +73,7 @@ class CarState(CarStateBase):
brake_pressure_detected = bool(pt_cp.vl["ESP_05"]["ESP_Fahrer_bremst"])
ret.brakePressed = brake_pedal_pressed or brake_pressure_detected
ret.parkingBrake = bool(pt_cp.vl["Kombi_01"]["KBI_Handbremse"]) # FIXME: need to include an EPB check as well
ret.brakeLights = bool(pt_cp.vl["ESP_05"]['ESP_Status_Bremsdruck'])
ret.brakeLightsDEPRECATED = bool(pt_cp.vl["ESP_05"]['ESP_Status_Bremsdruck'])
# Update gear and/or clutch position data.
if trans_type == TransmissionType.automatic:
@@ -201,7 +201,7 @@ class CarState(CarStateBase):
ret.brake = pt_cp.vl["Bremse_5"]["Bremsdruck"] / 250.0 # FIXME: this is pressure in Bar, not sure what OP expects
ret.brakePressed = bool(pt_cp.vl["Motor_2"]["Bremslichtschalter"])
ret.parkingBrake = bool(pt_cp.vl["Kombi_1"]["Bremsinfo"])
ret.brakeLights = bool(pt_cp.vl["Motor_2"]['Bremstestschalter'])
ret.brakeLightsDEPRECATED = bool(pt_cp.vl["Motor_2"]['Bremstestschalter'])
# Update gear and/or clutch position data.
if trans_type == TransmissionType.automatic:
selfdrive/ui/qt/onroad.cc
+2 -2
View File
@@ -559,7 +559,7 @@ void AnnotatedCameraWidget::updateState(const UIState &s) {
latActive = car_control.getLatActive();
madsEnabled = car_state.getMadsEnabled();
brakeLights = car_state.getBrakeLights() && s.scene.visual_brake_lights;
brakeLights = car_state.getBrakeLightsDEPRECATED() && s.scene.visual_brake_lights;
standStillTimer = s.scene.stand_still_timer;
standStill = car_state.getStandstill();
@@ -751,7 +751,7 @@ void AnnotatedCameraWidget::updateState(const UIState &s) {
}
}
if ((car_state.getCruiseState().getEnabled() || car_state.getBrakeLights()) && !car_state.getGasPressed() && car_state.getStandstill()) {
if ((car_state.getCruiseState().getEnabled() || car_state.getBrakeLightsDEPRECATED()) && !car_state.getGasPressed() && car_state.getStandstill()) {
if (e2eLStatus == 2 && !radar_state.getLeadOne().getStatus()) {
if (chime_sent) {
chime_count = 0;