diff options
Diffstat (limited to 'keyboards/orthodox')
-rw-r--r-- | keyboards/orthodox/keymaps/drashna/config.h | 2 | ||||
-rw-r--r-- | keyboards/orthodox/keymaps/oscillope/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/orthodox/keymaps/rfvizarra/rules.mk | 0 | ||||
-rw-r--r-- | keyboards/orthodox/keymaps/shaymdev/config.h | 7 | ||||
-rw-r--r-- | keyboards/orthodox/keymaps/shaymdev/keymap.c | 38 | ||||
-rw-r--r-- | keyboards/orthodox/orthodox.c | 1 | ||||
-rw-r--r-- | keyboards/orthodox/orthodox.h | 13 | ||||
-rw-r--r-- | keyboards/orthodox/rev1/config.h | 13 | ||||
-rw-r--r-- | keyboards/orthodox/rev1/info.json | 64 | ||||
-rw-r--r-- | keyboards/orthodox/rev1/rev1.c | 2 | ||||
-rw-r--r-- | keyboards/orthodox/rev1/rev1.h | 40 | ||||
-rw-r--r-- | keyboards/orthodox/rev3/config.h | 16 | ||||
-rw-r--r-- | keyboards/orthodox/rev3/info.json | 64 | ||||
-rw-r--r-- | keyboards/orthodox/rev3/rev3.c | 2 | ||||
-rw-r--r-- | keyboards/orthodox/rev3/rev3.h | 40 | ||||
-rw-r--r-- | keyboards/orthodox/rev3_teensy/config.h | 10 | ||||
-rw-r--r-- | keyboards/orthodox/rev3_teensy/info.json | 66 | ||||
-rw-r--r-- | keyboards/orthodox/rev3_teensy/rev3_teensy.c | 2 | ||||
-rw-r--r-- | keyboards/orthodox/rev3_teensy/rev3_teensy.h | 40 |
19 files changed, 200 insertions, 221 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/oscillope/rules.mk b/keyboards/orthodox/keymaps/oscillope/rules.mk index fb77881d96..72fe328aac 100644 --- a/keyboards/orthodox/keymaps/oscillope/rules.mk +++ b/keyboards/orthodox/keymaps/oscillope/rules.mk @@ -1,3 +1,2 @@ -SUBPROJECT_rev1 = no COMMAND_ENABLE = no MOUSEKEY_ENABLE = no 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..79d7cddec0 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 @@ -48,7 +48,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. } #endif -#define COMBO_COUNT 1 - -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 220 diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index 495a61c2e4..24fca7661e 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include QMK_KEYBOARD_H -enum orthodox_layers +enum orthodox_layers { _DVORAK, _QWERTY, @@ -30,14 +30,14 @@ enum orthodox_layers _ADJUST, }; -enum combos //match combo_count in config.h +enum combos { EU_ENT, }; const uint16_t PROGMEM eu_combo[] = {KC_E, KC_U, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [EU_ENT] = COMBO_ACTION(eu_combo), }; @@ -66,33 +66,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DVORAK] = LAYOUT( - KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, - KC_TAB, GUI_T(KC_A), ALT_T(KC_O), KC_E, KC_U, KC_I, KC_ENT, KC_LALT, KC_DEL, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, - KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, TT(LOWER), KC_LSFT, KC_LCTL, KC_BSPC, ALT_T(KC_SPC), TT(RAISE), KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS + KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, + KC_TAB, GUI_T(KC_A), ALT_T(KC_O), KC_E, KC_U, KC_I, KC_ENT, KC_LALT, KC_DEL, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, + KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, TT(LOWER), KC_LSFT, KC_LCTL, KC_BSPC, ALT_T(KC_SPC), TT(RAISE), KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS ), -[_QWERTY] = LAYOUT( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, _______, _______, _______, _______, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, _______, _______, _______, _______, _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT +[_QWERTY] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, _______, _______, _______, _______, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, _______, _______, _______, _______, _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT ), -[_LOWER] = LAYOUT( - _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, - _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, - _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______ +[_LOWER] = LAYOUT( + _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, + _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, + _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______ ), -[_RAISE] = LAYOUT( +[_RAISE] = LAYOUT( _______, KC_PSCR, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, KC_CAPS, KC_INS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX, _______, KC_NUM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX ), -[_ADJUST] = LAYOUT( - TO_DV, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLEP, - RGB_TOG, RGB_MOD, VK_TOGG, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, - RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY +[_ADJUST] = LAYOUT( + TO_DV, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLEP, + RGB_TOG, RGB_MOD, VK_TOGG, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, + RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ) 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 } \ - } |