summaryrefslogtreecommitdiff
path: root/keyboards/kiwikeebs
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kiwikeebs')
-rw-r--r--keyboards/kiwikeebs/macro/config.h17
-rw-r--r--keyboards/kiwikeebs/macro/info.json21
-rw-r--r--keyboards/kiwikeebs/macro/macro.c29
-rw-r--r--keyboards/kiwikeebs/macro/macro.h35
-rw-r--r--keyboards/kiwikeebs/macro_v2/config.h17
-rw-r--r--keyboards/kiwikeebs/macro_v2/info.json20
-rw-r--r--keyboards/kiwikeebs/macro_v2/macro_v2.c29
-rw-r--r--keyboards/kiwikeebs/macro_v2/macro_v2.h35
8 files changed, 27 insertions, 176 deletions
diff --git a/keyboards/kiwikeebs/macro/config.h b/keyboards/kiwikeebs/macro/config.h
index 3d06b6bc04..2238a4171f 100644
--- a/keyboards/kiwikeebs/macro/config.h
+++ b/keyboards/kiwikeebs/macro/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, D7 }
-#define MATRIX_COL_PINS { F7, B1, B3, B2 }
-
-/* 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
/* Locking resynchronize hack */
diff --git a/keyboards/kiwikeebs/macro/info.json b/keyboards/kiwikeebs/macro/info.json
index ae6ed513a2..1cbffbd568 100644
--- a/keyboards/kiwikeebs/macro/info.json
+++ b/keyboards/kiwikeebs/macro/info.json
@@ -8,6 +8,11 @@
"pid": "0x4712",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F7", "B1", "B3", "B2"],
+ "rows": ["E6", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D1", "pin_b": "D0"}
@@ -18,14 +23,16 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "k00", "x": 0, "y": 0 },
- { "label": "k01", "x": 1, "y": 0 },
- { "label": "k02", "x": 2, "y": 0 },
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "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": 0, "w": 2, "h": 2}
- { "label": "k03", "x": 0, "y": 1 },
- { "label": "k04", "x": 1, "y": 1 },
- { "label": "k05", "x": 2, "y": 1 },
- { "label": "k06", "x": 3, "y": 0, "h":2, "w":2 }
]
}
}
diff --git a/keyboards/kiwikeebs/macro/macro.c b/keyboards/kiwikeebs/macro/macro.c
deleted file mode 100644
index 5eb03509e5..0000000000
--- a/keyboards/kiwikeebs/macro/macro.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 KiwiKeebs
- *
- * 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 "macro.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_AUDIO_VOL_UP);
- } else {
- tap_code(KC_AUDIO_VOL_DOWN);
- }
- }
- return true;
-}
diff --git a/keyboards/kiwikeebs/macro/macro.h b/keyboards/kiwikeebs/macro/macro.h
deleted file mode 100644
index ee7c6bd47d..0000000000
--- a/keyboards/kiwikeebs/macro/macro.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 KiwiKeebs
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k00, k01, k02, \
- k03, k04, k05, k06 \
-) { \
- { k00, k01, k02, KC_NO }, \
- { k03, k04, k05, k06 } \
-}
diff --git a/keyboards/kiwikeebs/macro_v2/config.h b/keyboards/kiwikeebs/macro_v2/config.h
index d5fe49330f..2238a4171f 100644
--- a/keyboards/kiwikeebs/macro_v2/config.h
+++ b/keyboards/kiwikeebs/macro_v2/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B5, B4 }
-#define MATRIX_COL_PINS { B6, C6, C7, D4 }
-
-/* 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
/* Locking resynchronize hack */
diff --git a/keyboards/kiwikeebs/macro_v2/info.json b/keyboards/kiwikeebs/macro_v2/info.json
index 168b3ba447..efdf6d860f 100644
--- a/keyboards/kiwikeebs/macro_v2/info.json
+++ b/keyboards/kiwikeebs/macro_v2/info.json
@@ -8,6 +8,11 @@
"pid": "0x4712",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B6", "C6", "C7", "D4"],
+ "rows": ["B5", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D7", "pin_b": "D6"}
@@ -18,14 +23,15 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "k00", "x": 0, "y": 0 },
- { "label": "k01", "x": 1, "y": 0 },
- { "label": "k02", "x": 2, "y": 0 },
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
- { "label": "k03", "x": 0, "y": 1 },
- { "label": "k04", "x": 1, "y": 1 },
- { "label": "k05", "x": 2, "y": 1 },
- { "label": "k06", "x": 3, "y": 0, "h":2, "w":2 }
+ {"matrix": [1, 3], "x": 3, "y": 0, "w": 2, "h": 2}
]
}
}
diff --git a/keyboards/kiwikeebs/macro_v2/macro_v2.c b/keyboards/kiwikeebs/macro_v2/macro_v2.c
deleted file mode 100644
index 795da21cc9..0000000000
--- a/keyboards/kiwikeebs/macro_v2/macro_v2.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 KiwiKeebs
- *
- * 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 "macro_v2.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_AUDIO_VOL_UP);
- } else {
- tap_code(KC_AUDIO_VOL_DOWN);
- }
- }
- return true;
-}
diff --git a/keyboards/kiwikeebs/macro_v2/macro_v2.h b/keyboards/kiwikeebs/macro_v2/macro_v2.h
deleted file mode 100644
index ee7c6bd47d..0000000000
--- a/keyboards/kiwikeebs/macro_v2/macro_v2.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 KiwiKeebs
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k00, k01, k02, \
- k03, k04, k05, k06 \
-) { \
- { k00, k01, k02, KC_NO }, \
- { k03, k04, k05, k06 } \
-}