bat.d tlp-stat -b: advertise chargeonce, discharge, recalibrate features individually

Author: linrunner

bat.d/05-thinkpad

@@ -1024,7 +1024,7 @@ batdrv_show_battery_data () {
     [ "$_bm_thresh" = "natacpi" ] && fs="charge thresholds"
     if [ "$_bm_dischg" = "natacpi" ]; then
         [ -n "$fs" ] && fs="${fs}, "
-        fs="${fs}recalibration"
+        fs="${fs}chargeonce, discharge, recalibrate"
     fi
     if [ -n "$fs" ]; then
         cprintf "success" "Supported features: %s\n" "$fs"

bat.d/10-thinkpad-legacy

@@ -881,7 +881,7 @@ batdrv_show_battery_data () {
     [ "$_bm_thresh" = "tpsmapi" ] && fs="charge thresholds"
     if [ "$_bm_dischg" = "tpsmapi" ]; then
         [ -n "$fs" ] && fs="${fs}, "
-        fs="${fs}recalibration"
+        fs="${fs}chargeonce, discharge, recalibrate"
     fi
     if [ -n "$fs" ]; then
         cprintf "success" "Supported features: %s\n" "$fs"

bat.d/55-cros-ec

@@ -962,8 +962,8 @@ batdrv_show_battery_data () {
 
     if [ "$_bm_thresh" != "none" ]; then
         case $_natacpi in
-            0) cecho "Supported features: charge thresholds, recalibration" "success" ;;
-            1) cecho "Supported features: charge threshold, recalibration" "success" ;;
+            0) cecho "Supported features: charge thresholds, chargeonce, discharge, recalibrate" "success" ;;
+            1) cecho "Supported features: charge threshold, chargeonce, discharge, recalibrate" "success" ;;
         esac
     else
         cprintf "warning" "Supported features: none available\n"
@@ -972,8 +972,8 @@ batdrv_show_battery_data () {
     printf "Driver usage:\n"
     # native kernel ACPI battery API
     case $_natacpi in
-        0)   cprintf "success" "* natacpi (%s) = active (charge thresholds, recalibration) - EC cmd v3\n" "$_batdrv_kmod" ;;
-        1)   cprintf "success" "* natacpi (%s) = active (charge threshold, recalibration) - EC cmd v2\n" "$_batdrv_kmod" ;;
+        0)   cprintf "success" "* natacpi (%s) = active (charge thresholds, force-discharge) - EC cmd v3\n" "$_batdrv_kmod" ;;
+        1)   cprintf "success" "* natacpi (%s) = active (charge threshold, force-discharge) - EC cmd v2\n" "$_batdrv_kmod" ;;
         32)  cprintf "notice"  "* natacpi (%s) = inactive (disabled by configuration)\n" "$_batdrv_kmod" ;;
         128) cprintf "warning" "* natacpi (%s) = inactive (insufficient kernel support)\n" "$_batdrv_kmod" ;;
         254) cprintf "warning" "* natacpi (%s) = inactive (laptop not supported) - EC cmd v1\n" "$_batdrv_kmod" ;;

changelog

@@ -9,7 +9,7 @@
   * Bugfixes
     Battery Care:
     - ThinkPads:
-      - Fix X220 discharge (Issue #793)
+      - Fix X201, X220 discharge (Issue #793)
       - Fix bash completion for tlp discharge on tp-smapi models
 
 +++ 1.8.0 --- 13.02.2025 +++

func.d/tlp-func-stat

@@ -741,7 +741,7 @@ print_methods_per_driver () {
             case $bm in
                 _bm_read)   [ "$1" = "tpsmapi" ] && m="status" ;;
                 _bm_thresh) m="charge thresholds" ;;
-                _bm_dischg) m="recalibration" ;;
+                _bm_dischg) m="force-discharge" ;;
             esac
             if [ -n "$m" ]; then
                 # concat method to output