5 Commits
5.1.0 ... 5.1.5

4 changed files with 22 additions and 20 deletions

View File

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

View File

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

View File

@ -62,15 +62,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# undef ENABLE_RGB_MATRIX_CYCLE_ALL
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# 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_DUAL
# undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
# undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
# undef ENABLE_RGB_MATRIX_DUAL_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
# define ENABLE_RGB_MATRIX_RAINDROPS
# undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
# undef ENABLE_RGB_MATRIX_RAINDROPS
# undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
# undef ENABLE_RGB_MATRIX_HUE_BREATHING
# 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
# undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
// 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_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_MULTICROSS
# 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_MULTISPLASH
# undef ENABLE_RGB_MATRIX_SOLID_SPLASH
# undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
#endif
#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"

View File

@ -53,7 +53,7 @@ enum {
bool isWindows = false; // Change to make default config Windows
void dance_ctn_finished (qk_tap_dance_state_t *state, void *user_data) {
void dance_ctn_finished (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
if (isWindows == true) {
register_code (KC_LCTL);
@ -77,7 +77,7 @@ void dance_ctn_finished (qk_tap_dance_state_t *state, void *user_data) {
}
}
}
void dance_ctn_reset (qk_tap_dance_state_t *state, void *user_data) {
void dance_ctn_reset (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
if (isWindows == true) {
unregister_code (KC_LCTL);
@ -96,14 +96,14 @@ void dance_ctn_reset (qk_tap_dance_state_t *state, void *user_data) {
}
}
qk_tap_dance_action_t tap_dance_actions[] = {
tap_dance_action_t tap_dance_actions[] = {
// tap twice for change
[TD_CTN] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_ctn_finished, dance_ctn_reset),
[TD_BRC] = ACTION_TAP_DANCE_DOUBLE(ES_LCBR, ES_RCBR),
[TD_SBRC] = ACTION_TAP_DANCE_DOUBLE(ES_LBRC, ES_RBRC),
[TD_PAR] = ACTION_TAP_DANCE_DOUBLE(ES_LPRN, ES_RPRN),
[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_COMM] = ACTION_TAP_DANCE_DOUBLE(ES_COMM, ES_SCLN),
[TD_DOT] = ACTION_TAP_DANCE_DOUBLE(ES_DOT, ES_COLN),
@ -142,13 +142,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[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, ES_SLSH, ES_ASTR, TD(TD_SHIFT),
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
KC_TAB, ES_EQL, KC_SPC, KC_SPC, TT(1), KC_KP_0
KC_TAB, ES_EQL, KC_SPC, KC_SPC, TT(1), KC_0
//`--------------------------' `--------------------------'
),
@ -298,7 +298,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#endif // OLED_ENABLE
// RGB LAYER CONFIGURATION
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
for (uint8_t i = led_min; i <= led_max; i++) {
switch(get_highest_layer(layer_state|default_layer_state)) {
case 1:
@ -322,7 +322,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
}
break;
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);
}
if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
@ -331,4 +331,5 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
break;
}
}
return true;
}