diff options
| author | Nick Brassel <nick@tzarc.org> | 2022-08-28 14:23:01 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2022-08-28 14:23:01 +1000 |
| commit | 0a3f7e48690bb2b7b008300a54554979a55be19a (patch) | |
| tree | 7499d52f20040ed7d5a56496ecb81ed114f80719 /keyboards/m10a | |
| parent | fc0bf67f372c38f72c303cdec21b1d4afb5e8cb4 (diff) | |
| parent | 9b5b0722555891ba94f240760ef3a6d4c870fd13 (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/m10a')
| -rw-r--r-- | keyboards/m10a/config.h | 1 | ||||
| -rw-r--r-- | keyboards/m10a/keymaps/gam3cat/keymap.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/keyboards/m10a/config.h b/keyboards/m10a/config.h index a04f8e4025..8a5b36f4fe 100644 --- a/keyboards/m10a/config.h +++ b/keyboards/m10a/config.h @@ -27,7 +27,6 @@ /* Planck PCB default pin-out */ #define MATRIX_ROW_PINS { B6, F7, F6, D6 } #define MATRIX_COL_PINS { F5, F1, F0 } -#define UNUSED_PINS #define BACKLIGHT_PIN B7 diff --git a/keyboards/m10a/keymaps/gam3cat/keymap.c b/keyboards/m10a/keymaps/gam3cat/keymap.c index f962246ef3..c5ca7df2e8 100644 --- a/keyboards/m10a/keymaps/gam3cat/keymap.c +++ b/keyboards/m10a/keymaps/gam3cat/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_L5] = {{_______, _______, _______}, {_______, _______, _______}, {_______, _______, _______}, {XXXXXXX, XXXXXXX, MO(_L9)}}, [_L6] = {{_______, _______, _______}, {_______, _______, _______}, {_______, _______, _______}, {XXXXXXX, XXXXXXX, MO(_L9)}}, [_L7] = {{KC_DMP1, _______, KC_DMP2}, {_______, KC_DMRS, _______}, {KC_DMR1, _______, KC_DMR2}, {XXXXXXX, XXXXXXX, MO(_L9)}}, - [_L8] = {{_______, _______, RESET }, {_______, _______, _______}, {_______, _______, _______}, {XXXXXXX, XXXXXXX, MO(_L9)}}, + [_L8] = {{_______, _______, QK_BOOT }, {_______, _______, _______}, {_______, _______, _______}, {XXXXXXX, XXXXXXX, MO(_L9)}}, [_L9] = {{DF(_L6), DF(_L7), DF(_L8)}, {DF(_L3), DF(_L4), DF(_L5)}, {DF(_L0), DF(_L1), DF(_L2)}, {XXXXXXX, XXXXXXX, _______}}, }; @@ -115,7 +115,7 @@ void matrix_scan_user(void) { } layer_state_t layer_state_set_user(layer_state_t state) { - switch (biton32(state)) { + switch (get_highest_layer(state)) { case _L0: custom_backlight_level(0); break; |