Skip to content

Commit 40a1d39

Browse files
committed
setup steerFaultTemp
1 parent 30bf3fc commit 40a1d39

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

selfdrive/car/volkswagen/carcontroller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def update(self, CC, CS, ext_bus, now_nanos, frogpilot_variables):
3939
# 8 = standby
4040
# 6 = active
4141
# 4 = activatable, entry request signal
42-
if CC.latActive and not CS.PLA_driverCancel:
42+
if CC.latActive:
4343
self.PLA_status = 6 if self.PLA_entryCounter >= 11 else 4
4444
self.PLA_entryCounter += 1 if self.PLA_entryCounter <= 11 else self.PLA_entryCounter
4545
else:

selfdrive/car/volkswagen/carstate.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ def __init__(self, CP):
1717
self.esp_hold_confirmation = False
1818
self.upscale_lead_car_signal = False
1919
self.eps_stock_values = False
20-
self.PLA_driverCancel = False
2120

2221
def create_button_events(self, pt_cp, buttons):
2322
button_events = []
@@ -181,8 +180,7 @@ def update_pq(self, pt_cp, cam_cp, ext_cp, trans_type, frogpilot_variables):
181180
ret.steeringPressed = abs(ret.steeringTorque) > self.CCP.STEER_DRIVER_ALLOWANCE
182181
ret.yawRate = pt_cp.vl["Bremse_5"]["Giergeschwindigkeit"] * (1, -1)[int(pt_cp.vl["Bremse_5"]["Vorzeichen_der_Giergeschwindigk"])] * CV.DEG_TO_RAD
183182
hca_status = self.CCP.hca_status_values.get(pt_cp.vl["Lenkhilfe_2"]["LH2_Sta_HCA"])
184-
self.PLA_driverCancel = True if pt_cp.vl["Lenkhilfe_2"]["LH2_PLA_Abbr"] == 2 else False
185-
ret.steerFaultTemporary, ret.steerFaultPermanent = self.update_hca_state(hca_status)
183+
ret.steerFaultTemporary = True if pt_cp.vl["Lenkhilfe_2"]["LH2_PLA_Abbr"] == 2 else False
186184

187185
# Update gas, brakes, and gearshift.
188186
ret.gas = pt_cp.vl["Motor_3"]["Fahrpedal_Rohsignal"] / 100.0

0 commit comments

Comments
 (0)