mirror of
https://github.com/firestar5683/StarPilot.git
synced 2026-09-11 10:43:46 +08:00
Honda: clean Alpha Long arbitration tests
Keep the imported Bosch arbitration focused on executable behavior and concise tests.
This commit is contained in:
committed by
firestar5683
parent
a3d8c8948e
commit
340d225039
@@ -78,12 +78,9 @@ def create_acc_commands(packer, CAN, enabled, active, accel, gas, stopping_count
|
||||
control_on = 5 if enabled else 0
|
||||
if gas_force is None:
|
||||
gas_force = accel
|
||||
# Ordinary Bosch mode is selected from road-load-adjusted gas_force in
|
||||
# CarController. A None value retains the separate MVL crossover behavior.
|
||||
if braking is None:
|
||||
braking = gas_force < min_gas_accel
|
||||
braking = int(active and braking)
|
||||
# Enforce actuator mutual exclusion again at the final CAN boundary.
|
||||
gas_command = gas if active and gas_force > min_gas_accel and not braking else -30000
|
||||
accel_command = accel if active else 0
|
||||
standstill = 1 if active and stopping_counter > 0 else 0
|
||||
|
||||
@@ -43,10 +43,6 @@ class TestHondaFingerprint:
|
||||
return commands[-1][2]
|
||||
|
||||
def test_bosch_acc_commands_reject_fault_route_gas_brake_conflict(self):
|
||||
# Route 00000002--aa8501ddcb broadcast P061B while Alpha Long sent
|
||||
# approximately accel=-0.27, positive gas, and both brake bits. Drag/grade
|
||||
# compensation calculated positive gas, so same-domain arbitration keeps
|
||||
# propulsion without reproducing the simultaneous request.
|
||||
braking = update_honda_bosch_braking(False, 0.2, False, True)
|
||||
values = self._acc_control_values(True, -0.27, gas=160, gas_force=0.2, braking=braking)
|
||||
|
||||
@@ -68,8 +64,6 @@ class TestHondaFingerprint:
|
||||
assert active
|
||||
|
||||
def test_bosch_acc_commands_preserve_road_load_gas_above_brake_threshold(self):
|
||||
# Suppressing this positive drag/grade-compensated gas from raw accel
|
||||
# causes the acceleration/coast cycle seen in full E2E road testing.
|
||||
values = self._acc_control_values(True, -0.27, gas=500, gas_force=0.3)
|
||||
|
||||
assert values["GAS_COMMAND"] == 500
|
||||
|
||||
Reference in New Issue
Block a user