diff --git a/openpilot/starpilot/galaxy/setting_descriptions.py b/openpilot/starpilot/galaxy/setting_descriptions.py index 3e8e2a6665..5b53f61606 100644 --- a/openpilot/starpilot/galaxy/setting_descriptions.py +++ b/openpilot/starpilot/galaxy/setting_descriptions.py @@ -50,7 +50,7 @@ DESCRIPTIONS = { 'CustomCruise': 'Sets how much a short cruise-button press changes the set speed.', 'CustomCruiseLong': 'Sets how much holding a cruise button changes the set speed.', 'ReverseCruise': 'Swaps the Toyota short-press and held-press cruise-speed increments.', - 'ForceStops': 'Commits to stops detected by the driving model. Press the accelerator to continue.', + 'ForceStops': 'Improves stopping behavior at traffic lights and enables automatic stopping at detected stop signs. Press the accelerator to continue.', 'ForceStopDistanceOffset': 'Moves the planned stopping point. Positive values stop farther forward; negative values stop earlier.', 'LeadApproachBuffer': 'Gradually adds following distance when approaching a slower or braking lead vehicle.', 'ExperimentalSpeedNudge': ('Gently recovers toward set speed when Experimental mode hesitates on a clear road. ' + diff --git a/openpilot/starpilot/galaxy/tests/test_offroad_configuration_pages.py b/openpilot/starpilot/galaxy/tests/test_offroad_configuration_pages.py index 1c363f4d01..08073f6693 100644 --- a/openpilot/starpilot/galaxy/tests/test_offroad_configuration_pages.py +++ b/openpilot/starpilot/galaxy/tests/test_offroad_configuration_pages.py @@ -108,7 +108,7 @@ class TestOffroadConfigurationPages(unittest.TestCase): 'conditional/cem': ('Speed threshold', 'Speed with lead', 'Stop lights'), 'lane_change': ('Allow lane changes', 'Minimum lane-change speed', 'Automatic Lane Changes', 'Lane Change Speed'), 'slc': ('Speed Limit Controller', 'Confirm limits'), - 'profiles': ('Force Stop', 'Selected Acceleration Profile', 'Selected Deceleration Profile'), + 'profiles': ('Enhanced Stops', 'Selected Acceleration Profile', 'Selected Deceleration Profile'), 'torque': ('Steering Controller', 'Turn Assist', 'Lat Accel', 'Friction'), 'wheel': ('Short press', 'Hold', 'Distance long press', 'MODE press', 'Star button'), } @@ -162,7 +162,7 @@ class TestOffroadConfigurationPages(unittest.TestCase): selection = self.params.get('VehicleSelection') profiles = self.page('profiles') rows = {row['label']: row for row in profiles['rows']} - self.assertTrue(rows['Force Stop']['available']) + self.assertTrue(rows['Enhanced Stops']['available']) self.assertNotIn('Short press', rows) self.assertNotIn('Hold', rows) for label, key in (('Short press', 'CustomCruise'), ('Hold', 'CustomCruiseLong')): @@ -176,7 +176,7 @@ class TestOffroadConfigurationPages(unittest.TestCase): profiles = self.page('profiles') offset = next(row for row in profiles['rows'] if row['label'] == 'Stop Distance Adjustment') self.assertFalse(offset['available']) - index = next(i for i, row in enumerate(profiles['rows']) if row['label'] == 'Force Stop') + index = next(i for i, row in enumerate(profiles['rows']) if row['label'] == 'Enhanced Stops') intent = self.gateway.preview(profiles['view'], index, 1, 'session', b'generation') self.assertTrue(self.gateway.confirm(intent['intent'], 'session', b'generation')) self.assertTrue(self.params.get_bool('ForceStops')) @@ -195,7 +195,7 @@ class TestOffroadConfigurationPages(unittest.TestCase): def test_alpha_off_allows_saved_long_preferences_without_runtime_activation(self): self.params.put_bool('AlphaLongitudinalEnabled', False, block=True) - self.assertTrue(next(row for row in self.page('profiles')['rows'] if row['label'] == 'Force Stop')['available']) + self.assertTrue(next(row for row in self.page('profiles')['rows'] if row['label'] == 'Enhanced Stops')['available']) rows = {row['label']: row for row in self.page('wheel')['rows']} for label in ('Short press', 'Hold'): self.assertTrue(rows[label]['available'], label) diff --git a/openpilot/starpilot/galaxy/tests/test_settings.py b/openpilot/starpilot/galaxy/tests/test_settings.py index 01a88f1aa9..7ef9a0eb2c 100644 --- a/openpilot/starpilot/galaxy/tests/test_settings.py +++ b/openpilot/starpilot/galaxy/tests/test_settings.py @@ -1263,7 +1263,7 @@ class SettingsGatewayTest(unittest.TestCase): self.context.value = AuthorityContext(False, cp, b"verified-cp") self.params.put_bool("ForceStops", True, block=True) page = self.page("profiles") - index = next(i for i, row in enumerate(page["rows"]) if row["label"] == "Force Stop") + index = next(i for i, row in enumerate(page["rows"]) if row["label"] == "Enhanced Stops") self.assertTrue(page["rows"][index]["available"]) intent = self.gateway.preview(page["view"], index, 0, self.session, self.generation, value="Off") with self.assertRaises(SettingsChanged): @@ -1509,7 +1509,7 @@ class SettingsHttpTest(SettingsHttpFixture): cookie = self.login() status, page, _ = self.request("/api/settings/pages/profiles", cookie=cookie) self.assertEqual(status, 200) - index = next(i for i, row in enumerate(page["rows"]) if row["label"] == "Force Stop") + index = next(i for i, row in enumerate(page["rows"]) if row["label"] == "Enhanced Stops") self.assertTrue(page["rows"][index]["available"]) status, intent, _ = self.request("/api/settings/preview", cookie=cookie, payload={"view": page["view"], "row": index, "value": "Off"}) diff --git a/openpilot/starpilot/ui/feature_settings_owner.py b/openpilot/starpilot/ui/feature_settings_owner.py index 4a2c062e8f..f414ed83a3 100644 --- a/openpilot/starpilot/ui/feature_settings_owner.py +++ b/openpilot/starpilot/ui/feature_settings_owner.py @@ -1163,9 +1163,9 @@ class FeatureSettingsOwner: reason="Off uses the upstream planner. Supported longitudinal control stays active. Changes apply on the next drive.")) allowed = configurable and system_long force_enabled, _, _ = self._value("ForceStops") - rows.append(self._bool_row("ForceStops", "Force Stop", allowed or + rows.append(self._bool_row("ForceStops", "Enhanced Stops", allowed or (force_enabled == "1" and self.authority("preferences")), - reason="Commit to detected model stops; press the accelerator to continue")) + reason="Improves stopping behavior at traffic lights and enables automatic stopping at detected stop signs. Press the accelerator to continue.")) offset_row = self._number_row("ForceStopDistanceOffset", "Stop Distance Adjustment", allowed and force_enabled == "1") rows.append(replace(offset_row, default_reset_available=allowed and parked and offset_row.step > 0, reason="Positive values stop farther forward; negative values stop earlier")) diff --git a/openpilot/starpilot/ui/translation_messages.json b/openpilot/starpilot/ui/translation_messages.json index 4699373080..f5a3357d07 100644 --- a/openpilot/starpilot/ui/translation_messages.json +++ b/openpilot/starpilot/ui/translation_messages.json @@ -3132,9 +3132,10 @@ ] }, { - "source": "Commits to stops detected by the driving model. Press the accelerator to continue.", + "source": "Improves stopping behavior at traffic lights and enables automatic stopping at detected stop signs. Press the accelerator to continue.", "refs": [ - "openpilot/starpilot/galaxy/setting_descriptions.py" + "openpilot/starpilot/galaxy/setting_descriptions.py", + "openpilot/starpilot/ui/feature_settings_owner.py" ] }, { @@ -5710,7 +5711,7 @@ ] }, { - "source": "Force Stop", + "source": "Enhanced Stops", "refs": [ "openpilot/starpilot/ui/feature_settings_owner.py" ] @@ -30478,12 +30479,6 @@ "openpilot/starpilot/ui/long_profile_feature.py" ] }, - { - "source": "Commit to detected model stops; press the accelerator to continue", - "refs": [ - "openpilot/starpilot/ui/feature_settings_owner.py" - ] - }, { "source": "Compensates steering friction. First manual activation requires a driving-process restart; an active tuning owner refreshes changes during the drive.", "refs": [ diff --git a/prebuilt.json b/prebuilt.json index 4fd16774cd..7064212fe4 100644 --- a/prebuilt.json +++ b/prebuilt.json @@ -1 +1 @@ -{"protected_inventory_sha256": "57bbab429eeb6bd56778b60714e6196dc5b06fd2c9e1fc6ba8fc4d5f050274f7", "schema_version": 1} +{"protected_inventory_sha256": "2394c80faa2fcae8943b0a27a11a52a643c83c27e64a4325dc679a5820e5fd08", "schema_version": 1}