diff options
author | fauxpark <[email protected]> | 2023-12-20 16:03:14 +1100 |
---|---|---|
committer | fauxpark <[email protected]> | 2023-12-20 16:03:14 +1100 |
commit | 2c191e21c280a78e71767a73f31cd7017382186c (patch) | |
tree | 9712dc3c8fb836c708ac67a2c4ab0dbf2fa6d674 /keyboards/novelkeys | |
parent | 8812a095814fdad3ab245fa2c00e29cb50ee2e92 (diff) | |
parent | c8728880de198f5797463efbbba3eba7f1e4444a (diff) | |
download | qmk_firmware-2c191e21c280a78e71767a73f31cd7017382186c.tar.gz qmk_firmware-2c191e21c280a78e71767a73f31cd7017382186c.zip |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/novelkeys')
-rwxr-xr-x | keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c | 37 | ||||
-rwxr-xr-x | keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c | 47 |
2 files changed, 0 insertions, 84 deletions
diff --git a/keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c b/keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c deleted file mode 100755 index c5045c4551..0000000000 --- a/keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2019 Yiancar - * - * 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 - -enum my_layers { - _QWERTY, - _FNMS -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[_QWERTY] = LAYOUT_65_ansi( /* Base */ - QK_GESC, 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_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_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_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(_FNMS), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - -[_FNMS] = LAYOUT_65_ansi( /* FN */ - 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_DEL, 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, QK_BOOT, KC_TRNS, - AG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_TRNS, KC_TRNS, - KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), -}; diff --git a/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c b/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c deleted file mode 100755 index 79a3e2fdbf..0000000000 --- a/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c +++ /dev/null @@ -1,47 +0,0 @@ -/* -Copyright 2018 Jordi Pakey-Rodriguez - -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] = { - - [0] = LAYOUT( - LT(1, KC_NUM), KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_P4, KC_P5, KC_P6, KC_PEQL, - KC_P1, KC_P2, KC_P3, KC_TAB, - KC_PCMM, KC_P0, KC_PDOT, KC_PENT - ), - - [1] = LAYOUT( - _______, QK_BOOT, BL_STEP, RGB_TOG, - RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, - RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, - RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, - RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G - ), - -}; - -bool led_update_user(led_t led_state) { - if (led_state.num_lock) { - // Illuminate the LED under the Num Lock key - rgblight_sethsv_at(0, 0, 127, 1); - } else { - rgblight_sethsv_at(0, 0, 0, 1); - } - return false; -} |