--versions: Hide PD backup version if it's the same

Signed-off-by: Daniel Schaefer <[email protected]>

Author: JohnAZoidberg

EXAMPLES.md

@@ -18,12 +18,8 @@ EC Firmware
   Build version:  lilac-3.0.0-1541dc6 2025-05-05 11:31:24 zoid@localhost
   Current image:  RO
 PD Controllers
-  Right (01)
-    Main:       0.0.0E (Active)
-    Backup:     0.0.0E
-  Left  (23)
-    Main:       0.0.0E (Active)
-    Backup:     0.0.0E
+  Right (01):       0.0.0E (MainFw)
+  Left  (23):       0.0.0E (MainFw)
 [...]
 ```
 

framework_lib/src/commandline/mod.rs

@@ -399,53 +399,78 @@ fn print_versions(ec: &CrosEc) {
     if let Ok(pd_versions) = ccgx::get_pd_controller_versions(ec) {
         let right = &pd_versions.controller01;
         let left = &pd_versions.controller23;
-        println!("  Right (01)");
         // let active_mode =
         if let Some(Platform::IntelGen11) = smbios::get_platform() {
+            if right.main_fw.base != right.backup_fw.base {
+                println!("  Right (01)");
+                println!(
+                    "    Main:           {}{}",
+                    right.main_fw.base,
+                    active_mode(&right.active_fw, FwMode::MainFw)
+                );
+                println!(
+                    "    Backup:         {}{}",
+                    right.backup_fw.base,
+                    active_mode(&right.active_fw, FwMode::BackupFw)
+                );
+            } else {
+                println!(
+                    "  Right (01):       {} ({:?})",
+                    right.main_fw.base, right.active_fw
+                );
+            }
+        } else if right.main_fw.app != right.backup_fw.app {
             println!(
-                "    Main:       {}{}",
-                right.main_fw.base,
+                "    Main:           {}{}",
+                right.main_fw.app,
                 active_mode(&right.active_fw, FwMode::MainFw)
             );
             println!(
-                "    Backup:     {}{}",
-                right.backup_fw.base,
+                "    Backup:         {}{}",
+                right.backup_fw.app,
                 active_mode(&right.active_fw, FwMode::BackupFw)
             );
         } else {
             println!(
-                "    Main:       {}{}",
-                right.main_fw.app,
-                active_mode(&right.active_fw, FwMode::MainFw)
-            );
-            println!(
-                "    Backup:     {}{}",
-                right.backup_fw.app,
-                active_mode(&right.active_fw, FwMode::BackupFw)
+                "  Right (01):       {} ({:?})",
+                right.main_fw.app, right.active_fw
             );
         }
-        println!("  Left  (23)");
         if let Some(Platform::IntelGen11) = smbios::get_platform() {
+            if left.main_fw.base != left.backup_fw.base {
+                println!("  Left  (23)");
+                println!(
+                    "    Main:           {}{}",
+                    left.main_fw.base,
+                    active_mode(&left.active_fw, FwMode::MainFw)
+                );
+                println!(
+                    "    Backup:         {}{}",
+                    left.backup_fw.base,
+                    active_mode(&left.active_fw, FwMode::BackupFw)
+                );
+            } else {
+                println!(
+                    "  Left  (23):       {} ({:?})",
+                    left.main_fw.base, left.active_fw
+                );
+            }
+        } else if left.main_fw.app != left.backup_fw.app {
+            println!("  Left  (23)");
             println!(
-                "    Main:       {}{}",
-                left.main_fw.base,
+                "    Main:           {}{}",
+                left.main_fw.app,
                 active_mode(&left.active_fw, FwMode::MainFw)
             );
             println!(
-                "    Backup:     {}{}",
-                left.backup_fw.base,
+                "    Backup:         {}{}",
+                left.backup_fw.app,
                 active_mode(&left.active_fw, FwMode::BackupFw)
             );
         } else {
             println!(
-                "    Main:       {}{}",
-                left.main_fw.app,
-                active_mode(&left.active_fw, FwMode::MainFw)
-            );
-            println!(
-                "    Backup:     {}{}",
-                left.backup_fw.app,
-                active_mode(&left.active_fw, FwMode::BackupFw)
+                "  Left  (23):       {} ({:?})",
+                left.main_fw.app, left.active_fw
             );
         }
     } else if let Ok(pd_versions) = power::read_pd_version(ec) {