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/hotdox | |
| parent | fc0bf67f372c38f72c303cdec21b1d4afb5e8cb4 (diff) | |
| parent | 9b5b0722555891ba94f240760ef3a6d4c870fd13 (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/hotdox')
| -rw-r--r-- | keyboards/hotdox/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/hotdox/keymaps/eozaki/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/hotdox/keymaps/imchipwood/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/hotdox/keymaps/kloki/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/hotdox/keymaps/ninjonas/keymap.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/keyboards/hotdox/keymaps/default/keymap.c b/keyboards/hotdox/keymaps/default/keymap.c index fe07e6f91d..eb4692a4c2 100644 --- a/keyboards/hotdox/keymaps/default/keymap.c +++ b/keyboards/hotdox/keymaps/default/keymap.c @@ -163,7 +163,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { // Runs constantly in the background, in a loop. void matrix_scan_user(void) { - uint8_t layer = biton32(layer_state); + uint8_t layer = get_highest_layer(layer_state); ergodox_right_led_1_off(); ergodox_right_led_2_off(); diff --git a/keyboards/hotdox/keymaps/eozaki/keymap.c b/keyboards/hotdox/keymaps/eozaki/keymap.c index 3516f20303..d4b8f491fd 100644 --- a/keyboards/hotdox/keymaps/eozaki/keymap.c +++ b/keyboards/hotdox/keymaps/eozaki/keymap.c @@ -170,7 +170,7 @@ void matrix_init_user(void) { // Runs constantly in the background, in a loop. void matrix_scan_user(void) { - uint8_t layer = biton32(layer_state); + uint8_t layer = get_highest_layer(layer_state); ergodox_board_led_off(); ergodox_right_led_1_off(); diff --git a/keyboards/hotdox/keymaps/imchipwood/keymap.c b/keyboards/hotdox/keymaps/imchipwood/keymap.c index c5d7bc34cf..6dda884fa6 100644 --- a/keyboards/hotdox/keymaps/imchipwood/keymap.c +++ b/keyboards/hotdox/keymaps/imchipwood/keymap.c @@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | Lclk | Rclk | | | | Prev |VolDn | Next | * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. - * |RESET | | | | | + * |QK_BOOT | | | | | * ,------|------|------| |------+------+------. * | | | | | | | | * |MPENT | |------| |------| |Play | @@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT, // `---------------------------------------------------------------' `----------------------------------------------------------------' // ,-------------------------. ,-------------------------. - RESET, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, // ,------------+------------+------------| |------------+------------+------------. KC_TRNS, KC_TRNS, // | | +------------| |------------+ | | diff --git a/keyboards/hotdox/keymaps/kloki/keymap.c b/keyboards/hotdox/keymaps/kloki/keymap.c index f858effd54..2550b68978 100644 --- a/keyboards/hotdox/keymaps/kloki/keymap.c +++ b/keyboards/hotdox/keymaps/kloki/keymap.c @@ -189,7 +189,7 @@ void matrix_init_user(void) { // Runs constantly in the background, in a loop. void matrix_scan_user(void) { - uint8_t layer = biton32(layer_state); + uint8_t layer = get_highest_layer(layer_state); ergodox_board_led_off(); ergodox_right_led_1_off(); diff --git a/keyboards/hotdox/keymaps/ninjonas/keymap.c b/keyboards/hotdox/keymaps/ninjonas/keymap.c index 93c0b266b6..2f9609c5c5 100644 --- a/keyboards/hotdox/keymaps/ninjonas/keymap.c +++ b/keyboards/hotdox/keymaps/ninjonas/keymap.c @@ -257,7 +257,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,--------------------------------------------------. ,----------------------------------------------------. * | | | | | | | | | | | | | | | | * |--------+------+------+------+------+-------------| |-------+------+------+------+------+-------+--------| - * | M_MAKE |RESET | | | | | | | | | | |COLMAK|DVORAK |QWERTY | + * | M_MAKE |QK_BOOT | | | | | | | | | | |COLMAK|DVORAK |QWERTY | * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------| * | M_VRSN |M_MALL| | | | |------| |-------| | | | | | | * |--------+------+------+------+------+------| | | |------+------+------+------+-------+--------| |