|
|
@ -138,7 +138,7 @@ class LateralPlanner: |
|
|
|
else: |
|
|
|
else: |
|
|
|
self.lane_change_state = LaneChangeState.off |
|
|
|
self.lane_change_state = LaneChangeState.off |
|
|
|
|
|
|
|
|
|
|
|
if self.lane_change_state in [LaneChangeState.off, LaneChangeState.preLaneChange]: |
|
|
|
if self.lane_change_state in (LaneChangeState.off, LaneChangeState.preLaneChange): |
|
|
|
self.lane_change_timer = 0.0 |
|
|
|
self.lane_change_timer = 0.0 |
|
|
|
else: |
|
|
|
else: |
|
|
|
self.lane_change_timer += DT_MDL |
|
|
|
self.lane_change_timer += DT_MDL |
|
|
@ -148,13 +148,13 @@ class LateralPlanner: |
|
|
|
self.desire = DESIRES[self.lane_change_direction][self.lane_change_state] |
|
|
|
self.desire = DESIRES[self.lane_change_direction][self.lane_change_state] |
|
|
|
|
|
|
|
|
|
|
|
# Send keep pulse once per second during LaneChangeStart.preLaneChange |
|
|
|
# Send keep pulse once per second during LaneChangeStart.preLaneChange |
|
|
|
if self.lane_change_state in [LaneChangeState.off, LaneChangeState.laneChangeStarting]: |
|
|
|
if self.lane_change_state in (LaneChangeState.off, LaneChangeState.laneChangeStarting): |
|
|
|
self.keep_pulse_timer = 0.0 |
|
|
|
self.keep_pulse_timer = 0.0 |
|
|
|
elif self.lane_change_state == LaneChangeState.preLaneChange: |
|
|
|
elif self.lane_change_state == LaneChangeState.preLaneChange: |
|
|
|
self.keep_pulse_timer += DT_MDL |
|
|
|
self.keep_pulse_timer += DT_MDL |
|
|
|
if self.keep_pulse_timer > 1.0: |
|
|
|
if self.keep_pulse_timer > 1.0: |
|
|
|
self.keep_pulse_timer = 0.0 |
|
|
|
self.keep_pulse_timer = 0.0 |
|
|
|
elif self.desire in [log.LateralPlan.Desire.keepLeft, log.LateralPlan.Desire.keepRight]: |
|
|
|
elif self.desire in (log.LateralPlan.Desire.keepLeft, log.LateralPlan.Desire.keepRight): |
|
|
|
self.desire = log.LateralPlan.Desire.none |
|
|
|
self.desire = log.LateralPlan.Desire.none |
|
|
|
|
|
|
|
|
|
|
|
# Turn off lanes during lane change |
|
|
|
# Turn off lanes during lane change |
|
|
|