From cd06ee00d43fd3922de4f0bf1bfc73e297a3c515 Mon Sep 17 00:00:00 2001
From: John Williams <porschemad911@gmail.com>
Date: Tue, 16 Jun 2026 09:27:31 +1000
Subject: [PATCH] s922x: batteryplus

---
 projects/ROCKNIX/devices/S922X/options        |  2 +-
 .../packages/tools/batteryplus/Makefile       | 13 +++++++
 .../tools/batteryplus/config/batteryplus.conf |  2 +
 .../packages/tools/batteryplus/package.mk     | 37 +++++++++++++++++++
 .../batteryplus/system.d/batteryplus.service  |  8 ++++
 5 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 projects/ROCKNIX/packages/tools/batteryplus/Makefile
 create mode 100644 projects/ROCKNIX/packages/tools/batteryplus/config/batteryplus.conf
 create mode 100644 projects/ROCKNIX/packages/tools/batteryplus/package.mk
 create mode 100644 projects/ROCKNIX/packages/tools/batteryplus/system.d/batteryplus.service

diff --git a/projects/ROCKNIX/devices/S922X/options b/projects/ROCKNIX/devices/S922X/options
index d2edf168d92..dbe9e9fd8d1 100644
--- a/projects/ROCKNIX/devices/S922X/options
+++ b/projects/ROCKNIX/devices/S922X/options
@@ -67,7 +67,7 @@
     FIRMWARE=""
 
   # Additional packages to install
-    ADDITIONAL_PACKAGES="libmali"
+    ADDITIONAL_PACKAGES="libmali batteryplus"
 
   # Debug tty path
     DEBUG_TTY="/dev/ttyAML0"
diff --git a/projects/ROCKNIX/packages/tools/batteryplus/Makefile b/projects/ROCKNIX/packages/tools/batteryplus/Makefile
new file mode 100644
index 00000000000..b6ede5e04fc
--- /dev/null
+++ b/projects/ROCKNIX/packages/tools/batteryplus/Makefile
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS)
+
+CXX ?= gcc
+
+BINARY = batteryplus
+SOURCES = "BatteryPlus/batteryplus.cpp"
+
+all:
+	$(CXX) $(CFLAGS) $(SOURCES) -o $(BINARY)
+
+clean:
+	rm -f $(BINARY)
diff --git a/projects/ROCKNIX/packages/tools/batteryplus/config/batteryplus.conf b/projects/ROCKNIX/packages/tools/batteryplus/config/batteryplus.conf
new file mode 100644
index 00000000000..922e64cd204
--- /dev/null
+++ b/projects/ROCKNIX/packages/tools/batteryplus/config/batteryplus.conf
@@ -0,0 +1,2 @@
+data_dir=/storage/.config/batteryplus
+mode=voltage
diff --git a/projects/ROCKNIX/packages/tools/batteryplus/package.mk b/projects/ROCKNIX/packages/tools/batteryplus/package.mk
new file mode 100644
index 00000000000..30db2e63312
--- /dev/null
+++ b/projects/ROCKNIX/packages/tools/batteryplus/package.mk
@@ -0,0 +1,37 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2026 ROCKNIX (https://github.com/ROCKNIX)
+
+PKG_NAME="batteryplus"
+PKG_VERSION="4e08fa71b2b67d771429a3e235df327e7e3b59c3"
+PKG_GIT_CLONE_BRANCH="main"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/Mikhailzrick/knubat.components"
+PKG_URL="${PKG_SITE}.git"
+PKG_DEPENDS_TARGET="toolchain systemd"
+PKG_LONGDESC="BatteryPlus — battery percentage daemon for handheld Linux systems"
+GET_HANDLER_SUPPORT="git"
+PKG_TOOLCHAIN="make"
+
+pre_make_target() {
+	cp ${PKG_DIR}/Makefile ${PKG_BUILD}
+}
+
+makeinstall_target() {
+	mkdir -p ${INSTALL}/usr/bin
+	cp ${PKG_BUILD}/batteryplus ${INSTALL}/usr/bin
+
+	mkdir -p ${INSTALL}/etc/batteryplus
+	cp -f ${PKG_DIR}/config/batteryplus.conf ${INSTALL}/etc/batteryplus
+
+	# Empty hook dirs
+	mkdir -p ${INSTALL}/etc/batteryplus/charging.d
+	touch ${INSTALL}/etc/batteryplus/charging.d/.keep
+	mkdir -p ${INSTALL}/etc/batteryplus/discharging.d
+	touch ${INSTALL}/etc/batteryplus/discharging.d/.keep
+	mkdir -p ${INSTALL}/etc/batteryplus/state.d
+	touch ${INSTALL}/etc/batteryplus/state.d/.keep
+}
+
+post_install() {
+  enable_service batteryplus.service
+}
diff --git a/projects/ROCKNIX/packages/tools/batteryplus/system.d/batteryplus.service b/projects/ROCKNIX/packages/tools/batteryplus/system.d/batteryplus.service
new file mode 100644
index 00000000000..ace535bcef4
--- /dev/null
+++ b/projects/ROCKNIX/packages/tools/batteryplus/system.d/batteryplus.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=BatteryPlus service
+
+[Service]
+ExecStart=/usr/bin/batteryplus
+
+[Install]
+WantedBy=multi-user.target