Compare commits

..

No commits in common. "1-add-unicode-input-method-switching-option" and "master" have entirely different histories.

2 changed files with 4 additions and 6 deletions

View File

@ -56,4 +56,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
#define UNICODE_KEY_LNX LCTL(LSFT(KC_U)) #define UNICODE_KEY_LNX LCTL(LSFT(KC_U))
#define UNICODE_SELECTED_MODES UC_LNX, UC_WINC #define UNICODE_SELECTED_MODES UC_LNX

View File

@ -26,7 +26,6 @@ enum unicode_names {
E_ACUTE, E_ACUTE,
E_GRAVE, E_GRAVE,
U_GRAVE, U_GRAVE,
C_CEDIL,
A_AELIG, A_AELIG,
A_RING, A_RING,
O_SLASH O_SLASH
@ -37,7 +36,6 @@ const uint32_t PROGMEM unicode_map[] = {
[E_ACUTE] = 0x00E9, [E_ACUTE] = 0x00E9,
[E_GRAVE] = 0x00E8, [E_GRAVE] = 0x00E8,
[U_GRAVE] = 0x00F9, [U_GRAVE] = 0x00F9,
[C_CEDIL] = 0x00E7,
[A_AELIG] = 0x00E6, [A_AELIG] = 0x00E6,
[A_RING] = 0x00E5, [A_RING] = 0x00E5,
[O_SLASH] = 0x00F8 [O_SLASH] = 0x00F8
@ -61,9 +59,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,-----------------------------------------------------. ,-----------------------------------------------------. //,-----------------------------------------------------. ,-----------------------------------------------------.
KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
KC_LSFT,X(A_GRAVE),X(E_GRAVE), X(E_ACUTE), X(U_GRAVE), X(C_CEDIL), KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, XXXXXXX, XXXXXXX, KC_LSFT,X(A_GRAVE),X(E_GRAVE), X(E_ACUTE), X(U_GRAVE), XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
KC_LCTL, X(A_AELIG), X(A_RING), X(O_SLASH), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RCTL, KC_LCTL, X(A_AELIG), X(A_RING), X(O_SLASH), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
KC_LGUI, _______, KC_SPC, KC_ENT, MO(3), KC_RALT KC_LGUI, _______, KC_SPC, KC_ENT, MO(3), KC_RALT
//`--------------------------' `--------------------------' //`--------------------------' `--------------------------'
@ -87,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_RMOD, UC_MOD, KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RALT KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RALT
//`--------------------------' `--------------------------' //`--------------------------' `--------------------------'