From 0daccebaf9c5d3b5540643aa452f989bc5a74449 Mon Sep 17 00:00:00 2001
From: Logan Butler <8854426+MatchstickWorks@users.noreply.github.com>
Date: Wed, 18 Aug 2021 10:34:43 -0700
Subject: [PATCH] [Keyboard] Fixes to info.json and rules.mk for Southpad
 n(#14053)

Making info.json work better with the QMK Configurator and updating rules to work properly with the correct bootloader.
---
 keyboards/matchstickworks/southpad/info.json | 49 +++++++++++---------
 keyboards/matchstickworks/southpad/rules.mk  |  2 +-
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/keyboards/matchstickworks/southpad/info.json b/keyboards/matchstickworks/southpad/info.json
index a2a509fce..70a01d0f2 100644
--- a/keyboards/matchstickworks/southpad/info.json
+++ b/keyboards/matchstickworks/southpad/info.json
@@ -5,29 +5,34 @@
     "width": 4,
     "height": 6,
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_numpad_6x4_southpaw": {
             "layout": [
-                {"label":"K00 (B3,B0)", "x":0, "y":0},
-                {"label":"K01 (B3,B1)", "x":1, "y":0},
-                {"label":"K02 (B3,B2)", "x":2, "y":0},
-                {"label":"K03 (B3,B4)", "x":3, "y":0},
-                {"label":"K10 (B5,B0)", "x":0, "y":1},
-                {"label":"K11 (B5,B1)", "x":1, "y":1},
-                {"label":"K12 (B5,B2)", "x":2, "y":1},
-                {"label":"K13 (B5,B4)", "x":3, "y":1},
-                {"label":"K30 (B7,B0)", "x":0, "y":2, "h":2},
-                {"label":"K21 (B6,B1)", "x":1, "y":2},
-                {"label":"K22 (B6,B2)", "x":2, "y":2},
-                {"label":"K23 (B6,B4)", "x":3, "y":2},
-                {"label":"K31 (B7,B1)", "x":1, "y":3},
-                {"label":"K32 (B7,B2)", "x":2, "y":3},
-                {"label":"K33 (B7,B4)", "x":3, "y":3},
-                {"label":"K50 (C6,B0)", "x":0, "y":4, "h":2},
-                {"label":"K41 (C7,B1)", "x":1, "y":4},
-                {"label":"K42 (C7,B2)", "x":2, "y":4},
-                {"label":"K43 (C7,B4)", "x":3, "y":4},
-                {"label":"K51 (C6,B1)", "x":1, "y":5},
-                {"label":"K53 (C6,B4)", "x":2, "y":5, "w":2}
+                {"label":"Bksp", "x":0, "y":0},
+                {"label":"=", "x":1, "y":0},
+                {"label":"(", "x":2, "y":0},
+                {"label":")", "x":3, "y":0},
+				
+                {"label":"-", "x":0, "y":1},
+                {"label":"*", "x":1, "y":1},
+                {"label":"/", "x":2, "y":1},
+                {"label":"Num Lock", "x":3, "y":1},
+				
+                {"label":"+", "x":0, "y":2, "h":2},
+                {"label":"9", "x":1, "y":2},
+                {"label":"8", "x":2, "y":2},
+                {"label":"7", "x":3, "y":2},
+				
+                {"label":"6", "x":1, "y":3},
+                {"label":"5", "x":2, "y":3},
+                {"label":"4", "x":3, "y":3},
+				
+                {"label":"Enter", "x":0, "y":4, "h":2},
+                {"label":"3", "x":1, "y":4},
+                {"label":"2", "x":2, "y":4},
+                {"label":"1", "x":3, "y":4},
+				
+                {"label":".", "x":1, "y":5},
+                {"label":"0", "x":2, "y":5, "w":2}
             ]
         }
     }
diff --git a/keyboards/matchstickworks/southpad/rules.mk b/keyboards/matchstickworks/southpad/rules.mk
index 2641e3d33..dbea1a205 100644
--- a/keyboards/matchstickworks/southpad/rules.mk
+++ b/keyboards/matchstickworks/southpad/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32u2
 
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = atmel-dfu
 
 # Build Options
 #   change yes to no to disable