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":"Bksp", "x":0, "y":0},
-                {"label":"K01 (B3,B1)", "x":1, "y":0},
+                {"label":"=", "x":1, "y":0},
-                {"label":"K02 (B3,B2)", "x":2, "y":0},
+                {"label":"(", "x":2, "y":0},
-                {"label":"K03 (B3,B4)", "x":3, "y":0},
+                {"label":")", "x":3, "y":0},
-                {"label":"K10 (B5,B0)", "x":0, "y":1},
+                                
-                {"label":"K11 (B5,B1)", "x":1, "y":1},
+                {"label":"-", "x":0, "y":1},
-                {"label":"K12 (B5,B2)", "x":2, "y":1},
+                {"label":"*", "x":1, "y":1},
-                {"label":"K13 (B5,B4)", "x":3, "y":1},
+                {"label":"/", "x":2, "y":1},
-                {"label":"K30 (B7,B0)", "x":0, "y":2, "h":2},
+                {"label":"Num Lock", "x":3, "y":1},
-                {"label":"K21 (B6,B1)", "x":1, "y":2},
+                                
-                {"label":"K22 (B6,B2)", "x":2, "y":2},
+                {"label":"+", "x":0, "y":2, "h":2},
-                {"label":"K23 (B6,B4)", "x":3, "y":2},
+                {"label":"9", "x":1, "y":2},
-                {"label":"K31 (B7,B1)", "x":1, "y":3},
+                {"label":"8", "x":2, "y":2},
-                {"label":"K32 (B7,B2)", "x":2, "y":3},
+                {"label":"7", "x":3, "y":2},
-                {"label":"K33 (B7,B4)", "x":3, "y":3},
+                                
-                {"label":"K50 (C6,B0)", "x":0, "y":4, "h":2},
+                {"label":"6", "x":1, "y":3},
-                {"label":"K41 (C7,B1)", "x":1, "y":4},
+                {"label":"5", "x":2, "y":3},
-                {"label":"K42 (C7,B2)", "x":2, "y":4},
+                {"label":"4", "x":3, "y":3},
-                {"label":"K43 (C7,B4)", "x":3, "y":4},
+                                
-                {"label":"K51 (C6,B1)", "x":1, "y":5},
+                {"label":"Enter", "x":0, "y":4, "h":2},
-                {"label":"K53 (C6,B4)", "x":2, "y":5, "w":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

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 @@
5	"width": 4,	5	"width": 4,
6	"height": 6,	6	"height": 6,
7	"layouts": {	7	"layouts": {
8	"LAYOUT": {	8	"LAYOUT_numpad_6x4_southpaw": {
9	"layout": [	9	"layout": [
10	{"label":"K00 (B3,B0)", "x":0, "y":0},	10	{"label":"Bksp", "x":0, "y":0},
11	{"label":"K01 (B3,B1)", "x":1, "y":0},	11	{"label":"=", "x":1, "y":0},
12	{"label":"K02 (B3,B2)", "x":2, "y":0},	12	{"label":"(", "x":2, "y":0},
13	{"label":"K03 (B3,B4)", "x":3, "y":0},	13	{"label":")", "x":3, "y":0},
14	{"label":"K10 (B5,B0)", "x":0, "y":1},	14
15	{"label":"K11 (B5,B1)", "x":1, "y":1},	15	{"label":"-", "x":0, "y":1},
16	{"label":"K12 (B5,B2)", "x":2, "y":1},	16	{"label":"*", "x":1, "y":1},
17	{"label":"K13 (B5,B4)", "x":3, "y":1},	17	{"label":"/", "x":2, "y":1},
18	{"label":"K30 (B7,B0)", "x":0, "y":2, "h":2},	18	{"label":"Num Lock", "x":3, "y":1},
19	{"label":"K21 (B6,B1)", "x":1, "y":2},	19
20	{"label":"K22 (B6,B2)", "x":2, "y":2},	20	{"label":"+", "x":0, "y":2, "h":2},
21	{"label":"K23 (B6,B4)", "x":3, "y":2},	21	{"label":"9", "x":1, "y":2},
22	{"label":"K31 (B7,B1)", "x":1, "y":3},	22	{"label":"8", "x":2, "y":2},
23	{"label":"K32 (B7,B2)", "x":2, "y":3},	23	{"label":"7", "x":3, "y":2},
24	{"label":"K33 (B7,B4)", "x":3, "y":3},	24
25	{"label":"K50 (C6,B0)", "x":0, "y":4, "h":2},	25	{"label":"6", "x":1, "y":3},
26	{"label":"K41 (C7,B1)", "x":1, "y":4},	26	{"label":"5", "x":2, "y":3},
27	{"label":"K42 (C7,B2)", "x":2, "y":4},	27	{"label":"4", "x":3, "y":3},
28	{"label":"K43 (C7,B4)", "x":3, "y":4},	28
29	{"label":"K51 (C6,B1)", "x":1, "y":5},	29	{"label":"Enter", "x":0, "y":4, "h":2},
30	{"label":"K53 (C6,B4)", "x":2, "y":5, "w":2}	30	{"label":"3", "x":1, "y":4},
		31	{"label":"2", "x":2, "y":4},
		32	{"label":"1", "x":3, "y":4},
		33
		34	{"label":".", "x":1, "y":5},
		35	{"label":"0", "x":2, "y":5, "w":2}
31	]	36	]
32	}	37	}
33	}	38	}


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 @@
2	MCU = atmega32u2	2	MCU = atmega32u2
3		3
4	# Bootloader selection	4	# Bootloader selection
5	BOOTLOADER = bootloadHID	5	BOOTLOADER = atmel-dfu
6		6
7	# Build Options	7	# Build Options
8	# change yes to no to disable	8	# change yes to no to disable