From 417ba8aa7faeb63459b4d086bd100e67e9b1be6b Mon Sep 17 00:00:00 2001 From: prescientmoon Date: Sat, 31 Aug 2024 19:05:59 +0200 Subject: [PATCH] Uhh, forgot what I changed here --- keyboards/qmk/ferris-sweep/config.h | 1 + keyboards/qmk/ferris-sweep/keymap.c | 22 ++++++++++++------ keyboards/qmk/ferris-sweep/rules.mk | 4 ++-- layout-lens/input.lens | 23 +++++++++++++++++++ layout-lens/output.svg | 35 +++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+), 9 deletions(-) create mode 100644 layout-lens/input.lens create mode 100644 layout-lens/output.svg diff --git a/keyboards/qmk/ferris-sweep/config.h b/keyboards/qmk/ferris-sweep/config.h index b6bc7cd..c6c8c09 100644 --- a/keyboards/qmk/ferris-sweep/config.h +++ b/keyboards/qmk/ferris-sweep/config.h @@ -28,6 +28,7 @@ #define COMBO_HOLD_TERM 30 #define COMBO_ONLY_FROM_LAYER 0 // }}} +#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX // https://github.com/qmk/qmk_firmware/blob/master/docs/feature_split_keyboard.md#handedness-by-eeprom #define EE_HANDS diff --git a/keyboards/qmk/ferris-sweep/keymap.c b/keyboards/qmk/ferris-sweep/keymap.c index fc19a62..96b3571 100644 --- a/keyboards/qmk/ferris-sweep/keymap.c +++ b/keyboards/qmk/ferris-sweep/keymap.c @@ -26,6 +26,10 @@ const uint16_t PROGMEM lgui_combo[] = { KC_R, KC_V, COMBO_END }; const uint16_t PROGMEM rgui_combo[] = { KC_H, KC_I, COMBO_END }; const uint16_t PROGMEM lcontrol_sft_combo[] = { KC_R, KC_S, KC_T, COMBO_END }; const uint16_t PROGMEM rcontrol_sft_combo[] = { KC_N, KC_E, KC_I, COMBO_END }; +const uint16_t PROGMEM lalt_sft_combo[] = { KC_A, KC_R, KC_S, COMBO_END }; +const uint16_t PROGMEM ralt_sft_combo[] = { KC_E, KC_I, KC_O, COMBO_END }; +const uint16_t PROGMEM lcontrol_alt_sft_combo[] = { KC_A, KC_R, KC_S, KC_T, COMBO_END }; +const uint16_t PROGMEM rcontrol_alt_sft_combo[] = { KC_N, KC_E, KC_I, KC_O, COMBO_END }; // }}} // {{{ Custom keymaps (bound by specific apps) const uint16_t PROGMEM normal_mode_combo[] = { KC_N, KC_E, COMBO_END }; @@ -64,6 +68,10 @@ combo_t key_combos[] = { COMBO(rgui_combo, KC_RGUI), COMBO(lcontrol_sft_combo, S(KC_LCTL)), COMBO(rcontrol_sft_combo, S(KC_RCTL)), + COMBO(lalt_sft_combo, S(KC_LALT)), + COMBO(ralt_sft_combo, S(KC_RALT)), + COMBO(lcontrol_alt_sft_combo, S(C(KC_LALT))), + COMBO(rcontrol_alt_sft_combo, S(C(KC_RALT))), // }}} // {{{ Custom keybinds (bound in software) COMBO(normal_mode_combo, KC_F10), @@ -111,19 +119,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), // Blue layer [2] = LAYOUT_split_3x5_2( - // + @ # $ % _ & * ` ~ - S(KC_EQL), S(KC_2), S(KC_3),S(KC_4),S(KC_5), S(KC_MINS),S(KC_7), S(KC_8),KC_GRV,S(KC_GRV), - // < { [ ( ? | - / = : - S(KC_COMM),S(KC_LBRC),KC_LBRC,S(KC_9),S(KC_SLSH),S(KC_BSLS),KC_MINS, KC_SLSH,KC_EQL,S(KC_SCLN), - // > } ] ) ! ^ — em dash " - S(KC_DOT), S(KC_RBRC),KC_RBRC,S(KC_0),S(KC_1), S(KC_6), UC(0x2014),KC_NO, KC_NO, S(KC_QUOT), + // + @ # $ % _ & * ` ~ + S(KC_EQL), S(KC_2), S(KC_3),S(KC_4),S(KC_5), S(KC_MINS),S(KC_7), S(KC_8),KC_GRV, S(KC_GRV), + // < { [ ( ? | - / = : + S(KC_COMM),S(KC_LBRC),KC_LBRC,S(KC_9),S(KC_SLSH),S(KC_BSLS),KC_MINS, KC_SLSH,KC_EQL, S(KC_SCLN), + // > } ] ) ! ^ — em dash " + S(KC_DOT), S(KC_RBRC),KC_RBRC,S(KC_0),S(KC_1), S(KC_6), UC(0x2014),KC_TRNS,KC_TRNS,S(KC_QUOT), TL_LOWR, KC_BSLS, KC_TRNS, KC_NO ), // Purple layer (blue + red) [3] = LAYOUT_split_3x5_2( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, CAPS, KC_COPY, KC_MNXT,KC_VOLU,KC_BRIU, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,KC_NO, KC_PASTE,KC_MPLY,KC_VOLD,KC_BRID, - KC_F11,KC_F12,KC_NO, KC_NO, KC_NO, KC_NO, KC_CUT, KC_MPRV,KC_MUTE,KC_NO , + KC_F11,KC_F12,KC_NO, KC_NO, KC_NO, KC_NO, KC_CUT, KC_MPRV,KC_MUTE,CM_TOGG, KC_NO, KC_NO, KC_NO, KC_NO ), // QWERTY chars diff --git a/keyboards/qmk/ferris-sweep/rules.mk b/keyboards/qmk/ferris-sweep/rules.mk index d975471..92cb9e7 100644 --- a/keyboards/qmk/ferris-sweep/rules.mk +++ b/keyboards/qmk/ferris-sweep/rules.mk @@ -1,6 +1,6 @@ TRI_LAYER_ENABLE = yes COMBO_ENABLE = yes CAPS_WORD_ENABLE = yes -UNICODE_ENABLE = yes CONSOLE_ENABLE = yes -# UNICODEMAP_ENABLE = yes +UNICODE_COMMON = yes +UNICODE_ENABLE = yes diff --git a/layout-lens/input.lens b/layout-lens/input.lens new file mode 100644 index 0000000..bf9e8a4 --- /dev/null +++ b/layout-lens/input.lens @@ -0,0 +1,23 @@ +physical + block + key 0 1 + key 1 0.5 + key 2 0 + key 3 0.5 + key 4 1 + end + + block + place 0 0 + place 7 0 + end + + place 0 2 + + block + key 0 0 + key 1 0 + end + + place 3.5 4.5 0.2617993878 4 5 + place 6.5 4.5 -0.2617993878 8 5 diff --git a/layout-lens/output.svg b/layout-lens/output.svg new file mode 100644 index 0000000..916f815 --- /dev/null +++ b/layout-lens/output.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file