From 1bea8b9d31fff260c55d515dd221f5572d85b8ff Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 3 Apr 2024 01:32:48 +1100
Subject: [PATCH] 40percentclub/gherkin: remove `CONVERT_TO` at keyboard level
 (#23396)

---
 keyboards/40percentclub/gherkin/info.json     | 15 +++++-------
 .../gherkin/kb2040/keyboard.json              | 12 ++++++++++
 .../40percentclub/gherkin/kb2040/rules.mk     |  1 -
 .../gherkin/keymaps/default/keymap.c          | 23 -------------------
 .../gherkin/pro_micro/keyboard.json           | 16 +++++++++++++
 keyboards/40percentclub/gherkin/rules.mk      | 16 -------------
 6 files changed, 34 insertions(+), 49 deletions(-)
 create mode 100644 keyboards/40percentclub/gherkin/kb2040/keyboard.json
 delete mode 100644 keyboards/40percentclub/gherkin/kb2040/rules.mk
 create mode 100644 keyboards/40percentclub/gherkin/pro_micro/keyboard.json
 delete mode 100644 keyboards/40percentclub/gherkin/rules.mk

diff --git a/keyboards/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json
index 808a82d4ce..d531c9408c 100644
--- a/keyboards/40percentclub/gherkin/info.json
+++ b/keyboards/40percentclub/gherkin/info.json
@@ -8,16 +8,13 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
-  "matrix_pins": {
-    "cols": ["B4", "E6", "D7", "C6", "D4", "D0"],
-    "rows": ["F7", "B1", "B3", "B2", "B6"]
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true,
+    "backlight": true
   },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "pin": "B5"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
   "community_layouts": ["ortho_3x10"],
   "layouts": {
     "LAYOUT_ortho_3x10": {
diff --git a/keyboards/40percentclub/gherkin/kb2040/keyboard.json b/keyboards/40percentclub/gherkin/kb2040/keyboard.json
new file mode 100644
index 0000000000..431ac371ee
--- /dev/null
+++ b/keyboards/40percentclub/gherkin/kb2040/keyboard.json
@@ -0,0 +1,12 @@
+{
+    "development_board": "kb2040",
+    "matrix_pins": {
+        "cols": ["GP8", "GP7", "GP6", "GP5", "GP4", "GP3"],
+        "rows": ["GP26", "GP18", "GP20", "GP19", "GP10"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "GP9",
+        "driver": "software"
+    }
+}
diff --git a/keyboards/40percentclub/gherkin/kb2040/rules.mk b/keyboards/40percentclub/gherkin/kb2040/rules.mk
deleted file mode 100644
index 982c581702..0000000000
--- a/keyboards/40percentclub/gherkin/kb2040/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-CONVERT_TO = kb2040
diff --git a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
index f4d3032857..420890a108 100644
--- a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
@@ -50,26 +50,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 
 };
-
-void keyboard_pre_init_user(void) {
-  // Call the keyboard pre init code.
-
-  // Set our LED pins as output
-  setPinOutput(D5);
-  setPinOutput(B0);
-}
-
-bool led_update_user(led_t led_state) {
-  if (led_state.num_lock) {
-    writePinLow(D5);
-  } else {
-    writePinHigh(D5);
-  }
-
-  if (led_state.caps_lock) {
-    writePinLow(B0);
-  } else {
-    writePinHigh(B0);
-  }
-  return false;
-}
diff --git a/keyboards/40percentclub/gherkin/pro_micro/keyboard.json b/keyboards/40percentclub/gherkin/pro_micro/keyboard.json
new file mode 100644
index 0000000000..882ea8f72b
--- /dev/null
+++ b/keyboards/40percentclub/gherkin/pro_micro/keyboard.json
@@ -0,0 +1,16 @@
+{
+    "development_board": "promicro",
+    "matrix_pins": {
+        "cols": ["B4", "E6", "D7", "C6", "D4", "D0"],
+        "rows": ["F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "num_lock": "D5",
+        "caps_lock": "B0",
+        "on_state": 0
+    },
+    "backlight": {
+        "pin": "B5"
+    }
+}
diff --git a/keyboards/40percentclub/gherkin/rules.mk b/keyboards/40percentclub/gherkin/rules.mk
deleted file mode 100644
index e47c1c6572..0000000000
--- a/keyboards/40percentclub/gherkin/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	  # Mouse keys
-EXTRAKEY_ENABLE = yes	  # Audio control and System control
-CONSOLE_ENABLE = no	    # Console for debug
-COMMAND_ENABLE = no     # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
-
-# Disable unsupported hardware
-RGBLIGHT_SUPPORTED = no
-AUDIO_SUPPORTED = no