mawei/openpilot-evo
1
0
Fork 0
mirror of https://github.com/infiniteCable2/openpilot.git synced 2026-10-01 03:53:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "capnp: consolidate TurnDirection enum" (#1376)

Browse Source 
Revert "capnp: consolidate TurnDirection enum (#1370)"

This reverts commit 7229c7541e.
This commit is contained in:
Jason Wen
2025-10-14 00:19:21 -04:00
committed by GitHub
parent 59c64acc29
commit 339bc0b8b3
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/controls/lib/desire_helper.py
+5 -5
View File
@@ -32,9 +32,9 @@ DESIRES = {
}
TURN_DESIRES = {
custom.ModelDataV2SP.TurnDirection.none: log.Desire.none,
custom.ModelDataV2SP.TurnDirection.turnLeft: log.Desire.turnLeft,
custom.ModelDataV2SP.TurnDirection.turnRight: log.Desire.turnRight,
custom.TurnDirection.none: log.Desire.none,
custom.TurnDirection.turnLeft: log.Desire.turnLeft,
custom.TurnDirection.turnRight: log.Desire.turnRight,
}
@@ -49,7 +49,7 @@ class DesireHelper:
self.desire = log.Desire.none
self.alc = AutoLaneChangeController(self)
self.lane_turn_controller = LaneTurnController(self)
self.lane_turn_direction = custom.ModelDataV2SP.TurnDirection.none
self.lane_turn_direction = custom.TurnDirection.none
@staticmethod
def get_lane_change_direction(CS):
@@ -126,7 +126,7 @@ class DesireHelper:
self.prev_one_blinker = one_blinker
if self.lane_turn_direction != custom.ModelDataV2SP.TurnDirection.none:
if self.lane_turn_direction != custom.TurnDirection.none:
self.desire = TURN_DESIRES[self.lane_turn_direction]
else:
self.desire = DESIRES[self.lane_change_direction][self.lane_change_state]