Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
Joshua Diamond 2022-09-18 19:06:31 -04:00
commit 9a1b4b78f1
4 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
keyboards/keebio/bdn9/keymaps/via/keymap.c
View file

@ -1,42 +1,45 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
enum encoder_names {
_LEFT,
_RIGHT,
_MIDDLE,
};
enum layer_names { enum layer_names {
_ZERO, _MAIN,
_ONE, _FN1,
_TWO, _FN2,
_THREE _FN3
}; };
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ZERO] = LAYOUT( [_MAIN] = LAYOUT(
KC_MPLY, KC_HOME, KC_MUTE, KC_MPLY, KC_HOME, KC_MUTE,
MO(1), KC_UP, RGB_MOD, MO(1), KC_UP, RGB_MOD,
KC_LEFT, KC_DOWN, KC_RGHT KC_LEFT, KC_DOWN, KC_RGHT
), ),
[_ONE] = LAYOUT( [_FN1] = LAYOUT(
QK_BOOT, BL_STEP, KC_STOP, QK_BOOT, BL_STEP, KC_STOP,
_______, KC_HOME, RGB_MOD, _______, KC_HOME, RGB_MOD,
KC_MPRV, KC_END , KC_MNXT KC_MPRV, KC_END , KC_MNXT
), ),
[_TWO] = LAYOUT( [_FN2] = LAYOUT(
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
_______, _______, _______ _______, _______, _______
), ),
[_THREE] = LAYOUT( [_FN3] = LAYOUT(
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
_______, _______, _______ _______, _______, _______
) )
}; };
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[_MAIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_UP, KC_DOWN), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
[_FN1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
[_FN2] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
[_FN3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
};
#endif

1
keyboards/keebio/bdn9/keymaps/via/rules.mk
View file

@ -3,3 +3,4 @@ LTO_ENABLE = yes
MOUSEKEY_ENABLE = yes MOUSEKEY_ENABLE = yes
CONSOLE_ENABLE = yes CONSOLE_ENABLE = yes
COMMAND_ENABLE = no COMMAND_ENABLE = no
ENCODER_MAP_ENABLE = yes

2
keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c
View file

@ -175,7 +175,7 @@ static const keycodedescType PROGMEM keyselection[] = {
{"Break", KC_PAUS}, {"Break", KC_PAUS},
{"C-A-D", KC_CAD}, // Ctrl-Alt-Del {"C-A-D", KC_CAD}, // Ctrl-Alt-Del
{"AltF4", KC_AF4}, {"AltF4", KC_AF4},
{"QK_BOOT", QK_BOOT}, // firmware flash mode {"RESET", QK_BOOT}, // firmware flash mode
}; };
#define MAX_KEYSELECTION ARRAY_SIZE(keyselection) #define MAX_KEYSELECTION ARRAY_SIZE(keyselection)

4
users/jonavin/jonavin.h
View file

@ -17,6 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
// DEFINE MACROS
#ifndef ARRAYSIZE
#define ARRAYSIZE(arr) sizeof(arr)/sizeof(arr[0])
#endif // !ARRAYSIZE
// LAYERS // LAYERS
enum custom_user_layers { enum custom_user_layers {