summaryrefslogtreecommitdiff
path: root/keyboards/macro1
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/macro1')
-rw-r--r--keyboards/macro1/config.h8
-rw-r--r--keyboards/macro1/info.json187
-rw-r--r--keyboards/macro1/macro1.c31
-rw-r--r--keyboards/macro1/macro1.h115
4 files changed, 104 insertions, 237 deletions
diff --git a/keyboards/macro1/config.h b/keyboards/macro1/config.h
index a03f212f37..30b3906f0d 100644
--- a/keyboards/macro1/config.h
+++ b/keyboards/macro1/config.h
@@ -16,14 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6, B7, D0, D1, D2, B3 }
-#define MATRIX_COL_PINS { D3, D4, D6, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/macro1/info.json b/keyboards/macro1/info.json
index ae4de40310..dd22627031 100644
--- a/keyboards/macro1/info.json
+++ b/keyboards/macro1/info.json
@@ -1,13 +1,18 @@
{
- "keyboard_name": "MACRO-1",
+ "keyboard_name": "MACRO-1",
"manufacturer": "Laneware Peripherals",
- "url": "",
- "maintainer": "qmk",
+ "url": "",
+ "maintainer": "qmk",
"usb": {
"vid": "0x4C50",
"pid": "0x9999",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D3", "D4", "D6", "D7"],
+ "rows": ["E6", "B7", "D0", "D1", "D2", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F0", "pin_b": "F1"}
@@ -15,83 +20,99 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
- "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
+ "layouts": {
+ "LAYOUT_numpad": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4, "h": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+ {"matrix": [5, 2], "x": 2, "y": 5}
+ ]
+ },
+ "LAYOUT_southpaw": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "h": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "h": 2},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+
+ {"matrix": [5, 1], "x": 1, "y": 5},
+ {"matrix": [5, 2], "x": 2, "y": 5, "w": 2}
+ ]
+ },
+ "LAYOUT_macropad": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5},
+ {"matrix": [5, 1], "x": 1, "y": 5},
+ {"matrix": [5, 2], "x": 2, "y": 5},
+ {"matrix": [5, 3], "x": 3, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/macro1/macro1.c b/keyboards/macro1/macro1.c
deleted file mode 100644
index f1fbed1d15..0000000000
--- a/keyboards/macro1/macro1.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* 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_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) {
- return false;
- }
- 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
deleted file mode 100644
index 1066258050..0000000000
--- a/keyboards/macro1/macro1.h
+++ /dev/null
@@ -1,115 +0,0 @@
- /* 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 } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 05:10:06 +0000