Skip to content

Commit 68cfa7c

Browse files
sshanemartinl
authored andcommitted
Revert "GM: implement allow throttle/brakes" (#1187)
Revert "GM: implement allow throttle/brakes (#1185)" This reverts commit 8e20376.
1 parent 75f4408 commit 68cfa7c

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

opendbc/car/gm/carcontroller.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,9 @@ def update(self, CC, CS, now_nanos):
9494
self.apply_brake = int(round(interp(actuators.accel, self.params.BRAKE_LOOKUP_BP, self.params.BRAKE_LOOKUP_V)))
9595
# Don't allow any gas above inactive regen while stopping
9696
# FIXME: brakes aren't applied immediately when enabling at a stop
97-
if stopping or not actuators.allowThrottle:
97+
if stopping:
9898
self.apply_gas = self.params.INACTIVE_REGEN
9999

100-
if not actuators.allowBrake:
101-
self.apply_brake = 0
102-
103100
idx = (self.frame // 4) % 4
104101

105102
at_full_stop = CC.longActive and CS.out.standstill

opendbc/car/structs.py

-3
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,6 @@ class Actuators:
220220
steerOutputCan: float = auto_field()
221221
steeringAngleDeg: float = auto_field()
222222

223-
allowBrake: bool = auto_field()
224-
allowThrottle: bool = auto_field()
225-
226223
curvature: float = auto_field()
227224

228225
speed: float = auto_field() # m/s

0 commit comments

Comments
 (0)