From 90a65347294e93ee23c1f24c6ae342a42e6c2b29 Mon Sep 17 00:00:00 2001 From: Nicholas Keene Date: Thu, 5 May 2016 22:55:55 -0500 Subject: The Ordinary Layout is extraordinarily familiar and powerful --- keyboard/ergodox_ez/keymaps/ordinary/keymap.c | 197 +- .../ergodox_ez/keymaps/ordinary/ordinary-base.png | Bin 100472 -> 99605 bytes .../ergodox_ez/keymaps/ordinary/ordinary-base.txt | 10 +- .../ergodox_ez/keymaps/ordinary/ordinary-media.png | Bin 124173 -> 124144 bytes .../ergodox_ez/keymaps/ordinary/ordinary-media.txt | 8 +- .../keymaps/ordinary/ordinary-special.png | Bin 0 -> 63065 bytes .../keymaps/ordinary/ordinary-special.txt | 27 + .../keymaps/ordinary/ordinary-symbol.png | Bin 103677 -> 103735 bytes .../keymaps/ordinary/ordinary-symbol.txt | 4 +- keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex | 2415 ++++++++++---------- keyboard/ergodox_ez/keymaps/ordinary/readme.md | 37 +- 11 files changed, 1373 insertions(+), 1325 deletions(-) create mode 100644 keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.png create mode 100644 keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.txt (limited to 'keyboard/ergodox_ez') diff --git a/keyboard/ergodox_ez/keymaps/ordinary/keymap.c b/keyboard/ergodox_ez/keymaps/ordinary/keymap.c index 6905cbc7a6..6af3720fdc 100644 --- a/keyboard/ergodox_ez/keymaps/ordinary/keymap.c +++ b/keyboard/ergodox_ez/keymaps/ordinary/keymap.c @@ -7,26 +7,29 @@ #define BASE 0 // default layer #define SYMB 1 // symbols layer #define MDIA 2 // media layer -#define LOCK 3 // shift-lock layer +#define SPEC 3 // special layer #define LCaps 10 // left caps-shift key #define LSymb 11 // left symbol-shift key #define LMdia 12 // left media-shift key -#define LLock 13 // left shift-lock key -#define RCaps 20 // right caps-shift key -#define RSymb 21 // right symbol-shift key -#define RMdia 22 // right media-shift key -#define RLock 23 // right shift-lock key +#define LSpec 13 // left special-shift key +#define RCaps 14 // right caps-shift key +#define RSymb 15 // right symbol-shift key +#define RMdia 16 // right media-shift key +#define RSpec 17 // right special-shift key -#define MUL 30 // mouse up left -#define MUR 31 // mouse up right -#define MDL 32 // mouse down left -#define MDR 33 // mouse down right +#define MUL 20 // mouse up left +#define MUR 21 // mouse up right +#define MDL 22 // mouse down left +#define MDR 23 // mouse down right /* - * The Ordinary Layout for the Ergodox EZ keyboard, v3.141 + * The Ordinary Layout for the Ergodox EZ keyboard, v4 * * Modifications from default by Nicholas Keene ergodoxez@nicholaskeene.com + * + * No rights reserved. This software is in the public domain. + * Credit me if you are friendly but if you're a jerk don't bother. * * Details: readme.md * https://github.com/nrrkeene/qmk_firmware/tree/master/keyboard/ergodox_ez/keymaps/ordinary @@ -36,37 +39,37 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /******* Base Layer ******************************************************************************************************** * - * ,-----------------------------------------------------. ,-----------------------------------------------------. - * | Lock `~ | 1 | 2 | 3 | 4 | 5 | ESC | | - | 6 | 7 | 8 | 9 | 0 | =+ Lock | - * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| - * | Media Tab | Q | W | E | R | T | [ | | ] | Y | U | I | O | P | \| Media | - * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| - * | Symbol | A | S | D | F | G |------| |------| H | J | K | L | ; | '" Symbol | - * |-----------+------+------+------+------+------|Shift | | Tab |------+------+------+------+------+-----------| - * | LShift | Z | X | C | V | B | -Tab | | | N | M | , | . | / | LShift | - * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' - * | LCtrl | Meh |Hyper | LAlt | LGui | | RGui | RAlt | Hyper| Meh | RCtrl | - * `-----------------------------------' `-----------------------------------' - * ,-------------. ,-------------. - * | Home | End | | Left | Right| - * ,------|------|------| |------+------+------. - * | | | PgUp | | Up | | | - * |Backsp| Del |------| |------| Enter| Space| - * | | | PgDn | | Down | | |Aa - * `--------------------' `--------------------' + * ,------------------------------------------------------. ,------------------------------------------------------. + * | Special `~ | 1 | 2 | 3 | 4 | 5 | ESC | | - | 6 | 7 | 8 | 9 | 0 | =+ Special | + * |------------+------+------+------+------+-------------| |------+------+------+------+------+------+------------| + * | Media Tab | Q | W | E | R | T | [ | | ] | Y | U | I | O | P | \| Media | + * |------------+------+------+------+------+------| | | |------+------+------+------+------+------------| + * | Symbol | A | S | D | F | G |------| |------| H | J | K | L | ; | '" Symbol | + * |------------+------+------+------+------+------|Shift | | Tab |------+------+------+------+------+------------| + * | Capitals | Z | X | C | V | B | -Tab | | | N | M | , | . | / | Capitals | + * `------------+------+------+------+------+-------------' `-------------+------+------+------+------+------------' + * | LCtrl | Meh |Hyper | LAlt | LGui | | RGui | RAlt | Hyper| Meh | RCtrl | + * `-----------------------------------' `-----------------------------------' + * ,-------------. ,-------------. + * | Home | End | | Left | Right| + * ,------|------|------| |------+------+------. + * | | | PgUp | | Up | | | + * |Backsp| Del |------| |------| Enter| Space| + * | | | PgDn | | Down | | | + * `--------------------' `--------------------' */ [BASE] = KEYMAP( // left hand - F(LLock) ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,KC_ESC + F(LSpec),KC_1,KC_2,KC_3 ,KC_4 ,KC_5 ,KC_ESC ,F(LMdia) ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,KC_LBRC ,M(LSymb) ,KC_A ,KC_S ,KC_D ,KC_F ,KC_G -,M(LCaps) ,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,LSFT(KC_TAB) +,M(LCaps) ,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,LSFT(KC_TAB) ,KC_LCTL ,KC_MEH ,KC_HYPR,KC_LALT,KC_LGUI ,KC_HOME,KC_END ,KC_PGUP ,KC_BSPC,KC_DEL ,KC_PGDN // right hand - ,KC_MINS ,KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,F(RLock) + ,KC_MINS ,KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,F(RSpec) ,KC_RBRC ,KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,F(RMdia) ,KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN ,F(RSymb) ,KC_TAB ,KC_N ,KC_M ,KC_COMM,KC_DOT ,KC_SLSH ,M(RCaps) @@ -127,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+---------+---------+---------+---------+---------| Up | | Up |---------+---------+---------+---------+---------+------| * | | Sleep |MouseLeft|MouseDown|MouseRght|Volume Dn|------| |------| Num Lock| Left | Down | Right | MyComp | | * |------+---------+---------+---------+---------+---------|Scroll| |Scroll|---------+---------+---------+---------+---------+------| - * | | |MouseDnLf|MouseDown|MouseDnRg| Mute | Down | | Down | | End | Down | PgDn | RShift | | + * | | |MouseDnLf|MouseDown|MouseDnRg| Mute | Down | | Down | | End | Down | PgDn | | | * `------+---------+---------+---------+---------+----------------' `----------------+---------+---------+---------+---------+------' * |LCtrl| Meh | MClick | LClick | R Click| |Cmd/Insrt|Optn/Del | Hyper | Meh |RCtrl| * `---------------------------------------------' `---------------------------------------------' @@ -153,14 +156,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ,KC_NO ,KC_F16 ,KC_F17 ,KC_F18 ,KC_F19 ,KC_F20 ,KC_TRNS ,KC_WH_U ,KC_PSCR ,KC_HOME ,KC_UP ,KC_PGUP ,KC_MAIL ,KC_TRNS ,KC_NLCK ,KC_LEFT ,KC_DOWN ,KC_RIGHT,KC_MYCM ,KC_TRNS - ,KC_WH_D ,KC_NO ,KC_END ,KC_DOWN ,KC_PGDN ,KC_RSFT ,KC_TRNS + ,KC_WH_D ,KC_NO ,KC_END ,KC_DOWN ,KC_PGDN ,KC_NO ,KC_TRNS ,GUI_T(KC_INS),ALT_T(KC_DEL),KC_HYPR ,KC_MEH ,KC_RCTL ,KC_MPRV ,KC_MNXT ,KC_VOLU ,KC_VOLD ,KC_MSTP ,KC_MPLY ), -/******* Lock Layer ******************************************************************************************************** +/******* Special Layer ***************************************************************************************************** * * ,-----------------------------------------------------. ,-----------------------------------------------------. * | | Esc | | | | | | | | | | | | Bspc | | @@ -169,7 +172,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| * | | | | | | |------| |------| | | | | | | * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| - * | Caps LOCK | | | | | | | | | | | | | | Caps LOCK | + * | | | | | | | | | | | | | | | RShift | * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' @@ -181,12 +184,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | * `--------------------' `--------------------' */ -[LOCK] = KEYMAP( +[SPEC] = KEYMAP( // left hand KC_TRNS ,KC_ESC ,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_CAPS ,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 @@ -196,7 +199,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_BSPC ,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_CAPS + ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_RSFT ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS @@ -206,65 +209,77 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; const uint16_t PROGMEM fn_actions[] = { - // the six faux shift keys are implemented as macro taps - [LSymb] = ACTION_MACRO_TAP(LSymb) + // the faux shift keys are implemented as macro taps + [LCaps] = ACTION_MACRO_TAP(LCaps) + ,[LSymb] = ACTION_MACRO_TAP(LSymb) ,[LMdia] = ACTION_MACRO_TAP(LMdia) - ,[LLock] = ACTION_MACRO_TAP(LLock) + ,[LSpec] = ACTION_MACRO_TAP(LSpec) + ,[RCaps] = ACTION_MACRO_TAP(RCaps) ,[RSymb] = ACTION_MACRO_TAP(RSymb) ,[RMdia] = ACTION_MACRO_TAP(RMdia) - ,[RLock] = ACTION_MACRO_TAP(RLock) + ,[RSpec] = ACTION_MACRO_TAP(RSpec) }; uint16_t caps_shift = 0; -uint16_t symb_shift = 0; // there are two shift keys for each layer, and two lock -uint16_t mdia_shift = 0; // keys; we increment a counter for each key pressed and -uint16_t shift_lock = 0; // decrement when released. +uint16_t symb_shift = 0; +uint16_t mdia_shift = 0; -bool symb_lock = false; // when shift-lock is used in conjunction with a shift -bool mdia_lock = false; // key the lock flag is toggled +bool symb_lock = false; +bool mdia_lock = false; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { switch(id) { - // shift and lock between layers?L? + // There are two shift keys for each layer so we increment a layer_shift var when one + // is pressed and decrement when one is released. If both are pressed at the same time + // then the layer is locked (or unlocked). The shift counts are bound between 0 and 2 + // only because sometimes rapid pressing led to irregular events; this way the states + // are self healing during use. case LCaps: // both caps-shift keys trigger Left Shift case RCaps: // so they don't interfere with the magic combo if (record->event.pressed && !record->tap.count) { if(++caps_shift > 2) caps_shift = 2; - if(shift_lock) { + if(caps_shift == 2) { register_code(KC_CAPS); unregister_code(KC_CAPS); + } else if(caps_shift == 1) { + register_code(KC_LSFT); } - register_code(KC_LSFT); } else { if(--caps_shift < 0) caps_shift = 0; - if(!caps_shift) unregister_code(KC_LSFT); + if(caps_shift == 0) unregister_code(KC_LSFT); } break; case LSymb: if (record->event.pressed) { if(++symb_shift > 2) symb_shift = 2; - if(shift_lock) symb_lock = !symb_lock; - layer_on(SYMB); + if(symb_shift == 2) { + symb_lock = !symb_lock; + } else if(symb_shift == 1) { + layer_on(SYMB); + } } else { if(--symb_shift < 0) symb_shift = 0; - if((!symb_shift) && (!symb_lock)) layer_off(SYMB); + if((symb_shift == 0) && (!symb_lock)) layer_off(SYMB); } break; case LMdia: if (record->event.pressed) { - if (record->tap.count && !shift_lock) { + if (record->tap.count && (!mdia_shift) && (!mdia_lock)) { register_code(KC_TAB); } else { if(++mdia_shift > 2) mdia_shift = 2; - if(shift_lock) mdia_lock = !mdia_lock; - layer_on(MDIA); + if(mdia_shift == 2) { + mdia_lock = !mdia_lock; + } else if(mdia_shift == 1) { + layer_on(MDIA); + } } } else { - if(record->tap.count && !shift_lock) { + if(record->tap.count && (!mdia_shift) && (!mdia_lock)) { unregister_code(KC_TAB); } else { if(--mdia_shift < 0) mdia_shift = 0; @@ -273,37 +288,36 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) } break; - case LLock: + case LSpec: if (record->event.pressed) { - if(++shift_lock > 2) shift_lock = 2; - if(caps_shift) { - register_code(KC_CAPS); - unregister_code(KC_CAPS); - } - if(symb_shift) symb_lock = !symb_lock; - if(mdia_shift) mdia_lock = !mdia_lock; - layer_on(LOCK); - } else { - if(record->tap.count && !record->tap.interrupted && !symb_shift && !mdia_shift) { + if (record->tap.count && !record->tap.interrupted) { register_code(KC_GRV); + } else { + layer_on(SPEC); + } + } else { + if(record->tap.count && !record->tap.interrupted) { unregister_code(KC_GRV); + } else { + layer_off(SPEC); } - if(--shift_lock < 0) shift_lock = 0; - if(!shift_lock) layer_off(LOCK); } break; case RSymb: if (record->event.pressed) { - if (record->tap.count && !shift_lock) { + if (record->tap.count && (!symb_shift) && (!symb_lock)) { register_code(KC_QUOT); } else { if(++symb_shift > 2) symb_shift = 2; - if(shift_lock) symb_lock = !symb_lock; - layer_on(SYMB); + if(symb_shift == 2) { + symb_lock = !symb_lock; + } else if(symb_shift == 1) { + layer_on(SYMB); + } } } else { - if(record->tap.count && !shift_lock) { + if(record->tap.count && symb_shift == 0) { unregister_code(KC_QUOT); } else { if(--symb_shift < 0) symb_shift = 0; @@ -314,15 +328,18 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) case RMdia: if (record->event.pressed) { - if (record->tap.count && !shift_lock) { + if (record->tap.count && (!mdia_shift) && (!mdia_lock)) { register_code(KC_BSLS); } else { if(++mdia_shift > 2) mdia_shift = 2; - if(shift_lock) mdia_lock = !mdia_lock; - layer_on(MDIA); + if(mdia_shift == 2) { + mdia_lock = !mdia_lock; + } else if(mdia_shift == 1) { + layer_on(MDIA); + } } } else { - if(record->tap.count && !shift_lock) { + if(record->tap.count && (!mdia_shift) && (!mdia_lock)) { unregister_code(KC_BSLS); } else { if(--mdia_shift < 0) mdia_shift = 0; @@ -331,23 +348,19 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) } break; - case RLock: + case RSpec: if (record->event.pressed) { - if(++shift_lock > 2) shift_lock = 2; - if(caps_shift) { - register_code(KC_CAPS); - unregister_code(KC_CAPS); + if (record->tap.count && !record->tap.interrupted) { + register_code(KC_EQL); + } else { + layer_on(SPEC); } - if(symb_shift) symb_lock = !symb_lock; - if(mdia_shift) mdia_lock = !mdia_lock; - layer_on(LOCK); } else { - if (record->tap.count && !record->tap.interrupted && !symb_shift && !mdia_shift) { - register_code(KC_EQL); + if(record->tap.count && !record->tap.interrupted) { unregister_code(KC_EQL); + } else { + layer_off(SPEC); } - if(--shift_lock < 0) shift_lock = 0; - if(!shift_lock) layer_off(LOCK); } break; diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png index 2864031b1b..9c561a10aa 100644 Binary files a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png and b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png differ diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt index 66cd05503e..25731ea2e6 100644 --- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt +++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt @@ -1,7 +1,7 @@ [{x:3.5},"#\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",{c:"#ff4444"},"Esc",{x:4.5,c:"#cccccc"},"_\n\n\n\n\n\n-","^\n6"], -[{y:-0.875,c:"#2277ff",w:1.5},"Shift\n\n~\n\n\n\nLock\n`",{c:"#cccccc"},"!\n1",{x:14.5},")\n0",{c:"#2277ff",w:1.5},"+\n\nShift\n\n\n\n=\nLock"], +[{y:-0.875,c:"#2277ff",w:1.5},"Special\n\n~\n\n\n\nShift\n`",{c:"#cccccc"},"!\n1",{x:14.5},")\n0",{c:"#2277ff",w:1.5},"+\n\nSpecial\n\n\n\n=\nShift"], [{y:-0.375,x:3.5,c:"#cccccc"},"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",{h:1.5},"{\n\n\n\n\n\n[",{x:4.5,h:1.5},"}\n\n\n\n\n\n]","Y"], @@ -15,11 +15,11 @@ [{y:-0.875,x:2.5},"X",{x:1},"V",{x:8.5},"M",{x:1},">\n."], [{y:-0.875,x:5.5},"B",{x:6.5},"N"], [{y:-0.875,c:"#2277ff",w:1.5},"Capitals\n\n\n\n\n\nShift",{c:"#cccccc"},"Z",{x:14.5},"?\n/",{c:"#2277ff",w:1.5},"\n\nCapitals\n\n\n\n\nShift"], -[{y:-0.375,x:3.5,c:"#77aaff",f:3},"Option\n\n\nLAlt",{x:10.5,f:3},"Option\n\n\nRAlt"], -[{y:-0.875,x:2.5},"Hyper",{x:1,f:3},"Cmd\n\n\nSuper",{x:8.5,f:3},"Cmd\n\n\nSuper",{x:1},"Hyper"], -[{y:-0.75,x:0.5,f:3},"Ctrl\n\n\nLCtrl","Meh",{x:14.5},"Meh",{f:3},"Ctrl\n\n\nRCtrl"], +[{y:-0.375,x:3.5,c:"#77aaff"},"Option\n\n\nLAlt",{x:10.5},"Option\n\n\nRAlt"], +[{y:-0.875,x:2.5},"Hyper",{x:1},"Cmd\n\n\nSuper",{x:8.5},"Cmd\n\n\nSuper",{x:1},"Hyper"], +[{y:-0.75,x:0.5},"Ctrl\n\n\nLCtrl","Meh",{x:14.5},"Meh","Ctrl\n\n\nRCtrl"], [{r:30,rx:6.5,ry:4.25,y:-1,x:1,c:"#54d6de"},"Home","End"], -[{f:3,h:2},"< Del\n\n\nBackspace",{f:3,h:2},"Del >\n\n\nDelete","Page\n\n\n\n\n\nUp"], +[{h:2},"< Del\n\n\nBackspace",{h:2},"Del >\n\n\nDelete","Page\n\n\n\n\n\nUp"], [{x:2},"Page\n\n\n\n\n\nDown"], [{r:-30,rx:13,y:-1,x:-3},"Left","Right"], [{x:-3},"Up",{h:2},"Enter",{h:2},"Space"], diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png index 85b08cc092..99e5ed80b1 100644 Binary files a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png and b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png differ diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt index 815e2f5baf..4eccc9f350 100644 --- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt +++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt @@ -1,7 +1,7 @@ [{x:3.5,c:"#99de2a"},"F13",{x:10.5},"F18"], [{y:-0.875,x:2.5},"F12",{x:1},"F14",{x:8.5},"F17",{x:1},"F19"], -[{y:-0.875,x:5.5},"F15",{c:"#ff4444"},"Esc",{x:4.5,c:"#cccccc",a:7},"",{c:"#99de2a",a:4},"F16"], -[{y:-0.875,c:"#2277ff",w:1.5},"Shift\n\n\n\n\n\nLock",{c:"#99de2a"},"F11",{x:14.5},"F20",{c:"#2277ff",w:1.5},"\n\nShift\n\n\n\n\nLock"], +[{y:-0.875,x:5.5},"F15",{c:"#ff4444"},"Esc",{x:4.5,c:"#737373",a:7},"",{c:"#99de2a",a:4},"F16"], +[{y:-0.875,c:"#2277ff",w:1.5},"Special\n\n\n\n\n\nShift",{c:"#99de2a"},"F11",{x:14.5},"F20",{c:"#2277ff",w:1.5},"\n\nSpecial\n\n\n\n\nShift"], [{y:-0.375,x:3.5,c:"#ff8500"},"Mouse\n\n\n\n\n\nUp",{x:10.5},"Cursor\n\n\n\n\n\nUp"], [{y:-0.875,x:2.5},"Mouse\n\n\n\n\n\nUpLeft",{x:1},"Mouse\n\n\n\n\n\nUpRgt",{x:8.5,c:"#ffb063"},"Home",{x:1},"Page\n\n\n\n\n\nUp"], [{y:-0.875,x:5.5,c:"#e6e067"},"Vol\n\n\n\n\n\nUp",{c:"#ffb063",h:1.5},"Scroll\n\n\n\n\n\nUp",{x:4.5,h:1.5},"Scroll\n\n\n\n\n\nUp",{c:"#e6e067"},"Print\n\n\n\n\n\nScreen"], @@ -13,8 +13,8 @@ [{y:-0.625,x:6.5,c:"#ffb063",h:1.5},"Scroll\n\n\n\n\n\nDown",{x:4.5,h:1.5},"Scroll\n\n\n\n\n\nDown"], [{y:-0.75,x:3.5,c:"#ff8500"},"Mouse\n\n\n\n\n\nDown",{x:10.5},"Cursor\n\n\n\n\n\nDown"], [{y:-0.875,x:2.5},"Mouse\n\n\n\n\n\nDnLeft",{x:1},"Mouse\n\n\n\n\n\nDnRgt",{x:8.5,c:"#ffb063"},"End",{x:1},"Page\n\n\n\n\n\nDown"], -[{y:-0.875,x:5.5,c:"#e6e067"},"Mute",{x:6.5,c:"#cccccc",a:7},""], -[{y:-0.875,c:"#2277ff",a:4,w:1.5},"Capitals\n\n\n\n\n\nShift",{c:"#cccccc",a:7},"",{x:14.5,c:"#77aaff",a:4},"RShift",{c:"#2277ff",w:1.5},"\n\nCapitals\n\n\n\n\nShift"], +[{y:-0.875,x:5.5,c:"#e6e067"},"Mute",{x:6.5,c:"#737373",a:7},""], +[{y:-0.875,c:"#2277ff",a:4,w:1.5},"Capitals\n\n\n\n\n\nShift",{c:"#737373",a:7},"",{x:14.5},"",{c:"#2277ff",a:4,w:1.5},"\n\nCapitals\n\n\n\n\nShift"], [{y:-0.375,x:3.5,c:"#ff8500"},"Middle\n\n\n\n\n\nClick",{x:10.5,c:"#ffb063",fa:[0,0,0,1]},"Delete\n\n\nOption"], [{y:-0.875,x:2.5,c:"#ff8500"},"Left\n\n\n\n\n\nClick",{x:1},"Right\n\n\n\n\n\nClick",{x:8.5,c:"#ffb063"},"Insert\n\n\nCmd",{x:1,c:"#77aaff"},"Hyper"], [{y:-0.75,x:0.5},"Ctrl\n\n\nLCtrl","Meh",{x:14.5},"Meh","Crtl\n\n\nRCtrl"], diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.png b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.png new file mode 100644 index 0000000000..6eecf447ee Binary files /dev/null and b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.png differ diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.txt b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.txt new file mode 100644 index 0000000000..a08827c6de --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.txt @@ -0,0 +1,27 @@ +[{x:3.5,a:7},"",{x:10.5},""], +[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""], +[{y:-0.875,x:5.5},"",{c:"#ff4444",a:4},"Esc",{x:4.5,c:"#cccccc",a:7},"",""], +[{y:-0.875,c:"#000000",t:"#ff0000",a:4,w:1.5},"Special\n\n\n\n\n\nShift",{c:"#ff4444",t:"#000000"},"Esc",{x:14.5,c:"#54d6de"},"Back\n\n\n\n\n\nspace",{c:"#000000",t:"#ff0000",w:1.5},"\n\nSpecial\n\n\n\n\nShift"], +[{y:-0.375,x:3.5,c:"#cccccc",t:"#000000",a:7},"",{x:10.5},""], +[{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},"",{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.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},"",{c:"#2277ff",w:1.5},"RShift"], +[{y:-0.375,x:3.5,c:"#cccccc"},"",{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},"",{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/ordinary/ordinary-symbol.png b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png index 2cf2cb2b10..e4de64a96f 100644 Binary files a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png and b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png differ diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt index 4b6a6cb95e..e199f5c59f 100644 --- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt +++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt @@ -1,7 +1,7 @@ [{x:3.5,c:"#99de2a"},"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",{c:"#ff4444"},"Esc",{x:4.5,c:"#bbddbb"},"_\n\n\n\n\n\n-",{c:"#99de2a"},"F6"], -[{y:-0.875,c:"#2277ff",w:1.5},"Shift\n\n\n\n\n\nLock",{c:"#99de2a"},"F1",{x:14.5},"F10",{c:"#2277ff",w:1.5},"\n\nShift\n\n\n\n\nLock"], +[{y:-0.875,c:"#2277ff",w:1.5},"Special\n\n\n\n\n\nShift",{c:"#99de2a"},"F1",{x:14.5},"F10",{c:"#2277ff",w:1.5},"\n\nSpecial\n\n\n\n\nShift"], [{y:-0.375,x:3.5,c:"#bbddbb"},"{",{x:10.5,c:"#89b087"},"8"], [{y:-0.875,x:2.5,c:"#bbddbb"},"@",{x:1},"}",{x:8.5,c:"#89b087"},"7",{x:1},"9"], [{y:-0.875,x:5.5,c:"#bbddbb"},"&",{h:1.5},"<",{x:4.5,h:1.5},">","|"], @@ -22,6 +22,6 @@ [{h:2},"Space",{h:2},"Enter","Up"], [{x:2},"Down"], [{r:-30,rx:13,y:-1,x:-3},"Home","End"], -[{x:-3},"Page\n\n\n\n\n\nUp",{f:3,h:2},"< Del\n\n\nBackspace",{f:3,h:2},"Del >\n\n\nDelete"], +[{x:-3},"Page\n\n\n\n\n\nUp",{h:2},"< Del\n\n\nBackspace",{h:2},"Del >\n\n\nDelete"], [{x:-3},"Page\n\n\n\n\n\nDown"] diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex b/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex index 25fdc51714..347b494643 100644 --- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex +++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex @@ -1,1215 +1,1202 @@ -:100000000C94E7020C942B030C942B030C942B03FD -:100010000C942B030C942B030C942B030C942B03A8 -:100020000C942B030C942B030C94B10E0C94830FA3 -:100030000C942B030C942B030C942B030C942B0388 -:100040000C942B030C9402240C942B030C942B0380 -:100050000C942B030C94A61D0C942B030C942B03D3 -:100060000C942B030C942B030C942B030C942B0358 -:100070000C942B030C942B030C942B030C942B0348 -:100080000C942B030C942B030C942B030C942B0338 -:100090000C942B030C942B030C942B030C942B0328 -:1000A0000C942B030C942B030C942B033B036A033B -:1000B000A603DF03F804F804F804F804F804F804CD -:1000C0003B038A03C3036704F804F804F804F80444 -:1000D000F804F804BB04C504CF04E104E80F0A10D7 -:1000E000F5100A10F5104C106F10F510C410D71051 -:1000F000D113D11312141214541490149016901694 -:10010000A81490169F159F156A16901690167E16C5 -:1001100000000000000000000000000000000000DF -:100120000000000000000BC80CC80DC80000000053 -:100130000000000000000000000015C816C817C825 -:100140000D200C200B300A30E00000001E001400CF -:1001500004001D0000074E001F001A0016001B00BF -:10016000000F4C002000080007000600E2002A00F3 -:100170002100150009001900E3004B0022001700C0 -:100180000A00050000004A0029002F0000002B0291 -:1001900000004D002D00300000002B00000050003A -:1001A00023001C000B00110000004F002400180069 -:1001B0000D001000E700520025000C000E00360074 -:1001C000E6002C00260012000F003700000F280068 -:1001D00027001300330038000007510017201620B5 -:1001E00015201430E40000000100010001000100AE -:1001F000E00000003A001E02200222020007510027 -:100200003B001F0221022302000F28003C002F02A6 -:1002100026022F00E2002C003D00300227023000B1 -:10022000E30052003E002402350035020000500079 -:100230002900360200002B0000004F002D0037027D -:1002400000002B0200004A003F003102380031005C -:1002500000004D004000240021001E0027784B00C4 -:100260004100250022001F0037744C004200260088 -:10027000230020002E7F2A004300380025022D0095 -:100280002E774E00010001000100010028710000DE -:100290000100010001000100E000000044006600D0 -:1002A000A60000000007B50045001E30F200203017 -:1002B000F60000006800F000F100F100F400B60064 -:1002C00069001F30F3002130F500B4006A00A90076 -:1002D000AA00A8000000B8002900F9000000FA00F8 -:1002E0000000B9000000F9000000FA000000AC00B6 -:1002F0006B004600530000000000AB006C004A0099 -:1003000050004D004978A9006D0052005100510085 -:100310004C74AE006E004B004F004E00000FAD005D -:100320006F00B100B300E5000007AA000100010062 -:1003300001000100E400000001000100010039009B -:10034000010000002900010001000100010001007E -:100350000100010001000100010001000100010095 -:100360000100010001000100010001000100010085 -:100370000100010001000100010001000000010076 -:100380000100010000000100000001000100010067 -:100390000000010000000100010001000100010057 -:1003A0000000010001000100010001000100010046 -:1003B0000100010001000100010001000100010035 -:1003C00001000100010001002A00010001000100FC -:1003D00001000100010001000100390001000000DE -:1003E00016034500720067006F0044006F0078003C -:1003F000200045005A000000160345007200670007 -:100400006F0044006F007800200045005A00000093 -:100410000403090409026D00040100A0FA090400A4 -:10042000000103010100092111010001223F000721 -:1004300005810308000A0904010001030102000903 -:100440002111010001224D000705820308000A095D -:1004500004020001030000000921110100012236FD -:10046000000705830308000A0904030001030000D4 -:100470000009211101000122390007058403100041 -:10048000011201100100000008EDFE071301000138 -:1004900002000105010906A101050719E029E71578 -:1004A00000250195087501810205081901290595A6 -:1004B0000575019102950175039101050719002940 -:1004C0007715002501957875018102C00501098025 -:1004D000A101850216010026B7001A01002AB70003 -:1004E000751095018100C0050C0901A10185031655 -:1004F0000100269C021A01002A9C027510950181B8 -:1005000000C005010902A1010901A10005091901A5 -:1005100029051500250195057501810295017503D1 -:1005200081010501093009311581257F9502750882 -:10053000810609381581257F950175088106050C0E -:100540000A38021581257F950175088106C0C0050E -:10055000010906A101050719E029E7150025019504 -:1005600008750181029501750881010508190129A5 -:10057000059505750191029501750391010507190E -:100580000029FF150025FF950675088100C00000B1 -:10059000000000000000000000010204060A0F171E -:1005A000202C3A4A5D71879DB3C7DAE9F5FCFFFC60 -:1005B000F5E9DAC7B39D87715D4A3A2C20170F0A17 -:1005C00006040201000000000000000000001124E9 -:1005D0001FBECFEFDAE0DEBFCDBF04B603FE24C0FE -:1005E0008091F8019091F901A091FA01B091FB017D -:1005F0008730904BA740B04BB9F41092F80110929D -:10060000F9011092FA011092FB0114BE84B7877FA2 -:1006100084BF88E10FB6F894809360001092600068 -:100620000FBEE0E0FFE3099511E0A0E0B1E0E2E9F0 -:10063000FBE402C005900D92A433B107D9F721E085 -:10064000A4E3B1E001C01D92A83FB207E1F70E9408 -:10065000F70B0C94C7250C940000DC01462F50E0EA -:100660004A5051094831510508F0C2C14A5A5F4FFA -:10067000FA010C94772512962C91129780913C01E7 -:1006800090913D012223E1F015962C91207FC1F439 -:1006900001968330910510F082E090E090933D0147 -:1006A00080933C018091360190913701892B31F084 -:1006B00089E30E94591289E30E94211381EEF9C057 -:1006C000019790933D0180933C01892B09F090C1E3 -:1006D00081EEFAC012962C9180913A0190913B01E3 -:1006E000222331F101968330910510F082E090E0F1 -:1006F00090933B0180933A018091360190913701AC -:10070000892B31F08091350191E089278093350163 -:1007100081E078C012969C91129715968C91807FFB -:1007200091119CC009F0B7C080913A0190913B01B2 -:10073000019790933B0180933A01892B09F058C1AE -:1007400080913501811154C181E085C012969C9140 -:10075000129715968C91807F992359F0209136013C -:10076000309137018823B9F121153105A1F58BE2CC -:10077000A0C0882391F08091360190913701892B98 -:1007800061F48BE2A1C012969C91129715968C9100 -:10079000807F91111AC009F08FC08091380190912B -:1007A000390101979093390180933801892B09F021 -:1007B0001FC18091340181111BC182E04CC012968F -:1007C0008C911297882309F187C0209136013091CE -:1007D0003701811169C080913801909139010196EA -:1007E0008330910510F082E090E09093390180937E -:1007F0003801232B31F08091340191E089278093D7 -:10080000340182E00E94241BF3C015968C91982F2E -:10081000907FA1F080FD12C080913A0190913B0140 -:10082000892B61F48091380190913901892B31F441 -:1008300085E30E94591285E30E94211380913601BD -:100840009091370101979093370180933601892B5E -:1008500009F0CEC083E00E94451BCAC0209136013A -:1008600030913701882329F02115310511F484E3F3 -:1008700020C080913A0190913B010196833091050F -:1008800010F082E090E090933B0180933A01232B9B -:1008900009F038CF3DCF8091360190913701892BF7 -:1008A00009F042CF84E310C02115310509F093CF40 -:1008B00081E30E9459129CC08091360190913701CA -:1008C000892B09F06ACF81E30E94211391C012960F -:1008D0008C9112978823A1F1809136019091370174 -:1008E00001968330910510F082E090E090933701FB -:1008F0008093360180913C0190913D01892B31F02C -:1009000089E30E94591289E30E94211380913A01E0 -:1009100090913B01892B31F08091350191E089273D -:10092000809335018091380190913901892B31F004 -:100930008091340191E089278093340183E062CF74 -:1009400015968C91982F907F09F478CF80FD76CF03 -:1009500080913A0190913B01892B09F06FCF8091F2 -:10096000380190913901892B09F068CF8EE20E94FD -:1009700059128EE261CF12968C91882319F080EF84 -:1009800090E013C080EF90E017C012968C918823FE -:1009900019F080EF90E01BC080EF90E021C012962C -:1009A0008C91882339F081EF90E00E941A2082EF29 -:1009B00090E011C081EF90E00E94822082EF90E0F1 -:1009C00013C012968C91882349F081EF90E00E9429 -:1009D0001A2083EF90E00E941A2008C081EF90E077 -:1009E0000E94822083EF90E00E9482200E940721D3 -:1009F00080E090E008950895E0910E01F0910F01DC -:100A00008081827219F0259A2D9A06C00E943011B9 -:100A100081FDF9CF25982D988091BB0181FF03C0FE -:100A2000269A2E9A02C026982E988091BB0182FFAA -:100A300003C0279A2F9A089527982F9808950C9409 -:100A4000FC0456985E9825982D9826982E982798FD -:100A50002F988FEF90E09093890080938800909377 -:100A60008B0080938A0090938D0080938C00259A50 -:100A70002D9A2FEF80E792E0215080409040E1F7DF -:100A800000C00000269A2E9A2FEF80E792E02150B6 -:100A900080409040E1F700C00000279A2F9A2FEF86 -:100AA00080E792E0215080409040E1F700C00000D4 -:100AB00025982D982FEF80E792E0215080409040BC -:100AC000E1F700C0000026982E982FEF80E792E013 -:100AD000215080409040E1F700C0000027982F98F7 -:100AE00056985E9825982D9826982E9827982F9896 -:100AF000089589EA8093800089E08093810024989A -:100B00002C983F988AB18F748AB96E98479A8BB1A6 -:100B1000806B8BB9769A0E9421050C94FB0480E2CD -:100B20008093000180913E0181110EC00E94DE057C -:100B300081E080933E012FEF83ED90E321508040D0 -:100B40009040E1F700C0000080E40E94E40580933B -:100B5000000181112EC00E940E06809300018111B8 -:100B600028C00E940E0680930001811122C08FE3ED -:100B70000E940E068093000181111BC00E94060690 -:100B800080E40E94E40580930001811112C08CE092 -:100B90000E940E068093000181110BC00E940E0678 -:100BA00080930001811105C08FE30E940E0680939F -:100BB00000010E9406068091000108951092B9007C -:100BC0008AE08093B800089594EA9093BC009091D5 -:100BD000BC0097FFFCCF9091B900987F983021F02E -:100BE000903111F081E008958093BB0084E88093F8 -:100BF000BC008091BC0087FFFCCF8091B900887F4A -:100C0000883111F0803471F780E0089584E9809391 -:100C1000BC008091BC0084FDFCCF08958093BB0094 -:100C200084E88093BC008091BC0087FFFCCF90914A -:100C3000B900987F81E0983209F480E0089584E853 -:100C40008093BC008091BC0087FFFCCF8091BB00EB -:100C5000089580910001811115C080E40E94E4058F -:100C60008093000181110CC082E10E940E068093E6 -:100C70000001811105C08FEF0E940E0680930001D4 -:100C80000E94060684B1807F84B985B1807F85B9D2 -:100C90008AB1837F8AB98BB1837F8BB93E9846989E -:100CA00008950E948F05809300010E94290680B359 -:100CB0008C7080BB81B3836F81BBEEE4F1E0A0E474 -:100CC000B1E011921D9281E0EC35F807D1F70C9458 -:100CD0007905BF92CF92DF92EF92FF920F931F930D -:100CE000CF93DF9380910001882379F080913F01B9 -:100CF0008F5F80933F01811108C00E948F05809310 -:100D00000001811102C00E94210500E411E0C0E051 -:100D1000D0E0DD24D39482E0C82EEE24E394F12CBD -:100D2000C73000F580910001811162C080E40E940B -:100D3000E40580930001811112C082E10E940E0639 -:100D40008093000181110BC0C7010C2E01C0880FD8 -:100D50000A94EAF780950E940E06809300010E9493 -:100D6000060646C0CA30A1F028F4C83059F0C93090 -:100D700061F005C0CC3089F070F0CD3089F0209A58 -:100D8000289810C0219A29980DC0229A2A980AC042 -:100D9000239A2B9807C0529A01C0539A5B9802C0BD -:100DA0003E9A4698E0EAEA95F1F78FB179995AC0F0 -:100DB00092E081708D25892B7C9B02C090E001C060 -:100DC00094E0892B7D9B02C090E001C098E0892BC4 -:100DD0007E9B02C090E001C090E1892B9FB190956D -:100DE000991F9927991F9295990F907E892B0FC073 -:100DF0008091000181114BC080E40E94E405809342 -:100E00000001882389F1B12C0E9406068B2DF80180 -:100E10009081981719F08083C09201010E942906E1 -:100E200021960F5F1F4FCE30D10509F079CF809109 -:100E30000101882371F1815080930101882339F0E9 -:100E40008FE99FE00197F1F700C0000022C0AEE4F7 -:100E5000B1E0E0E4F1E081918D9391E0EE34F907A7 -:100E6000D1F717C090E0A5CF83E10E940E068093D2 -:100E700000018111C8CF81E40E94E4058093000144 -:100E80008111C1CF0E941F06B82EB094BDCF80E063 -:100E9000BECF0E941F0581E0DF91CF911F910F917E -:100EA000FF90EF90DF90CF90BF900895E82FF0E093 -:100EB000E25BFE4F808108950895089596E0799F42 -:100EC000F001112494E5899FE00DF11D1124E60F36 -:100ED000F11DEE0FFF1FE05CFE4F85919491089588 -:100EE000880F991F80579040FC0185919491089537 -:100EF000880F991F805F9E4FFC0185919491089502 -:100F00000F931F93CF93DF93EC01811520E392079A -:100F100030F5811530E2930708F0B1C08B3B9105A5 -:100F200088F4883A910508F058C0853A910508F090 -:100F300049C08430910508F043C08130910509F41F -:100F4000B2C1AEC18F3F910509F0D0F5803F910548 -:100F500008F092C0805E9109089790F1A1C1C11577 -:100F600081E5D807A8F4C23090E5D90708F09FC002 -:100F7000C11520E5D20709F486C008F092C0C1155A -:100F800080E4D80708F08CC18E011127106CCCC109 -:100F9000C11590E8D90758F4C11520E7D20708F029 -:100FA0007BC1C11530E6D30708F423C179C1C1154F -:100FB00080E9D80708F074C18E011F70106AB4C1AF -:100FC0008E01B2C1853A910509F470C1863A910546 -:100FD00009F46FC103E810E4A7C1883A910509F448 -:100FE0006BC1893A910509F46AC18A3A910509F4FD -:100FF00069C18B3A910509F468C18C3A910509F4ED -:1010000067C18D3A910509F466C1803B910509F4E9 -:1010100065C18E3A910509F464C18F3A910509F4CE -:1010200063C1813B910509F462C1823B910509F4DA -:1010300061C1833B910509F460C1843B910509F4CA -:101040005FC1853B910509F45EC1863B910509F4BA -:101050005DC1873B910509F45CC1883B910509F4AA -:101060005BC1893B910509F45AC18A3B910509F09E -:1010700059C10AE216E458C18C01106555C19F7030 -:101080000E94780752C10E94B3169FEF24E33CE010 -:10109000915020403040E1F700C000000E94CB1D7D -:1010A00043C18091D70181608093D7013DC10E94E7 -:1010B000731F811102C00E94591F0E94901F90E06F -:1010C0009093F8018093F701C23080E5D80721F4AE -:1010D0008091F701816086C0C43090E5D90721F482 -:1010E0008091F70182607EC0C63020E5D20721F4EE -:1010F0008091F701846076C0C83030E5D30719F4D9 -:101100008091F70127C0CA3080E5D80721F480918B -:10111000F701806167C0CC3090E5D90721F4809158 -:10112000F70180625FC0CE3020E5D20721F48091C4 -:10113000F701806457C0C03130E5D30721F48091B6 -:10114000F70180684FC0C23180E5D80729F480914B -:10115000F7018460886046C0C33090E5D90721F468 -:101160008091F7018E7F3EC0C53020E5D20721F483 -:101170008091F7018D7F36C0C73030E5D30721F469 -:101180008091F7018B7F2EC0C93080E5D80719F414 -:101190008091F70126C0CB3090E5D90721F48091EA -:1011A000F7018F7E1FC0CD3020E5D20721F480915A -:1011B000F7018F7D17C0CF3030E5D30721F4809140 -:1011C000F7018F7B0FC0C13180E5D80721F48091F2 -:1011D000F7018F7707C0C331D04531F48091F70113 -:1011E0008B7F877F8093F7018091F7010E94941F86 -:1011F0009BC08D2F99278F70992781309105E9F435 -:101200008E01037011279C0102C0220F331F0A9523 -:10121000E2F789011C68CE0164E0880F991F6A9586 -:10122000E1F788279370082B192B73E0CC0FDD1F93 -:101230007A95E1F7C076DD272CC08230910529F43C -:101240001C2F0027016F106A6FC08330910561F475 -:10125000CE018370992701E010E002C0000F111F3A -:101260008A95E2F71C680EC0049709F05DC0CE01B4 -:101270008370992701E010E002C0000F111F8A95CA -:10128000E2F71A6843E0CC0FDD1F4A95E1F7C07E14 -:10129000D7700C2B1D2B48C08E011F70106244C0EC -:1012A00000E010E041C001E010E03EC001E810E4C1 -:1012B0003BC002E810E438C002EE14E435C009EE89 -:1012C00014E432C00AEE14E42FC005EB14E42CC081 -:1012D00006EB14E429C007EB14E426C00CEC14E47C -:1012E00023C00DEC14E420C003E815E41DC00AE897 -:1012F00015E41AC002E915E417C004E915E414C0A6 -:1013000001E216E411C003E216E40EC004E216E4A2 -:101310000BC005E216E408C006E216E405C007E2C9 -:1013200016E402C000E014E4C801DF91CF911F91E0 -:101330000F91089596E0799FF001112494E5899F1B -:10134000E00DF11D1124E60FF11DEE0FFF1FE05C13 -:10135000FE4F85919491803E9105E0F4803C91058B -:1013600058F58133910509F46FC048F4893291052D -:1013700009F463C08A32910509F46DC072C08933E3 -:101380009105E9F082389105D1F08533910509F492 -:101390004DC067C0833E910581F138F4803E9105D0 -:1013A000B9F0823E9105D9F05CC0863E910561F1AD -:1013B000873E9105A1F155C00E94700708952091C4 -:1013C000F70120FD02C021FF4CC080EE90E049C033 -:1013D0008091F70180FFF9CF89E390E042C08091CE -:1013E000F70182FF0EC08091F70184FF03C080E007 -:1013F00090E037C083EE90E034C08091F70182FF27 -:10140000F2CF82EE90E02DC08091F70183FF0BC0F8 -:101410008091F70184FDEBCF87EE90E022C08091B0 -:10142000F70183FFF5CF86EE90E01BC08091F701B6 -:1014300085FF07C089E290E014C08091F70185FF25 -:10144000F9CF85E390E00DC08091F70186FF07C0DA -:101450008AE290E006C08091F70186FFF9CF81E330 -:1014600090E00E948007089508950C94340A8091BA -:101470006C010895CF93DF9300D01F92CDB7DEB7F4 -:101480002091EE01243019F523E029839B838A8380 -:101490002093E9008FEF9091E800815095FD06C000 -:1014A00095ED9A95F1F700008111F5CF8091E80054 -:1014B00085FF0DC040E050E063E070E0CE01019692 -:1014C0000E94A40C8091E8008E778093E8000F9032 -:1014D0000F900F90DF91CF910895CF93DF9300D0BD -:1014E0001F92CDB7DEB72091EE01243021F522E026 -:1014F00029839B838A8383E08093E9008FEF909117 -:10150000E800815095FD06C095ED9A95F1F7000031 -:101510008111F5CF8091E80085FF0DC040E050E0DB -:1015200063E070E0CE0101960E94A40C8091E80077 -:101530008E778093E8000F900F900F90DF91CF91FE -:1015400008952091EE012430F1F422E02093E90087 -:101550002FEF3091E800215035FD06C035ED3A956A -:10156000F1F700002111F5CF2091E80025FF0BC015 -:1015700040E050E065E070E00E94A40C8091E8003B -:101580008E778093E8000895CF93DF93EC018091EC -:10159000EE01843009F046C090910C019923D9F0F6 -:1015A00090910D019923B9F08093E9008FEF90910C -:1015B000E800815095FD06C095E19A95F1F700008D -:1015C0008111F5CF8091E80085FF2CC040E050E00C -:1015D00060E170E017C081E08093E9008FEF9091A7 -:1015E000E800815095FD06C095ED9A95F1F7000051 -:1015F0008111F5CF8091E80085FF14C040E050E0F4 -:1016000068E070E0CE010E94A40C8091E8008E7723 -:101610008093E80080E1FE01ACE5B1E001900D921D -:101620008A95E1F7DF91CF9108958091ED018111C5 -:1016300009C00E94360E0E94930E8091E2008460E1 -:101640008093E20008951092ED01089508950C949E -:10165000EF230E94621D0E94F5230E9430110C941A -:10166000350A42E061EC81E00E94B00D42E061EC9D -:1016700082E00E94B00D42E061EC83E00E94B00D78 -:1016800042E161EC84E00C94B00D8091F001833074 -:1016900009F455C030F4813071F0823009F48EC005 -:1016A00008958A3009F47AC08B3009F460C089301B -:1016B00009F09CC020C08091EF01813A09F096C0EA -:1016C0008091E800877F8093E8008091F3019091FA -:1016D000F401892B21F060E080E090E003C060E13C -:1016E0008CE591E070E00E94ED0C8091E8008B7732 -:1016F0008093E80008958091EF01813209F076C06F -:101700008091F3019091F401009719F0039709F08B -:101710006DC08091E800877F8093E8008091E800A9 -:1017200082FD05C08091EE018111F8CF5FC08091EC -:10173000F10080936C018091E8008B7753C0809119 -:10174000EF01813A09F052C08091F3019091F401C8 -:10175000892B09F04BC08091E800877F8093E800D7 -:101760008091E80080FFFCCF80910C0136C0809111 -:10177000EF018132D9F58091F3019091F401892B29 -:10178000A9F58091E800877F8093E8000E94E50D2D -:101790008091F10180930C010C94B3168091EF01BC -:1017A000813221F58091E800877F8093E8000E94D4 -:1017B000E50D8091F20180936D0108958091EF0114 -:1017C000813AA1F48091E800877F8093E8008091BE -:1017D000E80080FFFCCF80916D018093F100809143 -:1017E000E8008E778093E8000C94E50D089584B7A7 -:1017F000877F84BF88E10FB6F894809360001092D1 -:1018000060000FBE90E080E80FB6F894809361000E -:10181000909361000FBE0E947F110E94360E0E94BD -:10182000930E8091E20084608093E20078940E949D -:101830000E110E94811182E091E00E942B110E9402 -:10184000DD238091EE01853069F40E94221D809194 -:10185000EC018823B1F30E944D1D882391F30E946F -:101860008E0CEFCF0E948711ECCF292F3327233026 -:101870003105A9F06CF42130310509F442C0223061 -:10188000310509F043C08DE690E024E134E042C028 -:1018900021323105C9F02232310519F137C09927BB -:1018A0008130910541F08230910541F0892B71F52D -:1018B000E0E1F4E005C0E8EFF3E002C0E0EEF3E0C1 -:1018C000849190E09F0126C0643000F5E62FF0E09F -:1018D000EE0FFF1FEE5DFE4F2081318189E090E029 -:1018E00019C0643098F4E62FF0E0DF01AA0FBB1FA7 -:1018F000A65EBE4F2D913C91EA5EFE4F808190E046 -:1019000009C082E190E021E834E004C080E090E08A -:1019100020E030E0FA0131832083089580E189BD21 -:1019200082E189BD09B400FEFDCF8091D8008F7D92 -:101930008093D8008091E00082608093E0008091E5 -:10194000E00081FDFCCF0895CF92DF92EF92FF92ED -:101950000F931F93CF93DF937C018B01EA010E94C9 -:10196000060E811131C0209731F088819981081BC2 -:10197000190BE80EF91EC12CD12C0115110519F116 -:101980008091E80085FD14C08091E8008E778093F7 -:10199000E800209741F0888199818C0D9D1D9983E5 -:1019A000888385E011C00E94060E882331F30CC0A5 -:1019B000F70181917F018093F10001501109FFEF40 -:1019C000CF1ADF0ADACF80E0DF91CF911F910F911C -:1019D000FF90EF90DF90CF9008952091F501309126 -:1019E000F6012617370748F06115710539F4209183 -:1019F000E8002E772093E80001C0B901FC0120E047 -:101A000061157105B9F18091EE01882309F440C098 -:101A1000853009F43FC08091E80083FD3DC080918E -:101A2000E80082FF06C08091E80082FF26C080E0C7 -:101A300008958091E80080FFE3CF2091F30080912A -:101A4000F20090E0922B6115710551F088309105FC -:101A500038F421912093F100615071090196F3CF80 -:101A600021E0089709F020E08091E8008E778093CC -:101A7000E800C6CF2111C7CFD6CF8091EE018823D1 -:101A800039F0853039F08091E80083FFCCCF04C075 -:101A900082E0089583E0089581E008952091F501A2 -:101AA0003091F6012617370748F06115710539F4B2 -:101AB0002091E8002E772093E80001C0B901FC01D5 -:101AC00020E061157105C1F18091EE01882309F4D0 -:101AD00041C0853009F440C08091E80083FD3EC0DC -:101AE0008091E80082FF06C08091E80082FF27C055 -:101AF00080E008958091E80080FFE3CF2091F3001B -:101B00008091F20090E0922B6115710559F08830B8 -:101B1000910540F424912093F100319661507109B0 -:101B20000196F2CF21E0089709F020E08091E800CB -:101B30008E778093E800C5CF2111C6CFD5CF809195 -:101B4000EE01882339F0853039F08091E80083FF79 -:101B5000CBCF04C082E0089583E0089581E008952A -:101B6000982F973058F59093E900981739F07091B5 -:101B7000EC002091ED005091F00003C0242F762F4F -:101B800050E021FF19C03091EB003E7F3093EB0015 -:101B90003091ED003D7F3093ED003091EB003160EE -:101BA0003093EB007093EC002093ED005093F00025 -:101BB0002091EE0027FF07C09F5FD3CF8F708093E7 -:101BC000E90081E0089580E008958091EF0187FDAC -:101BD00005C08091E80080FF0EC012C08091E8002F -:101BE00082FD05C08091EE018111F8CF08958091AA -:101BF000E8008B7708C08091EE018111EACF08954B -:101C00008091E8008E778093E80008958091E40049 -:101C10009091E50045E62091EC0020FF21C0209145 -:101C2000E80020FD21C02091EE01222389F025301B -:101C300089F02091EB0025FD0FC02091E400309148 -:101C4000E5002817390739F3415041F0C901E3CFC6 -:101C500082E0089583E0089581E0089584E0089586 -:101C60002091E80022FFDFCF80E008950E94A40EBB -:101C70000E94AC0EE0EEF0E0808181608083E8EDB0 -:101C8000F0E080818F77808319BCA7EDB0E08C9164 -:101C90008E7F8C9380818F7E80831092ED010895DA -:101CA0000F931F93CF93DF930E94A40E0E94AC0E5C -:101CB000C8EDD0E088818F778883888180688883A9 -:101CC00088818F7D888319BC1092EE011092EA0101 -:101CD0001092EC011092EB0100EE10E0F80180810F -:101CE0008B7F808388818160888342E060E080E030 -:101CF0000E94B00DE1EEF0E080818E7F8083E2EE05 -:101D0000F0E0808181608083808188608083F80139 -:101D100080818E7F8083888180618883DF91CF91ED -:101D20001F910F910895E8EDF0E080818F7E808310 -:101D3000E7EDF0E080818160808384E082BF81E014 -:101D40008093ED010C94500EE8EDF0E080818E7FE1 -:101D500080831092E20008951092DA001092E10060 -:101D600008951F920F920FB60F9211242F933F9355 -:101D70004F935F936F937F938F939F93AF93BF9393 -:101D8000EF93FF938091E10082FF0BC08091E2000E -:101D900082FF07C08091E1008B7F8093E1000E9469 -:101DA0000D118091DA0080FF1FC08091D80080FF64 -:101DB0001BC08091DA008E7F8093DA008091D90079 -:101DC00080FF0DC080E189BD82E189BD09B400FEBC -:101DD000FDCF81E08093EE010E94150B05C019BC78 -:101DE0001092EE010E94230B8091E10080FF19C048 -:101DF0008091E20080FF15C08091E2008E7F809389 -:101E0000E2008091E20080618093E2008091D8003E -:101E100080628093D80019BC85E08093EE010E9417 -:101E2000270B8091E10084FF30C08091E20084FFA5 -:101E30002CC080E189BD82E189BD09B400FEFDCFDF -:101E40008091D8008F7D8093D8008091E1008F7EB3 -:101E50008093E1008091E2008F7E8093E200809188 -:101E6000E20081608093E2008091EA01882311F012 -:101E700084E007C08091E30087FF02C083E001C0D7 -:101E800081E08093EE010E94290B8091E10083FFA5 -:101E900029C08091E20083FF25C08091E100877F07 -:101EA0008093E10082E08093EE011092EA0180913C -:101EB000E1008E7F8093E1008091E2008E7F80932D -:101EC000E2008091E20080618093E20042E060E005 -:101ED00080E00E94B00D8091F00088608093F00057 -:101EE0000E94260BFF91EF91BF91AF919F918F912F -:101EF0007F916F915F914F913F912F910F900FBE06 -:101F00000F901F9018951F920F920FB60F921124E9 -:101F10002F933F934F935F936F937F938F939F93F1 -:101F2000AF93BF93CF93EF93FF93C091E900CF702E -:101F30008091EC001092E9008091F000877F8093FF -:101F4000F00078940E94BF0F1092E9008091F00099 -:101F500088608093F000C093E900FF91EF91CF91EA -:101F6000BF91AF919F918F917F916F915F914F91B1 -:101F70003F912F910F900FBE0F901F9018951F93B8 -:101F8000CF93DF93CDB7DEB7AA970FB6F894DEBF35 -:101F90000FBECDBFEFEEF1E08091F100819321E023 -:101FA000E73FF207C9F70E94450B8091E80083FFE5 -:101FB0001CC12091EF013091F001832F90E08A3015 -:101FC000910508F012C1FC01E259FF4F0C947725EE -:101FD000203881F0223809F008C18091F3018F7018 -:101FE0008093E9008091EB0085FB882780F91092AF -:101FF000E90006C08091EB019091EC0191118260A3 -:102000009091E800977F9093E8008093F100109200 -:10201000F100C5C0822F8D7F09F0E7C0222319F09F -:10202000223061F0E2C08091F101813009F0DDC021 -:10203000333009F080E08093EC0128C08091F101F9 -:10204000811124C02091F3012F7009F4CEC0209398 -:10205000E9008091EB0080FF19C08091EB003330E4 -:1020600011F4806211C080618093EB0081E090E008 -:10207000022E01C0880F0A94EAF78093EA001092BA -:10208000EA008091EB0088608093EB001092E900F9 -:102090008091E800877F86C02111A7C01091F101CF -:1020A0001F778091E3008078812B8093E3008091FB -:1020B000E800877F8093E8000E94E50D8091E800AA -:1020C00080FFFCCF8091E30080688093E3001123C0 -:1020D00011F083E001C082E08093EE0186C02058B9 -:1020E000223008F082C08091F1019091F2018C3D84 -:1020F00023E0920779F583E08A838AE289834FB7E8 -:10210000F894DE01139620E03EE051E2E32FF0E088 -:1021100050935700E49120FF03C0E295EF703F5FBA -:10212000EF708E2F90E0EA3010F0C79601C0C09695 -:102130008D939D932F5F243149F74FBF8091E80025 -:10214000877F8093E8006AE270E0CE0101960E94EA -:10215000ED0C14C0AE014F5F5F4F6091F3010E9420 -:10216000350C009709F441C02091E800277F2093A7 -:10217000E800BC0189819A810E944E0D8091E8009F -:102180008B778093E80031C0203879F58091E800A2 -:10219000877F8093E8008091EA018093F10080912D -:1021A000E8008E778093E8000E94E50D1EC02111A3 -:1021B0001CC09091F1019230C0F48091E800877FBB -:1021C0008093E8009093EA010E94E50D8091EA0176 -:1021D000811104C08091E30087FF02C084E001C048 -:1021E00081E08093EE010E94310B8091E80083FF33 -:1021F0000AC08091E800877F8093E8008091EB001F -:1022000080628093EB00AA960FB6F894DEBF0FBEF3 -:10221000CDBFDF91CF911F9108950895CF93809105 -:10222000EE018823B1F08091E9008F709091EC006D -:1022300090FF02C090E801C090E0C92FC82B109217 -:10224000E9008091E80083FD0E94BF0FCF70C0932A -:10225000E900CF91089590937301809372010895DE -:10226000E0917201F0917301309721F00190F081BB -:10227000E02D099480E00895E0917201F0917301DE -:10228000309721F00280F381E02D09940895E091C8 -:102290007201F0917301309721F00480F581E02DF7 -:1022A000099408952091700130917101821793076C -:1022B00071F09093710180937001E0917201F0913F -:1022C0007301309721F00680F781E02D099408957D -:1022D00020916E0130916F018217930771F09093F6 -:1022E0006F0180936E01E0917201F091730130975C -:1022F00021F00084F185E02D0994089508950C944F -:102300007E110E94681D0E9451060C942E1ECF92D1 -:10231000DF92EF92FF920F931F93CF93DF93CDB78E -:10232000DEB72B970FB6F894DEBF0FBECDBF0E946D -:10233000690635E7E32E31E0F32E00E010E0C02E11 -:10234000802F0E945607F701D1907F01D826B1F463 -:102350000F5F1F4F0E30110591F78FEF89838A832E -:102360001B820E94711D8160782F9D838C8349811F -:102370005A816B818D810E942A1241C09091D701B0 -:1023800091FF04C08B870E945C078B8520E030E0C2 -:102390004D2D50E0922FBA01022E02C0759567951F -:1023A0000A94E2F760FF25C02E83CF82EE24E394E7 -:1023B000F12C02C0EE0CFF1C9A95E2F790E08E2102 -:1023C0009F2121E0892B09F420E028870E94711DBC -:1023D0008160782F9A8789874E815F8168858A8599 -:1023E0000E942A12F801EB58FE4F80818E258083CF -:1023F00006C02F5F3F4F2630310561F6A9CF0E94FE -:102400001221109174010E9430111817A1F00E943E -:102410003011809374012B960FB6F894DEBF0FBE77 -:10242000CDBFDF91CF911F910F91FF90EF90DF9083 -:10243000CF900C94350A2B960FB6F894DEBF0FBEE2 -:10244000CDBFDF91CF911F910F91FF90EF90DF9063 -:10245000CF900895CF93DF93CDB7DEB72B970FB60C -:10246000F894DEBF0FBECDBF4F83588769877A8748 -:102470008B87DE01119686E0FD0111928A95E9F7BE -:1024800085E0FE01379601900D928A95E1F749812A -:102490005A816B817C818D819E810E947F192B9650 -:1024A0000FB6F894DEBF0FBECDBFDF91CF91089578 -:1024B0000895CF93C82F882309F4C1C0823859F4F6 -:1024C0000E94301181FDBBC089E30E94291C0E943B -:1024D000F31C89E30CC0833879F40E94301180FD2D -:1024E000AEC083E50E94291C0E94F31C83E50E9474 -:1024F000691CCF910C94F31C843859F40E9430115C -:1025000082FD9DC087E40E94291C0E94F31C87E481 -:10251000EECF8CEF8C0F813A48F48C2F0E9445232C -:1025200081118DC08C2F0E94291CE3CF80E28C0F7B -:10253000883048F4C77081E001C0880FCA95EAF777 -:102540000E94AA1CD6CF8BE58C0F833078F4C53A55 -:1025500029F0C63A31F482E890E005C081E890E0C5 -:1025600002C083E890E0CF910C94521188E58C0F63 -:10257000833108F064C0C83A39F1C93A41F1CA3A26 -:1025800049F1CB3A51F1CC3A59F1CD3A61F1C03B26 -:1025900069F1CE3A71F1CF3A79F1C13B81F1C23B99 -:1025A00089F1C33B91F1C43B99F1C53BA1F1C63B15 -:1025B000A9F1C73BB1F1C83BB9F1C93BC1F1CA3B75 -:1025C000C9F58AE292E038C082EE90E035C089EE2B -:1025D00090E032C08AEE90E02FC085EB90E02CC0F6 -:1025E00086EB90E029C087EB90E026C08CEC90E071 -:1025F00023C08DEC90E020C083E891E01DC08AE804 -:1026000091E01AC082E991E017C084E991E014C01A -:1026100081E292E011C083E292E00EC084E292E097 -:102620000BC085E292E008C086E292E005C087E236 -:1026300092E002C080E090E0CF910C946811CF91BD -:102640000895882309F44BC0823859F40E94301150 -:1026500081FF45C089E30E94291C0E94F31C89E385 -:102660000CC0833871F40E94301180FF38C083E5BC -:102670000E94291C0E94F31C83E50E94691C0C9493 -:10268000F31C843859F40E94301182FF28C087E47B -:102690000E94291C0E94F31C87E4EFCF9CEF980F47 -:1026A000913A58F390E2980F983050F4877091E087 -:1026B00001C0990F8A95EAF7892F0E94B01CDFCFDD -:1026C0009BE5980F933020F480E090E00C94521139 -:1026D000885A833120F480E090E00C9468110895CA -:1026E000882321F00E94AA1C0C94F31C08958823CF -:1026F00021F00E94B01C0C94F31C0895CF92DF923D -:10270000EF92FF920F931F93CF93DF93CDB7DEB776 -:1027100028970FB6F894DEBF0FBECDBF8C0185E0C1 -:10272000F801DE01119601900D928A95E1F7F8010A -:10273000D080E180F280558152955F702381348191 -:10274000232B39F0FFEFEF1206C081E0DF1203C048 -:1027500003C081E001C080E080FDE2C2C8015F8368 -:102760000E945812D982EA8269817A818F2D0E9453 -:10277000251C9E8388870E94D91B0E94AC1A4E811B -:102780005F816885FF2029F00E94C71C68855F81F2 -:102790004E81E42FE295EF70F0E0E858FF4F0C9483 -:1027A0007725842F807F142F1F70882311F01295B6 -:1027B000107FFF20B1F0112309F467C280E2860F79 -:1027C000883028F4812F68870E94AA1C04C0812FBA -:1027D00068870E94BA1C688568870E94F31C688518 -:1027E00054C2862F68870E9421136885112309F43B -:1027F00097C2605E812F683018F40E94B01C02C03E -:102800000E94C01C28960FB6F894DEBF0FBECDBF45 -:10281000DF91CF911F910F91FF90EF90DF90CF90BC -:102820000C94F31C242F207F842F8F70203211F002 -:102830008295807F662319F0613019F12BC0FF204B -:10284000B1F0552309F493C1513009F090C1289695 -:102850000FB6F894DEBF0FBECDBFDF91CF911F91B1 -:102860000F91FF90EF90DF90CF900C94DA1C5523DE -:1028700019F0513009F454C28E830E94DD1C8E8100 -:1028800089C1FF2021F0523008F04AC270C15111B5 -:1028900047C280C1FF2021F0552309F468C1F5C16A -:1028A000552309F477C105C2242F26952695237058 -:1028B00030E02115310521F021303105C9F030C259 -:1028C000FF2021F0862F942F937002C080E090E0CB -:1028D00028960FB6F894DEBF0FBECDBFDF91CF9123 -:1028E0001F910F91FF90EF90DF90CF900C945211B9 -:1028F000FF2021F0862F942F937002C080E090E09B -:1029000028960FB6F894DEBF0FBECDBFDF91CF91F2 -:102910001F910F91FF90EF90DF90CF900C94681172 -:10292000862FFF2019F00E941A2002C00E948220E8 -:1029300028960FB6F894DEBF0FBECDBFDF91CF91C2 -:102940001F910F91FF90EF90DF90CF900C94072193 -:10295000842F837009F076C0F110E2C1262F2295F2 -:1029600026952770220F220F862F8F70C82ED12C0C -:10297000E12CF12C022E04C0CC0CDD1CEE1CFF1C43 -:102980000A94D2F764FF10C06FE070E080E090E03E -:1029900004C0660F771F881F991F2A95D2F760958C -:1029A00070958095909503C060E070E0CB01242F76 -:1029B000269526952370422F50E042305105D1F0E4 -:1029C0004330510559F16C297D298E299F294130C9 -:1029D000510541F128960FB6F894DEBF0FBECDBF6A -:1029E000DF91CF911F910F91FF90EF90DF90CF90EB -:1029F0000C94D11A6C297D298E299F2928960FB60F -:102A0000F894DEBF0FBECDBFDF91CF911F910F9124 -:102A1000FF90EF90DF90CF900C94EB1A0E94D11AA8 -:102A2000C701B60128960FB6F894DEBF0FBECDBF22 -:102A3000DF91CF911F910F91FF90EF90DF90CF909A -:102A40000C94B71AFF2019F0842F817001C086956D -:102A5000882309F465C1262F229526952770220F19 -:102A6000220F862F8F70C82ED12CE12CF12C022E34 -:102A700004C0CC0CDD1CEE1CFF1C0A94D2F764FFD2 -:102A800010C06FE070E080E090E004C0660F771F38 -:102A9000881F991F2A95D2F760957095809590951B -:102AA00003C060E070E0CB01242F269526952370AB -:102AB000422F50E042305105D1F04330510559F1D9 -:102AC0006C297D298E299F294130510541F1289695 -:102AD0000FB6F894DEBF0FBECDBFDF91CF911F912F -:102AE0000F91FF90EF90DF90CF900C94A51B6C2975 -:102AF0007D298E299F2928960FB6F894DEBF0FBE38 -:102B0000CDBFDF91CF911F910F91FF90EF90DF909C -:102B1000CF900C94BF1B0E94A51BC701B60128963D -:102B20000FB6F894DEBF0FBECDBFDF91CF911F91DE -:102B30000F91FF90EF90DF90CF900C948B1B603F34 -:102B4000C9F118F4603E50F49BC0623F09F460C0C4 -:102B500008F44AC0633F09F46FC092C0162F1F707B -:102B6000842F8F71FF2099F00E94241B812F2896BB -:102B70000FB6F894DEBF0FBECDBFDF91CF911F918E -:102B80000F91FF90EF90DF90CF900C9470130E9404 -:102B9000451B812F28960FB6F894DEBF0FBECDBF20 -:102BA000DF91CF911F910F91FF90EF90DF90CF9029 -:102BB0000C947713FF20A1F05111B2C0842F8F71B4 -:102BC00028960FB6F894DEBF0FBECDBFDF91CF9130 -:102BD0001F910F91FF90EF90DF90CF900C946A1BA4 -:102BE000523008F09DC0EACFFF20A1F0842F8F71F2 -:102BF00028960FB6F894DEBF0FBECDBFDF91CF9100 -:102C00001F910F91FF90EF90DF90CF900C94241BB9 -:102C1000FF2061F3842F8F7128960FB6F894DEBFE2 -:102C20000FBECDBFDF91CF911F910F91FF90EF901D -:102C3000DF90CF900C94451BFF2091F0842F8F7173 -:102C400028960FB6F894DEBF0FBECDBFDF91CF91AF -:102C50001F910F91FF90EF90DF90CF900C940F1B7E -:102C600028960FB6F894DEBF0FBECDBFDF91CF918F -:102C70001F910F91FF90EF90DF90CF900C94051B68 -:102C8000FF20A1F0552309F4B1CF862F28960FB667 -:102C9000F894DEBF0FBECDBFDF91CF911F910F9192 -:102CA000FF90EF90DF90CF900C945912552309F4C8 -:102CB000B1CF862F28960FB6F894DEBF0FBECDBFDA -:102CC000DF91CF911F910F91FF90EF90DF90CF9008 -:102CD0000C9421134F70C8010E942D0328960FB643 -:102CE000F894DEBF0FBECDBFDF91CF911F910F9142 -:102CF000FF90EF90DF90CF900C942C1A4F70C8018A -:102D000028960FB6F894DEBF0FBECDBFDF91CF91EE -:102D10001F910F91FF90EF90DF90CF900C945D0783 -:102D200028960FB6F894DEBF0FBECDBFDF91CF91CE -:102D30001F910F91FF90EF90DF90CF9008950E9428 -:102D4000C71C0E94D71C0E949C1C0E94F31C0E945E -:102D5000B3210E94072180E090E00E94521180E0A0 -:102D600090E00C9468110E94B71C0C949F160E946E -:102D70001A1C292F22952F7030E02C3031054CF48D -:102D80002A3031056CF4225031092230310590F49B -:102D900007C02C30310551F02F30310539F00AC011 -:102DA000803E10F0803F31F481E0089593FB882746 -:102DB00080F9089580E00895CF93DF9300D000D08C -:102DC0001F92CDB7DEB70F900F900F900F900F901E -:102DD000DF91CF910895CF93DF9300D000D000D042 -:102DE000CDB7DEB726960FB6F894DEBF0FBECDBFC7 -:102DF000DF91CF9108951F93CF93DF93C09183010