From cd1e531b06ccf9ed97c4d3ce6a627167f683c7d2 Mon Sep 17 00:00:00 2001 From: "Ermer, Maximilian" Date: Wed, 25 Jan 2023 16:03:39 +0100 Subject: [PATCH] sync up to newer QMK version --- keymap.c | 6 +++--- rules.mk | 2 +- successful_build_with_qmk_commit.info | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/keymap.c b/keymap.c index 2be6deb..9200b49 100644 --- a/keymap.c +++ b/keymap.c @@ -60,7 +60,7 @@ enum {_B_QWER, _B_ADNW, _NUM_R, _FUN_R, _MOUS_L, _NAV_L, _PUNC_R, _PUNC_L}; #define _NUM_TAB LT(_NUM_R, KC_TAB) #define _NAV_ENT LT(_NAV_L, KC_ENT) #define _SYM_BSP LT(_PUNC_L, KC_BSPC) -#define _MS_DEL LT(_MOUS_L, KC_DELT) +#define _MS_DEL LT(_MOUS_L, KC_DEL) #define _LSKIP C(KC_LEFT) #define _RSKIP C(KC_RIGHT) @@ -139,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FUN_R] = LAYOUT_split_3x6_3( //,-----------------------------------------------------. ,-----------------------------------------------------. - RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_F7, KC_F8, KC_F9, KC_F12, XXXXXXX, + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_F7, KC_F8, KC_F9, KC_F12, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| DF(_B_QWER), KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_APP, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| @@ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MOUS_L] = LAYOUT_split_3x6_3( //,-----------------------------------------------------. ,-----------------------------------------------------. - DM_RSTP, KC_WH_L, KC_WH_U, KC_MS_U, KC_WH_D, KC_WH_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, + DM_RSTP, KC_WH_L, KC_WH_U, KC_MS_U, KC_WH_D, KC_WH_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| DM_REC1, DE_PIPE, KC_MS_L, KC_MS_D, KC_MS_R, DE_HASH, XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| diff --git a/rules.mk b/rules.mk index af1e619..7c3edd8 100644 --- a/rules.mk +++ b/rules.mk @@ -7,4 +7,4 @@ LTO_ENABLE = yes CONSOLE_ENABLE = no # AUTO_SHIFT_ENABLE = yes # Auto Shift DYNAMIC_MACRO_ENABLE = yes -BOOTLOADER = dfu +BOOTLOADER = atmel-dfu diff --git a/successful_build_with_qmk_commit.info b/successful_build_with_qmk_commit.info index 0f489e9..f27f385 100644 --- a/successful_build_with_qmk_commit.info +++ b/successful_build_with_qmk_commit.info @@ -1 +1 @@ -f2c9fa81dead728a29d5a0b107658677687f837a +437b6c73b65fa13f281386961a505607b70de953