From b8e7b86c0f813249ce09bf21c5743e9cc04d1137 Mon Sep 17 00:00:00 2001 From: struckmb Date: Thu, 28 Aug 2025 21:49:23 +0200 Subject: [PATCH] Remove mac specific extra keymap --- .../v2/splinky_3/keymaps/struckmb/keymap.c | 1 - keyboards/cantor/keymaps/struckmb/keymap.c | 1 - users/struckmb/keymap_german_extended.h | 60 +++++ users/struckmb/struckmb.c | 241 +----------------- users/struckmb/struckmb.h | 14 +- 5 files changed, 70 insertions(+), 247 deletions(-) create mode 100644 users/struckmb/keymap_german_extended.h diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keymaps/struckmb/keymap.c b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keymaps/struckmb/keymap.c index 7de781b0..d926b566 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keymaps/struckmb/keymap.c +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keymaps/struckmb/keymap.c @@ -66,7 +66,6 @@ // // clang-format on #include "struckmb.h" -#include "bs_tap_dance.c" #define LAYOUT_split_3x6_3_wrapper(...) LAYOUT(__VA_ARGS__) diff --git a/keyboards/cantor/keymaps/struckmb/keymap.c b/keyboards/cantor/keymaps/struckmb/keymap.c index 07257f30..bd7239e9 100644 --- a/keyboards/cantor/keymaps/struckmb/keymap.c +++ b/keyboards/cantor/keymaps/struckmb/keymap.c @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "struckmb.h" -#include "bs_tap_dance.c" #define LAYOUT_split_3x6_3_wrapper(...) LAYOUT_split_3x6_3(__VA_ARGS__) diff --git a/users/struckmb/keymap_german_extended.h b/users/struckmb/keymap_german_extended.h new file mode 100644 index 00000000..1009980c --- /dev/null +++ b/users/struckmb/keymap_german_extended.h @@ -0,0 +1,60 @@ + +#include "keymap_german.h" + +#define DE_SUP1 ALGR(DE_1) // ¹ +#define DE_F1_4 ALGR(DE_4) // ¼ +#define DE_F1_2 ALGR(DE_5) // ½ +#define DE_NOT ALGR(DE_6) // ¬ + +#define DE_INT ALGR(DE_W) // ſ +#define DE_PAR ALGR(DE_R) // ¶ +#define DE_AR_L ALGR(DE_Z) // ← +#define DE_AR_D ALGR(DE_U) // ↓ +#define DE_AR_R ALGR(DE_I) // → +#define DE_AVG ALGR(DE_O) // ø +#define DE_TH_S ALGR(DE_P) // þ +#define DE_TRMA ALGR(DE_UDIA) // ¨ (dead) +#define DE_AE_S ALGR(DE_A) // æ +#define DE_SLNG ALGR(DE_S) // ſ +#define DE_DDOT ALGR(DE_J) // . (dead) +#define DE_KRA ALGR(DE_K) // ĸ +#define DE_ACTD ALGR(DE_ODIA) // ˝ (dead) +#define DE_CRTD ALGR(DE_ADIA) // ^ (dead) +#define DE_RDAQ ALGR(DE_Y) // » +#define DE_LDAQ ALGR(DE_X) // « +#define DE_CENT ALGR(DE_C) // ¢ +#define DE_DLQU ALGR(DE_V) // „ +#define DE_LDQU ALGR(DE_B) // “ +#define DE_RDQU ALGR(DE_N) // ” +#define DE_ELLP ALGR(DE_DOT) // … +#define DE_MDOT ALGR(DE_COMM) // · +#define DE_NDSH ALGR(DE_MINS) // – + +#define DE_DPRM S(ALGR(DE_CIRC)) // ″ +#define DE_IEXL S(ALGR(DE_1)) // ¡ +#define DE_F1_8 S(ALGR(DE_2)) // ⅛ +#define DE_PND S(ALGR(DE_3)) // £ +#define DE_CURR S(ALGR(DE_4)) // ¤ +#define DE_F3_8 S(ALGR(DE_5)) // ⅜ +#define DE_F5_8 S(ALGR(DE_6)) // ⅝ +#define DE_F7_8 S(ALGR(DE_7)) // ⅞ +#define DE_TM S(ALGR(DE_8)) // ™ +#define DE_PLMN S(ALGR(DE_9)) // ± +#define DE_IQUE S(ALGR(DE_SS))// ¿ +#define DE_OGNK S(ALGR(DE_ACUT)) // ˛ +#define DE_REG S(ALGR(DE_R)) // ® +#define DE_YEN S(ALGR(DE_Z)) // ¥ +#define DE_AR_U S(ALGR(DE_U)) // ↑ +#define DE_TH_B S(ALGR(DE_P)) // Þ +#define DE_AE_B S(ALGR(DE_A)) // Æ +#define DE_UCSZ S(ALGR(DE_S)) // ẞ +#define DE_LSAQ S(ALGR(DE_X)) // ‹ +#define DE_RSAQ S(ALGR(DE_Y)) // › +#define DE_COPY S(ALGR(DE_C)) // © +#define DE_SLQU S(ALGR(DE_V)) // ‚ +#define DE_LSQU S(ALGR(DE_B)) // ‘ +#define DE_RSQU S(ALGR(DE_N)) // ’ +#define DE_MULT S(ALGR(DE_COMM)) // ÷ +#define DE_DIV S(ALGR(DE_DOT)) // ÷ +#define DE_MDSH S(ALGR(DE_MINS)) // — + diff --git a/users/struckmb/struckmb.c b/users/struckmb/struckmb.c index fc1b82bf..a257e36e 100644 --- a/users/struckmb/struckmb.c +++ b/users/struckmb/struckmb.c @@ -29,11 +29,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (detected_host_os()) { case OS_MACOS: switch (keycode) { - case DE_RSQU: // ' - if (record->event.pressed) { - tap_code16(S(DE_HASH)); - } - return false; case KC_CUT: if (record->event.pressed) { tap_code16(G(KC_X)); @@ -63,229 +58,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unregister_code16(KC_BRMD); } return false; -# ifdef MOUSEKEY_ENABLE - case MS_CSB1: - if (record->event.pressed) { - tap_code16(S(G(KC_BTN1))); - } - return false; -# endif // MOUSEKEY_ENABLE } break; case OS_LINUX: case OS_WINDOWS: switch (keycode) { - case DE_AT: // @ - if (record->event.pressed) { - register_code16(ALGR(DE_Q)); - } else { - unregister_code16(ALGR(DE_Q)); - } - return false; - case DE_ELLP: // … - if (record->event.pressed) { - register_code16(ALGR(KC_DOT)); - } else { - unregister_code16(ALGR(KC_DOT)); - } - return false; - case DE_LBRC: // [ - if (record->event.pressed) { - register_code16(ALGR(DE_8)); - } else { - unregister_code16(ALGR(DE_8)); - } - return false; - case DE_RBRC: // ] - if (record->event.pressed) { - register_code16(ALGR(DE_9)); - } else { - unregister_code16(ALGR(DE_9)); - } - return false; - case DE_BSLS: // "\" - if (record->event.pressed) { - register_code16(ALGR(DE_SS)); - } else { - unregister_code16(ALGR(DE_SS)); - } - return false; - case DE_LCBR: // { - if (record->event.pressed) { - register_code16(ALGR(DE_7)); - } else { - unregister_code16(ALGR(DE_7)); - } - return false; - case DE_RCBR: // } - if (record->event.pressed) { - register_code16(ALGR(DE_0)); - } else { - unregister_code16(ALGR(DE_0)); - } - return false; - case DE_PIPE: // | - if (record->event.pressed) { - register_code16(ALGR(KC_NUBS)); - } else { - unregister_code16(ALGR(KC_NUBS)); - } - return false; - case DE_TILD: // ~ - if (record->event.pressed) { - register_code16(ALGR(DE_PLUS)); - } else { - unregister_code16(ALGR(DE_PLUS)); - } - return false; - case DE_LDAQ: // « - if (record->event.pressed) { - register_code16(ALGR(DE_X)); - } else { - unregister_code16(ALGR(DE_X)); - } - return false; - case DE_RDAQ: // » - if (record->event.pressed) { - register_code16(ALGR(DE_Y)); - } else { - unregister_code16(ALGR(DE_Y)); - } - return false; - case DE_LSAQ: // ‹ - if (record->event.pressed) { - register_code16(S(ALGR(DE_X))); - } else { - unregister_code16(S(ALGR(DE_X))); - } - return false; - case DE_RSAQ: // › - if (record->event.pressed) { - register_code16(S(ALGR(DE_Y))); - } else { - unregister_code16(S(ALGR(DE_Y))); - } - return false; - case DE_PND: // £ - if (record->event.pressed) { - register_code16(S(ALGR(DE_3))); - } else { - unregister_code16(S(ALGR(DE_3))); - } - return false; - case DE_CENT: // ¢ - if (record->event.pressed) { - register_code16(ALGR(DE_C)); - } else { - unregister_code16(ALGR(DE_C)); - } - return false; - case DE_EURO: // € - if (record->event.pressed) { - register_code16(ALGR(DE_E)); - } else { - unregister_code16(ALGR(DE_E)); - } - return false; - case DE_IEXL: // ¡ - if (record->event.pressed) { - register_code16(S(ALGR(DE_1))); - } else { - unregister_code16(S(ALGR(DE_1))); - } - return false; - case DE_SLQU: // ‚ - if (record->event.pressed) { - register_code16(S(ALGR(DE_V))); - } else { - unregister_code16(S(ALGR(DE_V))); - } - return false; - case DE_NDSH: // – - if (record->event.pressed) { - register_code16(ALGR(DE_MINS)); - } else { - unregister_code16(ALGR(DE_MINS)); - } - return false; - case DE_MDSH: // — - if (record->event.pressed) { - register_code16(S(ALGR(DE_MINS))); - } else { - unregister_code16(S(ALGR(DE_MINS))); - } - return false; - case DE_LSQU: // ‘ - if (record->event.pressed) { - register_code16(S(ALGR(DE_B))); - } else { - unregister_code16(S(ALGR(DE_B))); - } - return false; - case DE_RSQU: // ’ - if (record->event.pressed) { - register_code16(S(ALGR(DE_N))); - } else { - unregister_code16(S(ALGR(DE_N))); - } - return false; - case DE_IQUE: // ¿ - if (record->event.pressed) { - register_code16(S(ALGR(DE_SS))); - } else { - unregister_code16(S(ALGR(DE_SS))); - } - return false; - case DE_MDDT: // • - if (record->event.pressed) { - register_code16(ALGR(DE_COMM)); - } else { - unregister_code16(ALGR(DE_COMM)); - } - return false; - case DE_DIV: // ÷ - if (record->event.pressed) { - register_code16(S(ALGR(DE_DOT))); - } else { - unregister_code16(S(ALGR(DE_DOT))); - } - return false; - case DE_PLMN: // ± - if (record->event.pressed) { - register_code16(S(ALGR(DE_9))); - } else { - unregister_code16(S(ALGR(DE_9))); - } - return false; - case DE_DLQU: // „ - if (record->event.pressed) { - register_code16(ALGR(DE_V)); - } else { - unregister_code16(ALGR(DE_V)); - } - return false; - case DE_LDQU: // “ - if (record->event.pressed) { - register_code16(ALGR(DE_B)); - } else { - unregister_code16(ALGR(DE_B)); - } - return false; - case DE_RDQU: // ” - if (record->event.pressed) { - register_code16(ALGR(DE_N)); - } else { - unregister_code16(ALGR(DE_N)); - } - return false; - case DE_YEN: - if (record->event.pressed) { - register_code16(S(ALGR(DE_Z))); - } else { - unregister_code16(S(ALGR(DE_Z))); - } - return false; case KC_CUT: if (record->event.pressed) { tap_code16(S(KC_DEL)); @@ -301,28 +79,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { tap_code16(S(KC_INS)); } return false; -# ifdef MOUSEKEY_ENABLE - case MS_CSB1: - if (record->event.pressed) { - tap_code16(S(C(KC_BTN1))); - } - return false; -# endif // MOUSEKEY_ENABLE } break; - default: - // ??? break; } #endif /* ifdef OS_DETECTION_ENABLE */ return - // process_record_keymap(keycode, record) && - // #ifdef ENCODER_ENABLE - // process_record_encoder(keycode, record) && - // #endif // ENCODER_ENABLE - true; + // process_record_keymap(keycode, record) && + // #ifdef ENCODER_ENABLE + // process_record_encoder(keycode, record) && + // #endif // ENCODER_ENABLE + true; } #ifdef QUICK_TAP_TERM diff --git a/users/struckmb/struckmb.h b/users/struckmb/struckmb.h index 2c4e1ace..dd19463b 100644 --- a/users/struckmb/struckmb.h +++ b/users/struckmb/struckmb.h @@ -1,6 +1,6 @@ #pragma once #include QMK_KEYBOARD_H -#include "keymap_german_mac_iso.h" +#include "keymap_german_extended.h" #ifndef QWERTY_ENABLE # ifndef BONE_ENABLE @@ -70,10 +70,6 @@ enum userspace_custom_keycodes { #ifdef ASETNIOP_ENABLE /* AS_START, AS_END, // Dummy key codes for combo definitions */ #endif // ASETNIOP_ENABLE - DE_RSQU, -#ifdef MOUSEKEY_ENABLE - MS_CSB1, -#endif // MOUSEKEY_ENABLE #ifdef X__ENCODER_ENABLE // Encoder button(s) BS_ENC0, @@ -386,7 +382,7 @@ enum userspace_custom_keycodes { /* Pointer layer */ # define _PL1_5_ KC_WH_D, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U # define _PL2_5_ KC_BTN4, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5 -# define _PL3_5_ S_C_TAB, KC_CUT, KC_COPY, KC_PSTE, MS_CSB1 +# define _PL3_5_ S_C_TAB, KC_CUT, KC_COPY, KC_PSTE, XXXXXXX # define _PR1_5_ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX # define _PR2_5_ OSM_MEH, OSM_CTL, OSM_SFT, OSM_ALT, OSM_GUI # define _PR3_5_ KC_ACL0, KC_ACL1, KC_ACL2, OSM_AGR, C___TAB @@ -399,9 +395,9 @@ enum userspace_custom_keycodes { # define _PR3_6_ _PR3_5_, _ADD_R_3_ // # define _PL4_2_ KC_BTN1, KC_BTN2 -# define _PL4_3_ MS_CSB1, _PL4_2_ +# define _PL4_3_ XXXXXXX, _PL4_2_ # define _PR4_2_ KC_BTN3, KC_BTN1 -# define _PR4_3_ _PR4_2_, MS_CSB1 +# define _PR4_3_ _PR4_2_, XXXXXXX // # define _POINT_3x5_ _PL1_5_, _PR1_5_, _PL2_5_, _PR2_5_, _PL3_5_, _PR3_5_ # define _POINT_3x6_ _PL1_6_, _PR1_6_, _PL2_6_, _PR2_6_, _PL3_6_, _PR3_6_ @@ -412,7 +408,7 @@ enum userspace_custom_keycodes { #define _AL2_5_ DL_GAME, DL_PREV, DL_NEXT, DL_QWER, NO_MODS #define _AL3_5_ RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD #define _AR1_5_ DE_IEXL, DE_LSAQ, DE_LDAQ, DE_RDAQ, DE_RSAQ -#define _AR2_5_ DE_IQUE, DE_MDDT, DE_SLQU, DE_LSQU, DE_RSQU +#define _AR2_5_ DE_IQUE, DE_MDOT, DE_SLQU, DE_LSQU, DE_RSQU #define _AR3_5_ DE_NDSH, DE_MDSH, DE_DLQU, DE_LDQU, DE_RDQU // #define _AL1_6_ QK_BOOT, _AL1_5_