Merge remote-tracking branch 'origin/master' into develop

11 files changed, 621 insertions, 0 deletions

diff --git a/keyboards/macro1/config.h b/keyboards/macro1/config.h
new file mode 100644
index 0000000000..54203ef2bf
--- /dev/null
+++ b/keyboards/macro1/config.h
@@ -0,0 +1,55 @@
+/* Copyright 2021 Laneware Peripherals 
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4C50 // "LP" = Laneware Peripherals
+#define PRODUCT_ID      0x9999
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Laneware Peripherals
+#define PRODUCT         MACRO-1
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 4
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { E6, B7, D0, D1, D2, B3 }
+#define MATRIX_COL_PINS { D3, D4, D6, D7 }
+#define UNUSED_PINS
+
+/*ENCODER*/
+#define ENCODERS_PAD_A { F0 }
+#define ENCODERS_PAD_B { F1 }
+#define ENCODER_RESOLUTION 4
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* 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
+
+
+
diff --git a/keyboards/macro1/info.json b/keyboards/macro1/info.json
new file mode 100644
index 0000000000..dbb7bafa74
--- /dev/null
+++ b/keyboards/macro1/info.json
@@ -0,0 +1,84 @@
+{
+    "keyboard_name": "MACRO1", 
+    "url": "", 
+    "maintainer": "qmk", 
+    "layouts":{
+      "LAYOUT_numpad":{
+        "layout":[
+          {"label":"Mute", "x":0, "y":0}, 
+          {"label":"Play", "x":2, "y":0}, 
+          {"label":"Backspace", "x":3, "y":0}, 
+          {"label":"Numlock", "x":0, "y":1}, 
+          {"label":"/", "x":1, "y":1}, 
+          {"label":"*", "x":2, "y":1},
+          {"label":"-", "x":3, "y":1}, 
+          {"label":"7", "x":0, "y":2}, 
+          {"label":"8", "x":1, "y":2}, 
+          {"label":"9", "x":2, "y":2}, 
+          {"label":"+", "x":3, "y":2, "h":2},
+          {"label":"4", "x":0, "y":3}, 
+          {"label":"5", "x":1, "y":3}, 
+          {"label":"6", "x":2, "y":3}, 
+          {"label":"1", "x":0, "y":4}, 
+          {"label":"2", "x":1, "y":4}, 
+          {"label":"3", "x":2, "y":4}, 
+          {"label":"Enter", "x":3, "y":4, "h":2}, 
+          {"label":"0", "x":0, "y":5, "w":2}, 
+          {"label":".", "x":2, "y":5}
+        ]
+      }, 
+
+      "LAYOUT_southpaw":{
+        "layout":[
+          {"label":"Mute", "x":0, "y":0}, 
+          {"label":"Play", "x":2, "y":0}, 
+          {"label":"Backspace", "x":3, "y":0}, 
+          {"label":"Numlock", "x":0, "y":1}, 
+          {"label":"/", "x":1, "y":1}, 
+          {"label":"*", "x":2, "y":1},
+          {"label":"-", "x":3, "y":1}, 
+          {"label":"+", "x":0, "y":2, "h":2}, 
+          {"label":"7", "x":1, "y":2}, 
+          {"label":"8", "x":2, "y":2}, 
+          {"label":"9", "x":3, "y":2},
+          {"label":"4", "x":1, "y":3}, 
+          {"label":"5", "x":2, "y":3}, 
+          {"label":"6", "x":3, "y":3}, 
+          {"label":"Enter", "x":0, "y":4, "h":2}, 
+          {"label":"1", "x":1, "y":4}, 
+          {"label":"2", "x":2, "y":4}, 
+          {"label":"3", "x":3, "y":4}, 
+          {"label":".", "x":1, "y":5}, 
+          {"label":"0", "x":2, "y":5, "w":2}
+        ]
+      },
+
+      "LAYOUT_macropad":{
+        "layout":[
+          {"label":"Mute", "x":0, "y":0}, 
+          {"label":"F1", "x":2, "y":0}, 
+          {"label":"F2", "x":3, "y":0}, 
+          {"label":"F3", "x":0, "y":1}, 
+          {"label":"F4", "x":1, "y":1}, 
+          {"label":"F5", "x":2, "y":1},
+          {"label":"F6", "x":3, "y":1}, 
+          {"label":"F7", "x":0, "y":2}, 
+          {"label":"F8", "x":1, "y":2}, 
+          {"label":"F9", "x":2, "y":2}, 
+          {"label":"F10", "x":3, "y":2},
+          {"label":"F11", "x":0, "y":3}, 
+          {"label":"F12", "x":1, "y":3}, 
+          {"label":"F13", "x":2, "y":3}, 
+          {"label":"F14", "x":3, "y":3}, 
+          {"label":"F15", "x":0, "y":4}, 
+          {"label":"F16", "x":1, "y":4}, 
+          {"label":"F17", "x":2, "y":4}, 
+          {"label":"F18", "x":3, "y":4}, 
+          {"label":"F19", "x":0, "y":5}, 
+          {"label":"F20", "x":1, "y":5},
+          {"label":"F21", "x":2, "y":5}, 
+          {"label":"F22", "x":3, "y":5}  
+        ]
+      } 
+  }
+}
\ No newline at end of file
diff --git a/keyboards/macro1/keymaps/default/keymap.c b/keyboards/macro1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..22cff4a718
--- /dev/null
+++ b/keyboards/macro1/keymaps/default/keymap.c
@@ -0,0 +1,64 @@
+ /* Copyright 2021 Laneware Peripherals
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+/* 
+ * ┌───┐   ┌───┬───┐ 
+ * │K00│   │K02│K03│
+ * └───┘   └───┴───┘ 
+ * ┌───┬───┬───┬───┐
+ * │K10│K11│K12│K13│
+ * ├───┼───┼───┼───┤ 
+ * │K20│K21│K22│K23│
+ * ├───┼───┼───┤   │ 
+ * │K30│K31│K32│   │
+ * ├───┼───┼───┼───┤ 
+ * │K40│K41│K42│K43│
+ * ├───┴───┼───┤   │ 
+ * │K50    │K52│   │
+ * └───────┴───┴───┘
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_numpad(
+		KC_MUTE, KC_MPLY,     KC_BSPC, 
+		KC_CALC, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, 
+		KC_KP_7, KC_KP_8,     KC_KP_9,        KC_KP_PLUS, 
+		KC_KP_4, KC_KP_5,     KC_KP_6, 
+		KC_KP_1, KC_KP_2,     KC_KP_3,        KC_KP_ENTER, 
+		KC_KP_0, KC_KP_DOT),
+
+	[1] = LAYOUT_numpad(
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS),
+
+	[2] = LAYOUT_numpad(
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS), };
+
+
+
+
diff --git a/keyboards/macro1/keymaps/macropad/keymap.c b/keyboards/macro1/keymaps/macropad/keymap.c
new file mode 100644
index 0000000000..68566fb53f
--- /dev/null
+++ b/keyboards/macro1/keymaps/macropad/keymap.c
@@ -0,0 +1,63 @@
+ /* Copyright 2021 Laneware Peripherals
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+/* 
+ * ┌───┐   ┌───┬───┐ 
+ * │K00│   │K01│K02│
+ * └───┘   └───┴───┘ 
+ * ┌───┬───┬───┬───┐
+ * │K10│K11│K12│K13│
+ * ├───┼───┼───┼───┤ 
+ * │K20│K21│K22│K23│
+ * ├───┼───┼───┼───┤ 
+ * │K30│K31│K32│K33│
+ * ├───┼───┼───┼───┤ 
+ * │K40│K41│K42│K43│
+ * ├───┼───┼───┼───┤ 
+ * │K50│K51│K52│K53│
+ * └───┴───┴───┴───┘
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_macropad(
+		KC_MUTE, KC_F1,  KC_F2, 
+		KC_F3,   KC_F4,  KC_F5,  KC_F6, 
+		KC_F7,   KC_F8,  KC_F9,  KC_F10,  
+		KC_F11,  KC_F12, KC_F13, KC_F14, 
+		KC_F15,  KC_F16, KC_F17, KC_F18,  
+		KC_F19,  KC_F20, KC_F21, KC_F22),
+
+	[1] = LAYOUT_macropad(
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[2] = LAYOUT_macropad(
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), };
+
+
+
diff --git a/keyboards/macro1/keymaps/southpaw/keymap.c b/keyboards/macro1/keymaps/southpaw/keymap.c
new file mode 100644
index 0000000000..b8c6bfb339
--- /dev/null
+++ b/keyboards/macro1/keymaps/southpaw/keymap.c
@@ -0,0 +1,63 @@
+ /* Copyright 2021 Laneware Peripherals
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+/* 
+ * ┌───┐   ┌───┬───┐ 
+ * │K00│   │K02│K03│
+ * └───┘   └───┴───┘ 
+ * ┌───┬───┬───┬───┐
+ * │K10│K11│K12│K13│
+ * ├───┼───┼───┼───┤ 
+ * │K20│K21│K22│K23│
+ * │   ├───┼───┼───┤ 
+ * │   │K31│K32│K33│
+ * ├───┼───┼───┼───┤ 
+ * │K40│K41│K42│K43│
+ * │   ├───┼───┴───┤ 
+ * │   │K51│K52    │
+ * └───┴───┴───────┘
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_southpaw(
+		KC_MUTE,     KC_MPLY,     KC_BSPC, 
+		KC_CALC,     KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, 
+		KC_KP_PLUS,  KC_KP_7,     KC_KP_8,        KC_KP_9,  
+		KC_KP_4,     KC_KP_5,     KC_KP_6, 
+		KC_KP_ENTER, KC_KP_1,     KC_KP_2,        KC_KP_3,  
+		KC_KP_DOT,   KC_KP_0),
+
+	[1] = LAYOUT_southpaw(
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS),
+
+	[2] = LAYOUT_southpaw(
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS), };
+
+
+
diff --git a/keyboards/macro1/keymaps/via/keymap.c b/keyboards/macro1/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f3e53a78e9
--- /dev/null
+++ b/keyboards/macro1/keymaps/via/keymap.c
@@ -0,0 +1,103 @@
+ /* Copyright 2021 Laneware Peripherals
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+/* 
+ * ┌───┐   ┌───┬───┐ 
+ * │K00│   │K02│K03│
+ * └───┘   └───┴───┘ 
+ * ┌───┬───┬───┬───┐
+ * │K10│K11│K12│K13│
+ * ├───┼───┼───┼───┤ 
+ * │K20│K21│K22│K23│
+ * ├───┼───┼───┤   │ 
+ * │K30│K31│K32│   │
+ * ├───┼───┼───┼───┤ 
+ * │K40│K41│K42│K43│
+ * ├───┴───┼───┤   │ 
+ * │K50    │K52│   │
+ * └───────┴───┴───┘
+ */
+
+ /* 
+ * ┌───┐   ┌───┬───┐ 
+ * │K00│   │K02│K03│
+ * └───┘   └───┴───┘ 
+ * ┌───┬───┬───┬───┐
+ * │K10│K11│K12│K13│
+ * ├───┼───┼───┼───┤ 
+ * │K20│K21│K22│K23│
+ * │   ├───┼───┼───┤ 
+ * │   │K31│K32│K33│
+ * ├───┼───┼───┼───┤ 
+ * │K40│K41│K42│K43│
+ * │   ├───┼───┴───┤ 
+ * │   │K51│K52    │
+ * └───┴───┴───────┘
+ */
+
+/* 
+ * ┌───┐   ┌───┬───┐ 
+ * │K00│   │K01│K02│
+ * └───┘   └───┴───┘ 
+ * ┌───┬───┬───┬───┐
+ * │K10│K11│K12│K13│
+ * ├───┼───┼───┼───┤ 
+ * │K20│K21│K22│K23│
+ * ├───┼───┼───┼───┤ 
+ * │K30│K31│K32│K33│
+ * ├───┼───┼───┼───┤ 
+ * │K40│K41│K42│K43│
+ * ├───┼───┼───┼───┤ 
+ * │K50│K51│K52│K53│
+ * └───┴───┴───┴───┘
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_numpad(
+		KC_MUTE, KC_MPLY,     KC_BSPC, 
+		KC_CALC, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, 
+		KC_KP_7, KC_KP_8,     KC_KP_9,        KC_KP_PLUS, 
+		KC_KP_4, KC_KP_5,     KC_KP_6, 
+		KC_KP_1, KC_KP_2,     KC_KP_3,        KC_KP_ENTER, 
+		KC_KP_0, KC_KP_DOT),
+
+	[1] = LAYOUT_numpad(
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS),
+
+	[2] = LAYOUT_numpad(
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS),
+
+	[3] = LAYOUT_numpad(
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS), };
+
diff --git a/keyboards/macro1/keymaps/via/rules.mk b/keyboards/macro1/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/macro1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/macro1/macro1.c b/keyboards/macro1/macro1.c
new file mode 100644
index 0000000000..b470ed523f
--- /dev/null
+++ b/keyboards/macro1/macro1.c
@@ -0,0 +1,29 @@
+ /* Copyright 2021 Laneware Peripherals
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include "macro1.h"
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } 
+        return false; 
+}
+
diff --git a/keyboards/macro1/macro1.h b/keyboards/macro1/macro1.h
new file mode 100644
index 0000000000..1066258050
--- /dev/null
+++ b/keyboards/macro1/macro1.h
@@ -0,0 +1,115 @@
+ /* Copyright 2021 Laneware Peripherals
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#pragma once
+
+#include "quantum.h"
+
+/* KEYMAP_numpad
+ * ┌───┐   ┌───┬───┐ 
+ * │K00│   │K02│K03│
+ * └───┘   └───┴───┘ 
+ * ┌───┬───┬───┬───┐
+ * │K10│K11│K12│K13│
+ * ├───┼───┼───┼───┤ 
+ * │K20│K21│K22│K23│
+ * ├───┼───┼───┤   │ 
+ * │K30│K31│K32│   │
+ * ├───┼───┼───┼───┤ 
+ * │K40│K41│K42│K43│
+ * ├───┴───┼───┤   │ 
+ * │K50    │K52│   │
+ * └───────┴───┴───┘
+ */
+#define LAYOUT_numpad( \
+	K00,      K02, K03, \
+	K10, K11, K12, K13, \
+	K20, K21, K22, K23, \
+	K30, K31, K32,      \
+	K40, K41, K42, K43, \
+	K50,      K52  \
+) { \
+	{ K00,   KC_NO, K02,   K03 }, \
+	{ K10,   K11,   K12,   K13 }, \
+	{ K20,   K21,   K22,   K23 }, \
+	{ K30,   K31,   K32,   KC_NO }, \
+	{ K40,   K41,   K42,   K43 }, \
+	{ K50,   KC_NO, K52,   KC_NO }  \
+}
+
+/* KEYMAP_southpaw
+ * ┌───┐   ┌───┬───┐ 
+ * │K00│   │K02│K03│
+ * └───┘   └───┴───┘ 
+ * ┌───┬───┬───┬───┐
+ * │K10│K11│K12│K13│
+ * ├───┼───┼───┼───┤ 
+ * │K20│K21│K22│K23│
+ * │   ├───┼───┼───┤ 
+ * │   │K31│K32│K33│
+ * ├───┼───┼───┼───┤ 
+ * │K40│K41│K42│K43│
+ * │   ├───┼───┴───┤ 
+ * │   │K51│K52    │
+ * └───┴───┴───────┘
+ */
+#define LAYOUT_southpaw( \
+	K00,      K02, K03, \
+	K10, K11, K12, K13, \
+	K20, K21, K22, K23, \
+	     K31, K32, K33, \
+	K40, K41, K42, K43, \
+	     K51, K52  \
+) { \
+	{ K00,   KC_NO, K02,   K03 }, \
+	{ K10,   K11,   K12,   K13 }, \
+	{ K20,   K21,   K22,   K23 }, \
+	{ KC_NO, K31,   K32,   K33 }, \
+	{ K40,   K41,   K42,   K43 }, \
+	{ KC_NO, K51,   K52,   KC_NO }  \
+}
+
+/* KEYMAP_macropad
+ * ┌───┐   ┌───┬───┐ 
+ * │K00│   │K01│K02│
+ * └───┘   └───┴───┘ 
+ * ┌───┬───┬───┬───┐
+ * │K10│K11│K12│K13│
+ * ├───┼───┼───┼───┤ 
+ * │K20│K21│K22│K23│
+ * ├───┼───┼───┼───┤ 
+ * │K30│K31│K32│K33│
+ * ├───┼───┼───┼───┤ 
+ * │K40│K41│K42│K43│
+ * ├───┼───┼───┼───┤ 
+ * │K50│K51│K52│K53│
+ * └───┴───┴───┴───┘
+ */
+#define LAYOUT_macropad( \
+	K00,      K02, K03, \
+	K10, K11, K12, K13, \
+	K20, K21, K22, K23, \
+	K30, K31, K32, K33, \
+	K40, K41, K42, K43, \
+	K50, K51, K52, K53  \
+) { \
+	{ K00,   KC_NO,  K02,  K03 }, \
+	{ K10,   K11,   K12,   K13 }, \
+	{ K20,   K21,   K22,   K23 }, \
+	{ K30,   K31,   K32,   K33 }, \
+	{ K40,   K41,   K42,   K43 }, \
+	{ K50,   K51,   K52,   K53 }  \
+}
diff --git a/keyboards/macro1/readme.md b/keyboards/macro1/readme.md
new file mode 100644
index 0000000000..578a34e1c7
--- /dev/null
+++ b/keyboards/macro1/readme.md
@@ -0,0 +1,22 @@
+# Macro-1
+
+![Macro-1](https://i.imgur.com/pnTgKuTh.jpeg)
+
+A versitile numpad/macropad (14x6) with a rotary encoder, made and sold by Laneware Peripherals.
+
+* Keyboard Maintainer: [Laneware Peripherals](https://github.com/laneware)
+* Hardware Supported: Macro-1
+* Hardware Availability: [Laneware Peripherals](https://lanewareperipherals.com/), 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make macro1:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the encoder and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
diff --git a/keyboards/macro1/rules.mk b/keyboards/macro1/rules.mk
new file mode 100644
index 0000000000..6822271603
--- /dev/null
+++ b/keyboards/macro1/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# 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
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
\ No newline at end of file