diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-04-08 11:03:04 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-04-08 11:03:04 +1000 |
| commit | 10fc6c4cd6d7463737801430e8c13b347e1b85c7 (patch) | |
| tree | d5a277fc0a36d48052c5489c13b96862e8ac063d /keyboards/adafruit/macropad/keymaps | |
| parent | dbfbf6c2c47922600beeb45883ae6892e9f71edd (diff) | |
| parent | 2c375e64785f3d69a14d7a3e02c041d774d1d75b (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/adafruit/macropad/keymaps')
| -rw-r--r-- | keyboards/adafruit/macropad/keymaps/default/keymap.c | 13 | ||||
| -rw-r--r-- | keyboards/adafruit/macropad/keymaps/via/keymap.c | 5 |
2 files changed, 12 insertions, 6 deletions
diff --git a/keyboards/adafruit/macropad/keymaps/default/keymap.c b/keyboards/adafruit/macropad/keymaps/default/keymap.c index 34989ea0b6..808b202df4 100644 --- a/keyboards/adafruit/macropad/keymaps/default/keymap.c +++ b/keyboards/adafruit/macropad/keymaps/default/keymap.c @@ -18,17 +18,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_MUTE, + LT(1,KC_MUTE), KC_ENT, KC_0, KC_BSPC, KC_7, KC_8, KC_9, KC_4, KC_5, KC_6, KC_1, KC_2, KC_3 - ) + ), + [1] = LAYOUT( + _______, + CK_TOGG, AU_TOGG, _______, + _______, _______, _______, + _______, _______, _______, + _______, _______, _______ + ), }; #ifdef ENCODER_MAP_ENABLE const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(_______, _______) }, }; #endif @@ -111,4 +119,3 @@ bool oled_task_user(void) { } #endif - diff --git a/keyboards/adafruit/macropad/keymaps/via/keymap.c b/keyboards/adafruit/macropad/keymaps/via/keymap.c index 6ef3d3e29d..80efd80f2d 100644 --- a/keyboards/adafruit/macropad/keymaps/via/keymap.c +++ b/keyboards/adafruit/macropad/keymaps/via/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_MUTE, + LT(1,KC_MUTE), KC_ENT, KC_0, KC_BSPC, KC_7, KC_8, KC_9, KC_4, KC_5, KC_6, @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( _______, - _______, _______, _______, + CK_TOGG, AU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ @@ -135,4 +135,3 @@ bool oled_task_user(void) { } #endif - |