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

Green light alert

Browse Source 
Added toggle to alert the user when a red light turns to green.
This commit is contained in:
FrogAi
2024-02-27 16:34:47 -07:00
parent 1d3a40aa7e
commit f2cd6e256a
9 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
selfdrive/frogpilot/assets/toggle_icons/icon_green_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

9
selfdrive/frogpilot/functions/frogpilot_planner.py
View File

@@ -53,7 +53,7 @@ class FrogPilotPlanner:
self.accel_limits = [min_accel, max_accel]
# Update Conditional Experimental Mode
if self.conditional_experimental_mode and self.CP.openpilotLongitudinalControl:
if self.conditional_experimental_mode and self.CP.openpilotLongitudinalControl or self.green_light_alert and carState.standstill:
self.cem.update(carState, enabled, sm['frogpilotNavigation'], modelData, sm['radarState'], self.road_curvature, self.stop_distance, mpc.t_follow, v_ego)
# Update the current lane widths
@@ -102,6 +102,8 @@ class FrogPilotPlanner:
frogpilotPlan.laneWidthLeft = self.lane_width_left
frogpilotPlan.laneWidthRight = self.lane_width_right
frogpilotPlan.redLight = self.cem.red_light_detected
pm.send('frogpilotPlan', frogpilot_plan_send)
def update_frogpilot_params(self, params):
@@ -112,6 +114,11 @@ class FrogPilotPlanner:
self.cem.update_frogpilot_params(self.is_metric, params)
params.put_bool("ExperimentalMode", True)
custom_alerts = params.get_bool("CustomAlerts")
self.green_light_alert = custom_alerts and params.get_bool("GreenLightAlert")
if self.green_light_alert and not self.conditional_experimental_mode:
self.cem.update_frogpilot_params(self.is_metric, params)
self.custom_personalities = params.get_bool("CustomPersonalities")
self.aggressive_follow = params.get_float("AggressiveFollow")
self.standard_follow = params.get_float("StandardFollow")

1
selfdrive/frogpilot/ui/visual_settings.cc
View File

@@ -20,6 +20,7 @@ FrogPilotVisualsPanel::FrogPilotVisualsPanel(SettingsWindow *parent) : FrogPilot
{"CameraView", "Camera View", "Choose your preferred camera view for the onroad UI. This is a visual change only and doesn't impact openpilot.", "../frogpilot/assets/toggle_icons/icon_camera.png"},
{"CustomAlerts", "Custom Alerts", "Enable custom alerts for various logic or situational changes.", "../frogpilot/assets/toggle_icons/icon_green_light.png"},
{"GreenLightAlert", "Green Light Alert", "Get an alert when a traffic light changes from red to green.", ""},
{"CustomUI", "Custom Onroad UI", "Customize the Onroad UI with some additional visual functions.", "../assets/offroad/icon_road.png"},
{"AccelerationPath", "Acceleration Path", "Visualize the car's intended acceleration or deceleration with a color-coded path.", ""},

2
selfdrive/frogpilot/ui/visual_settings.h
View File

@@ -29,7 +29,7 @@ private:
void updateToggles();
std::set<QString> alertVolumeControlKeys = {"EngageVolume", "DisengageVolume", "RefuseVolume", "PromptVolume", "PromptDistractedVolume", "WarningSoftVolume", "WarningImmediateVolume"};
std::set<QString> customAlertsKeys = {};
std::set<QString> customAlertsKeys = {"GreenLightAlert"};
std::set<QString> customOnroadUIKeys = {"AccelerationPath", "AdjacentPath", "BlindSpotPath", "FPSCounter", "LeadInfo"};
std::set<QString> customThemeKeys = {"CustomColors", "CustomIcons", "CustomSignals", "CustomSounds"};
std::set<QString> modelUIKeys = {"DynamicPathWidth", "LaneLinesWidth", "PathEdgeWidth", "PathWidth", "RoadEdgesWidth", "UnlimitedLength"};