From 1db7ff7f18b7d6922dec6e8746850e0f41cef984 Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Sat, 9 Mar 2024 02:39:08 -0500
Subject: [PATCH] Update BAMFK-1 (#23236)

* Bump version number so VIA doesn't choke due to reconfiguration of keys/encoders

* Move rules.mk stuff into info.json, convert RGBLIGHT TO RGB_MATRIX

* Run format-json on info.json
---
 keyboards/keebio/bamfk1/config.h  |  22 ------
 keyboards/keebio/bamfk1/info.json | 124 ++++++++++++++++++++++--------
 keyboards/keebio/bamfk1/rules.mk  |  15 +---
 3 files changed, 93 insertions(+), 68 deletions(-)

diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h
index 6fd93072f5..46fd4d7316 100644
--- a/keyboards/keebio/bamfk1/config.h
+++ b/keyboards/keebio/bamfk1/config.h
@@ -8,25 +8,3 @@
 #    define STARTUP_SONG SONG(STARTUP_SOUND)
 #endif
 
-#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json
index 4fa563f0e8..09e7edbd18 100644
--- a/keyboards/keebio/bamfk1/info.json
+++ b/keyboards/keebio/bamfk1/info.json
@@ -1,52 +1,112 @@
 {
-    "keyboard_name": "BAMFK-1",
     "manufacturer": "Keebio",
-    "url": "https://keeb.io",
+    "keyboard_name": "BAMFK-1",
     "maintainer": "nooges",
-    "usb": {
-        "vid": "0xCB10",
-        "pid": "0x1111",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 16,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
+    "bootloader": "atmel-dfu",
     "encoder": {
         "rotary": [
             {"pin_a": "C7", "pin_b": "B5"},
             {"pin_a": "D7", "pin_b": "D4"}
         ]
     },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgb_matrix": true
+    },
     "matrix_pins": {
         "direct": [
             ["E6", "B6", "D6"]
         ]
     },
+    "processor": "atmega32u4",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "cycle_pinwheel",
+            "speed": 48
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"x": 56, "y": 0, "flags": 4},
+            {"x": 168, "y": 0, "flags": 4},
+            {"x": 224, "y": 16, "flags": 4},
+            {"x": 224, "y": 48, "flags": 4},
+            {"matrix": [0, 2], "x": 168, "y": 64, "flags": 4},
+            {"matrix": [0, 1], "x": 56, "y": 64, "flags": 4},
+            {"x": 0, "y": 48, "flags": 4},
+            {"x": 0, "y": 16, "flags": 4},
+            {"x": 0, "y": 0, "flags": 2},
+            {"x": 112, "y": 0, "flags": 2},
+            {"x": 224, "y": 0, "flags": 2},
+            {"x": 224, "y": 32, "flags": 2},
+            {"x": 224, "y": 64, "flags": 2},
+            {"x": 112, "y": 64, "flags": 2},
+            {"x": 224, "y": 64, "flags": 2},
+            {"matrix": [0, 0], "x": 112, "y": 32, "flags": 2}
+        ],
+        "sleep": true
+    },
+    "url": "https://keeb.io",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x1211",
+        "vid": "0xCB10"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 1, "y": 0, "h": 2, "w": 2, "matrix": [0, 0]},
-                {"x": 0, "y": 2.25, "matrix": [0, 1]},
-                {"x": 3, "y": 2.25, "matrix": [0, 2]}
+                {"matrix": [0, 0], "x": 1, "y": 0, "w": 2, "h": 2},
+                {"matrix": [0, 1], "x": 0, "y": 2.25},
+                {"matrix": [0, 2], "x": 3, "y": 2.25}
             ]
         }
     }
diff --git a/keyboards/keebio/bamfk1/rules.mk b/keyboards/keebio/bamfk1/rules.mk
index 21df40039e..6e7633bfe0 100644
--- a/keyboards/keebio/bamfk1/rules.mk
+++ b/keyboards/keebio/bamfk1/rules.mk
@@ -1,14 +1 @@
-# 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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
+# This file intentionally left blank