From 53a0cdc4467fb688faa2708fe75daa26686e918d Mon Sep 17 00:00:00 2001
From: Joel Challis
Date: Tue, 18 Jun 2024 03:44:22 +0100
Subject: Implement data driven joysticks (#22947)

---
 .../battleship_gamepad/battleship_gamepad.c         |  6 ------
 keyboards/handwired/battleship_gamepad/config.h     | 21 ---------------------
 .../handwired/battleship_gamepad/keyboard.json      |  8 ++++++++
 keyboards/handwired/battleship_gamepad/rules.mk     |  1 -
 4 files changed, 8 insertions(+), 28 deletions(-)
 delete mode 100644 keyboards/handwired/battleship_gamepad/config.h
 delete mode 100644 keyboards/handwired/battleship_gamepad/rules.mk

(limited to 'keyboards/handwired')

diff --git a/keyboards/handwired/battleship_gamepad/battleship_gamepad.c b/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
index cccc03a287..7b5e65a990 100644
--- a/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
+++ b/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
@@ -16,12 +16,6 @@
 
 #include "quantum.h"
 
-/* joystick config */
-joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
-    [0] = JOYSTICK_AXIS_IN(F5, 1023, 512, 0),
-    [1] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023)
-};
-
 /* joystick button code (thumbstick pressed) */
 void keyboard_pre_init_kb(void) {
 	gpio_set_pin_input_high(F6);
diff --git a/keyboards/handwired/battleship_gamepad/config.h b/keyboards/handwired/battleship_gamepad/config.h
deleted file mode 100644
index b785c80aad..0000000000
--- a/keyboards/handwired/battleship_gamepad/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Andrew Braini
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* joystick configuration */
-#define JOYSTICK_BUTTON_COUNT 25
-#define JOYSTICK_AXIS_RESOLUTION 10
diff --git a/keyboards/handwired/battleship_gamepad/keyboard.json b/keyboards/handwired/battleship_gamepad/keyboard.json
index 2832741875..8350f31fdd 100644
--- a/keyboards/handwired/battleship_gamepad/keyboard.json
+++ b/keyboards/handwired/battleship_gamepad/keyboard.json
@@ -13,6 +13,14 @@
         "rows": ["B6", "B2", "B3", "B1", "F7"]
     },
     "diode_direction": "COL2ROW",
+    "joystick": {
+        "button_count": 25,
+        "axis_resolution": 10,
+        "axes": {
+            "x": {"input_pin": "F5", "low": 1023, "rest": 512, "high": 0},
+            "y": {"input_pin": "F4", "low": 0, "rest": 512, "high": 1023}
+        }
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "features": {
diff --git a/keyboards/handwired/battleship_gamepad/rules.mk b/keyboards/handwired/battleship_gamepad/rules.mk
deleted file mode 100644
index c5ab560bca..0000000000
--- a/keyboards/handwired/battleship_gamepad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-JOYSTICK_DRIVER = analog
-- 
cgit v1.2.3