From 8e24e6ad88be7c3bc60bdf8fe9aee810b0704254 Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 16 Jan 2021 18:32:15 -0800 Subject: [PATCH 01/16] fix atomic:pvc so it compiles --- keyboards/atomic/keymaps/pvc/keymap.c | 2 +- keyboards/atomic/keymaps/pvc/rules.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/keyboards/atomic/keymaps/pvc/keymap.c b/keyboards/atomic/keymaps/pvc/keymap.c index 361d702c5bc3..51e697f96853 100644 --- a/keyboards/atomic/keymaps/pvc/keymap.c +++ b/keyboards/atomic/keymaps/pvc/keymap.c @@ -401,7 +401,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { else { breathing_period_set(1); - breathing_self_disable(); + breathing_disable(); layer_off(LAYER_FUNCTION); } break; diff --git a/keyboards/atomic/keymaps/pvc/rules.mk b/keyboards/atomic/keymaps/pvc/rules.mk index 8414b40fb6d0..fa693923e54a 100644 --- a/keyboards/atomic/keymaps/pvc/rules.mk +++ b/keyboards/atomic/keymaps/pvc/rules.mk @@ -10,6 +10,7 @@ AUDIO_ENABLE = yes # Audio output on port C6 UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. +LTO_ENABLE = yes # Optimize size of firmware # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend \ No newline at end of file +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend From c68dc05cdd08390a303c24adfde48d56c211e448 Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 16 Jan 2021 18:35:28 -0800 Subject: [PATCH 02/16] enable LTO on atreus:ibnuda to bring it below the threshold --- keyboards/atreus/keymaps/ibnuda/rules.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/atreus/keymaps/ibnuda/rules.mk diff --git a/keyboards/atreus/keymaps/ibnuda/rules.mk b/keyboards/atreus/keymaps/ibnuda/rules.mk new file mode 100644 index 000000000000..14227c90d793 --- /dev/null +++ b/keyboards/atreus/keymaps/ibnuda/rules.mk @@ -0,0 +1 @@ +LTO_ENABLE=yes From 0027004dd54d8cdeebd9801a49c371e01cffc18f Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 16 Jan 2021 18:35:35 -0800 Subject: [PATCH 03/16] enable bluetooth on atreus:clash to fix compile error --- keyboards/atreus/keymaps/clash/rules.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/atreus/keymaps/clash/rules.mk diff --git a/keyboards/atreus/keymaps/clash/rules.mk b/keyboards/atreus/keymaps/clash/rules.mk new file mode 100644 index 000000000000..db1870fb1570 --- /dev/null +++ b/keyboards/atreus/keymaps/clash/rules.mk @@ -0,0 +1 @@ +BLUETOOTH_ENABLE=yes From ab5791b996645fe1d08f3b8132050e844227387a Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 16 Jan 2021 18:36:23 -0800 Subject: [PATCH 04/16] fix chimera_ortho:gordon so it compiles --- .../chimera_ortho/keymaps/gordon/keymap.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/keyboards/chimera_ortho/keymaps/gordon/keymap.c b/keyboards/chimera_ortho/keymaps/gordon/keymap.c index c0543f2e0413..5bd2019c26f9 100644 --- a/keyboards/chimera_ortho/keymaps/gordon/keymap.c +++ b/keyboards/chimera_ortho/keymaps/gordon/keymap.c @@ -112,13 +112,8 @@ * */ -//Tap dance enums enum { - F12ETAPS = 0, - CALCCOMP, - ALTF4, - F6F7, - TTT, + TTT = 4, HOME_END, CALC_PRINTSCREEN }; @@ -188,18 +183,6 @@ void TTT_reset (qk_tap_dance_state_t *state, void *user_data) { ttt_state.state = 0; } -qk_tap_dance_action_t tap_dance_actions[] = { - // simple tap dance - [F12ETAPS] = ACTION_TAP_DANCE_DOUBLE(KC_F12,LSFT(LCTL(KC_F10))), - [CALCCOMP] = ACTION_TAP_DANCE_DOUBLE(KC_CALCULATOR, KC_MY_COMPUTER), - [CALC_PRINTSCREEN] = ACTION_TAP_DANCE_DOUBLE(KC_CALCULATOR, KC_PSCR), - [ALTF4] = ACTION_TAP_DANCE_DOUBLE(KC_F4,LALT(KC_F4)), - [F6F7] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_F6), LALT(KC_F7)), - [HOME_END] = ACTION_TAP_DANCE_DOUBLE(KC_END, KC_HOME), - [TTT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL,TTT_finished, TTT_reset), -}; - - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_kc( From e99d4ea63b0aa825837d555b538ea0db38141027 Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 16 Jan 2021 18:37:10 -0800 Subject: [PATCH 05/16] fix clueboard/66:magicmonty to bring hue under the 255 limit --- .../clueboard/66/keymaps/magicmonty/keymap.c | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c index cd9ae01188e9..54420d31b6fa 100644 --- a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c +++ b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c @@ -134,23 +134,23 @@ enum layer_id { void clueboard_set_led(uint8_t id, uint8_t val) { switch (id) { case LAYER_BASE: - rgblight_sethsv_noeeprom(190, 255, val); + rgblight_sethsv_noeeprom(135, 255, val); break; case LAYER_FUNCTION: - rgblight_sethsv_noeeprom(46, 255, val); + rgblight_sethsv_noeeprom(32, 255, val); break; case LAYER_MEDIA: - rgblight_sethsv_noeeprom(86, 255, val); + rgblight_sethsv_noeeprom(60, 255, val); break; case LAYER_CONTROL: - rgblight_sethsv_noeeprom(346, 255, val); + rgblight_sethsv_noeeprom(245, 255, val); break; case LAYER_MOUSE: - rgblight_sethsv_noeeprom(206, 255, val); + rgblight_sethsv_noeeprom(146, 255, val); break; #if defined(MIDI_ENABLE) case LAYER_MIDI: - rgblight_sethsv_noeeprom(316, 255, val); + rgblight_sethsv_noeeprom(224, 255, val); break; #endif } @@ -158,15 +158,15 @@ void clueboard_set_led(uint8_t id, uint8_t val) { const uint16_t oct_hues[10] = { 0, - 30, + 20, + 40, 60, - 90, + 80, + 100, 120, - 150, - 180, - 210, - 240, - 300 + 140, + 160, + 180 }; #define MAX_OCT 9 From 9dd7c55c1448f989c1c04b4d98e4f0bce8d1c30d Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 16 Jan 2021 18:37:28 -0800 Subject: [PATCH 06/16] make the tetris keymap fit --- keyboards/clueboard/66/keymaps/tetris/rules.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/clueboard/66/keymaps/tetris/rules.mk b/keyboards/clueboard/66/keymaps/tetris/rules.mk index 4613531296b5..464c6e0c8e4e 100644 --- a/keyboards/clueboard/66/keymaps/tetris/rules.mk +++ b/keyboards/clueboard/66/keymaps/tetris/rules.mk @@ -1 +1,3 @@ SRC = tetris_text.c +RGBLIGHT_ENABLE = no +BACKLIGHT_ENABLE = no From e23d687d12c69217d3160f46ae0764502b14f27d Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 16 Jan 2021 18:37:53 -0800 Subject: [PATCH 07/16] add missing ADJUST key --- keyboards/contra/keymaps/msiu/keymap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/contra/keymaps/msiu/keymap.c b/keyboards/contra/keymaps/msiu/keymap.c index c68c2c7bbf66..ee0598533d31 100644 --- a/keyboards/contra/keymaps/msiu/keymap.c +++ b/keyboards/contra/keymaps/msiu/keymap.c @@ -16,7 +16,8 @@ enum planck_keycodes { QWERTY = SAFE_RANGE, DVORAK, LOWER, - RAISE + RAISE, + ADJUST }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From efee4eeb349005b596884827c927955d7e3ec65e Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 16 Jan 2021 18:38:26 -0800 Subject: [PATCH 08/16] remove conflicting NKRO_ENABLE flag --- keyboards/converter/usb_usb/keymaps/narze/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/converter/usb_usb/keymaps/narze/rules.mk b/keyboards/converter/usb_usb/keymaps/narze/rules.mk index 657773e84ee2..2d982de62890 100644 --- a/keyboards/converter/usb_usb/keymaps/narze/rules.mk +++ b/keyboards/converter/usb_usb/keymaps/narze/rules.mk @@ -1,3 +1,2 @@ EXTRAKEY_ENABLE = no -NKRO_ENABLE = yes COMBO_ENABLE = yes From 63b0d8929f5332ad266138e99cd176c262035f8e Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 16 Jan 2021 18:38:50 -0800 Subject: [PATCH 09/16] strip fn_actions --- layouts/community/60_iso/unxmaal/keymap.c | 101 +--------------------- 1 file changed, 2 insertions(+), 99 deletions(-) diff --git a/layouts/community/60_iso/unxmaal/keymap.c b/layouts/community/60_iso/unxmaal/keymap.c index 5c8325e62f58..e1c0454fb6d0 100644 --- a/layouts/community/60_iso/unxmaal/keymap.c +++ b/layouts/community/60_iso/unxmaal/keymap.c @@ -90,37 +90,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_UL] = LAYOUT_60_iso( 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,F(4),F(5),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,F(6),F(7),F(8),F(9),F(10),F(11),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \ + KC_TRNS,RGB_TOG,RGB_MOD,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,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \ KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS), }; -enum function_id { - RGBLED_TOGGLE, - RGBLED_STEP_MODE, - RGBLED_INCREASE_HUE, - RGBLED_DECREASE_HUE, - RGBLED_INCREASE_SAT, - RGBLED_DECREASE_SAT, - RGBLED_INCREASE_VAL, - RGBLED_DECREASE_VAL, - SHIFT_ESC, -}; - -const uint16_t PROGMEM fn_actions[] = { - [4] = ACTION_FUNCTION(RGBLED_TOGGLE), //Turn on/off underglow - [5] = ACTION_FUNCTION(RGBLED_STEP_MODE), // Change underglow mode - [6] = ACTION_FUNCTION(RGBLED_INCREASE_HUE), - [7] = ACTION_FUNCTION(RGBLED_DECREASE_HUE), - [8] = ACTION_FUNCTION(RGBLED_INCREASE_SAT), - [9] = ACTION_FUNCTION(RGBLED_DECREASE_SAT), - [10] = ACTION_FUNCTION(RGBLED_INCREASE_VAL), - [11] = ACTION_FUNCTION(RGBLED_DECREASE_VAL), - [12] = ACTION_FUNCTION(SHIFT_ESC), -}; - void matrix_scan_user(void) { - // Layer LED indicators // ESC led on when in function layer, WASD cluster leds enabled when on arrow cluster #ifdef KEYBOARD_gh60 @@ -138,75 +113,3 @@ void matrix_scan_user(void) { } #endif }; - -#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) - -void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { - switch (id) { -#ifdef RGBLIGHT_ENABLE - case RGBLED_TOGGLE: - //led operations - if (record->event.pressed) { - rgblight_toggle(); - } - break; - case RGBLED_INCREASE_HUE: - if (record->event.pressed) { - rgblight_increase_hue(); - } - break; - case RGBLED_DECREASE_HUE: - if (record->event.pressed) { - rgblight_decrease_hue(); - } - break; - case RGBLED_INCREASE_SAT: - if (record->event.pressed) { - rgblight_increase_sat(); - } - break; - case RGBLED_DECREASE_SAT: - if (record->event.pressed) { - rgblight_decrease_sat(); - } - break; - case RGBLED_INCREASE_VAL: - if (record->event.pressed) { - rgblight_increase_val(); - } - break; - case RGBLED_DECREASE_VAL: - if (record->event.pressed) { - rgblight_decrease_val(); - } - break; - case RGBLED_STEP_MODE: - if (record->event.pressed) { - rgblight_step(); - } - break; -#endif - static uint8_t shift_esc_shift_mask; - // Shift + ESC = ~ - case SHIFT_ESC: - shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK; - if (record->event.pressed) { - if (shift_esc_shift_mask) { - add_key(KC_GRV); - send_keyboard_report(); - } else { - add_key(KC_ESC); - send_keyboard_report(); - } - } else { - if (shift_esc_shift_mask) { - del_key(KC_GRV); - send_keyboard_report(); - } else { - del_key(KC_ESC); - send_keyboard_report(); - } - } - break; - } -}; From d64a67458dce9da53c0ed933092b8daf6aae3284 Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 16 Jan 2021 18:39:43 -0800 Subject: [PATCH 10/16] bring the xyverz keymap inline with LAYOUT_66_ansi --- layouts/community/66_ansi/xyverz/keymap.c | 50 +++++++++++------------ layouts/community/66_ansi/xyverz/rules.mk | 4 +- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/layouts/community/66_ansi/xyverz/keymap.c b/layouts/community/66_ansi/xyverz/keymap.c index 521379bde91c..d7231db5cb93 100644 --- a/layouts/community/66_ansi/xyverz/keymap.c +++ b/layouts/community/66_ansi/xyverz/keymap.c @@ -37,12 +37,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `------------------------------------------------------------------' */ -[_QWERTY] = LAYOUT ( - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_GRV, KC_BSPC, KC_PGUP, \ +[_QWERTY] = LAYOUT_66_ansi ( + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, \ 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_PGDN, \ - FN_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT, \ - KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, KC_SPC, KC_SPC, XXXXXXX, KC_RGUI, KC_RCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT), + FN_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, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT), /* Keymap _COLEMAK: Base Layer * ,-----------------------------------------------------------. ,---. @@ -57,12 +57,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |Ctrl|Gui|Alt | | Space| Space| |Alt |Gui |Ctrl|Left|Down|Rgt| * `------------------------------------------------------------------' */ -[_COLEMAK] = LAYOUT ( - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_GRV, KC_BSPC, KC_PGUP, \ +[_COLEMAK] = LAYOUT_66_ansi ( + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, \ KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, \ - FN_CAPS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, XXXXXXX, KC_ENT, \ - KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, KC_SPC, KC_SPC, XXXXXXX, KC_RGUI, KC_RCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT), + FN_CAPS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT), /* Keymap _DVORAK: Base Layer * ,-----------------------------------------------------------. ,---. @@ -77,30 +77,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |Ctrl|Gui|Alt | | Space| Space| |Alt |Gui |Ctrl|Left|Down|Rgt| * `------------------------------------------------------------------' */ -[_DVORAK] = LAYOUT ( - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_GRV, KC_BSPC, KC_PGUP, \ +[_DVORAK] = LAYOUT_66_ansi ( + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, \ KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, KC_PGDN, \ - FN_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, XXXXXXX, KC_ENT, \ - KC_LSFT, XXXXXXX, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, KC_SPC, KC_SPC, XXXXXXX, KC_RGUI, KC_RCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT), + FN_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, \ + KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, KC_UP, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT), /* Keymap _FL: Function Layer */ -[_FL] = LAYOUT ( - 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, BL_STEP, \ +[_FL] = LAYOUT_66_ansi ( + 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, BL_STEP, \ _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, \ - _______, _______, MO(_CL), _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, KC_PGUP, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END), + _______, _______, MO(_CL), _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PGUP, \ + _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END), /* Keymap _CL: Control layer */ -[_CL] = LAYOUT ( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_VAI, \ +[_CL] = LAYOUT_66_ansi ( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_VAI, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, \ - _______, _______, MO(_CL), _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI, \ - _______, _______, _______, _______, RGB_MOD, RGB_MOD, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_HUI), + _______, _______, MO(_CL), _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI, \ + _______, _______, _______, RGB_MOD, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_HUI), }; // clang-format on diff --git a/layouts/community/66_ansi/xyverz/rules.mk b/layouts/community/66_ansi/xyverz/rules.mk index 164232f3398c..6ddbb80a9c58 100644 --- a/layouts/community/66_ansi/xyverz/rules.mk +++ b/layouts/community/66_ansi/xyverz/rules.mk @@ -1 +1,3 @@ -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. \ No newline at end of file +ifneq ($(strip $(RGBLIGHT_SUPPORTED)), no) + RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. +endif From e421eb5a7e3836e1edce6a7d4f36af2303cb695a Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 16 Jan 2021 18:40:24 -0800 Subject: [PATCH 11/16] bring the bocaj keymap inline with LAYOUT_ortho_4x12 --- layouts/community/ortho_4x12/bocaj/keymap.c | 6 +++--- users/bocaj/wrappers.h | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/layouts/community/ortho_4x12/bocaj/keymap.c b/layouts/community/ortho_4x12/bocaj/keymap.c index 0ac22b4ccf14..89d4d1d9ab61 100644 --- a/layouts/community/ortho_4x12/bocaj/keymap.c +++ b/layouts/community/ortho_4x12/bocaj/keymap.c @@ -87,21 +87,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___________________LOWER_L1_EXT____________________, ___________________LOWER_R1_EXT____________________, ___________________LOWER_L2_EXT____________________, ___________________LOWER_R2_EXT____________________, ___________________LOWER_L3_EXT____________________, ___________________LOWER_R3_EXT____________________, - _______, _______, _______, _______, _______, _______, KC_0, KC_DOT, KC_COMM, _______, _______ + _______, _______, _______, _______, _______, _______, _______, KC_0, KC_DOT, KC_COMM, _______, _______ ), [_RAISE] = LAYOUT_ortho_4x12_bocaj( KC_TILD, _________________RAISE_L1__________________, _________________RAISE_R1__________________, KC_EQUAL, KC_F11, _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_F12, _______, _________________RAISE_L3__________________, _________________RAISE_R3__________________, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_ADJUST] = WRAPPER_ortho_4x12( KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RST, VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST, TH_LVL, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL, - HPT_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + HPT_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/users/bocaj/wrappers.h b/users/bocaj/wrappers.h index c76820f4950f..0f18d346a39a 100644 --- a/users/bocaj/wrappers.h +++ b/users/bocaj/wrappers.h @@ -12,7 +12,7 @@ expanded before being used as arguments to the LAYOUT_xxx macro. // clang-format off #define WRAPPER_ergodox_pretty(...) LAYOUT_ergodox_pretty(__VA_ARGS__) -#define WRAPPER_ortho_4x12(...) LAYOUT_planck_mit(__VA_ARGS__) +#define WRAPPER_ortho_4x12(...) LAYOUT_ortho_4x12(__VA_ARGS__) /* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */ #define WRAPPER_ergodox_bocaj( \ @@ -62,25 +62,25 @@ expanded before being used as arguments to the LAYOUT_xxx macro. K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B \ + K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C \ )\ WRAPPER_ortho_4x12( \ K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ K11, K12, SFT_T(K13), GUI_T(K14), ALT_T(K15), K16, K17, ALT_T(K18), GUI_T(K19), SFT_T(K1A), K1B, K1C, \ K21, CTL_T(K22), K23, K24, K25, K26, K27, K28, K29, K2A, CTL_T(K2B), K2C, \ - K31, K32, K33, K34, LT(_LOWER, K35), K36, LT(_RAISE, K37), K38, K39, K3A, K3B ) + K31, K32, K33, K34, LT(_LOWER, K35), K36, K37, LT(_RAISE, K38), K39, K3A, K3B, K3C ) #define WRAPPER_planck_bocaj_WIN( \ K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B \ + K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C \ )\ WRAPPER_ortho_4x12( \ K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ K11, K12, SFT_T(K13), CTL_T(K14), ALT_T(K15), K16, K17, ALT_T(K18), CTL_T(K19), SFT_T(K1A), K1B, K1C, \ K21, GUI_T(K22), K23, K24, K25, K26, K27, K28, K29, K2A, GUI_T(K2B), K2C, \ - K31, K32, K33, K34, LT(_LOWER, K35), K36, LT(_RAISE, K37), K38, K39, K3A, K3B ) + K31, K32, K33, K34, LT(_LOWER, K35), K36, K37, LT(_RAISE, K38), K39, K3A, K3B, K3C ) #define WRAPPER_planck_bocaj_base( \ K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ @@ -91,7 +91,7 @@ expanded before being used as arguments to the LAYOUT_xxx macro. KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_MINS, \ KC_TAB, K11, K12, K13, K14, ALL_T(K15), MEH_T(K16), K17, K18, K19, K1A, KC_QUOT, \ KC_LSFT, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, _______, \ - _______, KC_LEAD, KC_UP, KC_LEFT, KC_BSPC, KC_SPC, KC_ENTER, KC_RIGHT, KC_DOWN, QWERTY, WORKMAN \ + _______, KC_LEAD, KC_UP, KC_LEFT, KC_BSPC, KC_SPC, KC_SPC, KC_ENTER, KC_RIGHT, KC_DOWN, QWERTY, WORKMAN \ ) #define WRAPPER_planck_bocaj_base_WIN( \ @@ -103,7 +103,7 @@ expanded before being used as arguments to the LAYOUT_xxx macro. KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_MINS, \ KC_TAB, K11, K12, K13, K14, ALL_T(K15), MEH_T(K16), K17, K18, K19, K1A, KC_QUOT, \ KC_LSFT, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, _______, \ - _______, KC_LEAD, KC_UP, KC_LEFT, KC_BSPC, KC_SPC, KC_ENTER, KC_RIGHT, KC_DOWN, QWERTY, WORKMAN \ + _______, KC_LEAD, KC_UP, KC_LEFT, KC_BSPC, KC_SPC, KC_SPC, KC_ENTER, KC_RIGHT, KC_DOWN, QWERTY, WORKMAN \ ) /* From 7db2c7be5832c8862c8be8e5f3c3c03cff64be9c Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 16 Jan 2021 18:41:10 -0800 Subject: [PATCH 12/16] change LAYOUT_planck_grid to LAYOUT_ortho_4x12 --- layouts/community/ortho_4x12/jackhumbert/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/layouts/community/ortho_4x12/jackhumbert/keymap.c b/layouts/community/ortho_4x12/jackhumbert/keymap.c index 8f07e375a003..f9a3e1686ffb 100644 --- a/layouts/community/ortho_4x12/jackhumbert/keymap.c +++ b/layouts/community/ortho_4x12/jackhumbert/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Shft | Ctrl | Alt | GUI |Lower | Shft | Spc |Raise | Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ -[_COLEMAK] = LAYOUT_planck_grid( +[_COLEMAK] = LAYOUT_ortho_4x12( KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_MINS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ESC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | | | | | * `-----------------------------------------------------------------------------------' */ -[_SHIFT_COLEMAK] = LAYOUT_planck_grid( +[_SHIFT_COLEMAK] = LAYOUT_ortho_4x12( S(KC_TAB), S(KC_Q), S(KC_W), S(KC_F), S(KC_P), S(KC_G), S(KC_J), S(KC_L), S(KC_U), S(KC_Y), KC_COLN, _______, S(KC_MINS), S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_D), S(KC_H), S(KC_N), S(KC_E), S(KC_I), S(KC_O), KC_GRV, S(KC_ESC), S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), S(KC_K), S(KC_M), KC_EXLM, KC_AT, KC_QUES, _______ , @@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | Home | Pgup | Pgdn | End | * `-----------------------------------------------------------------------------------' */ -[_LOWER] = LAYOUT_planck_grid( +[_LOWER] = LAYOUT_ortho_4x12( _______, XXXXXXX, KC_7, KC_8, KC_9, XXXXXXX, KC_DEL, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, XXXXXXX, KC_4, KC_5, KC_6, XXXXXXX, XXXXXXX, KC_F5, KC_F6, KC_F7, KC_F8, _______, _______, KC_0, KC_1, KC_2, KC_3, XXXXXXX, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, _______, @@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | Next | Vol- | Vol+ | Play | * `-----------------------------------------------------------------------------------' */ -[_RAISE] = LAYOUT_planck_grid( +[_RAISE] = LAYOUT_ortho_4x12( _______, XXXXXXX, KC_LT, KC_DLR, KC_GT, XXXXXXX, XXXXXXX, KC_LBRC, KC_UNDS, KC_RBRC, XXXXXXX, _______, _______, KC_BSLS, KC_LPRN, KC_DQUO, KC_RPRN, KC_HASH, KC_PERC, KC_LCBR, KC_EQL, KC_RCBR, KC_PIPE, _______, _______, XXXXXXX, KC_COLN, KC_ASTR, KC_PLUS, XXXXXXX, XXXXXXX, KC_AMPR, KC_CIRC, KC_TILD, XXXXXXX, _______, @@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | | | | | * `-----------------------------------------------------------------------------------' */ -[_ADJUST] = LAYOUT_planck_grid( +[_ADJUST] = LAYOUT_ortho_4x12( _______, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, XXXXXXX, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, XXXXXXX, XXXXXXX, _______, From ffa26d8e1e39f59c0516f7503bcbc3bbdc37a0ca Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 16 Jan 2021 18:41:47 -0800 Subject: [PATCH 13/16] check for BACKLIGHT_ENABLE so this works on all keyboards --- layouts/community/ortho_4x12/juno/keymap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/layouts/community/ortho_4x12/juno/keymap.c b/layouts/community/ortho_4x12/juno/keymap.c index a22c229e2925..2b16b9955e6d 100644 --- a/layouts/community/ortho_4x12/juno/keymap.c +++ b/layouts/community/ortho_4x12/juno/keymap.c @@ -240,6 +240,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { layer_state_t layer_state_set_user(layer_state_t state) { // LED control, lighting up when Fn layer is activated state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +# ifdef BACKLIGHT_ENABLE switch (get_highest_layer(state)) { case _QWERTY: backlight_set(0); @@ -251,6 +252,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { backlight_set(3); break; } +# endif return state; } From 213b04ce09b6b76820a72428ea22be2b61add1dc Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 16 Jan 2021 18:42:22 -0800 Subject: [PATCH 14/16] add missing _MACRO to users/brandonschlack/brandonschlack.h --- users/brandonschlack/brandonschlack.h | 1 + 1 file changed, 1 insertion(+) diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index d7dbc0ea4b90..4fbf6906d868 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -46,6 +46,7 @@ enum bs_layers { _ADJUST = 15 // 15: Change keyboard settings }; +#define _MACRO _M1 #define _LOWER _FN1 #define _RAISE _FN2 From 659b2df6672fd6a5da51f604520b0f2d3fd44956 Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 16 Jan 2021 18:43:13 -0800 Subject: [PATCH 15/16] rename callum's custom keycode that conflicts with a LUFA define --- users/callum/callum.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/callum/callum.c b/users/callum/callum.c index 4661902af546..b3254a9cfaa2 100644 --- a/users/callum/callum.c +++ b/users/callum/callum.c @@ -10,7 +10,7 @@ #define TABL G(S(KC_LBRC)) #define TABR G(S(KC_RBRC)) #define SPCL A(G(KC_LEFT)) -#define SPCR A(G(KC_RGHT)) +#define SPC_R A(G(KC_RGHT)) #define LA_SYM MO(SYM) #define LA_NAV MO(NAV) @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [NAV] = LAYOUT_callum( KC_TAB, SW_WIN, TABL, TABR, KC_VOLU, RESET, HOME, KC_UP, END, KC_DEL, OS_SHFT, OS_CTRL, OS_ALT, OS_CMD, KC_VOLD, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, - SPCL, SPCR, BACK, FWD, KC_MPLY, XXXXXXX, KC_PGDN, KC_PGUP, SW_LANG, KC_ENT, + SPCL, SPC_R, BACK, FWD, KC_MPLY, XXXXXXX, KC_PGDN, KC_PGUP, SW_LANG, KC_ENT, _______, _______, _______, _______ ), From 1724f88b01a0d586e1e86ecda8478d7e0a1a030c Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 16 Jan 2021 18:44:03 -0800 Subject: [PATCH 16/16] undef TAPPING_TERM in users/hvp/hvp.h --- users/hvp/hvp.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/users/hvp/hvp.h b/users/hvp/hvp.h index 99da258aafb5..b016da9e2521 100644 --- a/users/hvp/hvp.h +++ b/users/hvp/hvp.h @@ -5,8 +5,9 @@ #endif #include "quantum.h" +#undef TAPPING_TERM #define TAPPING_TERM 150 // Keys -#define D_NAVI MT(MOD_LCTL | MOD_LSFT, KC_D) \ No newline at end of file +#define D_NAVI MT(MOD_LCTL | MOD_LSFT, KC_D)