Compare commits

...

9 Commits

Author SHA1 Message Date
QMK Bot
805f49299a Merge remote-tracking branch 'origin/develop' into xap 2023-01-15 08:41:36 +00:00
Ryan
a92071494a
usb_main.c: remove CH_KERNEL_MAJOR check (#19597) 2023-01-15 19:40:52 +11:00
QMK Bot
925340e7b5 Merge remote-tracking branch 'origin/develop' into xap 2023-01-15 08:04:38 +00:00
QMK Bot
80464674d3 Merge remote-tracking branch 'origin/master' into develop 2023-01-15 08:03:56 +00:00
Christian Brauner
44bcde102d
[Keymap] Update brauner preonic layout (#19595) 2023-01-15 00:03:27 -08:00
jack
2c98e795f7
[Keyboard] Fixup gingko65 matrix pins (#19589) 2023-01-15 00:03:16 -08:00
QMK Bot
e56acc04dc Merge remote-tracking branch 'origin/develop' into xap 2023-01-15 03:59:17 +00:00
QMK Bot
d40516c3c7 Merge remote-tracking branch 'origin/master' into develop 2023-01-15 03:58:42 +00:00
jurassic73
e7d1b210ba
[Keyboard] Update handwired/split89 to new standard. (#19540)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2023-01-14 19:58:09 -08:00
8 changed files with 163 additions and 160 deletions

View File

@ -10,7 +10,97 @@
},
"layouts": {
"LAYOUT": {
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6, "y":0}, {"label":"F6", "x":10.25, "y":0}, {"label":"F7", "x":11.25, "y":0}, {"label":"F8", "x":12.25, "y":0}, {"label":"F9", "x":13.75, "y":0}, {"label":"F10", "x":14.75, "y":0}, {"label":"F11", "x":15.75, "y":0}, {"label":"F12", "x":16.75, "y":0}, {"label":"PrtSc", "x":18, "y":0}, {"label":"Scroll Lock", "x":19, "y":0}, {"label":"Pause", "x":20, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":9.75, "y":1.5}, {"label":"*", "x":10.75, "y":1.5}, {"label":"(", "x":11.75, "y":1.5}, {"label":")", "x":12.75, "y":1.5}, {"label":"_", "x":13.75, "y":1.5}, {"label":"+", "x":14.75, "y":1.5}, {"label":"Backspace", "x":15.75, "y":1.5, "w":2}, {"label":"Insert", "x":18, "y":1.5}, {"label":"Home", "x":19, "y":1.5}, {"label":"PgUp", "x":20, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":9.25, "y":2.5}, {"label":"U", "x":10.25, "y":2.5}, {"label":"I", "x":11.25, "y":2.5}, {"label":"O", "x":12.25, "y":2.5}, {"label":"P", "x":13.25, "y":2.5}, {"label":"{", "x":14.25, "y":2.5}, {"label":"}", "x":15.25, "y":2.5}, {"label":"|", "x":16.25, "y":2.5, "w":1.5}, {"label":"Delete", "x":18, "y":2.5}, {"label":"End", "x":19, "y":2.5}, {"label":"PgDn", "x":20, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":9.5, "y":3.5}, {"label":"J", "x":10.5, "y":3.5}, {"label":"K", "x":11.5, "y":3.5}, {"label":"L", "x":12.5, "y":3.5}, {"label":":", "x":13.5, "y":3.5}, {"label":"\"", "x":14.5, "y":3.5}, {"label":"Enter", "x":15.5, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":10, "y":4.5}, {"label":"M", "x":11, "y":4.5}, {"label":"<", "x":12, "y":4.5}, {"label":">", "x":13, "y":4.5}, {"label":"?", "x":14, "y":4.5}, {"label":"Shift", "x":15, "y":4.5, "w":2.75}, {"label":"\u2191", "x":19, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Fn", "x":1.25, "y":5.5, "w":1.25}, {"label":"Win", "x":2.5, "y":5.5, "w":1.25}, {"label":"Alt", "x":3.75, "y":5.5, "w":1.25}, {"x":5, "y":5.5, "w":2.25}, {"x":10, "y":5.5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5.5, "w":1.25}, {"label":"Win", "x":14, "y":5.5, "w":1.25}, {"label":"Menu", "x":15.25, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":16.5, "y":5.5, "w":1.25}, {"label":"\u2190", "x":18, "y":5.5}, {"label":"\u2193", "x":19, "y":5.5}, {"label":"\u2192", "x":20, "y":5.5}]
"layout": [
{"label":"Esc", "matrix": [0, 4], "x":0 , "y":0},
{"label":"F1" , "matrix": [0, 5], "x":2 , "y":0},
{"label":"F2" , "matrix": [0, 6], "x":3 , "y":0},
{"label":"F3" , "matrix": [0, 7], "x":4 , "y":0},
{"label":"F4" , "matrix": [0, 8], "x":5 , "y":0},
{"label":"F5" , "matrix": [0, 9], "x":6 , "y":0},
{"label":"F6" , "matrix": [6, 0], "x":10.25 , "y":0},
{"label":"F7" , "matrix": [6, 1], "x":11.25 , "y":0},
{"label":"F8" , "matrix": [6, 2], "x":12.25 , "y":0},
{"label":"F9" , "matrix": [6, 3], "x":13.75 , "y":0},
{"label":"F10" , "matrix": [6, 4], "x":14.75 , "y":0},
{"label":"F11" , "matrix": [6, 5], "x":15.75 , "y":0},
{"label":"F12" , "matrix": [6, 6], "x":16.75 , "y":0},
{"label":"PrtSc" , "matrix": [6, 7], "x":18 , "y":0},
{"label":"Scroll Lock" , "matrix": [6, 8], "x":19 , "y":0},
{"label":"Pause" , "matrix": [6, 9], "x":20 , "y":0},
{"label":"~" , "matrix": [2, 4], "x":0 , "y":1.5},
{"label":"1!" , "matrix": [1, 4], "x":1 , "y":1.5},
{"label":"2@" , "matrix": [1, 5], "x":2 , "y":1.5},
{"label":"3#" , "matrix": [1, 6], "x":3 , "y":1.5},
{"label":"4$" , "matrix": [1, 7], "x":4 , "y":1.5},
{"label":"5%" , "matrix": [1, 8], "x":5 , "y":1.5},
{"label":"6^" , "matrix": [1, 9], "x":6 , "y":1.5},
{"label":"7&" , "matrix": [7, 0], "x":9.75 , "y":1.5},
{"label":"8*" , "matrix": [7, 1], "x":10.75 , "y":1.5},
{"label":"9(" , "matrix": [7, 2], "x":11.75 , "y":1.5},
{"label":"0)" , "matrix": [7, 3], "x":12.75 , "y":1.5},
{"label":"-_" , "matrix": [7, 4], "x":13.75 , "y":1.5},
{"label":"=+" , "matrix": [7, 5], "x":14.75 , "y":1.5},
{"label":"Backspace" , "matrix": [7, 6], "x":15.75 , "y":1.5 , "w":2},
{"label":"Insert" , "matrix": [7, 7], "x":18 , "y":1.5},
{"label":"Home" , "matrix": [7, 8], "x":19 , "y":1.5},
{"label":"PgUp" , "matrix": [7, 9], "x":20 , "y":1.5},
{"label":"Tab" , "matrix": [3, 4], "x":0 , "y":2.5 , "w":1.5},
{"label":"Q" , "matrix": [2, 5], "x":1.5 , "y":2.5},
{"label":"W" , "matrix": [2, 6], "x":2.5 , "y":2.5},
{"label":"E" , "matrix": [2, 7], "x":3.5 , "y":2.5},
{"label":"R" , "matrix": [2, 8], "x":4.5 , "y":2.5},
{"label":"T" , "matrix": [2, 9], "x":5.5 , "y":2.5},
{"label":"Y" , "matrix": [9, 0], "x":9.25 , "y":2.5},
{"label":"U" , "matrix": [8, 0], "x":10.25 , "y":2.5},
{"label":"I" , "matrix": [8, 1], "x":11.25 , "y":2.5},
{"label":"O" , "matrix": [8, 2], "x":12.25 , "y":2.5},
{"label":"P" , "matrix": [8, 3], "x":13.25 , "y":2.5},
{"label":"{" , "matrix": [8, 4], "x":14.25 , "y":2.5},
{"label":"}" , "matrix": [8, 5], "x":15.25 , "y":2.5},
{"label":"|" , "matrix": [8, 6], "x":16.25 , "y":2.5 , "w":1.5},
{"label":"Delete" , "matrix": [8, 7], "x":18 , "y":2.5},
{"label":"End" , "matrix": [8, 8], "x":19 , "y":2.5},
{"label":"PgDn" , "matrix": [8, 9], "x":20 , "y":2.5},
{"label":"Caps Lock" , "matrix": [4, 4], "x":0 , "y":3.5 , "w":1.75},
{"label":"A" , "matrix": [3, 5], "x":1.75 , "y":3.5},
{"label":"S" , "matrix": [3, 6], "x":2.75 , "y":3.5},
{"label":"D" , "matrix": [3, 7], "x":3.75 , "y":3.5},
{"label":"F" , "matrix": [3, 8], "x":4.75 , "y":3.5},
{"label":"G" , "matrix": [3, 9], "x":5.75 , "y":3.5},
{"label":"H" , "matrix": [10, 0], "x":9.5 , "y":3.5},
{"label":"J" , "matrix": [9, 1], "x":10.5 , "y":3.5},
{"label":"K" , "matrix": [9, 2], "x":11.5 , "y":3.5},
{"label":"L" , "matrix": [9, 3], "x":12.5 , "y":3.5},
{"label":":" , "matrix": [9, 4], "x":13.5 , "y":3.5},
{"label":"\"" , "matrix": [9, 5], "x":14.5 , "y":3.5},
{"label":"Enter" , "matrix": [9, 6], "x":15.5 , "y":3.5 , "w":2.25},
{"label":"Shift" , "matrix": [5, 4], "x":0 , "y":4.5 , "w":2.25},
{"label":"Z" , "matrix": [4, 5], "x":2.25 , "y":4.5},
{"label":"X" , "matrix": [4, 6], "x":3.25 , "y":4.5},
{"label":"C" , "matrix": [4, 7], "x":4.25 , "y":4.5},
{"label":"V" , "matrix": [4, 8], "x":5.25 , "y":4.5},
{"label":"B" , "matrix": [4, 9], "x":6.25 , "y":4.5},
{"label":"N" , "matrix": [11, 0], "x":10 , "y":4.5},
{"label":"M" , "matrix": [10, 1], "x":11 , "y":4.5},
{"label":"<" , "matrix": [10, 2], "x":12 , "y":4.5},
{"label":">" , "matrix": [10, 3], "x":13 , "y":4.5},
{"label":"?" , "matrix": [10, 4], "x":14 , "y":4.5},
{"label":"Shift" , "matrix": [10, 6], "x":15 , "y":4.5 , "w":2.75},
{"label":"\u2191" , "matrix": [10, 8], "x":19 , "y":4.5},
{"label":"Ctrl" , "matrix": [5, 5], "x":0 , "y":5.5 , "w":1.25},
{"label":"Fn" , "matrix": [5, 6], "x":1.25 , "y":5.5 , "w":1.25},
{"label":"Win" , "matrix": [5, 7], "x":2.5 , "y":5.5 , "w":1.25},
{"label":"Alt" , "matrix": [5, 8], "x":3.75 , "y":5.5 , "w":1.25},
{"label":"Space" , "matrix": [5, 9], "x":5 , "y":5.5 , "w":2.25},
{"label":"Space" , "matrix": [11, 1], "x":10 , "y":5.5 , "w":2.75},
{"label":"Alt" , "matrix": [11, 3], "x":12.75 , "y":5.5 , "w":1.25},
{"label":"Win" , "matrix": [11, 4], "x":14 , "y":5.5 , "w":1.25},
{"label":"Menu" , "matrix": [11, 5], "x":15.25 , "y":5.5 , "w":1.25},
{"label":"Ctrl" , "matrix": [11, 6], "x":16.5 , "y":5.5 , "w":1.25},
{"label":"\u2190" , "matrix": [11, 7], "x":18 , "y":5.5},
{"label":"\u2193" , "matrix": [11, 8], "x":19 , "y":5.5},
{"label":"\u2192" , "matrix": [11, 9], "x":20 , "y":5.5}
]
}
}
}

View File

@ -21,22 +21,22 @@ enum layer_names {
AUD,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
/* BASE */
[0] = LAYOUT(
KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS,
KC_GRV, 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_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB,KC_Q, KC_W, KC_E, KC_R, KC_T, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_Y, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_H, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL,MO(1),KC_LGUI,KC_LALT,KC_SPACE, KC_N, KC_SPACE, KC_RALT,KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
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_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, 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_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_LCTL, MO(1), KC_LGUI,KC_LALT,KC_SPACE,KC_SPACE,KC_RALT,KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
/* Volume */
/* AUD */
[1] = LAYOUT(
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, 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, KC_TRNS, KC_VOLU,
KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_MEDIA_PLAY_PAUSE, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
),
KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_MEDIA_PLAY_PAUSE,KC_MEDIA_PLAY_PAUSE,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
)
};

View File

@ -1,17 +0,0 @@
/* Copyright 2021 jurassic73
*
* 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 "split89.h"

View File

@ -1,50 +0,0 @@
/* Copyright 2021 jurassic73
*
* 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"
/* This is a shortcut to help you visually see your layout.
*
* The first section contains all of the arguments representing the physical
* layout of the board and position of the keys minus blanks in the matrix.
*
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix which includes blanks in the wired out matrix.
*/
#define LAYOUT( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, \
k32, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, \
k48, k33, k34, k35, k36, k37, k54, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, \
k61, k49, k50, k51, k52, k53, k67, k55, k56, k57, k58, k59, k60, \
k74, k62, k63, k64, k65, k66, k80, k68, k69, k70, k71, k72, k73, \
k75, k76, k77, k78, k79, k81, k82, k83, k84, k85, k86, k87, k88 \
) \
{ \
{ KC_NO, KC_NO, KC_NO, KC_NO, k00, k01, k02, k03, k04, k05 }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, k16, k17, k18, k19, k20, k21 }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, k32, k33, k34, k35, k36, k37 }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, k48, k49, k50, k51, k52, k53 }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, k61, k62, k63, k64, k65, k66, }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, k74, k75, k76, k77, k78, k79, }, \
{ k06, k07, k08, k09, k10, k11, k12, k13, k14, k15 }, \
{ k22, k23, k24, k25, k26, k27, k28, k29, k30, k31 }, \
{ k38, k39, k40, k41, k42, k43, k44, k45, k46, k47 }, \
{ k54, k55, k56, k57, k58, k59, k60, KC_NO, KC_NO, KC_NO }, \
{ k67, k68, k69, k70, k71, KC_NO, k72, KC_NO, k73, KC_NO }, \
{ k80, k81, KC_NO, k82, k83, k84, k85, k86, k87, k88 } \
}

View File

@ -1,33 +1,5 @@
/*
Copyright 2021 Kyle McCreery
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/>.
*/
// Copyright 2023 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16
/* 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
#define MATRIX_ROW_PINS { F7, B7, F5, F1, B0 }
#define MATRIX_COL_PINS { C7, F6, B2, F4, B3, E6, D0, D1, D2, D3, D5, D4, D6, D7, B4, B1 }
#define DIODE_DIRECTION COL2ROW
#define BACKLIGHT_PIN B6
#define BACKLIGHT_LEVELS 6
#define BACKLIGHT_CAPS_LOCK
#define BACKLIGHT_BREATHING
#define BREATHING_PERIOD 5
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5

View File

@ -8,6 +8,17 @@
"pid": "0x3365",
"device_version": "0.0.1"
},
"diode_direction": "COL2ROW",
"matrix_pins": {
"cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
"rows": ["B0", "B1", "B2", "B3", "F7"]
},
"backlight": {
"pin": "B6",
"levels": 6,
"breathing": true,
"breathing_period": 5
},
"layout_aliases": {
"LAYOUT": "LAYOUT_65_ansi_blocker"
},

View File

@ -142,24 +142,24 @@ const key_override_t **key_overrides = (const key_override_t *[]){
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
* ,------------------------------------------------------------------------------------------------------------------------------------------------.
* ,------------------------------------------------------------------------------------------------------------------------------------.
* | Caps Lock | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Leader |
* |----------+------+--------------------+-----------+------------+---------------+-----------+------------+------+------+------------+------------|
* | Ctrl | Q | W | E | R | T | Copy/Y | Ü/U | I | Ö/O | Paste/P | Ctrl |
* |----------+------+--------------------+-----------+------------+---------------------------+------------+------+------+------------+------------|
* | Shift/Esc| Ä/A | ß/S | D | F | G | H | J | K | L | ' | Shift/Enter|
* |----------+------+--------------------+-----------+------------+---------------|-----------+------------+------+------+------------+------------|
* | | Z | Cut/X | C | V | B | N | M | , | . | / | |
* |----------+------+--------------------+-----------+------------+---------------+-----------+------------+------+------+------------+------------|
* | | |Compositor+Alt+Shift| Raise |Lower/Space | Compositor+Alt| Mouse |Lower/Space |Raise | | | Manage |
* `------------------------------------------------------------------------------------------------------------------------------------------------'
* |--------------+--------------------+------+------+------+------+-----------+------+------+------+--------------------+--------------|
* | Ctrl | Q | W | E | R | T | Y/Copy | U/Ü | I | O/Ö | P/Paste | Ctrl |
* |--------------+--------------------+------+------+------+------+-----------+------+------+------+--------------------+--------------|
* | Shift/Esc | A/Ä | S/ß | D | F | G | H | J | K | L | ' | Shift/Enter |
* |--------------+--------------------+------+------+------+------+-----------+------+------+------+--------------------+--------------|
* |Compositor+Alt| Z |X/Cut | C | V | B | N | M | , | . | / |Compositor+Alt|
* |--------------+--------------------+------+------+------+------+-----------+------+------+------+--------------------+--------------|
* | |Compositor+Alt+Shift| | |Raise |Lower |Lower/Space|Raise | | |Compositor+Alt+Shift| Manage |
* `------------------------------------------------------------------------------------------------------------------------------------'
*/
[_QWERTY] = LAYOUT_preonic_grid(
KC_CAPS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LEAD,
KC_LCTL, KC_Q, KC_W, KC_E, KC_R, KC_T, LT_COPY_Y, LT_UE_U, KC_I, LT_OE_O, LT_PASTE_P, KC_RCTL,
MOD_TAP_LSFT_ESC, LT_AE_A, LT_SZ_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, MOD_TAP_LSFT_ENT,
_______, KC_Z, LT_CUT_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______,
_______, _______, LM_COMP_LALT_LSFT, RAISE, LOWER, LM_COMP_LALT, TG(_MOUSE), LT_LOWER_SPC, RAISE, _______, _______, MANAGE
LM_COMP_LALT, KC_Z, LT_CUT_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, LM_COMP_LALT,
_______, LM_COMP_LALT_LSFT, _______, _______, RAISE, LOWER, LT_LOWER_SPC, RAISE, _______, _______, _______, MANAGE
),
/* Lower
* ,-----------------------------------------------------------------------------------.
@ -202,24 +202,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
),
/* Mouse
* ,---------------------------------------------------------------------------------------------------------------------------------------.
* | | | | | | | | | | | | |
* |------+------+--------------+--------------+--------------+---------------+-----------+-----------+---------+------------+------+------|
* ,-------------------------------------------------------------------------------------------------------------------------------------------------------.
* | Caps Lock | | | | | | | | | | | Leader |
* |--------------+-------+--------------+--------------+--------------+--------------+-----------+-----------+---------+------------+------+--------------|
* | | | | | | |Wheel Left |Wheel Down |Wheel Up |Wheel Right | | Ctrl |
* |------+------+--------------+--------------+--------------+---------------------------+-----------+---------+------------+------+------|
* |--------------+-------+--------------+--------------+--------------+--------------+-----------+-----------+---------+------------+------+--------------|
* | | | Button 3 | Button 2 | Button 1 | |Cursor Left|Cursor Down|Cursor Up|Cursor Right| | |
* |------+------+--------------+--------------+--------------+---------------|-----------+-----------+---------+------------+------+------|
* | | | | | | | | | | | | |
* |------+------+--------------+--------------+--------------+---------------+-----------+-----------+---------+------------+------+------|
* | | |Accelaration 2|Accelaration 1|Accelaration 0| Compositor+Alt| | | | | | |
* `---------------------------------------------------------------------------------------------------------------------------------------'
* |--------------+-------+--------------+--------------+--------------+--------------+-----------+-----------+---------+------------+------+--------------|
* |Compositor+Alt| | | | | | | | | | |Compositor+Alt|
* |--------------+-------+--------------+--------------+--------------+--------------+-----------+-----------+---------+------------+------+--------------|
* | | | |Accelaration 2|Accelaration 1|Accelaration 0| | | | | | |
* `-------------------------------------------------------------------------------------------------------------------------------------------------------'
*/
[_MOUSE] = LAYOUT_preonic_grid(
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_UP, KC_MS_WH_RIGHT, XXXXXXX, _______,
XXXXXXX, XXXXXXX, KC_MS_BTN3, KC_MS_BTN2, KC_MS_BTN1, XXXXXXX, KC_MS_LEFT, KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, KC_MS_ACCEL2, KC_MS_ACCEL1, KC_MS_ACCEL0, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_ACCEL2, KC_MS_ACCEL1, KC_MS_ACCEL0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
),
/* Manage
* ,---------------------------------------------------------------------------------------.
@ -251,7 +251,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | Z | X | C | V | B | N | M | , | . | / | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | | |Space | | | | |
* | | | | | | |Space | | | | | |
* `-----------------------------------------------------------------------------------'
*/
[_COMPOSITOR] = LAYOUT_preonic_grid(
@ -259,7 +259,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, XXXXXXX,
XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT,
XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
)
};
@ -396,6 +396,11 @@ static inline void leader_bindings(void) {
SEQ_ONE_KEY(KC_P) {
tap_code16(C(S(KC_V)));
}
/* Toggle mouse layer. */
SEQ_ONE_KEY(KC_CAPS) {
layer_invert(_MOUSE);
}
}
}

View File

@ -73,11 +73,7 @@ uint8_t keyboard_led_state = 0;
volatile uint16_t keyboard_idle_count = 0;
static virtual_timer_t keyboard_idle_timer;
#if CH_KERNEL_MAJOR >= 7
static void keyboard_idle_timer_cb(struct ch_virtual_timer *, void *arg);
#elif CH_KERNEL_MAJOR <= 6
static void keyboard_idle_timer_cb(void *arg);
#endif
report_keyboard_t keyboard_report_sent = {{0}};
report_mouse_t mouse_report_sent = {0};
@ -842,12 +838,8 @@ __attribute__((weak)) void restart_usb_driver(USBDriver *usbp) {
/* Idle requests timer code
* callback (called from ISR, unlocked state) */
#if CH_KERNEL_MAJOR >= 7
static void keyboard_idle_timer_cb(struct ch_virtual_timer *timer, void *arg) {
(void)timer;
#elif CH_KERNEL_MAJOR <= 6
static void keyboard_idle_timer_cb(void *arg) {
#endif
USBDriver *usbp = (USBDriver *)arg;
osalSysLockFromISR();