Rename --pdports and add --pdports-chromebook

Signed-off-by: Daniel Schaefer <dhs@frame.work>

Author: JohnAZoidberg

EXAMPLES.md

@@ -40,7 +40,7 @@ Options:
       --autofanctrl
           Turn on automatic fan speed control
       --pdports
-          Show information about USB-C PD ports
+          Show USB-C PD port state
       --info
           Show info from SMBIOS (Only on UEFI)
       --pd-info

framework_lib/src/commandline/clap_std.rs

@@ -74,13 +74,13 @@ struct ClapCli {
     #[arg(long)]
     autofanctrl: Option<Option<u8>>,
 
-    /// Show information about USB-C PD ports
+    /// Show USB-C PD port state
     #[arg(long)]
     pdports: bool,
 
-    /// Show CYPD PD port state (Framework-specific)
+    /// Show PD port info (generic Chromium EC)
     #[arg(long)]
-    pdports_cypd: bool,
+    pdports_chromebook: bool,
 
     /// Show info from SMBIOS (Only on UEFI)
     #[arg(long)]
@@ -479,7 +479,7 @@ pub fn parse(args: &[String]) -> Cli {
         fansetrpm,
         autofanctrl: args.autofanctrl,
         pdports: args.pdports,
-        pdports_cypd: args.pdports_cypd,
+        pdports_chromebook: args.pdports_chromebook,
         pd_info: args.pd_info,
         pd_reset: args.pd_reset,
         pd_disable: args.pd_disable,

framework_lib/src/commandline/mod.rs

@@ -171,7 +171,7 @@ pub struct Cli {
     pub fansetrpm: Option<(Option<u32>, u32)>,
     pub autofanctrl: Option<Option<u8>>,
     pub pdports: bool,
-    pub pdports_cypd: bool,
+    pub pdports_chromebook: bool,
     pub privacy: bool,
     pub pd_info: bool,
     pub pd_reset: Option<u8>,
@@ -261,7 +261,7 @@ pub fn parse(args: &[String]) -> Cli {
             // fansetrpm
             // autofanctrl
             pdports: cli.pdports,
-            pdports_cypd: cli.pdports_cypd,
+            pdports_chromebook: cli.pdports_chromebook,
             privacy: cli.privacy,
             pd_info: cli.version,
             // pd_reset
@@ -1543,9 +1543,9 @@ pub fn run_with_args(args: &Cli, _allupdate: bool) -> i32 {
     } else if let Some(None) = args.autofanctrl {
         print_err(ec.autofanctrl(None));
     } else if args.pdports {
-        power::get_and_print_pd_info(&ec);
-    } else if args.pdports_cypd {
         power::get_and_print_cypd_pd_info(&ec);
+    } else if args.pdports_chromebook {
+        power::get_and_print_pd_info(&ec);
     } else if args.info {
         smbios_info();
     } else if let Some(dump_path) = &args.meinfo {
@@ -1836,8 +1836,8 @@ Options:
       --fansetduty           Set fan duty cycle (0-100%)
       --fansetrpm            Set fan RPM (limited by EC fan table max RPM)
       --autofanctrl [<FANID>]Turn on automatic fan speed control (optionally provide fan index)
-      --pdports              Show information about USB-C PD ports
-      --pdports-cypd         Show CYPD PD port state (Framework-specific)
+      --pdports              Show USB-C PD port state
+      --pdports-chromebook   Show PD port info (generic Chromium EC)
       --info                 Show info from SMBIOS (Only on UEFI)
       --meinfo [<DUMPFILE>]   Show Intel ME information (from SMBIOS type 0xDB)
       --pd-info              Show details about the PD controllers

framework_lib/src/commandline/uefi.rs

@@ -46,7 +46,7 @@ pub fn parse(args: &[String]) -> Cli {
         fansetrpm: None,
         autofanctrl: None,
         pdports: false,
-        pdports_cypd: false,
+        pdports_chromebook: false,
         pd_info: false,
         pd_reset: None,
         pd_disable: None,
@@ -225,8 +225,8 @@ pub fn parse(args: &[String]) -> Cli {
         } else if arg == "--pdports" {
             cli.pdports = true;
             found_an_option = true;
-        } else if arg == "--pdports-cypd" {
-            cli.pdports_cypd = true;
+        } else if arg == "--pdports-chromebook" {
+            cli.pdports_chromebook = true;
             found_an_option = true;
         } else if arg == "--allupdate" {
             cli.allupdate = true;

framework_tool/completions/bash/framework_tool

@@ -23,7 +23,7 @@ _framework_tool() {
 
     case "${cmd}" in
         framework_tool)
-            opts="-v -q -t -f -h --flash-gpu-descriptor --verbose --quiet --versions --version --features --esrt --device --compare-version --power --thermal --sensors --fansetduty --fansetrpm --autofanctrl --pdports --pdports-cypd --info --meinfo --pd-info --pd-reset --pd-disable --pd-enable --dp-hdmi-info --dp-hdmi-update --audio-card-info --privacy --pd-bin --ec-bin --capsule --dump --h2o-capsule --dump-ec-flash --flash-full-ec --flash-ec --flash-ro-ec --flash-rw-ec --intrusion --inputdeck --inputdeck-mode --expansion-bay --charge-limit --charge-current-limit --charge-rate-limit --get-gpio --fp-led-level --fp-brightness --kblight --remap-key --rgbkbd --ps2-enable --tablet-mode --touchscreen-enable --stylus-battery --console --reboot-ec --ec-hib-delay --uptimeinfo --s0ix-counter --hash --driver --pd-addrs --pd-ports --test --test-retimer --boardid --force --dry-run --flash-gpu-descriptor-file --dump-gpu-descriptor-file --nvidia --host-command --generate-completions --help"
+            opts="-v -q -t -f -h --flash-gpu-descriptor --verbose --quiet --versions --version --features --esrt --device --compare-version --power --thermal --sensors --fansetduty --fansetrpm --autofanctrl --pdports --pdports-chromebook --info --meinfo --pd-info --pd-reset --pd-disable --pd-enable --dp-hdmi-info --dp-hdmi-update --audio-card-info --privacy --pd-bin --ec-bin --capsule --dump --h2o-capsule --dump-ec-flash --flash-full-ec --flash-ec --flash-ro-ec --flash-rw-ec --intrusion --inputdeck --inputdeck-mode --expansion-bay --charge-limit --charge-current-limit --charge-rate-limit --get-gpio --fp-led-level --fp-brightness --kblight --remap-key --rgbkbd --ps2-enable --tablet-mode --touchscreen-enable --stylus-battery --console --reboot-ec --ec-hib-delay --uptimeinfo --s0ix-counter --hash --driver --pd-addrs --pd-ports --test --test-retimer --boardid --force --dry-run --flash-gpu-descriptor-file --dump-gpu-descriptor-file --nvidia --host-command --generate-completions --help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0

framework_tool/completions/fish/framework_tool.fish

@@ -80,8 +80,8 @@ complete -c framework_tool -l esrt -d 'Display the UEFI ESRT table'
 complete -c framework_tool -l power -d 'Show current power status of battery and AC (Add -vv for more details)'
 complete -c framework_tool -l thermal -d 'Print thermal information (Temperatures and Fan speed)'
 complete -c framework_tool -l sensors -d 'Print sensor information (ALS, G-Sensor)'
-complete -c framework_tool -l pdports -d 'Show information about USB-C PD ports'
-complete -c framework_tool -l pdports-cypd -d 'Show CYPD PD port state (Framework-specific)'
+complete -c framework_tool -l pdports -d 'Show USB-C PD port state'
+complete -c framework_tool -l pdports-chromebook -d 'Show PD port info (generic Chromium EC)'
 complete -c framework_tool -l info -d 'Show info from SMBIOS (Only on UEFI)'
 complete -c framework_tool -l pd-info -d 'Show details about the PD controllers'
 complete -c framework_tool -l dp-hdmi-info -d 'Show details about connected DP or HDMI Expansion Cards'

framework_tool/completions/zsh/_framework_tool

@@ -71,8 +71,8 @@ _framework_tool() {
 '--power[Show current power status of battery and AC (Add -vv for more details)]' \
 '--thermal[Print thermal information (Temperatures and Fan speed)]' \
 '--sensors[Print sensor information (ALS, G-Sensor)]' \
-'--pdports[Show information about USB-C PD ports]' \
-'--pdports-cypd[Show CYPD PD port state (Framework-specific)]' \
+'--pdports[Show USB-C PD port state]' \
+'--pdports-chromebook[Show PD port info (generic Chromium EC)]' \
 '--info[Show info from SMBIOS (Only on UEFI)]' \
 '--pd-info[Show details about the PD controllers]' \
 '--dp-hdmi-info[Show details about connected DP or HDMI Expansion Cards]' \