Compare commits

..

No commits in common. "master" and "5.1.4" have entirely different histories.

3 changed files with 9 additions and 10 deletions

View File

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

View File

@ -1,4 +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 Version: 5.1.4

View File

@ -28,6 +28,7 @@ enum {
TD_TAB, TD_TAB,
TD_COMM, TD_COMM,
TD_DOT, TD_DOT,
TD_NTIL,
TD_BRC, TD_BRC,
TD_SBRC, TD_SBRC,
TD_PAR, TD_PAR,
@ -38,7 +39,6 @@ enum {
TD_EXL, TD_EXL,
TD_QUES, TD_QUES,
TD_PERC, TD_PERC,
TD_SLSH,
TD_1, TD_1,
TD_2, TD_2,
TD_3, TD_3,
@ -51,7 +51,7 @@ enum {
TD_0, TD_0,
}; };
bool isWindows = false; // Change to make default config Windows bool isWindows = true; // Change to make default config Windows
void dance_ctn_finished (qk_tap_dance_state_t *state, void *user_data) { void dance_ctn_finished (qk_tap_dance_state_t *state, void *user_data) {
if (state->count == 1) { if (state->count == 1) {
@ -107,6 +107,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
[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_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),
@ -114,7 +115,6 @@ 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_1] = ACTION_TAP_DANCE_DOUBLE(KC_KP_1, KC_F1),
[TD_2] = ACTION_TAP_DANCE_DOUBLE(KC_KP_2, KC_F2), [TD_2] = ACTION_TAP_DANCE_DOUBLE(KC_KP_2, KC_F2),
[TD_3] = ACTION_TAP_DANCE_DOUBLE(KC_KP_3, KC_F3), [TD_3] = ACTION_TAP_DANCE_DOUBLE(KC_KP_3, KC_F3),
@ -132,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, ES_L, ES_NTIL, KC_ENT, TD(TD_ALT), ES_A, ES_S, ES_D, ES_F, ES_G, ES_H, ES_J, ES_K, ES_L, TD(TD_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),
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------|
@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
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_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_1, KC_2, KC_3, TD(TD_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, ES_SLSH, ES_ASTR, TD(TD_SHIFT),
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
KC_TAB, ES_EQL, KC_SPC, KC_SPC, TT(1), KC_0 KC_TAB, ES_EQL, KC_SPC, KC_SPC, TT(1), KC_0
//`--------------------------' `--------------------------' //`--------------------------' `--------------------------'
@ -322,7 +322,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
} }
break; break;
default: default:
if (isWindows != false){ // 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)) {