summaryrefslogtreecommitdiff
path: root/keyboards/handwired/chiron
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/chiron')
-rw-r--r--keyboards/handwired/chiron/chiron.c16
-rw-r--r--keyboards/handwired/chiron/chiron.h42
-rw-r--r--keyboards/handwired/chiron/config.h10
-rw-r--r--keyboards/handwired/chiron/info.json156
-rw-r--r--keyboards/handwired/chiron/keymaps/default/config.h1
-rw-r--r--keyboards/handwired/chiron/keymaps/default/rules.mk0
6 files changed, 88 insertions, 137 deletions
diff --git a/keyboards/handwired/chiron/chiron.c b/keyboards/handwired/chiron/chiron.c
deleted file mode 100644
index 997cda6a4d..0000000000
--- a/keyboards/handwired/chiron/chiron.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Mike Hix
- *
- * 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 "chiron.h"
diff --git a/keyboards/handwired/chiron/chiron.h b/keyboards/handwired/chiron/chiron.h
deleted file mode 100644
index 9d1ab385a5..0000000000
--- a/keyboards/handwired/chiron/chiron.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 Mike Hix
- *
- * 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"
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \
- ) \
- { \
- /* Left Half */ \
- { L06, L05, L04, L03, L02, L01, L00 }, \
- { L16, L15, L14, L13, L12, L11, L10 }, \
- { L26, L25, L24, L23, L22, L21, L20 }, \
- { L36, L35, L34, L33, L32, L31, L30 }, \
- { L45, L44, L43, KC_NO, L42, L41, L40 }, \
- /* Right Half */ \
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, R20 }, \
- { R36, R35, R34, R33, R32, R31, R30 }, \
- { R45, R44, R43, KC_NO, R42, R41, R40 } \
- }
-
-#define LAYOUT_chiron LAYOUT
diff --git a/keyboards/handwired/chiron/config.h b/keyboards/handwired/chiron/config.h
index d881fecbaa..677804cbe9 100644
--- a/keyboards/handwired/chiron/config.h
+++ b/keyboards/handwired/chiron/config.h
@@ -17,20 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// Pro Micro Pins 4, 6, 7, 8, 9
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-// Pro Micro Pins A3, A2, A1, A0, 15, 14, 16
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-
// Pro Micro Pins RX1
#define SPLIT_HAND_PIN D2
-#define DIODE_DIRECTION COL2ROW
-
#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE
-#define RGB_DI_PIN D3
#define RGBLED_NUM 4
diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json
index b1590d8ded..2cb9a7a4d9 100644
--- a/keyboards/handwired/chiron/info.json
+++ b/keyboards/handwired/chiron/info.json
@@ -8,86 +8,106 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 7
},
+ "ws2812": {
+ "pin": "D3"
+ },
"split": {
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_chiron": "LAYOUT"
+ },
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"L06", "x":6, "y":0},
- {"label":"R00", "x":8, "y":0},
- {"label":"R01", "x":9, "y":0},
- {"label":"R02", "x":10, "y":0},
- {"label":"R03", "x":11, "y":0},
- {"label":"R04", "x":12, "y":0},
- {"label":"R05", "x":13, "y":0},
- {"label":"R06", "x":14, "y":0},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1},
- {"label":"L16", "x":6, "y":1},
- {"label":"R10", "x":8, "y":1},
- {"label":"R11", "x":9, "y":1},
- {"label":"R12", "x":10, "y":1},
- {"label":"R13", "x":11, "y":1},
- {"label":"R14", "x":12, "y":1},
- {"label":"R15", "x":13, "y":1},
- {"label":"R16", "x":14, "y":1},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2},
- {"label":"L26", "x":6, "y":2},
- {"label":"R20", "x":8, "y":2},
- {"label":"R21", "x":9, "y":2},
- {"label":"R22", "x":10, "y":2},
- {"label":"R23", "x":11, "y":2},
- {"label":"R24", "x":12, "y":2},
- {"label":"R25", "x":13, "y":2},
- {"label":"R26", "x":14, "y":2},
- {"label":"L30", "x":0, "y":3},
- {"label":"L31", "x":1, "y":3},
- {"label":"L32", "x":2, "y":3},
- {"label":"L33", "x":3, "y":3},
- {"label":"L34", "x":4, "y":3},
- {"label":"L35", "x":5, "y":3},
- {"label":"L36", "x":6, "y":3},
- {"label":"R30", "x":8, "y":3},
- {"label":"R31", "x":9, "y":3},
- {"label":"R32", "x":10, "y":3},
- {"label":"R33", "x":11, "y":3},
- {"label":"R34", "x":12, "y":3},
- {"label":"R35", "x":13, "y":3},
- {"label":"R36", "x":14, "y":3},
- {"label":"L40", "x":0, "y":4},
- {"label":"L41", "x":1, "y":4},
- {"label":"L42", "x":2, "y":4},
- {"label":"L43", "x":4, "y":4, "h":1.25},
- {"label":"L44", "x":5, "y":4, "h":1.25},
- {"label":"L45", "x":6, "y":4, "h":1.25},
- {"label":"R40", "x":8, "y":4, "h":1.25},
- {"label":"R41", "x":9, "y":4, "h":1.25},
- {"label":"R42", "x":10, "y":4, "h":1.25},
- {"label":"R43", "x":12, "y":4},
- {"label":"R44", "x":13, "y":4},
- {"label":"R45", "x":14, "y":4}
+ {"matrix": [0, 6], "x": 0, "y": 0},
+ {"matrix": [0, 5], "x": 1, "y": 0},
+ {"matrix": [0, 4], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [0, 1], "x": 5, "y": 0},
+ {"matrix": [0, 0], "x": 6, "y": 0},
+
+ {"matrix": [5, 6], "x": 8, "y": 0},
+ {"matrix": [5, 5], "x": 9, "y": 0},
+ {"matrix": [5, 4], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0},
+ {"matrix": [5, 1], "x": 13, "y": 0},
+ {"matrix": [5, 0], "x": 14, "y": 0},
+
+ {"matrix": [1, 6], "x": 0, "y": 1},
+ {"matrix": [1, 5], "x": 1, "y": 1},
+ {"matrix": [1, 4], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 1], "x": 5, "y": 1},
+ {"matrix": [1, 0], "x": 6, "y": 1},
+
+ {"matrix": [6, 6], "x": 8, "y": 1},
+ {"matrix": [6, 5], "x": 9, "y": 1},
+ {"matrix": [6, 4], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1},
+ {"matrix": [6, 1], "x": 13, "y": 1},
+ {"matrix": [6, 0], "x": 14, "y": 1},
+
+ {"matrix": [2, 6], "x": 0, "y": 2},
+ {"matrix": [2, 5], "x": 1, "y": 2},
+ {"matrix": [2, 4], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 2], "x": 4, "y": 2},
+ {"matrix": [2, 1], "x": 5, "y": 2},
+ {"matrix": [2, 0], "x": 6, "y": 2},
+
+ {"matrix": [7, 6], "x": 8, "y": 2},
+ {"matrix": [7, 5], "x": 9, "y": 2},
+ {"matrix": [7, 4], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2},
+ {"matrix": [7, 1], "x": 13, "y": 2},
+ {"matrix": [7, 0], "x": 14, "y": 2},
+
+ {"matrix": [3, 6], "x": 0, "y": 3},
+ {"matrix": [3, 5], "x": 1, "y": 3},
+ {"matrix": [3, 4], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 1], "x": 5, "y": 3},
+ {"matrix": [3, 0], "x": 6, "y": 3},
+
+ {"matrix": [8, 6], "x": 8, "y": 3},
+ {"matrix": [8, 5], "x": 9, "y": 3},
+ {"matrix": [8, 4], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 2], "x": 12, "y": 3},
+ {"matrix": [8, 1], "x": 13, "y": 3},
+ {"matrix": [8, 0], "x": 14, "y": 3},
+
+ {"matrix": [4, 6], "x": 0, "y": 4},
+ {"matrix": [4, 5], "x": 1, "y": 4},
+ {"matrix": [4, 4], "x": 2, "y": 4},
+ {"matrix": [4, 2], "x": 4, "y": 4, "h": 1.25},
+ {"matrix": [4, 1], "x": 5, "y": 4, "h": 1.25},
+ {"matrix": [4, 0], "x": 6, "y": 4, "h": 1.25},
+
+ {"matrix": [9, 6], "x": 8, "y": 4, "h": 1.25},
+ {"matrix": [9, 5], "x": 9, "y": 4, "h": 1.25},
+ {"matrix": [9, 4], "x": 10, "y": 4, "h": 1.25},
+ {"matrix": [9, 2], "x": 12, "y": 4},
+ {"matrix": [9, 1], "x": 13, "y": 4},
+ {"matrix": [9, 0], "x": 14, "y": 4}
]
}
}
diff --git a/keyboards/handwired/chiron/keymaps/default/config.h b/keyboards/handwired/chiron/keymaps/default/config.h
index 06c5f586e4..c373743a39 100644
--- a/keyboards/handwired/chiron/keymaps/default/config.h
+++ b/keyboards/handwired/chiron/keymaps/default/config.h
@@ -19,7 +19,6 @@
#define MASTER_RIGHT
//#define MASTER_LEFT
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define TAPPING_TERM 200
diff --git a/keyboards/handwired/chiron/keymaps/default/rules.mk b/keyboards/handwired/chiron/keymaps/default/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/chiron/keymaps/default/rules.mk
+++ /dev/null