Configurable brightness

Author: WhatAmISupposedToPutHere

share/tiny-dfr/config.toml

@@ -29,6 +29,12 @@ FontTemplate = ":bold"
 # screen's brightness
 AdaptiveBrightness = true
 
+# With adaptive brightness disabled this is used as the brightness
+# in the active state
+# With it enabled, this is the maximum point on the brightness curve
+# Accepted values are 0-255
+ActiveBrightness = 128
+
 # This key defines the contents of the primary layer
 # (the one with F{number} keys)
 # You can change the individual buttons, add, or remove them

src/backlight.rs

@@ -15,7 +15,6 @@ const MAX_DISPLAY_BRIGHTNESS: u32 = 509;
 const MAX_TOUCH_BAR_BRIGHTNESS: u32 = 255;
 const BRIGHTNESS_DIM_TIMEOUT: i32 = TIMEOUT_MS * 3; // should be a multiple of TIMEOUT_MS
 const BRIGHTNESS_OFF_TIMEOUT: i32 = TIMEOUT_MS * 6; // should be a multiple of TIMEOUT_MS
-const DEFAULT_BRIGHTNESS: u32 = 128;
 const DIMMED_BRIGHTNESS: u32 = 1;
 
 fn read_attr(path: &Path, attr: &str) -> u32 {
@@ -71,10 +70,10 @@ impl BacklightManager {
             display_bl_path
         }
     }
-    fn display_to_touchbar(display: u32) -> u32 {
+    fn display_to_touchbar(display: u32, active_brightness: u32) -> u32 {
         let normalized = display as f64 / MAX_DISPLAY_BRIGHTNESS as f64;
         // Add one so that the touch bar does not turn off
-        let adjusted = (normalized.powf(0.5) * MAX_TOUCH_BAR_BRIGHTNESS as f64) as u32 + 1;
+        let adjusted = (normalized.powf(0.5) * active_brightness as f64) as u32 + 1;
         adjusted.min(MAX_TOUCH_BAR_BRIGHTNESS) // Clamp the value to the maximum allowed brightness
     }
     pub fn process_event(&mut self, event: &Event) {
@@ -103,9 +102,9 @@ impl BacklightManager {
             0
         } else if since_last_active < BRIGHTNESS_DIM_TIMEOUT as u64 {
             if cfg.adaptive_brightness {
-                BacklightManager::display_to_touchbar(read_attr(&self.display_bl_path, "brightness"))
+                BacklightManager::display_to_touchbar(read_attr(&self.display_bl_path, "brightness"), cfg.active_brightness)
             } else {
-                DEFAULT_BRIGHTNESS
+                cfg.active_brightness
             }
         } else if since_last_active < BRIGHTNESS_OFF_TIMEOUT as u64 {
             DIMMED_BRIGHTNESS

src/config.rs

@@ -21,6 +21,7 @@ pub struct Config {
     pub enable_pixel_shift: bool,
     pub font_face: FontFace,
     pub adaptive_brightness: bool,
+    pub active_brightness: u32,
 }
 
 #[derive(Deserialize)]
@@ -31,6 +32,7 @@ struct ConfigProxy {
     enable_pixel_shift: Option<bool>,
     font_template: Option<String>,
     adaptive_brightness: Option<bool>,
+    active_brightness: Option<u32>,
     primary_layer_keys: Option<Vec<ButtonConfig>>,
     media_layer_keys: Option<Vec<ButtonConfig>>
 }
@@ -71,6 +73,7 @@ fn load_config() -> (Config, [FunctionLayer; 2]) {
         base.adaptive_brightness = user.adaptive_brightness.or(base.adaptive_brightness);
         base.media_layer_keys = user.media_layer_keys.or(base.media_layer_keys);
         base.primary_layer_keys = user.primary_layer_keys.or(base.primary_layer_keys);
+        base.active_brightness = user.active_brightness.or(base.active_brightness);
     };
     let media_layer = FunctionLayer::with_config(base.media_layer_keys.unwrap());
     let fkey_layer = FunctionLayer::with_config(base.primary_layer_keys.unwrap());
@@ -80,6 +83,7 @@ fn load_config() -> (Config, [FunctionLayer; 2]) {
         enable_pixel_shift: base.enable_pixel_shift.unwrap(),
         adaptive_brightness: base.adaptive_brightness.unwrap(),
         font_face: load_font(&base.font_template.unwrap()),
+        active_brightness: base.active_brightness.unwrap()
     };
     (cfg, layers)
 }