Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Badger BM43a #20

Merged
merged 2 commits into from
Feb 9, 2023
Merged

Badger BM43a #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa66dc7
Badger BM43a
BlueTufa Feb 9, 2023
7e759ba
Merge remote-tracking branch 'origin/master' into dev/badger-bm43a
BlueTufa Feb 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions keyboards/1upkeyboards/1up60hse/keymaps/badger/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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, FUNCTION, KC_RGUI, KC_RALT, J_MACRO),
KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, LT_FUNC, KC_RGUI, KC_RALT, J_MACRO),

[_MOVE] = LAYOUT_60_ansi(\
MAC_FRC, MM_LEFT, MM_RGHT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, P_BRACE, P_PAREN, P_BRACK, IJ_TOP, IJ_BOTT, WD_DELE, \
Expand All @@ -45,8 +45,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[_CONFIG] = LAYOUT_60_ansi(\
_______, 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, \
_______, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, \
_______, _______, _______, DEBUG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_SPI, RGB_M_B, _______, _______, RGB_TOG, _______, \
_______, _______, _______, EE_CLR, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, \
_______, _______, _______, 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, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______)
};
76 changes: 76 additions & 0 deletions keyboards/kprepublic/bm43a/keymaps/badger/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/*
Copyright 2023 Dan White <opensource@bluetufa.com>

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 "badger.h"

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT(
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
MOVE_MAC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, LT_SLSH,
KC_LCTL, KC_RALT, KC_LGUI, LT_SPACE, LT_SPACE, LT_FUNC, KC_DOWN, KC_UP, KC_RGHT
),
[_MOVE] = LAYOUT(
KC_GRV, 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, _______,
_______, MM_UH, MM_BH, MAC_CPY, MAC_PST, _______, VS_MVDN, IJ_REN, IJ_BACK, IJ_FWD, _______,
_______, _______, _______, KC_BSPC, _______, _______, _______, _______, _______
),
[_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_BSLS,
_______, _______, _______, _______, _______, KC_SCLN, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_QUOT,
_______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
[_FUNCTION] = LAYOUT(
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE,
_______, KC_4, KC_5, KC_6, KC_MINS, KC_COLN, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_DQUO,
KC_0, KC_7, KC_2, KC_3, KC_PLUS, _______, _______, _______, 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,
_______, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, _______, _______, _______, KC_F11, KC_F12, _______,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
)
/*
[_QWERTY] = LAYOUT_60_ansi(\
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, FUNCTION, KC_RGUI, KC_RALT, J_MACRO),

[_FUNCTION] = LAYOUT_60_ansi(\
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, \
_______, _______, _______, _______, _______, VS_TERM, KC_MPLY, KC_PGUP, _______, _______, KC_PGDN, KC_VOLD, KC_VOLU, KC_INS, \
_______, VS_EXP, VS_DBG, VS_CMD, VS_FILE, _______, _______, _______, _______, _______, _______, _______, _______, \
_______, DF_1, DF_2, KC_CAPS, _______, KC_MPRV, KC_MNXT, KC_MUTE, KC_WBAK, KC_WFWD, KC_WSCH, _______, \
_______, _______, _______, _______, _______, _______, _______, CONFIG),

[_MACRO] = LAYOUT_60_ansi(\
_______, 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, \
_______, _______, _______, _______, SED, KC_MSTP, KC_MPLY, KC_PGUP, BASH_IF, _______, KC_PGDN, KC_VOLD, KC_VOLU, KC_INS, \
_______, _______, SELECT, _______, FN, _______, _______, _______, _______, FOR_LOOP, _______, _______, _______, \
_______, DF_1, DF_2, CONST, _______, SHEBANG, TS_IMPT, KC_MUTE, KC_WBAK, KC_WFWD, KC_WSCH, _______, \
_______, _______, _______, _______, _______, _______, _______, _______),

[_CONFIG] = LAYOUT_60_ansi(\
_______, 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, \
_______, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, \
_______, _______, _______, DEBUG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_SPI, RGB_M_B, _______, _______, RGB_TOG, _______, \
_______, _______, _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_SPD, RGB_M_K, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______) */
};
4 changes: 3 additions & 1 deletion users/badger/badger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ enum CustomKeys {
#define MOVE LT(_MOVE_LINUX, KC_ESC)
#define MOVE_MAC LT(_MOVE, KC_ESC)
#define LT_END LT(_MACRO, KC_END)
#define FUNCTION MO(_FUNCTION)
#define LT_SPACE LT(_MACRO, KC_SPC)
#define LT_FUNC LT(_FUNCTION, KC_LEFT)
#define CONFIG MO(_CONFIG)
#define J_MACRO MO(_MACRO)
#define CFG_LNX MO(_CONFIG)
Expand Down Expand Up @@ -85,6 +86,7 @@ enum CustomKeys {

/* IntelliJ / JetBrains shortcuts with Mac keymap */
#define IJ_BACK LGUI(LALT(KC_LEFT))
#define LT_SLSH RSFT_T(KC_SLSH)
#define IJ_FWD LGUI(LALT(KC_RIGHT))
#define IJ_UP LGUI(LALT(KC_UP))
#define IJ_DOWN LGUI(LALT(KC_DOWN))
Expand Down