brianhansonxyz/oscarpilot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Your Name
2024-02-05 01:50:34 -06:00
parent e55aa65d18
commit 746d9fc631
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
selfdrive/controls/lib/events.py
View File

@@ -231,7 +231,7 @@ def startup_master_alert(CP: car.CarParams, CS: car.CarState, sm: messaging.SubM
if "REPLAY" in os.environ: if "REPLAY" in os.environ:
branch = "replay" branch = "replay"
return StartupAlert("Openpilot Ready", "", alert_status=AlertStatus.frogpilot) return StartupAlert("Oscarpilot ready", "Be excellent to eachother", alert_status=AlertStatus.frogpilot)
def below_engage_speed_alert(CP: car.CarParams, CS: car.CarState, sm: messaging.SubMaster, metric: bool, soft_disable_time: int) -> Alert: def below_engage_speed_alert(CP: car.CarParams, CS: car.CarState, sm: messaging.SubMaster, metric: bool, soft_disable_time: int) -> Alert:
return NoEntryAlert(f"Drive above {get_display_speed(CP.minEnableSpeed, metric)} to engage") return NoEntryAlert(f"Drive above {get_display_speed(CP.minEnableSpeed, metric)} to engage")
@@ -373,7 +373,8 @@ EVENTS: Dict[int, Dict[str, Union[Alert, AlertCallbackType]]] = {
}, },
EventName.startupMaster: { EventName.startupMaster: {
ET.PERMANENT: startup_master_alert, # ET.PERMANENT: startup_master_alert,
ET.PERMANENT: StartupAlert("OscarPilot Ready"),
}, },
# Car is recognized, but marked as dashcam only # Car is recognized, but marked as dashcam only

2
selfdrive/frogpilot/functions/model_switcher.py
View File

@@ -27,7 +27,7 @@ def set_model_list_parameter(params):
if previous_model_list != model_list: if previous_model_list != model_list:
# Reset the selected model if the model list changed # Reset the selected model if the model list changed
params.put_int("Model", 0) params.put_int("Model", 3)
params.put("ModelList", model_list) params.put("ModelList", model_list)
params.remove("CalibrationParams"); params.remove("CalibrationParams");
params.remove("LiveTorqueParameters"); params.remove("LiveTorqueParameters");

BIN
selfdrive/modeld/models/supercombo.onnx LFS
View File

Binary file not shown.