From bbe553dba34b6d04fbd54d71dbc58cb85dcb8bff Mon Sep 17 00:00:00 2001 From: Roman Zolotarev Date: Wed, 16 Mar 2016 00:43:45 +0800 Subject: Add Roman's Layout Four layers BASE (Norman), SYMB, PLVR (optimized for Plover), ARRW. --- .../keyboard-layout-editor/arrw.json | 27 + .../keyboard-layout-editor/arrw.png | Bin 0 -> 96737 bytes .../keyboard-layout-editor/base.json | 26 + .../keyboard-layout-editor/base.png | Bin 0 -> 129028 bytes .../keyboard-layout-editor/plvr.json | 26 + .../keyboard-layout-editor/plvr.png | Bin 0 -> 102077 bytes .../keyboard-layout-editor/symb.json | 27 + .../keyboard-layout-editor/symb.png | Bin 0 -> 105763 bytes .../romanzolotarev-norman-plover-osx/keymap.c | 145 +++ .../romanzolotarev-norman-plover-osx/readme.md | 51 + .../romanzolotarev-norman-plover-osx.hex | 1132 ++++++++++++++++++++ 11 files changed, 1434 insertions(+) create mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.json create mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.png create mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.json create mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.png create mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.json create mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.png create mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.json create mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.png create mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c create mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md create mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.hex (limited to 'keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx') diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.json b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.json new file mode 100644 index 000000000..814e1cc2a --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.json @@ -0,0 +1,27 @@ +[{x:3.5,c:"#eeeeee",a:7},"",{x:10.5},""], +[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""], +[{y:-0.875,x:5.5},"","",{x:4.5},"",""], +[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""], +[{y:-0.375,x:3.5,a:5,fa:[0,2,0,0,0,0,2]},"\nmouse\n\n\n\n\nUP",{x:10.5,a:7,fa:[2]},"UP"], +[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""], +[{y:-0.875,x:5.5},"",{h:1.5},"",{x:4.5,h:1.5},"",""], +[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""], +[{y:-0.375,x:3.5,a:5,fa:[2,2,0,0,0,0,2]},"\nmouse\n\n\n\n\nDOWN",{x:10.5,a:7},"DOWN"], +[{y:-0.875,x:2.5,a:5,fa:[2,1,0,0,0,0,2]},"\nmouse\n\n\n\n\nLEFT",{x:1,fa:[2,2,0,0,0,0,2]},"\nmouse\n\n\n\n\nRIGHT",{x:8.5,a:7},"LEFT",{x:1},"RIGHT"], +[{y:-0.875,x:5.5},"",{x:6.5},""], +[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""], +[{y:-0.625,x:6.5,h:1.5},"",{x:4.5,h:1.5},""], +[{y:-0.75,x:3.5},"",{x:10.5},""], +[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""], +[{y:-0.875,x:5.5},"",{x:6.5},""], +[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""], +[{y:-0.375,x:3.5,a:5,fa:[2,1,0,0,0,0,2]},"\nclick\n\n\n\n\nLEFT",{x:10.5,a:7},""], +[{y:-0.875,x:2.5},"",{x:1,a:5},"\nclick\n\n\n\n\nRIGHT",{x:8.5,a:7},"",{x:1},""], +[{y:-0.75,x:0.5},"","",{x:14.5},"",""], +[{r:30,rx:6.5,ry:4.25,y:-1,x:1},"",""], +[{h:2},"",{h:2},"",""], +[{x:2},""], +[{r:-30,rx:13,y:-1,x:-3},"",""], +[{x:-3},"",{h:2},"",{h:2},""], +[{x:-3},""] + diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.png b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.png new file mode 100644 index 000000000..e2e5779b5 Binary files /dev/null and b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.png differ diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.json b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.json new file mode 100644 index 000000000..9e6fc3733 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.json @@ -0,0 +1,26 @@ +[{x:3.5,c:"#eeeeee",a:5,fa:[5,7,0,0,0,0,0]},"#\n3",{x:10.5},"*\n8"], +[{y:-0.875,x:2.5},"@\n2",{x:1},"$\n4",{x:8.5},"&\n7",{x:1},"(\n9"], +[{y:-0.875,x:5.5},"%\n5",{a:7},"",{x:4.5},"",{a:5},"^\n6"], +[{y:-0.875,w:1.5},"~\n`","!\n1",{x:14.5},")\n0",{w:1.5},"+\n="], +[{y:-0.375,x:3.5,c:"#cccccc",a:7,fa:[7]},"D",{x:10.5},"R"], +[{y:-0.875,x:2.5,c:"#eeeeee"},"W",{x:1,c:"#cccccc"},"F",{x:8.5,c:"#eeeeee"},"U",{x:1,c:"#cccccc"},"L"], +[{y:-0.875,x:5.5},"K",{c:"#eeeeee",a:5,fa:[5,0,0,0,0,0,7],h:1.5},"|\n\n\n\n\n\n\\",{x:4.5,h:1.5},"?\n\n\n\n\n\n/",{c:"#cccccc",a:7,fa:[7]},"J"], +[{y:-0.875,c:"#eeeeee",fa:[2],w:1.5},"TAB",{fa:[7]},"Q",{x:14.5,c:"#cccccc",a:5,fa:[5,7,0,0,0,0,0]},":\n;",{c:"#eeeeee",w:1.5},"_\n-"], +[{y:-0.375,x:3.5,c:"#cccccc",a:7,fa:[7]},"E",{x:10.5},"I"], +[{y:-0.875,x:2.5,c:"#eeeeee"},"S",{x:1,c:"#cccccc"},"T",{x:8.5},"N",{x:1},"O"], +[{y:-0.875,x:5.5,c:"#eeeeee"},"G",{x:6.5,c:"#cccccc"},"Y"], +[{y:-0.875,c:"#eeeeee",a:5,fa:[7,2,0,0,0,0,2],w:1.5},"\nESC\n\n\n\n\nCTRL",{a:7},"A",{x:14.5,c:"#cccccc"},"H",{c:"#eeeeee",fa:[2],w:1.5},"ENTER"], +[{y:-0.625,x:6.5,a:5,fa:[5,0,0,0,0,0,7],h:1.5},"{\n\n\n\n\n\n[",{x:4.5,h:1.5},"}\n\n\n\n\n\n]"], +[{y:-0.75,x:3.5,a:7,fa:[7]},"C",{x:10.5,a:5,fa:[5,7,0,0,0,0,0]},"<\n,"], +[{y:-0.875,x:2.5,a:7,fa:[7]},"X",{x:1},"V",{x:8.5},"M",{x:1,a:5,fa:[5,7,0,0,0,0,0]},">\n."], +[{y:-0.875,x:5.5,a:7,fa:[7]},"B",{x:6.5,c:"#cccccc"},"P"], +[{y:-0.875,c:"#eeeeee",fa:[2],w:1.5},"SHIFT",{fa:[7]},"Z",{x:14.5,a:5,fa:[5,7,0,0,0,0,0]},"?\n/",{a:7,fa:[2],w:1.5},"SHIFT"], +[{y:-0.375,x:3.5},"ALT",{x:10.5},"ALT"], +[{y:-0.875,x:2.5},"",{x:1},"CMD",{x:8.5},"CTRL",{x:1},""], +[{y:-0.75,x:0.5,f:3},"L2","",{x:14.5},"",""], +[{r:30,rx:6.5,ry:4.25,y:-1,x:1},"VOL-","MUTE"], +[{h:2},"BS",{h:2},"ESC","VOL+"], +[{x:2},"~L1"], +[{r:-30,rx:13,y:-1,x:-3},"PLAY","NEXT"], +[{x:-3},"PREV",{a:5,fa:[5,0,0,0,0,0,7],h:2},"\"\n\n\n\n\n\n'",{a:7,fa:[2],h:2},"SPACE"], +[{x:-3},"~L3"] diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.png b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.png new file mode 100644 index 000000000..0b8539cfa Binary files /dev/null and b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.png differ diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.json b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.json new file mode 100644 index 000000000..5c3f0b8a2 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.json @@ -0,0 +1,26 @@ +[{x:3.5,c:"#eeeeee",a:7},"",{x:10.5},""], +[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""], +[{y:-0.875,x:5.5},"","",{x:4.5},"",""], +[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""], +[{y:-0.375,x:3.5,fa:[7]},"3",{x:10.5},"8"], +[{y:-0.875,x:2.5},"2",{x:1},"4",{x:8.5},"7",{x:1},"9"], +[{y:-0.875,x:5.5},"5",{h:1.5},"",{x:4.5,h:1.5},"","6"], +[{y:-0.875,w:1.5},"","1",{x:14.5},"0",{w:1.5},""], +[{y:-0.375,x:3.5},"E",{x:10.5},"I"], +[{y:-0.875,x:2.5},"W",{x:1},"R",{x:8.5},"U",{x:1},"O"], +[{y:-0.875,x:5.5},"T",{x:6.5},"Y"], +[{y:-0.875,w:1.5},"","Q",{x:14.5},"P",{w:1.5},"["], +[{y:-0.625,x:6.5,h:1.5},"",{x:4.5,h:1.5},""], +[{y:-0.75,x:3.5},"D",{x:10.5},"K"], +[{y:-0.875,x:2.5},"S",{x:1},"F",{x:8.5},"J",{x:1},"L"], +[{y:-0.875,x:5.5},"G",{x:6.5},"H"], +[{y:-0.875,w:1.5},"","A",{x:14.5},";",{w:1.5},"'"], +[{y:-0.375,x:3.5},"",{x:10.5},""], +[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""], +[{y:-0.75,x:0.5},"","",{x:14.5},"",""], +[{r:30,rx:6.5,ry:4.25,y:-1,x:1},"",""], +[{h:2},"C",{h:2},"V",""], +[{x:2},""], +[{r:-30,rx:13,y:-1,x:-3},"",""], +[{x:-3},"",{h:2},"N",{h:2},"M"], +[{x:-3},""] diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.png b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.png new file mode 100644 index 000000000..f8d38204f Binary files /dev/null and b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.png differ diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.json b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.json new file mode 100644 index 000000000..ccd1d74e4 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.json @@ -0,0 +1,27 @@ +[{x:3.5,c:"#eeeeee",a:7,fa:[7]},"F3",{x:10.5},"F8"], +[{y:-0.875,x:2.5},"F2",{x:1},"F4",{x:8.5},"F7",{x:1},"F9"], +[{y:-0.875,x:5.5},"F5","",{x:4.5},"","F6"], +[{y:-0.875,w:1.5},"","F1",{x:14.5},"F10",{w:1.5},"F11"], +[{y:-0.375,x:3.5},"{",{x:10.5},"8"], +[{y:-0.875,x:2.5},"@",{x:1},"}",{x:8.5},"7",{x:1},"9"], +[{y:-0.875,x:5.5},"|",{h:1.5},"",{x:4.5,h:1.5},"",{fa:[2]},"UP"], +[{y:-0.875,w:1.5},"",{fa:[7]},"!",{x:14.5},"*",{w:1.5},"F12"], +[{y:-0.375,x:3.5},"(",{x:10.5},"5"], +[{y:-0.875,x:2.5},"$",{x:1},")",{x:8.5},"4",{x:1},"6"], +[{y:-0.875,x:5.5},"`",{x:6.5,fa:[2]},"DOWN"], +[{y:-0.875,w:1.5},"",{fa:[7]},"#",{x:14.5},"+",{w:1.5},""], +[{y:-0.625,x:6.5,h:1.5},"",{x:4.5,h:1.5},""], +[{y:-0.75,x:3.5},"[",{x:10.5},"2"], +[{y:-0.875,x:2.5},"^",{x:1},"]",{x:8.5},"1",{x:1},"3"], +[{y:-0.875,x:5.5},"~",{x:6.5},"&"], +[{y:-0.875,w:1.5},"","%",{x:14.5},"\\",{w:1.5},""], +[{y:-0.375,x:3.5},"",{x:10.5},"."], +[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},"0"], +[{y:-0.75,x:0.5},"","",{x:14.5},"=",""], +[{r:30,rx:6.5,ry:4.25,y:-1,x:1},"",""], +[{h:2},"",{h:2},"",""], +[{x:2},""], +[{r:-30,rx:13,y:-1,x:-3},"",""], +[{x:-3},"",{h:2},"",{h:2},""], +[{x:-3},""] + diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.png b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.png new file mode 100644 index 000000000..83dc2242b Binary files /dev/null and b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.png differ diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c new file mode 100644 index 000000000..36526bf2a --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c @@ -0,0 +1,145 @@ +#include "ergodox_ez.h" +#include "debug.h" +#include "action_layer.h" + +#define BASE 0 +#define SYMB 1 +#define PLVR 2 +#define ARRW 3 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [BASE] = KEYMAP( + // + KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, + KC_TAB, KC_Q, KC_W, KC_D, KC_F, KC_K, KC_BSLS, + CTL_T(KC_ESC), KC_A, KC_S, KC_E, KC_T, KC_G, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, + TG(PLVR), KC_TRNS, KC_TRNS, KC_LALT, KC_LGUI, + /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_VOLU, KC_MUTE, + /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_VOLD, + /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_BSPC, KC_ESC, KC_FN1, + // + /*-*/ KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, + /*-*/ KC_SLSH, KC_J, KC_U, KC_R, KC_L, KC_SCLN, KC_MINS, + /*-*/ /*-*/ KC_Y, KC_N, KC_I, KC_O, KC_H, KC_ENT, + /*-*/ KC_RBRC, KC_P, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + /*-*/ /*-*/ /*-*/ KC_RCTL, KC_RALT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_MPLY, KC_MNXT, + KC_MPRV, + KC_FN3, KC_QUOT, KC_SPC + // + ), + // + [SYMB] = KEYMAP( + // + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, + KC_TRNS, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS, + KC_TRNS, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, + KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, 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_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + /*-*/ KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, + /*-*/ /*-*/ KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, + /*-*/ KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, + /*-*/ /*-*/ /*-*/ KC_TRNS, KC_DOT, KC_0, KC_EQL, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS + // + ), + // + [PLVR] = KEYMAP( + // + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO, + KC_NO, KC_Q, KC_W, KC_E, KC_R, KC_T, + KC_NO, KC_A, KC_S, KC_D, KC_F, KC_G, KC_NO, + KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, + /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS, KC_TRNS, + /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS, + /*-*/ /*-*/ /*-*/ /*-*/ KC_C, KC_V, KC_NO, + // + /*-*/ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + /*-*/ KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, + /*-*/ /*-*/ KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, + /*-*/ KC_NO, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + /*-*/ /*-*/ /*-*/ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_NO, KC_N, KC_M + // + ), + // + [ARRW] = KEYMAP( + // + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, + /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ 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_UP, KC_TRNS, KC_TRNS, KC_TRNS, + /*-*/ /*-*/ KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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 + // + ), +}; + +const uint16_t PROGMEM fn_actions[] = { + [SYMB] = ACTION_LAYER_TAP_TOGGLE(SYMB), // FN1 - Momentary Symbols Layer + [PLVR] = ACTION_LAYER_TAP_TOGGLE(PLVR), // FN2 - Momentary Plover Layer + [ARRW] = ACTION_LAYER_TAP_TOGGLE(ARRW), // FN3 - Momentary Arrows Layer +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + switch(id) { + case 0: + if (record->event.pressed) { + register_code(KC_RSFT); + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; + +// Runs just one time when the keyboard initializes. +void * matrix_init_user(void) { +}; + +// Runs constantly in the background, in a loop. +void * matrix_scan_user(void) { + uint8_t layer = biton32(layer_state); + ergodox_board_led_off(); + ergodox_right_led_1_off(); + ergodox_right_led_2_off(); + ergodox_right_led_3_off(); + switch (layer) { + case SYMB: + ergodox_right_led_1_on(); + break; + case PLVR: + ergodox_right_led_2_on(); + break; + case ARRW: + ergodox_right_led_3_on(); + break; + default: + break; + } +}; diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md new file mode 100644 index 000000000..8b03e3323 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md @@ -0,0 +1,51 @@ +# Roman's Layout + +There are four layers: + +- **BASE** is [Norman layout](https://normanlayout.info/). +- **PLVR** is optimized for [Plover](http://www.openstenoproject.org). +- **SYMB** for numbers and symbols. +- **ARRW** for navigation. + +## Switching + +- Tap `~L1` to toggle **SYMB**. +- Tap `~L3` to toggle **ARRW**. +- Hold `~L1` (or `~L3`) to activate **SYMB** (or **ARRW**) while holding. +- Tap `L2` to toggle **PLVR**. + +## LEDs + +- Red: SYMB is on. +- Green: PLVR is on. +- Blue: ARRW is on. + +## CTRL/ESC + +Both of those keys are frequently used in Vim. + +- Tap `CTRL/ESC` to send `ESC`. +- Hold `CTRL/ESC` to use as `CTRL`. + +## Activate N-rollover + +- While in **BASE** hold left `SHIFT` and right `SHIRT` and then tap `N`. +- Then you can activate **PLVR** and use ErgoDox EZ for steno. + +## Layers + +BASE + +![base](keyboard-layout-editor/base.png) + +SYMB + +![symb](keyboard-layout-editor/symb.png) + +PLVR + +![plvr](keyboard-layout-editor/plvr.png) + +ARRW + +![arrw](keyboard-layout-editor/arrw.png) diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.hex b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.hex new file mode 100644 index 000000000..eeb0eb935 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.hex @@ -0,0 +1,1132 @@ +:100000000C94BB020C94FF020C94FF020C94FF02B0 +:100010000C94FF020C94FF020C94FF020C94FF025C +:100020000C94FF020C94FF020C941C0C0C94EE0C2C +:100030000C94FF020C94FF020C94FF020C94FF023C +:100040000C94FF020C9473210C94FF020C94FF0299 +:100050000C94FF020C94041B0C94FF020C94FF02FE +:100060000C94FF020C94FF020C94FF020C94FF020C +:100070000C94FF020C94FF020C94FF020C94FF02FC +:100080000C94FF020C94FF020C94FF020C94FF02EC +:100090000C94FF020C94FF020C94FF020C94FF02DC +:1000A0000C94FF020C94FF020C94FF025B0D7D0D7B +:1000B0006B0E7D0D6B0EC20DE50D6B0E3A0E4D0EE7 +:1000C0002F112F115E115E11A111DF11F813F8131A +:1000D000F811F813F912F912CC13F813F813E3130B +:1000E0000000F0A1F0A2F0A335022B002971E1007D +:1000F000025400001E00140004001D000100C10095 +:100100001F001A0016001B00010029002000070034 +:1001100008000600E2002A0021000900170019006B +:10012000E300AA0022000E000A0005000000A9005A +:100130000100310000002F000000A800010038007D +:10014000000030000000AE0023000D001C00130072 +:100150000000AB002400180011001000E400AC0007 +:10016000250015000C003600E6002C0026000F00CC +:100170001200370001003400270033000B00380064 +:100180000100C3002E002D002800E5000100000042 +:100190000100010001000100010000003A001E0200 +:1001A00020022202010001003B001F022102230263 +:1001B000010001003C002F0226022F000100010077 +:1001C0003D00300227023000010001003E003102F4 +:1001D00035003502000001000100010000000100AF +:1001E000000001000100010000000100000001000A +:1001F0003F00520051002402000001004000240092 +:1002000021001E00010001004100250022001F0006 +:1002100037000100420026002300200027000100D3 +:10022000430025022E0231002E000100440045004B +:1002300001000100010000000000000000000000BB +:100240000100000000001E00140004000100000076 +:1002500000001F001A001600010019000000200015 +:10026000080007000000060000002100150009003A +:10027000000001000000220017000A000000010039 +:10028000000000000000000000000100000000006D +:100290000000000000000100000023001C000B0013 +:1002A000000001000000240018000D000000010003 +:1002B000000025000C000E000000100000002600C9 +:1002C00012000F000000110000002700130033008F +:1002D00000000000000000002F00340000000000BB +:1002E0000100010001000100010000000100010007 +:1002F000010001000100010001000100F200010005 +:10030000010001000100F000F1000100F400010013 +:1003100001000100F3000100F500010001000100EF +:1003200001000100000001000100010000000100C7 +:1003300000000100010001000000010000000100B8 +:1003400001000100010001000000010001000100A6 +:1003500050000100010001000100520051000100A5 +:1003600001000100010001004F0001000100010037 +:100370000100010001000100010001000100010075 +:100380000100010001000000160345007200670033 +:100390006F0044006F007800200045005A00000004 +:1003A00016034500720067006F0044006F0078007C +:1003B000200045005A0000000403090409026D00F2 +:1003C000040100A0FA090400000103010100092151 +:1003D00011010001223F000705810308000A0904FA +:1003E00001000103010200092111010001224D0059 +:1003F0000705820308000A09040200010300000047 +:100400000921110100012236000705830308000AB3 +:100410000904030001030000000921110100012269 +:1004200039000705840310000112011001000000CB +:1004300008EDFE071301000102000105010906A1F4 +:1004400001050719E029E7150025019508750181C7 +:100450000205081901290595057501910295017597 +:100460000391010507190029771500250195787575 +:10047000018102C005010980A10185021601002643 +:10048000B7001A01002AB700751095018100C00558 +:100490000C0901A1018503160100269C021A010026 +:1004A0002A9C02751095018100C005010902A10175 +:1004B0000901A10005091901290515002501950566 +:1004C000750181029501750381010501093009312A +:1004D0001581257F95027508810609381581257FCC +:1004E000950175088106050C0A38021581257F954E +:1004F0000175088106C0C005010906A1010507199B +:10050000E029E7150025019508750181029501751F +:1005100008810105081901290595057501910295C4 +:1005200001750391010507190029FF150025FF95A5 +:100530000675088100C000000000000000000000F7 +:1005400000010204060A0F17202C3A4A5D71879DAC +:10055000B3C7DAE9F5FCFFFCF5E9DAC7B39D8771AB +:100560005D4A3A2C20170F0A060402010000000021 +:1005700000000000000011241FBECFEFDAE0DEBF54 +:10058000CDBF04B603FE24C08091EE019091EF012F +:10059000A091F001B091F1018730904BA740B04B92 +:1005A000B9F41092EE011092EF011092F001109246 +:1005B000F10114BE84B7877F84BF88E10FB6F89439 +:1005C00080936000109260000FBEE0E0FFE30995A9 +:1005D00011E0A0E0B1E0EAE6F6E402C005900D9279 +:1005E000A433B107D9F711E0A4E3B1E001C01D9233 +:1005F000AE3EB107E1F70E9460090C9433230C94DE +:10060000000061110BC0FC018281882321F085EE7E +:100610000E94CC0F03C085EE0E94941080E090E011 +:10062000089508956091B1017091B2018091B30174 +:100630009091B4010E94331A56985E9825982D988F +:1006400026982E9827982F98823039F0833041F0E1 +:10065000813041F4259A2D9A0895269A2E9A08956C +:10066000279A2F9A089582E193E0892B11F00E9436 +:10067000120380E090E0089556985E9825982D9892 +:1006800026982E9827982F988FEF90E090938900C6 +:100690008093880090938B0080938A0090938D00C4 +:1006A00080938C00259A2D9A2FEF80E792E02150BD +:1006B00080409040E1F700C00000269A2E9A2FEF6C +:1006C00080E792E0215080409040E1F700C00000B8 +:1006D000279A2F9A2FEF80E792E021508040904098 +:1006E000E1F700C0000025982D982FEF80E792E0F9 +:1006F000215080409040E1F700C0000026982E98DD +:100700002FEF80E792E0215080409040E1F700C059 +:10071000000027982F9856985E9825982D9826982F +:100720002E9827982F98089589EA8093800089E071 +:100730008093810024982C983F988AB18F748AB94D +:100740006E98479A8BB1806B8BB9769A0E943C0366 +:1007500081E193E0892B11F00E94110380E090E089 +:10076000089580E2809300018091340181110EC0D0 +:100770000E94000481E0809334012FEF83ED90E329 +:10078000215080409040E1F700C0000080E40E94CA +:1007900006048093000181112EC00E9430048093D2 +:1007A0000001811128C00E94300480930001811152 +:1007B00022C08FE30E9430048093000181111BC08E +:1007C0000E94280480E40E940604809300018111A5 +:1007D00012C08CE00E9430048093000181110BC094 +:1007E0000E94300480930001811105C08FE30E94B4 +:1007F0003004809300010E94280480910001089534 +:100800001092B9008AE08093B800089594EA90931A +:10081000BC009091BC0097FFFCCF9091B900987FED +:10082000983021F0903111F081E008958093BB0061 +:1008300084E88093BC008091BC0087FFFCCF80914E +:10084000B900887F883111F0803471F780E0089515 +:1008500084E98093BC008091BC0084FDFCCF0895A6 +:100860008093BB0084E88093BC008091BC0087FF2C +:10087000FCCF9091B900987F81E0983209F480E034 +:10088000089584E88093BC008091BC0087FFFCCF72 +:100890008091BB00089580910001811115C080E412 +:1008A0000E9406048093000181110CC082E10E9425 +:1008B000300480930001811105C08FEF0E94300445 +:1008C000809300010E94280484B1807F84B985B19F +:1008D000807F85B98AB1837F8AB98BB1837F8BB9D9 +:1008E0003E98469808950E94B103809300010E94AB +:1008F0004B0480B38C7080BB81B3836F81BBA6E354 +:10090000B1E0E4E4F1E08EE08E0F11921D928E13BF +:10091000FCCF84E993E0892B11F00C9494030895A3 +:10092000BF92CF92DF92EF92FF920F931F93CF93DC +:10093000DF9380910001882379F0809135018F5FEA +:1009400080933501811108C00E94B103809300019A +:10095000811102C00E943C0306E311E0C0E0D0E038 +:10096000DD24D39482E0C82EEE24E394F12CC7302A +:10097000D10500F580910001811164C080E40E94DE +:10098000060480930001811112C082E10E943004AC +:100990008093000181110BC0C7010C2E01C0880F8C +:1009A0000A94EAF780950E943004809300010E9427 +:1009B000280448C0CA30A1F028F4C83059F0C93022 +:1009C00061F005C0CC3089F070F0CD3089F0209A0C +:1009D000289810C0219A29980DC0229A2A980AC0F6 +:1009E000239A2B9807C0529A01C0539A5B9802C071 +:1009F0003E9A469890EA9A95F1F79FB1799902C08C +:100A000082E001C080E091709D25982B7C9902C006 +:100A100084E001C080E0892B7D9902C038E001C0EC +:100A200030E0832B7E9902C020E101C020E0822BC0 +:100A30009FB19095991F9927991F9295990F907E34 +:100A4000892B0FC08091000181114FC080E40E946A +:100A50000604809300018823A9F1B12C0E94280488 +:100A60008B2DF8019081981719F08083C0920101B5 +:100A70000E944B0421960F5F1F4FCE30D10509F025 +:100A800076CF809101018823B1F0815080930101DC +:100A9000882339F08FE99FE00197F1F700C000004B +:100AA0000AC0A4E4B1E0E6E3F1E0CF01825F9191F6 +:100AB0009D938E13FCCF83E393E0892BC1F00E94BA +:100AC000330315C083E10E9430048093000181113B +:100AD000C4CF81E40E940604809300018111BDCF40 +:100AE0000E944104B82EB094B9CF80E0BACF81E023 +:100AF000DF91CF911F910F91FF90EF90DF90CF90FA +:100B0000BF900895E82FF0E0EC5BFE4F80810895E0 +:100B100008958B3B910578F4883A910540F5853A24 +:100B20009105D0F48430910508F0B1C08130910571 +:100B300009F4ADC06BC0803E910508F467C0883EE3 +:100B4000910508F4A4C09C01205F310920313105D2 +:100B500008F05CC090650895853A910509F459C084 +:100B6000863A910509F058C082E890E40895883AE1 +:100B7000910509F454C0893A910509F453C08A3AA1 +:100B8000910509F452C08B3A910509F451C08C3A91 +:100B9000910509F450C08D3A910509F44FC0803B8E +:100BA000910509F44EC08E3A910509F44DC08F3A73 +:100BB000910509F44CC0813B910509F44BC0823B7F +:100BC000910509F44AC0833B910509F449C0843B6F +:100BD000910509F448C0853B910509F447C0863B5F +:100BE000910509F446C0873B910509F445C0883B4F +:100BF000910509F444C0893B910509F443C08A3B3F +:100C0000910509F442C080E094E4089580E090E00A +:100C1000089581E890E4089583E890E4089582EED1 +:100C200094E4089589EE94E408958AEE94E4089596 +:100C300085EB94E4089586EB94E4089587EB94E4BF +:100C400008958CEC94E408958DEC94E4089583E881 +:100C500095E408958AE895E4089582E995E4089575 +:100C600084E995E4089581E296E4089583E296E4A8 +:100C7000089584E296E4089585E296E4089586E274 +:100C800096E4089587E296E408958AE296E408954A +:100C9000089596E0799FF001112494E5899FE00D75 +:100CA000F11D1124E60FF11DEE0FFF1FE851FF4F5C +:100CB000859194910895880F991FFC01E05AF040A6 +:100CC000859194910895880F991FFC01E052FF4F80 +:100CD00085919491089526E0729FF001112444E5D6 +:100CE000849FE00DF11D1124E60FF11DEE0FFF1F93 +:100CF000E851FF4F859194919C013A9521154FE160 +:100D0000340708F41AC13F512115304120F49F7077 +:100D10000E94630608959C0130532115304118F458 +:100D20009927906C0895811520E5920769F40E9437 +:100D30001A144FEF84E39CE0415080409040E1F76B +:100D400000C000000C94291B813020E5920731F48B +:100D50008091CC0181608093CC0108959C01305535 +:100D60002115304108F051C0292F33272F70332728 +:100D700021303105D9F4AC014370552702C0220F50 +:100D8000331F4A95E2F73C68AC0164E0440F551FFD +:100D90006A95E1F744275370242B352B73E0880FB5 +:100DA000991F7A95E1F7807699271DC02230310589 +:100DB00029F4982F8827816F906A08952330310590 +:100DC000A9F4AC014370552721E030E002C0220FA6 +:100DD000331F4A95E2F73C6843E0880F991F4A9514 +:100DE000E1F7807E9770822B932B08952430310594 +:100DF000E1F4AC014370552721E030E002C0220F3E +:100E0000331F4A95E2F73A68E7CF9C013057211526 +:100E1000304118F49F70906208959C01305821155C +:100E2000304118F49F70906A0895803E9105E0F477 +:100E3000803C910558F58133910509F46FC048F461 +:100E40008932910509F463C08A32910509F46DC0B5 +:100E500072C089339105E9F082389105D1F085336C +:100E6000910509F44DC067C0833E910581F138F4C6 +:100E7000803E9105B9F0823E9105D9F05CC0863E76 +:100E8000910561F1873E9105A1F155C00E945B0675 +:100E900008952091DF0120FD02C021FF4CC080EEAB +:100EA00090E049C08091DF0180FFF9CF89E390E0B5 +:100EB00042C08091DF0182FF0EC08091DF0184FF7C +:100EC00003C080E090E037C083EE90E034C08091B2 +:100ED000DF0182FFF2CF82EE90E02DC08091DF0132 +:100EE00083FF0BC08091DF0184FDEBCF87EE90E0A4 +:100EF00022C08091DF0183FFF5CF86EE90E01BC01A +:100F00008091DF0185FF07C089E290E014C08091E5 +:100F1000DF0185FFF9CF85E390E00DC08091DF010F +:100F200086FF07C08AE290E006C08091DF0186FF5D +:100F3000F9CF81E390E00E9489050895089580919A +:100F400062010895CF93DF9300D01F92CDB7DEB733 +:100F50009C018091E501843019F593E099833B83EE +:100F60002A839093E9008FEF9091E800815095FDDE +:100F700006C095ED9A95F1F700008111F5CF8091AB +:100F8000E80085FF0DC040E050E063E070E0CE0176 +:100F900001960E940C0A8091E8008E778093E80009 +:100FA0000F900F900F90DF91CF910895CF93DF9323 +:100FB00000D01F92CDB7DEB72091E501243021F596 +:100FC00022E029839B838A8383E08093E9008FEF6B +:100FD0009091E800815095FD06C095ED9A95F1F746 +:100FE00000008111F5CF8091E80085FF0DC040E041 +:100FF00050E063E070E0CE0101960E940C0A8091FF +:10100000E8008E778093E8000F900F900F90DF91AB +:10101000CF9108952091E5012430F1F422E020934E +:10102000E9002FEF3091E800215035FD06C035ED85 +:101030003A95F1F700002111F5CF2091E80025FF46 +:101040000BC040E050E065E070E00E940C0A809127 +:10105000E8008E778093E8000895CF93DF93EC014A +:101060009091E501943009F046C080910C018823ED +:10107000D9F080910D018823B9F09093E9008FEFAA +:101080009091E800815095FD06C095E19A95F1F7A1 +:1010900000008111F5CF8091E80085FF2CC040E071 +:1010A00050E060E170E017C081E08093E9008FEFCD +:1010B0009091E800815095FD06C095ED9A95F1F765 +:1010C00000008111F5CF8091E80085FF14C040E059 +:1010D00050E068E070E0CE010E940C0A8091E800C8 +:1010E0008E778093E80080E1FE01A2E5B1E00190F7 +:1010F0000D928A95E1F7DF91CF9108958091E401F7 +:10110000811109C00E94A10B0E94FE0B8091E20098 +:1011100084608093E20008951092E4010895089598 +:101120000C9460210E94BF1A0E9466210E94A40EA6 +:101130000C949E0742E061EC81E00E941B0B42E0B0 +:1011400061EC82E00E941B0B42E061EC83E00E94B4 +:101150001B0B42E161EC84E00C941B0B8091E701D6 +:10116000833009F455C030F4813071F0823009F4D5 +:101170008EC008958A3009F47AC08B3009F460C0BB +:10118000893009F09CC020C08091E601813A09F0C5 +:1011900096C08091E800877F8093E8008091EA0103 +:1011A0009091EB01892B21F460E182E591E003C08D +:1011B00060E080E090E070E00E94570A8091E800D3 +:1011C0008B778093E80008958091E601813209F0E1 +:1011D00076C08091EA019091EB01009719F0039796 +:1011E00009F06DC08091E800877F8093E8008091CE +:1011F000E80082FD05C08091E5018111F8CF5FC054 +:101200008091F100809362018091E8008B7753C058 +:101210008091E601813A09F052C08091EA019091F3 +:10122000EB01892B09F04BC08091E800877F809308 +:10123000E8008091E80080FFFCCF80910C0136C06F +:101240008091E6018132D9F58091EA019091EB011C +:10125000892BA9F58091E800877F8093E8000E94A0 +:10126000500B8091E80180930C010C941A1480912A +:10127000E601813221F58091E800877F8093E800C4 +:101280000E94500B8091E901809363010895809141 +:10129000E601813AA1F48091E800877F8093E8001D +:1012A0008091E80080FFFCCF809163018093F10082 +:1012B0008091E8008E778093E8000C94500B08959D +:1012C00084B7877F84BF88E10FB6F894809360006D +:1012D000109260000FBE90E080E80FB6F894809303 +:1012E0006100909361000FBE0E94F30E0E94A10B5B +:1012F0000E94FE0B8091E20084608093E20078946B +:101300000E94840E0E94F50E82E091E00E949F0EE2 +:101310000E944E218091E501853069F40E94831A74 +:101320008091E3018823B1F30E94AB1A882391F3E3 +:101330000E94F609EFCF0E94FB0EECCF292F332736 +:1013400023303105C9F064F42130310581F02230B9 +:10135000310509F043C08DE690E02CEB33E042C04C +:1013600021323105F1F02232310541F137C082E1FD +:1013700090E029E234E036C099278130910541F0B0 +:101380008230910541F0892B49F5E8EBF3E005C087 +:10139000E0EAF3E002C0E8E8F3E0849190E09F0126 +:1013A00021C06430D8F4E62FF0E0EE0FFF1FEE5DB1 +:1013B000FE4F2081318189E090E014C0643070F4E8 +:1013C00070E0FB01EE0FFF1FE65EFE4F20813181D2 +:1013D000FB01EA5EFE4F808190E004C080E090E077 +:1013E00020E030E0FA0131832083089580E189BD57 +:1013F00082E189BD09B400FEFDCF8091D8008F7DC8 +:101400008093D8008091E00082608093E00080911A +:10141000E00081FDFCCF0895CF92DF92EF92FF9222 +:101420000F931F93CF93DF93EC018B016A010E940E +:101430006F0B811133C0C114D10439F0F6018081E2 +:101440009181081B190BC80FD91FE12CF12C011534 +:10145000110519F18091E80085FD16C08091E80022 +:101460008E778093E800C114D10449F0F6018081A1 +:101470009181E80EF91EF182E08285E00FC00E94A2 +:101480006F0B882321F30AC089918093F1000150EA +:101490001109FFEFEF1AFF0ADACF80E0DF91CF9159 +:1014A0001F910F91FF90EF90DF90CF9008952091C2 +:1014B000EC013091ED012617370748F061157105F1 +:1014C00039F42091E8002E772093E80001C0B9019B +:1014D00040E061157105A9F12091E501222309F48D +:1014E00043C0253009F442C02091E80023FD40C0EC +:1014F0002091E80022FD32C02091E80020FFE9CFD2 +:101500004091F3002091F20030E0342BFC01CF0138 +:101510006115710559F02830310540F481918093AF +:10152000F100615071092F5F3F4FF1CF41E028304A +:10153000310509F040E02091E8002E772093E80083 +:10154000C8CF4111C9CF0AC08091E501882361F05D +:10155000853061F08091E80083FD0AC08091E80049 +:1015600082FFF2CF80E0089582E0089583E008953D +:1015700081E008952091EC013091ED0126173707A5 +:1015800048F06115710539F42091E8002E77209319 +:10159000E80001C0B901FC0120E06115710591F17D +:1015A0008091E501882309F440C0853009F43FC0EB +:1015B0008091E80083FD3DC08091E80082FD2FC04E +:1015C0008091E80080FFE9CF2091F3008091F20044 +:1015D00090E0922B6115710559F08830910540F427 +:1015E00024912093F1003196615071090196F2CF58 +:1015F00021E0089709F020E08091E8008E77809341 +:10160000E800CBCF2111CCCF0AC08091E50188231F +:1016100061F0853061F08091E80083FD0AC080911F +:10162000E80082FFF2CF80E0089582E0089583E031 +:10163000089581E00895982F973058F59093E90028 +:10164000981739F07091EC002091ED005091F00066 +:1016500003C0242F762F50E021FF19C03091EB00FA +:101660003E7F3093EB003091ED003D7F3093ED00F5 +:101670003091EB0031603093EB007093EC002093DD +:10168000ED005093F0002091EE0027FF07C09F5F10 +:10169000D3CF8F708093E90081E0089580E00895B2 +:1016A0008091E60187FF11C08091E80082FD05C0AE +:1016B0008091E5018111F8CF11C08091E8008B770E +:1016C0000BC08091E501882349F08091E80080FFFC +:1016D000F8CF8091E8008E778093E80008952091FC +:1016E000E4003091E50095E64091EC00842F817094 +:1016F00040FF22C08091E80080FD1CC08091E50180 +:10170000882391F0853091F08091EB0085FD10C029 +:101710004091E4005091E5004217530729F39A01E4 +:10172000915011F784E0089582E0089583E00895D0 +:1017300081E0089580E008954091E80042FFDECF07 +:1017400008950E940F0C0E94170CE0EEF0E08081DB +:1017500081608083E8EDF0E080818F77808319BC21 +:10176000A7EDB0E08C918E7F8C9380818F7E8083FB +:101770001092E40108950F931F93CF93DF930E947B +:101780000F0C0E94170CC8EDD0E088818F778883FA +:1017900088818068888388818F7D888319BC1092B6 +:1017A000E5011092E1011092E3011092E20100EED6 +:1017B00010E0F80180818B7F80838881816088833D +:1017C00042E060E080E00E941B0BE1EEF0E08081EF +:1017D0008E7F8083E2EEF0E0808181608083808173 +:1017E00088608083F80180818E7F8083888180611A +:1017F0008883DF91CF911F910F910895E8EDF0E07C +:1018000080818F7E8083E7EDF0E08081816080833E +:1018100084E082BF81E08093E4010C94BB0BE8ED8F +:10182000F0E080818E7F80831092E2000895109214 +:10183000DA001092E10008951F920F920FB60F92F6 +:1018400011242F933F934F935F936F937F938F93C5 +:101850009F93AF93BF93EF93FF938091E10082FF3B +:101860000BC08091E20082FF07C08091E1008B7F76 +:101870008093E1000E94830E8091DA0080FF1FC0F8 +:101880008091D80080FF1BC08091DA008E7F80930A +:10189000DA008091D90080FF0DC080E189BD82E12E +:1018A00089BD09B400FEFDCF81E08093E5010E946F +:1018B0007E0805C019BC1092E5010E948C08809139 +:1018C000E10080FF19C08091E20080FF15C0809187 +:1018D000E2008E7F8093E2008091E200806180933D +:1018E000E2008091D80080628093D80019BC85E026 +:1018F0008093E5010E9490088091E10084FF30C050 +:101900008091E20084FF2CC080E189BD82E189BD25 +:1019100009B400FEFDCF8091D8008F7D8093D80060 +:101920008091E1008F7E8093E1008091E2008F7EC4 +:101930008093E2008091E20081608093E2008091D8 +:10194000E101882311F084E007C08091E30087FD66 +:1019500002C081E001C083E08093E5010E9492080B +:101960008091E10083FF29C08091E20083FF25C0C0 +:101970008091E100877F8093E10082E08093E50120 +:101980001092E1018091E1008E7F8093E1008091CF +:10199000E2008E7F8093E2008091E200806180937C +:1019A000E20042E060E080E00E941B0B8091F000CA +:1019B00088608093F0000E948F08FF91EF91BF91A3 +:1019C000AF919F918F917F916F915F914F913F91D7 +:1019D0002F910F900FBE0F901F9018951F920F928E +:1019E0000FB60F9211242F933F934F935F936F93F2 +:1019F0007F938F939F93AF93BF93CF93DF93EF9397 +:101A0000FF93C091E900CF708091EC00D82FD17086 +:101A100080FDD0E81092E9008091F000877F8093EC +:101A2000F00078940E94320D1092E9008091F0004D +:101A300088608093F000CD2BCF70C093E900FF91B8 +:101A4000EF91DF91CF91BF91AF919F918F917F9156 +:101A50006F915F914F913F912F910F900FBE0F901B +:101A60001F9018951F93CF93DF93CDB7DEB7AA973A +:101A70000FB6F894DEBF0FBECDBFE6EEF1E088E012 +:101A80008E0F9091F10091938E13FBCF0E94AE08C0 +:101A90008091E80083FF1FC18091E6019091E701EA +:101AA000492F50E04A30510508F015C1FA01EA5AB1 +:101AB000FF4F0C94E822803881F0823809F00BC186 +:101AC0008091EA018F708093E9008091EB0085FBA3 +:101AD000882780F91092E90006C08091E201909178 +:101AE000E301911182609091E800977F9093E80064 +:101AF0008093F1001092F100C8C0282F2D7F09F0CB +:101B0000EAC0882319F0823061F0E5C08091E801D5 +:101B1000813009F0E0C0933009F080E08093E30168 +:101B20002BC08091E801811127C08091EA018F705C +:101B300009F4D1C08093E9002091EB0020FF1CC084 +:101B4000933021F48091EB00806214C09091EB00FF +:101B500090619093EB0021E030E0A90102C0440FB6 +:101B6000551F8A95E2F74093EA001092EA008091AF +:101B7000EB0088608093EB001092E9008091E80010 +:101B8000877F86C08111A7C01091E8011F778091DF +:101B9000E3008078812B8093E3008091E800877FC9 +:101BA0008093E8000E94500B8091E80080FFFCCFFA +:101BB0008091E30080688093E300111102C082E00D +:101BC00001C083E08093E50186C08058823008F030 +:101BD00082C08091E8019091E9018C3D53E0950726 +:101BE00079F583E08A838AE289834FB7F894DE012E +:101BF000139620E03EE051E2E32FF0E050935700CF +:101C0000E49120FF03C0E295EF703F5FEF708E2FED +:101C100090E0EA3010F0C79601C0C0968D939D9376 +:101C20002F5F243149F74FBF8091E800877F809371 +:101C3000E8006AE270E0CE0101960E94570A14C0E3 +:101C4000AE014F5F5F4F6091EA010E949E09BC01A7 +:101C5000892B09F440C09091E800977F9093E800A9 +:101C600089819A810E94BA0A8091E8008B778093DB +:101C7000E80031C0803879F58091E800877F809353 +:101C8000E8008091E1018093F1008091E8008E7777 +:101C90008093E8000E94500B1EC081111CC09091DF +:101CA000E8019230C0F48091E800877F8093E800DB +:101CB0009093E1010E94500B8091E101811106C0D7 +:101CC0008091E30087FD02C081E001C084E0809341 +:101CD000E5010E949A088091E80083FF0AC0809184 +:101CE000E800877F8093E8008091EB00806280931A +:101CF000EB00AA960FB6F894DEBF0FBECDBFDF9102 +:101D0000CF911F9108950895CF938091E501882385 +:101D1000A1F0C091E900CF709091EC00892F817003 +:101D200090FD80E8C82B1092E9008091E80083FDC7 +:101D30000E94320DCF70C093E900CF910895909327 +:101D40006901809368010895E0916801F09169014B +:101D5000309721F00190F081E02D099480E0089502 +:101D6000E0916801F0916901309721F00280F381E0 +:101D7000E02D09940895E0916801F0916901309790 +:101D800021F00480F581E02D0994089520916601E9 +:101D9000309167018217930771F0909367018093E8 +:101DA0006601E0916801F0916901309721F00680A9 +:101DB000F781E02D09940895209164013091650127 +:101DC0008217930771F09093650180936401E0910D +:101DD0006801F0916901309721F00084F185E02DD0 +:101DE0000994089508950C94F20E0E94C51A0E9459 +:101DF00073040C948B1BCF92DF92EF92FF920F93A0 +:101E00001F93CF93DF93CDB7DEB72B970FB6F89420 +:101E1000DEBF0FBECDBF0E9490048BE6C82E81E0CE +:101E2000D82E00E010E0E02E802F0E948205F601FF +:101E300041916F01F42EF826B1F40F5F1F4F0E3061 +:101E4000110589F78FEF89838A831B820E94CE1A3E +:101E50008160782F9D838C8349815A816B818D812C +:101E60000E949E0F40C09091CC0191FF04C08B87CF +:101E70000E9488058B8520E030E04F2D50E0922FA6 +:101E8000BA01022E02C0759567950A94E2F760FFC9 +:101E900024C02E83EF8221E030E0690102C0CC0C27 +:101EA000DD1C9A95E2F790E08C219D21892B09F4A5 +:101EB00020E028870E94CE1A8160782F9A87898730 +:101EC0004E815F8168858A850E949E0FF801E559E1 +:101ED000FE4F8081C826C08206C02F5F3F4F26304C +:101EE000310569F6AACF0E94721E10916A010E9404 +:101EF000A40E1817A1F00E94A40E80936A012B96DD +:101F00000FB6F894DEBF0FBECDBFDF91CF911F910A +:101F10000F91FF90EF90DF90CF900C949E072B963F +:101F20000FB6F894DEBF0FBECDBFDF91CF911F91EA +:101F30000F91FF90EF90DF90CF900895CF93DF93B4 +:101F4000CDB7DEB72B970FB6F894DEBF0FBECDBF6F +:101F50004F83588769877A878B87DE01119686E0E1 +:101F6000FD0111928A95E9F785E0FE01379601900F +:101F70000D928A95E1F749815A816B817C818D812F +:101F80009E810E94B4162B960FB6F894DEBF0FBE4A +:101F9000CDBFDF91CF910895CF93882309F4C2C0BC +:101FA000C82F823859F40E94A40E81FDBBC089E37A +:101FB0000E9450190E940D1A89E30CC0833879F4ED +:101FC0000E94A40E80FDAEC083E50E9450190E94BD +:101FD0000D1A83E50E949219CF910C940D1A843842 +:101FE00059F40E94A40E82FD9DC087E40E945019FE +:101FF0000E940D1A87E4EECF8CEF8C0F813A48F4E3 +:102000008C2F0E94B32081118DC08C2F0E945019FB +:10201000E3CF80E28C0F883048F4C77081E001C0C4 +:10202000880FCA95EAF70E94D619D6CF8BE58C0F98 +:10203000833078F4C53A29F0C63A31F083E890E06D +:1020400005C081E890E002C082E890E0CF910C9456 +:10205000C60E88E58C0F833108F064C0C83A39F1A8 +:10206000C93A41F1CA3A49F1CB3A51F1CC3A59F166 +:10207000CD3A61F1C03B69F1CE3A71F1CF3A79F1D5 +:10208000C13B81F1C23B89F1C33B91F1C43B99F162 +:10209000C53BA1F1C63BA9F1C73BB1F1C83BB9F1C2 +:1020A000C93BC1F1CA3BC9F180E090E038C082EE83 +:1020B00090E035C089EE90E032C08AEE90E02FC00B +:1020C00085EB90E02CC086EB90E029C087EB90E098 +:1020D00026C08CEC90E023C08DEC90E020C083E81B +:1020E00091E01DC08AE891E01AC082E991E017C032 +:1020F00084E991E014C081E292E011C083E292E0B1 +:102100000EC084E292E00BC085E292E008C086E255 +:1021100092E005C087E292E002C08AE292E0CF91AD +:102120000C94DC0ECF910895882309F44BC08238BB +:1021300059F40E94A40E81FF45C089E30E94501902 +:102140000E940D1A89E30CC0833871F40E94A40E1A +:1021500080FF38C083E50E9450190E940D1A83E564 +:102160000E9492190C940D1A843859F40E94A40EFE +:1021700082FF28C087E40E9450190E940D1A87E44C +:10218000EFCF9CEF980F913A58F390E2980F983068 +:1021900050F4877091E001C0990F8A95EAF7892F72 +:1021A0000E94DC19DFCF9BE5980F933020F480E08C +:1021B00090E00C94C60E885A833120F480E090E0C1 +:1021C0000C94DC0E0895882321F00E94D6190C94FB +:1021D0000D1A0895882321F00E94DC190C940D1A21 +:1021E0000895BF92CF92DF92EF92FF920F931F93C9 +:1021F000CF93DF9300D000D000D0CDB7DEB725E07D +:10220000FC01DE01119601900D922A95E1F7FC0187 +:10221000408131810281258122952F7063817481F3 +:10222000672B09F4E5C23F3F19F44F3F09F4E0C2C0 +:102230007C0149833A8389819A812E830E940F19F8 +:10224000182FB92E0E940E190E94D517EB2DE2957A +:10225000EF70F0E0E05AFF4F2E810C94E8228B2DB6 +:10226000807F9B2D9F70F92E882319F0F29480EFC8 +:10227000F822002349F0FF2009F467C28F2D0E9445 +:10228000E6190E940D1A61C2812F0E949410FF204E +:1022900009F4AEC28F2D0E94EC1926960FB6F89461 +:1022A000DEBF0FBECDBFDF91CF911F910F91FF9089 +:1022B000EF90DF90CF90BF900C940D1A3B2D307FA4 +:1022C0008B2D8F70303211F08295807F112319F0A1 +:1022D000113021F12CC00023B9F0222309F4A0C150 +:1022E000213009F09DC126960FB6F894DEBF0FBECF +:1022F000CDBFDF91CF911F910F91FF90EF90DF90B5 +:10230000CF90BF900C94F619222319F0213009F4D4 +:102310006FC28E830E94F9198E8196C1002321F02D +:10232000223008F065C27CC1211162C28DC1002338 +:1023300021F0222309F474C108C2222309F484C1C4 +:1023400019C22B2D26952695237030E021153105D5 +:1023500021F021303105D1F04BC2002321F0812F33 +:102360009B2D937002C080E090E026960FB6F89403 +:10237000DEBF0FBECDBFDF91CF911F910F91FF90B8 +:10238000EF90DF90CF90BF900C94C60E002321F009 +:10239000812F9B2D937002C080E090E026960FB6AF +:1023A000F894DEBF0FBECDBFDF91CF911F910F918B +:1023B000FF90EF90DF90CF90BF900C94DC0E812FB8 +:1023C000002319F00E947A1D02C00E94E21D269689 +:1023D0000FB6F894DEBF0FBECDBFDF91CF911F9136 +:1023E0000F91FF90EF90DF90CF90BF900C94671EFD +:1023F0008B2D837009F07BC00111FAC1812F82956A +:1024000086958770880F880F912F9F70C92ED12CC9 +:10241000E12CF12C082E04C0CC0CDD1CEE1CFF1CA2 +:102420000A94D2F714FF12C04FE050E060E070E071 +:1024300004C0440F551F661F771F8A95D2F7CB0142 +:10244000BA01609570958095909503C060E070E04A +:10245000CB012B2D269526952370422F50E042303C +:102460005105D9F04330510569F16C297D298E2938 +:102470009F294130510551F126960FB6F894DEBFE1 +:102480000FBECDBFDF91CF911F910F91FF90EF90C5 +:10249000DF90CF90BF900C94FC176C297D298E297A +:1024A0009F2926960FB6F894DEBF0FBECDBFDF91F1 +:1024B000CF911F910F91FF90EF90DF90CF90BF9041 +:1024C0000C9418180E94FC17C701B60126960FB687 +:1024D000F894DEBF0FBECDBFDF91CF911F910F915A +:1024E000FF90EF90DF90CF90BF900C94E017002307 +:1024F00019F08B2D817001C08695882309F478C16D +:10250000812F829586958770880F880F912F9F70F5 +:10251000C92ED12CE12CF12C082E04C0CC0CDD1CD2 +:10252000EE1CFF1C0A94D2F714FF12C04FE050E0DB +:1025300060E070E004C0440F551F661F771F8A9546 +:10254000D2F7CB01BA01609570958095909503C044 +:1025500060E070E0CB012B2D269526952370422F4D +:1025600050E042305105D9F04330510569F16C29F2 +:102570007D298E299F294130510551F126960FB6AC +:10258000F894DEBF0FBECDBFDF91CF911F910F91A9 +:10259000FF90EF90DF90CF90BF900C94D6186C29ED +:1025A0007D298E299F2926960FB6F894DEBF0FBE8F +:1025B000CDBFDF91CF911F910F91FF90EF90DF90F2 +:1025C000CF90BF900C94F2180E94D618C701B601A4 +:1025D00026960FB6F894DEBF0FBECDBFDF91CF9128 +:1025E0001F910F91FF90EF90DF90CF90BF900C94D0 +:1025F000BA18103FD1F118F4103E50F4A1C0123FA8 +:1026000009F463C008F44CC0133F09F473C098C0C8 +:102610001F708B2D8F710023A1F00E945318812F02 +:1026200026960FB6F894DEBF0FBECDBFDF91CF91D7 +:102630001F910F91FF90EF90DF90CF90BF900C947F +:10264000E3100E947418812F26960FB6F894DEBF0F +:102650000FBECDBFDF91CF911F910F91FF90EF90F3 +:10266000DF90CF90BF900C94EA100023A9F02111C5 +:10267000BFC08B2D8F7126960FB6F894DEBF0FBEAC +:10268000CDBFDF91CF911F910F91FF90EF90DF9021 +:10269000CF90BF900C949918223008F0A9C0E9CFD0 +:1026A0000023A9F08B2D8F7126960FB6F894DEBF0C +:1026B0000FBECDBFDF91CF911F910F91FF90EF9093 +:1026C000DF90CF90BF900C945318002359F38B2DBB +:1026D0008F7126960FB6F894DEBF0FBECDBFDF9187 +:1026E000CF911F910F91FF90EF90DF90CF90BF900F +:1026F0000C947418002399F08B2D8F7126960FB6C9 +:10270000F894DEBF0FBECDBFDF91CF911F910F9127 +:10271000FF90EF90DF90CF90BF900C943E182696DC +:102720000FB6F894DEBF0FBECDBFDF91CF911F91E2 +:102730000F91FF90EF90DF90CF90BF900C943418E2 +:102740000023A9F0222309F4ADCF812F26960FB6DE +:10275000F894DEBF0FBECDBFDF91CF911F910F91D7 +:10276000FF90EF90DF90CF90BF900C94CC0F22237E +:1027700009F4ADCF812F26960FB6F894DEBF0FBEB9 +:10278000CDBFDF91CF911F910F91FF90EF90DF9020 +:10279000CF90BF900C9494104B2D4F70612FC701B8 +:1027A0000E94010326960FB6F894DEBF0FBECDBF80 +:1027B000DF91CF911F910F91FF90EF90DF90CF901D +:1027C000BF900C9458174B2D4F70612FC701269660 +:1027D0000FB6F894DEBF0FBECDBFDF91CF911F9132 +:1027E0000F91FF90EF90DF90CF90BF900C94480630 +:1027F00026960FB6F894DEBF0FBECDBFDF91CF9106 +:102800001F910F91FF90EF90DF90CF90BF900895B0 +:102810000E94F3190E94C8190E940D1A0E94181FE5 +:102820000E94671E80E090E00E94C60E80E090E06B +:102830000C94DC0E0E94E3190C9408140E940F19EA +:10284000292F22952F7030E02C3031054CF42A309E +:1028500031056CF4225031092230310588F407C06B +:102860002C30310549F02F30310531F009C0803E60 +:1028700048F0803F29F406C093FB882780F908952B +:1028800080E0089581E00895CF93DF9300D000D0D9 +:102890001F92CDB7DEB70F900F900F900F900F9053 +:1028A000DF91CF910895CF93DF9300D000D000D077 +:1028B000CDB7DEB726960FB6F894DEBF0FBECDBFFC +:1028C000DF91CF9108951F93CF93DF93C09179014A +:1028D00016E080917A01C81799F0D0E01C9FF001B2 +:1028E0001D9FF00D1124E558FE4F408151816281FA +:1028F0007381848195810E9453142196C770E9CF1A +:10290000DF91CF911F9108954091AB015091AC019F +:102910006091AD017091AE018091AF019091B001D5 +:102920000C9453148091B00182958F7009F054C0BB +:102930008091AD01882309F44FC080917901A09165 +:102940007A016091AB017091AC014091AE01509160 +:10295000AF01B6E08A1709F43FC090E04115510578 +:10296000C1F17F3F11F46F3FA1F1B89FF001B99F12 +:10297000F00D1124E558FE4F218172132AC02081E9 +:10298000621327C02281211124C02381348124179E +:10299000350710F421503109241B350B283C310533 +:1029A000C0F42091B0012F7020612093B00126E087 +:1029B000289FF001299FF00D1124E058FE4F8081DF +:1029C0008F70806180838BEA91E00E94F1100C94FB +:1029D000631401968770BECF0895CF92DF92EF9275 +:1029E000FF920F931F93CF93DF93CDB7DEB762971C +:1029F0000FB6F894DEBF0FBECDBF8C0185E0F801A5 +:102A0000DE011D9601900D928A95E1F7D8014C9157 +:102A100011965C91119712966C9112971396CD9026 +:102A2000DC9014973091AB017091AC018091AE01B4 +:102A30009091AF01009709F46BC17F3F19F43F3FBC +:102A400009F466C1E090AD01EE2009F4C0C0209108 +:102A5000B001C816D90628F0F601E81BF90BCF0122 +:102A600004C0809590958C0D9D1DFF24F394883CA7 +:102A7000910578F0F12C207F09F0C6C07C2DD98A11 +:102A8000C88A89890E9444148BEA91E00E94F1105F +:102A9000B1C0822F807F09F046C0751314C0341373 +:102AA00012C0611110C02F7020612093B0010E94EC +:102AB00084148BEA91E00E94F1108091B001D8015A +:102AC00015968C932EC0CD2819F15F3F11F44F3F1E +:102AD000F9F0F62E61111CC08091790120917A01E4 +:102AE00036E0821709F45AC090E0389FF001399F10 +:102AF000F00D1124E558FE4F7181571306C0708107 +:102B0000471303C07281711103C001968770E9CF2A +:102B1000F62E662309F418C18091B001816080937C +:102B2000B001F12C11C1751308C0341306C0611136 +:102B300004C08091B001D801C3C04D875E878D85E8 +:102B40009E856A8B0E941E146A898823E1F16623A0 +:102B5000D1F12091B001822F82958F7090E0029781 +:102B600074F08091AB019091AC0198878F831986A6 +:102B7000DB86CA862C87CE0107960E94F11086E07C +:102B8000F801ABEAB1E001900D928A95E1F70E945D +:102B900092140E948414FF24F394D6C04D875E875C +:102BA0008D859E850E940F19292F22952F7030E068 +:102BB000223031050CF0BCC09F7009F0B6C0805EB9 +:102BC000883008F4C1C0C8010E94F110E4CFC816D3 +:102BD000D90608F453C0F601E81BF90BCF01883C75 +:102BE000910508F450C0F12C7C2DD98AC88A8989B6 +:102BF0000E944414EBEAF1E086E0DF011D928A9521 +:102C0000E9F70E948414A0C0751314C0341312C0D5 +:102C1000611110C08091B001F8018583C8010E9444 +:102C2000F11086E0EBEAF1E0DF011D928A95E9F709 +:102C3000FE2C8AC04D875E878D859E856A8B0E949B +:102C40001E146A89882309F4BECF662309F4BBCF1A +:102C50002091B001822F82958F7090E002970CF442 +:102C60008ECF8091AB019091AC019A8389831B82B6 +:102C7000DD82CC822E83CE0101967FCF8095909508 +:102C80008C0D9D1DACCFF62E662309F49CCF7513D9 +:102C90002EC034132CC02091B00120FD1FC0822F04 +:102CA00082958F70D9F0D80115962C9315978F3097 +:102CB00049F08F5F982F9295907F822F8F70892B8C +:102CC00015968C93C8010E94F11086E0F801ABEADA +:102CD000B1E001900D928A95E1F793CF86E0F8017B +:102CE000ABEAB1E001900D928A95E1F72DC04D87D6 +:102CF0005E878D859E850E941E14811140CF809134 +:102D0000B00181608093B001C8010E94F1101CC025 +:102D1000662309F458CF4D875E878D859E850E9476 +:102D20001E14882309F44FCF2ACF811148CF0CC03D +:102D3000243031050CF047CF9F7009F440CFF801E3 +:102D40009581907F09F03BCF8F2D62960FB6F89456 +:102D5000DEBF0FBECDBFDF91CF911F910F91FF90CE +:102D6000EF90DF90CF9008951F93CF93DF93CDB76F +:102D7000DEB72C970FB6F894DEBF0FBECDBF4F83E2 +:102D8000588769877A878B879C87CE0107960E9430 +:102D9000ED14882369F08F8198852A853B85232B44 +:102DA000F1F19F3F09F063C08F3F09F060C037C069 +:102DB00086E0FE013796DE01119601900D928A950C +:102DC000E1F76F817885EA85FB85309741F17F3F98 +:102DD00011F46F3F21F120917A0130E0C901019691 +:102DE000877099274091790150E08417950709F47D +:102DF00047C069837A83FD83EC8396E0929FD0017C +:102E0000939FB00D1124A558BE4FFE01319601903D +:102E10000D929A95E1F780937A010E94631416E06F +:102E20008091790190917A018917C1F1189FC001B1 +:102E3000112485589E4F0E94ED14882379F1E0916A +:102E400079011E9FF0011124E558FE4F4081518108 +:102E500062817381848195810E94531480917901EC +:102E600090E001968770992780937901D9CF4F819F +:102E7000588569857A858B859C850E945314CFCFB0 +:102E80000E941A1410927A0110927901EBEAF1E093 +:102E900086E0DF011D928A95E9F7C1CF2C960FB627 +:102EA000F894DEBF0FBECDBFDF91CF911F91089583 +:102EB000EF92FF920F931F93CF93DF938C01892B97 +:102EC00009F46CC0F12CEE24E394E8012196F8019A +:102ED0008491843740F4843008F051C0813081F00F +:102EE000823019F15BC0853709F444C0A8F19CE732 +:102EF000980F903708F052C08F770E94941041C00D +:102F00000E5F1F4FFE01C49180E28C0F883048F4A1 +:102F1000C7708E2D01C0880FCA95EAF70E94E61986 +:102F200014C08C2F0E94CC0F2DC00E5F1F4FFE01CE +:102F3000C49180E28C0F883058F4C7708E2D01C088 +:102F4000880FCA95EAF70E94EC190E940D1A1AC060 +:102F50008C2F0E94941016C00E5F1F4FFE01C4916B +:102F6000CC2381F08FE99FE00197F1F700C00000CA +:102F7000C150F6CF0E5F1F4FFE01F49003C00E94B8 +:102F8000CC0F8E018F2D882309F49FCFEFE9FFE04E +:102F90003197F1F700C000008150F5CFDF91CF915C +:102FA0001F910F91FF90EF90089508956093B501E0 +:102FB0007093B6018093B7019093B8010C940814F4 +:102FC0000F931F930091B5011091B6012091B701A5 +:102FD0003091B801DC01CB01802B912BA22BB32BBC +:102FE0008093B5019093B601A093B701B093B80157 +:102FF0001F910F910C9408140F931F930091B5012A +:103000001091B6012091B7013091B801DC01CB01DC +:1030100080239123A223B3238093B5019093B6011B +:10302000A093B701B093B8011F910F910C940814AD +:103030000F931F930091B5011091B6012091B70134 +:103040003091B801DC01CB0180279127A227B3275B +:103050008093B5019093B601A093B701B093B801E6 +:103060001F910F910C9408141092B1011092B201AB +:103070001092B3011092B4010C94081441E050E096 +:1030800060E070E004C0440F551F661F771F8A95EB +:10309000D2F74093B1015093B2016093B3017093A2 +:1030A000B4010C94081441E050E060E070E004C00A +:1030B000440F551F661F771F8A95D2F78091B10183 +:1030C0009091B201A091B301B091B401482B592B5A +:1030D0006A2B7B2B4093B1015093B2016093B301F3 +:1030E0007093B4010C94081441E050E060E070E08B +:1030F00004C0440F551F661F771F8A95D2F740956D +:103100005095609570958091B1019091B201A09118 +:10311000B301B091B401482359236A237B23409320 +:10312000B1015093B2016093B3017093B4010C9458 +:10313000081441E050E060E070E004C0440F551F07 +:10314000661F771F8A95D2F78091B1019091B201E5 +:10315000A091B301B091B401482759276A277B2772 +:103160004093B1015093B2016093B3017093B401E5 +:103170000C9408140F931F930091B1011091B201A8 +:103180002091B3013091B401DC01CB01802B912B54 +:10319000A22BB32B8093B1019093B201A093B30102 +:1031A000B093B4011F910F910C9408140F931F93C7 +:1031B0000091B1011091B2012091B3013091B4019D +:1031C000DC01CB0180239123A223B3238093B1019F +:1031D0009093B201A093B301B093B4011F910F91EA +:1031E0000C9408140F931F930091B1011091B20138 +:1031F0002091B3013091B401DC01CB0180279127EC +:10320000A227B3278093B1019093B201A093B30199 +:10321000B093B4011F910F910C9408140895CF92AC +:10322000DF92EF92FF920F931F93CF93DF938C0166 +:10323000C090B501D090B601E090B701F090B80110 +:103240004091B1015091B2016091B3017091B4010C +:10325000C42AD52AE62AF72ACFE1D0E0D701C60151 +:103260000C2E04C0B695A795979587950A94D2F72A +:1032700080FF07C0B8018C2F0E946B06813091053A +:1032800031F4219758F7B80180E00E946B06DF9176 +:10329000CF911F910F91FF90EF90DF90CF90089505 +:1032A00090910C01992321F090910D01911109C089 +:1032B00020910E0130910F01F90132969FEF40E00D +:1032C0001FC0982F9695969596959F3050F5E09152 +:1032D0000E01F0910F01E90FF11D877021E030E040 +:1032E000A90102C0440F551F8A95E2F7CA019181D6 +:1032F000892B818308959F3F39F04F5F4E3041F015 +:1033000051915813F8CF0DC05111F7CF942FF5CF2D +:103310009F3F39F0F901E90FF11D97FDFA9582837E +:103320000895089590910C01992321F090910D0139 +:10333000911109C020910E0130910F01F9013296CF +:10334000205F3F4F1FC0982F9695969596959F307A +:10335000F0F4E0910E01F0910F01E90FF11D87707B +:1033600021E030E0A90102C0440F551F8A95E2F721 +:10337000CA01809591818923818308953196E2174E +:10338000F30729F090819813F9CF1082F7CF0895B1 +:1033900081E090E0E0910E01F0910F01E80FF91F3C +:1033A0001082019680319105A9F708959091CB0183 +:1033B000892B8093CB01089580959091CB0189232F +:1033C0008093CB0108951092CB0108959091CA018A +:1033D000892B8093CA01089580959091CA01892311 +:1033E0008093CA0108951092CA0108958093B9018B +:1033F00008951092B901089580910E0190910F01E6 +:10340000FC0131969C01205F3F4F80E0919191112A +:103410008F5FE217F307D1F70895E0910E01F09165 +:103420000F018091CB018083E0910E01F0910F019B +:1034300090818091CA01892B80838091B901882372 +:1034400061F0E0910E01F0910F019081892B808352 +:103450000E94FC1981111092B90180910E01909186 +:103460000F010C94B00ECF92DF92EF92FF926C019D +:10347000EE24FF24C114D104E104F10421F0C701BA +:10348000B60120E101C020E0C72ED82EE92EFF248E +:10349000C114D104E104F10419F0285FC701B60199 +:1034A0006B017C0154E0F694E794D794C7945A9545 +:1034B000D1F7C114D104E104F10419F02C5FC70164 +:1034C000B6016B017C0142E0F694E794D794C7946F +:1034D0004A95D1F7C114D104E104F10419F02E5F2B +:1034E000C701B601DC01CB01B695A79597958795E5 +:1034F000892B8A2B8B2B09F02F5F822FFF90EF9067 +:10350000DF90CF9008958091E501843009F1109209 +:10351000CD0120E488E190E00FB6F894A89580935F +:1035200060000FBE2093600083B7817F846083BFFB +:1035300083B7816083BF7894889583B78E7F83BF7C +:1035400088E10FB6F89480936000109260000FBE7F +:10355000089508950895CF930E94A91A0E94900497 +:103560000E94AA1AC0E08C2F0E948205811104C01B +:10357000CF5FCE30C1F701C081E0CF9108950E94A6 +:103580001A140E94A40E0C949E0782E084BD93E05E +:1035900095BD9AEF97BD80936E0008952FB7F8946C +:1035A0008091CE019091CF01A091D001B091D10135 +:1035B0002FBF0895CF92DF92EF92FF920F931F9348 +:1035C0002FB7F8944091CE015091CF016091D00176 +:1035D0007091D1012FBF6A017B01EE24FF248C0181 +:1035E00020E030E0C016D106E206F30610F44150A8 +:1035F00051099A01281B390BC9011F910F91FF90A6 +:10360000EF90DF90CF9008951F920F920FB60F9218 +:1036100011248F939F93AF93BF938091CE0190918C +:10362000CF01A091D001B091D1010196A11DB11D92 +:103630008093CE019093CF01A093D001B093D1019C +:10364000BF91AF919F918F910F900FBE0F901F90E0 +:1036500018950E94A10BF8942FEF87EA91E621506C +:1036600080409040E1F700C0000087E090EBDC0173 +:103670008093EE019093EF01A093F001B093F101DC +:103680009CE088E10FB6F894A895809360000FBE87 +:1036900090936000FFCFEF92FF920F931F93CF9311 +:1036A000DF93D82FC0E08C2F0E94820500E010E04D +:1036B000E82EF12CC701002E02C0959587950A943B +:1036C000E2F780FD06C00F5F1F4F0630110591F72E +:1036D00009C0602F7C2F80E00E944906D813F3CFE9 +:1036E00081E004C0CF5FCE30F1F680E0DF91CF9172 +:1036F0001F910F91FF90EF900895CF93C82F8CE208 +:103700000E944B1B882321F08C2FCF910C944B1BD4 +:1037100080E0CF910895CF930E94D21C811102C006 +:103720000E94B81CC5E6C15049F00E9490048FE386 +:103730009CE90197F1F700C00000F5CF89E20E94F3 +:103740007D1B811113C18AE20E947D1B81110E94A1 +:10375000B81C85E00E947D1B81110E94291B0E94DC +:10376000DD1C8093CC0187E00E947D1B8823A9F19A +:103770008BE10E947D1B882351F08091CC0181FB5D +:10378000222720F991E0922790FB81F90EC08EE06C +:103790000E947D1B882361F08091CC0182FB22274F +:1037A00020F991E0922790FB82F98093CC0115C01B +:1037B00080E10E947D1B9091CC01882341F093FB16 +:1037C000222720F981E0822780FB93F904C0892F0A +:1037D000809580FB90F99093CC018091CC010E9460 +:1037E000E11C0E94EF1C8093DF0180EE0E947D1B94 +:1037F000882341F08091DF01982F909590FB80F90C +:103800008093DF0189E30E947D1B882359F080911A +:10381000DF0181FB222720F991E0922790FB81F9BB +:103820008093DF0182EE0E947D1B882359F08091F6 +:10383000DF0182FB222720F991E0922790FB82F999 +:103840008093DF0186EE0E947D1B882359F08091D2 +:10385000DF0183FB222720F991E0922790FB83F977 +:103860008093DF0183EE0E947D1B882359F08091B5 +:10387000DF0184FB222720F991E0922790FB84F955 +:103880008093DF0185E30E947D1B882359F080919E +:10389000DF0185FB222720F991E0922790FB85F933 +:1038A0008093DF0181E30E947D1B882359F0809182 +:1038B000DF0186FB222720F991E0922790FB86F911 +:1038C0008093DF0181E10E947D1B882359F0809164 +:1038D000DF0187FB222720F991E0922790FB87F9EF +:1038E0008093DF018091DF010E94F31C8091DF0152 +:1038F00087FB882780F980930D0187E20E947D1B5A +:10390000C82F8EE10E947D1B8111C2608FE10E9451 +:103910007D1B8111C46080E20E947D1B8111C86003 +:1039200081E20E947D1B8111C06182E20E947D1BA9 +:103930008111C06283E20E947D1B8111C06484E218 +:103940000E947D1B882311F0C06802C0CC2329F09F +:103950008C2F0E94EA1C6C2F03C00E94E61C682F6B +:1039600070E080E090E0CF910C94D617CF9108954D +:103970006DEE7EEF80E090E00E941E2360E082E02A +:1039800090E00E94102360E083E090E00E9410230A +:1039900060E084E090E00E94102360E085E090E029 +:1039A0000C94102380E090E00E940A2321E08D3ED9 +:1039B0009E4F09F020E0822F089582E090E00C9461 +:1039C0000223682F82E090E00C94102383E090E0C3 +:1039D0000C940223682F83E090E00C94102384E081 +:1039E00090E00C940223682F84E090E00C94102364 +:1039F0008091D40180FF0BC06091130185E0689F26 +:103A0000B001112475956795759567952BC081FF59 +:103A100009C06091130185E0689FB001112475957C +:103A2000679520C082FF07C06091130185E0689F01 +:103A3000B001112417C09091D5019923D1F0609164 +:103A40001201961788F72091130185E0289F9001B5 +:103A50001124929FA001939F500D112470E0CA0180 +:103A60000E94D4226038710540F46115710539F067 +:103A700002C065E070E0862F08958FE7089581E029 +:103A800008958091D40180FF08C06091110170E019 +:103A9000759567957595679521C081FF06C0609102 +:103AA000110170E07595679519C082FF04C060919F +:103AB000110170E010C09091D5019923C1F060917F +:103AC00010019617A0F780911101899FC001112460 +:103AD00070E00E94D4226038710528F461157105E8 +:103AE00021F0862F08958FE7089581E0089561E021 +:103AF00070E0F4CF803F21F40E94F81C819504C04F +:103B0000813F29F40E94F81C8093D8010895823FD8 +:103B100021F40E94F81C819504C0833F29F40E947F +:103B2000F81C8093D7010895893F19F40E94411D24 +:103B300005C08A3F31F40E94411D81958093D901CF +:103B400008958B3F21F40E94411D819504C08C3F54 +:103B500029F40E94411D8093DA010895843F21F4E5 +:103B60008091D601816017C0853F21F48091D601F4 +:103B7000826011C0863F21F48091D60184600BC021 +:103B8000873F21F48091D601886005C0883F31F4D9 +:103B90008091D60180618093D60108958D3F21F4F4 +:103BA0008091D40181600BC08E3F21F48091D401BB +:103BB000826005C08F3F29F48091D4018460809396 +:103BC000D4010895803F39F48091D80187FF6CC0FB +:103BD0001092D80169C0813F29F48091D80118164C +:103BE000BCF362C09091D701823F29F497FF5CC07B +:103BF0001092D70159C0833F19F41916CCF354C061 +:103C0000893F41F48091D90118160CF04DC01092F3 +:103C1000D9014AC08A3F29F48091D90187FF44C065 +:103C2000F6CF8B3F39F48091DA0187FF3DC01092C7 +:103C3000DA013AC08C3F29F48091DA011816BCF3FE +:103C400033C0843F21F48091D6018E7F17C0853F19 +:103C500021F48091D6018D7F11C0863F21F480919F +:103C6000D6018B7F0BC0873F21F48091D601877FDF +:103C700005C0883F31F48091D6018F7E8093D601B4 +:103C800013C08D3F21F48091D4018E7F0BC08E3FF5 +:103C900021F48091D4018D7F05C08F3F29F480915C +:103CA000D4018B7F8093D4018091D70181110EC004 +:103CB0008091D80181110AC08091D901811106C07B +:103CC0008091DA01811102C01092D501089586ED2C +:103CD00091E00E94BB0E0E94CE1A9093D301809374 +:103CE000D20108951F93CF93DF938091D2019091D9 +:103CF000D3010E94DA1AAC019091D501992321F0E9 +:103D00002091140130E006C0209115018AE0289F1F +:103D1000900111244217530708F486C08091D701FF +:103D2000C091D801D091D9011091DA01811107C059 +:103D3000C11176C0D11174C0111172C075C09F3FFE +:103D400019F09F5F9093D501181624F40E94F81C77 +:103D50008093D7018091D70187FF05C00E94F81C8E +:103D600081958093D7011C1624F40E94F81C80933F +:103D7000D8018091D80187FF05C00E94F81C819569 +:103D80008093D8016091D701662339F1C091D801A1 +:103D9000CC2319F1772767FD7095872F972F0E9405 +:103DA000E52123E333E343E35FE30E9449220E94DA +:103DB000B2216093D7016C2F772767FD7095872F0D +:103DC000972F0E94E52123E333E343E35FE30E945F +:103DD00049220E94B2216093D8011D1624F40E944A +:103DE000411D8093D9018091D90187FF05C00E94B0 +:103DF000411D81958093D901111624F40E94411D23 +:103E00008093DA018091DA0187FF05C00E94411D8D +:103E100081958093DA01DF91CF911F910C94671EF9 +:103E20009F3F09F08ECF96CFDF91CF911F910895DC +:103E3000E6EDF1E085E0DF011D928A95E9F7109249 +:103E4000D5011092D4010895833081F128F4813096 +:103E500059F08230D1F00895853009F449C0B8F1A5 +:103E6000863009F456C0089580911501262F30E060 +:103E7000280F311D2F3F310524F4680F6093150181 +:103E800008958FEF80931501089580911401262FD6 +:103E900030E0280F311D2F3F310524F4680F609367 +:103EA000140108958FEF80931401089580911301F8 +:103EB000262F30E0280F311D2F3F310524F4680FE5 +:103EC0006093130108958FEF8093130108958091FB +:103ED0001201262F30E0280F311D2F3F310524F429 +:103EE000680F6093120108958FEF80931201089577 +:103EF00080911101262F30E0280F311D2F3F310511 +:103F000024F4680F6093110108958FEF80931101DD +:103F1000089580911001262F30E0280F311D2F3F8A +:103F2000310524F4680F6093100108958FEF80939A +:103F300010010895833011F128F4813049F0823066 +:103F400091F00895853081F120F18630C1F1089516 +:103F500080911501681720F4861B80931501089540 +:103F600010921501089580911401681720F4861BA2 +:103F70008093140108951092140108958091130103 +:103F8000681720F4861B8093130108951092130183 +:103F9000089580911201681720F4861B8093120106 +:103FA000089510921201089580911101681720F46C +:103FB000861B80931101089510921101089580913C +:103FC0001001681720F4861B809310010895109249 +:103FD000100108950F931F938D3109F46BC008F001 +:103FE0003FC08E3009F47DC0C0F4873009F46EC044 +:103FF00068F4863009F0AFC08091CC01817F8E7F5C +:104000008093CC0181E08093DC01A6C0883009F464 +:1040100058C08B3009F49BC09EC0863109F497C00C +:1040200078F4803109F470C0813109F094C00E94A5 +:104030001A1490910D0181E0892780930D0187C0AA +:10404000893109F484C08B3109F085C08091CC019D +:1040500081FB222720F991E0922790FB81F94AC049 +:10406000853309F45BC048F4873209F457C008F47B +:104070005AC0893209F452C06EC0833438F48A338E +:1040800008F067C0883309F462C065C0833409F45E +:1040900045C0883409F05FC00E941A140FEF13ED79 +:1040A00020E3015010402040E1F700C000000E94D2 +:1040B000291B4DC00E946C210E94A40E0E949E07E5 +:1040C00046C00E94DD1C0E94EF1C41C09091CC01B3 +:1040D000892F817090FF12C0917F9E7F9093CC01B9 +:1040E0003BC08091CC0182FB222720F991E09227EE +:1040F00090FB82F98093CC01992349F18091CC0106 +:1041000081608093CC0123C08091CC0183FB222766 +:1041100020F991E0922790FB83F9ECCF61E070E009 +:1041200080E090E010C08D5141E050E060E070E030 +:104130008A019B0104C0000F111F221F331F8A95A3 +:10414000D2F7C901B8010E94D6170E941A1481E063 +:1041500003C08953E9CF80E01F910F91089580E05B +:10416000089580E00895CF93C82F8091DC018130BD +:1041700079F018F08230E9F187C0E0910E01F091FA +:104180000F018081813169F0823209F07FC009C05E +:10419000E0910E01F0910F018081813111F08232A6 +:1041A00061F48C2F0E94AF20811104C08C2F0E94DB +:1041B000EA1F1DC081E090E01AC08C2F0E94B12040 +:1041C000811114C0C43179F048F4CB3079F0C0319A +:1041D00009F060C082E08093DC0108C0C93219F0A8 +:1041E000C83321F057C01092DC0154C081E08170C7 +:1041F00053C0C93289F118F5C43171F1A8F4C73040 +:1042000009F046C08AE08093150194E1909314016F +:1042100093E0909313018093120188E08093110141 +:1042200088E28093100134C0CE51C63088F5EC2F5F +:10423000F0E0E65DFE4F80818093DB0129C0CE3443 +:10424000E9F020F4CB3421F56AE013C0C13579F0F0 +:10425000C235F1F461E00DC08091DB01882319F0D3 +:104260001092DB0115C081E08093DC0115C061E094 +:1042700006C08091DB010E94241F0AC06AE0809181 +:10428000DB010E949A1F04C01092DC0180E004C090 +:1042900081E002C080E0ABCFCF910895E1E8F0E08B +:1042A0008081886080838081816080838FB7F8946B +:1042B00093E09093890090ED909388008FBF0895CC +:1042C000EFE6F0E08081826080830895EFE6F0E021 +:1042D00080818D7F80830895EFE6F0E0908182E019 +:1042E0008927808308951F920F920FB60F92112491 +:1042F0002F933F934F935F936F937F938F939F93EE +:10430000AF93BF93EF93FF938091DD019091DE0116 +:1043100001969093DE018093DD01811103C082E05C +:104320000E949E07E091DE01E695E695F0E0EA5CEA +:10433000FA4FE4918091DD018E1303C080E00E946A +:104340009E07FF91EF91BF91AF919F918F917F91C8 +:104350006F915F914F913F912F910F900FBE0F90F2 +:104360001F90189504D06894B1118DC0089570D035 +:1043700088F09F5790F0B92F9927B751A0F0D1F04E +:10438000660F771F881F991F1AF0BA95C9F712C0D8 +:10439000B13081F077D0B1E0089574C0672F782FE5 +:1043A0008827B85F39F0B93FCCF386957795679544 +:1043B000B395D9F73EF490958095709561957F4FB0 +:1043C0008F4F9F4F0895E89409C097FB3EF4909556 +:1043D0008095709561957F4F8F4F9F4F9923A9F0DE +:1043E000F92F96E9BB279395F6958795779567956D +:1043F000B795F111F8CFFAF4BB0F11F460FF1BC0B1 +:104400006F5F7F4F8F4F9F4F16C0882311F096E943 +:1044100011C0772321F09EE8872F762F05C06623F1 +:1044200071F096E8862F70E060E02AF09A95660FAA +:10443000771F881FDAF7880F9695879597F9089563 +:1044400057FD9058440F551F59F05F3F71F0479545 +:10445000880F97FB991F61F09F3F79F0879508952A +:10446000121613061406551FF2CF4695F1DF08C049 +:10447000161617061806991FF1CF86957105610566 +:1044800008940895E894BB2766277727CB0197F90E +:1044900008950BD078C069D028F06ED018F095231D +:1044A00009F05AC05FC01124EECFCADFA0F3959F78 +:1044B000D1F3950F50E0551F629FF001729FBB270B +:1044C000F00DB11D639FAA27F00DB11DAA1F649FB7 +:1044D0006627B00DA11D661F829F2227B00DA11D6A +:1044E000621F739FB00DA11D621F839FA00D611DF0 +:1044F000221F749F3327A00D611D231F849F600D11 +:10450000211D822F762F6A2F11249F5750408AF049 +:10451000E1F088234AF0EE0FFF1FBB1F661F771FD5 +:10452000881F91505040A9F79E3F510570F014C06C +:10453000AACF5F3FECF3983EDCF3869577956795BD +:10454000B795F795E7959F5FC1F7FE2B880F911DF3 +:104550009695879597F9089597F99F6780E870E099 +:1045600060E008959FEF80EC089500240A941616E9 +:10457000170618060906089500240A941216130651 +:10458000140605060895092E0394000C11F48823DF +:1045900052F0BB0F40F4BF2B11F460FF04C06F5FFB +:1045A0007F4F8F4F9F4F089597FB072E16F400946F +:1045B00007D077FD09D00E94EE2207FC05D03EF41B +:1045C000909581959F4F0895709561957F4F0895BF +:1045D000EE0FFF1F0590F491E02D0994AA1BBB1B61 +:1045E00051E107C0AA1FBB1FA617B70710F0A61BF3 +:1045F000B70B881F991F5A95A9F780959095BC0114 +:10460000CD010895F999FECF92BD81BDF89A992701 +:1046100080B50895A8E1B0E042E050E00C94252375 +:10462000262FF999FECF1FBA92BD81BD20BD0FB6CE +:10463000F894FA9AF99A0FBE019608950E941023F1 +:10464000272F0C941123DC01CB01FC01F999FECF3B +:1046500006C0F2BDE1BDF89A319600B40D9241500A +:0A4660005040B8F70895F894FFCF1A +:10466A0020029F072D080A08D607A2070101BA01EE +:10467A0028080A03140A3F4D3639F704AA047404B9 +:10468A003B04CE03E70300041904010203040506F0 +:04469A000708090004 +:00000001FF -- cgit v1.2.3-70-g09d2 From f1c265aace66ab129da152a74527973dfac5a23a Mon Sep 17 00:00:00 2001 From: Roman Zolotarev Date: Fri, 18 Mar 2016 17:55:21 +0800 Subject: Swap volup and voldown --- keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx') diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c index 36526bf2a..150d0f644 100644 --- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c @@ -15,8 +15,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { CTL_T(KC_ESC), KC_A, KC_S, KC_E, KC_T, KC_G, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, TG(PLVR), KC_TRNS, KC_TRNS, KC_LALT, KC_LGUI, - /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_VOLU, KC_MUTE, - /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_VOLD, + /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_VOLD, KC_MUTE, + /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_VOLU, /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_BSPC, KC_ESC, KC_FN1, // /*-*/ KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, -- cgit v1.2.3-70-g09d2 From 7138b1e6fce97dbe73d307b576cbbb2676059058 Mon Sep 17 00:00:00 2001 From: Roman Zolotarev Date: Sat, 19 Mar 2016 17:43:02 +0800 Subject: Update layout --- .../keyboard-layout-editor/arrw.json | 27 -------- .../keyboard-layout-editor/arrw.png | Bin 96737 -> 0 bytes .../keyboard-layout-editor/base.json | 26 -------- .../keyboard-layout-editor/base.png | Bin 129028 -> 0 bytes .../keyboard-layout-editor/plvr.json | 26 -------- .../keyboard-layout-editor/plvr.png | Bin 102077 -> 0 bytes .../keyboard-layout-editor/symb.json | 27 -------- .../keyboard-layout-editor/symb.png | Bin 105763 -> 0 bytes .../romanzolotarev-norman-plover-osx/keymap.c | 73 +++++++++------------ .../romanzolotarev-norman-plover-osx/readme.md | 38 +++++------ .../romanzolotarev-norman-plover-osx.hex | 42 ++++++------ .../romanzolotarev-norman-plover-osx.png | Bin 0 -> 130464 bytes 12 files changed, 67 insertions(+), 192 deletions(-) delete mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.json delete mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.png delete mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.json delete mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.png delete mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.json delete mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.png delete mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.json delete mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.png create mode 100644 keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png (limited to 'keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx') diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.json b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.json deleted file mode 100644 index 814e1cc2a..000000000 --- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.json +++ /dev/null @@ -1,27 +0,0 @@ -[{x:3.5,c:"#eeeeee",a:7},"",{x:10.5},""], -[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""], -[{y:-0.875,x:5.5},"","",{x:4.5},"",""], -[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""], -[{y:-0.375,x:3.5,a:5,fa:[0,2,0,0,0,0,2]},"\nmouse\n\n\n\n\nUP",{x:10.5,a:7,fa:[2]},"UP"], -[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""], -[{y:-0.875,x:5.5},"",{h:1.5},"",{x:4.5,h:1.5},"",""], -[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""], -[{y:-0.375,x:3.5,a:5,fa:[2,2,0,0,0,0,2]},"\nmouse\n\n\n\n\nDOWN",{x:10.5,a:7},"DOWN"], -[{y:-0.875,x:2.5,a:5,fa:[2,1,0,0,0,0,2]},"\nmouse\n\n\n\n\nLEFT",{x:1,fa:[2,2,0,0,0,0,2]},"\nmouse\n\n\n\n\nRIGHT",{x:8.5,a:7},"LEFT",{x:1},"RIGHT"], -[{y:-0.875,x:5.5},"",{x:6.5},""], -[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""], -[{y:-0.625,x:6.5,h:1.5},"",{x:4.5,h:1.5},""], -[{y:-0.75,x:3.5},"",{x:10.5},""], -[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""], -[{y:-0.875,x:5.5},"",{x:6.5},""], -[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""], -[{y:-0.375,x:3.5,a:5,fa:[2,1,0,0,0,0,2]},"\nclick\n\n\n\n\nLEFT",{x:10.5,a:7},""], -[{y:-0.875,x:2.5},"",{x:1,a:5},"\nclick\n\n\n\n\nRIGHT",{x:8.5,a:7},"",{x:1},""], -[{y:-0.75,x:0.5},"","",{x:14.5},"",""], -[{r:30,rx:6.5,ry:4.25,y:-1,x:1},"",""], -[{h:2},"",{h:2},"",""], -[{x:2},""], -[{r:-30,rx:13,y:-1,x:-3},"",""], -[{x:-3},"",{h:2},"",{h:2},""], -[{x:-3},""] - diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.png b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.png deleted file mode 100644 index e2e5779b5..000000000 Binary files a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.png and /dev/null differ diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.json b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.json deleted file mode 100644 index 9e6fc3733..000000000 --- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.json +++ /dev/null @@ -1,26 +0,0 @@ -[{x:3.5,c:"#eeeeee",a:5,fa:[5,7,0,0,0,0,0]},"#\n3",{x:10.5},"*\n8"], -[{y:-0.875,x:2.5},"@\n2",{x:1},"$\n4",{x:8.5},"&\n7",{x:1},"(\n9"], -[{y:-0.875,x:5.5},"%\n5",{a:7},"",{x:4.5},"",{a:5},"^\n6"], -[{y:-0.875,w:1.5},"~\n`","!\n1",{x:14.5},")\n0",{w:1.5},"+\n="], -[{y:-0.375,x:3.5,c:"#cccccc",a:7,fa:[7]},"D",{x:10.5},"R"], -[{y:-0.875,x:2.5,c:"#eeeeee"},"W",{x:1,c:"#cccccc"},"F",{x:8.5,c:"#eeeeee"},"U",{x:1,c:"#cccccc"},"L"], -[{y:-0.875,x:5.5},"K",{c:"#eeeeee",a:5,fa:[5,0,0,0,0,0,7],h:1.5},"|\n\n\n\n\n\n\\",{x:4.5,h:1.5},"?\n\n\n\n\n\n/",{c:"#cccccc",a:7,fa:[7]},"J"], -[{y:-0.875,c:"#eeeeee",fa:[2],w:1.5},"TAB",{fa:[7]},"Q",{x:14.5,c:"#cccccc",a:5,fa:[5,7,0,0,0,0,0]},":\n;",{c:"#eeeeee",w:1.5},"_\n-"], -[{y:-0.375,x:3.5,c:"#cccccc",a:7,fa:[7]},"E",{x:10.5},"I"], -[{y:-0.875,x:2.5,c:"#eeeeee"},"S",{x:1,c:"#cccccc"},"T",{x:8.5},"N",{x:1},"O"], -[{y:-0.875,x:5.5,c:"#eeeeee"},"G",{x:6.5,c:"#cccccc"},"Y"], -[{y:-0.875,c:"#eeeeee",a:5,fa:[7,2,0,0,0,0,2],w:1.5},"\nESC\n\n\n\n\nCTRL",{a:7},"A",{x:14.5,c:"#cccccc"},"H",{c:"#eeeeee",fa:[2],w:1.5},"ENTER"], -[{y:-0.625,x:6.5,a:5,fa:[5,0,0,0,0,0,7],h:1.5},"{\n\n\n\n\n\n[",{x:4.5,h:1.5},"}\n\n\n\n\n\n]"], -[{y:-0.75,x:3.5,a:7,fa:[7]},"C",{x:10.5,a:5,fa:[5,7,0,0,0,0,0]},"<\n,"], -[{y:-0.875,x:2.5,a:7,fa:[7]},"X",{x:1},"V",{x:8.5},"M",{x:1,a:5,fa:[5,7,0,0,0,0,0]},">\n."], -[{y:-0.875,x:5.5,a:7,fa:[7]},"B",{x:6.5,c:"#cccccc"},"P"], -[{y:-0.875,c:"#eeeeee",fa:[2],w:1.5},"SHIFT",{fa:[7]},"Z",{x:14.5,a:5,fa:[5,7,0,0,0,0,0]},"?\n/",{a:7,fa:[2],w:1.5},"SHIFT"], -[{y:-0.375,x:3.5},"ALT",{x:10.5},"ALT"], -[{y:-0.875,x:2.5},"",{x:1},"CMD",{x:8.5},"CTRL",{x:1},""], -[{y:-0.75,x:0.5,f:3},"L2","",{x:14.5},"",""], -[{r:30,rx:6.5,ry:4.25,y:-1,x:1},"VOL-","MUTE"], -[{h:2},"BS",{h:2},"ESC","VOL+"], -[{x:2},"~L1"], -[{r:-30,rx:13,y:-1,x:-3},"PLAY","NEXT"], -[{x:-3},"PREV",{a:5,fa:[5,0,0,0,0,0,7],h:2},"\"\n\n\n\n\n\n'",{a:7,fa:[2],h:2},"SPACE"], -[{x:-3},"~L3"] diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.png b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.png deleted file mode 100644 index 0b8539cfa..000000000 Binary files a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.png and /dev/null differ diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.json b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.json deleted file mode 100644 index 5c3f0b8a2..000000000 --- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.json +++ /dev/null @@ -1,26 +0,0 @@ -[{x:3.5,c:"#eeeeee",a:7},"",{x:10.5},""], -[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""], -[{y:-0.875,x:5.5},"","",{x:4.5},"",""], -[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""], -[{y:-0.375,x:3.5,fa:[7]},"3",{x:10.5},"8"], -[{y:-0.875,x:2.5},"2",{x:1},"4",{x:8.5},"7",{x:1},"9"], -[{y:-0.875,x:5.5},"5",{h:1.5},"",{x:4.5,h:1.5},"","6"], -[{y:-0.875,w:1.5},"","1",{x:14.5},"0",{w:1.5},""], -[{y:-0.375,x:3.5},"E",{x:10.5},"I"], -[{y:-0.875,x:2.5},"W",{x:1},"R",{x:8.5},"U",{x:1},"O"], -[{y:-0.875,x:5.5},"T",{x:6.5},"Y"], -[{y:-0.875,w:1.5},"","Q",{x:14.5},"P",{w:1.5},"["], -[{y:-0.625,x:6.5,h:1.5},"",{x:4.5,h:1.5},""], -[{y:-0.75,x:3.5},"D",{x:10.5},"K"], -[{y:-0.875,x:2.5},"S",{x:1},"F",{x:8.5},"J",{x:1},"L"], -[{y:-0.875,x:5.5},"G",{x:6.5},"H"], -[{y:-0.875,w:1.5},"","A",{x:14.5},";",{w:1.5},"'"], -[{y:-0.375,x:3.5},"",{x:10.5},""], -[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""], -[{y:-0.75,x:0.5},"","",{x:14.5},"",""], -[{r:30,rx:6.5,ry:4.25,y:-1,x:1},"",""], -[{h:2},"C",{h:2},"V",""], -[{x:2},""], -[{r:-30,rx:13,y:-1,x:-3},"",""], -[{x:-3},"",{h:2},"N",{h:2},"M"], -[{x:-3},""] diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.png b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.png deleted file mode 100644 index f8d38204f..000000000 Binary files a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.png and /dev/null differ diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.json b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.json deleted file mode 100644 index ccd1d74e4..000000000 --- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.json +++ /dev/null @@ -1,27 +0,0 @@ -[{x:3.5,c:"#eeeeee",a:7,fa:[7]},"F3",{x:10.5},"F8"], -[{y:-0.875,x:2.5},"F2",{x:1},"F4",{x:8.5},"F7",{x:1},"F9"], -[{y:-0.875,x:5.5},"F5","",{x:4.5},"","F6"], -[{y:-0.875,w:1.5},"","F1",{x:14.5},"F10",{w:1.5},"F11"], -[{y:-0.375,x:3.5},"{",{x:10.5},"8"], -[{y:-0.875,x:2.5},"@",{x:1},"}",{x:8.5},"7",{x:1},"9"], -[{y:-0.875,x:5.5},"|",{h:1.5},"",{x:4.5,h:1.5},"",{fa:[2]},"UP"], -[{y:-0.875,w:1.5},"",{fa:[7]},"!",{x:14.5},"*",{w:1.5},"F12"], -[{y:-0.375,x:3.5},"(",{x:10.5},"5"], -[{y:-0.875,x:2.5},"$",{x:1},")",{x:8.5},"4",{x:1},"6"], -[{y:-0.875,x:5.5},"`",{x:6.5,fa:[2]},"DOWN"], -[{y:-0.875,w:1.5},"",{fa:[7]},"#",{x:14.5},"+",{w:1.5},""], -[{y:-0.625,x:6.5,h:1.5},"",{x:4.5,h:1.5},""], -[{y:-0.75,x:3.5},"[",{x:10.5},"2"], -[{y:-0.875,x:2.5},"^",{x:1},"]",{x:8.5},"1",{x:1},"3"], -[{y:-0.875,x:5.5},"~",{x:6.5},"&"], -[{y:-0.875,w:1.5},"","%",{x:14.5},"\\",{w:1.5},""], -[{y:-0.375,x:3.5},"",{x:10.5},"."], -[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},"0"], -[{y:-0.75,x:0.5},"","",{x:14.5},"=",""], -[{r:30,rx:6.5,ry:4.25,y:-1,x:1},"",""], -[{h:2},"",{h:2},"",""], -[{x:2},""], -[{r:-30,rx:13,y:-1,x:-3},"",""], -[{x:-3},"",{h:2},"",{h:2},""], -[{x:-3},""] - diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.png b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.png deleted file mode 100644 index 83dc2242b..000000000 Binary files a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.png and /dev/null differ diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c index 150d0f644..173fc4ecd 100644 --- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c @@ -9,53 +9,46 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = KEYMAP( - // - KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, - KC_TAB, KC_Q, KC_W, KC_D, KC_F, KC_K, KC_BSLS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_F14, + KC_TAB, KC_Q, KC_W, KC_D, KC_F, KC_K, TG(PLVR), CTL_T(KC_ESC), KC_A, KC_S, KC_E, KC_T, KC_G, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, - TG(PLVR), KC_TRNS, KC_TRNS, KC_LALT, KC_LGUI, + KC_F1, KC_F2, KC_F3, KC_LALT, KC_LGUI, /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_VOLD, KC_MUTE, /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_VOLU, - /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_BSPC, KC_ESC, KC_FN1, + /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_BSPC, CTL_T(KC_ESC), KC_FN1, // - /*-*/ KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, - /*-*/ KC_SLSH, KC_J, KC_U, KC_R, KC_L, KC_SCLN, KC_MINS, - /*-*/ /*-*/ KC_Y, KC_N, KC_I, KC_O, KC_H, KC_ENT, - /*-*/ KC_RBRC, KC_P, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - /*-*/ /*-*/ /*-*/ KC_RCTL, KC_RALT, KC_TRNS, KC_TRNS, KC_TRNS, + /*-*/ KC_F15, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, + /*-*/ KC_BSLS, KC_J, KC_U, KC_R, KC_L, KC_SCLN, KC_MINS, + /*-*/ /*-*/ KC_Y, KC_N, KC_I, KC_O, KC_H, KC_ENT, + /*-*/ KC_RBRC, KC_P, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + /*-*/ /*-*/ /*-*/ KC_RGUI, KC_RALT, KC_F4, KC_F5, KC_F6, KC_MPLY, KC_MNXT, KC_MPRV, KC_FN3, KC_QUOT, KC_SPC - // ), - // [SYMB] = KEYMAP( - // - KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, - KC_TRNS, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS, - KC_TRNS, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, - KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, + KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, + 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_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - /*-*/ KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, - /*-*/ /*-*/ KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, - /*-*/ KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, - /*-*/ /*-*/ /*-*/ KC_TRNS, KC_DOT, KC_0, KC_EQL, KC_TRNS, + /*-*/ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + /*-*/ KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, + /*-*/ /*-*/ KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, 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 - // ), - // [PLVR] = KEYMAP( - // - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_NO, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO, KC_A, KC_S, KC_D, KC_F, KC_G, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, @@ -63,37 +56,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS, /*-*/ /*-*/ /*-*/ /*-*/ KC_C, KC_V, KC_NO, // - /*-*/ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - /*-*/ KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, - /*-*/ /*-*/ KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, - /*-*/ KC_NO, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - /*-*/ /*-*/ /*-*/ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + /*-*/ KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + /*-*/ KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, + /*-*/ /*-*/ KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, + /*-*/ KC_NO, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + /*-*/ /*-*/ /*-*/ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_N, KC_M - // ), - // [ARRW] = KEYMAP( - // KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, + 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_UP, KC_TRNS, KC_TRNS, KC_TRNS, - /*-*/ /*-*/ KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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_UP, KC_TRNS, KC_TRNS, KC_TRNS, + /*-*/ /*-*/ KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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 - // ), }; diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md index 8b03e3323..0777de471 100644 --- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md @@ -3,16 +3,18 @@ There are four layers: - **BASE** is [Norman layout](https://normanlayout.info/). -- **PLVR** is optimized for [Plover](http://www.openstenoproject.org). - **SYMB** for numbers and symbols. +- **PLVR** is optimized for [Plover](http://www.openstenoproject.org). - **ARRW** for navigation. +[![keyboard-layout](romanzolotarev-norman-plover-osx.png)]() + ## Switching -- Tap `~L1` to toggle **SYMB**. -- Tap `~L3` to toggle **ARRW**. -- Hold `~L1` (or `~L3`) to activate **SYMB** (or **ARRW**) while holding. -- Tap `L2` to toggle **PLVR**. +- Tap `SYMB` to toggle **SYMB**. +- Tap `ARRW` to toggle **ARRW**. +- Hold `SYMB` (or `ARRW`) to activate **SYMB** (or **ARRW**) while holding. +- Tap `PLVR` to toggle **PLVR**. ## LEDs @@ -20,6 +22,14 @@ There are four layers: - Green: PLVR is on. - Blue: ARRW is on. +## Functional Keys + +- Tap `F1` to mute microphone via [Shush](http://mizage.com/shush/). +- Tap `F2` to copy screenshot to the clipboard. +- Hold `SHIFT` and tap `F2` to save screenshot as a file. +- Tap `F3`, `F4`, `F5`, `F6` to resize a window via [Divvy](http://mizage.com/divvy/). +- Tap `F14`, `F15` to adjust display brightness. + ## CTRL/ESC Both of those keys are frequently used in Vim. @@ -31,21 +41,3 @@ Both of those keys are frequently used in Vim. - While in **BASE** hold left `SHIFT` and right `SHIRT` and then tap `N`. - Then you can activate **PLVR** and use ErgoDox EZ for steno. - -## Layers - -BASE - -![base](keyboard-layout-editor/base.png) - -SYMB - -![symb](keyboard-layout-editor/symb.png) - -PLVR - -![plvr](keyboard-layout-editor/plvr.png) - -ARRW - -![arrw](keyboard-layout-editor/arrw.png) diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.hex b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.hex index eeb0eb935..b5eded6e6 100644 --- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.hex +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.hex @@ -12,42 +12,42 @@ :1000B0006B0E7D0D6B0EC20DE50D6B0E3A0E4D0EE7 :1000C0002F112F115E115E11A111DF11F813F8131A :1000D000F811F813F912F912CC13F813F813E3130B -:1000E0000000F0A1F0A2F0A335022B002971E1007D -:1000F000025400001E00140004001D000100C10095 -:100100001F001A0016001B00010029002000070034 +:1000E0000000F0A1F0A2F0A335002B002971E1007F +:1000F0003A0000001E00140004001D003B00C10077 +:100100001F001A0016001B003C0029712000070088 :1001100008000600E2002A0021000900170019006B -:10012000E300AA0022000E000A0005000000A9005A -:100130000100310000002F000000A800010038007D +:10012000E300A90022000E000A0005000000AA005A +:100130006900025400002F000000A8006A0031008E :10014000000030000000AE0023000D001C00130072 -:100150000000AB002400180011001000E400AC0007 +:100150000000AB002400180011001000E700AC0004 :10016000250015000C003600E6002C0026000F00CC -:100170001200370001003400270033000B00380064 -:100180000100C3002E002D002800E5000100000042 -:100190000100010001000100010000003A001E0200 -:1001A00020022202010001003B001F022102230263 -:1001B000010001003C002F0226022F000100010077 -:1001C0003D00300227023000010001003E003102F4 -:1001D00035003502000001000100010000000100AF +:10017000120037003D003400270033000B00380028 +:100180003E00C3002E002D002800E5003F000000C7 +:1001900001000100010001000100000001001E003B +:1001A0001E0201000100010001001F001F020100EA +:1001B00001000100010020002002010001000100F7 +:1001C00001002100210201000100010001002200C4 +:1001D00022020100000001000100010000000100F6 :1001E000000001000100010000000100000001000A -:1001F0003F00520051002402000001004000240092 -:1002000021001E00010001004100250022001F0006 -:1002100037000100420026002300200027000100D3 -:10022000430025022E0231002E000100440045004B +:1001F000010023002302010000000100010024008F +:100200002402010001000100010025002502010077 +:10021000010001000100260026020100010001008A +:100220000100270027020100010001000100010078 :1002300001000100010000000000000000000000BB :100240000100000000001E00140004000100000076 :1002500000001F001A001600010019000000200015 :10026000080007000000060000002100150009003A :10027000000001000000220017000A000000010039 -:10028000000000000000000000000100000000006D +:10028000010001000000000000000100010000006A :100290000000000000000100000023001C000B0013 :1002A000000001000000240018000D000000010003 :1002B000000025000C000E000000100000002600C9 :1002C00012000F000000110000002700130033008F :1002D00000000000000000002F00340000000000BB :1002E0000100010001000100010000000100010007 -:1002F000010001000100010001000100F200010005 -:10030000010001000100F000F1000100F400010013 -:1003100001000100F3000100F500010001000100EF +:1002F00001000100010001000100F400F200010012 +:10030000010001000100F000F10001000100010006 +:100310000100F500F30001000100010001000100EF :1003200001000100000001000100010000000100C7 :1003300000000100010001000000010000000100B8 :1003400001000100010001000000010001000100A6 diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png new file mode 100644 index 000000000..10b0752be Binary files /dev/null and b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png differ -- cgit v1.2.3-70-g09d2 From a429374b7842cbacb68e11c5b68b868790823c2a Mon Sep 17 00:00:00 2001 From: Roman Zolotarev Date: Sat, 19 Mar 2016 17:53:58 +0800 Subject: Update readme --- keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx') diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md index 0777de471..6f182d0d8 100644 --- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md @@ -7,7 +7,7 @@ There are four layers: - **PLVR** is optimized for [Plover](http://www.openstenoproject.org). - **ARRW** for navigation. -[![keyboard-layout](romanzolotarev-norman-plover-osx.png)]() +[![keyboard-layout](romanzolotarev-norman-plover-osx.png)](http://www.keyboard-layout-editor.com/#/gists/8ebcb701ecb763944417) ## Switching -- cgit v1.2.3-70-g09d2