The Ordinary Layout is the most natural and powerful layout for the Ergodox EZ. Come check it out.

9 files changed, 1284 insertions, 1249 deletions

diff --git a/keyboard/ergodox_ez/keymaps/ordinary/keymap.c b/keyboard/ergodox_ez/keymaps/ordinary/keymap.c
index 871bda672c..6905cbc7a6 100644
--- a/keyboard/ergodox_ez/keymaps/ordinary/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/ordinary/keymap.c
@@ -4,25 +4,27 @@
 #include "action_layer.h"
 #include "action_util.h"
 
-#define BASE 0 // default layer
-#define SYMB 1 // symbols layer
-#define MDIA 2 // media layer
-#define LOCK 3 // shift-lock layer
-
-#define LSymb 0 // left symbol-shift key
-#define LMdia 1 // left media-shift key
-#define LLock 2 // left shift-lock key
-#define RSymb 3 // right symbol-shift key
-#define RMdia 4 // right media-shift key
-#define RLock 5 // right shift-lock key
-
-#define MUL   6 // mouse up left
-#define MUR   7 // mouse up right
-#define MDL   8 // mouse down left
-#define MDR   9 // mouse down right
+#define BASE   0 // default layer
+#define SYMB   1 // symbols layer
+#define MDIA   2 // media layer
+#define LOCK   3 // shift-lock 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 MUL   30 // mouse up left
+#define MUR   31 // mouse up right
+#define MDL   32 // mouse down left
+#define MDR   33 // mouse down right
 
 /*
- * The Ordinary Layout for the Ergodox EZ keyboard, v3.14
+ * The Ordinary Layout for the Ergodox EZ keyboard, v3.141
  * 
  * Modifications from default by Nicholas Keene ergodoxez@nicholaskeene.com
  * 
@@ -41,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
  * | Symbol    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;   | '" Symbol |
  * |-----------+------+------+------+------+------|Shift |           | Tab  |------+------+------+------+------+-----------|
- * | LShift    |   Z  |   X  |   C  |   V  |   B  | -Tab |           |      |   N  |   M  |   ,  |   .  |  /   |    RShift |
+ * | LShift    |   Z  |   X  |   C  |   V  |   B  | -Tab |           |      |   N  |   M  |   ,  |   .  |  /   |    LShift |
  * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
  *     | LCtrl | Meh  |Hyper | LAlt | LGui |                                       | RGui | RAlt | Hyper|  Meh | RCtrl |
  *     `-----------------------------------'                                       `-----------------------------------'
@@ -50,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  ,------|------|------|           |------+------+------.
  *                                  |      |      | PgUp |           |  Up  |      |      |
  *                                  |Backsp| Del  |------|           |------| Enter| Space|
- *                                  |      |      | PgDn |           | Down |      |      |
+ *                                  |      |      | PgDn |           | Down |      |      |Aa
  *                                  `--------------------'           `--------------------'
  */
 [BASE] = KEYMAP(
@@ -58,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  F(LLock)  ,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
-,KC_LSFT   ,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
@@ -67,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                      ,KC_MINS ,KC_6   ,KC_7   ,KC_8   ,KC_9    ,KC_0     ,F(RLock)
                                                                      ,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  ,KC_RSFT
+                                                                     ,KC_TAB  ,KC_N   ,KC_M   ,KC_COMM,KC_DOT  ,KC_SLSH  ,M(RCaps)
                                                                                       ,KC_RGUI,KC_RALT,KC_HYPR ,KC_MEH   ,KC_RCTL
                                                                      ,KC_LEFT ,KC_RGHT
                                                                      ,KC_UP
@@ -125,7 +127,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  |         |      |
+ * |      |         |MouseDnLf|MouseDown|MouseDnRg|  Mute   | Down |           | Down |         |   End   |   Down  |   PgDn  | RShift  |      |
  * `------+---------+---------+---------+---------+----------------'           `----------------+---------+---------+---------+---------+------'
  *  |LCtrl|   Meh   |  MClick | LClick  |  R Click|                                             |Cmd/Insrt|Optn/Del | Hyper   |  Meh    |RCtrl|
  *  `---------------------------------------------'                                             `---------------------------------------------'
@@ -151,7 +153,7 @@ 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_NO   ,KC_TRNS
+                                                                     ,KC_WH_D  ,KC_NO   ,KC_END       ,KC_DOWN      ,KC_PGDN ,KC_RSFT ,KC_TRNS
                                                                                         ,GUI_T(KC_INS),ALT_T(KC_DEL),KC_HYPR ,KC_MEH  ,KC_RCTL
                                                                      ,KC_MPRV  ,KC_MNXT
                                                                      ,KC_VOLU
@@ -213,6 +215,7 @@ const uint16_t PROGMEM fn_actions[] = {
     ,[RLock] = ACTION_MACRO_TAP(RLock)
 };
 
+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.
@@ -223,15 +226,30 @@ bool mdia_lock = false;  // key the lock flag is toggled
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
     switch(id) {
-        // shift and lock between layers
+        // shift and lock between layers?L?
+
+        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)  {
+                register_code(KC_CAPS);
+                unregister_code(KC_CAPS);
+            }
+            register_code(KC_LSFT);
+        } else {
+            if(--caps_shift < 0) caps_shift = 0;
+            if(!caps_shift) unregister_code(KC_LSFT);
+        }
+        break;
 
         case LSymb:
         if (record->event.pressed) {
-            symb_shift++;
+            if(++symb_shift > 2) symb_shift = 2;
             if(shift_lock) symb_lock = !symb_lock;
             layer_on(SYMB);
         } else {
-            symb_shift--;
+            if(--symb_shift < 0) symb_shift = 0;
             if((!symb_shift) && (!symb_lock)) layer_off(SYMB);
         }
         break;
@@ -241,7 +259,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             if (record->tap.count && !shift_lock) {
                 register_code(KC_TAB);
             } else {
-                mdia_shift++;
+                if(++mdia_shift > 2) mdia_shift = 2;
                 if(shift_lock) mdia_lock = !mdia_lock;
                 layer_on(MDIA);
             }
@@ -249,7 +267,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             if(record->tap.count && !shift_lock) {
                 unregister_code(KC_TAB);
             } else {
-                mdia_shift--;
+                if(--mdia_shift < 0) mdia_shift = 0;
                 if((!mdia_shift) && (!mdia_lock)) layer_off(MDIA);
             }
         }
@@ -257,20 +275,20 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 
         case LLock:
         if (record->event.pressed) {
-            shift_lock++;
-            if(symb_shift) symb_lock = !symb_lock;
-            if(mdia_shift) mdia_lock = !mdia_lock;
-            if(!record->tap.count && (keyboard_report->mods & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)))) {
+            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) {
                 register_code(KC_GRV);
                 unregister_code(KC_GRV);
             }
-            shift_lock--;
+            if(--shift_lock < 0) shift_lock = 0;
             if(!shift_lock) layer_off(LOCK);
         }
         break;
@@ -280,7 +298,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             if (record->tap.count && !shift_lock) {
                 register_code(KC_QUOT);
             } else {
-                symb_shift++;
+                if(++symb_shift > 2) symb_shift = 2;
                 if(shift_lock) symb_lock = !symb_lock;
                 layer_on(SYMB);
             }
@@ -288,7 +306,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             if(record->tap.count && !shift_lock) {
                 unregister_code(KC_QUOT);
             } else {
-                symb_shift--;
+                if(--symb_shift < 0) symb_shift = 0;
                 if((!symb_shift) && (!symb_lock)) layer_off(SYMB);
             }
         }
@@ -299,7 +317,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             if (record->tap.count && !shift_lock) {
                 register_code(KC_BSLS);
             } else {
-                mdia_shift++;
+                if(++mdia_shift > 2) mdia_shift = 2;
                 if(shift_lock) mdia_lock = !mdia_lock;
                 layer_on(MDIA);
             }
@@ -307,7 +325,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             if(record->tap.count && !shift_lock) {
                 unregister_code(KC_BSLS);
             } else {
-                mdia_shift--;
+                if(--mdia_shift < 0) mdia_shift = 0;
                 if((!mdia_shift) && (!mdia_lock)) layer_off(MDIA);
             }
         }
@@ -315,20 +333,20 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 
         case RLock:
         if (record->event.pressed) {
-            shift_lock++;
+            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;
-            if(!record->tap.count && (keyboard_report->mods & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)))) {
-                    register_code(KC_CAPS);
-                    unregister_code(KC_CAPS);
-            } 
             layer_on(LOCK);
         } else {
             if (record->tap.count && !record->tap.interrupted && !symb_shift && !mdia_shift) {
                 register_code(KC_EQL);
                 unregister_code(KC_EQL);
             }
-            shift_lock--;
+            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 69af8df4e1..2864031b1b 100644
--- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png
+++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png
diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt
index 04792f2dfc..66cd05503e 100644
--- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt
+++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt
@@ -14,12 +14,12 @@
 [{y:-0.75,x:3.5,c:"#cccccc"},"C",{x:10.5},"<\n,"],
 [{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",fa:[0,1,0,1,0,0,0],w:1.5},"Capitals\nShift\n\n\n\n\nShift",{c:"#cccccc"},"Z",{x:14.5,f:3},"?\n/",{c:"#2277ff",w:1.5},"\n\nCapitals\nShift\n\n\n\nShift"],
-[{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"],
+[{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"],
 [{r:30,rx:6.5,ry:4.25,y:-1,x:1,c:"#54d6de"},"Home","End"],
-[{h:2},"< Del\n\n\nBackspace",{h:2},"Del >\n\n\nDelete","Page\n\n\n\n\n\nUp"],
+[{f:3,h:2},"< Del\n\n\nBackspace",{f:3,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 f3fed3cdbe..85b08cc092 100644
--- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png
+++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png
diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt
index f1ecd5fdce..815e2f5baf 100644
--- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt
+++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt
@@ -14,8 +14,8 @@
 [{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,fa:[0,1,0,0,0,0,0],w:1.5},"Capitals\nShift\n\n\n\n\nShift",{c:"#cccccc",a:7},"",{x:14.5},"",{c:"#2277ff",a:4,fa:[0,1,0,1],w:1.5},"\n\nCapitals\nShift\n\n\n\nShift"],
-[{y:-0.375,x:3.5,c:"#ff8500"},"Middle\n\n\n\n\n\nClick",{x:10.5,c:"#ffb063"},"Delete\n\n\nOption"],
+[{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.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"],
 [{r:30,rx:6.5,ry:4.25,y:-1,x:1,c:"#ccbb00"},"Stop\n\n\nBrowser","Reload\n\n\nBrowser"],
diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png
index 8a0cfd63f8..2cf2cb2b10 100644
--- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png
+++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png
diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt
index 93f632e955..4b6a6cb95e 100644
--- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt
+++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt
@@ -14,7 +14,7 @@
 [{y:-0.75,x:3.5,c:"#bbddbb"},"[",{x:10.5,c:"#89b087"},"2"],
 [{y:-0.875,x:2.5,c:"#bbddbb"},"^",{x:1},"]",{x:8.5,c:"#89b087"},"1",{x:1},"3"],
 [{y:-0.875,x:5.5,c:"#bbddbb"},"~",{x:6.5},"\\"],
-[{y:-0.875,c:"#2277ff",f2:1,w:1.5},"Capitals\nShift\n\n\n\n\nShift",{c:"#bbddbb"},"%",{x:14.5,c:"#89b087"},"-",{c:"#2277ff",fa:[0,1,0,1],w:1.5},"\n\nCapitals\nShift\n\n\n\nShift"],
+[{y:-0.875,c:"#2277ff",w:1.5},"Capitals\n\n\n\n\n\nShift",{c:"#bbddbb"},"%",{x:14.5,c:"#89b087"},"-",{c:"#2277ff",w:1.5},"\n\nCapitals\n\n\n\n\nShift"],
 [{y:-0.375,x:3.5,c:"#77aaff"},"Option\n\n\nLAlt",{x:10.5,c:"#89b087"},".\n\n\nOption"],
 [{y:-0.875,x:2.5,c:"#77aaff"},"Hyper",{x:1},"Cmd\n\n\nSuper",{x:8.5,c:"#89b087"},"0\n\n\nCmd",{x:1},"=\n\n\nHyper"],
 [{y:-0.75,x:0.5,c:"#77aaff"},"Ctrl\n\n\nLCtrl","Meh",{x:14.5,c:"#89b087"},"+\n\n\nMeh","Enter\n\n\nCtrl"],
diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex b/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex
index 6a42b7098a..25fdc51714 100644
--- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex
+++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex
@@ -1,1198 +1,1215 @@
-:100000000C94C7020C940B030C940B030C940B037D

-:100010000C940B030C940B030C940B030C940B0328

-:100020000C940B030C940B030C942A0E0C94FC0EF2

-:100030000C940B030C940B030C940B030C940B0308

-:100040000C940B030C947B230C940B030C940B0368

-:100050000C940B030C941F1D0C940B030C940B03BA

-:100060000C940B030C940B030C940B030C940B03D8

-:100070000C940B030C940B030C940B030C940B03C8

-:100080000C940B030C940B030C940B030C940B03B8

-:100090000C940B030C940B030C940B030C940B03A8

-:1000A0000C940B030C940B030C940B031C034E03D6

-:1000B0009A0335035E032D044A044D0450045E0484

-:1000C000610F830F6E10830F6E10C50FE80F6E1057

-:1000D0003D1050104A134A138B138B13CD13091480

-:1000E000091609162114091618151815E31509160D

-:1000F0000916F71500C801C802C803C804C805C816

-:10010000022001200030E100E00000001E00140089

-:1001100004001D0000074E001F001A0016001B00FF

-:10012000000F4C002000080007000600E2002A0033

-:100130002100150009001900E3004B002200170000

-:100140000A00050000004A0029002F0000002B02D1

-:1001500000004D002D00300000002B00000050007A

-:1001600023001C000B00110000004F0024001800A9

-:100170000D001000E700520025000C000E003600B4

-:10018000E6002C00260012000F003700000F2800A8

-:100190002700130033003800000751000520042019

-:1001A0000320E500E400000001000100010001005F

-:1001B000E00000003A001E02200222020007510067

-:1001C0003B001F0221022302000F28003C002F02E7

-:1001D00026022F00E2002C003D00300227023000F2

-:1001E000E30052003E0024023500350200005000BA

-:1001F0002900360200002B0000004F002D003702BE

-:1002000000002B0200004A003F003102380031009C

-:1002100000004D004000240021001E0027784B0004

-:100220004100250022001F0037744C0042002600C8

-:10023000230020002E7F2A004300380025022D00D5

-:100240002E774E000100010001000100287100001E

-:100250000100010001000100E00000004400660010

-:10026000A60000000007B50045000630F200083087

-:10027000F60000006800F000F100F100F400B600A4

-:1002800069000730F3000930F500B4006A00A900E6

-:10029000AA00A8000000B8002900F9000000FA0038

-:1002A0000000B9000000F9000000FA000000AC00F6

-:1002B0006B004600530000000000AB006C004A00D9

-:1002C00050004D004978A9006D00520051005100C6

-:1002D0004C74AE006E004B004F004E00000FAD009E

-:1002E0006F00B100B30000000007AA000100010088

-:1002F00001000100E40000000100010001003900DC

-:1003000001000000290001000100010001000100BE

-:1003100001000100010001000100010001000100D5

-:1003200001000100010001000100010001000100C5

-:1003300001000100010001000100010000000100B6

-:1003400001000100000001000000010001000100A7

-:100350000000010000000100010001000100010097

-:100360000000010001000100010001000100010086

-:100370000100010001000100010001000100010075

-:1003800001000100010001002A000100010001003C

-:10039000010001000100010001003900010000001E

-:1003A00016034500720067006F0044006F0078007C

-:1003B000200045005A000000160345007200670047

-:1003C0006F0044006F007800200045005A000000D4

-:1003D0000403090409026D00040100A0FA090400E5

-:1003E000000103010100092111010001223F000762

-:1003F00005810308000A0904010001030102000944

-:100400002111010001224D000705820308000A099D

-:10041000040200010300000009211101000122363D

-:10042000000705830308000A090403000103000014

-:100430000009211101000122390007058403100081

-:10044000011201100100000008EDFE071301000178

-:1004500002000105010906A101050719E029E715B8

-:1004600000250195087501810205081901290595E6

-:100470000575019102950175039101050719002980

-:100480007715002501957875018102C00501098065

-:10049000A101850216010026B7001A01002AB70043

-:1004A000751095018100C0050C0901A10185031695

-:1004B0000100269C021A01002A9C027510950181F8

-:1004C00000C005010902A1010901A10005091901E6

-:1004D0002905150025019505750181029501750312

-:1004E00081010501093009311581257F95027508C3

-:1004F000810609381581257F950175088106050C4F

-:100500000A38021581257F950175088106C0C0054E

-:10051000010906A101050719E029E7150025019544

-:1005200008750181029501750881010508190129E5

-:10053000059505750191029501750391010507194E

-:100540000029FF150025FF950675088100C00000F1

-:10055000000000000000000000010204060A0F175E

-:10056000202C3A4A5D71879DB3C7DAE9F5FCFFFCA0

-:10057000F5E9DAC7B39D87715D4A3A2C20170F0A57

-:100580000604020100000000000000000000112429

-:100590001FBECFEFDAE0DEBFCDBF04B603FE24C03E

-:1005A0008091F6019091F701A091F801B091F901C5

-:1005B0008730904BA740B04BB9F41092F6011092DF

-:1005C000F7011092F8011092F90114BE84B7877FE9

-:1005D00084BF88E10FB6F8948093600010926000A9

-:1005E0000FBEE0E0FFE3099511E0A0E0B1E0E4E830

-:1005F000FAE402C005900D92A433B107D9F721E0C7

-:10060000A4E3B1E001C01D92A63FB207E1F70E944A

-:10061000700B0C9440250C940000DC01462F50E038

-:100620004A30510508F05DC14A5A5F4F12962C912D

-:100630001297FA010C94F02480913A0190913B01B9

-:100640002223F1F0019690933B0180933A0180912F

-:10065000360190913701892B31F08091350191E07D

-:1006600089278093350181E09AC015968C91807F0F

-:100670002111BFC009F0D5C080913A0190913B0192

-:10068000019790933B0180933A01892B09F029C18E

-:1006900080913501811125C181E0A8C015968C910A

-:1006A000807F222349F12091360130913701882340

-:1006B00081F02115310569F48BE2C1C015968C914A

-:1006C000807F222319F12091360130913701811169

-:1006D000B1C0809138019091390101969093390110

-:1006E00080933801232B31F08091340191E08927E8

-:1006F0008093340182E053C0882351F08091360109

-:1007000090913701892B21F48BE2A4C081119AC00A

-:10071000809138019091390101979093390180932C

-:100720003801892B09F0DDC0809134018111D9C0D5

-:1007300082E05CC015963C912223A1F180913601A4

-:100740009091370101969093370180933601809103

-:100750003A0190913B01892B31F08091350191E074

-:100760008927809335018091380190913901892B37

-:1007700031F08091340191E0892780933401307FFA

-:1007800069F4E0910E01F0910F018081827231F0E5

-:1007900089E30E94D21189E30E949A1283E00E94A9

-:1007A0009D1A9FC0832F807FA1F030FD12C08091E1

-:1007B0003A0190913B01892B61F48091380190912D

-:1007C0003901892B31F485E30E94D21185E30E941F

-:1007D0009A128091360190913701019790933701D9

-:1007E00080933601892B09F07CC083E00E94BE1AF9

-:1007F00078C02091360130913701882329F02115E6

-:10080000310511F484E31BC080913A0190913B01C2

-:10081000019690933B0180933A01232B09F01DCF61

-:1008200022CF8091360190913701892B09F024CF96

-:1008300084E310C02115310509F04BCF81E30E94FC

-:10084000D2114FC08091360190913701892B09F068

-:100850005FCF81E30E949A1244C015963C9121110A

-:100860006DCF832F807F09F4B4CF30FDB2CF80915C

-:100870003A0190913B01892B09F0ABCF809138016F

-:1008800090913901892B09F0A4CF8EE20E94D211F8

-:100890008EE29DCF80EF90E005C080EF90E010C029

-:1008A00081EF90E0222329F00E94931F82EF90E0D5

-:1008B0000DC00E94FB1F82EF90E00FC081EF90E01F

-:1008C000222339F00E94931F83EF90E00E94931F30

-:1008D00006C00E94FB1F83EF90E00E94FB1F0E9456

-:1008E000802080E090E008950895E0910E01F0915D

-:1008F0000F018081827219F0259A2D9A06C00E94FC

-:10090000A91081FDF9CF25982D988091B90181FF1B

-:1009100003C0269A2E9A02C026982E988091B9017B

-:1009200082FF03C0279A2F9A089527982F98089539

-:100930000C94750456985E9825982D9826982E98B4

-:1009400027982F988FEF90E09093890080938800EC

-:1009500090938B0080938A0090938D0080938C00FD

-:10096000259A2D9A2FEF80E792E021508040904009

-:10097000E1F700C00000269A2E9A2FEF80E792E060

-:10098000215080409040E1F700C00000279A2F9A44

-:100990002FEF80E792E0215080409040E1F700C0C7

-:1009A000000025982D982FEF80E792E0215080409D

-:1009B0009040E1F700C0000026982E982FEF80E7C6

-:1009C00092E0215080409040E1F700C0000027985D

-:1009D0002F9856985E9825982D9826982E982798A7

-:1009E0002F98089589EA8093800089E080938100A0

-:1009F00024982C983F988AB18F748AB96E98479A38

-:100A00008BB1806B8BB9769A0E949A040C94740413

-:100A100080E28093000180913C0181110EC00E9410

-:100A2000570581E080933C012FEF83ED90E3215047

-:100A300080409040E1F700C0000080E40E945D0526

-:100A40008093000181112EC00E94870580930001D0

-:100A5000811128C00E94870580930001811122C066

-:100A60008FE30E9487058093000181111BC00E94C3

-:100A70007F0580E40E945D0580930001811112C012

-:100A80008CE00E9487058093000181110BC00E94B9

-:100A9000870580930001811105C08FE30E948705BF

-:100AA000809300010E947F058091000108951092BB

-:100AB000B9008AE08093B800089594EA9093BC004E

-:100AC0009091BC0097FFFCCF9091B900987F98302F

-:100AD00021F0903111F081E008958093BB0084E80B

-:100AE0008093BC008091BC0087FFFCCF8091B9004F

-:100AF000887F883111F0803471F780E0089584E9AF

-:100B00008093BC008091BC0084FDFCCF089580934D

-:100B1000BB0084E88093BC008091BC0087FFFCCFC1

-:100B20009091B900987F81E0983209F480E00895AF

-:100B300084E88093BC008091BC0087FFFCCF80914B

-:100B4000BB00089580910001811115C080E40E94CE

-:100B50005D058093000181110CC082E10E94870530

-:100B600080930001811105C08FEF0E94870580935B

-:100B700000010E947F0584B1807F84B985B1807FA8

-:100B800085B98AB1837F8AB98BB1837F8BB93E984F

-:100B9000469808950E940805809300010E94A205CE

-:100BA00080B38C7080BB81B3836F81BBECE4F1E0D8

-:100BB000AEE3B1E011921D9281E0EA35F807D1F77A

-:100BC0000C94F204BF92CF92DF92EF92FF920F93B8

-:100BD0001F93CF93DF9380910001882379F0809158

-:100BE0003D018F5F80933D01811108C00E9408057F

-:100BF00080930001811102C00E949A040EE311E06B

-:100C0000C0E0D0E0DD24D39482E0C82EEE24E3944B

-:100C1000F12CC73000F580910001811162C080E4A1

-:100C20000E945D0580930001811112C082E10E9443

-:100C300087058093000181110BC0C7010C2E01C0F4

-:100C4000880F0A94EAF780950E9487058093000137

-:100C50000E947F0546C0CA30A1F028F4C83059F080

-:100C6000C93061F005C0CC3089F070F0CD3089F02A

-:100C7000209A289810C0219A29980DC0229A2A9863

-:100C80000AC0239A2B9807C0529A01C0539A5B98C6

-:100C900002C03E9A4698E0EAEA95F1F78FB1799959

-:100CA0005AC092E081708D25892B7C9B02C090E018

-:100CB00001C094E0892B7D9B02C090E001C098E0C8

-:100CC000892B7E9B02C090E001C090E1892B9FB1EF

-:100CD0009095991F9927991F9295990F907E892B2E

-:100CE0000FC08091000181114BC080E40E945D051E

-:100CF00080930001882389F1B12C0E947F058B2D00

-:100D0000F8019081981719F08083C09201010E9428

-:100D1000A20521960F5F1F4FCE30D10509F079CF84

-:100D200080910101882371F1815080930101882312

-:100D300039F08FE99FE00197F1F700C0000022C071

-:100D4000ACE4B1E0EEE3F1E081918D9391E0EC341D

-:100D5000F907D1F717C090E0A5CF83E10E9487057E

-:100D6000809300018111C8CF81E40E945D058093CA

-:100D700000018111C1CF0E949805B82EB094BDCF5B

-:100D800080E0BECF0E94980481E0DF91CF911F9157

-:100D90000F91FF90EF90DF90CF90BF900895E82FD4

-:100DA000F0E0E45BFE4F808108950895089596E099

-:100DB000799FF001112494E5899FE00DF11D112424

-:100DC000E60FF11DEE0FFF1FE050FF4F859194914C

-:100DD0000895880F991F8C589040FC01859194913B

-:100DE0000895880F991F8C509F4FFC018591949115

-:100DF00008950F931F93CF93DF93EC01811520E3A8

-:100E0000920730F5811530E2930708F0B1C08B3BB3

-:100E1000910588F4883A910508F058C0853A910503

-:100E200008F049C08430910508F043C08130910535

-:100E300009F4B2C1AEC18F3F910509F0D0F5803FF2

-:100E4000910508F092C0805E9109089790F1A1C1C8

-:100E5000C11581E5D807A8F4C23090E5D90708F09C

-:100E60009FC0C11520E5D20709F486C008F092C0E2

-:100E7000C11580E4D80708F08CC18E011127106CD1

-:100E8000CCC1C11590E8D90758F4C11520E7D207A5

-:100E900008F07BC1C11530E6D30708F423C179C13E

-:100EA000C11580E9D80708F074C18E011F70106A5F

-:100EB000B4C18E01B2C1853A910509F470C1863A78

-:100EC000910509F46FC103E810E4A7C1883A9105C0

-:100ED00009F46BC1893A910509F46AC18A3A91050E

-:100EE00009F469C18B3A910509F468C18C3A9105FE

-:100EF00009F467C18D3A910509F466C1803B9105FB

-:100F000009F465C18E3A910509F464C18F3A9105DF

-:100F100009F463C1813B910509F462C1823B9105EB

-:100F200009F461C1833B910509F460C1843B9105DB

-:100F300009F45FC1853B910509F45EC1863B9105CB

-:100F400009F45DC1873B910509F45CC1883B9105BB

-:100F500009F45BC1893B910509F45AC18A3B9105AB

-:100F600009F059C10AE216E458C18C01106555C157

-:100F70009F700E94F10652C10E942C169FEF24E33D

-:100F80003CE0915020403040E1F700C000000E945A

-:100F9000441D43C18091D50181608093D5013DC13D

-:100FA0000E94EC1E811102C00E94D21E0E94091FE5

-:100FB00090E09093F6018093F501C23080E5D80768

-:100FC00021F48091F501816086C0C43090E5D90795

-:100FD00021F48091F50182607EC0C63020E5D20701

-:100FE00021F48091F501846076C0C83030E5D307E4

-:100FF00019F48091F50127C0CA3080E5D80721F4A3

-:101000008091F501806167C0CC3090E5D90721F46B

-:101010008091F50180625FC0CE3020E5D20721F4D7

-:101020008091F501806457C0C03130E5D30721F4C9

-:101030008091F50180684FC0C23180E5D80729F45E

-:101040008091F5018460886046C0C33090E5D9077F

-:1010500021F48091F5018E7F3EC0C53020E5D20796

-:1010600021F48091F5018D7F36C0C73030E5D3077C

-:1010700021F48091F5018B7F2EC0C93080E5D8071F

-:1010800019F48091F50126C0CB3090E5D90721F401

-:101090008091F5018F7E1FC0CD3020E5D20721F46D

-:1010A0008091F5018F7D17C0CF3030E5D30721F453

-:1010B0008091F5018F7B0FC0C13180E5D80721F405

-:1010C0008091F5018F7707C0C331D04531F480910D

-:1010D000F5018B7F877F8093F5018091F5010E9458

-:1010E0000D1F9BC08D2F99278F70992781309105F7

-:1010F000E9F48E01037011279C0102C0220F331FF7

-:101100000A95E2F789011C68CE0164E0880F991FF7

-:101110006A95E1F788279370082B192B73E0CC0FA1

-:10112000DD1F7A95E1F7C076DD272CC0823091056E

-:1011300029F41C2F0027016F106A6FC083309105BE

-:1011400061F4CE018370992701E010E002C0000F26

-:10115000111F8A95E2F71C680EC0049709F05DC064

-:10116000CE018370992701E010E002C0000F111F2B

-:101170008A95E2F71A6843E0CC0FDD1F4A95E1F744

-:10118000C07ED7700C2B1D2B48C08E011F701062C3

-:1011900044C000E010E041C001E010E03EC001E8C2

-:1011A00010E43BC002E810E438C002EE14E435C09D

-:1011B00009EE14E432C00AEE14E42FC005EB14E487

-:1011C0002CC006EB14E429C007EB14E426C00CEC99

-:1011D00014E423C00DEC14E420C003E815E41DC0A2

-:1011E0000AE815E41AC002E915E417C004E915E499

-:1011F00014C001E216E411C003E216E40EC004E2DA

-:1012000016E40BC005E216E408C006E216E405C0C9

-:1012100007E216E402C000E014E4C801DF91CF91B8

-:101220001F910F91089596E0799FF001112494E5A4

-:10123000899FE00DF11D1124E60FF11DEE0FFF1F38

-:10124000E050FF4F85919491803E9105E0F4803C01

-:10125000910558F58133910509F46FC048F489323E

-:10126000910509F463C08A32910509F46DC072C01A

-:1012700089339105E9F082389105D1F085339105E4

-:1012800009F44DC067C0833E910581F138F4803E7A

-:101290009105B9F0823E9105D9F05CC0863E91057A

-:1012A00061F1873E9105A1F155C00E94E9060895BC

-:1012B0002091F50120FD02C021FF4CC080EE90E09E

-:1012C00049C08091F50180FFF9CF89E390E042C0E9

-:1012D0008091F50182FF0EC08091F50184FF03C06B

-:1012E00080E090E037C083EE90E034C08091F5015B

-:1012F00082FFF2CF82EE90E02DC08091F50183FF56

-:101300000BC08091F50184FDEBCF87EE90E022C009

-:101310008091F50183FFF5CF86EE90E01BC08091B0

-:10132000F50185FF07C089E290E014C08091F501C6

-:1013300085FFF9CF85E390E00DC08091F50186FF30

-:1013400007C08AE290E006C08091F50186FFF9CFE0

-:1013500081E390E00E94F906089508950C94AD0988

-:1013600080916A010895CF93DF9300D01F92CDB78B

-:10137000DEB72091EC01243019F523E029839B830B

-:101380008A832093E9008FEF9091E800815095FDCA

-:1013900006C095ED9A95F1F700008111F5CF809187

-:1013A000E80085FF0DC040E050E063E070E0CE0152

-:1013B00001960E941D0C8091E8008E778093E800D2

-:1013C0000F900F900F90DF91CF910895CF93DF93FF

-:1013D00000D01F92CDB7DEB72091EC01243021F56B

-:1013E00022E029839B838A8383E08093E9008FEF47

-:1013F0009091E800815095FD06C095ED9A95F1F722

-:1014000000008111F5CF8091E80085FF0DC040E01C

-:1014100050E063E070E0CE0101960E941D0C8091C7

-:10142000E8008E778093E8000F900F900F90DF9187

-:10143000CF9108952091EC012430F1F422E0209323

-:10144000E9002FEF3091E800215035FD06C035ED61

-:101450003A95F1F700002111F5CF2091E80025FF22

-:101460000BC040E050E065E070E00E941D0C8091F0

-:10147000E8008E778093E8000895CF93DF93EC0126

-:101480008091EC01843009F046C090910C019923C1

-:10149000D9F090910D019923B9F08093E9008FEF75

-:1014A0009091E800815095FD06C095E19A95F1F77D

-:1014B00000008111F5CF8091E80085FF2CC040E04D

-:1014C00050E060E170E017C081E08093E9008FEFA9

-:1014D0009091E800815095FD06C095ED9A95F1F741

-:1014E00000008111F5CF8091E80085FF14C040E035

-:1014F00050E068E070E0CE010E941D0C8091E80091

-:101500008E778093E80080E1FE01AAE5B1E00190CA

-:101510000D928A95E1F7DF91CF9108958091EB01CB

-:10152000811109C00E94AF0D0E940C0E8091E20053

-:1015300084608093E20008951092EB01089508956D

-:101540000C9468230E94DB1C0E946E230E94A91049

-:101550000C94AE0942E061EC81E00E94290D42E06A

-:1015600061EC82E00E94290D42E061EC83E00E9480

-:10157000290D42E161EC84E00C94290D8091EE018B

-:10158000833009F455C030F4813071F0823009F4B1

-:101590008EC008958A3009F47AC08B3009F460C097

-:1015A000893009F09CC020C08091ED01813A09F09A

-:1015B00096C08091E800877F8093E8008091F101D8

-:1015C0009091F201892B21F060E080E090E003C06F

-:1015D00060E18AE591E070E00E94660C8091E8008D

-:1015E0008B778093E80008958091ED01813209F0B6

-:1015F00076C08091F1019091F201009719F0039764

-:1016000009F06DC08091E800877F8093E8008091A9

-:10161000E80082FD05C08091EC018111F8CF5FC028

-:101620008091F10080936A018091E8008B7753C02C

-:101630008091ED01813A09F052C08091F1019091C1

-:10164000F201892B09F04BC08091E800877F8093DD

-:10165000E8008091E80080FFFCCF80910C0136C04B

-:101660008091ED018132D9F58091F1019091F201E3

-:10167000892BA9F58091E800877F8093E8000E947C

-:101680005E0D8091EF0180930C010C942C168091DB

-:10169000ED01813221F58091E800877F8093E80099

-:1016A0000E945E0D8091F00180936B0108958091FE

-:1016B000ED01813AA1F48091E800877F8093E800F2

-:1016C0008091E80080FFFCCF80916B018093F10056

-:1016D0008091E8008E778093E8000C945E0D089569

-:1016E00084B7877F84BF88E10FB6F8948093600049

-:1016F000109260000FBE90E080E80FB6F8948093DF

-:101700006100909361000FBE0E94F8100E94AF0D1F

-:101710000E940C0E8091E20084608093E200789435

-:101720000E9487100E94FA1082E091E00E94A410AB

-:101730000E9456238091EC01853069F40E949B1C25

-:101740008091EA018823B1F30E94C61C882391F39B

-:101750000E94070CEFCF0E940011ECCF292F3327F6

-:1017600023303105A9F06CF42130310509F442C071

-:101770002230310509F043C08DE690E024ED33E0DE

-:1017800042C021323105C9F02232310519F137C08A

-:1017900099278130910541F08230910541F0892BE4

-:1017A00071F5E0EDF3E005C0E8EBF3E002C0E0EA3C

-:1017B000F3E0849190E09F0126C0643000F5E62FAD

-:1017C000F0E0EE0FFF1FEE5DFE4F2081318189E0DA

-:1017D00090E019C0643098F4E62FF0E0DF01AA0F22

-:1017E000BB1FA65EBE4F2D913C91EA5EFE4F8081ED

-:1017F00090E009C082E190E021E434E004C080E0A0

-:1018000090E020E030E0FA0131832083089580E108

-:1018100089BD82E189BD09B400FEFDCF8091D80069

-:101820008F7D8093D8008091E00082608093E000FB

-:101830008091E00081FDFCCF0895CF92DF92EF927E

-:10184000FF920F931F93CF93DF937C018B01EA01EB

-:101850000E947F0D811131C0209731F088819981DC

-:10186000081B190BE80EF91EC12CD12C011511050E

-:1018700019F18091E80085FD14C08091E8008E7711

-:101880008093E800209741F0888199818C0D9D1DFF

-:101890009983888385E011C00E947F0D882331F3EE

-:1018A0000CC0F70181917F018093F1000150110973

-:1018B000FFEFCF1ADF0ADACF80E0DF91CF911F91DF

-:1018C0000F91FF90EF90DF90CF9008952091F3015A

-:1018D0003091F4012617370748F06115710539F486

-:1018E0002091E8002E772093E80001C0B901FC01A7

-:1018F00020E061157105B9F18091EC01882309F4AC

-:1019000040C0853009F43FC08091E80083FD3DC0B0

-:101910008091E80082FF06C08091E80082FF26C027

-:1019200080E008958091E80080FFE3CF2091F300EC

-:101930008091F20090E0922B6115710551F0883092

-:10194000910538F421912093F100615071090196BD

-:10195000F3CF21E0089709F020E08091E8008E772E

-:101960008093E800C6CF2111C7CFD6CF8091EC017C

-:10197000882339F0853039F08091E80083FFCCCF9F

-:1019800004C082E0089583E0089581E008952091E5

-:10199000F3013091F4012617370748F061157105FE

-:1019A00039F42091E8002E772093E80001C0B901B6

-:1019B000FC0120E061157105C1F18091EC018823E3

-:1019C00009F441C0853009F440C08091E80083FDEE

-:1019D0003EC08091E80082FF06C08091E80082FF4F

-:1019E00027C080E008958091E80080