Merge 1c1b7481d7d4e0617b3606553f4ec1e1f16d69ed into 3e5d129248ed7b93d4ef13de28c26b91d3111014

Battery (Haiku): handle empty slots
My ThinkPad has a second slot for external batteries.
2025-02-20 11:43:27 +08:00 · 2025-02-19 22:14:41 +05:30 · 2025-02-19 22:21:43 +08:00 · 2025-02-16 19:13:01 -06:00 · 2025-02-15 08:25:15 -06:00 · 2025-02-14 19:28:49 -06:00
4 changed files with 18 additions and 17 deletions
--- a/src/detection/battery/battery_haiku.c
+++ b/src/detection/battery/battery_haiku.c
@ -18,6 +18,9 @@ const char* parseBattery(int dfd, const char* battId, FFlist* results)
    if (ioctl(fd, GET_EXTENDED_BATTERY_INFO, &extended, sizeof(extended)) != 0)
        return "ioctl(GET_EXTENDED_BATTERY_INFO) failed";

+    if (extended.last_full_charge == (uint32)-1)
+        return "Skipped";
+
    FFBatteryResult* battery = (FFBatteryResult*)ffListAdd(results);
    ffStrbufInitS(&battery->modelName, extended.model_number);
    ffStrbufInitS(&battery->manufacturer, extended.oem_info);
--- a/src/logo/ascii/foxos.txt
+++ b/src/logo/ascii/foxos.txt
@ -1,8 +0,0 @@
- ________ ________     ___    ___ ________  ________
-|\  _____\\   __  \   |\  \  /  /|\   __  \|\   ____\
-\ \  \__/\ \  \|\  \  \ \  \/  / | \  \|\  \ \  \___|_
- \ \   __\\ \  \\\  \  \ \    / / \ \  \\\  \ \_____  \
-  \ \  \_| \ \  \\\  \  /     \/   \ \  \\\  \|____|\  \
-   \ \__\   \ \_______\/  /\   \    \ \_______\____\_\  \
-    \|__|    \|_______/__/ /\ __\    \|_______|\_________\
-                      |__|/ \|__|             \|_________|
--- a/src/logo/ascii/wolfos.txt
+++ b/src/logo/ascii/wolfos.txt
@ -0,0 +1,5 @@
+__        __    _  __  ___  ____  
+\ \      / /__ | |/ _|/ _ \/ ___| 
+ \ \ /\ / / _ \| | |_| | | \___ \ 
+  \ V  V / (_) | |  _| |_| |___) |
+   \_/\_/ \___/|_|_|  \___/|____/ 
--- a/src/logo/builtin.c
+++ b/src/logo/builtin.c
@ -1721,14 +1721,6 @@ static const FFlogo F[] = {
        .colorKeys = FF_COLOR_FG_RED,
        .colorTitle = FF_COLOR_FG_WHITE,
    },
-    // FoxOS
-    {
-        .names = {"FoxOS"},
-        .lines = FASTFETCH_DATATEXT_LOGO_FOXOS,
-        .colors = {
-            FF_COLOR_FG_YELLOW,
-        },
-    },
    // FreeBSD
    {
        .names = {"Freebsd"},
@ -4959,6 +4951,7 @@ static const FFlogo V[] = {
 };

 static const FFlogo W[] = {
+
    // WiiLinuxNgx
    {
        .names = {"WiiLinuxNgx"},
@ -5049,10 +5042,18 @@ static const FFlogo W[] = {
        .colorKeys = FF_COLOR_FG_CYAN,
        .colorTitle = FF_COLOR_FG_BLUE,
    },
+    // WolfOS
+    {
+        .names = {"WolfOS"},
+        .lines = FASTFETCH_DATATEXT_LOGO_WOLFOS,
+        .colors = {
+            FF_COLOR_FG_BLUE,
+            FF_COLOR_FG_GREEN,
+        },
+    },
    // LAST
    {},
 };
-
 static const FFlogo X[] = {
    // Xenia
    {
Author	SHA1	Message	Date
WolfTech Innovations	3a2d1a19b3	Merge 1c1b7481d7d4e0617b3606553f4ec1e1f16d69ed into 3e5d129248ed7b93d4ef13de28c26b91d3111014	2025-02-19 22:14:41 +05:30
François Revol	3e5d129248	Battery (Haiku): handle empty slots Some checks failed CI / spellcheck (push) Has been cancelled Details CI / No-features-test (push) Has been cancelled Details CI / Linux-amd64 (push) Has been cancelled Details CI / Linux-aarch64 (push) Has been cancelled Details CI / Linux-armv7l (push) Has been cancelled Details CI / Linux-armv6l (push) Has been cancelled Details CI / Linux-riscv64 (push) Has been cancelled Details CI / Linux-ppc64le (push) Has been cancelled Details CI / Linux-s390x (push) Has been cancelled Details CI / Musl-amd64 (push) Has been cancelled Details CI / macOS-universal (push) Has been cancelled Details CI / SunOS-amd64 (push) Has been cancelled Details CI / FreeBSD-amd64 (push) Has been cancelled Details CI / DragonFly-amd64 (push) Has been cancelled Details CI / OpenBSD-amd64 (push) Has been cancelled Details CI / NetBSD-amd64 (push) Has been cancelled Details CI / Windows-amd64 (push) Has been cancelled Details CI / Release (push) Has been cancelled Details My ThinkPad has a second slot for external batteries.	2025-02-19 22:21:43 +08:00
WolfTech Innovations	1c1b7481d7	Merge branch 'fastfetch-cli:dev' into dev	2025-02-16 19:13:01 -06:00
WolfTech Innovations	7c68280049	Merge branch 'fastfetch-cli:dev' into dev	2025-02-15 08:25:15 -06:00
WolfTech Innovations	88e379bd2b	Merge branch 'fastfetch-cli:dev' into dev	2025-02-14 19:28:49 -06:00
WolfTech Innovations	cd7d7e9e97	Update wolfos.txt	2025-02-14 19:28:39 -06:00
WolfTech Innovations	c0a3860cb1	Merge branch 'fastfetch-cli:dev' into dev	2025-02-13 15:58:09 -06:00
WolfTech Innovations	0c23b28084	Merge branch 'fastfetch-cli:dev' into dev	2025-02-10 06:15:51 -06:00
WolfTech Innovations	d66256814c	Merge branch 'fastfetch-cli:dev' into dev	2025-02-09 21:11:23 -06:00
WolfTech Innovations	d1f4e78e86	Merge pull request #1 from komaru-cdn/dev Logo (Builtin): move WolfOS to the correct place	2025-02-09 21:11:11 -06:00
komaru	50b73ecf24	Logo (Builtin): move WolfOS to the correct place	2025-02-08 16:59:13 +01:00
WolfTech Innovations	21020545ad	Merge branch 'fastfetch-cli:dev' into dev	2025-02-07 05:53:13 -06:00
WolfTech Innovations	8e1e3ebefb	Update builtin.c	2025-02-07 05:52:49 -06:00
WolfTech Innovations	d91ce0b240	Update builtin.c	2025-02-01 07:36:31 -06:00
WolfTech Innovations	943864a668	Update builtin.c	2025-02-01 07:35:03 -06:00
WolfTech Innovations	3f7360df03	Update and rename foxos.txt to wolfos.txt	2025-01-31 19:04:08 -06:00
WolfTech Innovations	4065c8f796	Update builtin.c	2025-01-31 19:00:59 -06:00