diff options
Diffstat (limited to 'keyboards/orthodox')
-rw-r--r-- | keyboards/orthodox/keymaps/rfvizarra/rules.mk | 0 | ||||
-rw-r--r-- | keyboards/orthodox/keymaps/shaymdev/config.h | 1 | ||||
-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 | 5 | ||||
-rw-r--r-- | keyboards/orthodox/rev1/rev1.c | 2 | ||||
-rw-r--r-- | keyboards/orthodox/rev1/rev1.h | 2 | ||||
-rw-r--r-- | keyboards/orthodox/rev3/config.h | 16 | ||||
-rw-r--r-- | keyboards/orthodox/rev3/info.json | 5 | ||||
-rw-r--r-- | keyboards/orthodox/rev3/rev3.c | 2 | ||||
-rw-r--r-- | keyboards/orthodox/rev3/rev3.h | 2 | ||||
-rw-r--r-- | keyboards/orthodox/rev3_teensy/config.h | 10 | ||||
-rw-r--r-- | keyboards/orthodox/rev3_teensy/info.json | 5 | ||||
-rw-r--r-- | keyboards/orthodox/rev3_teensy/rev3_teensy.c | 2 | ||||
-rw-r--r-- | keyboards/orthodox/rev3_teensy/rev3_teensy.h | 2 |
16 files changed, 18 insertions, 63 deletions
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..2fa05fda7c 100644 --- a/keyboards/orthodox/keymaps/shaymdev/config.h +++ b/keyboards/orthodox/keymaps/shaymdev/config.h @@ -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..0200ccdc5c 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" }, diff --git a/keyboards/orthodox/rev1/rev1.c b/keyboards/orthodox/rev1/rev1.c index 49deba4dbf..1101f4379b 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 "rev1.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/orthodox/rev1/rev1.h b/keyboards/orthodox/rev1/rev1.h index d9d0b78dfc..328cb46cc1 100644 --- a/keyboards/orthodox/rev1/rev1.h +++ b/keyboards/orthodox/rev1/rev1.h @@ -21,8 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "orthodox.h" - #include "quantum.h" #define LAYOUT( \ 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..0681d736f9 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" }, diff --git a/keyboards/orthodox/rev3/rev3.c b/keyboards/orthodox/rev3/rev3.c index 49deba4dbf..79af5cd668 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 "rev3.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/orthodox/rev3/rev3.h b/keyboards/orthodox/rev3/rev3.h index d9d0b78dfc..328cb46cc1 100644 --- a/keyboards/orthodox/rev3/rev3.h +++ b/keyboards/orthodox/rev3/rev3.h @@ -21,8 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "orthodox.h" - #include "quantum.h" #define LAYOUT( \ 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..9a292b0f74 100644 --- a/keyboards/orthodox/rev3_teensy/info.json +++ b/keyboards/orthodox/rev3_teensy/info.json @@ -7,6 +7,11 @@ "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" }, diff --git a/keyboards/orthodox/rev3_teensy/rev3_teensy.c b/keyboards/orthodox/rev3_teensy/rev3_teensy.c index 49deba4dbf..9faf94fd9a 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 "rev3_teensy.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 index d9d0b78dfc..328cb46cc1 100644 --- a/keyboards/orthodox/rev3_teensy/rev3_teensy.h +++ b/keyboards/orthodox/rev3_teensy/rev3_teensy.h @@ -21,8 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "orthodox.h" - #include "quantum.h" #define LAYOUT( \ |