138 lines
8.4 KiB
Plaintext
138 lines
8.4 KiB
Plaintext
[1mdiff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/josh/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/josh/config.h[m
|
||
[1mindex ac1f92810..99e2808cf 100644[m
|
||
[1m--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/josh/config.h[m
|
||
[1m+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/josh/config.h[m
|
||
[36m@@ -25,4 +25,4 @@[m
|
||
#define USE_SERIAL[m
|
||
#define EE_HANDS[m
|
||
#define TAPPING_TOGGLE 2[m
|
||
[31m-#define UNICODE_SELECTED_MODES UC_LNX, UC_WINC[m
|
||
[32m+[m[32m#define UNICODE_SELECTED_MODES UC_LNX, UC_WIN[m
|
||
[1mdiff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/josh/josh.json b/keyboards/handwired/dactyl_manuform/5x6/keymaps/josh/josh.json[m
|
||
[1mindex beb6bb093..6f99138f3 100644[m
|
||
[1m--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/josh/josh.json[m
|
||
[1m+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/josh/josh.json[m
|
||
[36m@@ -63,11 +63,11 @@[m
|
||
"KC_SPC",[m
|
||
"KC_SPC",[m
|
||
"KC_ENT",[m
|
||
[31m- "TG(4)",[m
|
||
[32m+[m[32m "KC_LGUI",[m
|
||
"TT(2)",[m
|
||
"KC_BSPC",[m
|
||
"KC_LALT",[m
|
||
[31m- "KC_LGUI",[m
|
||
[32m+[m[32m "TG(4)",[m
|
||
"KC_LSFT",[m
|
||
"KC_LCTL",[m
|
||
"MO(3)"[m
|
||
[36m@@ -253,8 +253,8 @@[m
|
||
"KC_TRNS",[m
|
||
"KC_TRNS",[m
|
||
"KC_LSFT",[m
|
||
[31m- "ANY(UNICODE_MODE_FORWARD)",[m
|
||
[31m- "ANY(UNICODE_MODE_REVERSE)",[m
|
||
[32m+[m[32m "ANY(UC_MOD)",[m
|
||
[32m+[m[32m "ANY(UC_RMOD)",[m
|
||
"KC_TRNS",[m
|
||
"KC_TRNS",[m
|
||
"KC_TRNS",[m
|
||
[36m@@ -271,6 +271,7 @@[m
|
||
"KC_TRNS"[m
|
||
],[m
|
||
[[m
|
||
[32m+[m[32m "KC_EQL",[m
|
||
"KC_NO",[m
|
||
"KC_1",[m
|
||
"KC_2",[m
|
||
[36m@@ -282,7 +283,7 @@[m
|
||
"KC_8",[m
|
||
"KC_9",[m
|
||
"KC_0",[m
|
||
[31m- "KC_EQL",[m
|
||
[32m+[m[32m "KC_MINS",[m
|
||
"KC_TAB",[m
|
||
"KC_Q",[m
|
||
"KC_W",[m
|
||
[36m@@ -294,7 +295,7 @@[m
|
||
"KC_I",[m
|
||
"KC_O",[m
|
||
"KC_P",[m
|
||
[31m- "KC_MINS",[m
|
||
[32m+[m[32m "KC_QUOT",[m
|
||
"KC_LSFT",[m
|
||
"KC_A",[m
|
||
"KC_S",[m
|
||
[36m@@ -306,7 +307,7 @@[m
|
||
"KC_K",[m
|
||
"KC_L",[m
|
||
"KC_SCLN",[m
|
||
[31m- "KC_QUOT",[m
|
||
[32m+[m[32m "KC_BSLS",[m
|
||
"KC_LCTL",[m
|
||
"KC_Z",[m
|
||
"KC_X",[m
|
||
[36m@@ -318,24 +319,23 @@[m
|
||
"KC_COMM",[m
|
||
"KC_DOT",[m
|
||
"KC_SLSH",[m
|
||
[31m- "KC_BSLS",[m
|
||
"KC_LBRC",[m
|
||
"KC_RBRC",[m
|
||
"KC_NO",[m
|
||
"KC_EQL",[m
|
||
[31m- "KC_ESC",[m
|
||
[31m- "KC_SPC",[m
|
||
[31m- "KC_SPC",[m
|
||
[31m- "KC_ENT",[m
|
||
"KC_TRNS",[m
|
||
[31m- "KC_NO",[m
|
||
[31m- "KC_BSPC",[m
|
||
[31m- "KC_NO",[m
|
||
[31m- "KC_NO",[m
|
||
[31m- "KC_NO",[m
|
||
[31m- "KC_NO",[m
|
||
[31m- "KC_NO"[m
|
||
[32m+[m[32m "KC_TRNS",[m
|
||
[32m+[m[32m "KC_TRNS",[m
|
||
[32m+[m[32m "KC_TRNS",[m
|
||
[32m+[m[32m "KC_TRNS",[m
|
||
[32m+[m[32m "KC_TRNS",[m
|
||
[32m+[m[32m "KC_TRNS",[m
|
||
[32m+[m[32m "KC_TRNS",[m
|
||
[32m+[m[32m "KC_TRNS",[m
|
||
[32m+[m[32m "KC_TRNS",[m
|
||
[32m+[m[32m "KC_TRNS",[m
|
||
[32m+[m[32m "KC_TRNS"[m
|
||
][m
|
||
],[m
|
||
"author": "Anonymous"[m
|
||
[31m-}[m
|
||
[32m+[m[32m}[m
|
||
\ No newline at end of file[m
|
||
[1mdiff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/josh/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/josh/keymap.c[m
|
||
[1mindex 069947476..5035bfe37 100644[m
|
||
[1m--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/josh/keymap.c[m
|
||
[1m+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/josh/keymap.c[m
|
||
[36m@@ -1,5 +1,6 @@[m
|
||
#include QMK_KEYBOARD_H[m
|
||
[m
|
||
[32m+[m
|
||
#include "unicode.h"[m
|
||
[m
|
||
/* THIS FILE WAS GENERATED![m
|
||
[36m@@ -9,9 +10,10 @@[m
|
||
*/[m
|
||
[m
|
||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[m
|
||
[31m- [0] = LAYOUT_5x6(KC_DLR, KC_AMPR, KC_LBRC, KC_LCBR, KC_RCBR, KC_LPRN, KC_EQL, KC_PAST, KC_RPRN, KC_PPLS, KC_RBRC, KC_EXLM, KC_TAB, KC_SCLN, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, MO(1), KC_QUOT, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, MO(1), KC_NO, KC_HASH, KC_BSLS, KC_AT, KC_ESC, KC_SPC, KC_SPC, KC_ENT, TG(4), TT(2), KC_BSPC, KC_LALT, KC_LGUI, KC_LSFT, KC_LCTL, MO(3)),[m
|
||
[32m+[m [32m[0] = LAYOUT_5x6(KC_DLR, KC_AMPR, KC_LBRC, KC_LCBR, KC_RCBR, KC_LPRN, KC_EQL, KC_PAST, KC_RPRN, KC_PPLS, KC_RBRC, KC_EXLM, KC_TAB, KC_SCLN, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, MO(1), KC_QUOT, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, MO(1), KC_NO, KC_HASH, KC_BSLS, KC_AT, KC_ESC, KC_SPC, KC_SPC, KC_ENT, KC_LGUI, TT(2), KC_BSPC, KC_LALT, TG(4), KC_LSFT, KC_LCTL, MO(3)),[m
|
||
[1] = LAYOUT_5x6(KC_TILD, KC_PERC, KC_7, KC_5, KC_3, KC_1, KC_9, KC_0, KC_2, KC_4, KC_6, KC_8, KC_TRNS, LSFT(KC_SCLN), LSFT(KC_COMM), LSFT(KC_DOT), LSFT(KC_P), LSFT(KC_Y), LSFT(KC_F), LSFT(KC_G), LSFT(KC_C), LSFT(KC_R), LSFT(KC_L), LSFT(KC_SLSH), KC_TRNS, LSFT(KC_A), LSFT(KC_O), LSFT(KC_E), LSFT(KC_U), LSFT(KC_I), LSFT(KC_D), LSFT(KC_H), LSFT(KC_T), LSFT(KC_N), LSFT(KC_S), LSFT(KC_MINS), KC_TRNS, LSFT(KC_QUOT), LSFT(KC_Q), LSFT(KC_J), LSFT(KC_K), LSFT(KC_X), LSFT(KC_B), LSFT(KC_M), LSFT(KC_W), LSFT(KC_V), LSFT(KC_Z), KC_TRNS, KC_TRNS, KC_GRV, LSFT(KC_BSLS), KC_CIRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),[m
|
||
[2] = LAYOUT_5x6(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_PGUP, KC_UP, KC_PGDN, KC_VOLU, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_MPRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_PSCR, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, OSM(MOD_LSFT), OSM(MOD_LCTL), KC_TRNS, KC_TRNS, KC_TRNS, OSM(MOD_LALT), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),[m
|
||
[31m- [3] = LAYOUT_5x6(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, XP(SMALL_A_DIAERESIS, CAPITAL_A_DIAERESIS), XP(SMALL_O_DIAERESIS, CAPITAL_O_DIAERESIS), XP(SMALL_O_TILDE, CAPITAL_O_TILDE), XP(SMALL_U_DIAERESIS, CAPITAL_U_DIAERESIS), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LSFT, UNICODE_MODE_FORWARD, UNICODE_MODE_REVERSE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),[m
|
||
[31m- [4] = LAYOUT_5x6(KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, KC_LBRC, KC_RBRC, KC_NO, KC_EQL, KC_ESC, KC_SPC, KC_SPC, KC_ENT, KC_TRNS, KC_NO, KC_BSPC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)[m
|
||
[32m+[m [32m[3] = LAYOUT_5x6(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, XP(SMALL_A_DIAERESIS, CAPITAL_A_DIAERESIS), XP(SMALL_O_DIAERESIS, CAPITAL_O_DIAERESIS), XP(SMALL_O_TILDE, CAPITAL_O_TILDE), XP(SMALL_U_DIAERESIS, CAPITAL_U_DIAERESIS), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LSFT, UC_MOD, UC_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),[m
|
||
[32m+[m [32m[4] = LAYOUT_5x6(KC_EQL, KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_QUOT, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_BSLS, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LBRC, KC_RBRC, KC_NO, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)[m
|
||
};[m
|
||
[41m+[m
|