summaryrefslogtreecommitdiff
path: root/keyboards/orthodox
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/orthodox')
-rw-r--r--keyboards/orthodox/keymaps/drashna/config.h2
-rw-r--r--keyboards/orthodox/keymaps/rfvizarra/rules.mk0
-rw-r--r--keyboards/orthodox/keymaps/shaymdev/config.h5
-rw-r--r--keyboards/orthodox/orthodox.c1
-rw-r--r--keyboards/orthodox/orthodox.h13
-rw-r--r--keyboards/orthodox/rev1/config.h13
-rw-r--r--keyboards/orthodox/rev1/info.json64
-rw-r--r--keyboards/orthodox/rev1/rev1.c2
-rw-r--r--keyboards/orthodox/rev1/rev1.h40
-rw-r--r--keyboards/orthodox/rev3/config.h16
-rw-r--r--keyboards/orthodox/rev3/info.json64
-rw-r--r--keyboards/orthodox/rev3/rev3.c2
-rw-r--r--keyboards/orthodox/rev3/rev3.h40
-rw-r--r--keyboards/orthodox/rev3_teensy/config.h10
-rw-r--r--keyboards/orthodox/rev3_teensy/info.json66
-rw-r--r--keyboards/orthodox/rev3_teensy/rev3_teensy.c2
-rw-r--r--keyboards/orthodox/rev3_teensy/rev3_teensy.h40
17 files changed, 181 insertions, 199 deletions
diff --git a/keyboards/orthodox/keymaps/drashna/config.h b/keyboards/orthodox/keymaps/drashna/config.h
index f17deefb4e..502f364719 100644
--- a/keyboards/orthodox/keymaps/drashna/config.h
+++ b/keyboards/orthodox/keymaps/drashna/config.h
@@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LALT)))
#ifdef RGBLIGHT_ENABLE
-# define RGB_DI_PIN D3
+# define WS2812_DI_PIN D3
# define RGBLED_NUM 16 // Number of LEDs
# define RGBLED_SPLIT \
{ 8, 8 }
diff --git a/keyboards/orthodox/keymaps/rfvizarra/rules.mk b/keyboards/orthodox/keymaps/rfvizarra/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/orthodox/keymaps/rfvizarra/rules.mk
+++ /dev/null
diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h
index 5f20923107..7852878ee7 100644
--- a/keyboards/orthodox/keymaps/shaymdev/config.h
+++ b/keyboards/orthodox/keymaps/shaymdev/config.h
@@ -32,8 +32,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_KNIGHT
// #define RGBLED_SPLIT { 5, 5 }
-#undef RGB_DI_PIN
-#define RGB_DI_PIN D3
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN D3
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
#define RGBLIGHT_SLEEP
@@ -50,5 +50,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define COMBO_COUNT 1
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 220
diff --git a/keyboards/orthodox/orthodox.c b/keyboards/orthodox/orthodox.c
deleted file mode 100644
index 0b366e9449..0000000000
--- a/keyboards/orthodox/orthodox.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "orthodox.h" \ No newline at end of file
diff --git a/keyboards/orthodox/orthodox.h b/keyboards/orthodox/orthodox.h
deleted file mode 100644
index ebf13debb7..0000000000
--- a/keyboards/orthodox/orthodox.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_orthodox_rev1
- #include "rev1.h"
-#endif
-#ifdef KEYBOARD_orthodox_rev3
-#include "rev3.h"
-#endif
-#ifdef KEYBOARD_orthodox_rev3_teensy
-#include "rev3_teensy.h"
-#endif
diff --git a/keyboards/orthodox/rev1/config.h b/keyboards/orthodox/rev1/config.h
index 9b479a5d0c..c4261a79fb 100644
--- a/keyboards/orthodox/rev1/config.h
+++ b/keyboards/orthodox/rev1/config.h
@@ -21,19 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// wiring of each half
-
-
-//PRO MICRO
-#define MATRIX_ROW_PINS { D4, B4, B5 }
-#define MATRIX_COL_PINS { D7, F4, F5, F6, F7, B1, B3, B2, B6 }
-//#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4, D7 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* key combination for command */
#define IS_COMMAND() ( \
get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LGUI)) \
diff --git a/keyboards/orthodox/rev1/info.json b/keyboards/orthodox/rev1/info.json
index ea0a1692e4..042187b8bf 100644
--- a/keyboards/orthodox/rev1/info.json
+++ b/keyboards/orthodox/rev1/info.json
@@ -7,6 +7,11 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D7", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
@@ -15,14 +20,61 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0},
- {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [3, 5], "x": 13, "y": 0},
+ {"matrix": [3, 4], "x": 14, "y": 0},
+ {"matrix": [3, 3], "x": 15, "y": 0},
+ {"matrix": [3, 2], "x": 16, "y": 0},
+ {"matrix": [3, 1], "x": 17, "y": 0},
+ {"matrix": [3, 0], "x": 18, "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": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [1, 6], "x": 7, "y": 2.75, "h": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 2.75, "h": 1.25},
+
+ {"matrix": [4, 8], "x": 10, "y": 2.75, "h": 1.25},
+ {"matrix": [4, 6], "x": 11, "y": 2.75, "h": 1.25},
+
+ {"matrix": [4, 5], "x": 13, "y": 1},
+ {"matrix": [4, 4], "x": 14, "y": 1},
+ {"matrix": [4, 3], "x": 15, "y": 1},
+ {"matrix": [4, 2], "x": 16, "y": 1},
+ {"matrix": [4, 1], "x": 17, "y": 1},
+ {"matrix": [4, 0], "x": 18, "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": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [2, 6], "x": 6, "y": 3.75, "h": 1.25},
+ {"matrix": [2, 7], "x": 7, "y": 4},
+ {"matrix": [2, 8], "x": 8, "y": 4},
- {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":2.75, "h":1.25}, {"x":8, "y":2.75, "h":1.25},
- {"x":10, "y":2.75, "h":1.25}, {"x":11, "y":2.75, "h":1.25}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1},
+ {"matrix": [5, 8], "x": 10, "y": 4},
+ {"matrix": [5, 7], "x": 11, "y": 4},
+ {"matrix": [5, 6], "x": 12, "y": 3.75, "h": 1.25},
- {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":3.75, "h":1.25}, {"x":7, "y":4}, {"x":8, "y":4},
- {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":3.75, "h":1.25}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2}
+ {"matrix": [5, 5], "x": 13, "y": 2},
+ {"matrix": [5, 4], "x": 14, "y": 2},
+ {"matrix": [5, 3], "x": 15, "y": 2},
+ {"matrix": [5, 2], "x": 16, "y": 2},
+ {"matrix": [5, 1], "x": 17, "y": 2},
+ {"matrix": [5, 0], "x": 18, "y": 2}
]
}
}
diff --git a/keyboards/orthodox/rev1/rev1.c b/keyboards/orthodox/rev1/rev1.c
index 49deba4dbf..ecdae6b48d 100644
--- a/keyboards/orthodox/rev1/rev1.c
+++ b/keyboards/orthodox/rev1/rev1.c
@@ -19,7 +19,7 @@ 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 "orthodox.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/orthodox/rev1/rev1.h b/keyboards/orthodox/rev1/rev1.h
deleted file mode 100644
index d9d0b78dfc..0000000000
--- a/keyboards/orthodox/rev1/rev1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-This is the header file for the subproject
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 Art Ortenburger
-
-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 "orthodox.h"
-
-#include "quantum.h"
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, L16, L18, R10, R12, R13, R14, R15, R16, R17, R18, \
- L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, L18}, \
- { L20, L21, L22, L23, L24, L25, L26, L27, L28 }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R18, R17, R16, R15, R14, R13, R12, KC_NO, R10 }, \
- { R28, R27, R26, R25, R24, R23, R22, R21, R20 } \
- }
diff --git a/keyboards/orthodox/rev3/config.h b/keyboards/orthodox/rev3/config.h
index acefd95383..c4261a79fb 100644
--- a/keyboards/orthodox/rev3/config.h
+++ b/keyboards/orthodox/rev3/config.h
@@ -21,22 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// wiring of each half
-
-//REV.3 PRO MICRO
-#define MATRIX_ROW_PINS { D2, B4, B5 }
-#define MATRIX_COL_PINS { D7, F4, F5, B6, B2, B3, B1, F7, F6 }
-
-/*/
-//REV.3 TEENSY
-#define MATRIX_ROW_PINS { B0, C6, C7 }
-#define MATRIX_COL_PINS { D2, F5, F6, D6, D7, B4, B5, B6, F7 }
-/*/
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* key combination for command */
#define IS_COMMAND() ( \
get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LGUI)) \
diff --git a/keyboards/orthodox/rev3/info.json b/keyboards/orthodox/rev3/info.json
index a4525cc2f6..e2b3abd34d 100644
--- a/keyboards/orthodox/rev3/info.json
+++ b/keyboards/orthodox/rev3/info.json
@@ -7,6 +7,11 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D7", "F4", "F5", "B6", "B2", "B3", "B1", "F7", "F6"],
+ "rows": ["D2", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
@@ -15,14 +20,61 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0},
- {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [3, 5], "x": 13, "y": 0},
+ {"matrix": [3, 4], "x": 14, "y": 0},
+ {"matrix": [3, 3], "x": 15, "y": 0},
+ {"matrix": [3, 2], "x": 16, "y": 0},
+ {"matrix": [3, 1], "x": 17, "y": 0},
+ {"matrix": [3, 0], "x": 18, "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": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [1, 6], "x": 7, "y": 2.75, "h": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 2.75, "h": 1.25},
+
+ {"matrix": [4, 8], "x": 10, "y": 2.75, "h": 1.25},
+ {"matrix": [4, 6], "x": 11, "y": 2.75, "h": 1.25},
+
+ {"matrix": [4, 5], "x": 13, "y": 1},
+ {"matrix": [4, 4], "x": 14, "y": 1},
+ {"matrix": [4, 3], "x": 15, "y": 1},
+ {"matrix": [4, 2], "x": 16, "y": 1},
+ {"matrix": [4, 1], "x": 17, "y": 1},
+ {"matrix": [4, 0], "x": 18, "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": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [2, 6], "x": 6, "y": 3.75, "h": 1.25},
+ {"matrix": [2, 7], "x": 7, "y": 4},
+ {"matrix": [2, 8], "x": 8, "y": 4},
- {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":2.75, "h":1.25}, {"x":8, "y":2.75, "h":1.25},
- {"x":10, "y":2.75, "h":1.25}, {"x":11, "y":2.75, "h":1.25}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1},
+ {"matrix": [5, 8], "x": 10, "y": 4},
+ {"matrix": [5, 7], "x": 11, "y": 4},
+ {"matrix": [5, 6], "x": 12, "y": 3.75, "h": 1.25},
- {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":3.75, "h":1.25}, {"x":7, "y":4}, {"x":8, "y":4},
- {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":3.75, "h":1.25}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2}
+ {"matrix": [5, 5], "x": 13, "y": 2},
+ {"matrix": [5, 4], "x": 14, "y": 2},
+ {"matrix": [5, 3], "x": 15, "y": 2},
+ {"matrix": [5, 2], "x": 16, "y": 2},
+ {"matrix": [5, 1], "x": 17, "y": 2},
+ {"matrix": [5, 0], "x": 18, "y": 2}
]
}
}
diff --git a/keyboards/orthodox/rev3/rev3.c b/keyboards/orthodox/rev3/rev3.c
index 49deba4dbf..ecdae6b48d 100644
--- a/keyboards/orthodox/rev3/rev3.c
+++ b/keyboards/orthodox/rev3/rev3.c
@@ -19,7 +19,7 @@ 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 "orthodox.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/orthodox/rev3/rev3.h b/keyboards/orthodox/rev3/rev3.h
deleted file mode 100644
index d9d0b78dfc..0000000000
--- a/keyboards/orthodox/rev3/rev3.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-This is the header file for the subproject
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 Art Ortenburger
-
-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 "orthodox.h"
-
-#include "quantum.h"
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, L16, L18, R10, R12, R13, R14, R15, R16, R17, R18, \
- L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, L18}, \
- { L20, L21, L22, L23, L24, L25, L26, L27, L28 }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R18, R17, R16, R15, R14, R13, R12, KC_NO, R10 }, \
- { R28, R27, R26, R25, R24, R23, R22, R21, R20 } \
- }
diff --git a/keyboards/orthodox/rev3_teensy/config.h b/keyboards/orthodox/rev3_teensy/config.h
index 27435df7fd..c4261a79fb 100644
--- a/keyboards/orthodox/rev3_teensy/config.h
+++ b/keyboards/orthodox/rev3_teensy/config.h
@@ -21,16 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// wiring of each half
-
-//REV.3 TEENSY
-#define MATRIX_ROW_PINS { B0, C6, C7 }
-#define MATRIX_COL_PINS { D2, F5, F6, D6, D7, B4, B5, B6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* key combination for command */
#define IS_COMMAND() ( \
get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LGUI)) \
diff --git a/keyboards/orthodox/rev3_teensy/info.json b/keyboards/orthodox/rev3_teensy/info.json
index e6d6e98032..345ff58145 100644
--- a/keyboards/orthodox/rev3_teensy/info.json
+++ b/keyboards/orthodox/rev3_teensy/info.json
@@ -7,22 +7,74 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D2", "F5", "F6", "D6", "D7", "B4", "B5", "B6", "F7"],
+ "rows": ["B0", "C6", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
- "bootloader": "halfkay",
+ "bootloader": "halfkay",
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0},
- {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [3, 5], "x": 13, "y": 0},
+ {"matrix": [3, 4], "x": 14, "y": 0},
+ {"matrix": [3, 3], "x": 15, "y": 0},
+ {"matrix": [3, 2], "x": 16, "y": 0},
+ {"matrix": [3, 1], "x": 17, "y": 0},
+ {"matrix": [3, 0], "x": 18, "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": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [1, 6], "x": 7, "y": 2.75, "h": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 2.75, "h": 1.25},
+
+ {"matrix": [4, 8], "x": 10, "y": 2.75, "h": 1.25},
+ {"matrix": [4, 6], "x": 11, "y": 2.75, "h": 1.25},
+
+ {"matrix": [4, 5], "x": 13, "y": 1},
+ {"matrix": [4, 4], "x": 14, "y": 1},
+ {"matrix": [4, 3], "x": 15, "y": 1},
+ {"matrix": [4, 2], "x": 16, "y": 1},
+ {"matrix": [4, 1], "x": 17, "y": 1},
+ {"matrix": [4, 0], "x": 18, "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": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [2, 6], "x": 6, "y": 3.75, "h": 1.25},
+ {"matrix": [2, 7], "x": 7, "y": 4},
+ {"matrix": [2, 8], "x": 8, "y": 4},
- {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":2.75, "h":1.25}, {"x":8, "y":2.75, "h":1.25},
- {"x":10, "y":2.75, "h":1.25}, {"x":11, "y":2.75, "h":1.25}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1},
+ {"matrix": [5, 8], "x": 10, "y": 4},
+ {"matrix": [5, 7], "x": 11, "y": 4},
+ {"matrix": [5, 6], "x": 12, "y": 3.75, "h": 1.25},
- {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":3.75, "h":1.25}, {"x":7, "y":4}, {"x":8, "y":4},
- {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":3.75, "h":1.25}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2}
+ {"matrix": [5, 5], "x": 13, "y": 2},
+ {"matrix": [5, 4], "x": 14, "y": 2},
+ {"matrix": [5, 3], "x": 15, "y": 2},
+ {"matrix": [5, 2], "x": 16, "y": 2},
+ {"matrix": [5, 1], "x": 17, "y": 2},
+ {"matrix": [5, 0], "x": 18, "y": 2}
]
}
}
diff --git a/keyboards/orthodox/rev3_teensy/rev3_teensy.c b/keyboards/orthodox/rev3_teensy/rev3_teensy.c
index 49deba4dbf..ecdae6b48d 100644
--- a/keyboards/orthodox/rev3_teensy/rev3_teensy.c
+++ b/keyboards/orthodox/rev3_teensy/rev3_teensy.c
@@ -19,7 +19,7 @@ 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 "orthodox.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/orthodox/rev3_teensy/rev3_teensy.h b/keyboards/orthodox/rev3_teensy/rev3_teensy.h
deleted file mode 100644
index d9d0b78dfc..0000000000
--- a/keyboards/orthodox/rev3_teensy/rev3_teensy.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-This is the header file for the subproject
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 Art Ortenburger
-
-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 "orthodox.h"
-
-#include "quantum.h"
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, L16, L18, R10, R12, R13, R14, R15, R16, R17, R18, \
- L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, L18}, \
- { L20, L21, L22, L23, L24, L25, L26, L27, L28 }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R18, R17, R16, R15, R14, R13, R12, KC_NO, R10 }, \
- { R28, R27, R26, R25, R24, R23, R22, R21, R20 } \
- }
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-02 21:37:24 +0000