summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-10-23 06:31:24 +0000
committerQMK Bot <hello@qmk.fm>2021-10-23 06:31:24 +0000
commit4721b0eda239b4688f289409288282ec492d1199 (patch)
tree1d66a403a45e0207bbcb50a3c54e7916db713119
parent3aadf45668a49892c6b0612c5967c9fc01768403 (diff)
parenta167a95bd07adfa15c3837fdee9cee507e49ae06 (diff)
downloadqmk_firmware-4721b0eda239b4688f289409288282ec492d1199.tar.gz
qmk_firmware-4721b0eda239b4688f289409288282ec492d1199.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--layouts/community/ortho_5x12/riblee/keymap.c12
-rw-r--r--users/riblee/riblee.c6
2 files changed, 12 insertions, 6 deletions
diff --git a/layouts/community/ortho_5x12/riblee/keymap.c b/layouts/community/ortho_5x12/riblee/keymap.c
index b34217bff4..b722483759 100644
--- a/layouts/community/ortho_5x12/riblee/keymap.c
+++ b/layouts/community/ortho_5x12/riblee/keymap.c
@@ -189,17 +189,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+-------------+------+------+------+------+------|
* | | |Mu mod|Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| HUN |Wrkmn |
* |------+------+------+------+------+------|------+------+------+------+------+------|
- * | | | | | | | NKRO | Swap |Un swp|UC Mod| | |
+ * | | | | | | | NKRO | Mac |Linux | | | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
[_ADJUST] = LAYOUT_ortho_5x12(
- KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
- _______, RESET, DEBUG, _______, _______, _______, _______, TERM_ON, TERM_OFF,KC_INS, KC_PSCR, KC_DEL,
- _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, HUNGARIAN, WORKMAN,
- _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, UC_MOD, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
+ _______, RESET, DEBUG, _______, _______, _______, _______, TERM_ON, TERM_OFF, KC_INS, KC_PSCR, KC_DEL,
+ _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, HUNGARIAN, WORKMAN,
+ _______, _______, _______, _______, _______, _______, NK_TOGG, CG_NORM, CG_SWAP, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
}; \ No newline at end of file
diff --git a/users/riblee/riblee.c b/users/riblee/riblee.c
index ae3bd7a2b1..6f608f94f5 100644
--- a/users/riblee/riblee.c
+++ b/users/riblee/riblee.c
@@ -175,6 +175,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
return false;
break;
+ case CG_NORM:
+ set_unicode_input_mode(UC_MAC);
+ break;
+ case CG_SWAP:
+ set_unicode_input_mode(UC_LNX);
+ break;
}
return true;
};