From 0b5bd9cc9f015d6815d6930968bb24369ae68dce Mon Sep 17 00:00:00 2001
From: TolaMironcenko <mironcenkotola@gmail.com>
Date: Thu, 20 Mar 2025 11:32:46 +0700
Subject: [PATCH] added voltage in battery menu

---
 widget/menus/BatteryMenu/BatteryMenu.tsx |  7 +--
 widget/menus/BatteryMenu/helpers.ts      | 68 ++++++++++++++++++------
 2 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/widget/menus/BatteryMenu/BatteryMenu.tsx b/widget/menus/BatteryMenu/BatteryMenu.tsx
index f7cd282..075a2d3 100644
--- a/widget/menus/BatteryMenu/BatteryMenu.tsx
+++ b/widget/menus/BatteryMenu/BatteryMenu.tsx
@@ -1,7 +1,7 @@
 import { Astal, App, Gtk } from "astal/gtk3";
 import Battery from "gi://AstalBattery";
 import { bind, Variable } from "astal";
-import {cycles_count, health} from "./helpers.ts";
+import { cycles_count, health, voltage } from "./helpers.ts";
 
 const BatteryMenu = () => {
   const { TOP, RIGHT } = Astal.WindowAnchor;
@@ -9,7 +9,8 @@ const BatteryMenu = () => {
   const bat = Battery.get_default();
   const batcycles = Variable<string>("").poll(5000, () => cycles_count());
   const bathealth = Variable<string>("").poll(5000, () => health());
-  
+  const batvoltage = Variable<string>("").poll(5000, () => voltage());
+
   return (
     <window
       anchor={TOP | RIGHT}
@@ -80,7 +81,7 @@ const BatteryMenu = () => {
               halign={START}
               label="Voltage:"
             />
-            <label hexpand halign={END} label="12.1 V" />
+            <label hexpand halign={END} label={batvoltage()} />
           </box>
         </box>
       </box>
diff --git a/widget/menus/BatteryMenu/helpers.ts b/widget/menus/BatteryMenu/helpers.ts
index 4968406..18577d5 100644
--- a/widget/menus/BatteryMenu/helpers.ts
+++ b/widget/menus/BatteryMenu/helpers.ts
@@ -1,37 +1,71 @@
-import { GLib } from "astal"
+import { GLib } from "astal";
 
 const cycles_count = (): string => {
   try {
-  const [success, cycles] = GLib.file_get_contents("/sys/class/power_supply/BAT0/cycle_count");
-  if (!success || !cycles) {
-    throw new Error("Failed to read /sys/class/ or the file content is null.");
-  }
-  const cyclesinfo = new TextDecoder("utf-8").decode(cycles);
-  return cyclesinfo.replace(/\n$/, '');
+    const [success, cycles] = GLib.file_get_contents(
+      "/sys/class/power_supply/BAT0/cycle_count",
+    );
+    if (!success || !cycles) {
+      throw new Error(
+        "Failed to read /sys/class/ or the file content is null.",
+      );
+    }
+    const cyclesinfo = new TextDecoder("utf-8").decode(cycles);
+    return cyclesinfo.replace(/\n$/, "");
   } catch (error) {
     console.error("Error get battery cycles_count");
     return "";
   }
-}
+};
 
 const health = (): string => {
   try {
-    const [success, charge_full] = GLib.file_get_contents("/sys/class/power_supply/BAT0/charge_full");
+    const [success, charge_full] = GLib.file_get_contents(
+      "/sys/class/power_supply/BAT0/charge_full",
+    );
     if (!success || !charge_full) {
-      throw new Error("Failed to read /sys/class/ or the file content is null.");
+      throw new Error(
+        "Failed to read /sys/class/ or the file content is null.",
+      );
     }
-    const [success_chagre_full_design, charge_full_design] = GLib.file_get_contents("/sys/class/power_supply/BAT0/charge_full_design");
+    const [success_chagre_full_design, charge_full_design] =
+      GLib.file_get_contents("/sys/class/power_supply/BAT0/charge_full_design");
     if (!success_chagre_full_design || !charge_full_design) {
-      throw new Error("Failed to read /sys/class/ or the file content is null.");
+      throw new Error(
+        "Failed to read /sys/class/ or the file content is null.",
+      );
     }
-    const chargefullnow = parseInt(new TextDecoder("utf-8").decode(charge_full));
-    const chargefulldesign = parseInt(new TextDecoder("utf-8").decode(charge_full_design));
-    const percents = Math.round(chargefullnow * 100 / chargefulldesign);
+    const chargefullnow = parseInt(
+      new TextDecoder("utf-8").decode(charge_full),
+    );
+    const chargefulldesign = parseInt(
+      new TextDecoder("utf-8").decode(charge_full_design),
+    );
+    const percents = Math.round((chargefullnow * 100) / chargefulldesign);
     return percents.toString() + " %";
   } catch (error) {
     console.error("error get battery health");
     return "";
   }
-}
+};
 
-export {cycles_count, health};
+const voltage = (): string => {
+  try {
+    const [success, voltage] = GLib.file_get_contents(
+      "/sys/class/power_supply/BAT0/voltage_now",
+    );
+    if (!success || !voltage) {
+      throw new Error(
+        "Failed to read /sys/class/ or the file content is null.",
+      );
+    }
+    const voltage_now = parseInt(new TextDecoder("utf-8").decode(voltage));
+    const voltage_string = (voltage_now / 1000).toString() + " V";
+    return voltage_string;
+  } catch (error) {
+    console.error("error get battery voltage");
+    return "";
+  }
+};
+
+export { cycles_count, health, voltage };