Hide brightness panel on FW12 (grouzen#56)

Author: grouzen

src/app.rs

@@ -31,9 +31,10 @@ impl App {
     pub fn new() -> color_eyre::Result<Self> {
         let ec = CrosEc::new();
         let fingerprint = Arc::new(Fingerprint::new(&ec)?);
-        let framework = Framework::new(ec, fingerprint.clone());
-        let info = FrameworkInfo::default();
-        let tui = Tui::new(fingerprint);
+        // Pre-fetch framework info
+        let mut framework = Framework::new(ec, fingerprint.clone());
+        let info = framework.get_info();
+        let tui = Tui::new(fingerprint, &info);
 
         Ok(Self {
             framework,
@@ -46,9 +47,6 @@ impl App {
     pub async fn run<B: Backend>(&mut self, terminal: &mut Terminal<B>) -> color_eyre::Result<()> {
         let mut event_loop = EventLoop::new();
 
-        // Pre-fetch framework info
-        self.info = self.framework.get_info();
-
         event_loop.run(Duration::from_millis(1000));
 
         while self.running {

src/framework.rs

@@ -77,6 +77,7 @@ impl Framework {
             .map(Result::ok)
             .collect();
         let fan_rpm = self.get_fan_rpm().ok();
+        let platform = smbios::get_platform();
 
         FrameworkInfo::new(
             &power,
@@ -87,6 +88,7 @@ impl Framework {
             &smbios,
             pd_ports,
             fan_rpm,
+            platform,
         )
     }
 

src/framework/info.rs

@@ -4,6 +4,7 @@ use framework_lib::power::UsbChargingType;
 use framework_lib::power::UsbPdPowerInfo;
 use framework_lib::power::UsbPowerRoles;
 use framework_lib::smbios;
+use framework_lib::smbios::Platform;
 use smbioslib::DefinedStruct;
 use smbioslib::SMBiosData;
 
@@ -31,6 +32,7 @@ pub struct FrameworkInfo {
     pub smbios_vendor: Option<String>,
     pub pd_ports: PdPortsInfo,
     pub fan_rpm: Option<Vec<u16>>,
+    pub platform: Option<Platform>,
 }
 
 impl FrameworkInfo {
@@ -44,6 +46,7 @@ impl FrameworkInfo {
         smbios: &Option<SMBiosData>,
         pd_ports: Vec<Option<UsbPdPowerInfo>>,
         fan_rpm: Option<Vec<u16>>,
+        platform: Option<Platform>,
     ) -> Self {
         Self {
             charge_percentage: charge_percentage(power),
@@ -68,6 +71,7 @@ impl FrameworkInfo {
             smbios_vendor: smbios_vendor(smbios),
             pd_ports: pd_ports_info(pd_ports),
             fan_rpm,
+            platform,
         }
     }
 }

src/tui.rs

@@ -35,10 +35,10 @@ pub struct Tui {
 }
 
 impl Tui {
-    pub fn new(fingerprint: Arc<Fingerprint>) -> Self {
+    pub fn new(fingerprint: Arc<Fingerprint>, info: &FrameworkInfo) -> Self {
         Self {
             title: TitleComponent,
-            main: MainComponent::new(fingerprint),
+            main: MainComponent::new(fingerprint, info),
             footer: FooterComponent,
             theme: Theme::default(),
             error_message: None,
@@ -135,12 +135,17 @@ mod tests {
 
     use ratatui::crossterm::event::{Event, KeyCode, KeyEvent};
 
-    use crate::{app::AppEvent, framework::fingerprint::Fingerprint, tui::Tui};
+    use crate::{
+        app::AppEvent,
+        framework::{fingerprint::Fingerprint, info::FrameworkInfo},
+        tui::Tui,
+    };
 
     #[test]
     fn handle_input_internal_quit_event() {
         let fingerprint = Arc::new(Fingerprint::percentage());
-        let mut tui = Tui::new(fingerprint);
+        let info = FrameworkInfo::default();
+        let mut tui = Tui::new(fingerprint, &info);
         let event = Event::Key(KeyEvent::from(KeyCode::Char('q')));
 
         let app_event = tui.handle_input(event);

src/tui/component/main.rs

@@ -27,15 +27,23 @@ pub struct MainComponent {
 }
 
 impl MainComponent {
-    pub fn new(finterprint: Arc<Fingerprint>) -> Self {
+    pub fn new(finterprint: Arc<Fingerprint>, info: &FrameworkInfo) -> Self {
+        let mut adjustable_panels: Vec<Box<dyn AdjustableComponent>> = Vec::new();
         let charge_panel = Box::new(ChargePanelComponent::new());
-        let brightness_panel = Box::new(BrightnessPanelComponent::new(finterprint));
+
+        adjustable_panels.push(charge_panel);
+
+        if Self::is_brightness_supported(info) {
+            let brightness_panel = Box::new(BrightnessPanelComponent::new(finterprint));
+
+            adjustable_panels.push(brightness_panel);
+        }
 
         Self {
             privacy_panel: PrivacyPanelComponent,
             smbios_panel: SmbiosPanelComponent,
             pd_ports_panel: PdPortsPanelComponent::new(),
-            adjustable_panels: vec![charge_panel, brightness_panel],
+            adjustable_panels,
             selected_panel: None,
         }
     }
@@ -60,6 +68,30 @@ impl MainComponent {
             self.selected_panel = Some(0);
         }
     }
+
+    fn render_privacy_and_smbios_panels(
+        &mut self,
+        frame: &mut Frame,
+        area: Rect,
+        theme: &Theme,
+        info: &FrameworkInfo,
+    ) {
+        let [privacy_panel_area, smbios_panel_area] =
+            Layout::horizontal([Constraint::Min(0), Constraint::Min(0)]).areas(area);
+
+        // Privacy panel
+        self.privacy_panel
+            .render(frame, privacy_panel_area, theme, info);
+
+        // SMBIOS panel
+        self.smbios_panel
+            .render(frame, smbios_panel_area, theme, info);
+    }
+
+    fn is_brightness_supported(info: &FrameworkInfo) -> bool {
+        // NOTE: modifiying FP and KB brightness is not supported on FW 12
+        info.platform != Some(framework_lib::smbios::Platform::Framework12IntelGen13)
+    }
 }
 
 impl Component for MainComponent {
@@ -80,25 +112,29 @@ impl Component for MainComponent {
             Layout::vertical([Constraint::Max(15), Constraint::Min(0)]).areas(area);
         let [charge_panel_area, top_right_area] =
             Layout::horizontal([Constraint::Min(0), Constraint::Min(0)]).areas(top_area);
-        let [brightness_panel_area, privacy_and_smbios_panels_area] =
-            Layout::vertical([Constraint::Min(7), Constraint::Min(7)]).areas(top_right_area);
-        let [privacy_panel_area, smbios_panel_area] =
-            Layout::horizontal([Constraint::Min(0), Constraint::Min(0)])
-                .areas(privacy_and_smbios_panels_area);
 
         // Charge panel
         self.adjustable_panels[0].render(frame, charge_panel_area, theme, info);
 
-        // Brightness panel (top of right_area)
-        self.adjustable_panels[1].render(frame, brightness_panel_area, theme, info);
-
-        // Privacy panel
-        self.privacy_panel
-            .render(frame, privacy_panel_area, theme, info);
-
-        // SMBIOS panel
-        self.smbios_panel
-            .render(frame, smbios_panel_area, theme, info);
+        // Show brightness panel only on supported platforms
+        if Self::is_brightness_supported(info) {
+            let [brightness_panel_area, privacy_and_smbios_panels_area] =
+                Layout::vertical([Constraint::Min(7), Constraint::Min(7)]).areas(top_right_area);
+
+            // Brightness panel (top of right_area)
+            self.adjustable_panels[1].render(frame, brightness_panel_area, theme, info);
+
+            // Privacy and SMBIOS panels
+            self.render_privacy_and_smbios_panels(
+                frame,
+                privacy_and_smbios_panels_area,
+                theme,
+                info,
+            );
+        } else {
+            // Privacy and SMBIOS panels
+            self.render_privacy_and_smbios_panels(frame, top_right_area, theme, info);
+        }
 
         // PD Ports panel (bottom of right_area)
         self.pd_ports_panel