diff options
Diffstat (limited to 'keyboards/keychron')
113 files changed, 247 insertions, 336 deletions
diff --git a/keyboards/keychron/c1_pro/ansi/rgb/info.json b/keyboards/keychron/c1_pro/ansi/rgb/keyboard.json index 64d45e3595..64d45e3595 100644 --- a/keyboards/keychron/c1_pro/ansi/rgb/info.json +++ b/keyboards/keychron/c1_pro/ansi/rgb/keyboard.json diff --git a/keyboards/keychron/c1_pro/ansi/rgb/rules.mk b/keyboards/keychron/c1_pro/ansi/rgb/rules.mk deleted file mode 100644 index 7307f9f9e7..0000000000 --- a/keyboards/keychron/c1_pro/ansi/rgb/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# Build Options diff --git a/keyboards/keychron/c1_pro/ansi/white/info.json b/keyboards/keychron/c1_pro/ansi/white/keyboard.json index c64183a739..c64183a739 100644 --- a/keyboards/keychron/c1_pro/ansi/white/info.json +++ b/keyboards/keychron/c1_pro/ansi/white/keyboard.json diff --git a/keyboards/keychron/c1_pro/ansi/white/rules.mk b/keyboards/keychron/c1_pro/ansi/white/rules.mk deleted file mode 100644 index 7307f9f9e7..0000000000 --- a/keyboards/keychron/c1_pro/ansi/white/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# Build Options diff --git a/keyboards/keychron/c2_pro/matrix.c b/keyboards/keychron/c2_pro/matrix.c index 5065f97aa7..8c954c73d0 100644 --- a/keyboards/keychron/c2_pro/matrix.c +++ b/keyboards/keychron/c2_pro/matrix.c @@ -14,7 +14,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "quantum.h" +#include "matrix.h" +#include "atomic_util.h" +#include <string.h> #ifndef SHIFT_COL_START # define SHIFT_COL_START 8 diff --git a/keyboards/keychron/q0/base/info.json b/keyboards/keychron/q0/base/keyboard.json index ad89cf84da..ad89cf84da 100644 --- a/keyboards/keychron/q0/base/info.json +++ b/keyboards/keychron/q0/base/keyboard.json diff --git a/keyboards/keychron/q0/base/rules.mk b/keyboards/keychron/q0/base/rules.mk deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q0/base/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank
\ No newline at end of file diff --git a/keyboards/keychron/q0/plus/info.json b/keyboards/keychron/q0/plus/keyboard.json index b187a79139..b187a79139 100644 --- a/keyboards/keychron/q0/plus/info.json +++ b/keyboards/keychron/q0/plus/keyboard.json diff --git a/keyboards/keychron/q0/plus/rules.mk b/keyboards/keychron/q0/plus/rules.mk deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q0/plus/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank
\ No newline at end of file diff --git a/keyboards/keychron/q10/matrix.c b/keyboards/keychron/q10/matrix.c index 5c035b0e42..2c2d2ccc37 100644 --- a/keyboards/keychron/q10/matrix.c +++ b/keyboards/keychron/q10/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include <string.h> // Pin connected to DS of 74HC595 #define DATA_PIN A7 diff --git a/keyboards/keychron/q12/matrix.c b/keyboards/keychron/q12/matrix.c index 8229517fd9..cf8361bd23 100644 --- a/keyboards/keychron/q12/matrix.c +++ b/keyboards/keychron/q12/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include <string.h> // Pin connected to DS of 74HC595 #define DATA_PIN C15 diff --git a/keyboards/keychron/q1v1/ansi/info.json b/keyboards/keychron/q1v1/ansi/keyboard.json index 028967d608..028967d608 100644 --- a/keyboards/keychron/q1v1/ansi/info.json +++ b/keyboards/keychron/q1v1/ansi/keyboard.json diff --git a/keyboards/keychron/q1v1/ansi/rules.mk b/keyboards/keychron/q1v1/ansi/rules.mk deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q1v1/ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank
\ No newline at end of file diff --git a/keyboards/keychron/q1v1/ansi_encoder/info.json b/keyboards/keychron/q1v1/ansi_encoder/keyboard.json index 786c297fd3..786c297fd3 100644 --- a/keyboards/keychron/q1v1/ansi_encoder/info.json +++ b/keyboards/keychron/q1v1/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q1v1/ansi_encoder/rules.mk b/keyboards/keychron/q1v1/ansi_encoder/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/q1v1/ansi_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q1v1/iso/iso.c b/keyboards/keychron/q1v1/iso/iso.c index affc41d219..ef4f3425af 100644 --- a/keyboards/keychron/q1v1/iso/iso.c +++ b/keyboards/keychron/q1v1/iso/iso.c @@ -121,28 +121,28 @@ led_config_t g_led_config = { // Key Matrix to LED Index { 0, __, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14 }, { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, - { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 }, - { 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 71, 57, 58 }, - { 59, __, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 80, 70, 13 }, - { 72, 73, 74, __, __, __, 75, __, __, __, 76, 77, 78, 79, 81 } + { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 57, 43 }, + { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 72, 56, 58 }, + { 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 81, 71, 13 }, + { 73, 74, 75, __, __, __, 76, __, __, __, 77, 78, 79, 80, 82 } }, { // LED Index to Physical Position {0,0}, {18,0}, {33,0}, {48,0}, {62,0}, {81,0}, {95,0}, {110,0}, {125,0}, {143,0}, {158,0}, {173,0}, {187,0}, {206,0}, {224,0}, {0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {118,15}, {132,15}, {147,15}, {162,15}, {176,15}, {198,15}, {224,15}, - {4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26}, {202,26}, {224,26}, - {6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38}, {196,38}, {224,38}, - {9,49}, {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49}, {185,49}, {209,52}, - {2,61}, {20,61}, {39,61}, {94,61}, {147,61}, {162,61}, {176,61}, {195,64}, {209,64}, {224,64} + {4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26}, {224,26}, + {6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38}, {187,38}, {203,32}, {224,38}, + {2,49}, {18,49}, {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49}, {185,49}, {209,52}, + {2,61}, {20,61}, {39,61}, {94,61}, {147,61}, {162,61}, {176,61}, {195,64}, {209,64}, {224,64} }, { // RGB LED Index to Flag - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, - 1, 1, 1, 4, 1, 1, 1, 1, 1, 1 + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, + 1, 1, 1, 4, 1, 1, 1, 1, 1, 1 } }; diff --git a/keyboards/keychron/q1v1/iso/info.json b/keyboards/keychron/q1v1/iso/keyboard.json index 2bd353803e..2bd353803e 100644 --- a/keyboards/keychron/q1v1/iso/info.json +++ b/keyboards/keychron/q1v1/iso/keyboard.json diff --git a/keyboards/keychron/q1v1/iso/rules.mk b/keyboards/keychron/q1v1/iso/rules.mk deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q1v1/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank
\ No newline at end of file diff --git a/keyboards/keychron/q1v1/iso_encoder/info.json b/keyboards/keychron/q1v1/iso_encoder/keyboard.json index 780fc7ae82..780fc7ae82 100644 --- a/keyboards/keychron/q1v1/iso_encoder/info.json +++ b/keyboards/keychron/q1v1/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q1v1/iso_encoder/rules.mk b/keyboards/keychron/q1v1/iso_encoder/rules.mk deleted file mode 100644 index 6968c52335..0000000000 --- a/keyboards/keychron/q1v1/iso_encoder/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# This file intentionally left blank - diff --git a/keyboards/keychron/q1v2/matrix.c b/keyboards/keychron/q1v2/matrix.c index d008a79384..2bdf4bdec7 100644 --- a/keyboards/keychron/q1v2/matrix.c +++ b/keyboards/keychron/q1v2/matrix.c @@ -14,7 +14,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "quantum.h" +#include "matrix.h" +#include "atomic_util.h" +#include <string.h> // Pin connected to DS of 74HC595 #define DATA_PIN A7 diff --git a/keyboards/keychron/q2/ansi/info.json b/keyboards/keychron/q2/ansi/keyboard.json index d419d31eef..d419d31eef 100644 --- a/keyboards/keychron/q2/ansi/info.json +++ b/keyboards/keychron/q2/ansi/keyboard.json diff --git a/keyboards/keychron/q2/ansi/rules.mk b/keyboards/keychron/q2/ansi/rules.mk deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q2/ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank
\ No newline at end of file diff --git a/keyboards/keychron/q2/ansi_encoder/info.json b/keyboards/keychron/q2/ansi_encoder/keyboard.json index 1e1f22bada..1e1f22bada 100644 --- a/keyboards/keychron/q2/ansi_encoder/info.json +++ b/keyboards/keychron/q2/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q2/ansi_encoder/rules.mk b/keyboards/keychron/q2/ansi_encoder/rules.mk deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q2/ansi_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank
\ No newline at end of file diff --git a/keyboards/keychron/q2/iso/info.json b/keyboards/keychron/q2/iso/keyboard.json index 8a2023320d..8a2023320d 100644 --- a/keyboards/keychron/q2/iso/info.json +++ b/keyboards/keychron/q2/iso/keyboard.json diff --git a/keyboards/keychron/q2/iso/rules.mk b/keyboards/keychron/q2/iso/rules.mk deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q2/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank
\ No newline at end of file diff --git a/keyboards/keychron/q2/iso_encoder/info.json b/keyboards/keychron/q2/iso_encoder/keyboard.json index b828c88931..b828c88931 100644 --- a/keyboards/keychron/q2/iso_encoder/info.json +++ b/keyboards/keychron/q2/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q2/iso_encoder/rules.mk b/keyboards/keychron/q2/iso_encoder/rules.mk deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q2/iso_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank
\ No newline at end of file diff --git a/keyboards/keychron/q2/jis/info.json b/keyboards/keychron/q2/jis/keyboard.json index 834b89332e..834b89332e 100644 --- a/keyboards/keychron/q2/jis/info.json +++ b/keyboards/keychron/q2/jis/keyboard.json diff --git a/keyboards/keychron/q2/jis/rules.mk b/keyboards/keychron/q2/jis/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/q2/jis/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q2/jis_encoder/info.json b/keyboards/keychron/q2/jis_encoder/keyboard.json index 32b691742b..32b691742b 100644 --- a/keyboards/keychron/q2/jis_encoder/info.json +++ b/keyboards/keychron/q2/jis_encoder/keyboard.json diff --git a/keyboards/keychron/q2/jis_encoder/rules.mk b/keyboards/keychron/q2/jis_encoder/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/q2/jis_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q3/ansi/info.json b/keyboards/keychron/q3/ansi/keyboard.json index 2162208082..2162208082 100644 --- a/keyboards/keychron/q3/ansi/info.json +++ b/keyboards/keychron/q3/ansi/keyboard.json diff --git a/keyboards/keychron/q3/ansi/rules.mk b/keyboards/keychron/q3/ansi/rules.mk deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q3/ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank
\ No newline at end of file diff --git a/keyboards/keychron/q3/iso/info.json b/keyboards/keychron/q3/iso/keyboard.json index 14e1e96629..14e1e96629 100644 --- a/keyboards/keychron/q3/iso/info.json +++ b/keyboards/keychron/q3/iso/keyboard.json diff --git a/keyboards/keychron/q3/iso/rules.mk b/keyboards/keychron/q3/iso/rules.mk deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q3/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank
\ No newline at end of file diff --git a/keyboards/keychron/q3/jis/info.json b/keyboards/keychron/q3/jis/keyboard.json index 7a45046f82..7a45046f82 100644 --- a/keyboards/keychron/q3/jis/info.json +++ b/keyboards/keychron/q3/jis/keyboard.json diff --git a/keyboards/keychron/q3/jis/rules.mk b/keyboards/keychron/q3/jis/rules.mk deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q3/jis/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank
\ No newline at end of file diff --git a/keyboards/keychron/q3/matrix.c b/keyboards/keychron/q3/matrix.c index 26830780ff..188156789b 100644 --- a/keyboards/keychron/q3/matrix.c +++ b/keyboards/keychron/q3/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include <string.h> // Pin connected to DS of 74HC595 #define DATA_PIN A7 diff --git a/keyboards/keychron/q4/info.json b/keyboards/keychron/q4/info.json index e314477ab9..59f6caef92 100644 --- a/keyboards/keychron/q4/info.json +++ b/keyboards/keychron/q4/info.json @@ -16,16 +16,13 @@ } }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, "extrakey": true, "mousekey": true, "nkro": true, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], diff --git a/keyboards/keychron/q4/iso/info.json b/keyboards/keychron/q4/iso/keyboard.json index 13b25f74e0..13b25f74e0 100644 --- a/keyboards/keychron/q4/iso/info.json +++ b/keyboards/keychron/q4/iso/keyboard.json diff --git a/keyboards/keychron/q4/iso/rules.mk b/keyboards/keychron/q4/iso/rules.mk deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q4/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank
\ No newline at end of file diff --git a/keyboards/keychron/q5/matrix.c b/keyboards/keychron/q5/matrix.c index 28ef877504..4809b20677 100644 --- a/keyboards/keychron/q5/matrix.c +++ b/keyboards/keychron/q5/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include <string.h> // Pin connected to DS of 74HC595 #define DATA_PIN C15 diff --git a/keyboards/keychron/q6/matrix.c b/keyboards/keychron/q6/matrix.c index 11f3432e6b..c59b229cfa 100644 --- a/keyboards/keychron/q6/matrix.c +++ b/keyboards/keychron/q6/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include <string.h> // Pin connected to DS of 74HC595 #define DATA_PIN C15 diff --git a/keyboards/keychron/q60/ansi/info.json b/keyboards/keychron/q60/ansi/keyboard.json index 1d074c5e3c..4d6f680890 100644 --- a/keyboards/keychron/q60/ansi/info.json +++ b/keyboards/keychron/q60/ansi/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x01C0", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/q60/ansi/rules.mk b/keyboards/keychron/q60/ansi/rules.mk deleted file mode 100644 index 468ed6fae3..0000000000 --- a/keyboards/keychron/q60/ansi/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable. -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/q65/matrix.c b/keyboards/keychron/q65/matrix.c index 5785f5d570..206e301226 100644 --- a/keyboards/keychron/q65/matrix.c +++ b/keyboards/keychron/q65/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include <string.h> // Pin connected to DS of 74HC595 #define DATA_PIN C15 diff --git a/keyboards/keychron/q7/ansi/info.json b/keyboards/keychron/q7/ansi/keyboard.json index 62cff888e1..62cff888e1 100644 --- a/keyboards/keychron/q7/ansi/info.json +++ b/keyboards/keychron/q7/ansi/keyboard.json diff --git a/keyboards/keychron/q7/ansi/rules.mk b/keyboards/keychron/q7/ansi/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/q7/ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q7/iso/info.json b/keyboards/keychron/q7/iso/keyboard.json index d98ec8fa5e..d98ec8fa5e 100644 --- a/keyboards/keychron/q7/iso/info.json +++ b/keyboards/keychron/q7/iso/keyboard.json diff --git a/keyboards/keychron/q7/iso/rules.mk b/keyboards/keychron/q7/iso/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/q7/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q8/ansi/info.json b/keyboards/keychron/q8/ansi/keyboard.json index 2580b4163e..2580b4163e 100644 --- a/keyboards/keychron/q8/ansi/info.json +++ b/keyboards/keychron/q8/ansi/keyboard.json diff --git a/keyboards/keychron/q8/ansi/rules.mk b/keyboards/keychron/q8/ansi/rules.mk deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q8/ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank
\ No newline at end of file diff --git a/keyboards/keychron/q8/ansi_encoder/info.json b/keyboards/keychron/q8/ansi_encoder/keyboard.json index b3f82637db..b3f82637db 100644 --- a/keyboards/keychron/q8/ansi_encoder/info.json +++ b/keyboards/keychron/q8/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q8/ansi_encoder/rules.mk b/keyboards/keychron/q8/ansi_encoder/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/q8/ansi_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q8/iso/info.json b/keyboards/keychron/q8/iso/keyboard.json index fe87955c39..fe87955c39 100644 --- a/keyboards/keychron/q8/iso/info.json +++ b/keyboards/keychron/q8/iso/keyboard.json diff --git a/keyboards/keychron/q8/iso/rules.mk b/keyboards/keychron/q8/iso/rules.mk deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q8/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank
\ No newline at end of file diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/keyboard.json index 46a93ec63b..46a93ec63b 100644 --- a/keyboards/keychron/q8/iso_encoder/info.json +++ b/keyboards/keychron/q8/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q8/iso_encoder/rules.mk b/keyboards/keychron/q8/iso_encoder/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/q8/iso_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q9/ansi/info.json b/keyboards/keychron/q9/ansi/keyboard.json index ec5f367ed1..ec5f367ed1 100644 --- a/keyboards/keychron/q9/ansi/info.json +++ b/keyboards/keychron/q9/ansi/keyboard.json diff --git a/keyboards/keychron/q9/ansi/rules.mk b/keyboards/keychron/q9/ansi/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/q9/ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q9/ansi_encoder/info.json b/keyboards/keychron/q9/ansi_encoder/keyboard.json index 0fc135771a..0fc135771a 100644 --- a/keyboards/keychron/q9/ansi_encoder/info.json +++ b/keyboards/keychron/q9/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q9/ansi_encoder/rules.mk b/keyboards/keychron/q9/ansi_encoder/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/q9/ansi_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q9/iso/info.json b/keyboards/keychron/q9/iso/keyboard.json index 19a818ebb8..19a818ebb8 100644 --- a/keyboards/keychron/q9/iso/info.json +++ b/keyboards/keychron/q9/iso/keyboard.json diff --git a/keyboards/keychron/q9/iso/rules.mk b/keyboards/keychron/q9/iso/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/q9/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q9/iso_encoder/info.json b/keyboards/keychron/q9/iso_encoder/keyboard.json index 087c2f8188..087c2f8188 100644 --- a/keyboards/keychron/q9/iso_encoder/info.json +++ b/keyboards/keychron/q9/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q9/iso_encoder/rules.mk b/keyboards/keychron/q9/iso_encoder/rules.mk deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/q9/iso_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank
\ No newline at end of file diff --git a/keyboards/keychron/q9_plus/ansi_encoder/info.json b/keyboards/keychron/q9_plus/ansi_encoder/keyboard.json index c465071ca1..c465071ca1 100755 --- a/keyboards/keychron/q9_plus/ansi_encoder/info.json +++ b/keyboards/keychron/q9_plus/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q9_plus/ansi_encoder/rules.mk b/keyboards/keychron/q9_plus/ansi_encoder/rules.mk deleted file mode 100755 index e69de29bb2..0000000000 --- a/keyboards/keychron/q9_plus/ansi_encoder/rules.mk +++ /dev/null diff --git a/keyboards/keychron/s1/ansi/rgb/info.json b/keyboards/keychron/s1/ansi/rgb/keyboard.json index 2e78ccfe42..23ea66071e 100644 --- a/keyboards/keychron/s1/ansi/rgb/info.json +++ b/keyboards/keychron/s1/ansi/rgb/keyboard.json @@ -35,6 +35,16 @@ "driver": "snled27351", "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/s1/ansi/rgb/rules.mk b/keyboards/keychron/s1/ansi/rgb/rules.mk deleted file mode 100644 index cf31e094cb..0000000000 --- a/keyboards/keychron/s1/ansi/rgb/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/s1/ansi/white/info.json b/keyboards/keychron/s1/ansi/white/keyboard.json index 0e20c9ebe6..cab38a4ae6 100644 --- a/keyboards/keychron/s1/ansi/white/info.json +++ b/keyboards/keychron/s1/ansi/white/keyboard.json @@ -35,6 +35,16 @@ "sleep": true, "react_on_keyup": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "led_matrix": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/s1/ansi/white/rules.mk b/keyboards/keychron/s1/ansi/white/rules.mk deleted file mode 100644 index afcbe18d62..0000000000 --- a/keyboards/keychron/s1/ansi/white/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes -LED_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v1/matrix.c b/keyboards/keychron/v1/matrix.c index 82a883834f..7b9136d490 100644 --- a/keyboards/keychron/v1/matrix.c +++ b/keyboards/keychron/v1/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include <string.h> // Pin connected to DS of 74HC595 #define DATA_PIN A7 diff --git a/keyboards/keychron/v10/matrix.c b/keyboards/keychron/v10/matrix.c index 9269fed8d6..87cda1774a 100644 --- a/keyboards/keychron/v10/matrix.c +++ b/keyboards/keychron/v10/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include <string.h> #ifndef PIN_USED_74HC595 # define PIN_USED_74HC595 8 diff --git a/keyboards/keychron/v2/ansi/info.json b/keyboards/keychron/v2/ansi/keyboard.json index 528d437829..015aae6e3e 100644 --- a/keyboards/keychron/v2/ansi/info.json +++ b/keyboards/keychron/v2/ansi/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0320", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v2/ansi/rules.mk b/keyboards/keychron/v2/ansi/rules.mk deleted file mode 100644 index cf31e094cb..0000000000 --- a/keyboards/keychron/v2/ansi/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v2/ansi_encoder/info.json b/keyboards/keychron/v2/ansi_encoder/keyboard.json index 42efdae984..ca62bab148 100644 --- a/keyboards/keychron/v2/ansi_encoder/info.json +++ b/keyboards/keychron/v2/ansi_encoder/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0321", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v2/ansi_encoder/rules.mk b/keyboards/keychron/v2/ansi_encoder/rules.mk deleted file mode 100644 index 5d77f09971..0000000000 --- a/keyboards/keychron/v2/ansi_encoder/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v2/iso/info.json b/keyboards/keychron/v2/iso/keyboard.json index 171407e75f..827f613247 100644 --- a/keyboards/keychron/v2/iso/info.json +++ b/keyboards/keychron/v2/iso/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0322", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v2/iso/rules.mk b/keyboards/keychron/v2/iso/rules.mk deleted file mode 100644 index cf31e094cb..0000000000 --- a/keyboards/keychron/v2/iso/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v2/iso_encoder/info.json b/keyboards/keychron/v2/iso_encoder/keyboard.json index 75a8bf1f1f..10774d6974 100644 --- a/keyboards/keychron/v2/iso_encoder/info.json +++ b/keyboards/keychron/v2/iso_encoder/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0323", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v2/iso_encoder/rules.mk b/keyboards/keychron/v2/iso_encoder/rules.mk deleted file mode 100644 index 5d77f09971..0000000000 --- a/keyboards/keychron/v2/iso_encoder/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v2/jis/info.json b/keyboards/keychron/v2/jis/keyboard.json index 64058d4c13..c775944009 100644 --- a/keyboards/keychron/v2/jis/info.json +++ b/keyboards/keychron/v2/jis/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0324", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v2/jis/rules.mk b/keyboards/keychron/v2/jis/rules.mk deleted file mode 100644 index cf31e094cb..0000000000 --- a/keyboards/keychron/v2/jis/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v2/jis_encoder/info.json b/keyboards/keychron/v2/jis_encoder/keyboard.json index 12fadfec73..c783b3553e 100644 --- a/keyboards/keychron/v2/jis_encoder/info.json +++ b/keyboards/keychron/v2/jis_encoder/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0325", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v2/jis_encoder/rules.mk b/keyboards/keychron/v2/jis_encoder/rules.mk deleted file mode 100644 index 5d77f09971..0000000000 --- a/keyboards/keychron/v2/jis_encoder/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v3/ansi/info.json b/keyboards/keychron/v3/ansi/keyboard.json index f01b2394a7..b8489a43b4 100644 --- a/keyboards/keychron/v3/ansi/info.json +++ b/keyboards/keychron/v3/ansi/keyboard.json @@ -3,6 +3,16 @@ "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "usb": { "vid": "0x3434", "pid": "0x0330", diff --git a/keyboards/keychron/v3/ansi/rules.mk b/keyboards/keychron/v3/ansi/rules.mk deleted file mode 100644 index cf31e094cb..0000000000 --- a/keyboards/keychron/v3/ansi/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v3/iso/info.json b/keyboards/keychron/v3/iso/keyboard.json index f57ccbd7d0..b257deb1c0 100644 --- a/keyboards/keychron/v3/iso/info.json +++ b/keyboards/keychron/v3/iso/keyboard.json @@ -3,6 +3,16 @@ "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "features": { + "bootmagic": true, + "command": false, + "console": true, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "usb": { "vid": "0x3434", "pid": "0x0332", diff --git a/keyboards/keychron/v3/iso/rules.mk b/keyboards/keychron/v3/iso/rules.mk deleted file mode 100644 index 118bf40e5a..0000000000 --- a/keyboards/keychron/v3/iso/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v3/jis/info.json b/keyboards/keychron/v3/jis/keyboard.json index cce7372c31..f00716b2db 100644 --- a/keyboards/keychron/v3/jis/info.json +++ b/keyboards/keychron/v3/jis/keyboard.json @@ -3,6 +3,16 @@ "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "usb": { "vid": "0x3434", "pid": "0x0334", diff --git a/keyboards/keychron/v3/jis/rules.mk b/keyboards/keychron/v3/jis/rules.mk deleted file mode 100644 index cf31e094cb..0000000000 --- a/keyboards/keychron/v3/jis/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v3/matrix.c b/keyboards/keychron/v3/matrix.c index 44a1676afa..c0c39d5b5f 100644 --- a/keyboards/keychron/v3/matrix.c +++ b/keyboards/keychron/v3/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include <string.h> // Pin connected to DS of 74HC595 #define DATA_PIN A7 diff --git a/keyboards/keychron/v4/ansi/info.json b/keyboards/keychron/v4/ansi/keyboard.json index a8b980ddd6..d66eb3f956 100644 --- a/keyboards/keychron/v4/ansi/info.json +++ b/keyboards/keychron/v4/ansi/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0340", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v4/ansi/rules.mk b/keyboards/keychron/v4/ansi/rules.mk deleted file mode 100644 index 468ed6fae3..0000000000 --- a/keyboards/keychron/v4/ansi/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable. -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v4/iso/info.json b/keyboards/keychron/v4/iso/keyboard.json index 81153c3621..c7854307e4 100644 --- a/keyboards/keychron/v4/iso/info.json +++ b/keyboards/keychron/v4/iso/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0342", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v4/iso/rules.mk b/keyboards/keychron/v4/iso/rules.mk deleted file mode 100644 index 468ed6fae3..0000000000 --- a/keyboards/keychron/v4/iso/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable. -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v5/matrix.c b/keyboards/keychron/v5/matrix.c index ced8442881..fc3a1c4c2c 100644 --- a/keyboards/keychron/v5/matrix.c +++ b/keyboards/keychron/v5/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include <string.h> // Pin connected to DS of 74HC595 #define DATA_PIN C15 diff --git a/keyboards/keychron/v6/matrix.c b/keyboards/keychron/v6/matrix.c index 9269fed8d6..87cda1774a 100644 --- a/keyboards/keychron/v6/matrix.c +++ b/keyboards/keychron/v6/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include <string.h> #ifndef PIN_USED_74HC595 # define PIN_USED_74HC595 8 diff --git a/keyboards/keychron/v7/ansi/info.json b/keyboards/keychron/v7/ansi/keyboard.json index ea01b3ff39..a60b46dc97 100644 --- a/keyboards/keychron/v7/ansi/info.json +++ b/keyboards/keychron/v7/ansi/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0370", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v7/ansi/rules.mk b/keyboards/keychron/v7/ansi/rules.mk deleted file mode 100644 index 468ed6fae3..0000000000 --- a/keyboards/keychron/v7/ansi/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable. -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v7/iso/info.json b/keyboards/keychron/v7/iso/keyboard.json index e241232d06..0022222635 100644 --- a/keyboards/keychron/v7/iso/info.json +++ b/keyboards/keychron/v7/iso/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0372", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v7/iso/rules.mk b/keyboards/keychron/v7/iso/rules.mk deleted file mode 100644 index 468ed6fae3..0000000000 --- a/keyboards/keychron/v7/iso/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable. -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v8/ansi/info.json b/keyboards/keychron/v8/ansi/keyboard.json index df6ef81b8d..7827270228 100644 --- a/keyboards/keychron/v8/ansi/info.json +++ b/keyboards/keychron/v8/ansi/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0380", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v8/ansi/rules.mk b/keyboards/keychron/v8/ansi/rules.mk deleted file mode 100644 index 50b09aa58a..0000000000 --- a/keyboards/keychron/v8/ansi/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v8/ansi_encoder/info.json b/keyboards/keychron/v8/ansi_encoder/keyboard.json index 100d215ee8..a5d84021d0 100644 --- a/keyboards/keychron/v8/ansi_encoder/info.json +++ b/keyboards/keychron/v8/ansi_encoder/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0381", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v8/ansi_encoder/rules.mk b/keyboards/keychron/v8/ansi_encoder/rules.mk deleted file mode 100644 index bc154c1788..0000000000 --- a/keyboards/keychron/v8/ansi_encoder/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v8/iso/info.json b/keyboards/keychron/v8/iso/keyboard.json index d789740644..89310111f5 100644 --- a/keyboards/keychron/v8/iso/info.json +++ b/keyboards/keychron/v8/iso/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0382", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v8/iso/rules.mk b/keyboards/keychron/v8/iso/rules.mk deleted file mode 100644 index 4aa9221c24..0000000000 --- a/keyboards/keychron/v8/iso/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v8/iso_encoder/info.json b/keyboards/keychron/v8/iso_encoder/keyboard.json index 23efd329aa..2e50de7421 100644 --- a/keyboards/keychron/v8/iso_encoder/info.json +++ b/keyboards/keychron/v8/iso_encoder/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0383", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v8/iso_encoder/rules.mk b/keyboards/keychron/v8/iso_encoder/rules.mk deleted file mode 100644 index bc154c1788..0000000000 --- a/keyboards/keychron/v8/iso_encoder/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes |