From 5acbe5266c554f435807f8422b580e015613d2d4 Mon Sep 17 00:00:00 2001 From: Deon Spengler Date: Tue, 18 May 2021 06:15:30 +0200 Subject: [PATCH] Added alt + ctrl + del macro and ctrl hold space tap --- keyboards/handwired/adept42/adept42.h | 2 +- .../adept42/keymaps/default/keymap.c | 22 +++++++++++-------- .../handwired/adept42/keymaps/micro/keymap.c | 21 +++++++++++------- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/keyboards/handwired/adept42/adept42.h b/keyboards/handwired/adept42/adept42.h index 206ddeb483..0cb6606415 100644 --- a/keyboards/handwired/adept42/adept42.h +++ b/keyboards/handwired/adept42/adept42.h @@ -17,4 +17,4 @@ { R30, R31, R32, KC_NO, KC_NO, KC_NO } \ } -#define FW_VERSION "2.18" +#define FW_VERSION "2.19" diff --git a/keyboards/handwired/adept42/keymaps/default/keymap.c b/keyboards/handwired/adept42/keymaps/default/keymap.c index a0ab741884..5b9b027619 100644 --- a/keyboards/handwired/adept42/keymaps/default/keymap.c +++ b/keyboards/handwired/adept42/keymaps/default/keymap.c @@ -1,7 +1,6 @@ #include "adept42.h" #include "raw_hid.h" #include "split_util.h" -#include "version.h" #define _QWERTY 0 #define _L1 1 @@ -21,6 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * Enter = Enter when tapped and Alt + Ctrl when held * Space = Space when tapped and Super when held * Layer2 = Leader key when tapped and layer 2 when held + * CtlSpc = Space when tapped and Ctrl when held * ,-----------------------------------------. ,-----------------------------------------. * | Esc | Q | W | E | R | T | | Y | U | I | O | P | Bspc | * |------+------+------+------+------+------| |------+------+------+------+------+------| @@ -28,14 +28,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------| |------+------+------+------+------+------| * |Shift | Z | X | C | V | B | | N | M | , | . | / |Shift | * `-----------------------------------------|------. ,------|-----------------------------------------' - * | LCtl |Enter |Layer1| |Layer2|Space | RAlt | + * |CtlSpc|Enter |Layer1| |Layer2|Space | RAlt | * `--------------------' `--------------------' */ [_QWERTY] = LAYOUT( \ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ - KC_LCTL, LCA_T(KC_ENT), MO(_L1), TD(LT_LEAD), LGUI_T(KC_SPC), KC_RALT \ + CTL_T(KC_SPC), LCA_T(KC_ENT), MO(_L1), TD(LT_LEAD), LGUI_T(KC_SPC), KC_RALT \ ), /* @@ -118,7 +118,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - #ifdef OLED_DRIVER_ENABLE oled_rotation_t oled_init_user(oled_rotation_t rotation) { if (is_keyboard_master()) { @@ -295,6 +294,16 @@ void matrix_scan_user(void) { unregister_code(KC_LSFT); } + // send alt + ctrl + del + SEQ_ONE_KEY(KC_L) { + register_code(KC_LALT); + register_code(KC_LCTL); + register_code(KC_DEL); + unregister_code(KC_DEL); + unregister_code(KC_LCTL); + unregister_code(KC_LALT); + } + // play dynamic macro 1 SEQ_ONE_KEY(KC_M) { process_dynamic_macro(DYN_MACRO_PLAY1, &kr); @@ -316,11 +325,6 @@ void matrix_scan_user(void) { reset_keyboard(); } - // display qmk firmware version - SEQ_TWO_KEYS(KC_Q, KC_V) { - SEND_STRING("QMK firmware: v" QMK_VERSION "\nBuilt on: " QMK_BUILDDATE "\nKeyboard: " QMK_KEYBOARD); - } - // display adept42 firmware version SEQ_TWO_KEYS(KC_K, KC_V) { uint8_t msg[RAW_EPSIZE] = {0}; diff --git a/keyboards/handwired/adept42/keymaps/micro/keymap.c b/keyboards/handwired/adept42/keymaps/micro/keymap.c index 47db3c94c5..0ca6023ed7 100644 --- a/keyboards/handwired/adept42/keymaps/micro/keymap.c +++ b/keyboards/handwired/adept42/keymaps/micro/keymap.c @@ -1,7 +1,6 @@ #include "adept42.h" #include "raw_hid.h" #include "split_util.h" -#include "version.h" #define _QWERTY 0 #define _L1 1 @@ -21,6 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * Enter = Enter when tapped and Alt + Ctrl when held * Space = Space when tapped and Super when held * Layer2 = Leader key when tapped and layer 2 when held + * CtlSpc = Space when tapped and Ctrl when held * ,-----------------------------------------. ,-----------------------------------------. * | Esc | Q | W | E | R | T | | Y | U | I | O | P | Bspc | * |------+------+------+------+------+------| |------+------+------+------+------+------| @@ -28,14 +28,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------| |------+------+------+------+------+------| * |Shift | Z | X | C | V | B | | N | M | , | . | / |Shift | * `-----------------------------------------|------. ,------|-----------------------------------------' - * | LCtl |Enter |Layer1| |Layer2|Space | RAlt | + * |CtlSpc|Enter |Layer1| |Layer2|Space | RAlt | * `--------------------' `--------------------' */ [_QWERTY] = LAYOUT( \ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ - KC_LCTL, LCA_T(KC_ENT), MO(_L1), TD(LT_LEAD), LGUI_T(KC_SPC), KC_RALT \ + CTL_T(KC_SPC), LCA_T(KC_ENT), MO(_L1), TD(LT_LEAD), LGUI_T(KC_SPC), KC_RALT \ ), /* @@ -186,6 +186,16 @@ void matrix_scan_user(void) { unregister_code(KC_LSFT); } + // send alt + ctrl + del + SEQ_ONE_KEY(KC_L) { + register_code(KC_LALT); + register_code(KC_LCTL); + register_code(KC_DEL); + unregister_code(KC_DEL); + unregister_code(KC_LCTL); + unregister_code(KC_LALT); + } + // play dynamic macro 1 SEQ_ONE_KEY(KC_M) { process_dynamic_macro(DYN_MACRO_PLAY1, &kr); @@ -207,11 +217,6 @@ void matrix_scan_user(void) { reset_keyboard(); } - // display qmk firmware version - SEQ_TWO_KEYS(KC_Q, KC_V) { - SEND_STRING("QMK firmware: v" QMK_VERSION "\nBuilt on: " QMK_BUILDDATE "\nKeyboard: " QMK_KEYBOARD); - } - // display adept42 firmware version SEQ_TWO_KEYS(KC_K, KC_V) { uint8_t msg[RAW_EPSIZE] = {0};