Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						07db8c3813
					
				
					 4 changed files with 218 additions and 0 deletions
				
			
		
							
								
								
									
										50
									
								
								keyboards/crkbd/keymaps/ajarov/config.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										50
									
								
								keyboards/crkbd/keymaps/ajarov/config.h
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,50 @@ | |||
| /*
 | ||||
| This is the c configuration file for the keymap | ||||
| 
 | ||||
| Copyright 2012 Jun Wako <wakojun@gmail.com> | ||||
| Copyright 2015 Jack Humbert | ||||
| 
 | ||||
| This program is free software: you can redistribute it and/or modify | ||||
| it under the terms of the GNU General Public License as published by | ||||
| the Free Software Foundation, either version 2 of the License, or | ||||
| (at your option) any later version. | ||||
| 
 | ||||
| This program is distributed in the hope that it will be useful, | ||||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| GNU General Public License for more details. | ||||
| 
 | ||||
| You should have received a copy of the GNU General Public License | ||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| */ | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| 
 | ||||
| /* Select hand configuration */ | ||||
| 
 | ||||
| #define MASTER_LEFT | ||||
| // #define MASTER_RIGHT
 | ||||
| // #define EE_HANDS
 | ||||
| 
 | ||||
| //#define TAPPING_FORCE_HOLD
 | ||||
| //#define TAPPING_TERM 100
 | ||||
| 
 | ||||
| #ifdef RGBLIGHT_ENABLE | ||||
| #    define RGBLIGHT_EFFECT_BREATHING | ||||
| #    define RGBLIGHT_EFFECT_RAINBOW_MOOD | ||||
| #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL | ||||
| #    define RGBLIGHT_EFFECT_SNAKE | ||||
| #    define RGBLIGHT_EFFECT_KNIGHT | ||||
| #    define RGBLIGHT_EFFECT_CHRISTMAS | ||||
| #    define RGBLIGHT_EFFECT_STATIC_GRADIENT | ||||
| #    define RGBLIGHT_EFFECT_RGB_TEST | ||||
| #    define RGBLIGHT_EFFECT_ALTERNATING | ||||
| #    define RGBLIGHT_EFFECT_TWINKLE | ||||
| #    define RGBLIGHT_LIMIT_VAL 120 | ||||
| #    define RGBLIGHT_HUE_STEP 10 | ||||
| #    define RGBLIGHT_SAT_STEP 17 | ||||
| #    define RGBLIGHT_VAL_STEP 17 | ||||
| #endif | ||||
| 
 | ||||
| #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" | ||||
							
								
								
									
										150
									
								
								keyboards/crkbd/keymaps/ajarov/keymap.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										150
									
								
								keyboards/crkbd/keymaps/ajarov/keymap.c
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,150 @@ | |||
| /*
 | ||||
| Copyright 2019 @foostan | ||||
| Copyright 2020 Drashna Jaelre <@drashna> | ||||
| Copyright 2022 Alejandro Jarovisky <@ajarov> | ||||
| 
 | ||||
| This program is free software: you can redistribute it and/or modify | ||||
| it under the terms of the GNU General Public License as published by | ||||
| the Free Software Foundation, either version 2 of the License, or | ||||
| (at your option) any later version. | ||||
| 
 | ||||
| This program is distributed in the hope that it will be useful, | ||||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| GNU General Public License for more details. | ||||
| 
 | ||||
| You should have received a copy of the GNU General Public License | ||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| */ | ||||
| 
 | ||||
| #include QMK_KEYBOARD_H | ||||
| #include "keymap_spanish.h" | ||||
| 
 | ||||
| enum layers { | ||||
|     L_BASE, | ||||
|     L_UPPER, | ||||
|     L_RIGHT, | ||||
|     L_UPPER_RIGHT, | ||||
| }; | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [L_BASE] = LAYOUT_split_3x6_3( | ||||
|     //,-----------------------------------------------------.                    ,-----------------------------------------------------.
 | ||||
|          KC_TAB,    ES_Q,    ES_W,    ES_E,    ES_R,    ES_T,                         ES_Y,    ES_U,    ES_I,    ES_O,   ES_P,  KC_BSPC, | ||||
|     //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
 | ||||
|         KC_LCTL,    ES_A,    ES_S,    ES_D,    ES_F,    ES_G,                         ES_H,    ES_J,    ES_K,    ES_L, ES_NTIL, ES_ACUT, | ||||
|     //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
 | ||||
|         KC_LSFT,    ES_Z,    ES_X,    ES_C,    ES_V,    ES_B,                         ES_N,    ES_M, ES_COMM,  ES_DOT, ES_MINS, KC_RSFT, | ||||
|     //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
 | ||||
|                                             KC_LGUI,   MO(1),  KC_SPC,     KC_ENT,   MO(2), KC_LALT | ||||
|                                         //`--------------------------'  `--------------------------'
 | ||||
|     ), | ||||
| 
 | ||||
|     [L_UPPER] = LAYOUT_split_3x6_3( | ||||
|     //,-----------------------------------------------------.                    ,-----------------------------------------------------.
 | ||||
|          KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_APP,                       KC_INS, KC_HOME,   KC_UP,  KC_END, KC_PGUP, KC_BSPC, | ||||
|     //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
 | ||||
|         KC_LCTL,   KC_F5,   KC_F6,   KC_F7,   KC_F8, KC_PSCR,                       KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, ES_DIAE, | ||||
|     //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
 | ||||
|         KC_LSFT,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_PAUS,                      XXXXXXX, XXXXXXX, ES_SCLN, ES_COLN, ES_UNDS, KC_RSFT, | ||||
|     //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
 | ||||
|                                             KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_LALT | ||||
|                                         //`--------------------------'  `--------------------------'
 | ||||
|     ), | ||||
| 
 | ||||
|     [L_RIGHT] = LAYOUT_split_3x6_3( | ||||
|     //,-----------------------------------------------------.                    ,-----------------------------------------------------.
 | ||||
|         KC_CAPS, ES_EXLM, ES_DQUO, ES_HASH, ES_CIRC, XXXXXXX,                      ES_ASTR,    ES_7,    ES_8,    ES_9, ES_MINS, KC_BSPC, | ||||
|     //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
 | ||||
|         KC_LCTL, ES_LCBR, ES_RCBR, ES_LPRN, ES_RPRN, ES_QUES,                      ES_SLSH,    ES_4,    ES_5,    ES_6, ES_PLUS, ES_QUOT, | ||||
|     //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
 | ||||
|         KC_LSFT, ES_LBRC, ES_RBRC, ES_LABK, ES_RABK,  ES_EQL,                         ES_0,    ES_1,    ES_2,    ES_3,  ES_DOT, KC_RSFT, | ||||
|     //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
 | ||||
|                                             KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_LALT | ||||
|                                         //`--------------------------'  `--------------------------'
 | ||||
|     ), | ||||
| 
 | ||||
|     [L_UPPER_RIGHT] = LAYOUT_split_3x6_3( | ||||
|     //,-----------------------------------------------------.                    ,-----------------------------------------------------.
 | ||||
|         XXXXXXX, ES_IEXL,   ES_AT, ES_EURO,  ES_DLR, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, ES_MORD, XXXXXXX, KC_BSPC, | ||||
|     //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
 | ||||
|         KC_LCTL, ES_FORD, ES_AMPR, ES_PIPE, ES_BSLS, ES_IQUE,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ES_TILD,  ES_GRV, | ||||
|     //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
 | ||||
|         KC_LSFT, XXXXXXX,  ES_NOT, ES_CCED, ES_PERC, XXXXXXX,                      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_RSFT, | ||||
|     //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
 | ||||
|                                             KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_LALT | ||||
|                                         //`--------------------------'  `--------------------------'
 | ||||
|     ) | ||||
| }; | ||||
| 
 | ||||
| layer_state_t layer_state_set_user(layer_state_t state) { | ||||
|     return update_tri_layer_state(state, L_UPPER, L_RIGHT, L_UPPER_RIGHT); | ||||
| } | ||||
| 
 | ||||
| #ifdef OLED_ENABLE | ||||
| oled_rotation_t oled_init_user(oled_rotation_t rotation) { | ||||
|     if (!is_keyboard_master()) { | ||||
|         return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
 | ||||
|     } | ||||
|     return rotation; | ||||
| } | ||||
| 
 | ||||
| void oled_render_layer_state(void) { | ||||
|     // Host Keyboard Layer Status
 | ||||
|     oled_write_P(PSTR("Layer: "), false); | ||||
|     switch (get_highest_layer(layer_state)) { | ||||
|         case L_BASE: | ||||
|             oled_write_ln_P(PSTR("Default"), false); | ||||
|             break; | ||||
|         case L_UPPER: | ||||
|             oled_write_ln_P(PSTR("Upper"), false); | ||||
|             break; | ||||
|         case L_RIGHT: | ||||
|             oled_write_ln_P(PSTR("Right"), false); | ||||
|             break; | ||||
|         case L_UPPER_RIGHT: | ||||
|             oled_write_ln_P(PSTR("Upper Right"), false); | ||||
|             break; | ||||
|         default: | ||||
|             oled_write_ln_P(PSTR("Undefined"), false); | ||||
|     } | ||||
| 
 | ||||
|     // Host Keyboard LED Status
 | ||||
|     led_t led_state = host_keyboard_led_state(); | ||||
|     oled_write_ln_P(PSTR(""), false); | ||||
|     oled_write_ln_P(led_state.caps_lock ? PSTR("CAPS LOCK") : PSTR("         "), false); | ||||
| } | ||||
| 
 | ||||
| void render_bootmagic_status(bool status) { | ||||
|     /* Show Ctrl-Gui Swap options */ | ||||
|     static const char PROGMEM logo[][2][3] = { | ||||
|         {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}}, | ||||
|         {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}}, | ||||
|     }; | ||||
|     if (status) { | ||||
|         oled_write_ln_P(logo[0][0], false); | ||||
|         oled_write_ln_P(logo[0][1], false); | ||||
|     } else { | ||||
|         oled_write_ln_P(logo[1][0], false); | ||||
|         oled_write_ln_P(logo[1][1], false); | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| void oled_render_logo(void) { | ||||
|     static const char PROGMEM crkbd_logo[] = { | ||||
|         0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, | ||||
|         0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, | ||||
|         0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, | ||||
|         0}; | ||||
|     oled_write_P(crkbd_logo, false); | ||||
| } | ||||
| 
 | ||||
| bool oled_task_user(void) { | ||||
|     if (is_keyboard_master()) { | ||||
|         oled_render_layer_state(); | ||||
|     } else { | ||||
|         oled_render_logo(); | ||||
|     } | ||||
|     return false; | ||||
| } | ||||
| #endif // OLED_ENABLE
 | ||||
							
								
								
									
										13
									
								
								keyboards/crkbd/keymaps/ajarov/readme.md
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								keyboards/crkbd/keymaps/ajarov/readme.md
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,13 @@ | |||
| # Corne Spanish layout by ajarov | ||||
| 
 | ||||
|  | ||||
| 
 | ||||
| The OS keyboard layout should be set to Spanish so the above image matches the actual keys. | ||||
| 
 | ||||
| Some ideas that shaped this layout: | ||||
| * There are 4 layers: Base, Upper (`△`), Right (`▷`), and Upper Right (`△` + `▷`). | ||||
| * The base layer is almost the same as the one on the default Corne layout when the keyboard is set to Spanish on the OS (the only differences being `RShift` instead of `Esc`, and `LAlt` instead of `Alt Gr`). | ||||
| * When the Upper layer (`△`) is selected, the right hand resting position matches the one on the arrow keys on a traditional keyboard. | ||||
| * The right half of the keyboard can be used as a numpad with only the right hand by selecting the Right layer (`▷`). | ||||
| * The only keys missing from a full-size (105 keys) Spanish keyboard are the interpunct (`·` or `Shift` + `3`), `Scroll Lock`, and `Num Lock`. I never use them (does anybody?) and I'd rather not include them and risk toggling Scroll/Num Lock by accident. | ||||
| * Media keys are not present because I find it better to use keyboard + mouse shortcuts with [AutoHotkey](https://www.autohotkey.com/) (e.g: `Ctrl` + `Shift` + `Wheel Up`/`Wheel Down` increases/decreases the volume). | ||||
							
								
								
									
										5
									
								
								keyboards/crkbd/keymaps/ajarov/rules.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								keyboards/crkbd/keymaps/ajarov/rules.mk
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,5 @@ | |||
| MOUSEKEY_ENABLE = yes | ||||
| RGBLIGHT_ENABLE = yes | ||||
| OLED_ENABLE     = yes | ||||
| OLED_DRIVER     = SSD1306 | ||||
| LTO_ENABLE      = yes | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 QMK Bot
						QMK Bot