summaryrefslogtreecommitdiffstats
path: root/keyboards/aeboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/aeboards')
-rw-r--r--keyboards/aeboards/aegis/aegis.c17
-rw-r--r--keyboards/aeboards/aegis/aegis.h43
-rw-r--r--keyboards/aeboards/aegis/config.h8
-rw-r--r--keyboards/aeboards/aegis/info.json239
-rwxr-xr-xkeyboards/aeboards/constellation/constellation.c20
-rwxr-xr-xkeyboards/aeboards/constellation/constellation.h28
-rwxr-xr-xkeyboards/aeboards/constellation/keymaps/default/keymap.c4
-rw-r--r--keyboards/aeboards/constellation/keymaps/default_65_ansi_rwkl/keymap.c35
-rwxr-xr-xkeyboards/aeboards/constellation/keymaps/via/keymap.c8
-rwxr-xr-xkeyboards/aeboards/constellation/rev1/config.h8
-rw-r--r--keyboards/aeboards/constellation/rev1/info.json222
-rw-r--r--keyboards/aeboards/constellation/rev1/matrix_diagram.md18
-rwxr-xr-xkeyboards/aeboards/constellation/rev1/rev1.c18
-rwxr-xr-xkeyboards/aeboards/constellation/rev1/rev1.h36
-rwxr-xr-xkeyboards/aeboards/constellation/rev2/config.h8
-rw-r--r--keyboards/aeboards/constellation/rev2/info.json222
-rw-r--r--keyboards/aeboards/constellation/rev2/matrix_diagram.md18
-rwxr-xr-xkeyboards/aeboards/constellation/rev2/rev2.c2
-rwxr-xr-xkeyboards/aeboards/constellation/rev2/rev2.h35
-rwxr-xr-xkeyboards/aeboards/constellation/rev3/config.h8
-rw-r--r--keyboards/aeboards/constellation/rev3/info.json222
-rw-r--r--keyboards/aeboards/constellation/rev3/matrix_diagram.md18
-rwxr-xr-xkeyboards/aeboards/constellation/rev3/rev3.c18
-rwxr-xr-xkeyboards/aeboards/constellation/rev3/rev3.h36
-rw-r--r--keyboards/aeboards/ext65/rev1/info.json177
-rw-r--r--keyboards/aeboards/ext65/rev1/rev1.c2
-rw-r--r--keyboards/aeboards/ext65/rev1/rev1.h40
-rw-r--r--keyboards/aeboards/ext65/rev2/config.h1
-rw-r--r--keyboards/aeboards/ext65/rev2/info.json181
-rw-r--r--keyboards/aeboards/ext65/rev2/rev2.c2
-rw-r--r--keyboards/aeboards/ext65/rev2/rev2.h40
-rw-r--r--keyboards/aeboards/ext65/rev2/rules.mk1
-rw-r--r--keyboards/aeboards/ext65/rev3/info.json512
-rw-r--r--keyboards/aeboards/ext65/rev3/rev3.c2
-rw-r--r--keyboards/aeboards/ext65/rev3/rev3.h40
-rw-r--r--keyboards/aeboards/satellite/keymaps/default/keymap.c8
-rw-r--r--keyboards/aeboards/satellite/keymaps/via/keymap.c8
-rw-r--r--keyboards/aeboards/satellite/rev1/info.json142
-rw-r--r--keyboards/aeboards/satellite/rev1/matrix_diagram.md15
-rw-r--r--keyboards/aeboards/satellite/rev1/rev1.c2
-rw-r--r--keyboards/aeboards/satellite/rev1/rev1.h35
-rw-r--r--keyboards/aeboards/satellite/rev1/rules.mk1
-rw-r--r--keyboards/aeboards/satellite/satellite.c19
-rw-r--r--keyboards/aeboards/satellite/satellite.h23
44 files changed, 1053 insertions, 1489 deletions
diff --git a/keyboards/aeboards/aegis/aegis.c b/keyboards/aeboards/aegis/aegis.c
deleted file mode 100644
index ccff6d62c9..0000000000
--- a/keyboards/aeboards/aegis/aegis.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * 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/>.
- */
-
-// Nothing to see here, move along... ;-)
diff --git a/keyboards/aeboards/aegis/aegis.h b/keyboards/aeboards/aegis/aegis.h
deleted file mode 100644
index 95ffb73dde..0000000000
--- a/keyboards/aeboards/aegis/aegis.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * 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 _____ KC_NO
-
-#define LAYOUT_aegis( \
- K0000, K0100, K0001, K0101, K0002, K0102, K0003, K0103, K0004, K0104, K0005, K0105, K0006, K0106, K0007, K0107, K0008, \
- K0200, K0300, K0201, K0301, K0202, K0302, K0203, K0303, K0204, K0304, K0205, K0305, K0206, K0306, K0207, K0307, K0208, K0308, K0108, \
- K0400, K0500, K0401, K0501, K0402, K0502, K0403, K0503, K0404, K0504, K0405, K0505, K0406, K0506, K0407, K0507, K0408, K0508, \
- K0600, K0700, K0601, K0701, K0602, K0702, K0603, K0703, K0604, K0704, K0605, K0705, K0606, K0706, K0607, K0707, K0608, \
- K0800, K0900, K0801, K0901, K0802, K0902, K0803, K0903, K0804, K0904, K0805, K0905, K0806, K0906, K0807, K0907, K0808, K0908, \
- K1000, K1100, K1001, K1101, K1002, K1102, K1003, K1103, K1105, K1107, K1008, K1108 \
-) { \
- { K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, K0008 }, \
- { K0100, K0101, K0102, K0103, K0104, K0105, K0106, K0107, K0108 }, \
- { K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208 }, \
- { K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308 }, \
- { K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408 }, \
- { K0500, K0501, K0502, K0503, K0504, K0505, K0506, K0507, K0508 }, \
- { K0600, K0601, K0602, K0603, K0604, K0605, K0606, K0607, K0608 }, \
- { K0700, K0701, K0702, K0703, K0704, K0705, K0706, K0707, _____ }, \
- { K0800, K0801, K0802, K0803, K0804, K0805, K0806, K0807, K0808 }, \
- { K0900, K0901, K0902, K0903, K0904, K0905, K0906, K0907, K0908 }, \
- { K1000, K1001, K1002, K1003, _____, _____, _____, _____, K1008 }, \
- { K1100, K1101, K1102, K1103, _____, K1105, _____, K1107, K1108 } \
-}
diff --git a/keyboards/aeboards/aegis/config.h b/keyboards/aeboards/aegis/config.h
index edaef2f7b9..8606067a4c 100644
--- a/keyboards/aeboards/aegis/config.h
+++ b/keyboards/aeboards/aegis/config.h
@@ -16,14 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F5, F6, E6, F7, D1, D0, D6, D4, B4, D7, B6, B5 }
-#define MATRIX_COL_PINS { C7, C6, B7, D2, D3, B3, B2, B1, B0 }
-
-/* 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
diff --git a/keyboards/aeboards/aegis/info.json b/keyboards/aeboards/aegis/info.json
index b3817db452..5fe143318f 100644
--- a/keyboards/aeboards/aegis/info.json
+++ b/keyboards/aeboards/aegis/info.json
@@ -8,128 +8,133 @@
"pid": "0x0807",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C7", "C6", "B7", "D2", "D3", "B3", "B2", "B1", "B0"],
+ "rows": ["F5", "F6", "E6", "F7", "D1", "D0", "D6", "D4", "B4", "D7", "B6", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_aegis": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
-
- {"x": 4.5, "y": 0},
-
- {"x": 6.5, "y": 0},
- {"x": 7.5, "y": 0},
- {"x": 8.5, "y": 0},
- {"x": 9.5, "y": 0},
-
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
-
- {"x": 15.5, "y": 0},
- {"x": 16.5, "y": 0},
- {"x": 17.5, "y": 0},
- {"x": 18.5, "y": 0},
-
- {"x": 0, "y": 1.5},
- {"x": 1, "y": 1.5},
- {"x": 2, "y": 1.5},
- {"x": 3, "y": 1.5},
-
- {"x": 4.5, "y": 1.5},
- {"x": 5.5, "y": 1.5},
- {"x": 6.5, "y": 1.5},
- {"x": 7.5, "y": 1.5},
- {"x": 8.5, "y": 1.5},
- {"x": 9.5, "y": 1.5},
- {"x": 10.5, "y": 1.5},
- {"x": 11.5, "y": 1.5},
- {"x": 12.5, "y": 1.5},
- {"x": 13.5, "y": 1.5},
- {"x": 14.5, "y": 1.5},
- {"x": 15.5, "y": 1.5},
- {"x": 16.5, "y": 1.5},
- {"x": 17.5, "y": 1.5},
- {"x": 18.5, "y": 1.5},
-
- {"x": 0, "y": 2.5},
- {"x": 1, "y": 2.5},
- {"x": 2, "y": 2.5},
- {"x": 3, "y": 2.5},
-
- {"x": 4.5, "y": 2.5, "w": 1.5},
- {"x": 6, "y": 2.5},
- {"x": 7, "y": 2.5},
- {"x": 8, "y": 2.5},
- {"x": 9, "y": 2.5},
- {"x": 10, "y": 2.5},
- {"x": 11, "y": 2.5},
- {"x": 12, "y": 2.5},
- {"x": 13, "y": 2.5},
- {"x": 14, "y": 2.5},
- {"x": 15, "y": 2.5},
- {"x": 16, "y": 2.5},
- {"x": 17, "y": 2.5},
- {"x": 18, "y": 2.5, "w": 1.5},
-
- {"x": 0, "y": 3.5},
- {"x": 1, "y": 3.5},
- {"x": 2, "y": 3.5},
- {"x": 3, "y": 3.5},
-
- {"x": 4.5, "y": 3.5, "w": 1.75},
- {"x": 6.25, "y": 3.5},
- {"x": 7.25, "y": 3.5},
- {"x": 8.25, "y": 3.5},
- {"x": 9.25, "y": 3.5},
- {"x": 10.25, "y": 3.5},
- {"x": 11.25, "y": 3.5},
- {"x": 12.25, "y": 3.5},
- {"x": 13.25, "y": 3.5},
- {"x": 14.25, "y": 3.5},
- {"x": 15.25, "y": 3.5},
- {"x": 16.25, "y": 3.5},
- {"x": 17.25, "y": 3.5, "w": 2.25},
-
- {"x": 0, "y": 4.5},
- {"x": 1, "y": 4.5},
- {"x": 2, "y": 4.5},
- {"x": 3, "y": 4.5},
-
- {"x": 4.25, "y": 4.75},
-
- {"x": 5.5, "y": 4.5, "w": 1.25},
- {"x": 6.75, "y": 4.5},
- {"x": 7.75, "y": 4.5},
- {"x": 8.75, "y": 4.5},
- {"x": 9.75, "y": 4.5},
- {"x": 10.75, "y": 4.5},
- {"x": 11.75, "y": 4.5},
- {"x": 12.75, "y": 4.5},
- {"x": 13.75, "y": 4.5},
- {"x": 14.75, "y": 4.5},
- {"x": 15.75, "y": 4.5},
- {"x": 16.75, "y": 4.5, "w": 1.75},
- {"x": 18.5, "y": 4.5},
-
- {"x": 0, "y": 5.5},
- {"x": 1, "y": 5.5},
- {"x": 2, "y": 5.5},
-
- {"x": 3.25, "y": 5.75},
- {"x": 4.25, "y": 5.75},
- {"x": 5.25, "y": 5.75},
-
- {"x": 6.5, "y": 5.5, "w": 1.25},
- {"x": 7.75, "y": 5.5, "w": 1.25},
- {"x": 9, "y": 5.5, "w": 6.25},
- {"x": 15.25, "y": 5.5, "w": 1.5},
- {"x": 16.75, "y": 5.5, "w": 1.25},
- {"x": 18, "y": 5.5, "w": 1.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+
+ {"matrix": [0, 2], "x": 4.5, "y": 0},
+
+ {"matrix": [1, 2], "x": 6.5, "y": 0},
+ {"matrix": [0, 3], "x": 7.5, "y": 0},
+ {"matrix": [1, 3], "x": 8.5, "y": 0},
+ {"matrix": [0, 4], "x": 9.5, "y": 0},
+
+ {"matrix": [1, 4], "x": 11, "y": 0},
+ {"matrix": [0, 5], "x": 12, "y": 0},
+ {"matrix": [1, 5], "x": 13, "y": 0},
+ {"matrix": [0, 6], "x": 14, "y": 0},
+
+ {"matrix": [1, 6], "x": 15.5, "y": 0},
+ {"matrix": [0, 7], "x": 16.5, "y": 0},
+ {"matrix": [1, 7], "x": 17.5, "y": 0},
+ {"matrix": [0, 8], "x": 18.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.5},
+ {"matrix": [3, 0], "x": 1, "y": 1.5},
+ {"matrix": [2, 1], "x": 2, "y": 1.5},
+ {"matrix": [3, 1], "x": 3, "y": 1.5},
+
+ {"matrix": [2, 2], "x": 4.5, "y": 1.5},
+ {"matrix": [3, 2], "x": 5.5, "y": 1.5},
+ {"matrix": [2, 3], "x": 6.5, "y": 1.5},
+ {"matrix": [3, 3], "x": 7.5, "y": 1.5},
+ {"matrix": [2, 4], "x": 8.5, "y": 1.5},
+ {"matrix": [3, 4], "x": 9.5, "y": 1.5},
+ {"matrix": [2, 5], "x": 10.5, "y": 1.5},
+ {"matrix": [3, 5], "x": 11.5, "y": 1.5},
+ {"matrix": [2, 6], "x": 12.5, "y": 1.5},
+ {"matrix": [3, 6], "x": 13.5, "y": 1.5},
+ {"matrix": [2, 7], "x": 14.5, "y": 1.5},
+ {"matrix": [3, 7], "x": 15.5, "y": 1.5},
+ {"matrix": [2, 8], "x": 16.5, "y": 1.5},
+ {"matrix": [3, 8], "x": 17.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 18.5, "y": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.5},
+ {"matrix": [5, 0], "x": 1, "y": 2.5},
+ {"matrix": [4, 1], "x": 2, "y": 2.5},
+ {"matrix": [5, 1], "x": 3, "y": 2.5},
+
+ {"matrix": [4, 2], "x": 4.5, "y": 2.5, "w": 1.5},
+ {"matrix": [5, 2], "x": 6, "y": 2.5},
+ {"matrix": [4, 3], "x": 7, "y": 2.5},
+ {"matrix": [5, 3], "x": 8, "y": 2.5},
+ {"matrix": [4, 4], "x": 9, "y": 2.5},
+ {"matrix": [5, 4], "x": 10, "y": 2.5},
+ {"matrix": [4, 5], "x": 11, "y": 2.5},
+ {"matrix": [5, 5], "x": 12, "y": 2.5},
+ {"matrix": [4, 6], "x": 13, "y": 2.5},
+ {"matrix": [5, 6], "x": 14, "y": 2.5},
+ {"matrix": [4, 7], "x": 15, "y": 2.5},
+ {"matrix": [5, 7], "x": 16, "y": 2.5},
+ {"matrix": [4, 8], "x": 17, "y": 2.5},
+ {"matrix": [5, 8], "x": 18, "y": 2.5, "w": 1.5},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.5},
+ {"matrix": [7, 0], "x": 1, "y": 3.5},
+ {"matrix": [6, 1], "x": 2, "y": 3.5},
+ {"matrix": [7, 1], "x": 3, "y": 3.5},
+
+ {"matrix": [6, 2], "x": 4.5, "y": 3.5, "w": 1.75},
+ {"matrix": [7, 2], "x": 6.25, "y": 3.5},
+ {"matrix": [6, 3], "x": 7.25, "y": 3.5},
+ {"matrix": [7, 3], "x": 8.25, "y": 3.5},
+ {"matrix": [6, 4], "x": 9.25, "y": 3.5},
+ {"matrix": [7, 4], "x": 10.25, "y": 3.5},
+ {"matrix": [6, 5], "x": 11.25, "y": 3.5},
+ {"matrix": [7, 5], "x": 12.25, "y": 3.5},
+ {"matrix": [6, 6], "x": 13.25, "y": 3.5},
+ {"matrix": [7, 6], "x": 14.25, "y": 3.5},
+ {"matrix": [6, 7], "x": 15.25, "y": 3.5},
+ {"matrix": [7, 7], "x": 16.25, "y": 3.5},
+ {"matrix": [6, 8], "x": 17.25, "y": 3.5, "w": 2.25},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.5},
+ {"matrix": [9, 0], "x": 1, "y": 4.5},
+ {"matrix": [8, 1], "x": 2, "y": 4.5},
+ {"matrix": [9, 1], "x": 3, "y": 4.5},
+
+ {"matrix": [8, 2], "x": 4.25, "y": 4.75},
+
+ {"matrix": [9, 2], "x": 5.5, "y": 4.5, "w": 1.25},
+ {"matrix": [8, 3], "x": 6.75, "y": 4.5},
+ {"matrix": [9, 3], "x": 7.75, "y": 4.5},
+ {"matrix": [8, 4], "x": 8.75, "y": 4.5},
+ {"matrix": [9, 4], "x": 9.75, "y": 4.5},
+ {"matrix": [8, 5], "x": 10.75, "y": 4.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 4.5},
+ {"matrix": [8, 6], "x": 12.75, "y": 4.5},
+ {"matrix": [9, 6], "x": 13.75, "y": 4.5},
+ {"matrix": [8, 7], "x": 14.75, "y": 4.5},
+ {"matrix": [9, 7], "x": 15.75, "y": 4.5},
+ {"matrix": [8, 8], "x": 16.75, "y": 4.5, "w": 1.75},
+ {"matrix": [9, 8], "x": 18.5, "y": 4.5},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.5},
+ {"matrix": [11, 0], "x": 1, "y": 5.5},
+ {"matrix": [10, 1], "x": 2, "y": 5.5},
+
+ {"matrix": [11, 1], "x": 3.25, "y": 5.75},
+ {"matrix": [10, 2], "x": 4.25, "y": 5.75},
+ {"matrix": [11, 2], "x": 5.25, "y": 5.75},
+
+ {"matrix": [10, 3], "x": 6.5, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 3], "x": 7.75, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 5], "x": 9, "y": 5.5, "w": 6.25},
+ {"matrix": [11, 7], "x": 15.25, "y": 5.5, "w": 1.5},
+ {"matrix": [10, 8], "x": 16.75, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 8], "x": 18, "y": 5.5, "w": 1.5}
]
}
}
diff --git a/keyboards/aeboards/constellation/constellation.c b/keyboards/aeboards/constellation/constellation.c
deleted file mode 100755
index 0b8354d071..0000000000
--- a/keyboards/aeboards/constellation/constellation.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- * Copyright 2021 Harrison Chan (Xelus)
- *
- * 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/>.
- */
-
-// Nothing to see here, move along... ;-)
-
-#include "constellation.h"
diff --git a/keyboards/aeboards/constellation/constellation.h b/keyboards/aeboards/constellation/constellation.h
deleted file mode 100755
index 3724b29d6a..0000000000
--- a/keyboards/aeboards/constellation/constellation.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- * Copyright 2021 Harrison Chan (Xelus)
- *
- * 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"
-
-#if defined(KEYBOARD_aeboards_constellation_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_aeboards_constellation_rev2)
- #include "rev2.h"
-#elif defined(KEYBOARD_aeboards_constellation_rev3)
- #include "rev3.h"
-#endif
diff --git a/keyboards/aeboards/constellation/keymaps/default/keymap.c b/keyboards/aeboards/constellation/keymaps/default/keymap.c
index 53ebb108aa..afc2e93c2f 100755
--- a/keyboards/aeboards/constellation/keymaps/default/keymap.c
+++ b/keyboards/aeboards/constellation/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Default layer
- [0] = LAYOUT_all(
+ [0] = LAYOUT_65_ansi_rwkl_split_bs(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
// Fn1 Layer
- [1] = LAYOUT_all(
+ [1] = LAYOUT_65_ansi_rwkl_split_bs(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, QK_BOOT,
KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/aeboards/constellation/keymaps/default_65_ansi_rwkl/keymap.c b/keyboards/aeboards/constellation/keymaps/default_65_ansi_rwkl/keymap.c
new file mode 100644
index 0000000000..9661682677
--- /dev/null
+++ b/keyboards/aeboards/constellation/keymaps/default_65_ansi_rwkl/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2018 Jason Williams (Wilba)
+ *
+ * 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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ // Default layer
+ [0] = LAYOUT_65_ansi_rwkl(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_HOME,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ // Fn1 Layer
+ [1] = LAYOUT_65_ansi_rwkl(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, QK_BOOT,
+ KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/aeboards/constellation/keymaps/via/keymap.c b/keyboards/aeboards/constellation/keymaps/via/keymap.c
index 0cdfddaa5f..82c1dfecea 100755
--- a/keyboards/aeboards/constellation/keymaps/via/keymap.c
+++ b/keyboards/aeboards/constellation/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Default layer
- [0] = LAYOUT_all(
+ [0] = LAYOUT_65_ansi_rwkl_split_bs(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
// Fn1 Layer
- [1] = LAYOUT_all(
+ [1] = LAYOUT_65_ansi_rwkl_split_bs(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_TRNS,
KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
// Fn2 Layer
- [2] = LAYOUT_all(
+ [2] = LAYOUT_65_ansi_rwkl_split_bs(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
// Fn3 Layer
- [3] = LAYOUT_all(
+ [3] = LAYOUT_65_ansi_rwkl_split_bs(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/aeboards/constellation/rev1/config.h b/keyboards/aeboards/constellation/rev1/config.h
index 83eb6e90d3..01155887a5 100755
--- a/keyboards/aeboards/constellation/rev1/config.h
+++ b/keyboards/aeboards/constellation/rev1/config.h
@@ -17,14 +17,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, F0, F1, F4 }
-#define MATRIX_COL_PINS { E6, D5, B2, B3, D3, F6, F7, C7, C6, B6, B5, B4, D7, D6, 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
diff --git a/keyboards/aeboards/constellation/rev1/info.json b/keyboards/aeboards/constellation/rev1/info.json
index 6f82ab71f5..3a2d3feea9 100644
--- a/keyboards/aeboards/constellation/rev1/info.json
+++ b/