Compare commits

...

9 Commits

5 changed files with 47 additions and 27 deletions

View File

@ -3,11 +3,12 @@
{ {
"name": "Mac", "name": "Mac",
"includePath": [ "includePath": [
"${workspaceFolder}/**" "${workspaceFolder}/**",
"/usr/local/Cellar/boost/1.81.0_1/include/boost/predef"
], ],
"defines": [], "defines": [],
"macFrameworkPath": [], "macFrameworkPath": [],
"compilerPath": "/opt/homebrew/bin/arm-none-eabi-gcc", "compilerPath": "/usr/bin/clang++",
"cStandard": "gnu17", "cStandard": "gnu17",
"cppStandard": "gnu++14", "cppStandard": "gnu++14",
"intelliSenseMode": "macos-gcc-arm" "intelliSenseMode": "macos-gcc-arm"

View File

@ -1,2 +1,4 @@
# Configuracion de teclado Corne Aleleba # Configuracion de teclado Corne Aleleba
En este repositorio se encuentra el código del teclado Corne Aleleba. En este repositorio se encuentra el código del teclado Corne Aleleba.
Version: 5.2.1

View File

@ -62,15 +62,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# undef ENABLE_RGB_MATRIX_CYCLE_ALL # undef ENABLE_RGB_MATRIX_CYCLE_ALL
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT # define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN # undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON # undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
# undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN # undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
# undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL # undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
# undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL # undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
# undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL # undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
# undef ENABLE_RGB_MATRIX_DUAL_BEACON # undef ENABLE_RGB_MATRIX_DUAL_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_BEACON # define ENABLE_RGB_MATRIX_RAINBOW_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS # undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
# define ENABLE_RGB_MATRIX_RAINDROPS # undef ENABLE_RGB_MATRIX_RAINDROPS
# undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS # undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
# undef ENABLE_RGB_MATRIX_HUE_BREATHING # undef ENABLE_RGB_MATRIX_HUE_BREATHING
# undef ENABLE_RGB_MATRIX_HUE_PENDULUM # undef ENABLE_RGB_MATRIX_HUE_PENDULUM
@ -82,18 +82,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP # define ENABLE_RGB_MATRIX_TYPING_HEATMAP
# undef ENABLE_RGB_MATRIX_DIGITAL_RAIN # undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
# undef ENABLE_RGB_MATRIX_SPLASH # undef ENABLE_RGB_MATRIX_SPLASH
# undef ENABLE_RGB_MATRIX_MULTISPLASH # undef ENABLE_RGB_MATRIX_MULTISPLASH
# undef ENABLE_RGB_MATRIX_SOLID_SPLASH # undef ENABLE_RGB_MATRIX_SOLID_SPLASH
# undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
#endif #endif
#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"

View File

@ -28,8 +28,6 @@ enum {
TD_TAB, TD_TAB,
TD_COMM, TD_COMM,
TD_DOT, TD_DOT,
TD_L,
TD_NTIL,
TD_BRC, TD_BRC,
TD_SBRC, TD_SBRC,
TD_PAR, TD_PAR,
@ -39,7 +37,18 @@ enum {
TD_SPC, TD_SPC,
TD_EXL, TD_EXL,
TD_QUES, TD_QUES,
TD_PERC TD_PERC,
TD_SLSH,
TD_1,
TD_2,
TD_3,
TD_4,
TD_5,
TD_6,
TD_7,
TD_8,
TD_9,
TD_0,
}; };
bool isWindows = false; // Change to make default config Windows bool isWindows = false; // Change to make default config Windows
@ -94,12 +103,10 @@ qk_tap_dance_action_t tap_dance_actions[] = {
[TD_SBRC] = ACTION_TAP_DANCE_DOUBLE(ES_LBRC, ES_RBRC), [TD_SBRC] = ACTION_TAP_DANCE_DOUBLE(ES_LBRC, ES_RBRC),
[TD_PAR] = ACTION_TAP_DANCE_DOUBLE(ES_LPRN, ES_RPRN), [TD_PAR] = ACTION_TAP_DANCE_DOUBLE(ES_LPRN, ES_RPRN),
[TD_SHIFT] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS), [TD_SHIFT] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
[TD_ALT] = ACTION_TAP_DANCE_DOUBLE(KC_RALT, KC_LALT), [TD_ALT] = ACTION_TAP_DANCE_DOUBLE(KC_LALT, KC_RALT),
[TD_TAB] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_ESC), [TD_TAB] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_ESC),
[TD_COMM] = ACTION_TAP_DANCE_DOUBLE(ES_COMM, ES_SCLN), [TD_COMM] = ACTION_TAP_DANCE_DOUBLE(ES_COMM, ES_SCLN),
[TD_DOT] = ACTION_TAP_DANCE_DOUBLE(ES_DOT, ES_COLN), [TD_DOT] = ACTION_TAP_DANCE_DOUBLE(ES_DOT, ES_COLN),
[TD_L] = ACTION_TAP_DANCE_DOUBLE(ES_L, ES_EQL),
[TD_NTIL] = ACTION_TAP_DANCE_DOUBLE(ES_NTIL, ES_SLSH),
[TD_GRV] = ACTION_TAP_DANCE_DOUBLE(ES_GRV, ES_TILD), [TD_GRV] = ACTION_TAP_DANCE_DOUBLE(ES_GRV, ES_TILD),
[TD_ABK] = ACTION_TAP_DANCE_DOUBLE(ES_LABK, ES_RABK), [TD_ABK] = ACTION_TAP_DANCE_DOUBLE(ES_LABK, ES_RABK),
[TD_MINS] = ACTION_TAP_DANCE_DOUBLE(ES_MINS, ES_UNDS), [TD_MINS] = ACTION_TAP_DANCE_DOUBLE(ES_MINS, ES_UNDS),
@ -107,6 +114,17 @@ qk_tap_dance_action_t tap_dance_actions[] = {
[TD_EXL] = ACTION_TAP_DANCE_DOUBLE(ES_EXLM, ES_IEXL), [TD_EXL] = ACTION_TAP_DANCE_DOUBLE(ES_EXLM, ES_IEXL),
[TD_QUES] = ACTION_TAP_DANCE_DOUBLE(ES_QUES, ES_IQUES), [TD_QUES] = ACTION_TAP_DANCE_DOUBLE(ES_QUES, ES_IQUES),
[TD_PERC] = ACTION_TAP_DANCE_DOUBLE(ES_PERC, ES_CIRC), [TD_PERC] = ACTION_TAP_DANCE_DOUBLE(ES_PERC, ES_CIRC),
[TD_SLSH] = ACTION_TAP_DANCE_DOUBLE(ES_SLSH, ES_BSLS),
[TD_1] = ACTION_TAP_DANCE_DOUBLE(KC_KP_1, KC_F1),
[TD_2] = ACTION_TAP_DANCE_DOUBLE(KC_KP_2, KC_F2),
[TD_3] = ACTION_TAP_DANCE_DOUBLE(KC_KP_3, KC_F3),
[TD_4] = ACTION_TAP_DANCE_DOUBLE(KC_KP_4, KC_F4),
[TD_5] = ACTION_TAP_DANCE_DOUBLE(KC_KP_5, KC_F5),
[TD_6] = ACTION_TAP_DANCE_DOUBLE(KC_KP_6, KC_F6),
[TD_7] = ACTION_TAP_DANCE_DOUBLE(KC_KP_7, KC_F7),
[TD_8] = ACTION_TAP_DANCE_DOUBLE(KC_KP_8, KC_F8),
[TD_9] = ACTION_TAP_DANCE_DOUBLE(KC_KP_9, KC_F9),
[TD_0] = ACTION_TAP_DANCE_DOUBLE(KC_KP_0, KC_F10),
}; };
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@ -114,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,-----------------------------------------------------. ,-------------------------------------------------------. //,-----------------------------------------------------. ,-------------------------------------------------------.
TD(TD_TAB), ES_Q, ES_W, ES_E, ES_R, ES_T, ES_Y, ES_U, ES_I, ES_O, ES_P, KC_BSPC, TD(TD_TAB), ES_Q, ES_W, ES_E, ES_R, ES_T, ES_Y, ES_U, ES_I, ES_O, ES_P, KC_BSPC,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+----------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+----------|
TD(TD_ALT), ES_A, ES_S, ES_D, ES_F, ES_G, ES_H, ES_J, ES_K, TD(TD_L), TD(TD_NTIL), KC_ENT, TD(TD_ALT), ES_A, ES_S, ES_D, ES_F, ES_G, ES_H, ES_J, ES_K, ES_L, ES_NTIL, KC_ENT,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+----------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+----------|
TD(TD_CTN), ES_Z, ES_X, ES_C, ES_V, ES_B, ES_N, ES_M, TD(TD_COMM), TD(TD_DOT), TD(TD_MINS), TD(TD_SHIFT), TD(TD_CTN), ES_Z, ES_X, ES_C, ES_V, ES_B, ES_N, ES_M, TD(TD_COMM), TD(TD_DOT), TD(TD_MINS), TD(TD_SHIFT),
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------|
@ -124,13 +142,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT_split_3x6_3( [1] = LAYOUT_split_3x6_3(
//,-----------------------------------------------------. ,-----------------------------------------------------. //,-----------------------------------------------------. ,-----------------------------------------------------.
TD(TD_TAB), TD(TD_PERC), ES_AMPR, ES_PIPE, TD(TD_QUES), TD(TD_EXL), KC_KP_7, KC_KP_8, KC_KP_9, ES_MINS, KC_UP, ES_PLUS, TD(TD_TAB), TD(TD_PERC), ES_AMPR, ES_PIPE, TD(TD_QUES), TD(TD_EXL), KC_7, KC_8, KC_9, ES_MINS, KC_UP, ES_PLUS,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
TD(TD_ALT), ES_DLR, TD(TD_ABK), TD(TD_BRC), TD(TD_PAR), TD(TD_SBRC), KC_KP_4, KC_KP_5, KC_KP_6, KC_LEFT, KC_DOWN, KC_RIGHT, TD(TD_ALT), ES_DLR, TD(TD_ABK), TD(TD_BRC), TD(TD_PAR), TD(TD_SBRC), KC_4, KC_5, KC_6, KC_LEFT, KC_DOWN, KC_RIGHT,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
TD(TD_CTN), ES_HASH, ES_AT, ES_QUOT, ES_DQUO, TD(TD_GRV), KC_KP_1, KC_KP_2, KC_KP_3, ES_SLSH, ES_ASTR, TD(TD_SHIFT), TD(TD_CTN), ES_HASH, ES_AT, ES_QUOT, ES_DQUO, TD(TD_GRV), KC_1, KC_2, KC_3, TD(TD_SLSH), ES_ASTR, TD(TD_SHIFT),
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
XXXXXXX, KC_TAB, KC_SPC, KC_SPC, TT(1), KC_KP_0 KC_TAB, ES_EQL, KC_SPC, KC_SPC, TT(1), KC_0
//`--------------------------' `--------------------------' //`--------------------------' `--------------------------'
), ),
@ -148,13 +166,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[3] = LAYOUT_split_3x6_3( [3] = LAYOUT_split_3x6_3(
//,-----------------------------------------------------. ,-----------------------------------------------------. //,-----------------------------------------------------. ,-----------------------------------------------------.
TD(TD_TAB), ES_Q, ES_W, ES_E, ES_R, ES_T, KC_KP_7, KC_KP_8, KC_KP_9, ES_MINS, KC_UP, ES_PLUS, TD(TD_TAB), ES_Q, ES_W, ES_E, ES_R, ES_T, TD(TD_7), TD(TD_8), TD(TD_9), ES_MINS, KC_UP, ES_PLUS,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
TD(TD_ALT), ES_A, ES_S, ES_D, ES_F, ES_G, KC_KP_4, KC_KP_5, KC_KP_6, KC_LEFT, KC_DOWN, KC_RIGHT, TD(TD_ALT), ES_A, ES_S, ES_D, ES_F, ES_G, TD(TD_4), TD(TD_5), TD(TD_6), KC_LEFT, KC_DOWN, KC_RIGHT,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
TD(TD_CTN), ES_Z, ES_X, ES_C, ES_V, ES_B, KC_KP_1, KC_KP_2, KC_KP_3, ES_SLSH, ES_ASTR, TD(TD_SHIFT), TD(TD_CTN), ES_Z, ES_X, ES_C, ES_V, ES_B, TD(TD_1), TD(TD_2), TD(TD_3), ES_SLSH, ES_ASTR, TD(TD_SHIFT),
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
TD(TD_CTN), TD(TD_SHIFT),KC_SPC, KC_SPC, TT(3), KC_KP_0 TD(TD_CTN), TD(TD_SHIFT),KC_SPC, KC_SPC, TT(3), TD(TD_0)
//`--------------------------' `--------------------------' //`--------------------------' `--------------------------'
), ),
@ -304,7 +322,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
} }
break; break;
default: default:
if (isWindows == true){ // Change to false if main config is Mac if (isWindows != false){ // Change to false if main config is Mac
rgb_matrix_set_color(26, RGB_WHITE); rgb_matrix_set_color(26, RGB_WHITE);
} }
if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) { if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {

View File

@ -1 +0,0 @@
5.0.1