From 262930c8d5e57beec044d932ef554a09e846f9ca Mon Sep 17 00:00:00 2001 From: Nathan Sharfi Date: Sat, 30 Apr 2016 22:12:13 -0700 Subject: ergodox-zweihander: initial commit --- .../ergodox_ez/keymaps/zweihander-osx/keymap.c | 184 +++++++++++++++++++++ .../keymaps/zweihander-osx/readme.markdown | 40 +++++ 2 files changed, 224 insertions(+) create mode 100644 keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c create mode 100644 keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown (limited to 'keyboard/ergodox_ez/keymaps/zweihander-osx') diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c new file mode 100644 index 0000000000..cc94e13337 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c @@ -0,0 +1,184 @@ +#include "ergodox_ez.h" +#include "debug.h" +#include "action_layer.h" + +#define BASE 0 // default layer +#define SYMB 1 // symbols +#define MDIA 2 // media keys + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Keymap 0: Basic layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | = | 1 | 2 | 3 | 4 | 5 | ← | | → | 6 | 7 | 8 | 9 | 0 | - | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | ⌦ | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | ⌫ | A | S | D | F | G |------| |------| H | J | K | L |; / L2| ' / L⌘ | + * |--------+------+------+------+------+------| L⌘ | | L⌘ |------+------+------+------+------+--------| + * | L⇧ | Z | X | C | V | B | | | | N | M | , | . | / / ⌃| R⇧ | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | L⌃ | L⌥ | L⌘ | ← | → | | ↑ | ↓ | [ | ] | ~L1 | + * `----------------------------------' `----------------------------------' + * ,-------------. ,---------------. + * | `~ | '" | | ⎋ | ⌫ | + * ,------|------|------| |------+--------+------. + * | | | PgUp | | PgDn | | | + * | | ⌫ |------| |------| ⇥ |Enter | + * | | | L⌥ | | L⌃ | | | + * `--------------------' `----------------------' + */ +// If it accepts an argument (i.e, is a function), it doesn't need KC_. +// Otherwise, it needs KC_* +[BASE] = KEYMAP( // layer 0 : default + // left hand + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, + KC_DELT, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), + KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LGUI, + KC_LCTL, KC_LALT, KC_LGUI,KC_LEFT,KC_RGHT, + KC_GRV, KC_QUOT, + KC_PGUP, + KC_SPC,KC_BSPC,KC_LALT, + // right hand + KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),GUI_T(KC_QUOT), + KC_LGUI, KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT, + KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_FN1, + KC_ESC, KC_BSPC, + KC_PGDN, + KC_LCTL, KC_TAB, KC_ENT + ), +/* Keymap 1: Symbol Layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | ! | @ | { | } | | | | | | / | 7 | 8 | 9 | * | F12 | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | # | $ | ( | ) | ` |------| |------| - | 4 | 5 | 6 | + | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | = | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | 0 | . | ← | → | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | Home | | | + * | | |------| |------| | | + * | | | | | End | | | + * `--------------------' `--------------------' + */ +// SYMBOLS +[SYMB] = KEYMAP( + // left hand + KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, + KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, + KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, + KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, + KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, + KC_TRNS,KC_TRNS, + KC_TRNS, + KC_TRNS,KC_TRNS,KC_TRNS, + // right hand + KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_TRNS, KC_SLSH, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, + KC_MINS, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, + KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_EQL, KC_TRNS, + KC_0, KC_DOT, KC_LEFT, KC_RGHT, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_HOME, + KC_END , KC_TRNS, KC_TRNS +), +/* Keymap 2: Media keys + * dim brighten + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | F14 | | F15 | | | | | | Power | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | | PgUp | | | | | | ⌘] | ⌥⌘↑ | ↑ | ⌥⌘↓ | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | Home | PgDn | End | |------| |------| ⌘[ | ← | ↓ | → | | ⏯ | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | | | | |L⇧+Spc| Spc | ⏮ | ⏭ | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | |VolUp |VolDn | Mute | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +// MEDIA AND MOUSE +[MDIA] = KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F14, /* F14 dims screen, F15 brightens */ + KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END , 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, + // right hand + KC_F15 , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PWR, + KC_TRNS, LGUI(KC_RBRC), LGUI(LALT(KC_UP)), KC_UP , LGUI(LALT(KC_DOWN)), KC_TRNS, KC_TRNS, + LGUI(KC_LBRC), KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_MPLY, + KC_TRNS, LSFT(KC_SPC), KC_SPC , KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, + KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS +), +}; + +const uint16_t PROGMEM fn_actions[] = { + [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + switch(id) { + case 0: + if (record->event.pressed) { + register_code(KC_RSFT); + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; + +// Runs just one time when the keyboard initializes. +void matrix_init_user(void) { + +}; + +// Runs constantly in the background, in a loop. +void matrix_scan_user(void) { + + uint8_t layer = biton32(layer_state); + + ergodox_board_led_off(); + ergodox_right_led_1_off(); + ergodox_right_led_2_off(); + ergodox_right_led_3_off(); + switch (layer) { + // TODO: Make this relevant to the ErgoDox EZ. + case 1: + ergodox_right_led_1_on(); + break; + case 2: + ergodox_right_led_2_on(); + break; + default: + // none + break; + } + +}; diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown b/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown new file mode 100644 index 0000000000..8103c6b327 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown @@ -0,0 +1,40 @@ +# The Zweihander Layout + +This layout is tuned for people who… + + +## use OS X + +This layout doesn’t make any concessions for Windows use. While it should work fine in Windows, I’m not about to devote precious keyboard space to Windows-specific shortcuts. + + +## mouse left-handed while doing other things with the right hand + +I tend to have my mouse in my left hand, but I like to use my other hand to make things go faster. I’ve added a bunch of buttons to the media layer to speed up browsing in Safari and Finder: + +- Back (⌘[) +- Forward (⌘]) +- Open and Close Parent Folder (⌥⌘↓) +- Go Up and Close Just-Left Folder (⌥⌘↑) +- Space (page down in browsers; Quick Look in the Finder) +- Shift-Space (page up in web browsers) + +Because moving letter-by-letter is way slower than moving word-by-word, I added Option (⌥) to the bottommost button on the left side. This key can be held easily while holding ; (activate media layer) and pressing J and L to move left and right by word. + + +## use lots of modifier keys in OS X menu-item shortcuts + +I wanted to preserve the feel of a number of shortcuts that involve pressing lots of modifier keys at once; this is why the bottom left of the keyboard has shift, control, option, and command in the usual spaces. Further, some common shortcuts I press have a key on the right side of the keyboard. These shortcuts include: + +- Empty Trash Without Asking for Confirmation (⇧⌥⌘⌫) +- Shut Down Without Asking for Confirmation (⇧⌥⌘ power) + + +## use Emacs-style shortcuts + +I press C-a, C-e, and C-k all the time. It’s difficult to press these key combinations with the control key on the bottom left and I’m too quick on the draw for the control function on the / key to work reliably, so the bottommost thumb button on the right side is another control key. + + +## use spreadsheets + +All the common spreadsheet operations (+-*/=) are now on the right side of the symbol layer. -- cgit v1.2.3 From 8ec1d41a28d5223a147218bfb7fefd933b906d22 Mon Sep 17 00:00:00 2001 From: Nathan Sharfi Date: Sat, 30 Apr 2016 22:36:09 -0700 Subject: Ergodox EZ: add zweihander-osx.hex --- .../keymaps/zweihander-osx/zweihander-osx.hex | 1152 ++++++++++++++++++++ 1 file changed, 1152 insertions(+) create mode 100644 keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex (limited to 'keyboard/ergodox_ez/keymaps/zweihander-osx') diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex b/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex new file mode 100644 index 0000000000..9b783c957c --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex @@ -0,0 +1,1152 @@ +:100000000C9465020C94A9020C94A9020C94A90208 +:100010000C94A9020C94A9020C94A9020C94A902B4 +:100020000C94A9020C94A9020C94720C0C94440D2B +:100030000C94A9020C94A9020C94A9020C94A90294 +:100040000C94A9020C940E220C94A9020C94A902FF +:100050000C94A9020C949D1B0C94A9020C94A90267 +:100060000C94A9020C94A9020C94A9020C94A90264 +:100070000C94A9020C94A9020C94A9020C94A90254 +:100080000C94A9020C94A9020C94A9020C94A90244 +:100090000C94A9020C94A9020C94A9020C94A90234 +:1000A0000C94A9020C94A9020C94A902B10DD30DD1 +:1000B000C10ED30DC10E180E3B0EC10E900EA30E35 +:1000C0008F118F11CC11CC110F124D1266146614C2 +:1000D00066126614671367133A1466146614511493 +:1000E0000000F0A12E004C002A00E100E00000001A +:1000F0001E00140004001D00E200E2001F001A00B0 +:1001000016001B00E3002A0020000800070006007C +:1001100050002C0021001500090019004F004B0071 +:10012000220017000A0005000000350050000154AD +:100130000000E300000034004F0001540000E30021 +:100140000000290023001C000B00110000002A0001 +:10015000240018000D00100052004E0025000C0075 +:100160000E00360051002800260012000F00370054 +:100170002F002B0027001300338238713000E0007D +:100180002D0031003478E500C100000001000100BD +:1001900001000100010000003A001E0220022202BC +:1001A000010001003B001F022102230201000100A7 +:1001B0003C002F0226022F00010001003D0030020A +:1001C00027023000010001003E00310235003502F7 +:1001D000000001000100010000000100000001001A +:1001E0000100010000000100000001003F00380094 +:1001F0002D002402000001004000240021001E0008 +:1002000027004A004100250022001F00370001009E +:100210004200260023002000500001004300250278 +:100220002E022E004F004D00440045000100010049 +:1002300001000000010001000100010001000000B8 +:1002400001000100010001000100010001000100A6 +:100250004A0001000100010001004B004E000100B6 +:1002600001000100010001004D000100010001003A +:10027000010001000100010000000100690001000F +:1002800000000100000001006A0001000000010000 +:1002900000000100010030082F082C0200000100BE +:1002A0000100520C50002C00A90001000100520076 +:1002B0005100AC00AA0001000100510C4F00AB003E +:1002C000A80001000100010001000100010001007F +:1002D000A5000100AE00010001000000160345006A +:1002E000720067006F0044006F0078002000450036 +:1002F0005A00000016034500720067006F004400BA +:100300006F007800200045005A0000000403090433 +:1003100009026D00040100A0FA09040000010301B4 +:100320000100092111010001223F00070581030896 +:10033000000A090401000103010200092111010062 +:1003400001224D000705820308000A09040200018A +:100350000300000009211101000122360007058376 +:100360000308000A09040300010300000009211129 +:100370000100012239000705840310000112011059 +:100380000100000008EDFE07130100010200010555 +:10039000010906A101050719E029E71500250195C6 +:1003A0000875018102050819012905950575019156 +:1003B000029501750391010507190029771500259C +:1003C00001957875018102C005010980A1018502AE +:1003D00016010026B7001A01002AB7007510950112 +:1003E0008100C0050C0901A1018503160100269CAE +:1003F000021A01002A9C02751095018100C00501B6 +:100400000902A1010901A100050919012905150029 +:10041000250195057501810295017503810105018D +:10042000093009311581257F950275088106093843 +:100430001581257F950175088106050C0A3802157E +:1004400081257F950175088106C0C005010906A1B7 +:1004500001050719E029E7150025019508750181B7 +:100460000295017508810105081901290595057591 +:100470000191029501750391010507190029FF15E6 +:100480000025FF950675088100C0000000000000EF +:100490000000000000010204060A0F17202C3A4A4F +:1004A0005D71879DB3C7DAE9F5FCFFFCF5E9DAC7B2 +:1004B000B39D87715D4A3A2C20170F0A060402018A +:1004C0000000000000000000000011241FBECFEF5C +:1004D000DAE0DEBFCDBF04B603FE24C08091EE019A +:1004E0009091EF01A091F001B091F1018730904B14 +:1004F000A740B04BB9F41092EE011092EF011092A8 +:10050000F0011092F10114BE84B7877F84BF88E1A7 +:100510000FB6F89480936000109260000FBEE0E088 +:10052000FFE3099511E0A0E0B1E0EAEAF7E402C0D8 +:1005300005900D92A433B107D9F711E0A4E3B1E01F +:1005400001C01D92AE3EB107E1F70E94B6090C94BE +:10055000D3230C94000061110BC0FC01828188231D +:1005600021F085EE0E94231003C085EE0E94EB105F +:1005700080E090E0089508956091B1017091B2011A +:100580008091B3019091B4010E94C91A56985E9867 +:1005900025982D9826982E9827982F98813019F015 +:1005A000823021F00895259A2D9A0895269A2E9A40 +:1005B00008950C94BC0256985E9825982D9826981C +:1005C0002E9827982F988FEF90E090938900809332 +:1005D000880090938B0080938A0090938D00809385 +:1005E0008C00259A2D9A2FEF80E792E021508040D1 +:1005F0009040E1F700C00000269A2E9A2FEF80E786 +:1006000092E0215080409040E1F700C00000279A1E +:100610002F9A2FEF80E792E0215080409040E1F741 +:1006200000C0000025982D982FEF80E792E0215020 +:1006300080409040E1F700C0000026982E982FEFF0 +:1006400080E792E0215080409040E1F700C0000038 +:1006500027982F9856985E9825982D9826982E982A +:1006600027982F98089589EA8093800089E08093E5 +:10067000810024982C983F988AB18F748AB96E981B +:10068000479A8BB1806B8BB9769A0E94DB020C94EF +:10069000BB0280E2809300018091340181110EC081 +:1006A0000E94980381E0809334012FEF83ED90E363 +:1006B000215080409040E1F700C0000080E40E949B +:1006C0009E038093000181112EC00E94C803809375 +:1006D0000001811128C00E94C8038093000181118C +:1006E00022C08FE30E94C8038093000181111BC0C8 +:1006F0000E94C00380E40E949E0380930001811148 +:1007000012C08CE00E94C8038093000181110BC0CD +:100710000E94C80380930001811105C08FE30E94ED +:10072000C803809300010E94C003809100010895D6 +:100730001092B9008AE08093B800089594EA9093EB +:10074000BC009091BC0097FFFCCF9091B900987FBE +:10075000983021F0903111F081E008958093BB0032 +:1007600084E88093BC008091BC0087FFFCCF80911F +:10077000B900887F883111F0803471F780E00895E6 +:1007800084E98093BC008091BC0084FDFCCF089577 +:100790008093BB0084E88093BC008091BC0087FFFD +:1007A000FCCF9091B900987F81E0983209F480E005 +:1007B000089584E88093BC008091BC0087FFFCCF43 +:1007C0008091BB00089580910001811115C080E4E3 +:1007D0000E949E038093000181110CC082E10E945F +:1007E000C80380930001811105C08FEF0E94C803E8 +:1007F000809300010E94C00384B1807F84B985B1D9 +:10080000807F85B98AB1837F8AB98BB1837F8BB9A9 +:100810003E98469808950E944903809300010E94E3 +:10082000E30380B38C7080BB81B3836F81BBA6E38D +:10083000B1E0E4E4F1E08EE08E0F11921D928E1390 +:10084000FCCF0C943303BF92CF92DF92EF92FF92D2 +:100850000F931F93CF93DF9380910001882379F04A +:10086000809135018F5F80933501811108C00E940E +:10087000490380930001811102C00E94DB0206E35C +:1008800011E0C0E0D0E0DD24D39482E0C82EEE2455 +:10089000E394F12CC730D10500F58091000181115E +:1008A00064C080E40E949E0380930001811112C005 +:1008B00082E10E94C8038093000181110BC0C7012F +:1008C0000C2E01C0880F0A94EAF780950E94C80395 +:1008D000809300010E94C00348C0CA30A1F028F4F0 +:1008E000C83059F0C93061F005C0CC3089F070F0E3 +:1008F000CD3089F0209A289810C0219A29980DC0EF +:10090000229A2A980AC0239A2B9807C0529A01C0AB +:10091000539A5B9802C03E9A469890EA9A95F1F7EE +:100920009FB1799902C082E001C080E091709D255D +:10093000982B7C9902C084E001C080E0892B7D99CE +:1009400002C038E001C030E0832B7E9902C020E174 +:1009500001C020E0822B9FB19095991F9927991F84 +:100960009295990F907E892B0FC080910001811183 +:1009700049C080E40E949E0380930001882379F19E +:10098000B12C0E94C0038B2DF8019081981719F0AB +:100990008083C09201010E94E30321960F5F1F4FE5 +:1009A000CE30D10509F076CF80910101882361F125 +:1009B000815080930101882339F08FE99FE00197EE +:1009C000F1F700C0000020C0A4E4B1E0E6E3F1E0EC +:1009D000CF01825F91919D938E13FCCF15C083E16F +:1009E0000E94C803809300018111CACF81E40E9454 +:1009F0009E03809300018111C3CF0E94D903B82EBA +:100A0000B094BFCF80E0C0CF0E94D90281E0DF91D7 +:100A1000CF911F910F91FF90EF90DF90CF90BF90FB +:100A20000895E82FF0E0EC5BFE4F80810895089573 +:100A3000089596E0799FF001112494E5899FE00DD7 +:100A4000F11D1124E60FF11DEE0FFF1FEC51FF4FBA +:100A5000859194910895880F991FFC01E05AF04008 +:100A6000859194910895880F991FFC01E052FF4FE2 +:100A70008591949108950F931F93CF93DF93EC0189 +:100A80008115904350F5C11580E2D80708F0B3C036 +:100A9000CB3BD10590F4C83AD10508F05AC0C53A0D +:100AA000D10508F04BC0C430D10508F0BBC1219777 +:100AB00009F0B5C101E010E0F5C1CF3FD10511F05B +:100AC00008F0B0C1C03FD10508F092C0CE01805EF1 +:100AD0009109089708F4A6C1A2C1C11591E5D907EB +:100AE000A8F4C23020E5D20708F09EC0C11580E509 +:100AF000D80709F485C008F091C0C11520E4D207D9 +:100B000008F08DC1DD278E01106CCCC1C11580E8C5 +:100B1000D80758F4C11590E7D90708F07CC1C11572 +:100B200020E6D20708F422C17AC1C11580E9D807AE +:100B300008F075C1DF708E01106AB4C1C53AD105E5 +:100B400009F472C1C63AD10509F071C102E810E496 +:100B5000A9C1C83AD10509F46DC1C93AD10509F452 +:100B60006CC1CA3AD10509F46BC1CB3AD10509F47D +:100B70006AC1CC3AD10509F469C1CD3AD10509F46D +:100B800068C1C03BD10509F467C1CE3AD10509F46B +:100B900066C1CF3AD10509F465C1C13BD10509F45D +:100BA00064C1C23BD10509F463C1C33BD10509F45B +:100BB00062C1C43BD10509F461C1C53BD10509F44B +:100BC00060C1C63BD10509F45FC1C73BD10509F43B +:100BD0005EC1C83BD10509F45DC1C93BD10509F42B +:100BE0005CC1CA3BD10509F45BC100E014E45AC101 +:100BF0008E01106557C1CE019F700E94330553C10D +:100C00000E948A149FEF24E38CE0915020408040A2 +:100C1000E1F700C000000E94C21B44C18091CD01D9 +:100C200081608093CD013EC10E946B1D811102C085 +:100C30000E94511D0E94881D90E09093EE018093C8 +:100C4000ED01C23090E5D90721F48091ED0181607A +:100C500086C0C43020E5D20721F48091ED01826086 +:100C60007EC0C63080E5D80721F48091ED01846014 +:100C700076C0C83090E5D90719F48091ED0127C0FE +:100C8000CA3020E5D20721F48091ED01806167C070 +:100C9000CC3080E5D80721F48091ED0180625FC0FF +:100CA000CE3090E5D90721F48091ED01806457C0E2 +:100CB000C03120E5D20721F48091ED0180684FC05A +:100CC000C23180E5D80729F48091ED018460886005 +:100CD00046C0C33090E5D90721F48091ED018E7FA5 +:100CE0003EC0C53020E5D20721F48091ED018D7F13 +:100CF00036C0C73080E5D80721F48091ED018B7FA5 +:100D00002EC0C93090E5D90719F48091ED0126C0B5 +:100D1000CB3020E5D20721F48091ED018F7E1FC0FA +:100D2000CD3080E5D80721F48091ED018F7D17C08B +:100D3000CF3090E5D90721F48091ED018F7B0FC072 +:100D4000C13120E5D20721F48091ED018F7707C0F2 +:100D5000C331D04531F48091ED018B7F877F809343 +:100D6000ED018091ED010E948C1D9CC08D2F992773 +:100D70008F70992781309105D9F49E012370332714 +:100D800002C0880F991F2A95E2F79C688E0144E003 +:100D9000000F111F4A95E1F700271370802B912B4C +:100DA00053E0CC0FDD1F5A95E1F7C076DD272FC049 +:100DB0008230910531F4DC2FCC278E01016F106A4F +:100DC00071C08330910569F4CE018370992701E0E9 +:100DD00010E002C0000F111F8A95E2F7C8019C685D +:100DE0000FC0049709F05EC0CE018370992701E01F +:100DF00010E002C0000F111F8A95E2F7C8019A683F +:100E000023E0CC0FDD1F2A95E1F7C07ED7708C015F +:100E10000C2B1D2B47C0DF708E01106243C000E019 +:100E200010E040C08E013EC001E810E43BC003E882 +:100E300010E438C002EE14E435C009EE14E432C008 +:100E40000AEE14E42FC005EB14E42CC006EB14E406 +:100E500029C007EB14E426C00CEC14E423C00DEC0D +:100E600014E420C003E815E41DC00AE815E41AC024 +:100E700002E915E417C004E915E414C001E216E420 +:100E800011C003E216E40EC004E216E40BC005E252 +:100E900016E408C006E216E405C007E216E402C044 +:100EA0000AE216E4C801DF91CF911F910F910895D6 +:100EB00096E0799FF001112494E5899FE00DF11DE2 +:100EC0001124E60FF11DEE0FFF1FEC51FF4F85912E +:100ED0009491803E9105E0F4803C910558F5813372 +:100EE000910509F46FC048F48932910509F463C093 +:100EF0008A32910509F46DC072C089339105E9F019 +:100F000082389105D1F08533910509F44DC067C051 +:100F1000833E910581F138F4803E9105B9F0823E1F +:100F20009105D9F05CC0863E910561F1873E91053F +:100F3000A1F155C00E942B0508952091ED0120FDDF +:100F400002C021FF4CC080EE90E049C08091ED01CD +:100F500080FFF9CF89E390E042C08091ED0182FFEC +:100F60000EC08091ED0184FF03C080E090E037C0A7 +:100F700083EE90E034C08091ED0182FFF2CF82EEEB +:100F800090E02DC08091ED0183FF0BC08091ED01B9 +:100F900084FDEBCF87EE90E022C08091ED0183FFCE +:100FA000F5CF86EE90E01BC08091ED0185FF07C074 +:100FB00089E290E014C08091ED0185FFF9CF85E3CF +:100FC00090E00DC08091ED0186FF07C08AE290E0BD +:100FD00006C08091ED0186FFF9CF81E390E00E9489 +:100FE0003B05089508950C94F207809162010895DD +:100FF000CF93DF9300D01F92CDB7DEB79C018091D5 +:10100000E401843019F593E099833B832A8390931C +:10101000E9008FEF9091E800815095FD06C095EDB5 +:101020009A95F1F700008111F5CF8091E80085FFD6 +:101030000DC040E050E063E070E0CE0101960E94F8 +:10104000620A8091E8008E778093E8000F900F90FD +:101050000F90DF91CF910895CF93DF9300D01F922F +:10106000CDB7DEB72091E401243021F522E02983B9 +:101070009B838A8383E08093E9008FEF9091E8005F +:10108000815095FD06C095ED9A95F1F7000081110C +:10109000F5CF8091E80085FF0DC040E050E063E0AF +:1010A00070E0CE0101960E94620A8091E8008E777E +:1010B0008093E8000F900F900F90DF91CF910895EB +:1010C0002091E4012430F1F422E02093E9002FEF95 +:1010D0003091E800215035FD06C035ED3A95F1F725 +:1010E00000002111F5CF2091E80025FF0BC040E062 +:1010F00050E065E070E00E94620A8091E8008E771F +:101100008093E8000895CF93DF93EC019091E40180 +:10111000943009F046C080910C018823D9F0809169 +:101120000D018823B9F09093E9008FEF9091E800CA +:10113000815095FD06C095E19A95F1F70000811167 +:10114000F5CF8091E80085FF2CC040E050E060E1E1 +:1011500070E017C081E08093E9008FEF9091E80084 +:10116000815095FD06C095ED9A95F1F7000081112B +:10117000F5CF8091E80085FF14C040E050E068E0C2 +:1011800070E0CE010E94620A8091E8008E77809321 +:10119000E80080E1FE01A2E5B1E001900D928A95A0 +:1011A000E1F7DF91CF9108958091E301811109C0AA +:1011B0000E94F70B0E94540C8091E200846080939F +:1011C000E20008951092E301089508950C94FB2124 +:1011D0000E94581B0E9401220E94FA0E0C94F307F1 +:1011E00042E061EC81E00E94710B42E061EC82E040 +:1011F0000E94710B42E061EC83E00E94710B42E1BE +:1012000061EC84E00C94710B8091E601833009F469 +:1012100055C030F4813071F0823009F48EC00895E9 +:101220008A3009F47AC08B3009F460C0893009F043 +:101230009CC020C08091E501813A09F096C0809160 +:10124000E800877F8093E8008091E9019091EA01AE +:10125000892B21F460E182E591E003C060E080E049 +:1012600090E070E00E94AD0A8091E8008B77809357 +:10127000E80008958091E501813209F076C08091FF +:10128000E9019091EA01009719F0039709F06DC008 +:101290008091E800877F8093E8008091E80082FDDC +:1012A00005C08091E4018111F8CF5FC08091F10009 +:1012B000809362018091E8008B7753C08091E501B3 +:1012C000813A09F052C08091E9019091EA01892B9D +:1012D00009F04BC08091E800877F8093E8008091FF +:1012E000E80080FFFCCF80910C0136C08091E501C1 +:1012F0008132D9F58091E9019091EA01892BA9F514 +:101300008091E800877F8093E8000E94A60B80917F +:10131000E70180930C010C948A148091E5018132DD +:1013200021F58091E800877F8093E8000E94A60B5A +:101330008091E8018093630108958091E501813AED +:10134000A1F48091E800877F8093E8008091E80015 +:1013500080FFFCCF809163018093F1008091E800D1 +:101360008E778093E8000C94A60B089584B7877F4E +:1013700084BF88E10FB6F8948093600010926000FB +:101380000FBE90E080E80FB6F894809361009093D0 +:1013900061000FBE0E94490F0E94F70B0E94540C7F +:1013A0008091E20084608093E20078940E94DA0EDB +:1013B0000E944B0F82E091E00E94F50E0E94E9210D +:1013C0008091E401853069F40E94191B8091E2014B +:1013D0008823B1F30E94441B882391F30E944C0A96 +:1013E000EFCF0E94510FECCF292F33272330310547 +:1013F000C9F064F42130310581F02230310509F063 +:1014000043C08DE690E020E133E042C02132310557 +:10141000F1F02232310541F137C082E190E02DE751 +:1014200033E036C099278130910541F08230910533 +:1014300041F0892B49F5ECE0F3E005C0E4EFF2E080 +:1014400002C0ECEDF2E0849190E09F0121C0643095 +:10145000D8F4E62FF0E0EE0FFF1FEE5DFE4F208187 +:10146000318189E090E014C0643070F470E0FB01D9 +:10147000EE0FFF1FE65EFE4F20813181FB01EA5E29 +:10148000FE4F808190E004C080E090E020E030E0FA +:10149000FA0131832083089580E189BD82E189BD0D +:1014A00009B400FEFDCF8091D8008F7D8093D800D5 +:1014B0008091E00082608093E0008091E00081FDF7 +:1014C000FCCF0895CF92DF92EF92FF920F931F937C +:1014D000CF93DF93EC018B016A010E94C50B811150 +:1014E00033C0C114D10439F0F60180819181081B09 +:1014F000190BC80FD91FE12CF12C0115110519F199 +:101500008091E80085FD16C08091E8008E77809379 +:10151000E800C114D10449F0F60180819181E80E00 +:10152000F91EF182E08285E00FC00E94C50B88237E +:1015300021F30AC089918093F10001501109FFEF56 +:10154000EF1AFF0ADACF80E0DF91CF911F910F9160 +:10155000FF90EF90DF90CF9008952091EB013091B4 +:10156000EC012617370748F06115710539F4209111 +:10157000E8002E772093E80001C0B90140E0611532 +:101580007105A9F12091E401222309F443C025301B +:1015900009F442C02091E80023FD40C02091E800FA +:1015A00022FD32C02091E80020FFE9CF4091F300F6 +:1015B0002091F20030E0342BFC01CF016115710560 +:1015C00059F02830310540F481918093F100615049 +:1015D00071092F5F3F4FF1CF41E02830310509F00D +:1015E00040E02091E8002E772093E800C8CF411119 +:1015F000C9CF0AC08091E401882361F0853061F091 +:101600008091E80083FD0AC08091E80082FFF2CF5C +:1016100080E0089582E0089583E0089581E00895D0 +:101620002091EB013091EC012617370748F0611546 +:10163000710539F42091E8002E772093E80001C06D +:10164000B901FC0120E06115710591F18091E4017F +:10165000882309F440C0853009F43FC08091E80038 +:1016600083FD3DC08091E80082FD2FC08091E8009D +:1016700080FFE9CF2091F3008091F20090E0922B5F +:101680006115710559F08830910540F4249120933B +:10169000F1003196615071090196F2CF21E008976F +:1016A00009F020E08091E8008E778093E800CBCFAE +:1016B0002111CCCF0AC08091E401882361F08530EC +:1016C00061F08091E80083FD0AC08091E80082FF0C +:1016D000F2CF80E0089582E0089583E0089581E0EC +:1016E0000895982F973058F59093E900981739F09E +:1016F0007091EC002091ED005091F00003C0242F78 +:10170000762F50E021FF19C03091EB003E7F3093DF +:10171000EB003091ED003D7F3093ED003091EB0018 +:1017200031603093EB007093EC002093ED00509308 +:10173000F0002091EE0027FF07C09F5FD3CF8F708E +:101740008093E90081E0089580E008958091E501AB +:1017500087FF11C08091E80082FD05C08091E401FF +:101760008111F8CF11C08091E8008B770BC0809178 +:10177000E401882349F08091E80080FFF8CF809150 +:10178000E8008E778093E80008952091E40030917E +:10179000E50095E64091EC00842F817040FF22C067 +:1017A0008091E80080FD1CC08091E401882391F0C5 +:1017B000853091F08091EB0085FD10C04091E400F0 +:1017C0005091E5004217530729F39A01915011F700 +:1017D00084E0089582E0089583E0089581E008950B +:1017E00080E008954091E80042FFDECF08950E9416 +:1017F000650C0E946D0CE0EEF0E0808181608083DA +:10180000E8EDF0E080818F77808319BCA7EDB0E030 +:101810008C918E7F8C9380818F7E80831092E301E8 +:1018200008950F931F93CF93DF930E94650C0E943E +:101830006D0CC8EDD0E088818F77888388818068BF +:10184000888388818F7D888319BC1092E40110926F +:10185000E0011092E2011092E10100EE10E0F801C7 +:1018600080818B7F808388818160888342E060E013 +:1018700080E00E94710BE1EEF0E080818E7F80833A +:10188000E2EEF0E0808181608083808188608083E7 +:10189000F80180818E7F8083888180618883DF91D9 +:1018A000CF911F910F910895E8EDF0E080818F7E38 +:1018B0008083E7EDF0E080818160808384E082BFF7 +:1018C00081E08093E3010C94110CE8EDF0E080815D +:1018D0008E7F80831092E20008951092DA001092B9 +:1018E000E10008951F920F920FB60F9211242F93CB +:1018F0003F934F935F936F937F938F939F93AF9398 +:10190000BF93EF93FF938091E10082FF0BC0809122 +:10191000E20082FF07C08091E1008B7F8093E100AD +:101920000E94D90E8091DA0080FF1FC08091D800FC +:1019300080FF1BC08091DA008E7F8093DA00809157 +:10194000D90080FF0DC080E189BD82E189BD09B465 +:1019500000FEFDCF81E08093E4010E94D40805C021 +:1019600019BC1092E4010E94E2088091E10080FF1E +:1019700019C08091E20080FF15C08091E2008E7F47 +:101980008093E2008091E20080618093E200809188 +:10199000D80080628093D80019BC85E08093E40170 +:1019A0000E94E6088091E10084FF30C08091E2004F +:1019B00084FF2CC080E189BD82E189BD09B400FEAD +:1019C000FDCF8091D8008F7D8093D8008091E10079 +:1019D0008F7E8093E1008091E2008F7E8093E20011 +:1019E0008091E20081608093E2008091E001882391 +:1019F00011F084E007C08091E30087FD02C081E020 +:101A000001C083E08093E4010E94E8088091E10036 +:101A100083FF29C08091E20083FF25C08091E1000F +:101A2000877F8093E10082E08093E4011092E001DF +:101A30008091E1008E7F8093E1008091E2008E7FB3 +:101A40008093E2008091E20080618093E20042E0B6 +:101A500060E080E00E94710B8091F00088608093CC +:101A6000F0000E94E508FF91EF91BF91AF919F9127 +:101A70008F917F916F915F914F913F912F910F9037 +:101A80000FBE0F901F9018951F920F920FB60F92D6 +:101A900011242F933F934F935F936F937F938F9373 +:101AA0009F93AF93BF93CF93DF93EF93FF93C09137 +:101AB000E900CF708091EC00D82FD17080FDD0E884 +:101AC0001092E9008091F000877F8093F000789475 +:101AD0000E94880D1092E9008091F0008860809348 +:101AE000F000CD2BCF70C093E900FF91EF91DF9113 +:101AF000CF91BF91AF919F918F917F916F915F91A6 +:101B00004F913F912F910F900FBE0F901F901895FE +:101B10001F93CF93DF93CDB7DEB7AA970FB6F89494 +:101B2000DEBF0FBECDBFE5EEF1E088E08E0F9091F5 +:101B3000F10091938E13FBCF0E9404098091E8007D +:101B400083FF1FC18091E5019091E601492F50E08C +:101B50004A30510508F015C1FA01EA5AFF4F0C94BA +:101B60008323803881F0823809F00BC18091E9012C +:101B70008F708093E9008091EB0085FB882780F9C6 +:101B80001092E90006C08091E1019091E20191116B +:101B900082609091E800977F9093E8008093F10035 +:101BA0001092F100C8C0282F2D7F09F0EAC08823C9 +:101BB00019F0823061F0E5C08091E701813009F0D1 +:101BC000E0C0933009F080E08093E2012BC0809167 +:101BD000E701811127C08091E9018F7009F4D1C01C +:101BE0008093E9002091EB0020FF1CC0933021F48A +:101BF0008091EB00806214C09091EB009061909313 +:101C0000EB0021E030E0A90102C0440F551F8A9586 +:101C1000E2F74093EA001092EA008091EB008860BE +:101C20008093EB001092E9008091E800877F86C0E6 +:101C30008111A7C01091E7011F778091E3008078A0 +:101C4000812B8093E3008091E800877F8093E800F8 +:101C50000E94A60B8091E80080FFFCCF8091E300FA +:101C600080688093E300111102C082E001C083E02C +:101C70008093E40186C08058823008F082C0809151 +:101C8000E7019091E8018C3D53E0950779F583E0F9 +:101C90008A838AE289834FB7F894DE01139620E0A5 +:101CA0003EE051E2E32FF0E050935700E49120FF33 +:101CB00003C0E295EF703F5FEF708E2F90E0EA3047 +:101CC00010F0C79601C0C0968D939D932F5F24316D +:101CD00049F74FBF8091E800877F8093E8006AE270 +:101CE00070E0CE0101960E94AD0A14C0AE014F5FB4 +:101CF0005F4F6091E9010E94F409BC01892B09F44E +:101D000040C09091E800977F9093E80089819A8184 +:101D10000E94100B8091E8008B778093E80031C01F +:101D2000803879F58091E800877F8093E800809182 +:101D3000E0018093F1008091E8008E778093E800C5 +:101D40000E94A60B1EC081111CC09091E701923029 +:101D5000C0F48091E800877F8093E8009093E001D1 +:101D60000E94A60B8091E001811106C08091E300E2 +:101D700087FD02C081E001C084E08093E4010E94FD +:101D8000F0088091E80083FF0AC08091E800877F17 +:101D90008093E8008091EB0080628093EB00AA962C +:101DA0000FB6F894DEBF0FBECDBFDF91CF911F916C +:101DB00008950895CF938091E4018823A1F0C09104 +:101DC000E900CF709091EC00892F817090FD80E840 +:101DD000C82B1092E9008091E80083FD0E94880DD5 +:101DE000CF70C093E900CF910895909369018093DB +:101DF00068010895E0916801F0916901309721F040 +:101E00000190F081E02D099480E00895E09168014F +:101E1000F0916901309721F00280F381E02D09945F +:101E20000895E0916801F0916901309721F00480F4 +:101E3000F581E02D099408952091660130916701A4 +:101E40008217930771F09093670180936601E09188 +:101E50006801F0916901309721F00680F781E02D4B +:101E600009940895209164013091650182179307C8 +:101E700071F09093650180936401E0916801F091A5 +:101E80006901309721F00084F185E02D09940895CF +:101E900008950C94480F0E945E1B0E940B040C9442 +:101EA000241CCF92DF92EF92FF920F931F93CF9358 +:101EB000DF93CDB7DEB72B970FB6F894DEBF0FBE1A +:101EC000CDBF0E9423048BE6C82E81E0D82E00E00F +:101ED00010E0E02E802F0E941105F60141916F0164 +:101EE000F42EF826B1F40F5F1F4F0E30110589F75D +:101EF0008FEF89838A831B820E94671B8160782F02 +:101F00009D838C8349815A816B818D810E94F40F5E +:101F100040C09091CD0191FF04C08B870E941705AE +:101F20008B8520E030E04F2D50E0922FBA01022E39 +:101F300002C0759567950A94E2F760FF24C02E836E +:101F4000EF8221E030E0690102C0CC0CDD1C9A95E3 +:101F5000E2F790E08C219D21892B09F420E028876D +:101F60000E94671B8160782F9A8789874E815F81E5 +:101F700068858A850E94F40FF801E559FE4F80813B +:101F8000C826C08206C02F5F3F4F2630310569F654 +:101F9000AACF0E940B1F10916A010E94FA0E181717 +:101FA000A1F00E94FA0E80936A012B960FB6F89466 +:101FB000DEBF0FBECDBFDF91CF911F910F91FF907C +:101FC000EF90DF90CF900C94F3072B960FB6F89418 +:101FD000DEBF0FBECDBFDF91CF911F910F91FF905C +:101FE000EF90DF90CF900895CF93DF93CDB7DEB71A +:101FF0002B970FB6F894DEBF0FBECDBF4F83588727 +:1020000069877A878B87DE01119686E0FD01119240 +:102010008A95E9F785E0FE01379601900D928A9541 +:10202000E1F749815A816B817C818D819E810E947B +:1020300024172B960FB6F894DEBF0FBECDBFDF91ED +:10204000CF9108950895CF93882309F4C2C0C82F73 +:10205000823859F40E94FA0E81FDBBC089E30E94C8 +:10206000CD190E949A1A89E30CC0833879F40E9432 +:10207000FA0E80FDAEC083E50E94CD190E949A1A27 +:1020800083E50E940F1ACF910C949A1A843859F460 +:102090000E94FA0E82FD9DC087E40E94CD190E9425 +:1020A0009A1A87E4EECF8CEF8C0F813A48F48C2F8C +:1020B0000E944E2181118DC08C2F0E94CD19E3CF3B +:1020C00080E28C0F883048F4C77081E001C0880F2F +:1020D000CA95EAF70E94531AD6CF8BE58C0F83304E +:1020E00078F4C53A29F0C63A31F083E890E005C0AB +:1020F00081E890E002C082E890E0CF910C941C0F40 +:1021000088E58C0F833108F064C0C83A39F1C93AC8 +:1021100041F1CA3A49F1CB3A51F1CC3A59F1CD3AB1 +:1021200061F1C03B69F1CE3A71F1CF3A79F1C13B2F +:1021300081F1C23B89F1C33B91F1C43B99F1C53BAD +:10214000A1F1C63BA9F1C73BB1F1C83BB9F1C93B0D +:10215000C1F1CA3BC9F180E090E038C082EE90E066 +:1021600035C089EE90E032C08AEE90E02FC085EB5A +:1021700090E02CC086EB90E029C087EB90E026C071 +:102180008CEC90E023C08DEC90E020C083E891E0DF +:102190001DC08AE891E01AC082E991E017C084E985 +:1021A00091E014C081E292E011C083E292E00EC09F +:1021B00084E292E00BC085E292E008C086E292E001 +:1021C00005C087E292E002C08AE292E0CF910C94CF +:1021D000320FCF910895882309F44BC0823859F407 +:1021E0000E94FA0E81FF45C089E30E94CD190E942A +:1021F0009A1A89E30CC0833871F40E94FA0E80FFAA +:1022000038C083E50E94CD190E949A1A83E50E9486 +:102210000F1A0C949A1A843859F40E94FA0E82FF0D +:1022200028C087E40E94CD190E949A1A87E4EFCF54 +:102230009CEF980F913A58F390E2980F983050F431 +:10224000877091E001C0990F8A95EAF7892F0E9463 +:10225000591ADFCF9BE5980F933020F480E090E08F +:102260000C941C0F885A833120F480E090E00C9489 +:10227000320F0895882321F00E94531A0C949A1A61 +:102280000895882321F00E94591A0C949A1A0895EF +:10229000BF92CF92DF92EF92FF920F931F93CF9353 +:1022A000DF9300D000D000D0CDB7DEB725E0FC0131 +:1022B000DE01119601900D922A95E1F7FC01D08084 +:1022C00011810281258122952F7043815481452BF4 +:1022D00009F4FCC21F3F21F4FFEFDF1609F4F6C238 +:1022E0007C012E830E942210D9821A8369817A810F +:1022F000802F0E94C919182FB92E0E947E190E94A2 +:1023000045182E81002319F00E94701A2E81EB2DA2 +:10231000E295EF70F0E0E05AFF4F0C9483238B2D91 +:10232000807F9B2D9F70F92E882319F0F29480EF07 +:10233000F822002389F0FF2009F475C280E2810FA2 +:10234000883020F48F2D0E94531A03C08F2D0E94D5 +:10235000631A0E949A1A67C2812F0E94EB10FF2015 +:1023600009F4B4C2105E8F2D183018F40E94591A67 +:1023700002C00E94691A26960FB6F894DEBF0FBEFF +:10238000CDBFDF91CF911F910F91FF90EF90DF9024 +:10239000CF90BF900C949A1A3B2D307F8B2D8F706D +:1023A000303211F08295807F112319F0113021F124 +:1023B0002CC00023B9F0222309F4A0C1213009F078 +:1023C0009DC126960FB6F894DEBF0FBECDBFDF913C +:1023D000CF911F910F91FF90EF90DF90CF90BF9022 +:1023E0000C94831A222319F0213009F46FC28E83D2 +:1023F0000E94861A8E8196C1002321F0223008F0B7 +:1024000065C27CC1211162C28DC1002321F022234B +:1024100009F474C108C2222309F484C119C22B2D06 +:1024200026952695237030E02115310521F02130C5 +:102430003105D1F04BC2002321F0812F9B2D9370E9 +:1024400002C080E090E026960FB6F894DEBF0FBE83 +:10245000CDBFDF91CF911F910F91FF90EF90DF9053 +:10246000CF90BF900C941C0F002321F0812F9B2D47 +:10247000937002C080E090E026960FB6F894DEBF1D +:102480000FBECDBFDF91CF911F910F91FF90EF90C5 +:10249000DF90CF90BF900C94320F812F002319F062 +:1024A0000E94131E02C00E947B1E26960FB6F8944F +:1024B000DEBF0FBECDBFDF91CF911F910F91FF9077 +:1024C000EF90DF90CF90BF900C94001F8B2D837006 +:1024D00009F07BC00111FAC1812F82958695877022 +:1024E000880F880F912F9F70C92ED12CE12CF12CD1 +:1024F000082E04C0CC0CDD1CEE1CFF1C0A94D2F785 +:1025000014FF12C04FE050E060E070E004C0440FE0 +:10251000551F661F771F8A95D2F7CB01BA016095C8 +:1025200070958095909503C060E070E0CB012B2DF5 +:10253000269526952370422F50E042305105D9F060 +:102540004330510569F16C297D298E299F2941303D +:10255000510551F126960FB6F894DEBF0FBECDBFE0 +:10256000DF91CF911F910F91FF90EF90DF90CF906F +:10257000BF900C946C186C297D298E299F29269672 +:102580000FB6F894DEBF0FBECDBFDF91CF911F9184 +:102590000F91FF90EF90DF90CF90BF900C94881830 +:1025A0000E946C18C701B60126960FB6F894DEBFDC +:1025B0000FBECDBFDF91CF911F910F91FF90EF9094 +:1025C000DF90CF90BF900C945018002319F08B2D02 +:1025D000817001C08695882309F478C1812F829586 +:1025E00086958770880F880F912F9F70C92ED12CE8 +:1025F000E12CF12C082E04C0CC0CDD1CEE1CFF1CC1 +:102600000A94D2F714FF12C04FE050E060E070E08F +:1026100004C0440F551F661F771F8A95D2F7CB0160 +:10262000BA01609570958095909503C060E070E068 +:10263000CB012B2D269526952370422F50E042305A +:102640005105D9F04330510569F16C297D298E2956 +:102650009F294130510551F126960FB6F894DEBFFF +:102660000FBECDBFDF91CF911F910F91FF90EF90E3 +:10267000DF90CF90BF900C9446196C297D298E294C +:102680009F2926960FB6F894DEBF0FBECDBFDF910F +:10269000CF911F910F91FF90EF90DF90CF90BF905F +:1026A0000C9462190E944619C701B60126960FB60E +:1026B000F894DEBF0FBECDBFDF91CF911F910F9178 +:1026C000FF90EF90DF90CF90BF900C942A19103FAD +:1026D000D1F118F4103E50F4A1C0123F09F463C0C8 +:1026E00008F44CC0133F09F473C098C01F708B2DC1 +:1026F0008F710023A1F00E94C318812F26960FB678 +:10270000F894DEBF0FBECDBFDF91CF911F910F9127 +:10271000FF90EF90DF90CF90BF900C943A110E9401 +:10272000E418812F26960FB6F894DEBF0FBECDBFFA +:10273000DF91CF911F910F91FF90EF90DF90CF909D +:10274000BF900C9441110023A9F02111BFC08B2D23 +:102750008F7126960FB6F894DEBF0FBECDBFDF9106 +:10276000CF911F910F91FF90EF90DF90CF90BF908E +:102770000C940919223008F0A9C0E9CF0023A9F070 +:102780008B2D8F7126960FB6F894DEBF0FBECDBF8E +:10279000DF91CF911F910F91FF90EF90DF90CF903D +:1027A000BF900C94C318002359F38B2D8F7126967C +:1027B0000FB6F894DEBF0FBECDBFDF91CF911F9152 +:1027C0000F91FF90EF90DF90CF90BF900C94E418A2 +:1027D000002399F08B2D8F7126960FB6F894DEBFEB +:1027E0000FBECDBFDF91CF911F910F91FF90EF9062 +:1027F000DF90CF90BF900C94AE1826960FB6F89449 +:10280000DEBF0FBECDBFDF91CF911F910F91FF9023 +:10281000EF90DF90CF90BF900C94A4180023A9F004 +:10282000222309F4ADCF812F26960FB6F894DEBF90 +:102830000FBECDBFDF91CF911F910F91FF90EF9011 +:10284000DF90CF90BF900C942310222309F4ADCFDA +:10285000812F26960FB6F894DEBF0FBECDBFDF9155 +:10286000CF911F910F91FF90EF90DF90CF90BF908D +:102870000C94EB104B2D4F70612FC7010E94AB02DF +:1028800026960FB6F894DEBF0FBECDBFDF91CF9175 +:102890001F910F91FF90EF90DF90CF90BF900C941D +:1028A000C8174B2D4F70612FC70126960FB6F894AD +:1028B000DEBF0FBECDBFDF91CF911F910F91FF9073 +:1028C000EF90DF90CF90BF900C94180526960FB62E +:1028D000F894DEBF0FBECDBFDF91CF911F910F9156 +:1028E000FF90EF90DF90CF90BF9008950E94701AF4 +:1028F0000E94801A0E94451A0E949A1A0E94B11FD3 +:102900000E94001F80E090E00E941C0F80E090E099 +:102910000C94320F0E94601A0C9476140E94BE1917 +:10292000292F22952F7030E02C3031054CF42A30BD +:1029300031056CF4225031092230310588F407C08A +:102940002C30310549F02F30310531F009C0803E7F +:1029500048F0803F29F406C093FB882780F908954A +:1029600080E0089581E00895CF93DF9300D000D0F8 +:102970001F92CDB7DEB70F900F900F900F900F9072 +:10298000DF91CF910895CF93DF9300D000D000D096 +:10299000CDB7DEB726960FB6F894DEBF0FBECDBF1B +:1029A000DF91CF9108951F93CF93DF93C091790169 +:1029B00016E080917A01C81799F0D0E01C9FF001D1 +:1029C0001D9FF00D1124E558FE4F40815181628119 +:1029D0007381848195810E94C3142196C770E9CFC9 +:1029E000DF91CF911F9108954091AB015091AC01BF +:1029F0006091AD017091AE018091AF019091B001F5 +:102A00000C94C3148091B00182958F7009F054C06A +:102A10008091AD01882309F44FC080917901A09184 +:102A20007A016091AB017091AC014091AE0150917F +:102A3000AF01B6E08A1709F43FC090E04115510597 +:102A4000C1F17F3F11F46F3FA1F1B89FF001B99F31 +:102A5000F00D1124E558FE4F218172132AC0208108 +:102A6000621327C02281211124C0238134812417BD +:102A7000350710F421503109241B350B283C310552 +:102A8000C0F42091B0012F7020612093B00126E0A6 +:102A9000289FF001299FF00D1124E058FE4F8081FE +:102AA0008F70806180838BEA91E00E9448110C94C2 +:102AB000D31401968770BECF0895CF92DF92EF9224 +:102AC000FF920F931F93CF93DF93CDB7DEB762973B +:102AD0000FB6F894DEBF0FBECDBF8C0185E0F801C4 +:102AE000DE011D9601900D928A95E1F7D8014C9177 +:102AF00011965C91119712966C9112971396CD9046 +:102B0000DC9014973091AB017091AC018091AE01D3 +:102B10009091AF01009709F46BC17F3F19F43F3FDB +:102B200009F466C1E090AD01EE2009F4C0C0209127 +:102B3000B001C816D90628F0F601E81BF90BCF0141 +:102B400004C0809590958C0D9D1DFF24F394883CC6 +:102B5000910578F0F12C207F09F0C6C07C2DD98A30 +:102B6000C88A89890E94B4148BEA91E00E944811B6 +:102B7000B1C0822F807F09F046C0751314C0341392 +:102B800012C0611110C02F7020612093B0010E940B +:102B9000F4148BEA91E00E9448118091B001D801B1 +:102BA00015968C932EC0CD2819F15F3F11F44F3F3D +:102BB000F9F0F62E61111CC08091790120917A0103 +:102BC00036E0821709F45AC090E0389FF001399F2F +:102BD000F00D1124E558FE4F7181571306C0708126 +:102BE000471303C07281711103C001968770E9CF4A +:102BF000F62E662309F418C18091B001816080939C +:102C0000B001F12C11C1751308C0341306C0611155 +:102C100004C08091B001D801C3C04D875E878D8507 +:102C20009E856A8B0E948E146A898823E1F166234F +:102C3000D1F12091B001822F82958F7090E00297A0 +:102C400074F08091AB019091AC0198878F831986C5 +:102C5000DB86CA862C87CE0107960E94481186E043 +:102C6000F801ABEAB1E001900D928A95E1F70E947C +:102C700002150E94F414FF24F394D6C04D875E879A +:102C80008D859E850E94BE19292F22952F7030E0D8 +:102C9000223031050CF0BCC09F7009F0B6C0805ED8 +:102CA000883008F4C1C0C8010E944811E4CFC8169A +:102CB000D90608F453C0F601E81BF90BCF01883C94 +:102CC000910508F450C0F12C7C2DD98AC88A8989D5 +:102CD0000E94B414EBEAF1E086E0DF011D928A95D0 +:102CE000E9F70E94F414A0C0751314C0341312C085 +:102CF000611110C08091B001F8018583C8010E9464 +:102D0000481186E0EBEAF1E0DF011D928A95E9F7D0 +:102D1000FE2C8AC04D875E878D859E856A8B0E94BA +:102D20008E146A89882309F4BECF662309F4BBCFC9 +:102D30002091B001822F82958F7090E002970CF461 +:102D40008ECF8091AB019091AC019A8389831B82D5 +:102D5000DD82CC822E83CE0101967FCF8095909527 +:102D60008C0D9D1DACCFF62E662309F49CCF7513F8 +:102D70002EC034132CC02091B00120FD1FC0822F23 +:102D800082958F70D9F0D80115962C9315978F30B6 +:102D900049F08F5F982F9295907F822F8F70892BAB +:102DA00015968C93C8010E94481186E0F801ABEAA1 +:102DB000B1E001900D928A95E1F793CF86E0F8019A +:102DC000ABEAB1E001900D928A95E1F72DC04D87F5 +:102DD0005E878D859E850E948E14811140CF8091E3 +:102DE000B00181608093B001C8010E9448111CC0ED +:102DF000662309F458CF4D875E878D859E850E9496 +:102E00008E14882309F44FCF2ACF811148CF0CC0EC +:102E1000243031050CF047CF9F7009F440CFF80102 +:102E20009581907F09F03BCF8F2D62960FB6F89475 +:102E3000DEBF0FBECDBFDF91CF911F910F91FF90ED +:102E4000EF90DF90CF9008951F93CF93DF93CDB78E +:102E5000DEB72C970FB6F894DEBF0FBECDBF4F8301 +:102E6000588769877A878B879C87CE0107960E944F +:102E70005D15882369F08F8198852A853B85232BF2 +:102E8000F1F19F3F09F063C08F3F09F060C037C088 +:102E900086E0FE013796DE01119601900D928A952B +:102EA000E1F76F817885EA85FB85309741F17F3FB7 +:102EB00011F46F3F21F120917A0130E0C9010196B0 +:102EC000877099274091790150E08417950709F49C +:102ED00047C069837A83FD83EC8396E0929FD0019B +:102EE000939FB00D1124A558BE4FFE01319601905D +:102EF0000D929A95E1F780937A010E94D31416E01F +:102F00008091790190917A018917C1F1189FC001D0 +:102F1000112485589E4F0E945D15882379F1E09118 +:102F200079011E9FF0011124E558FE4F4081518127 +:102F300062817381848195810E94C314809179019B +:102F400090E001968770992780937901D9CF4F81BE +:102F5000588569857A858B859C850E94C314CFCF5F +:102F60000E948A1410927A0110927901EBEAF1E042 +:102F700086E0DF011D928A95E9F7C1CF2C960FB646 +:102F8000F894DEBF0FBECDBFDF91CF911F910895A2 +:102F9000EF92FF920F931F93CF93DF938C01892BB6 +:102FA00009F46CC0F12CEE24E394E8012196F801B9 +:102FB0008491843740F4843008F051C0813081F02E +:102FC000823019F15BC0853709F444C0A8F19CE751 +:102FD000980F903708F052C08F770E94EB1041C0D5 +:102FE0000E5F1F4FFE01C49180E28C0F883048F4C1 +:102FF000C7708E2D01C0880FCA95EAF70E94731A18 +:1030000014C08C2F0E9423102DC00E5F1F4FFE0195 +:10301000C49180E28C0F883058F4C7708E2D01C0A7 +:10302000880FCA95EAF70E94791A0E949A1A1AC064 +:103030008C2F0E94EB1016C00E5F1F4FFE01C49133 +:10304000CC2381F08FE99FE00197F1F700C00000E9 +:10305000C150F6CF0E5F1F4FFE01F49003C00E94D7 +:1030600023108E018F2D882309F49FCFEFE9FFE015 +:103070003197F1F700C000008150F5CFDF91CF917B +:103080001F910F91FF90EF90089508956093B501FF +:103090007093B6018093B7019093B8010C947614A5 +:1030A0000F931F930091B5011091B6012091B701C4 +:1030B0003091B801DC01CB01802B912BA22BB32BDB +:1030C0008093B5019093B601A093B701B093B80176 +:1030D0001F910F910C9476140F931F930091B501DB +:1030E0001091B6012091B7013091B801DC01CB01FC +:1030F00080239123A223B3238093B5019093B6013B +:10310000A093B701B093B8011F910F910C9476145E +:103110000F931F930091B5011091B6012091B70153 +:103120003091B801DC01CB0180279127A227B3277A +:103130008093B5019093B601A093B701B093B80105 +:103140001F910F910C9476141092B1011092B2015C +:103150001092B3011092B4010C94761441E050E047 +:1031600060E070E004C0440F551F661F771F8A950A +:10317000D2F74093B1015093B2016093B3017093C1 +:10318000B4010C94761441E050E060E070E004C0BB +:10319000440F551F661F771F8A95D2F78091B101A2 +:1031A0009091B201A091B301B091B401482B592B79 +:1031B0006A2B7B2B4093B1015093B2016093B30112 +:1031C0007093B4010C94761441E050E060E070E03C +:1031D00004C0440F551F661F771F8A95D2F740958C +:1031E0005095609570958091B1019091B201A09138 +:1031F000B301B091B401482359236A237B23409340 +:10320000B1015093B2016093B3017093B4010C9477 +:10321000761441E050E060E070E004C0440F551FB8 +:10322000661F771F8A95D2F78091B1019091B20104 +:10323000A091B301B091B401482759276A277B2791 +:103240004093B1015093B2016093B3017093B40104 +:103250000C9476140F931F930091B1011091B20159 +:103260002091B3013091B401DC01CB01802B912B73 +:10327000A22BB32B8093B1019093B201A093B30121 +:10328000B093B4011F910F910C9476140F931F9378 +:103290000091B1011091B2012091B3013091B401BC +:1032A000DC01CB0180239123A223B3238093B101BE +:1032B0009093B201A093B301B093B4011F910F9109 +:1032C0000C9476140F931F930091B1011091B201E9 +:1032D0002091B3013091B401DC01CB01802791270B +:1032E000A227B3278093B1019093B201A093B301B9 +:1032F000B093B4011F910F910C9476140895CF925E +:10330000DF92EF92FF920F931F93CF93DF938C0185 +:10331000C090B501D090B601E090B701F090B8012F +:103320008091B1019091B201A091B301B091B4012B +:10333000C82AD92AEA2AFB2ACFE1D0E0D701C60160 +:103340000C2E04C0B695A795979587950A94D2F749 +:1033500080FF06C0B8018C2F0E945807019721F406 +:10336000219760F780E001C08C2FDF91CF911F91F2 +:103370000F91FF90EF90DF90CF900895CF93DF9360 +:10338000EC010E947F19BE010E945807DF91CF9186 +:103390000895CB010E94BE19089590910C019923C4 +:1033A00021F090910D01911109C020910E013091F1 +:1033B0000F01F90132969FEF40E01FC0982F9695BC +:1033C000969596959F3050F5E0910E01F0910F0182 +:1033D000E90FF11D877021E030E0A90102C0440F20 +:1033E000551F8A95E2F7CA019181892B818308953F +:1033F0009F3F39F04F5F4E3041F051915813F8CF55 +:103400000DC05111F7CF942FF5CF9F3F39F0F9013F +:10341000E90FF11D97FDFA95828308950895909123 +:103420000C01992321F090910D01911109C0209177 +:103430000E0130910F01F9013296205F3F4F1FC0FE +:10344000982F9695969596959F30F0F4E0910E0101 +:10345000F0910F01E90FF11D877021E030E0A90123 +:1034600002C0440F551F8A95E2F7CA0180959181E9 +:103470008923818308953196E217F30729F090811B +:103480009813F9CF1082F7CF089581E090E0E09192 +:103490000E01F0910F01E80FF91F108201968031A3 +:1034A0009105A9F708959091CC01892B8093CC01C7 +:1034B000089580959091CC0189238093CC01089543 +:1034C0001092CC0108959091CB01892B8093CB0170 +:1034D000089580959091CB0189238093CB01089525 +:1034E0001092CB0108959091CA01892B8093CA0153 +:1034F000089580959091CA0189238093CA01089507 +:103500001092CA0108958093B90108951092B901EB +:10351000089580910E0190910F01FC0131969C015C +:10352000205F3F4F80E0919191118F5FE217F30789 +:10353000D1F70895E0910E01F0910F018091CC0137 +:103540008083E0910E01F0910F0190818091CB0179 +:10355000892B8083E0910E01F0910F019081809181 +:10356000CA01892B80838091B901882361F0E091A1 +:103570000E01F0910F019081892B80830E94891A9E +:1035800081111092B90180910E0190910F010C945C +:10359000060FCF92DF92EF92FF926C01EE24FF2490 +:1035A000C114D104E104F10421F0C701B60120E106 +:1035B00001C020E0C72ED82EE92EFF24C114D1046B +:1035C000E104F10419F0285FC701B6016B017C0129 +:1035D00054E0F694E794D794C7945A95D1F7C11460 +:1035E000D104E104F10419F02C5FC701B6016B01AD +:1035F0007C0142E0F694E794D794C7944A95D1F7BA +:10360000C114D104E104F10419F02E5FC701B60121 +:10361000DC01CB01B695A79597958795892B8A2BC9 +:103620008B2B09F02F5F822FFF90EF90DF90CF90D0 +:1036300008958091E401843021F11092CE0120E4BC +:1036400088E190E00FB6F894A895809360000FBED3 +:103650002093600080E00E94F30783B7817F84603D +:1036600083BF83B7816083BF7894889583B78E7F4B +:1036700083BF88E10FB6F8948093600010926000D9 +:103680000FBE089508950895CF930E94421B0E9493 +:1036900023040E94431BC0E08C2F0E94110581115E +:1036A00004C0CF5FCE30C1F701C081E0CF91089553 +:1036B0000E948A140E94FA0E0C94F30782E084BDE3 +:1036C00093E095BD9AEF97BD80936E0008952FB754 +:1036D000F8948091CF019091D001A091D101B09147 +:1036E000D2012FBF0895CF92DF92EF92FF920F93F6 +:1036F0001F932FB7F8944091CF015091D001609162 +:10370000D1017091D2012FBF6A017B01EE24FF2409 +:103710008C0120E030E0C016D106E206F30610F47A +:10372000415051099A01281B390BC9011F910F9172 +:10373000FF90EF90DF90CF9008951F920F920FB6F9 +:103740000F9211248F939F93AF93BF938091CF01DA +:103750009091D001A091D101B091D2010196A11D0B +:10376000B11D8093CF019093D001A093D101B0936C +:10377000D201BF91AF919F918F910F900FBE0F908B +:103780001F9018950E94F70BF8942FEF87EA91E6A7 +:10379000215080409040E1F700C0000087E090EBAE +:1037A000DC018093EE019093EF01A093F001B093C0 +:1037B000F1019CE088E10FB6F894A8958093600031 +:1037C0000FBE90936000FFCFEF92FF920F931F9375 +:1037D000CF93DF93D82FC0E08C2F0E94110500E01B +:1037E00010E0E82EF12CC701002E02C095958795B8 +:1037F0000A94E2F780FD06C00F5F1F4F06301105E7 +:1038000091F709C0602F7C2F80E00E941905D81322 +:10381000F3CF81E004C0CF5FCE30F1F680E0DF91DE +:10382000CF911F910F91FF90EF900895CF93C82FE4 +:103830008CE20E94E41B882321F08C2FCF910C9402 +:10384000E41B80E0CF910895CF930E946B1D8111FE +:1038500002C00E94511DC5E6C15049F00E942304D8 +:103860008FE39CE90197F1F700C00000F5CF89E2F2 +:103870000E94161C811113C18AE20E94161C81113C +:103880000E94511D85E00E94161C81110E94C21BDE +:103890000E94761D8093CD0187E00E94161C88232C +:1038A000A9F18BE10E94161C882351F08091CD0173 +:1038B00081FB222720F991E0922790FB81F90EC02D +:1038C0008EE00E94161C882361F08091CD0182FB5E +:1038D000222720F991E0922790FB82F98093CD0175 +:1038E00015C080E10E94161C9091CD01882341F003 +:1038F00093FB222720F981E0822780FB93F904C003 +:10390000892F809580FB90F99093CD018091CD0116 +:103910000E947A1D0E94881D8093ED0180EE0E9416 +:10392000161C882341F08091ED01982F909590FB13 +:1039300080F98093ED0189E30E94161C882359F0D9 +:103940008091ED0181FB222720F991E0922790FBE5 +:1039500081F98093ED0182EE0E94161C882359F0B4 +:103960008091ED0182FB222720F991E0922790FBC4 +:1039700082F98093ED0186EE0E94161C882359F08F +:103980008091ED0183FB222720F991E0922790FBA3 +:1039900083F98093ED0183EE0E94161C882359F071 +:1039A0008091ED0184FB222720F991E0922790FB82 +:1039B00084F98093ED0185E30E94161C882359F059 +:1039C0008091ED0185FB222720F991E0922790FB61 +:1039D00085F98093ED0181E30E94161C882359F03C +:1039E0008091ED0186FB222720F991E0922790FB40 +:1039F00086F98093ED0181E10E94161C882359F01D +:103A00008091ED0187FB222720F991E0922790FB1E +:103A100087F98093ED018091ED010E948C1D8091CA +:103A2000ED0187FB882780F980930D0187E20E94D2 +:103A3000161CC82F8EE10E94161C8111C2608FE1F6 +:103A40000E94161C8111C46080E20E94161C811124 +:103A5000C86081E20E94161C8111C06182E20E944E +:103A6000161C8111C06283E20E94161C8111C06481 +:103A700084E20E94161C882311F0C06802C0CC2387 +:103A800029F08C2F0E94831D6C2F03C00E947F1D84 +:103A9000682F70E080E090E0CF910C944618CF91B1 +:103AA00008956DEE7EEF80E090E00E94BD2360E01F +:103AB00082E090E00E94AB2360E083E090E00E940F +:103AC000AB2360E084E090E00E94AB2360E085E0FF +:103AD00090E00C94AB2380E090E00E94A52321E0CD +:103AE0008D3E9E4F09F020E0822F089582E090E005 +:103AF0000C949D23682F82E090E00C94AB2383E02C +:103B000090E00C949D23682F83E090E00C94AB230D +:103B100084E090E00C949D23682F84E090E00C9466 +:103B2000AB238091D50180FF0BC06091130185E02C +:103B3000689FB001112475956795759567952BC0A1 +:103B400081FF09C06091130185E0689FB0011124D5 +:103B50007595679520C082FF07C06091130185E0CD +:103B6000689FB001112417C09091D6019923D1F01C +:103B700060911201961788F72091130185E0289F24 +:103B800090011124929FA001939F500D112470E089 +:103B9000CA010E946F236038710540F461157105F8 +:103BA00039F002C065E070E0862F08958FE7089530 +:103BB00081E008958091D50180FF08C060911101D6 +:103BC00070E0759567957595679521C081FF06C072 +:103BD0006091110170E07595679519C082FF04C06E +:103BE0006091110170E010C09091D6019923C1F04D +:103BF000609110019617A0F780911101899FC00173 +:103C0000112470E00E946F236038710528F461155B +:103C1000710521F0862F08958FE7089581E00895BA +:103C200061E070E0F4CF803F21F40E94911D819506 +:103C300004C0813F29F40E94911D8093D901089509 +:103C4000823F21F40E94911D819504C0833F29F495 +:103C50000E94911D8093D8010895893F19F40E9414 +:103C6000DA1D05C08A3F31F40E94DA1D81958093E8 +:103C7000DA0108958B3F21F40E94DA1D819504C07A +:103C80008C3F29F40E94DA1D8093DB010895843F64 +:103C900021F48091D701816017C0853F21F4809184 +:103CA000D701826011C0863F21F48091D7018460E2 +:103CB0000BC0873F21F48091D701886005C0883F01 +:103CC00031F48091D70180618093D70108958D3FB1 +:103CD00021F48091D50181600BC08E3F21F4809149 +:103CE000D501826005C08F3F29F48091D5018460A1 +:103CF0008093D5010895803F39F48091D90187FFE1 +:103D00006CC01092D90169C0813F29F48091D9011A +:103D10001816BCF362C09091D801823F29F497FF36 +:103D20005CC01092D80159C0833F19F41916CCF326 +:103D300054C0893F41F48091DA0118160CF04DC04F +:103D40001092DA014AC08A3F29F48091DA0187FF94 +:103D500044C0F6CF8B3F39F48091DB0187FF3DC033 +:103D60001092DB013AC08C3F29F48091DB011816D8 +:103D7000BCF333C0843F21F48091D7018E7F17C0FC +:103D8000853F21F48091D7018D7F11C0863F21F4BA +:103D90008091D7018B7F0BC0873F21F48091D701A1 +:103DA000877F05C0883F31F48091D7018F7E809353 +:103DB000D70113C08D3F21F48091D5018E7F0BC0B8 +:103DC0008E3F21F48091D5018D7F05C08F3F29F46E +:103DD0008091D5018B7F8093D5018091D80181118D +:103DE0000EC08091D90181110AC08091DA01811140 +:103DF00006C08091DB01811102C01092D6010895A6 +:103E000087ED91E00E94110F0E94671B9093D401EF +:103E10008093D30108951F93CF93DF938091D301B3 +:103E20009091D4010E94731BAC019091D60199230B +:103E300021F02091140130E006C0209115018AE0A4 +:103E4000289F900111244217530708F486C08091DF +:103E5000D801C091D901D091DA011091DB01811113 +:103E600007C0C11176C0D11174C0111172C075C0E4 +:103E70009F3F19F09F5F9093D601181624F40E947B +:103E8000911D8093D8018091D80187FF05C00E94C1 +:103E9000911D81958093D8011C1624F40E94911DD8 +:103EA0008093D9018091D90187FF05C00E94911D9F +:103EB00081958093D9016091D801662339F1C09131 +:103EC000D901CC2319F1772767FD7095872F972F9C +:103ED0000E94802223E333E343E35FE30E94E42272 +:103EE0000E944D226093D8016C2F772767FD709553 +:103EF000872F972F0E94802223E333E343E35FE37E +:103F00000E94E4220E944D226093D9011D1624F4E0 +:103F10000E94DA1D8093DA018091DA0187FF05C0E3 +:103F20000E94DA1D81958093DA01111624F40E9413 +:103F3000DA1D8093DB018091DB0187FF05C00E94C1 +:103F4000DA1D81958093DB01DF91CF911F910C9455 +:103F5000001F9F3F09F08ECF96CFDF91CF911F9129 +:103F60000895E7EDF1E085E0DF011D928A95E9F71C +:103F70001092D6011092D5010895833081F128F472 +:103F8000813059F08230D1F00895853009F449C06C +:103F9000B8F1863009F456C0089580911501262F96 +:103FA00030E0280F311D2F3F310524F4680F609356 +:103FB000150108958FEF80931501089580911401E4 +:103FC000262F30E0280F311D2F3F310524F4680FD4 +:103FD0006093140108958FEF8093140108958091E8 +:103FE0001301262F30E0280F311D2F3F310524F417 +:103FF000680F6093130108958FEF80931301089564 +:1040000080911201262F30E0280F311D2F3F3105FE +:1040100024F4680F6093120108958FEF80931201CA +:10402000089580911101262F30E0280F311D2F3F78 +:10403000310524F4680F6093110108958FEF809388 +:104040001101089580911001262F30E0280F311DB5 +:104050002F3F310524F4680F6093100108958FEF0E +:10406000809310010895833011F128F4813049F0D4 +:10407000823091F00895853081F120F18630C1F1D0 +:10408000089580911501681720F4861B809315010F +:10409000089510921501089580911401681720F475 +:1040A000861B809314010895109214010895809145 +:1040B0001301681720F4861B809313010895109252 +:1040C0001301089580911201681720F4861B8093D4 +:1040D000120108951092120108958091110168173C +:1040E00020F4861B80931101089510921101089508 +:1040F00080911001681720F4861B809310010895A9 +:104100001092100108950F931F938D3109F46BC025 +:1041100008F03FC08E3009F47FC0C0F4873009F446 +:1041200069C068F4863009F0B1C08091CD01817F0B +:104130008E7F8093CD0181E08093DD01A8C088301F +:1041400009F4A2C08B3009F49FC0A0C0863109F4E5 +:104150009BC078F4803109F472C0813109F096C0B7 +:104160000E948A1490910D0181E0892780930D01AE +:104170008BC0893109F488C08B3109F087C08091E8 +:10418000CD0181FB222720F991E0922790FB81F954 +:104190004CC0853309F470C048F4873209F46CC010 +:1041A00008F459C0893209F467C070C0833438F408 +:1041B0008A3308F04EC0883309F466C067C0833480 +:1041C00009F45AC0883409F061C00E948A140FEFC4 +:1041D00013ED20E3015010402040E1F700C0000043 +:1041E0000E94C21B51C00E9407220E94FA0E0E9428 +:1041F000F3074AC09091CD01892F8095817080FB93 +:1042000090F929F0966098609093CD0140C0997F15 +:10421000977F9093CD0138C08091CD0182FB2227FA +:1042200020F991E0922790FB82F98093CD019923A8 +:1042300059F18091CD0181608093CD0125C080919D +:10424000CD0183FB222720F991E0922790FB83F98F +:10425000ECCF895301C08D5141E050E060E070E047 +:104260008A019B0104C0000F111F221F331F8A9572 +:10427000D2F7C901B80104C061E070E080E090E0CD +:104280000E9446180E948A1481E001C080E01F91BC +:104290000F91089580E0089580E00895CF93C82F8E +:1042A0008091DD01813079F018F08230E9F187C02A +:1042B000E0910E01F0910F018081813169F082322D +:1042C00009F07FC009C0E0910E01F0910F018081DB +:1042D000813111F0823261F48C2F0E944A218111C8 +:1042E00004C08C2F0E9483201DC081E090E01AC082 +:1042F0008C2F0E944C21811114C0C43179F048F4F4 +:10430000CB3079F0C03109F060C082E08093DD01EC +:1043100008C0C93219F0C83321F057C01092DD012E +:1043200054C081E0817053C0C93289F118F5C4319D +:1043300071F1A8F4C73009F046C08AE080931501F6 +:1043400094E19093140193E09093130180931201F0 +:1043500088E08093110188E28093100134C0CE512F +:10436000C63088F5EC2FF0E0E65DFE4F808180934B +:10437000DC0129C0CE34E9F020F4CB3421F56AE029 +:1043800013C0C13579F0C235F1F461E00DC0809100 +:10439000DC01882319F01092DC0115C081E08093C4 +:1043A000DD0115C061E006C08091DC010E94BD1FE7 +:1043B0000AC06AE08091DC010E94332004C01092A0 +:1043C000DD0180E004C081E002C080E0ABCFCF918E +:1043D0000895E1E8F0E080818860808380818160D9 +:1043E00080838FB7F89493E09093890090ED909339 +:1043F00088008FBF0895EFE6F0E0808182608083BF +:104400000895EFE6F0E080818D7F80830895EFE6E8 +:10441000F0E0908182E08927808308951F920F92B7 +:104420000FB60F9211242F933F934F935F936F9387 +:104430007F938F939F93AF93BF93EF93FF9380915D +:10444000DE019091DF0101969093DF018093DE0100 +:10445000811103C082E00E94F307E091DF01E6953D +:10446000E695F0E0E657FB4FE4918091DE018E1374 +:1044700003C080E00E94F307FF91EF91BF91AF91DD +:104480009F918F917F916F915F914F913F912F916C +:104490000F900FBE0F901F90189504D06894B11123 +:1044A0008DC0089570D088F09F5790F0B92F99274C +:1044B000B751A0F0D1F0660F771F881F991F1AF02F +:1044C000BA95C9F712C0B13081F077D0B1E0089544 +:1044D00074C0672F782F8827B85F39F0B93FCCF3C5 +:1044E000869577956795B395D9F73EF49095809525 +:1044F000709561957F4F8F4F9F4F0895E89409C045 +:1045000097FB3EF490958095709561957F4F8F4F06 +:104510009F4F9923A9F0F92F96E9BB279395F6951C +:10452000879577956795B795F111F8CFFAF4BB0F9A +:1045300011F460FF1BC06F5F7F4F8F4F9F4F16C0FE +:10454000882311F096E911C0772321F09EE8872F88 +:10455000762F05C0662371F096E8862F70E060E044 +:104560002AF09A95660F771F881FDAF7880F9695BD +:10457000879597F9089557FD9058440F551F59F0A6 +:104580005F3F71F04795880F97FB991F61F09F3F40 +:1045900079F087950895121613061406551FF2CF69 +:1045A0004695F1DF08C0161617061806991FF1CFB9 +:1045B00086957105610508940895E894BB276627E0 +:1045C0007727CB0197F908950BD078C069D028F0F0 +:1045D0006ED018F0952309F05AC05FC01124EECFB9 +:1045E000CADFA0F3959FD1F3950F50E0551F629F4E +:1045F000F001729FBB27F00DB11D639FAA27F00D3C +:10460000B11DAA1F649F6627B00DA11D661F829F62 +:104610002227B00DA11D621F739FB00DA11D621F47 +:10462000839FA00D611D221F749F3327A00D611D64 +:10463000231F849F600D211D822F762F6A2F112446 +:104640009F5750408AF0E1F088234AF0EE0FFF1F99 +:10465000BB1F661F771F881F91505040A9F79E3FD0 +:10466000510570F014C0AACF5F3FECF3983EDCF325 +:10467000869577956795B795F795E7959F5FC1F70D +:10468000FE2B880F911D9695879597F9089597F9B8 +:104690009F6780E870E060E008959FEF80EC0895E8 +:1046A00000240A9416161706180609060895002411 +:1046B0000A9412161306140605060895092E03948B +:1046C000000C11F4882352F0BB0F40F4BF2B11F4FF +:1046D00060FF04C06F5F7F4F8F4F9F4F089597FB20 +:1046E000072E16F4009407D077FD09D00E94892385 +:1046F00007FC05D03EF4909581959F4F08957095E5 +:1047000061957F4F0895EE0FFF1F0590F491E02D06 +:104710000994AA1BBB1B51E107C0AA1FBB1FA61708 +:10472000B70710F0A61BB70B881F991F5A95A9F75A +:1047300080959095BC01CD010895F999FECF92BD69 +:1047400081BDF89A992780B50895A8E1B0E042E0CC +:1047500050E00C94C523262FF999FECF92BD81BD60 +:10476000F89A019700B4021639F01FBA20BD0FB6AF +:10477000F894FA9AF99A0FBE08950196272F0E948D +:10478000AC230C94AB23DC01CB01FC01F999FECFE7 +:1047900006C0F2BDE1BDF89A319600B40D924150C9 +:0A47A0005040B8F70895F894FFCFD9 +:1047AA002002F507830860082C08F8070101BA01FE +:1047BA0028080A03140A3F4D36394B04FE03C8037E +:1047CA008F0322033B0354036D030102030405060E +:0447DA0007080900C3 +:00000001FF -- cgit v1.2.3 From 9b163d2feb332107794a0f6e3573afe92c40b7fe Mon Sep 17 00:00:00 2001 From: Nathan Sharfi Date: Sun, 1 May 2016 13:55:00 -0700 Subject: =?UTF-8?q?zweihander:=20Add=20=E2=8C=98`,=20=E2=8C=98=E2=87=A7`,?= =?UTF-8?q?=20=E2=8C=A5=E2=87=A5,=20=E2=8C=A5=E2=87=A7=E2=87=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c | 14 +++++++------- keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown | 5 +++++ .../ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex | 8 ++++---- 3 files changed, 16 insertions(+), 11 deletions(-) (limited to 'keyboard/ergodox_ez/keymaps/zweihander-osx') diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c index cc94e13337..f53232c3cd 100644 --- a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c +++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c @@ -95,9 +95,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 2: Media keys * dim brighten * ,--------------------------------------------------. ,--------------------------------------------------. - * | | | | | | | F14 | | F15 | | | | | | Power | + * | | | | | | | F14 | | F15 | ⌘W | ⌘⇧` | ⌘` | ⌥⇧⇥ | ⌥⇥ | Power | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | | | PgUp | | | | | | ⌘] | ⌥⌘↑ | ↑ | ⌥⌘↓ | | | + * | | | | PgUp | | | | | | ⌘] | ⌥⌘↑ | ↑ | ⌥⌘↓ | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | | | Home | PgDn | End | |------| |------| ⌘[ | ← | ↓ | → | | ⏯ | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| @@ -124,11 +124,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, // right hand - KC_F15 , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PWR, - KC_TRNS, LGUI(KC_RBRC), LGUI(LALT(KC_UP)), KC_UP , LGUI(LALT(KC_DOWN)), KC_TRNS, KC_TRNS, - LGUI(KC_LBRC), KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_MPLY, - KC_TRNS, LSFT(KC_SPC), KC_SPC , KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, - KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, + KC_F15 , LGUI(KC_W), LGUI(LSFT(KC_GRV)), LGUI(KC_GRV), LALT(LSFT(KC_TAB)), LALT(KC_TAB), KC_PWR, + KC_TRNS, LGUI(KC_RBRC), LGUI(LALT(KC_UP)), KC_UP , LGUI(LALT(KC_DOWN)), KC_TRNS, KC_TRNS, + LGUI(KC_LBRC), KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_MPLY, + KC_TRNS, LSFT(KC_SPC), KC_SPC , KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, + KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown b/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown index 8103c6b327..7bce7c6909 100644 --- a/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown +++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown @@ -1,5 +1,7 @@ # The Zweihander Layout +NB: the backtick (\`) is special in Markdown. If I write ⌘\` in this readme, I mean “command-backtick”, not “command-backslash-backtick”. + This layout is tuned for people who… @@ -12,10 +14,13 @@ This layout doesn’t make any concessions for Windows use. While it should work I tend to have my mouse in my left hand, but I like to use my other hand to make things go faster. I’ve added a bunch of buttons to the media layer to speed up browsing in Safari and Finder: +- Close Window (⌘W) - Back (⌘[) - Forward (⌘]) - Open and Close Parent Folder (⌥⌘↓) - Go Up and Close Just-Left Folder (⌥⌘↑) +- Cycle through open windows in current application (⌘\` and ⌘⇧\`) +- Cycle through tabs in current window (⌥⇥ and ⌥⇧⇥) - Space (page down in browsers; Quick Look in the Finder) - Shift-Space (page up in web browsers) diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex b/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex index 9b783c957c..3e313c3724 100644 --- a/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex +++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex @@ -39,10 +39,10 @@ :1002600001000100010001004D000100010001003A :10027000010001000100010000000100690001000F :1002800000000100000001006A0001000000010000 -:1002900000000100010030082F082C0200000100BE -:1002A0000100520C50002C00A90001000100520076 -:1002B0005100AC00AA0001000100510C4F00AB003E -:1002C000A80001000100010001000100010001007F +:10029000000001001A0830082F082C02000001009D +:1002A000350A520C50002C00A900010035085200FC +:1002B0005100AC00AA0001002B06510C4F00AB000E +:1002C000A80001002B040100010001000100010051 :1002D000A5000100AE00010001000000160345006A :1002E000720067006F0044006F0078002000450036 :1002F0005A00000016034500720067006F004400BA -- cgit v1.2.3 From fe022a508fdd39696e3b2b188df27d60b32f0d63 Mon Sep 17 00:00:00 2001 From: Nathan Sharfi Date: Sun, 1 May 2016 15:12:38 -0700 Subject: =?UTF-8?q?zweihander:=20move=20dim/brighten=20to=201/2,=20add=20?= =?UTF-8?q?=E2=8C=98Q?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c | 16 ++++++++-------- .../ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'keyboard/ergodox_ez/keymaps/zweihander-osx') diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c index f53232c3cd..d019b731f2 100644 --- a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c +++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c @@ -93,9 +93,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_END , KC_TRNS, KC_TRNS ), /* Keymap 2: Media keys - * dim brighten + * * ,--------------------------------------------------. ,--------------------------------------------------. - * | | | | | | | F14 | | F15 | ⌘W | ⌘⇧` | ⌘` | ⌥⇧⇥ | ⌥⇥ | Power | + * | | F14 | F15 | | | | | | ⌘Q | ⌘W | ⌘⇧` | ⌘` | ⌥⇧⇥ | ⌥⇥ | Power | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | | | | PgUp | | | | | | ⌘] | ⌥⌘↑ | ↑ | ⌥⌘↓ | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| @@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ // MEDIA AND MOUSE [MDIA] = KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F14, /* F14 dims screen, F15 brightens */ + KC_TRNS, KC_F14 , KC_F15 , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, /* F14 dims screen, F15 brightens */ KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -124,11 +124,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, // right hand - KC_F15 , LGUI(KC_W), LGUI(LSFT(KC_GRV)), LGUI(KC_GRV), LALT(LSFT(KC_TAB)), LALT(KC_TAB), KC_PWR, - KC_TRNS, LGUI(KC_RBRC), LGUI(LALT(KC_UP)), KC_UP , LGUI(LALT(KC_DOWN)), KC_TRNS, KC_TRNS, - LGUI(KC_LBRC), KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_MPLY, - KC_TRNS, LSFT(KC_SPC), KC_SPC , KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, - KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, + LGUI(KC_Q), LGUI(KC_W), LGUI(LSFT(KC_GRV)), LGUI(KC_GRV), LALT(LSFT(KC_TAB)), LALT(KC_TAB), KC_PWR, + KC_TRNS, LGUI(KC_RBRC), LGUI(LALT(KC_UP)), KC_UP , LGUI(LALT(KC_DOWN)), KC_TRNS, KC_TRNS, + LGUI(KC_LBRC), KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_MPLY, + KC_TRNS, LSFT(KC_SPC), KC_SPC , KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, + KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex b/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex index 3e313c3724..b76c3ec8e8 100644 --- a/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex +++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex @@ -34,11 +34,11 @@ :100210004200260023002000500001004300250278 :100220002E022E004F004D00440045000100010049 :1002300001000000010001000100010001000000B8 -:1002400001000100010001000100010001000100A6 +:100240006900010001000100010001006A000100D5 :100250004A0001000100010001004B004E000100B6 :1002600001000100010001004D000100010001003A -:10027000010001000100010000000100690001000F -:1002800000000100000001006A0001000000010000 +:100270000100010001000100000001000100010077 +:10028000000001000000010014080100000001004E :10029000000001001A0830082F082C02000001009D :1002A000350A520C50002C00A900010035085200FC :1002B0005100AC00AA0001002B06510C4F00AB000E -- cgit v1.2.3 From 6bafe444865e228ddcae2234549f1fd0931d89ad Mon Sep 17 00:00:00 2001 From: Nathan Sharfi Date: Tue, 3 May 2016 19:19:47 -0700 Subject: zweihander: comment out action_get_macro() --- keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'keyboard/ergodox_ez/keymaps/zweihander-osx') diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c index d019b731f2..a9980593fb 100644 --- a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c +++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c @@ -139,6 +139,8 @@ const uint16_t PROGMEM fn_actions[] = { [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) }; +// action_get_macro() is unused — remove the “#if 0” and “#endif” lines to reenable +#if 0 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // MACRODOWN only works in this function @@ -153,6 +155,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) } return MACRO_NONE; }; +#endif // Runs just one time when the keyboard initializes. void matrix_init_user(void) { -- cgit v1.2.3 From fc4f693cad45916973c2b437b625e3fd63634fb6 Mon Sep 17 00:00:00 2001 From: Nathan Sharfi Date: Fri, 6 May 2016 05:19:17 -0700 Subject: =?UTF-8?q?zweihander:=20add=20=E2=8C=98X,=20=E2=8C=98C,=20?= =?UTF-8?q?=E2=8C=98V=20to=20media=20thumb=20keys?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'keyboard/ergodox_ez/keymaps/zweihander-osx') diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c index a9980593fb..1cd7e77230 100644 --- a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c +++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c @@ -109,8 +109,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | * ,------|------|------| |------+------+------. * | | | | | | | | - * | | |------| |------| | | - * | | | | | | | | + * | | |------| |------| ⌘C | ⌘V | + * | | | | | ⌘X | | | * `--------------------' `--------------------' */ // MEDIA AND MOUSE @@ -129,9 +129,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LGUI(KC_LBRC), KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_MPLY, KC_TRNS, LSFT(KC_SPC), KC_SPC , KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS + LGUI(KC_X), LGUI(KC_C), LGUI(KC_V) ), }; -- cgit v1.2.3 From c702a522b077e09a3d7d080c0dc94471f110aa53 Mon Sep 17 00:00:00 2001 From: Nathan Sharfi Date: Fri, 6 May 2016 05:47:55 -0700 Subject: Rearrange code layer on Zweihander Makes it more like the iOS keyboard (and therefore easier to remember). Also adds angle brackets for HTML and comparisons. --- keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'keyboard/ergodox_ez/keymaps/zweihander-osx') diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c index 1cd7e77230..e9963886be 100644 --- a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c +++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c @@ -55,11 +55,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,--------------------------------------------------. ,--------------------------------------------------. * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | ! | @ | { | } | | | | | | / | 7 | 8 | 9 | * | F12 | + * | | [ | ] | { | } | | | | | / | 7 | 8 | 9 | * | F12 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | # | $ | ( | ) | ` |------| |------| - | 4 | 5 | 6 | + | | + * | | < | > | ( | ) | |------| |------| - | 4 | 5 | 6 | + | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | = | | + * | | | | | | | | | | & | 1 | 2 | 3 | = | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * | | | | | | | 0 | . | ← | → | | * `----------------------------------' `----------------------------------' @@ -75,9 +75,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [SYMB] = KEYMAP( // left hand KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, - KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, - KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, - KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, + KC_TRNS,KC_LBRC,KC_RBRC,KC_LCBR,KC_RCBR,KC_TRNS,KC_TRNS, + KC_TRNS,KC_LABK,KC_RABK,KC_LPRN,KC_RPRN,KC_TRNS, + KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, -- cgit v1.2.3