use meter dimmer to control brightness

cydia2020 · Jan 27, 2024 · 325de7b · 325de7b
1 parent f071c3d
commit 325de7b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/cereal b/cereal
diff --git a/common/params.cc b/common/params.cc
@@ -208,6 +208,7 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"VisionRadarToggle", PERSISTENT},
     {"WheeledBody", PERSISTENT},
     {"DisplayRadarInfo", PERSISTENT}, // display radar state on onroad UI
+    {"CarBrightnessControl", PERSISTENT}, // link display brightness with combination meter
 };
 
 } // namespace

diff --git a/selfdrive/assets/offroad/icon_brightness.png b/selfdrive/assets/offroad/icon_brightness.png
diff --git a/selfdrive/car/toyota/carstate.py b/selfdrive/car/toyota/carstate.py
@@ -103,6 +103,10 @@ def update(self, cp, cp_cam):
     # brake lights
     ret.brakeLights = bool(cp.vl["ESP_CONTROL"]['BRAKE_LIGHTS_ACC'] or cp.vl["BRAKE_MODULE"]["BRAKE_PRESSED"] != 0)
 
+    # combination meter dimmer states
+    ret.meterDimmed = cp.vl["BODY_CONTROL_STATE"]['METER_DIMMED'] == 1
+    ret.meterLowBrightness = cp.vl["BODY_CONTROL_STATE_2"]["METER_SLIDER_LOW_BRIGHTNESS"] == 1
+
     # Check EPS LKA/LTA fault status
     ret.steerFaultTemporary = cp.vl["EPS_STATUS"]["LKA_STATE"] in TEMP_STEER_FAULTS
     ret.steerFaultPermanent = cp.vl["EPS_STATUS"]["LKA_STATE"] in PERM_STEER_FAULTS

diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc
@@ -77,6 +77,12 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) {
       tr("Display speed in km/h instead of mph."),
       "../assets/offroad/icon_radar.png",
     },
+    {
+      "CarBrightnessControl",
+      tr("Use Car For Backlight Control"),
+      tr("Use the car's meter dimmer state for brightness control."),
+      "../assets/offroad/icon_brightness.png",
+    },
 #ifdef ENABLE_MAPS
     {
       "NavSettingTime24h",

diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc
@@ -157,6 +157,9 @@ static void update_sockets(UIState *s) {
 static void update_state(UIState *s) {
   SubMaster &sm = *(s->sm);
   UIScene &scene = s->scene;
+  // meter dimmed and low brightness states
+  s->scene.meterDimmed = sm["carState"].getCarState().getMeterDimmed();
+  s->scene.meterLowBrightness = sm["carState"].getCarState().getMeterLowBrightness();
 
   if (sm.updated("liveCalibration")) {
     auto live_calib = sm["liveCalibration"].getLiveCalibration();
@@ -220,6 +223,7 @@ void ui_update_params(UIState *s) {
   s->scene.is_metric = params.getBool("IsMetric");
   s->scene.map_on_left = params.getBool("NavSettingLeftSide");
   s->scene.radar_state = params.getBool("DisplayRadarInfo");
+  s->scene.car_brightness = Params().getBool("CarBrightnessControl");
 }
 
 void UIState::updateStatus() {
@@ -320,22 +324,15 @@ void Device::resetInteractiveTimeout(int timeout) {
 }
 
 void Device::updateBrightness(const UIState &s) {
-  float clipped_brightness = offroad_brightness;
-  if (s.scene.started) {
-    clipped_brightness = s.scene.light_sensor;
+  int brightness;
 
-    // CIE 1931 - https://www.photonstophotos.net/GeneralTopics/Exposure/Psychometric_Lightness_and_Gamma.htm
-    if (clipped_brightness <= 8) {
-      clipped_brightness = (clipped_brightness / 903.3);
-    } else {
-      clipped_brightness = std::pow((clipped_brightness + 16.0) / 116.0, 3.0);
-    }
-
-    // Scale back to 10% to 100%
-    clipped_brightness = std::clamp(100.0f * clipped_brightness, 10.0f, 100.0f);
+  if (s.scene.car_brightness) {
+    brightness = (s.scene.started) ? (s.scene.meterDimmed) ? 50.0 : (s.scene.meterLowBrightness ? 1.0 : 100.0) : offroad_brightness;
+  } else {
+    float clipped_brightness = (s.scene.started) ? std::clamp((s.scene.light_sensor <= 8) ? (s.scene.light_sensor / 903.3) : std::pow((s.scene.light_sensor + 16.0) / 116.0, 3.0) * 100.0f, 10.0f, 100.0f) : offroad_brightness;
+    brightness = brightness_filter.update(clipped_brightness);
   }
 
-  int brightness = brightness_filter.update(clipped_brightness);
   if (!awake) {
     brightness = 0;
   }