From b7cb8d51f74d44b6f3f8502ef77f040745c70fec Mon Sep 17 00:00:00 2001 From: Dan White Date: Tue, 1 Aug 2023 21:41:12 -0600 Subject: [PATCH] Dev/upstream (#33) * update * Badger flashed Preonic * Ketch layout * DEV: PyCharm updates to pi60 * IJ Debug command * ketch IJ debugging and other fixes * Ketch cleanup * Badger flashed Preonic * Ketch layout * DEV: PyCharm updates to pi60 * IJ Debug command * Badger flashed Preonic * Ketch layout * DEV: PyCharm updates to pi60 * IJ Debug command * Badger flashed Preonic * Ketch layout * DEV: PyCharm updates to pi60 * IJ Debug command * Badger flashed Preonic * Ketch layout * DEV: PyCharm updates to pi60 * IJ Debug command * Badger flashed Preonic * Ketch layout * DEV: PyCharm updates to pi60 * IJ Debug command * Badger flashed Preonic * Ketch layout * DEV: PyCharm updates to pi60 * IJ Debug command * Badger flashed Preonic * Ketch layout * DEV: PyCharm updates to pi60 * IJ Debug command * update * Badger flashed Preonic * Ketch layout * DEV: PyCharm updates to pi60 * Badger flashed Preonic * Ketch layout * DEV: PyCharm updates to pi60 * Badger flashed Preonic * Ketch layout * DEV: PyCharm updates to pi60 * Badger flashed Preonic * Ketch layout * DEV: PyCharm updates to pi60 * Badger flashed Preonic * Ketch layout * DEV: PyCharm updates to pi60 * Badger flashed Preonic * Ketch layout * DEV: PyCharm updates to pi60 * Badger flashed Preonic * Ketch layout * DEV: PyCharm updates to pi60 * Badger flashed Preonic * Ketch layout * DEV: PyCharm updates to pi60 * re-flash 1up --- .../1up60rgb/keymaps/badger/keymap.c | 58 +++++++++---------- .../pro/rev1/ansi/keymaps/default/keymap.c | 23 +++----- keyboards/preonic/keymaps/badger/keymap.c | 16 +++++ .../trashman/ketch/keymaps/badger/keymap.c | 16 ++--- users/badger/badger.h | 2 +- 5 files changed, 62 insertions(+), 53 deletions(-) diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c index ae0e5bfcd46a..439f1d37ed9e 100644 --- a/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c +++ b/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c @@ -1,5 +1,6 @@ /* -Copyright 2020 Dan White +Copyright 2023 Dan White + 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 @@ -14,39 +15,38 @@ along with this program. If not, see . #include "badger.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_60_ansi_split_rshift(\ - 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_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, \ - MOVE_MAC, 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_LCTL, KC_LALT, KC_LGUI, KC_SPC, LT_FUNC, KC_RALT, KC_RGUI, KC_RCTL), +[_QWERTY] = LAYOUT_60_ansi_split_rshift(\ + 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_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, \ + MOVE_MAC, 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, J_MACRO, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, LT_FUNC, KC_RALT, KC_RGUI, KC_RCTL), - [_MOVE] = LAYOUT_60_ansi_split_rshift(\ - MAC_FRC, MM_LEFT, MM_RGHT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_0, IJ_TOP, IJ_BOTT, KC_DEL, \ - KC_BACK, IJ_STEP, IJ_INTO, IJ_OUT, IJ_RUN, IJ_STOP, IJ_RELD, WD_BACK, KC_HOME, KC_END, WD_FRWD, IJ_BACK, IJ_FWD, KC_NEXT, \ - _______, MM_LH, MM_MAX, MM_RH, IJ_FIND, IJ_IMPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, CM_RIGHT, CM_DOWN, _______, \ - _______, MM_UH, MM_BH, MAC_CPY, MAC_PST, IJ_IMPH, _______, IJ_REN, IJ_IMPL, IJ_DECL, IJ_USAG, KC_UP, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______), +[_MOVE] = LAYOUT_60_ansi_split_rshift(\ + MAC_FRC, MM_LEFT, MM_RGHT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, P_PAREN, KC_RPRN, KC_UNDS, KC_PLUS, WD_DELE, \ + _______, IJ_STEP, IJ_INTO, IJ_OUT, IJ_RUN, IJ_STOP, IJ_TOP, WD_BACK, KC_HOME, KC_END, WD_FRWD, IJ_BACK, IJ_FWD, KC_PIPE, \ + _______, MM_LH, MM_MAX, MM_RH, IJ_FIND, IJ_LINE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_COLN, KC_DQUO, _______, \ + _______, MM_UH, MM_BH, MAC_CPY, MAC_SPS, SHEBANG, IJ_BOTT, IJ_REN, IJ_IMPL, IJ_DECL, IJ_USAG, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______), - [_FUNCTION] = LAYOUT_60_ansi_split_rshift(\ - 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_DEL, \ - _______, _______, _______, _______, _______, KC_MSTP, KC_MPLY, KC_PGUP, _______, _______, KC_PGDN, KC_VOLD, KC_VOLU, KC_INS, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, KC_CAPS, _______, KC_MPRV, KC_MNXT, KC_MUTE, KC_WBAK, KC_WFWD, KC_WSCH, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, CONFIG), +[_FUNCTION] = LAYOUT_60_ansi_split_rshift(\ + 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_DEL, \ + _______, _______, _______, _______, IJ_RFMT, IJ_TERM, KC_MPLY, KC_PGUP, _______, _______, KC_PGDN, KC_VOLD, KC_VOLU, KC_INS, \ + _______, _______, _______, IJ_DEBG, IJ_FILE, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, KC_CAPS, _______, _______, KC_MNXT, KC_MUTE, KC_WBAK, KC_WFWD, KC_WSCH, _______, CONFIG, \ + _______, _______, _______, _______, _______, _______, _______, CONFIG), [_MACRO] = LAYOUT_60_ansi_split_rshift(\ - KC_ESC, DF_1, DF_2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, \ - _______, _______, _______, _______, KC_WREF, KC_MSTP, KC_MPLY, KC_PGUP, _______, _______, KC_PGDN, KC_VOLD, KC_VOLU, KC_INS, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, DF_1, DF_2, KC_CAPS, _______, KC_MPRV, KC_MNXT, KC_MUTE, KC_WBAK, KC_WFWD, KC_WSCH, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, CONFIG), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, SELECT, KC_UP, _______, SED, KC_MSTP, _______, _______, BASH_IF, _______, _______, P_BRACK, _______, _______, \ + _______, KC_LEFT, KC_DOWN, KC_RGHT, FOR_LOOP, _______, _______, _______, _______, FOR_LOOP, _______, _______, _______, \ + _______, _______, _______, CONST, _______, SHEBANG, TS_IMPT, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______), [_CONFIG] = LAYOUT_60_ansi_split_rshift(\ - _______, DF_1, DF_2, DF_3, DF_4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, \ - _______, NK_ON, NK_OFF, EEP_RST, RESET, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, \ - _______, GE_SWAP, GE_NORM, DEBUG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_SPI, RGB_M_B, _______, _______, RGB_TOG, _______, \ - _______, LAG_SWP, LAG_NRM, KC_CAPS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_SPD, RGB_M_K, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, EE_CLR, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, DB_TOGG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_SPI, RGB_M_B, _______, _______, RGB_TOG, _______, \ + _______, _______, _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_SPD, RGB_M_K, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______) }; - diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c index d3c00ad364f2..3fdc4ef25e9b 100644 --- a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c @@ -13,11 +13,9 @@ 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 . */ - #include QMK_KEYBOARD_H -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Prt Rotary(Mute) // ~ 1 2 3 4 5 6 7 8 9 0 - (=) BackSpc Del @@ -34,17 +32,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // // To put the keyboard in bootloader mode, use FN+backslash. If you accidentally put it into bootloader, you can just unplug the USB cable and // it'll be back to normal when you plug it back in. - // - // This keyboard defaults to 6KRO instead of NKRO for compatibility reasons (some KVMs and BIOSes are incompatible with NKRO). - // Since this is, among other things, a "gaming" keyboard, a key combination to enable NKRO on the fly is provided for convenience. - // Press Fn+N to toggle between 6KRO and NKRO. This setting is persisted to the EEPROM and thus persists between restarts. +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [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_MUTE, - 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_DEL, - 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_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_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + 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_DEL, KC_MUTE, + 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_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_BSLS, KC_END, + 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_PGUP, + 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_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), [1] = LAYOUT( @@ -55,8 +50,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI ), - - }; // clang-format on diff --git a/keyboards/preonic/keymaps/badger/keymap.c b/keyboards/preonic/keymaps/badger/keymap.c index 5a5ecc78cc5b..02e7f2371fb4 100644 --- a/keyboards/preonic/keymaps/badger/keymap.c +++ b/keyboards/preonic/keymaps/badger/keymap.c @@ -15,6 +15,22 @@ along with this program. If not, see . #undef AUDIO_ENABLE +#undef AUDIO_ENABLE + +#undef AUDIO_ENABLE + +#undef AUDIO_ENABLE + +#undef AUDIO_ENABLE + +#undef AUDIO_ENABLE + +#undef AUDIO_ENABLE + +#undef AUDIO_ENABLE + +#undef AUDIO_ENABLE + #include "ortho.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/trashman/ketch/keymaps/badger/keymap.c b/keyboards/trashman/ketch/keymaps/badger/keymap.c index d4d2ffc66b0a..ebdcd1793641 100644 --- a/keyboards/trashman/ketch/keymaps/badger/keymap.c +++ b/keyboards/trashman/ketch/keymaps/badger/keymap.c @@ -22,25 +22,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_RALT, KC_LGUI, LT_SPACE, KC_SPC, J_FUNCT, KC_RALT, J_MACRO ), [_MOVE] = LAYOUT( - MAC_WND, VS_STEP, VS_INTO, VS_OUT, VS_RUN, VS_STOP, VS_MVUP, WD_BACK, KC_HOME, KC_END, WD_FRWD, WD_DELE, - _______, MM_LH, MM_MAX, MM_RH, IJ_FIND, VS_LINE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_SCLN, KC_QUOT, - _______, MM_LEFT, MM_RGHT, MAC_CPY, MAC_SPS, _______, VS_MVDN, IJ_REN, IJ_BACK, IJ_FWD, KC_UP, _______, + MAC_WND, IJ_STEP, IJ_INTO, IJ_OUT, IJ_RUN, IJ_STOP, IJ_TOP, WD_BACK, KC_HOME, KC_END, WD_FRWD, WD_DELE, + _______, MM_LH, MM_MAX, MM_RH, IJ_FIND, IJ_LINE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_SCLN, KC_QUOT, + _______, MM_LEFT, MM_RGHT, MAC_CPY, MAC_SPS, MAC_B, IJ_BOTT, IJ_REN, IJ_BACK, IJ_FWD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_MACRO] = LAYOUT( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - _______, MAC_ALL, MAC_SAV, MAC_DUP, MAC_FND, VS_LINE, KC_BSLS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_QUOT, - _______, MAC_UND, MAC_CUT, MAC_CPY, MAC_PST, MAC_B, _______, _______, _______, _______, KC_SCLN, _______, + _______, MAC_ALL, MAC_SAV, MAC_DUP, MAC_FND, _______, KC_BSLS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, + _______, MAC_UND, MAC_CUT, MAC_CPY, MAC_PST, _______, _______, _______, _______, _______, KC_SCLN, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_FUNCTION] = LAYOUT( KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, - _______, MAC_ALL, MAC_SAV, MAC_DUP, KC_MINS, KC_COLN, KC_PIPE, KC_UNDS, KC_PLUS, KC_LCBR, KC_LCBR, KC_DQUO, - _______, MAC_UND, MAC_CUT, MAC_CPY, MAC_PST, MAC_B, _______, _______, _______, KC_COLN, KC_DQUO, _______, + _______, _______, _______, _______, KC_MINS, KC_COLN, KC_PIPE, KC_UNDS, KC_PLUS, KC_LCBR, KC_LCBR, KC_DQUO, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_COLN, KC_DQUO, _______, _______, _______, _______, _______, _______, _______, _______, CONFIG ), [_CONFIG] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, + QK_BOOT, _______, _______, _______, IJ_RFMT, _______, _______, _______, _______, _______, _______, _______, KC_CAPS, RGB_TOG, BL_DOWN, DB_TOGG, RGB_M_P, RGB_M_B, RGB_M_SN,RGB_M_R, RGB_M_SW,KC_F11, KC_F12, _______, _______, RGB_HUI, RGB_HUD, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/users/badger/badger.h b/users/badger/badger.h index 43d343d1431f..1ba36e3f0065 100644 --- a/users/badger/badger.h +++ b/users/badger/badger.h @@ -105,7 +105,7 @@ enum CustomKeys { #define IJ_DECL LGUI(KC_B) #define IJ_REN LSFT(KC_F6) #define IJ_USAG LALT(KC_F7) -#define IJ_RUN KC_F9 +#define IJ_RUN LCTL(LALT(KC_D)) #define IJ_STEP KC_F8 #define IJ_INTO LSFT(KC_F7) #define IJ_OUT LSFT(KC_F8)