feat: update sofle keyboard
- change mapping to latin american spanish - use encoder to cursor movement - move home row mod to upper row
This commit is contained in:
parent
0539533d23
commit
6f9a1c59d2
3 changed files with 87 additions and 130 deletions
10
.idea/inspectionProfiles/Project_Default.xml
generated
Normal file
10
.idea/inspectionProfiles/Project_Default.xml
generated
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
|
||||
<option name="processCode" value="true" />
|
||||
<option name="processLiterals" value="true" />
|
||||
<option name="processComments" value="true" />
|
||||
</inspection_tool>
|
||||
</profile>
|
||||
</component>
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
/* Copyright 2021 Dane Evans
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -19,6 +18,9 @@
|
|||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
// Keycodes: https://github.com/qmk/qmk_firmware/blob/master/quantum/keymap_extras/keymap_spanish_latin_america.h
|
||||
#include "keymap_spanish_latin_america.h"
|
||||
|
||||
#define INDICATOR_BRIGHTNESS 30
|
||||
|
||||
#define HSV_OVERRIDE_HELP(h, s, v, Override) h, s , Override
|
||||
|
|
@ -76,49 +78,49 @@ enum custom_keycodes {
|
|||
KC_SYMBOLS = SAFE_RANGE,
|
||||
KC_SYSTEM,
|
||||
KC_ADJUST,
|
||||
KC_D_MUTE
|
||||
KC_ENC_MODE,
|
||||
KC_D_MUTE,
|
||||
};
|
||||
|
||||
|
||||
// Left-hand home row mods
|
||||
#define HOME_A LGUI_T(KC_A)
|
||||
#define HOME_S LALT_T(KC_S)
|
||||
#define HOME_D LSFT_T(KC_D)
|
||||
#define HOME_F LCTL_T(KC_F)
|
||||
#define HOME_Q LGUI_T(ES_Q)
|
||||
#define HOME_W LALT_T(ES_W)
|
||||
#define HOME_E LSFT_T(ES_E)
|
||||
#define HOME_R LCTL_T(ES_R)
|
||||
|
||||
// Right-hand home row mods
|
||||
#define HOME_J RCTL_T(KC_J)
|
||||
#define HOME_K RSFT_T(KC_K)
|
||||
#define HOME_L LALT_T(KC_L)
|
||||
#define HOME_SCLN RGUI_T(KC_SCLN)
|
||||
#define HOME_U RCTL_T(ES_U)
|
||||
#define HOME_I RSFT_T(ES_I)
|
||||
#define HOME_O LALT_T(ES_O)
|
||||
#define HOME_P RGUI_T(ES_P)
|
||||
|
||||
// Other multi pourpose keys
|
||||
#define SIDE_TAB LT(_NUMPAD, KC_TAB) // layer on held, tab on tap
|
||||
|
||||
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_MINS,
|
||||
SIDE_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, ALGR(KC_QUOT),
|
||||
KC_ESC, HOME_A, HOME_S, HOME_D, HOME_F, KC_G, KC_H, HOME_J, HOME_K, HOME_L, HOME_SCLN, KC_BSPC,
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_D_MUTE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
|
||||
KC_LALT, KC_LCTL, KC_LGUI, KC_SPC, KC_SYMBOLS, KC_SYSTEM, KC_ENT, KC_RGUI, KC_RCTL, KC_ALGR
|
||||
ES_PIPE, ES_1, ES_2, ES_3, ES_4, ES_5, ES_6, ES_7, ES_8, ES_9, ES_0, ES_QUOT,
|
||||
SIDE_TAB, HOME_Q, HOME_W, HOME_E, HOME_R, ES_T, ES_Y, HOME_U, HOME_I, HOME_O, HOME_P, ES_ACUT,
|
||||
KC_ESC, ES_A, ES_S, ES_D, ES_F, ES_G, ES_H, ES_J, ES_K, ES_L, ES_NTIL, KC_BSPC,
|
||||
KC_LSFT, ES_Z, ES_X, ES_C, ES_V, ES_B, KC_ENC_MODE, XXXXXXX, ES_N, ES_M, ES_COMM,ES_DOT, ES_MINS, KC_RSFT,
|
||||
KC_LALT, KC_LCTL, KC_LGUI, KC_SPC, KC_SYMBOLS, KC_SYSTEM, KC_ENT, KC_RGUI, KC_RCTL, KC_ALGR
|
||||
),
|
||||
[_SYMBOLS] = LAYOUT(
|
||||
_______, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), _______,
|
||||
_______, ALGR(KC_SLSH), S(KC_SLSH), KC_LBRC, KC_RBRC, KC_QUOT, S(KC_EQL), S(KC_8), KC_SLASH, KC_MINS, S(KC_6), _______,
|
||||
_______, S(KC_COMM), S(KC_DOT), S(KC_9), S(KC_0), S(KC_QUOT), S(KC_BSLS), S(KC_4), S(KC_3), KC_EQL, KC_BSLS, _______,
|
||||
_______, RSA(KC_1), S(KC_1), S(KC_LBRC), S(KC_RBRC), KC_GRV, _______, _______, S(KC_7), S(KC_5), XXXXXXX, _______, _______, _______,
|
||||
ES_MORD, S(ES_1), S(ES_2), S(ES_3), S(ES_4), S(ES_5), S(ES_6), S(ES_7), S(ES_8), S(ES_9), S(ES_0), S(ES_QUOT),
|
||||
_______, ES_IQUE, ES_QUES, ES_LBRC, ES_RBRC, ES_QUOT, ES_ASTR, ES_SLSH, ES_PLUS, ES_MINS, ES_TILD, ES_CIRC,
|
||||
_______, ES_LABK, ES_RABK, ES_LPRN, ES_RPRN, ES_DQUO, ES_PIPE, ES_DLR, ES_NUMB, ES_EQL, ES_BSLS, _______,
|
||||
_______, ES_IEXL, ES_EXLM, ES_LCBR, ES_RCBR, ES_GRV, _______, _______, ES_AMPR, ES_PERC, ES_SCLN, ES_COLN, ES_UNDS, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
[_SYSTEM] = 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_INS, XXXXXXX, S(KC_PSCR), KC_PSCR, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_RPRN, KC_BSPC,
|
||||
_______, KC_LGUI, KC_LALT, KC_LSFT, KC_LCTL, KC_PGUP, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, KC_DEL,
|
||||
_______, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX, _______, _______, KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
|
||||
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_LGUI, KC_LALT, KC_LSFT, KC_LCTL, XXXXXXX, XXXXXXX, KC_LCTL, KC_LSFT, KC_LALT, KC_LGUI, KC_BSPC,
|
||||
_______, XXXXXXX, XXXXXXX, S(KC_PSCR), KC_PSCR, KC_PGUP, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, KC_DEL,
|
||||
_______, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, XXXXXXX, XXXXXXX,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
[_ADJUST] = LAYOUT(
|
||||
EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, _______, _______, C(G(KC_LEFT)), XXXXXXX, XXXXXXX,C(G(KC_RGHT)),XXXXXXX,XXXXXXX,
|
||||
UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, _______,XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
|
||||
|
|
@ -133,72 +135,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
),
|
||||
};
|
||||
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
char layer_state_str[70];
|
||||
// Now define the array of layers. Later layers take precedence
|
||||
enum ENCODER_MODE {
|
||||
_ENCODER_PAGE = 0,
|
||||
_ENCODER_CHARACTER,
|
||||
};
|
||||
|
||||
// QWERTY,
|
||||
// Light on inner column and underglow
|
||||
const rgblight_segment_t PROGMEM layer_qwerty_lights[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
SET_LAYER_ID(HSV_RED)
|
||||
enum ENCODER_MODE CURRENT_ENCODER_MODE = _ENCODER_CHARACTER;
|
||||
|
||||
);
|
||||
#ifdef ENCODER_ENABLE
|
||||
|
||||
// _NUM,
|
||||
// Light on outer column and underglow
|
||||
const rgblight_segment_t PROGMEM layer_num_lights[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
SET_NUMROW(HSV_TEAL)
|
||||
bool encoder_update_user(uint8_t index, bool clockwise) {
|
||||
// Uncomment this to use the encoder to control the volume
|
||||
if (index == 0) {
|
||||
// if (clockwise) {
|
||||
// tap_code(KC_VOLU);
|
||||
// } else {
|
||||
// tap_code(KC_VOLD);
|
||||
// }
|
||||
|
||||
);
|
||||
// _SYMBOL,
|
||||
// Light on inner column and underglow
|
||||
const rgblight_segment_t PROGMEM layer_symbol_lights[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
SET_LAYER_ID(HSV_PURPLE),
|
||||
SET_THUMB_CLUSTER(HSV_PURPLE)
|
||||
);
|
||||
// _COMMAND,
|
||||
// Light on inner column and underglow
|
||||
const rgblight_segment_t PROGMEM layer_command_lights[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
SET_LAYER_ID(HSV_PURPLE),
|
||||
SET_THUMB_CLUSTER(HSV_PURPLE)
|
||||
);
|
||||
bool is_default_layer = get_highest_layer(layer_state) == _DEFAULTS;
|
||||
|
||||
//_NUMPAD
|
||||
const rgblight_segment_t PROGMEM layer_numpad_lights[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
SET_INDICATORS(HSV_ORANGE),
|
||||
SET_UNDERGLOW(HSV_ORANGE),
|
||||
SET_NUMPAD(HSV_BLUE),
|
||||
{7, 4, HSV_ORANGE},
|
||||
{25, 2, HSV_ORANGE},
|
||||
{35+6, 4, HSV_ORANGE},
|
||||
{35+25, 2, HSV_ORANGE}
|
||||
);
|
||||
|
||||
const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
|
||||
layer_qwerty_lights,
|
||||
layer_num_lights,// overrides layer 1
|
||||
layer_symbol_lights,
|
||||
layer_numpad_lights,
|
||||
layer_numpad_lights
|
||||
);
|
||||
|
||||
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
rgblight_set_layer_state(0, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_QWERTY));
|
||||
|
||||
rgblight_set_layer_state(1, layer_state_cmp(state, _SYMBOLS));
|
||||
rgblight_set_layer_state(2, layer_state_cmp(state, _SYSTEM));
|
||||
rgblight_set_layer_state(3, layer_state_cmp(state, _ADJUST));
|
||||
rgblight_set_layer_state(4, layer_state_cmp(state, _NUMPAD));
|
||||
return state;
|
||||
if (CURRENT_ENCODER_MODE == _ENCODER_PAGE && clockwise) {
|
||||
tap_code(is_default_layer ? KC_PGDN : KC_END);
|
||||
} else if (CURRENT_ENCODER_MODE == _ENCODER_PAGE && !clockwise) {
|
||||
tap_code(is_default_layer ? KC_PGUP : KC_HOME);
|
||||
} else if (CURRENT_ENCODER_MODE == _ENCODER_CHARACTER && clockwise) {
|
||||
tap_code(is_default_layer ? KC_DOWN : KC_RGHT);
|
||||
} else if (CURRENT_ENCODER_MODE == _ENCODER_CHARACTER && !clockwise) {
|
||||
tap_code(is_default_layer ? KC_UP : KC_LEFT);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void keyboard_post_init_user(void) {
|
||||
// Enable the LED layers
|
||||
rgblight_layers = my_rgb_layers;
|
||||
|
||||
rgblight_mode(10);// haven't found a way to set this in a more useful way
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef OLED_ENABLE
|
||||
|
|
@ -218,16 +187,16 @@ static void print_status_narrow(void) {
|
|||
oled_write_ln_P(PSTR("LAYER"), false);
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case _QWERTY:
|
||||
oled_write_P(PSTR("Base\n"), false);
|
||||
oled_write_ln_P(PSTR("Base\n"), false);
|
||||
break;
|
||||
case _SYSTEM:
|
||||
oled_write_P(PSTR("Sys\n"), false);
|
||||
oled_write_ln_P(PSTR("Sys\n"), false);
|
||||
break;
|
||||
case _SYMBOLS:
|
||||
oled_write_P(PSTR("Symb\n"), false);
|
||||
oled_write_ln_P(PSTR("Symb\n"), false);
|
||||
break;
|
||||
case _ADJUST:
|
||||
oled_write_P(PSTR("Adj\n"), false);
|
||||
oled_write_ln_P(PSTR("Adj\n"), false);
|
||||
break;
|
||||
case _NUMPAD:
|
||||
oled_write_P(PSTR("Nump\n"), false);
|
||||
|
|
@ -235,6 +204,20 @@ static void print_status_narrow(void) {
|
|||
default:
|
||||
oled_write_ln_P(PSTR("Undef\n"), false);
|
||||
}
|
||||
|
||||
oled_write_ln_P(PSTR("\nENCDR"), false);
|
||||
|
||||
switch (CURRENT_ENCODER_MODE) {
|
||||
case _ENCODER_PAGE:
|
||||
oled_write_ln_P(PSTR("Page"), false);
|
||||
break;
|
||||
case _ENCODER_CHARACTER:
|
||||
oled_write_ln_P(PSTR("Char"), false);
|
||||
break;
|
||||
default:
|
||||
oled_write_ln_P(PSTR("Undef\n"), false);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
|
||||
|
|
@ -257,6 +240,11 @@ bool oled_task_user(void) {
|
|||
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
switch (keycode) {
|
||||
case KC_ENC_MODE:
|
||||
if (record->event.pressed) {
|
||||
CURRENT_ENCODER_MODE = (CURRENT_ENCODER_MODE+1) % (_ENCODER_CHARACTER+1);
|
||||
}
|
||||
return false;
|
||||
case KC_SYMBOLS:
|
||||
if (record->event.pressed) {
|
||||
layer_on(_SYMBOLS);
|
||||
|
|
@ -293,44 +281,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
#ifdef ENCODER_ENABLE
|
||||
|
||||
bool encoder_update_user(uint8_t index, bool clockwise) {
|
||||
if (index == 0) {
|
||||
// Uncomment this to use the encoder to control the volume
|
||||
// if (clockwise) {
|
||||
// tap_code(KC_VOLU);
|
||||
// } else {
|
||||
// tap_code(KC_VOLD);
|
||||
// }
|
||||
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case _QWERTY:
|
||||
if (clockwise) {
|
||||
tap_code(KC_PGDN);
|
||||
} else {
|
||||
tap_code(KC_PGUP);
|
||||
}
|
||||
break;
|
||||
case _SYSTEM:
|
||||
case _SYMBOLS:
|
||||
if (clockwise) {
|
||||
tap_code(KC_DOWN);
|
||||
} else {
|
||||
tap_code(KC_UP);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
if (clockwise) {
|
||||
tap_code(KC_WH_D);
|
||||
} else {
|
||||
tap_code(KC_WH_U);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
MOUSEKEY_ENABLE = yes
|
||||
EXTRAKEY_ENABLE = yes
|
||||
CONSOLE_ENABLE = no
|
||||
RGBLIGHT_ENABLE = yes
|
||||
RGBLIGHT_ENABLE = no
|
||||
ENCODER_ENABLE = yes
|
||||
LTO_ENABLE = yes
|
||||
OLED_ENABLE = yes
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue