From a20661fd8895ee8457cef96a92779898e4efb077 Mon Sep 17 00:00:00 2001
From: Marco Pelegrini <mpelegrini@microsoft.com>
Date: Sat, 23 Nov 2024 16:36:14 -0800
Subject: [PATCH] Applying core review suggestions

---
 keyboards/marcopad/config.h                 | 5 -----
 keyboards/marcopad/keyboard.json            | 8 ++++++--
 keyboards/marcopad/keymaps/default/keymap.c | 2 +-
 keyboards/marcopad/keymaps/default/rules.mk | 3 ---
 keyboards/marcopad/readme.md                | 8 ++++----
 5 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 keyboards/marcopad/config.h
 delete mode 100644 keyboards/marcopad/keymaps/default/rules.mk

diff --git a/keyboards/marcopad/config.h b/keyboards/marcopad/config.h
deleted file mode 100644
index b660986fd6f3..000000000000
--- a/keyboards/marcopad/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright (c) 2022 Marco Pelegrini <marco@pelegrini.ca>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#define WS2812_DRIVER vendor
-#define WS2812_DI_PIN GP28
\ No newline at end of file
diff --git a/keyboards/marcopad/keyboard.json b/keyboards/marcopad/keyboard.json
index 3171bda0cd7b..d8fe02f283fd 100644
--- a/keyboards/marcopad/keyboard.json
+++ b/keyboards/marcopad/keyboard.json
@@ -6,6 +6,8 @@
 	"diode_direction": "ROW2COL",
 	"features": {
 		"bootmagic": true,
+		"rgblight": true,
+		"combo": true,
 		"command": false,
 		"console": false,
 		"extrakey": false,
@@ -22,7 +24,8 @@
 		"pid": "0x0000",
 		"vid": "0xFEED"
 	},
-	"backlight": {
+	"ws2812": {
+		"driver": "vendor",
 		"pin": "GP28"
 	},
 	"rgblight": {
@@ -42,8 +45,9 @@
 			"twinkle": true
 		}
 	},
+	"community_layouts": ["ortho_3x3"],
 	"layouts": {
-		"LAYOUT": {
+		"LAYOUT_ortho_3x3": {
 			"layout": [
 				{ "matrix": [0, 0], "x": 0, "y": 0 },
 				{ "matrix": [0, 1], "x": 0, "y": 1 },
diff --git a/keyboards/marcopad/keymaps/default/keymap.c b/keyboards/marcopad/keymaps/default/keymap.c
index 863c3d2303ae..f3c0abf18f15 100644
--- a/keyboards/marcopad/keymaps/default/keymap.c
+++ b/keyboards/marcopad/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │ 1 │ 2 │ 3 │
      * └───┴───┴───┘
      */
-    [0] = LAYOUT(
+    [0] = LAYOUT_ortho_3x3(
         KC_P7,   KC_P8,   KC_P9,
         KC_P4,   KC_P5,   KC_P6,
         KC_P1,   KC_P2,   KC_P3
diff --git a/keyboards/marcopad/keymaps/default/rules.mk b/keyboards/marcopad/keymaps/default/rules.mk
deleted file mode 100644
index 97828732936f..000000000000
--- a/keyboards/marcopad/keymaps/default/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = vendor
-COMBO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/marcopad/readme.md b/keyboards/marcopad/readme.md
index 96f3060665ea..ec3802e498f8 100644
--- a/keyboards/marcopad/readme.md
+++ b/keyboards/marcopad/readme.md
@@ -1,12 +1,12 @@
 # Marcopad
 
-![macropad](imgur.com image replace me!)
+![marcopad](https://pelegrini.ca/assets/img/marcopad/hardware/macropad.png)
 
 *A compact 3x3 keys macropad built with RP-2040 Zero*
 
-* Keyboard Maintainer: [Marco Pelegrini](https://pelegrini.ca/marcopad)
-* Hardware Supported: [Macropad PCB](https://pelegrini.ca/marcopad/hardware)
-* Hardware Availability: [Macropad](https://pelegrini.ca/marcopad)
+* Keyboard Maintainer: [pelegrini.ca](https://pelegrini.ca/marcopad)
+* Hardware Supported: [Marcopad](https://pelegrini.ca/marcopad)
+* Hardware Availability: [Marcopad](https://pelegrini.ca/marcopad)
 
 Make example for this keyboard (after setting up your build environment):