Refactor battery driver (#25550)

7 files changed, 12 insertions, 8 deletions

diff --git a/keyboards/handwired/onekey/keymaps/battery/config.h b/keyboards/handwired/onekey/keymaps/battery/config.h
index 8a1c05d436..b93bfe9000 100644
--- a/keyboards/handwired/onekey/keymaps/battery/config.h
+++ b/keyboards/handwired/onekey/keymaps/battery/config.h
@@ -3,4 +3,4 @@
 
 #pragma once
 
-#define BATTERY_PIN ADC_PIN
+#define BATTERY_ADC_PIN ADC_PIN
diff --git a/keyboards/handwired/onekey/keymaps/battery/keymap.c b/keyboards/handwired/onekey/keymaps/battery/keymap.c
index 74191e83fc..793a6ed87e 100644
--- a/keyboards/handwired/onekey/keymaps/battery/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/battery/keymap.c
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
-#include "battery.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT_ortho_1x1(KC_A)
@@ -14,8 +13,6 @@ void keyboard_post_init_user(void) {
 //   debug_matrix=false;
 //   debug_keyboard=true;
 //   debug_mouse=false;
-
-  battery_init();
 }
 
 void housekeeping_task_user(void) {
diff --git a/keyboards/handwired/onekey/keymaps/battery/keymap.json b/keyboards/handwired/onekey/keymaps/battery/keymap.json
index c641dfe773..7232d6d899 100644
--- a/keyboards/handwired/onekey/keymaps/battery/keymap.json
+++ b/keyboards/handwired/onekey/keymaps/battery/keymap.json
@@ -1,6 +1,10 @@
 {
     "config": {
+        "battery": {
+            "driver": "adc"
+        },
         "features": {
+            "battery": true,
             "console": true
         }
     }
diff --git a/keyboards/handwired/onekey/keymaps/battery/rules.mk b/keyboards/handwired/onekey/keymaps/battery/rules.mk
deleted file mode 100644
index 06908179ae..0000000000
--- a/keyboards/handwired/onekey/keymaps/battery/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BATTERY_DRIVER_REQUIRED = yes
diff --git a/keyboards/handwired/promethium/config.h b/keyboards/handwired/promethium/config.h
index 974a4f951f..c63d3eaead 100644
--- a/keyboards/handwired/promethium/config.h
+++ b/keyboards/handwired/promethium/config.h
@@ -64,8 +64,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define PS2_MOUSE_INIT_DELAY 2000
 
-#define BATTERY_PIN B5
-
 #ifndef __ASSEMBLER__  // assembler doesn't like enum in .h file
 enum led_sequence {
     LED_IND_LINUX,
diff --git a/keyboards/handwired/promethium/keyboard.json b/keyboards/handwired/promethium/keyboard.json
index fa72908039..2e47bd186a 100644
--- a/keyboards/handwired/promethium/keyboard.json
+++ b/keyboards/handwired/promethium/keyboard.json
@@ -10,6 +10,12 @@
   "ws2812": {
     "pin": "B5"
   },
+  "battery": {
+    "driver": "adc",
+    "adc": {
+        "pin": "B5"
+    }
+  },
   "bluetooth": {
     "driver": "bluefruit_le"
   },
@@ -22,6 +28,7 @@
     "nkro": true,
     "ps2_mouse": true,
     "ps2": true,
+    "battery": true,
     "bluetooth": true
   },
   "build": {
diff --git a/keyboards/handwired/promethium/rules.mk b/keyboards/handwired/promethium/rules.mk
index 4012f8ca29..ecadca399c 100644
--- a/keyboards/handwired/promethium/rules.mk
+++ b/keyboards/handwired/promethium/rules.mk
@@ -5,7 +5,6 @@ PS2_DRIVER = interrupt
 CUSTOM_MATRIX = yes
 
 WS2812_DRIVER_REQUIRED = yes
-BATTERY_DRIVER_REQUIRED = yes
 
 SRC += rgbsps.c
 SRC += matrix.c