From 162dd3fe19a9c3bf15d63013bf51a49877de0bc9 Mon Sep 17 00:00:00 2001 From: hvp <32483282+hvpkod@users.noreply.github.com> Date: Wed, 16 Oct 2019 19:44:43 +0200 Subject: [PATCH] [Keymap] Corne keyap with tap dance Swedish support (#6857) * Adding profile for Corne with tap dance Swedish support. * Remove extern keymap_config_t keymap_config as no longer needed * Changed to use tap_code over register_code * Removed persistent_default_layer_set * Moved macros to hvp user space ink tap dance code * Removed not used functions * Moved to an ifbased include statement * Removed not needed characters --- keyboards/crkbd/keymaps/hvp/config.h | 50 +++++++ keyboards/crkbd/keymaps/hvp/keymap.c | 183 ++++++++++++++++++++++++++ keyboards/crkbd/keymaps/hvp/readme.md | 5 + keyboards/crkbd/keymaps/hvp/rules.mk | 14 ++ users/hvp/hvp.c | 2 + users/hvp/hvp.h | 6 + users/hvp/readme.md | 1 + users/hvp/rules.mk | 4 + users/hvp/tap_dances.c | 75 +++++++++++ users/hvp/tap_dances.h | 10 ++ 10 files changed, 350 insertions(+) create mode 100644 keyboards/crkbd/keymaps/hvp/config.h create mode 100644 keyboards/crkbd/keymaps/hvp/keymap.c create mode 100644 keyboards/crkbd/keymaps/hvp/readme.md create mode 100644 keyboards/crkbd/keymaps/hvp/rules.mk create mode 100644 users/hvp/hvp.c create mode 100644 users/hvp/hvp.h create mode 100644 users/hvp/readme.md create mode 100644 users/hvp/rules.mk create mode 100644 users/hvp/tap_dances.c create mode 100644 users/hvp/tap_dances.h diff --git a/keyboards/crkbd/keymaps/hvp/config.h b/keyboards/crkbd/keymaps/hvp/config.h new file mode 100644 index 00000000000..c5c6d1cba88 --- /dev/null +++ b/keyboards/crkbd/keymaps/hvp/config.h @@ -0,0 +1,50 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +//#define USE_MATRIX_I2C + +/* Select hand configuration */ + +#define MASTER_LEFT +// #define MASTER_RIGHT +// #define EE_HANDS + +#define SSD1306OLED + +#define USE_SERIAL_PD2 + +//#define TAPPING_FORCE_HOLD +//#define TAPPING_TERM 100 + +#define TAPPING_TERM 150 +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT + +#ifdef RGBLIGHT_ENABLE +# undef RGBLED_NUM +# define RGBLIGHT_ANIMATIONS +# define RGBLED_NUM 27 +# define RGBLIGHT_LIMIT_VAL 120 +# define RGBLIGHT_HUE_STEP 10 +# define RGBLIGHT_SAT_STEP 17 +# define RGBLIGHT_VAL_STEP 17 +#endif diff --git a/keyboards/crkbd/keymaps/hvp/keymap.c b/keyboards/crkbd/keymaps/hvp/keymap.c new file mode 100644 index 00000000000..b66c360e188 --- /dev/null +++ b/keyboards/crkbd/keymaps/hvp/keymap.c @@ -0,0 +1,183 @@ +#include QMK_KEYBOARD_H +#include "hvp.c" + +#ifdef RGBLIGHT_ENABLE +//Following line allows macro to read current RGB settings +extern rgblight_config_t rgblight_config; +#endif + +extern uint8_t is_master; + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +#define _QWERTY 0 +#define _LOWER 1 +#define _RAISE 2 +#define _ADJUST 3 + +enum custom_keycodes { + QWERTY = SAFE_RANGE, + LOWER, + RAISE, + ADJUST +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( \ + //,-----------------------------------------. ,-----------------------------------------. + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,KC_BSPC,\ + //|------+------+------+------+------+------| |------+------+------+------+------+------| + LT(_ADJUST, KC_ESC), KC_A, KC_S, KC_D, LT(_RAISE,KC_F), MT(MOD_LCTL,KC_G), KC_H, KC_J, KC_K, KC_L,TD(TD1),TD(TD2),\ + //|------+------+------+------+------+------| |------+------+------+------+------+------| + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM,KC_DOT,TD(TD3),KC_SFTENT,\ + //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| + KC_LGUI, LOWER,MT(MOD_LSFT, KC_SPC), LT(_RAISE,KC_ENT), RAISE,KC_LALT \ + //`--------------------' `--------------------' + ), + + [_RAISE] = LAYOUT( \ + //,-----------------------------------------. ,-----------------------------------------. + KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,KC_BSPC,\ + //|------+------+------+------+------+------| |------+------+------+------+------+------| + KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT,KC_DOWN,KC_UP, KC_RIGHT,KC_NO, KC_DEL,\ + //|------+------+------+------+------+------| |------+------+------+------+------+------| + KC_LCTL, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_NO, KC_NO,\ + //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| + KC_LGUI, LOWER,MT(MOD_LSFT, KC_SPC), LT(_RAISE,KC_ENT), RAISE,KC_LALT \ + //`--------------------' `--------------------' + ), + + [_LOWER] = LAYOUT( \ + //,-----------------------------------------. ,-----------------------------------------. + KC_TAB,KC_EXLM,KC_AT,KC_HASH,KC_DLR,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_BSPC,\ + //|------+------+------+------+------+------| |------+------+------+------+------+------| + KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MINS,KC_EQL,KC_LCBR,KC_RCBR,KC_PIPE,KC_GRV,\ + //|------+------+------+------+------+------| |------+------+------+------+------+------| + KC_LCTL, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UNDS,KC_PLUS,KC_LBRC,KC_RBRC,KC_BSLS,KC_TILD,\ + //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| + KC_LGUI, LOWER,MT(MOD_LSFT, KC_SPC), LT(_RAISE,KC_ENT), RAISE,KC_LALT \ + //`--------------------' `--------------------' + ), + + [_ADJUST] = LAYOUT( \ + //,-----------------------------------------. ,-----------------------------------------. + KC_F1,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,\ + //|------+------+------+------+------+------| |------+------+------+------+------+------| + KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\ + //|------+------+------+------+------+------| |------+------+------+------+------+------| + RESET,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, KC_MPLY, KC_MNXT, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,\ + //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| + KC_LGUI, LOWER,MT(MOD_LSFT, KC_SPC), LT(_RAISE,KC_ENT), RAISE,KC_LALT \ + //`--------------------' `--------------------' + ) +}; + +int RGB_current_mode; + +// Setting ADJUST layer RGB back to default +void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { + if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) { + layer_on(layer3); + } else { + layer_off(layer3); + } +} + +void matrix_init_user(void) { + #ifdef RGBLIGHT_ENABLE + RGB_current_mode = rgblight_config.mode; + #endif + //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h + #ifdef SSD1306OLED + iota_gfx_init(!has_usb()); // turns on the display + #endif +} + +//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h +#ifdef SSD1306OLED + +// When add source files to SRC in rules.mk, you can use functions. +const char *read_layer_state(void); +const char *read_logo(void); +void set_keylog(uint16_t keycode, keyrecord_t *record); +const char *read_keylog(void); +const char *read_keylogs(void); + +// const char *read_mode_icon(bool swap); +// const char *read_host_led_state(void); +// void set_timelog(void); +// const char *read_timelog(void); + +void matrix_scan_user(void) { + iota_gfx_task(); +} + +void matrix_render_user(struct CharacterMatrix *matrix) { + if (is_master) { + // If you want to change the display of OLED, you need to change here + matrix_write_ln(matrix, read_layer_state()); + matrix_write_ln(matrix, read_keylog()); + //matrix_write_ln(matrix, read_keylogs()); + //matrix_write_ln(matrix, read_mode_icon(keymap_config.swap_lalt_lgui)); + //matrix_write_ln(matrix, read_host_led_state()); + //matrix_write_ln(matrix, read_timelog()); + } else { + matrix_write(matrix, read_logo()); + } +} + +void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) { + if (memcmp(dest->display, source->display, sizeof(dest->display))) { + memcpy(dest->display, source->display, sizeof(dest->display)); + dest->dirty = true; + } +} + +void iota_gfx_task_user(void) { + struct CharacterMatrix matrix; + matrix_clear(&matrix); + matrix_render_user(&matrix); + matrix_update(&display, &matrix); +} +#endif//SSD1306OLED + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (record->event.pressed) { +#ifdef SSD1306OLED + set_keylog(keycode, record); +#endif + // set_timelog(); + } + + switch (keycode) { + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST); + } + return false; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST); + } + return false; + case ADJUST: + if (record->event.pressed) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + return false; + break; + } + return true; +} \ No newline at end of file diff --git a/keyboards/crkbd/keymaps/hvp/readme.md b/keyboards/crkbd/keymaps/hvp/readme.md new file mode 100644 index 00000000000..33bb83b83f9 --- /dev/null +++ b/keyboards/crkbd/keymaps/hvp/readme.md @@ -0,0 +1,5 @@ +Keymap to be used with Eurkey for easy access to swedish characters on first layer. + +Links: + +- https://eurkey.steffen.bruentjen.eu/ \ No newline at end of file diff --git a/keyboards/crkbd/keymaps/hvp/rules.mk b/keyboards/crkbd/keymaps/hvp/rules.mk new file mode 100644 index 00000000000..a651e528cf4 --- /dev/null +++ b/keyboards/crkbd/keymaps/hvp/rules.mk @@ -0,0 +1,14 @@ + +# If you want to change the display of OLED, you need to change here +SRC += ./lib/glcdfont.c \ + ./lib/rgb_state_reader.c \ + ./lib/layer_state_reader.c \ + ./lib/logo_reader.c \ + ./lib/keylogger.c \ + # ./lib/mode_icon_reader.c \ + # ./lib/host_led_state_reader.c \ + # ./lib/timelogger.c \ + +TAP_DANCE_ENABLE = yes +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +# LOCAL_GLCDFONT = yes \ No newline at end of file diff --git a/users/hvp/hvp.c b/users/hvp/hvp.c new file mode 100644 index 00000000000..7e484535c87 --- /dev/null +++ b/users/hvp/hvp.c @@ -0,0 +1,2 @@ + +#include "hvp.h" diff --git a/users/hvp/hvp.h b/users/hvp/hvp.h new file mode 100644 index 00000000000..2b2210f873f --- /dev/null +++ b/users/hvp/hvp.h @@ -0,0 +1,6 @@ +#pragma once + +#ifdef TAP_DANCE_ENABLE +# include "tap_dances.h" +#endif +#include "quantum.h" diff --git a/users/hvp/readme.md b/users/hvp/readme.md new file mode 100644 index 00000000000..2d8f9d85977 --- /dev/null +++ b/users/hvp/readme.md @@ -0,0 +1 @@ +Personal user space for hvpcode / cablegore at discord diff --git a/users/hvp/rules.mk b/users/hvp/rules.mk new file mode 100644 index 00000000000..0a7e679631d --- /dev/null +++ b/users/hvp/rules.mk @@ -0,0 +1,4 @@ +SRC += hvp.c +ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) + SRC += tap_dances.c +endif \ No newline at end of file diff --git a/users/hvp/tap_dances.c b/users/hvp/tap_dances.c new file mode 100644 index 00000000000..bb102b30abf --- /dev/null +++ b/users/hvp/tap_dances.c @@ -0,0 +1,75 @@ +#include "tap_dances.h" + +// Tap dance function for enable swedish characters on first layer. Unregister to not let tap bleed over to next keypress. +// Tap dance 1 +void dance_1_finished(qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 2) { + tap_code(KC_SCLN); + } else { + register_code(KC_RALT); + register_code(KC_O); + unregister_code(KC_RALT); + unregister_code(KC_O); + } +} + +void dance_1_reset(qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 2) { + unregister_code(KC_SCLN); + } else { + unregister_code(KC_RALT); + unregister_code(KC_O); + } +} + +// Tap dance 2 +void dance_2_finished(qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 2) { + tap_code(KC_QUOT); + } else { + register_code(KC_RALT); + register_code(KC_A); + unregister_code(KC_RALT); + unregister_code(KC_A); + } +} + +void dance_2_reset(qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 2) { + unregister_code(KC_QUOT); + } else { + unregister_code(KC_RALT); + unregister_code(KC_A); + } +} + +// Tap dance 3 +void dance_3_finished(qk_tap_dance_state_t *state, void *user_data) { + // if (state->count == 2) + if (state->count == 2) { + tap_code(KC_SLSH); + } else { + register_code(KC_RALT); + register_code(KC_W); + unregister_code(KC_RALT); + unregister_code(KC_W); + } +} + +void dance_3_reset(qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 2) { + unregister_code(KC_SLSH); + } else { + unregister_code(KC_RALT); + unregister_code(KC_W); + } +} + +// Tap Dance Definitions +qk_tap_dance_action_t tap_dance_actions[] = { + // simple tap dance + [TD1] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_1_finished, dance_1_reset), + + [TD2] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_2_finished, dance_2_reset), + + [TD3] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_3_finished, dance_3_reset)}; \ No newline at end of file diff --git a/users/hvp/tap_dances.h b/users/hvp/tap_dances.h new file mode 100644 index 00000000000..705985faac5 --- /dev/null +++ b/users/hvp/tap_dances.h @@ -0,0 +1,10 @@ +#pragma once +#include "hvp.h" + +// Tap Dance Declarations +enum tapdance_id +{ + TD1 = 0, + TD2, + TD3 +};