From 630a5650cc538710c8b52589abd480063f622cdd Mon Sep 17 00:00:00 2001 From: Franco Rosi Date: Mon, 14 Dec 2020 18:19:24 -0300 Subject: [PATCH] =?UTF-8?q?-Se=20agregan=20Mouse=20Keys=20(para=20manejo?= =?UTF-8?q?=20del=20mouse=20con=20el=20teclado).=20-Se=20hace=20fix=20en?= =?UTF-8?q?=20el=20modo=20"Bloq.=20May=C3=BAs"=20(Se=20persiste=20el=20cam?= =?UTF-8?q?bio=20de=20RGB=20mode=20mientras=20el=20Bloq.=20May=C3=BAs=20es?= =?UTF-8?q?t=C3=A1=20activado).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../helix/rev2_latam/keymaps/latam/config.h | 18 ++++++++++++++++++ .../latam/franco_rosi_latinoamerica.json | 14 +++++++------- .../helix/rev2_latam/keymaps/latam/keymap.c | 15 +++++++++++---- keyboards/helix/rules.mk | 2 +- 4 files changed, 37 insertions(+), 12 deletions(-) diff --git a/keyboards/helix/rev2_latam/keymaps/latam/config.h b/keyboards/helix/rev2_latam/keymaps/latam/config.h index 3610c6ef13f..e4a6a58f48e 100644 --- a/keyboards/helix/rev2_latam/keymaps/latam/config.h +++ b/keyboards/helix/rev2_latam/keymaps/latam/config.h @@ -36,3 +36,21 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #endif + + +#ifdef MOUSEKEY_ENABLE + #undef MOUSEKEY_INTERVAL + #define MOUSEKEY_INTERVAL 20 + + #undef MOUSEKEY_TIME_TO_MAX + #define MOUSEKEY_TIME_TO_MAX 40 + + #undef MOUSEKEY_MAX_SPEED + #define MOUSEKEY_MAX_SPEED 6 + + #undef MOUSEKEY_MOVE_DELTA + #define MOUSEKEY_MOVE_DELTA 5 + + #undef MOUSEKEY_DELAY + #define MOUSEKEY_DELAY 0 +#endif diff --git a/keyboards/helix/rev2_latam/keymaps/latam/franco_rosi_latinoamerica.json b/keyboards/helix/rev2_latam/keymaps/latam/franco_rosi_latinoamerica.json index 4d03758b9b2..270d1776565 100644 --- a/keyboards/helix/rev2_latam/keymaps/latam/franco_rosi_latinoamerica.json +++ b/keyboards/helix/rev2_latam/keymaps/latam/franco_rosi_latinoamerica.json @@ -2,7 +2,7 @@ "version": 1, "notes": "", "documentation": "\"This file is a QMK Configurator export. You can import this at . It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: \n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n", - "keyboard": "helix/rev2/under", + "keyboard": "helix/rev2/sc", "keymap": "franco_rosi_latinoamerica", "layout": "LAYOUT", "layers": [ @@ -89,8 +89,8 @@ "KC_TRNS", "KC_BRID", "KC_BRIU", - "KC_TRNS", - "KC_TRNS", + "KC_BTN1", + "KC_BTN2", "KC_PSCR", "KC_INS", "KC_TRNS", @@ -104,7 +104,7 @@ "KC_MPLY", "KC_TRNS", "KC_TRNS", - "KC_TRNS", + "KC_MS_U", "KC_TRNS", "KC_LBRC", "KC_RBRC", @@ -117,9 +117,9 @@ "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", + "KC_MS_L", + "KC_MS_D", + "KC_MS_R", "KC_TRNS", "KC_TRNS", "KC_TRNS", diff --git a/keyboards/helix/rev2_latam/keymaps/latam/keymap.c b/keyboards/helix/rev2_latam/keymaps/latam/keymap.c index e39b86dac38..87108e41bea 100644 --- a/keyboards/helix/rev2_latam/keymaps/latam/keymap.c +++ b/keyboards/helix/rev2_latam/keymaps/latam/keymap.c @@ -17,7 +17,7 @@ extern rgblight_config_t rgblight_config; uint8_t RGB_current_mode; HSV CURRENT_COLOR; bool caps_is_active = false; -void keyboard_post_init_user(void) { +void keyboard_post_init_user(void) { rgblight_enable(); // Enables RGB, without saving settings rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 5); RGB_current_mode = rgblight_config.mode; @@ -42,7 +42,7 @@ enum custom_keycodes { QWERTY = SAFE_RANGE, LOWER, RAISE, RGBRST }; // HELIX_ROWS == 5 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[_QWERTY] = LAYOUT(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_QUOT, KC_NUHS, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_ESC, KC_LGUI, KC_LALT, MO(2), MO(1), KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_RCTL), - [_LOWER] = 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_TRNS, KC_TRNS, KC_BRID, KC_BRIU, KC_TRNS, KC_TRNS, KC_PSCR, KC_INS, KC_TRNS, KC_MINS, KC_EQL, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_NUBS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_PGDN, KC_END, KC_TRNS), + [_LOWER] = 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_TRNS, KC_TRNS, KC_BRID, KC_BRIU, KC_BTN1, KC_BTN2, KC_PSCR, KC_INS, KC_TRNS, KC_MINS, KC_EQL, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_NUBS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_PGDN, KC_END, KC_TRNS), [_RAISE] = LAYOUT(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_M_R, RGB_M_K, RGB_M_SN, RGB_M_SW, RGB_TOG, KC_NO, KC_NO, RGB_RMOD, RGB_MOD, KC_NO, KC_NO, KC_NO, RGB_M_G, RGB_M_B, RGB_M_P, RGB_M_T, RGB_M_X, KC_NO, KC_NO, RGB_HUD, RGB_HUI, 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_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)}; @@ -98,8 +98,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { layer_on(_RAISE); } else { #ifdef RGBLIGHT_ENABLE - rgblight_mode(RGB_current_mode); - rgblight_sethsv(CURRENT_COLOR.h, CURRENT_COLOR.s, CURRENT_COLOR.v); + if(!caps_is_active){ + rgblight_mode(RGB_current_mode); + rgblight_sethsv(CURRENT_COLOR.h, CURRENT_COLOR.s, CURRENT_COLOR.v); + }else{ + RGB_current_mode = rgblight_config.mode; + CURRENT_COLOR = (HSV){rgblight_config.hue, rgblight_config.sat, rgblight_config.val}; + rgblight_mode(RGBLIGHT_MODE_ALTERNATING); + rgblight_sethsv(HSV_WHITE); + } #endif layer_off(_RAISE); TOG_STATUS = false; diff --git a/keyboards/helix/rules.mk b/keyboards/helix/rules.mk index 54a4d774fd5..b7b8b7f7d9f 100644 --- a/keyboards/helix/rules.mk +++ b/keyboards/helix/rules.mk @@ -18,7 +18,7 @@ BOOTLOADER = caterina # See TOP/docs/config_options.md for more information. # BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys +MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = no # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration