summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md14
-rw-r--r--keyboard/atomic/keymaps/pvc/config.h5
-rw-r--r--keyboard/atomic/keymaps/pvc/keymap.c107
-rw-r--r--keyboard/atreus/config.h2
-rw-r--r--keyboard/ergodox_ez/Makefile16
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/config_user.h8
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex2243
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c69
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk5
-rw-r--r--keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c3
-rw-r--r--keyboard/planck/keymaps/pvc/config.h2
-rw-r--r--keyboard/planck/keymaps/pvc/keymap.c4
-rw-r--r--keyboard/planck/keymaps/pvc/makefile.mk3
-rw-r--r--quantum/audio/audio.c766
-rw-r--r--quantum/audio/audio.h6
-rw-r--r--quantum/audio/audio_pwm.c643
-rw-r--r--quantum/audio/frequency_lut.h357
-rw-r--r--quantum/audio/luts.c382
-rw-r--r--quantum/audio/luts.h15
-rw-r--r--quantum/audio/vibrato_lut.h28
-rw-r--r--quantum/audio/voices.c8
-rw-r--r--quantum/audio/voices.h3
-rw-r--r--quantum/keymap_common.c14
-rw-r--r--quantum/keymap_common.h9
-rw-r--r--quantum/quantum.mk4
-rw-r--r--quantum/tools/README.md4
-rw-r--r--tmk_core/common/action.c97
-rw-r--r--tmk_core/common/action_code.h5
-rw-r--r--tmk_core/common/action_util.c70
-rw-r--r--tmk_core/common/action_util.h20
-rw-r--r--tmk_core/doc/keymap.md8
-rw-r--r--tmk_core/rules.mk9
32 files changed, 2868 insertions, 2061 deletions
diff --git a/README.md b/README.md
index bb1cca1edf..3e6eb1fa3a 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,10 @@ If your keymap directory has a file called `makefile.mk` (note the lowercase fil
So let's say your keyboard's makefile has `CONSOLE_ENABLE = yes` (or maybe doesn't even list the `CONSOLE_ENABLE` option, which would cause it to revert to the global Quantum default). You want your particular keymap to not have the debug console, so you make a file called `makefile.mk` and specify `CONSOLE_ENABLE = no`.
+### Customizing config.h on a per-keymap basis
+
+If you use the ErgoDox EZ, you can make a `config_user.h` file in your keymap directory and use it to override any `config.h` settings you don't like. Anything you set there will take precedence over the global `config.h` for the ErgoDox EZ. To see an example of this, check out `keymaps/erez_experimental`.
+
## Quick aliases to common actions
Your keymap can include shortcuts to common operations (called "function actions" in tmk).
@@ -41,10 +45,13 @@ Your keymap can include shortcuts to common operations (called "function actions
`MO(layer)` - momentary switch to *layer*. As soon as you let go of the key, the layer is deactivated and you pop back out to the previous layer. When you apply this to a key, that same key must be set as `KC_TRNS` on the destination layer. Otherwise, you won't make it back to the original layer when you release the key (and you'll get a keycode sent). You can only switch to layers *above* your current layer. If you're on layer 0 and you use `MO(1)`, that will switch to layer 1 just fine. But if you include `MO(3)` on layer 5, that won't do anything for you -- because layer 3 is lower than layer 5 on the stack.
+`OSL(layer)` - momentary switch to *layer*, as a one-shot operation. So if you have a key that's defined as `OSL(1)`, and you tap that key, then only the very next keystroke would come from layer 1. You would drop back to layer zero immediately after that one keystroke. That's handy if you have a layer full of custom shortcuts -- for example, a dedicated key for closing a window. So you tap your one-shot layer mod, then tap that magic 'close window' key, and keep typing like a boss. Layer 1 would remain active as long as you hold that key down, too (so you can use it like a momentary toggle-layer key with extra powers).
+
`LT(layer, kc)` - momentary switch to *layer* when held, and *kc* when tapped. Like `MO()`, this only works upwards in the layer stack (`layer` must be higher than the current layer).
`TG(layer)` - toggles a layer on or off. As with `MO()`, you should set this key as `KC_TRNS` in the destination layer so that tapping it again actually toggles back to the original layer. Only works upwards in the layer stack.
+
### Fun with modifier keys
* `LSFT(kc)` - applies left Shift to *kc* (keycode) - `S(kc)` is an alias
@@ -83,14 +90,19 @@ The following shortcuts automatically add `LSFT()` to keycodes to get commonly u
KC_PIPE |
KC_COLN :
+`OSM(mod)` - this is a "one shot" modifier. So let's say you have your left Shift key defined as `OSM(MOD_LSFT)`. Tap it, let go, and Shift is "on" -- but only for the next character you'll type. So to write "The", you don't need to hold down Shift -- you tap it, tap t, and move on with life. And if you hold down the left Shift key, it just works as a left Shift key, as you would expect (so you could type THE). There's also a magical, secret way to "lock" a modifier by tapping it multiple times. If you want to learn more about that, open an issue. :)
+
`MT(mod, kc)` - is *mod* (modifier key - MOD_LCTL, MOD_LSFT) when held, and *kc* when tapped. In other words, you can have a key that sends Esc (or the letter O or whatever) when you tap it, but works as a Control key or a Shift key when you hold it down.
-These are the values you can use for the `mod` in `MT()` (right-hand modifiers are not available):
+These are the values you can use for the `mod` in `MT()` and `OSM()` (right-hand modifiers are not available for `MT()`):
* MOD_LCTL
* MOD_LSFT
* MOD_LALT
* MOD_LGUI
+ * MOD_HYPR
+ * MOD_MEH
+
These can also be combined like `MOD_LCTL | MOD_LSFT` e.g. `MT(MOD_LCTL | MOD_LSFT, KC_ESC)` which would activate Control and Shift when held, and send Escape when tapped.
diff --git a/keyboard/atomic/keymaps/pvc/config.h b/keyboard/atomic/keymaps/pvc/config.h
index cc92634646..034bc5dc5c 100644
--- a/keyboard/atomic/keymaps/pvc/config.h
+++ b/keyboard/atomic/keymaps/pvc/config.h
@@ -158,4 +158,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
+
+//#define VIBRATO_ENABLE
+//#define VIBRATO_STRENGTH_ENABLE
+
+
#endif
diff --git a/keyboard/atomic/keymaps/pvc/keymap.c b/keyboard/atomic/keymaps/pvc/keymap.c
index e17c41e23d..3d604a868e 100644
--- a/keyboard/atomic/keymaps/pvc/keymap.c
+++ b/keyboard/atomic/keymaps/pvc/keymap.c
@@ -11,8 +11,8 @@
#define LAYER_QWERTY 0
#define LAYER_COLEMAK 1
#define LAYER_DVORAK 2
-#define LAYER_LOWER 3
-#define LAYER_RAISE 4
+#define LAYER_RAISE 3
+#define LAYER_LOWER 4
#define LAYER_FUNCTION 5
#define LAYER_MOUSE 6
#define LAYER_MUSIC 7
@@ -21,8 +21,8 @@
#define MACRO_QWERTY 0
#define MACRO_COLEMAK 1
#define MACRO_DVORAK 2
-#define MACRO_LOWER 3
-#define MACRO_RAISE 4
+#define MACRO_RAISE 3
+#define MACRO_LOWER 4
#define MACRO_FUNCTION 5
#define MACRO_MOUSE 6
#define MACRO_TIMBRE_1 7
@@ -42,8 +42,8 @@
#define M_QWRTY M(MACRO_QWERTY)
#define M_COLMK M(MACRO_COLEMAK)
#define M_DVORK M(MACRO_DVORAK)
-#define M_LOWER M(MACRO_LOWER)
#define M_RAISE M(MACRO_RAISE)
+#define M_LOWER M(MACRO_LOWER)
#define M_FUNCT M(MACRO_FUNCTION)
#define M_MOUSE M(MACRO_MOUSE)
#define TIMBR_1 M(MACRO_TIMBRE_1)
@@ -148,23 +148,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
{ KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC, KC_SPC, M_LOWER, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT },
},
+ [LAYER_RAISE] = { /* RAISED */
+ { KC_TILD, KC_PSCR, KC_PAUS, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ },
+ { _______, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS },
+ { _______, KC_F5, KC_F6, KC_F7, KC_F8, _______, _______, _______, _______, _______, _______, _______, ________________, KC_HOME },
+ { _______, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, ________________, _______, KC_END },
+ { _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______, _______, _______, _______ },
+ },
[LAYER_LOWER] = { /* LOWERED */
{ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ },
- { _______, _______, _______, _______, SC_CCLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS },
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, KC_HOME },
- { _______, SC_REDO, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, _______, KC_END },
+ { _______, KC_F13, KC_F14, KC_F15, KC_F16, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS },
+ { _______, KC_F17, KC_F18, KC_F19, KC_F20, _______, _______, _______, _______, _______, _______, _______, ________________, KC_HOME },
+ { _______, KC_F21, KC_F22, KC_F23, KC_F24, _______, _______, _______, _______, _______, _______, ________________, _______, KC_END },
{ _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, _______, _______, _______, _______, _______, _______, _______ },
},
- [LAYER_RAISE] = { /* RAISED */
- { KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ },
- { _______, _______, _______, _______, SC_ACLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS },
- { _______, SC_SELA, SC_SAVE, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, KC_HOME },
- { _______, SC_UNDO, SC_CUT, SC_COPY, SC_PSTE, _______, _______, _______, _______, _______, _______, ________________, _______, KC_END },
- { _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______, _______, _______, _______ },
- },
-
[LAYER_FUNCTION] = { /* FUNCTION */
{ KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ },
{ KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_PAUS },
@@ -281,28 +280,28 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
}
break;
- case MACRO_LOWER:
+ case MACRO_RAISE:
if (record->event.pressed)
{
- layer_on(LAYER_LOWER);
+ layer_on(LAYER_RAISE);
update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
}
else
{
- layer_off(LAYER_LOWER);
+ layer_off(LAYER_RAISE);
update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
}
break;
- case MACRO_RAISE:
+ case MACRO_LOWER:
if (record->event.pressed)
{
- layer_on(LAYER_RAISE);
+ layer_on(LAYER_LOWER);
update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
}
else
{
- layer_off(LAYER_RAISE);
+ layer_off(LAYER_LOWER);
update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
}
break;
@@ -468,36 +467,40 @@ void led_set_user(uint8_t usb_led)
_delay_ms(10); // gets rid of tick
- if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
- {
- // If CAPS LK LED is turning on...
- PLAY_NOTE_ARRAY(tone_caps_on, false, LEGATO);
- }
- else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
- {
- // If CAPS LK LED is turning off...
- PLAY_NOTE_ARRAY(tone_caps_off, false, LEGATO);
- }
- else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
- {
- // If NUM LK LED is turning on...
- PLAY_NOTE_ARRAY(tone_numlk_on, false, LEGATO);
- }
- else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
- {
- // If NUM LED is turning off...
- PLAY_NOTE_ARRAY(tone_numlk_off, false, LEGATO);
- }
- else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
- {
- // If SCROLL LK LED is turning on...
- PLAY_NOTE_ARRAY(tone_scroll_on, false, LEGATO);
- }
- else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
- {
- // If SCROLL LED is turning off...
- PLAY_NOTE_ARRAY(tone_scroll_off, false, LEGATO);
- }
+ if (!is_playing_notes())
+ {
+ if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
+ {
+ // If CAPS LK LED is turning on...
+ PLAY_NOTE_ARRAY(tone_caps_on, false, LEGATO);
+ }
+ else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
+ {
+ // If CAPS LK LED is turning off...
+ PLAY_NOTE_ARRAY(tone_caps_off, false, LEGATO);
+ }
+ else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
+ {
+ // If NUM LK LED is turning on...
+ PLAY_NOTE_ARRAY(tone_numlk_on, false, LEGATO);
+ }
+ else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
+ {
+ // If NUM LED is turning off...
+ PLAY_NOTE_ARRAY(tone_numlk_off, false, LEGATO);
+ }
+ else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
+ {
+ // If SCROLL LK LED is turning on...
+ PLAY_NOTE_ARRAY(tone_scroll_on, false, LEGATO);
+ }
+ else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
+ {
+ // If SCROLL LED is turning off...
+ PLAY_NOTE_ARRAY(tone_scroll_off, false, LEGATO);
+ }
+ }
+
old_usb_led = usb_led;
}
diff --git a/keyboard/atreus/config.h b/keyboard/atreus/config.h
index ca0cd7e47a..55d3b62b92 100644
--- a/keyboard/atreus/config.h
+++ b/keyboard/atreus/config.h
@@ -36,7 +36,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Change this to how you wired your keyboard
// COLS: Left to right, ROWS: Top to bottom
#if defined(ATREUS_ASTAR)
- #define COLS (int []){ B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 }
+ #define COLS (int []){ D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 }
#define ROWS (int []){ D0, D1, D3, D2 }
#elif defined(ATREUS_TEENSY2)
#define COLS (int []){ F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0}
diff --git a/keyboard/ergodox_ez/Makefile b/keyboard/ergodox_ez/Makefile
index 5dfcca2c80..3a07ec254f 100644
--- a/keyboard/ergodox_ez/Makefile
+++ b/keyboard/ergodox_ez/Makefile
@@ -101,6 +101,22 @@ NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: ht
# MIDI_ENABLE = yes # MIDI controls
# UNICODE_ENABLE = yes # Unicode
+# If you want to have your own config_user.h, you can just put it in
+# your keymap directory. Anything you set there will take precedence
+# over the global config.h.
+ifneq ("$(wildcard keymaps/$(KEYMAP)/config_user.h)","")
+CONFIG_USER_H = keymaps/$(KEYMAP)/config_user.h
+endif
+
+ifdef KEYMAP
+
+ifeq ("$(wildcard keymaps/$(KEYMAP).c)","")
+ifneq ("$(wildcard keymaps/$(KEYMAP)/makefile.mk)","")
+ include keymaps/$(KEYMAP)/makefile.mk
+endif
+endif
+endif
+
# Optimize size but this may cause error "relocation truncated to fit"
#EXTRALDFLAGS = -Wl,--relax
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/config_user.h b/keyboard/ergodox_ez/keymaps/erez_experimental/config_user.h
new file mode 100644
index 0000000000..d19c2783c3
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/erez_experimental/config_user.h
@@ -0,0 +1,8 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "config.h"
+#define ONESHOT_TAP_TOGGLE 2
+#define ONESHOT_TIMEOUT 3000
+
+#endif
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex b/keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex
index ab32e94dd2..edbead2769 100644
--- a/keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex
+++ b/keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex
@@ -1,235 +1,235 @@
-:100000000C9465020C94A9020C94A9020C94A90208
-:100010000C94A9020C94A9020C94A9020C94A902B4
-:100020000C94A9020C94A9020C94A00C0C94720DCF
-:100030000C94A9020C94A9020C94A9020C94A90294
-:100040000C94A9020C9446220C94A9020C94A902C7
-:100050000C94A9020C94EA1B0C94A9020C94A9021A
-:100060000C94A9020C94A9020C94A9020C94A90264
-:100070000C94A9020C94A9020C94A9020C94A90254
-:100080000C94A9020C94A9020C94A9020C94A90244
-:100090000C94A9020C94A9020C94A9020C94A90234
-:1000A0000C94A9020C94A9020C94A902D70DF90D85
-:1000B000E40EF90DE40E3B0E5E0EE40EB30EC60E1A
-:1000C000C011C0110112011243127F127F147F145C
-:1000D00097127F148E138E1359147F147F146D148E
-:1000E0000000F0A12E004C002A00003035810000F5
-:1000F0001E00140004001D7134004D001F001A0082
-:1001000016001B00E104C1002000080007000600E3
-:1001100050002C0021001500090019004F004A0072
-:10012000220017000A000500000065745000015409
-:1001300000002F7F0000E3004F00015400003077E3
-:100140000000E20023001C000B00110000002971D8
-:10015000240018000D74100052004B0025000C0004
-:100160000E00360051002800260012000F00370054
-:100170002F002B81270013003382387130004E008E
-:100180002D003100347801302D0000000100010005
-:1001900001000100010000003A001E0022002602BA
-:1001A000010001003B001F002300270201000100A5
-:1001B0003C00200024002F004B0101003D002100E5
-:1001C000250030004E0101003E00010026002700FE
-:1001D000000001000100010000000100000001001A
-:1001E0000100010000000100000001003F000100CB
-:1001F0002402310200000100400022022D022602EA
-:100200000100010041002E002D0027020100010025
-:1002100042001F0213002000010001004300010002
-:100220002E02010001000100440045000100010010
-:1002300001000000010001000100010001000000B8
-:1002400001000100010001000100010001000100A6
-:10025000F2000100010001000100F000F1000100C6
-:10026000F400010001000100F3000100F5000100AD
-:100270000100010001000100000001000100010077
-:100280000000010000000100010001000000010069
-:100290000000010001000100010001000000010058
-:1002A0000100010001000100A9000100010001009E
-:1002B0000100AC00AA00B600010001000100AB0083
-:1002C000A80001000100010001000100010001007F
-:1002D00001000100AE00010001000000160345000E
-: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
-:1004D000DAE0DEBFCDBF04B603FE24C08091F00198
-:1004E0009091F101A091F201B091F3018730904B0E
-:1004F000A740B04BB9F41092F0011092F1011092A4
-:10050000F2011092F30114BE84B7877F84BF88E1A3
-:100510000FB6F89480936000109260000FBEE0E088
-:10052000FFE3099511E0A0E0B1E0EAE1F8E402C0E0
-:1005300005900D92A433B107D9F711E0A4E3B1E01F
-:1005400001C01D92A03FB107E1F70E94E6090C949B
-:100550000B240C940000662319F06130F1F03DC0CB
-:10056000FC018281882341F00E94B51B90933501E4
-:100570008093340181EE1CC080913401909135014B
-:100580000E94C11B8634910534F486E20E94481013
-:1005900086E20E94101181EE1EC0FC018281882338
-:1005A00051F00E94B51B909335018093340185EE84
-:1005B0000E94481012C080913401909135010E9430
-:1005C000C11B8634910534F487E20E94481087E20B
-:1005D0000E94101185EE0E94101180E090E00895B5
-:1005E00008956091B3017091B4018091B50190912B
-:1005F000B6010E94131B56985E9825982D98269850
-:100600002E9827982F98813019F0823021F0089584
-:10061000259A2D9A0895269A2E9A08950C94F102FF
-:1006200056985E9825982D9826982E9827982F985A
-:100630008FEF90E0909389008093880090938B00D7
-:1006400080938A0090938D0080938C00259A2D9A38
-:100650002FEF80E792E0215080409040E1F700C00A
-:100660000000269A2E9A2FEF80E792E021508040DA
-:100670009040E1F700C00000279A2F9A2FEF80E703
-:1006800092E0215080409040E1F700C000002598A2
-:100690002D982FEF80E792E0215080409040E1F7C5
-:1006A00000C0000026982E982FEF80E792E021509E
-:1006B00080409040E1F700C0000027982F9856989E
-:1006C0005E9825982D9826982E9827982F9808950B
-:1006D00089EA8093800089E08093810024982C9897
-:1006E0003F988AB18F748AB96E98479A8BB1806BA4
-:1006F0008BB9769A0E9410030C94F00280E28093EA
-:1007000000018091360181110EC00E94CD0381E06D
-:10071000809336012FEF83ED90E32150804090408D
-:10072000E1F700C0000080E40E94D3038093000141
-:1007300081112EC00E94FD0380930001811128C009
-:100740000E94FD0380930001811122C08FE30E946B
-:10075000FD038093000181111BC00E94F50380E41A
-:100760000E94D30380930001811112C08CE00E948B
-:10077000FD038093000181110BC00E94FD03809353
-:100780000001811105C08FE30E94FD0380930001E9
-:100790000E94F5038091000108951092B9008AE04B
-:1007A0008093B800089594EA9093BC009091BC00A7
-:1007B00097FFFCCF9091B900987F983021F090314D
-:1007C00011F081E008958093BB0084E88093BC0021
-:1007D0008091BC0087FFFCCF8091B900887F883171
-:1007E00011F0803471F780E0089584E98093BC00B3
-:1007F0008091BC0084FDFCCF08958093BB0084E809
-:100800008093BC008091BC0087FFFCCF9091B90021
-:10081000987F81E0983209F480E0089584E880931D
-:10082000BC008091BC0087FFFCCF8091BB00089585
-:1008300080910001811115C080E40E94D303809350
-:10084000000181110CC082E10E94FD038093000130
-:10085000811105C08FEF0E94FD03809300010E946B
-:10086000F50384B1807F84B985B1807F85B98AB171
-:10087000837F8AB98BB1837F8BB93E984698089560
-:100880000E947E03809300010E94180480B38C7044
-:1008900080BB81B3836F81BBE6E4F1E0A8E3B1E004
-:1008A00011921D9281E0E435F807D1F70C946803AA
-:1008B000BF92CF92DF92EF92FF920F931F93CF934D
-:1008C000DF9380910001882379F0809137018F5F59
-:1008D00080933701811108C00E947E03809300013C
-:1008E000811102C00E94100308E311E0C0E0D0E0D3
-:1008F000DD24D39482E0C82EEE24E394F12CC7309B
-:1009000000F580910001811162C080E40E94D30350
-:1009100080930001811112C082E10E94FD03809347
-:10092000000181110BC0C7010C2E01C0880F0A9471
-:10093000EAF780950E94FD03809300010E94F50371
-:1009400046C0CA30A1F028F4C83059F0C93061F06F
-:1009500005C0CC3089F070F0CD3089F0209A28980D
-:1009600010C0219A29980DC0229A2A980AC0239A69
-:100970002B9807C0529A01C0539A5B9802C03E9AC6
-:100980004698E0EAEA95F1F78FB179995AC092E07A
-:1009900081708D25892B7C9B02C090E001C094E082
-:1009A000892B7D9B02C090E001C098E0892B7E9B43
-:1009B00002C090E001C090E1892B9FB19095991FF2
-:1009C0009927991F9295990F907E892B0FC080913E
-:1009D000000181114BC080E40E94D3038093000189
-:1009E000882389F1B12C0E94F5038B2DF8019081A9
-:1009F000981719F08083C09201010E941804219673
-:100A00000F5F1F4FCE30D10509F079CF80910101E2
-:100A1000882371F1815080930101882339F08FE997
-:100A20009FE00197F1F700C0000022C0A6E4B1E00A
-:100A3000E8E3F1E081918D9391E0E634F907D1F795
-:100A400017C090E0A5CF83E10E94FD0380930001D1
-:100A50008111C8CF81E40E94D303809300018111EA
-:100A6000C1CF0E940E04B82EB094BDCF80E0BECF9F
-:100A70000E940E0381E0DF91CF911F910F91FF90B3
-:100A8000EF90DF90CF90BF900895E82FF0E0EA5B01
-:100A9000FE4F808108950895089596E0799FF001B2
-:100AA000112494E5899FE00DF11D1124E60FF11D3D
-:100AB000EE0FFF1FEC51FF4F859194910895880F21
-:100AC000991F805A9040FC01859194910895880F58
-:100AD000991F80529F4FFC018591949108950F9327
-:100AE0001F93CF93DF93EC01811520E3920730F53C
-:100AF000811530E2930708F0B1C08B3B910588F473
-:100B0000883A910508F058C0853A910508F049C027
-:100B10008430910508F043C08130910509F4B2C1D9
-:100B2000AEC18F3F910509F0D0F5803F910508F0E7
-:100B300092C0805E9109089790F1A1C1C11581E52D
-:100B4000D807A8F4C23090E5D90708F09FC0C115B6
-:100B500020E5D20709F486C008F092C0C11580E4F0
-:100B6000D80708F08CC18E011127106CCCC1C115BB
-:100B700090E8D90758F4C11520E7D20708F07BC1E7
-:100B8000C11530E6D30708F423C179C1C11580E946
-:100B9000D80708F074C18E011F70106AB4C18E01AD
-:100BA000B2C1853A910509F470C1863A910509F4FC
-:100BB0006FC103E810E4A7C1883A910509F46BC13D
-:100BC000893A910509F46AC18A3A910509F469C123
-:100BD0008B3A910509F468C18C3A910509F467C113
-:100BE0008D3A910509F466C1803B910509F465C110
-:100BF0008E3A910509F464C18F3A910509F463C1F5
-:100C0000813B910509F462C1823B910509F461C100
-:100C1000833B910509F460C1843B910509F45FC1F0
-:100C2000853B910509F45EC1863B910509F45DC1E0
-:100C3000873B910509F45CC1883B910509F45BC1D0
-:100C4000893B910509F45AC18A3B910509F059C1C4
-:100C50000AE216E458C18C01106555C19F700E94CC
-:100C6000670552C10E94A2149FEF24E33CE091501B
-:100C700020403040E1F700C000000E940F1C43C13B
-:100C80008091CF0181608093CF013DC10E94B71D4B
-:100C9000811102C00E949D1D0E94D41D90E090937E
-:100CA000F0018093EF01C23080E5D80721F48091F4
-:100CB000EF01816086C0C43090E5D90721F48091AE
-:100CC000EF0182607EC0C63020E5D20721F480911A
-:100CD000EF01846076C0C83030E5D30719F4809105
-:100CE000EF0127C0CA3080E5D80721F48091EF01D9
-:100CF000806167C0CC3090E5D90721F48091EF0185
-:100D000080625FC0CE3020E5D20721F48091EF01F0
-:100D1000806457C0C03130E5D30721F48091EF01E2
-:100D200080684FC0C23180E5D80729F48091EF0177
-:100D30008460886046C0C33090E5D90721F4809173
-:100D4000EF018E7F3EC0C53020E5D20721F48091AF
-:100D5000EF018D7F36C0C73030E5D30721F4809195
-:100D6000EF018B7F2EC0C93080E5D80719F4809140
-:100D7000EF0126C0CB3090E5D90721F48091EF0137
-:100D80008F7E1FC0CD3020E5D20721F48091EF0186
-:100D90008F7D17C0CF3030E5D30721F48091EF016C
-:100DA0008F7B0FC0C13180E5D80721F48091EF011E
-:100DB0008F7707C0C331D04531F48091EF018B7F2D
-:100DC000877F8093EF018091EF010E94D81D9BC027
-:100DD0008D2F99278F70992781309105E9F48E0125
-:100DE000037011279C0102C0220F331F0A95E2F7FE
-:100DF00089011C68CE0164E0880F991F6A95E1F7AC
-:100E000088279370082B192B73E0CC0FDD1F7A9580
-:100E1000E1F7C076DD272CC08230910529F41C2F24
-:100E20000027016F106A6FC08330910561F4CE0115
-:100E30008370992701E010E002C0000F111F8A950E
-:100E4000E2F71C680EC0049709F05DC0CE01837004
-:100E5000992701E010E002C0000F111F8A95E2F708
-:100E60001A6843E0CC0FDD1F4A95E1F7C07ED770CA
-:100E70000C2B1D2B48C08E011F70106244C000E077
+:100000000C945C020C94A0020C94A0020C94A0022C
+:100010000C94A0020C94A0020C94A0020C94A002D8
+:100020000C94A0020C94A0020C94970C0C94690DF3
+:100030000C94D61B0C94A0020C94A0020C94A00269
+:100040000C94A0020C94A0020C94A0020C94A002A8
+:100050000C94A0020C943D1C0C94A0020C94A002E1
+:100060000C94A0020C94A0020C94A0020C94A00288
+:100070000C94A0020C94A0020C94A0020C94A00278
+:100080000C94A0020C94A0020C94A0020C94A00268
+:100090000C94A0020C94A0020C94A0020C94A00258
+:1000A0000C94A0020C94A0020C94A002CE0DF00DB2
+:1000B000DB0EF00DDB0E320E550EDB0EAA0EBD0E62
+:1000C000CC11CC11FB11FB1146126812CF13CF13C8
+:1000D0007312CF131C131C13C013CF13CF13C913E8
+:1000E0002913291329132913291329132913291330
+:1000F0002913291329132913291329132913291320
+:100100003A1348134F13561360130000F0A100C8B0
+:1001100001C82E004C002A000030358100001E006E
+:10012000140004001D7134004D001F001A00160059
+:100130001B00E104C1002000080007000600500079
+:100140002C0021001500090019004F004A00220070
+:1001500017000A00050000006574500001540000FB
+:100160002F7F0000E3004F000154000030770000B3
+:10017000E20023001C000B00110000002971240084
+:1001800018000D74100052004B0025000C000E00EA
+:10019000360051002800260012000F0037002F0003
+:1001A0002B81270013003382387130004E002D0060
+:1001B0003100347801302D00000001000100010001
+:1001C0000100010000003A001E002200260201008A
+:1001D00001003B001F0023002702010001003C003A
+:1001E000200024002F004B0101003D0021002500CC
+:1001F00030004E0101003E000100260027000000F3
+:1002000001000100010000000100000001000100E8
+:10021000010000000100000001003F000100240275
+:10022000310200000100400022022D0226020100DE
+:10023000010041002E002D002702010001004200B4
+:100240001F021300200001000100430001002E02E4
+:10025000010001000100440045000100010001000F
+:100260000000010001000100010001000000010088
+:100270000100010001000100010001000100F20085
+:100280000100010001000100F000F1000100F40094
+:10029000010001000100F3000100F5000100010070
+:1002A0000100010001000000010001000100000048
+:1002B0000100000001000100010000000100000039
+:1002C0000100010001000100010000000100010027
+:1002D000010001000100A90001000100010001006E
+:1002E000AC00AA00B600010001000100AB00A800AC
+:1002F00001000100010001000100010001000100F6
+:100300000100AE000100010000001603450072006C
+:1003100067006F0044006F007800200045005A001D
+:10032000000016034500720067006F0044006F0074
+:100330007800200045005A00000004030904090267
+:100340006D00040100A0FA0904000001030101008E
+:10035000092111010001223F000705810308000A5D
+:100360000904010001030102000921110100012219
+:100370004D000705820308000A090402000103007A
+:10038000000009211101000122360007058303083E
+:10039000000A090403000103000000092111010003
+:1003A0000122390007058403100001120110010029
+:1003B000000008EDFE07130100010200010501091C
+:1003C00006A101050719E029E71500250195087523
+:1003D000018102050819012905950575019102950C
+:1003E000017503910105071900297715002501956D
+:1003F0007875018102C005010980A10185021601FD
+:100400000026B7001A01002AB70075109501810077
+:10041000C0050C0901A1018503160100269C021AE2
+:1004200001002A9C02751095018100C00501090296
+:10043000A1010901A10005091901290515002501DE
+:10044000950575018102950175038101050109304A
+:1004500009311581257F95027508810609381581B6
+:10046000257F950175088106050C0A38021581253E
+:100470007F950175088106C0C005010906A1010527
+:100480000719E029E71500250195087501810295F6
+:100490000175088101050819012905950575019166
+:1004A000029501750391010507190029FF15002523
+:1004B000FF950675088100C011241FBECFEFDAE05A
+:1004C000DEBFCDBF04B603FE24C08091F20190913F
+:1004D000F301A091F401B091F5018730904BA74052
+:1004E000B04BB9F41092F2011092F3011092F401A2
+:1004F0001092F50114BE84B7877F84BF88E10FB6E0
+:10050000F89480936000109260000FBEE0E0FFE37B
+:10051000099511E0A0E0B1E0EAEEF7E402C0059031
+:100520000D92A433B107D9F711E0A4E3B1E001C003
+:100530001D92A23FB107E1F70E94DF090C94F3235B
+:100540000C940000CF93DF93EC01662319F0613027
+:1005500079F031C08A818823C9F082E00E94561167
+:100560008D81982F907F71F080FD0CC086E21BC0BA
+:100570008A818823D9F082E00E9456118D81982FBC
+:10058000907F71F48D818F708D8315C08D81807FF8
+:1005900019F086E20E94071182E00E945D110BC0F3
+:1005A00080FDF0CF87E20E943F1005C08D81807FE3
+:1005B00099F387E2EFCF80E090E0DF91CF9108954B
+:1005C00008956091B1017091B2018091B301909151
+:1005D000B4010E943D1B56985E9825982D98269848
+:1005E0002E9827982F98813019F0823021F00895A5
+:1005F000259A2D9A0895269A2E9A08950C94E10230
+:1006000056985E9825982D9826982E9827982F987A
+:100610008FEF90E0909389008093880090938B00F7
+:1006200080938A0090938D0080938C00259A2D9A58
+:100630002FEF80E792E0215080409040E1F700C02A
+:100640000000269A2E9A2FEF80E792E021508040FA
+:100650009040E1F700C00000279A2F9A2FEF80E723
+:1006600092E0215080409040E1F700C000002598C2
+:100670002D982FEF80E792E0215080409040E1F7E5
+:1006800000C0000026982E982FEF80E792E02150BE
+:1006900080409040E1F700C0000027982F985698BE
+:1006A0005E9825982D9826982E9827982F9808952B
+:1006B00089EA8093800089E08093810024982C98B7
+:1006C0003F988AB18F748AB96E98479A8BB1806BC4
+:1006D0008BB9769A0E9400030C94E00280E280932A
+:1006E00000018091340181110EC00E94BD0381E0A0
+:1006F000809334012FEF83ED90E3215080409040B0
+:10070000E1F700C0000080E40E94C3038093000171
+:1007100081112EC00E94ED0380930001811128C039
+:100720000E94ED0380930001811122C08FE30E949B
+:10073000ED038093000181111BC00E94E50380E45A
+:100740000E94C30380930001811112C08CE00E94BB
+:10075000ED038093000181110BC00E94ED03809393
+:100760000001811105C08FE30E94ED038093000119
+:100770000E94E5038091000108951092B9008AE07B
+:100780008093B800089594EA9093BC009091BC00C7
+:1007900097FFFCCF9091B900987F983021F090316D
+:1007A00011F081E008958093BB0084E88093BC0041
+:1007B0008091BC0087FFFCCF8091B900887F883191
+:1007C00011F0803471F780E0089584E98093BC00D3
+:1007D0008091BC0084FDFCCF08958093BB0084E829
+:1007E0008093BC008091BC0087FFFCCF9091B90042
+:1007F000987F81E0983209F480E0089584E880933E
+:10080000BC008091BC0087FFFCCF8091BB000895A5
+:1008100080910001811115C080E40E94C303809380
+:10082000000181110CC082E10E94ED038093000160
+:10083000811105C08FEF0E94ED03809300010E949B
+:10084000E50384B1807F84B985B1807F85B98AB1A1
+:10085000837F8AB98BB1837F8BB93E984698089580
+:100860000E946E03809300010E94080480B38C7084
+:1008700080BB81B3836F81BBE4E4F1E0A6E3B1E028
+:1008800011921D9281E0E235F807D1F70C945803DC
+:10089000BF92CF92DF92EF92FF920F931F93CF936D
+:1008A000DF9380910001882379F0809135018F5F7B
+:1008B00080933501811108C00E946E03809300016E
+:1008C000811102C00E94000306E311E0C0E0D0E005
+:1008D000DD24D39482E0C82EEE24E394F12CC730BB
+:1008E00000F580910001811162C080E40E94C30381
+:1008F00080930001811112C082E10E94ED03809378
+:10090000000181110BC0C7010C2E01C0880F0A9491
+:10091000EAF780950E94ED03809300010E94E503B1
+:1009200046C0CA30A1F028F4C83059F0C93061F08F
+:1009300005C0CC3089F070F0CD3089F0209A28982D
+:1009400010C0219A29980DC0229A2A980AC0239A89
+:100950002B9807C0529A01C0539A5B9802C03E9AE6
+:100960004698E0EAEA95F1F78FB179995AC092E09A
+:1009700081708D25892B7C9B02C090E001C094E0A2
+:10098000892B7D9B02C090E001C098E0892B7E9B63
+:1009900002C090E001C090E1892B9FB19095991F12
+:1009A0009927991F9295990F907E892B0FC080915E
+:1009B000000181114BC080E40E94C30380930001B9
+:1009C000882389F1B12C0E94E5038B2DF8019081D9
+:1009D000981719F08083C09201010E9408042196A3
+:1009E0000F5F1F4FCE30D10509F079CF8091010103
+:1009F000882371F1815080930101882339F08FE9B8
+:100A00009FE00197F1F700C0000022C0A4E4B1E02C
+:100A1000E6E3F1E081918D9391E0E434F907D1F7B9
+:100A200017C090E0A5CF83E10E94ED038093000101
+:100A30008111C8CF81E40E94C3038093000181111A
+:100A4000C1CF0E94FE03B82EB094BDCF80E0BECFD0
+:100A50000E94FE0281E0DF91CF911F910F91FF90E4
+:100A6000EF90DF90CF90BF900895E82FF0E0EC5B1F
+:100A7000FE4F808108950895089596E0799FF001D2
+:100A8000112494E5899FE00DF11D1124E60FF11D5D
+:100A9000EE0FFF1FEE5EFE4F859194910895880F33
+:100AA000991F86579040FC01859194910895880F75
+:100AB000991F865F9E4FFC018591949108950F9335
+:100AC0001F93CF93DF93EC01811520E3920730F55C
+:100AD000811530E2930708F0B1C08B3B910588F493
+:100AE000883A910508F058C0853A910508F049C048
+:100AF0008430910508F043C08130910509F4C2C1EA
+:100B0000BEC18F3F910509F0D0F5803F910508F0F7
+:100B100092C0805E9109089790F1B1C1C11581E53D
+:100B2000D807A8F4C23090E5D90708F09FC0C115D6
+:100B300020E5D20709F486C008F092C0C11580E410
+:100B4000D80708F09CC18E011127106CDCC1C115BB
+:100B500090E8D90758F4C11520E7D20708F08BC1F7
+:100B6000C11530E6D30708F423C189C1C11580E956
+:100B7000D80708F084C18E011F70106AC4C18E01AD
+:100B8000C2C1853A910509F480C1863A910509F4FC
+:100B90007FC103E810E4B7C1883A910509F47BC12D
+:100BA000893A910509F47AC18A3A910509F479C123
+:100BB0008B3A910509F478C18C3A910509F477C113
+:100BC0008D3A910509F476C1803B910509F475C110
+:100BD0008E3A910509F474C18F3A910509F473C1F5
+:100BE000813B910509F472C1823B910509F471C101
+:100BF000833B910509F470C1843B910509F46FC1F1
+:100C0000853B910509F46EC1863B910509F46DC1E0
+:100C1000873B910509F46CC1883B910509F46BC1D0
+:100C2000893B910509F46AC18A3B910509F069C1C4
+:100C30000AE216E468C18C01106565C19F700E94CC
+:100C4000570562C10E9419149FEF24E33CE09150C4
+:100C500020403040E1F700C000000E94621C53C1F8
+:100C60008091D30181608093D3014DC10E940A1EFF
+:100C7000811102C00E94F01D0E94271E90E09093F7
+:100C8000F2018093F101C23080E5D80721F4809110
+:100C9000F101816086C0C43090E5D90721F48091CC
+:100CA000F10182607EC0C63020E5D20721F4809138
+:100CB000F101846076C0C83030E5D30719F4809123
+:100CC000F10127C0CA3080E5D80721F48091F101F5
+:100CD000806167C0CC3090E5D90721F48091F101A3
+:100CE00080625FC0CE3020E5D20721F48091F1010F
+:100CF000806457C0C03130E5D30721F48091F10101
+:100D000080684FC0C23180E5D80729F48091F10195
+:100D10008460886046C0C33090E5D90721F4809193
+:100D2000F1018E7F3EC0C53020E5D20721F48091CD
+:100D3000F1018D7F36C0C73030E5D30721F48091B3
+:100D4000F1018B7F2EC0C93080E5D80719F480915E
+:100D5000F10126C0CB3090E5D90721F48091F10153
+:100D60008F7E1FC0CD3020E5D20721F48091F101A4
+:100D70008F7D17C0CF3030E5D30721F48091F1018A
+:100D80008F7B0FC0C13180E5D80721F48091F1013C
+:100D90008F7707C0C331D04531F48091F1018B7F4B
+:100DA000877F8093F1018091F1010E942B1EABC0DF
+:100DB0008D2F99278F70992781309105E9F48E0145
+:100DC000037011279C0102C0220F331F0A95E2F71E
+:100DD00089011C68CE01E4E0880F991FEA95E1F7CC
+:100DE00088279370082B192BF3E0CC0FDD1FFA95A1
+:100DF000E1F7C076DD272CC08230910529F41C2F45
+:100E00000027016F106A7FC08330910561F4CE0125
+:100E10008370992701E010E002C0000F111F8A952E
+:100E2000E2F71C680EC084309105A9F4CE018370EE
+:100E3000992701E010E002C0000F111F8A95E2F728
+:100E40001A6863E0CC0FDD1F6A95E1F7C07ED770AA
+:100E50000C2B1D2B58C08530910529F41C2F002721
+:100E6000046F106A50C0069709F04DC0CF71DD279E
+:100E70001C2F002702C08E011F70106244C000E0CA
:100E800010E041C001E010E03EC001E810E43BC0CA
:100E900002E810E438C002EE14E435C009EE14E4B0
:100EA00032C00AEE14E42FC005EB14E42CC006EBAC
@@ -240,43 +240,43 @@
:100EF00005E216E408C006E216E405C007E216E4BF
:100F000002C000E014E4C801DF91CF911F910F915E
:100F1000089596E0799FF001112494E5899FE00DF2
-:100F2000F11D1124E60FF11DEE0FFF1FEC51FF4FD5
+:100F2000F11D1124E60FF11DEE0FFF1FEE5EFE4FC7
:100F300085919491803E9105E0F4803C910558F5AF
:100F40008133910509F46FC048F48932910509F4A1
:100F500063C08A32910509F46DC072C0893391056E
:100F6000E9F082389105D1F08533910509F44DC03F
:100F700067C0833E910581F138F4803E9105B9F058
:100F8000823E9105D9F05CC0863E910561F1873EB5
-:100F90009105A1F155C00E945F0508952091EF01D0
+:100F90009105A1F155C00E944F0508952091F101DE
:100FA00020FD02C021FF4CC080EE90E049C080913E
-:100FB000EF0180FFF9CF89E390E042C08091EF011B
-:100FC00082FF0EC08091EF0184FF03C080E090E0BB
-:100FD00037C083EE90E034C08091EF0182FFF2CF02
-:100FE00082EE90E02DC08091EF0183FF0BC08091D5
-:100FF000EF0184FDEBCF87EE90E022C08091EF01FE
-:1010000083FFF5CF86EE90E01BC08091EF0185FF56
-:1010100007C089E290E014C08091EF0185FFF9CF0D
-:1010200085E390E00DC08091EF0186FF07C08AE262
-:1010300090E006C08091EF0186FFF9CF81E390E058
-:101040000E946F05089508950C942308809164010F
+:100FB000F10180FFF9CF89E390E042C08091F10117
+:100FC00082FF0EC08091F10184FF03C080E090E0B9
+:100FD00037C083EE90E034C08091F10182FFF2CF00
+:100FE00082EE90E02DC08091F10183FF0BC08091D3
+:100FF000F10184FDEBCF87EE90E022C08091F101FA
+:1010000083FFF5CF86EE90E01BC08091F10185FF54
+:1010100007C089E290E014C08091F10185FFF9CF0B
+:1010200085E390E00DC08091F10186FF07C08AE260
+:1010300090E006C08091F10186FFF9CF81E390E056
+:101040000E945F05089508950C9423088091620121
:101050000895CF93DF9300D01F92CDB7DEB72091D4
-:10106000E601243019F523E029839B838A832093AA
+:10106000E801243019F523E029839B838A832093A8
:10107000E9008FEF9091E800815095FD06C095ED55
:101080009A95F1F700008111F5CF8091E80085FF76
:101090000DC040E050E063E070E0CE0101960E9498
-:1010A000930A8091E8008E778093E8000F900F906C
+:1010A0008A0A8091E8008E778093E8000F900F9075
:1010B0000F90DF91CF910895CF93DF9300D01F92CF
-:1010C000CDB7DEB72091E601243021F522E0298357
+:1010C000CDB7DEB72091E801243021F522E0298355
:1010D0009B838A8383E08093E9008FEF9091E800FF
:1010E000815095FD06C095ED9A95F1F700008111AC
:1010F000F5CF8091E80085FF0DC040E050E063E04F
-:1011000070E0CE0101960E94930A8091E8008E77EC
+:1011000070E0CE0101960E948A0A8091E8008E77F5
:101110008093E8000F900F900F90DF91CF9108958A
-:101120002091E6012430F1F422E02093E9002FEF32
+:101120002091E8012430F1F422E02093E9002FEF30
:101130003091E800215035FD06C035ED3A95F1F7C4
:1011400000002111F5CF2091E80025FF0BC040E001
-:1011500050E065E070E00E94930A8091E8008E778D
-:101160008093E8000895CF93DF93EC018091E6012E
+:1011500050E065E070E00E948A0A8091E8008E7796
+:101160008093E8000895CF93DF93EC018091E8012C
:10117000843009F046C090910C019923D9F09091E8
:101180000D019923B9F08093E9008FEF9091E80069
:10119000815095FD06C095E19A95F1F70000811107
@@ -284,876 +284,873 @@
:1011B00070E017C081E08093E9008FEF9091E80024
:1011C000815095FD06C095ED9A95F1F700008111CB
:1011D000F5CF8091E80085FF14C040E050E068E062
-:1011E00070E0CE010E94930A8091E8008E77809390
-:1011F000E80080E1FE01A4E5B1E001900D928A953E
-:10120000E1F7DF91CF9108958091E501811109C047
-:101210000E94250C0E94820C8091E20084608093E1
-:10122000E20008951092E501089508950C94332288
-:101230000E94A61B0E9439220E941F0F0C942408B2
-:1012400042E061EC81E00E949F0B42E061EC82E0B1
-:101250000E949F0B42E061EC83E00E949F0B42E101
-:1012600061EC84E00C949F0B8091E801833009F4D9
-:1012700055C030F4813071F0823009F48EC0089589
-:101280008A3009F47AC08B3009F460C0893009F0E3
-:101290009CC020C08091E701813A09F096C08091FE
-:1012A000E800877F8093E8008091EB019091EC014A
-:1012B000892B21F060E080E090E003C060E184E5EC
-:1012C00091E070E00E94DC0A8091E8008B778093C7
-:1012D000E80008958091E701813209F076C080919D
-:1012E000EB019091EC01009719F0039709F06DC0A4
-:1012F0008091E800877F8093E8008091E80082FD7C
-:1013000005C08091E6018111F8CF5FC08091F100A6
-:10131000809364018091E8008B7753C08091E7014E
-:10132000813A09F052C08091EB019091EC01892B38
-:1013300009F04BC08091E800877F8093E80080919E
-:10134000E80080FFFCCF80910C0136C08091E7015E
-:101350008132D9F58091EB019091EC01892BA9F5AF
-:101360008091E800877F8093E8000E94D40B8091F1
-:10137000E90180930C010C94A2148091E701813261
-:1013800021F58091E800877F8093E8000E94D40BCC
-:101390008091EA018093650108958091E701813A87
-:1013A000A1F48091E800877F8093E8008091E800B5
-:1013B00080FFFCCF809165018093F1008091E8006F
-:1013C0008E778093E8000C94D40B089584B7877FC0
-:1013D00084BF88E10FB6F89480936000109260009B
-:1013E0000FBE90E080E80FB6F89480936100909370
-:1013F00061000FBE0E946E0F0E94250C0E94820C9D
-:101400008091E20084608093E20078940E94FD0E57
-:101410000E94700F82E091E00E941A0F0E94212228
-:101420008091E601853069F40E94661B8091E40199
-:101430008823B1F30E94911B882391F30E947D0AB7
-:10144000EFCF0E94760FECCF292F332723303105C1
-:10145000A9F06CF42130310509F442C02230310585
-:1014600009F043C08DE690E020E133E042C0213234
-:101470003105C9F02232310519F137C09927813081
-:10148000910541F08230910541F0892B71F5ECE036
-:10149000F3E005C0E4EFF2E002C0ECEDF2E084918D
-:1014A00090E09F0126C0643000F5E62FF0E0EE0FDB
-:1014B000FF1FEE5DFE4F2081318189E090E019C071
-:1014C000643098F4E62FF0E0DF01AA0FBB1FA65EA0
-:1014D000BE4F2D913C91EA5EFE4F808190E009C0A5
-:1014E00082E190E02DE733E004C080E090E020E06E
-:1014F00030E0FA0131832083089580E189BD82E1E3
-:1015000089BD09B400FEFDCF8091D8008F7D809306
-:10151000D8008091E00082608093E0008091E0003C
-:1015200081FDFCCF0895CF92DF92EF92FF920F934F
-:101530001F93CF93DF937C018B01EA010E94F50B8F
-:10154000811131C0209731F088819981081B190BD6
-:10155000E80EF91EC12CD12C0115110519F180914D
-:10156000E80085FD14C08091E8008E778093E80044
-:10157000209741F0888199818C0D9D1D99838883E6
-:1015800085E011C00E94F50B882331F30CC0F701F0
-:1015900081917F018093F10001501109FFEFCF1A73
-:1015A000DF0ADACF80E0DF91CF911F910F91FF909A
-:1015B000EF90DF90CF9008952091ED013091EE01F2
-:1015C0002617370748F06115710539F42091E800B6
-:1015D0002E772093E80001C0B901FC0120E06115DD
-:1015E0007105B9F18091E601882309F440C0853086
-:1015F00009F43FC08091E80083FD3DC08091E80080
-:1016000082FF06C08091E80082FF26C080E0089536
-:101610008091E80080FFE3CF2091F3008091F200F9
-:1016200090E0922B6115710551F08830910538F4E6
-:1016300021912093F100615071090196F3CF21E0CF
-:10164000089709F020E08091E8008E778093E80009
-:10165000C6CF2111C7CFD6CF8091E601882339F0BC
-:10166000853039F08091E80083FFCCCF04C082E060
-:10167000089583E0089581E008952091ED0130916F
-:10168000EE012617370748F06115710539F42091EE
-:10169000E8002E772093E80001C0B901FC0120E0AA
-:1016A00061157105C1F18091E601882309F441C0FB
-:1016B000853009F440C08091E80083FD3EC08091F0
-:1016C000E80082FF06C08091E80082FF27C080E02A
-:1016D00008958091E80080FFE3CF2091F30080918E
-:1016E000F20090E0922B6115710559F08830910558
-:1016F00040F424912093F1003196615071090196D4
-:10170000F2CF21E0089709F020E08091E8008E7781
-:101710008093E800C5CF2111C6CFD5CF8091E601D7
-:10172000882339F0853039F08091E80083FFCBCFF2
-:1017300004C082E0089583E0089581E00895982F21
-:10174000973058F59093E900981739F07091EC00B4
-:101750002091ED005091F00003C0242F762F50E02F
-:1017600021FF19C03091EB003E7F3093EB003091A8
-:10177000ED003D7F3093ED003091EB003160309310
-:10178000EB007093EC002093ED005093F00020915B
-:10179000EE0027FF07C09F5FD3CF8F708093E900D3
-:1017A00081E0089580E008958091E70187FD05C0FC
-:1017B0008091E80080FF0EC012C08091E80082FD99
-:1017C00005C08091E6018111F8CF08958091E8006D
-:1017D0008B7708C08091E6018111EACF089580914E
-:1017E000E8008E778093E80008958091E40090915E
-:1017F000E50045E62091EC0020FF21C02091E800A3
-:1018000020FD21C02091E601222389F0253089F0B6
-:101810002091EB0025FD0FC02091E4003091E50000
-:101820002817390739F3415041F0C901E3CF82E06D
-:10183000089583E0089581E0089584E0089520915B
-:10184000E80022FFDFCF80E008950E94930C0E9401
-:101850009B0CE0EEF0E0808181608083E8EDF0E0B9
-:1018600080818F77808319BCA7EDB0E08C918E7F4B
-:101870008C9380818F7E80831092E50108950F9371
-:101880001F93CF93DF930E94930C0E949B0CC8ED93
-:10189000D0E088818F778883888180688883888179
-:1018A0008F7D888319BC1092E6011092E20110929C
-:1018B000E4011092E30100EE10E0F80180818B7FDB
-:1018C000808388818160888342E060E080E00E94BC
-:1018D0009F0BE1EEF0E080818E7F8083E2EEF0E00E
-:1018E000808181608083808188608083F80180812D
-:1018F0008E7F8083888180618883DF91CF911F9163
-:101900000F910895E8EDF0E080818F7E8083E7ED10
-:10191000F0E080818160808384E082BF81E08093F9
-:10192000E5010C943F0CE8EDF0E080818E7F808330
-:101930001092E20008951092DA001092E1000895EA
-:101940001F920F920FB60F9211242F933F934F9334
-:101950005F936F937F938F939F93AF93BF93EF9317
-:10196000FF938091E10082FF0BC08091E20082FF33
-:1019700007C08091E1008B7F8093E1000E94FC0E04
-:101980008091DA0080FF1FC08091D80080FF1BC0CB
-:101990008091DA008E7F8093DA008091D90080FFF9
-:1019A0000DC080E189BD82E189BD09B400FEFDCF93
-:1019B00081E08093E6010E94040905C019BC1092E1
-:1019C000E6010E9412098091E10080FF19C0809118
-:1019D000E20080FF15C08091E2008E7F8093E200DC
-:1019E0008091E20080618093E2008091D800806263
-:1019F0008093D80019BC85E08093E6010E94160907
-:101A00008091E10084FF30C08091E20084FF2CC00F
-:101A100080E189BD82E189BD09B400FEFDCF8091DE
-:101A2000D8008F7D8093D8008091E1008F7E8093D5
-:101A3000E1008091E2008F7E8093E2008091E200DD
-:101A400081608093E2008091E201882311F084E0BC
-:101A500007C08091E30087FF02C083E001C081E0FE
-:101A60008093E6010E9418098091E10083FF29C05C
-:101A70008091E20083FF25C08091E100877F809301
-:101A8000E10082E08093E6011092E2018091E100A2
-:101A90008E7F8093E1008091E2008E7F8093E20050
-:101AA0008091E20080618093E20042E060E080E0AB
-:101AB0000E949F0B8091F00088608093F0000E944C
-:101AC0001509FF91EF91BF91AF919F918F917F91F8
-:101AD0006F915F914F913F912F910F900FBE0F909B
-:101AE0001F9018951F920F920FB60F9211242F93EB
-:101AF0003F934F935F936F937F938F939F93AF9396
-:101B0000BF93CF93EF93FF93C091E900CF70809183
-:101B1000EC001092E9008091F000877F8093F00044
-:101B200078940E94AE0D1092E9008091F0008860D8
-:101B30008093F000C093E900FF91EF91CF91BF91A6
-:101B4000AF919F918F917F916F915F914F913F9155
-:101B50002F910F900FBE0F901F9018951F93CF934A
-:101B6000DF93CDB7DEB7AA970FB6F894DEBF0FBEEE
-:101B7000CDBFE7EEF1E08091F100819321E0EF3EEF
-:101B8000F207C9F70E9434098091E80083FF1CC165
-:101B90002091E7013091E801832F90E08A30910590
-:101BA00008F012C1FC01EA5AFF4F0C94BB23203805
-:101BB00081F0223809F008C18091EB018F70809389
-:101BC000E9008091EB0085FB882780F91092E900FD
-:101BD00006C08091E3019091E4019111826090919F
-:101BE000E800977F9093E8008093F1001092F10055
-:101BF000C5C0822F8D7F09F0E7C0222319F0223063
-:101C000061F0E2C08091E901813009F0DDC033303C
-:101C100009F080E08093E40128C08091E9018111FE
-:101C200024C02091EB012F7009F4CEC02093E9006D
-:101C30008091EB0080FF19C08091EB00333011F4EC
-:101C4000806211C080618093EB0081E090E0022E01
-:101C500001C0880F0A94EAF78093EA001092EA0024
-:101C60008091EB0088608093EB001092E9008091F6
-:101C7000E800877F86C02111A7C01091E9011F7776
-:101C80008091E3008078812B8093E3008091E800CD
-:101C9000877F8093E8000E94D40B8091E80080FF4A
-:101CA000FCCF8091E30080688093E300112311F062
-:101CB00083E001C082E08093E60186C02058223094
-:101CC00008F082C08091E9019091EA018C3D23E007
-:101CD000920779F583E08A838AE289834FB7F89483
-:101CE000DE01139620E03EE051E2E32FF0E0509356
-:101CF0005700E49120FF03C0E295EF703F5FEF7063
-:101D00008E2F90E0EA3010F0C79601C0C0968D93F8
-:101D10009D932F5F243149F74FBF8091E800877F63
-:101D20008093E8006AE270E0CE0101960E94DC0A2E
-:101D300014C0AE014F5F5F4F6091EB010E94240A17
-:101D4000009709F441C02091E800277F2093E80024
-:101D5000BC0189819A810E943D0B8091E8008B77BC
-:101D60008093E80031C0203879F58091E800877FC2
-:101D70008093E8008091E2018093F1008091E80077
-:101D80008E778093E8000E94D40B1EC021111CC0E6
-:101D90009091E9019230C0F48091E800877F8093B0
-:101DA000E8009093E2010E94D40B8091E20181113E
-:101DB00004C08091E30087FF02C084E001C081E09D
-:101DC0008093E6010E9420098091E80083FF0AC009
-:101DD0008091E800877F8093E8008091EB0080622B
-:101DE0008093EB00AA960FB6F894DEBF0FBECDBF6E
-:101DF000DF91CF911F9108950895CF938091E601CF
-:101E00008823B1F08091E9008F709091EC0090FFF1
-:101E100002C090E801C090E0C92FC82B1092E900E1
-:101E20008091E80083FD0E94AE0DCF70C093E90061
-:101E3000CF91089590936B0180936A010895E0918A
-:101E40006A01F0916B01309721F00190F081E02D53
-:101E5000099480E00895E0916A01F0916B01309758
-:101E600021F00280F381E02D09940895E0916A0148
-:101E7000F0916B01309721F00480F581E02D0994F9
-:101E8000089520916801309169018217930771F0DC
-:101E90009093690180936801E0916A01F0916B0170
-:101EA000309721F00680F781E02D09940895209164
-:101EB0006601309167018217930771F09093670173
-:101EC00080936601E0916A01F0916B01309721F0F7
-:101ED0000084F185E02D0994089508950C946D0F08
-:101EE0000E94AC1B0E9440040C94721CCF92DF92A3
-:101EF000EF92FF920F931F93CF93DF93CDB7DEB78F
-:101F00002B970FB6F894DEBF0FBECDBF0E945804CA
-:101F10003DE6E32E31E0F32E00E010E0C02E802FEE
-:101F20000E944505F701D1907F01D826B1F40F5FDB
-:101F30001F4F0E30110591F78FEF89838A831B8223
-:101F40000E94B51B8160782F9D838C8349815A81C3
-:101F50006B818D810E94191041C09091CF0191FF3A
-:101F600004C08B870E944B058B8520E030E04D2D0F
-:101F700050E0922FBA01022E02C0759567950A941F
-:101F8000E2F760FF25C02E83CF82EE24E394F12C8C
-:101F900002C0EE0CFF1C9A95E2F790E08E219F2183
-:101FA00021E0892B09F420E028870E94B51B81607D
-:101FB000782F9A8789874E815F8168858A850E94FC
-:101FC0001910F801E359FE4F80818E25808306C0E9
-:101FD0002F5F3F4F2630310561F6A9CF0E94561F73
-:101FE00010916C010E941F0F1817A1F00E941F0F83
-:101FF00080936C012B960FB6F894DEBF0FBECDBF59
-:10200000DF91CF911F910F91FF90EF90DF90CF90D4
-:102010000C9424082B960FB6F894DEBF0FBECDBFEC
-:10202000DF91CF911F910F91FF90EF90DF90CF90B4
-:102030000895CF93DF93CDB7DEB72B970FB6F89403
-:10204000DEBF0FBECDBF4F83588769877A878B87E6
-:10205000DE01119686E0FD0111928A95E9F785E08F
-:10206000FE01379601900D928A95E1F749815A81D8
-:102070006B817C818D819E810E946E172B960FB69D
-:10208000F894DEBF0FBECDBFDF91CF9108950895C4
-:10209000CF93C82F882309F4C1C0823859F40E9415
-:1020A0001F0F81FDBBC089E30E941A1A0E94E41A27
-:1020B00089E30CC0833879F40E941F0F80FDAEC005
-:1020C00083E50E941A1A0E94E41A83E50E945A1AB4
-:1020D000CF910C94E41A843859F40E941F0F82FDAA
-:1020E0009DC087E40E941A1A0E94E41A87E4EECF8A
-:1020F0008CEF8C0F813A48F48C2F0E94892181113A
-:102100008DC08C2F0E941A1AE3CF80E28C0F88308A
-:1021100048F4C77081E001C0880FCA95EAF70E94B1
-:102120009B1AD6CF8BE58C0F833078F4C53A29F013
-:10213000C63A31F482E890E005C081E890E002C040
-:1021400083E890E0CF910C94410F88E58C0F8331A8
-:1021500008F064C0C83A39F1C93A41F1CA3A49F1C4
-:10216000CB3A51F1CC3A59F1CD3A61F1C03B69F12A
-:10217000CE3A71F1CF3A79F1C13B81F1C23B89F19D
-:10218000C33B91F1C43B99F1C53BA1F1C63BA9F119
-:10219000C73BB1F1C83BB9F1C93BC1F1CA3BC9F575
-:1021A0008AE292E038C082EE90E035C089EE90E09D
-:1021B00032C08AEE90E02FC085EB90E02CC086EB19
-:1021C00090E029C087EB90E026C08CEC90E023C023
-:1021D0008DEC90E020C083E891E01DC08AE891E09A
-:1021E0001AC082E991E017C084E991E014C081E24D
-:1021F00092E011C083E292E00EC084E292E00BC054
-:1022000085E292E008C086E292E005C087E292E0B3
-:1022100002C080E090E0CF910C94570FCF910895C9
-:10222000882309F44BC0823859F40E941F0F81FFA4
-:1022300045C089E30E941A1A0E94E41A89E30CC07F
-:10224000833871F40E941F0F80FF38C083E50E941D
-:102250001A1A0E94E41A83E50E945A1A0C94E41A8E
-:10226000843859F40E941F0F82FF28C087E40E941F
-:102270001A1A0E94E41A87E4EFCF9CEF980F913A64
-:1022800058F390E2980F983050F4877091E001C0B5
-:10229000990F8A95EAF7892F0E94A11ADFCF9BE553
-:1022A000980F933020F480E090E00C94410F885A0E
-:1022B000833120F480E090E00C94570F0895882338
-:1022C00021F00E949B1A0C94E41A0895882321F0AF
-:1022D0000E94A11A0C94E41A0895CF92DF92EF9213
-:1022E000FF920F931F93CF93DF93CDB7DEB728975D
-:1022F0000FB6F894DEBF0FBECDBF8C0185E0F801AC
-:10230000DE01119601900D928A95E1F7F801D080D7
-:10231000E180F280558152955F7023813481232BB7
-:1023200039F0FFEFEF1206C081E0DF1203C003C0F7
-:1023300081E001C080E080FDE2C2C8015F830E94AD
-:102340004710D982EA8269817A818F2D0E94161AFC
-:102350009E8388870E94CA190E949D184E815F81C2
-:102360006885FF2029F00E94B81A68855F814E8138
-:10237000E42FE295EF70F0E0E05AFF4F0C94BB239E
-:10238000842F807F142F1F70882311F01295107FE7
-:10239000FF20B1F0112309F467C280E2860F883074
-:1023A00028F4812F68870E949B1A04C0812F6887B8
-:1023B0000E94AB1A688568870E94E41A688554C237
-:1023C000862F68870E9410116885112309F497C22F
-:1023D000605E812F683018F40E94A11A02C00E942A
-:1023E000B11A28960FB6F894DEBF0FBECDBFDF91AD
-:1023F000CF911F910F91FF90EF90DF90CF900C94B1
-:10240000E41A242F207F842F8F70203211F08295C0
-:10241000807F662319F0613019F12BC0FF20B1F0E5
-:10242000552309F493C1513009F090C128960FB695
-:10243000F894DEBF0FBECDBFDF91CF911F910F91FA
-:10244000FF90EF90DF90CF900C94CB1A552319F0AA
-:10245000513009F454C28E830E94CE1A8E8189C1F4
-:10246000FF2021F0523008F04AC270C1511147C21A
-:1024700080C1FF2021F0552309F468C1F5C155231F
-:1024800009F477C105C2242F26952695237030E0E4
-:102490002115310521F021303105C9F030C2FF206E
-:1024A00021F0862F942F937002C080E090E0289650
-:1024B0000FB6F894DEBF0FBECDBFDF91CF911F9155
-:1024C0000F91FF90EF90DF90CF900C94410FFF2081
-:1024D00021F0862F942F937002C080E090E0289620
-:1024E0000FB6F894DEBF0FBECDBFDF91CF911F9125
-:1024F0000F91FF90EF90DF90CF900C94570F862FA5
-:10250000FF2019F00E945E1E02C00E94C61E28967F
-:102510000FB6F894DEBF0FBECDBFDF91CF911F91F4
-:102520000F91FF90EF90DF90CF900C944B1F842F72
-:10253000837009F076C0F110E2C1262F229526950E
-:102540002770220F220F862F8F70C82ED12CE12CDE
-:10255000F12C022E04C0CC0CDD1CEE1CFF1C0A94D6
-:10256000D2F764FF10C06FE070E080E090E004C03C
-:10257000660F771F881F991F2A95D2F7609570956F
-:102580008095909503C060E070E0CB01242F2695E4
-:1025900026952370422F50E042305105D1F0433050
-:1025A000510559F16C297D298E299F29413051050A
-:1025B00041F128960FB6F894DEBF0FBECDBFDF9174
-:1025C000CF911F910F91FF90EF90DF90CF900C94DF
-:1025D000C2186C297D298E299F2928960FB6F89458
-:1025E000DEBF0FBECDBFDF91CF911F910F91FF9046
-:1025F000EF90DF90CF900C94DC180E94C218C701B6
-:10260000B60128960FB6F894DEBF0FBECDBFDF919E
-:10261000CF911F910F91FF90EF90DF90CF900C948E
-:10262000A818FF2019F0842F817001C08695882397
-:1026300009F465C1262F229526952770220F220FB7
-:10264000862F8F70C82ED12CE12CF12C022E04C0C5
-:10265000CC0CDD1CEE1CFF1C0A94D2F764FF10C0EA
-:102660006FE070E080E090E004C0660F771F881F85
-:10267000991F2A95D2F7609570958095909503C023
-:1026800060E070E0CB01242F269526952370422F21
-:1026900050E042305105D1F04330510559F16C29D9
-:1026A0007D298E299F294130510541F128960FB689
-:1026B000F894DEBF0FBECDBFDF91CF911F910F9178
-:1026C000FF90EF90DF90CF900C9496196C297D29A4
-:1026D0008E299F2928960FB6F894DEBF0FBECDBF76
-:1026E000DF91CF911F910F91FF90EF90DF90CF90EE
-:1026F0000C94B0190E949619C701B60128960FB61E
-:10270000F894DEBF0FBECDBFDF91CF911F910F9127
-:10271000FF90EF90DF90CF900C947C19603FC9F14F
-:1027200018F4603E50F49BC0623F09F460C008F4A6
-:102730004AC0633F09F46FC092C0162F1F70842FE8
-:102740008F71FF2099F00E941519812F28960FB6DE
-:10275000F894DEBF0FBECDBFDF91CF911F910F91D7
-:10276000FF90EF90DF90CF900C945F110E9436198C
-:10277000812F28960FB6F894DEBF0FBECDBFDF9134
-:10278000CF911F910F91FF90EF90DF90CF900C941D
-:102790006611FF20A1F05111B2C0842F8F712896CD
-:1027A0000FB6F894DEBF0FBECDBFDF91CF911F9162
-:1027B0000F91FF90EF90DF90CF900C945B19523007
-:1027C00008F09DC0EACFFF20A1F0842F8F712896DA
-:1027D0000FB6F894DEBF0FBECDBFDF91CF911F9132
-:1027E0000F91FF90EF90DF90CF900C941519FF2080
-:1027F00061F3842F8F7128960FB6F894DEBF0FBE59
-:10280000CDBFDF91CF911F910F91FF90EF90DF909F
-:10281000CF900C943619FF2091F0842F8F71289659
-:102820000FB6F894DEBF0FBECDBFDF91CF911F91E1
-:102830000F91FF90EF90DF90CF900C9400192896A5
-:102840000FB6F894DEBF0FBECDBFDF91CF911F91C1
-:102850000F91FF90EF90DF90CF900C94F618FF202F
-:10286000A1F0552309F4B1CF862F28960FB6F8941E
-:10287000DEBF0FBECDBFDF91CF911F910F91FF90B3
-:10288000EF90DF90CF900C944810552309F4B1CF0E
-:10289000862F28960FB6F894DEBF0FBECDBFDF910E
-:1028A000CF911F910F91FF90EF90DF90CF900C94FC
-:1028B00010114F70C8010E94AB0228960FB6F89411
-:1028C000DEBF0FBECDBFDF91CF911F910F91FF9063
-:1028D000EF90DF90CF900C941B184F70C801289692
-:1028E0000FB6F894DEBF0FBECDBFDF91CF911F9121
-:1028F0000F91FF90EF90DF90CF900C944C052896AD
-:102900000FB6F894DEBF0FBECDBFDF91CF911F9100
-:102910000F91FF90EF90DF90CF9008950E94B81A2A
-:102920000E94C81A0E948D1A0E94E41A0E94F71F82
-:102930000E944B1F80E090E00E94410F80E090E0F9
-:102940000C94570F0E94A81A0C948E140E940B1A14
-:10295000292F22952F7030E02C3031054CF42A308D
-:1029600031056CF4225031092230310590F407C052
-:102970002C30310551F02F30310539F00AC0803E3E
-:1029800010F0803F31F481E0089593FB882780F9AF
-:10299000089580E00895CF93DF9300D000D01F9278
-:1029A000CDB7DEB70F900F900F900F900F90DF9183
-:1029B000CF910895CF93DF9300D000D000D0CDB752
-:1029C000DEB726960FB6F894DEBF0FBECDBFDF91FF
-:1029D000CF9108951F93CF93DF93C0917B0116E0B1
-:1029E00080917C01C81799F0D0E01C9FF0011D9FD9
-:1029F000F00D1124E358FE4F4081518162817381B3
-:102A0000848195810E94DA142196C770E9CFDF9105
-:102A1000CF911F9108954091AD015091AE01609109
-:102A2000AF017091B0018091B1019091B2010C940D
-:102A3000DA14CF938091B20182958F7009F05FC054
-:102A40008091AF01882309F45AC020917B01A091A5
-:102A50007C016091AD017091AE018091B0019091C7
-:102A6000B10131E06F3F09F030E0B32FC6E02A1723
-:102A700009F445C0009721F07F3F21F44B2F03C09C
-:102A800041E001C040E030E040FD35C0C29FF001B0
-:102A9000C39FF00D1124E358FE4F418174132BC0E6
-:102AA0004081641328C04281411125C04381548173
-:102AB0004817590710F441505109481B590B483C1D
-:102AC0005105C8F48091B2018F7080618093B2018A
-:102AD00086E0829FF001839FF00D1124EE57FE4F98
-:102AE00080818F70806180838DEA91E00E946D11FA
-:102AF000CF910C94EA142F5F3F4F2770B8CFCF913E
-:102B00000895CF92DF92EF92FF920F931F93CF938E
-:102B1000DF93CDB7DEB762970FB6F894DEBF0FBE76
-:102B2000CDBF8C0185E0F801DE011D9601900D926C
-:102B30008A95E1F7D8014C9111965C911197129604
-:102B40006C9112971396ED90FC9014977091AD01D3
-:102B5000E091AE012091B0013091B1012115310514
-:102B600031F0EF3F31F481E07F3F19F403C081E0A1
-:102B700001C080E0B82FB170CB2E80FD6CC1D09029
-:102B8000AF01DD2009F4F5C0F091B201E216F306C1
-:102B900038F0C701821B930B883C910548F09BC01D
-:102BA000209530952E0D3F1D283C310508F093C02F
-:102BB0008F2F807F09F052C0E51314C0741312C028
-:102BC000D62E61110FC0FF70F061F093B2010E9428
-:102BD0000B158DEA91E00E946D118091B201F80110
-:102BE00085836CC1EF2831F05F3F31F481E04F3FC6
-:102BF00019F403C081E001C080E080FD03C081E0E2
-:102C0000862701C080E0F82FF170FF2E80FF1CC0E6
-:102C100080917B0120917C0136E0821709F428C164
-:102C200090E0389FF001399FF00D1124E358FE4FDA
-:102C30007181571306C07081471303C072816713F7
-:102C400003C001968770E9CFD62E662309F436C1FA
-:102C50008091B20181608093B20153C0E51308C036
-:102C6000741306C0611104C0D8011596FC93AEC060
-:102C70004D875E878D859E856A8B0E94A6146A8922
-:102C8000882329F1D62E662311F12091B201822FDB
-:102C900082958F7090E002970CF460C08091AD0136
-:102CA0009091AE0198878F831986FB86EA862C87E0
-:102CB000CE01079651C0E51731F14D875E878D85AE
-:102CC0009E856A8B0E94A6146A8981112EC0C80154
-:102CD0000E946D11A4C08F2F807F69F77E2DF98A25
-:102CE000E88A89890E94CB148DEA91E00E946D11D7
-:102CF000EDEAF1E086E0DF011D928A95E9F70E9496
-:102D00000B15D12CDBC07413D8CF6111D6CFD801ED
-:102D10001596FC93C8010E946D11EDEAF1E086E082
-:102D2000DF011D928A95E9F7C9C0D62E662379F294
-:102D30002091B201822F82958F7090E0029774F0FB
-:102D40008091AD019091AE019A8389831B82FD82AF
-:102D5000EC822E83CE0101960E946D1186E0F8016F
-:102D6000ADEAB1E001900D928A95E1F70E94191544
-:102D70006FC0E216F30628F0C701821B930B9C017B
-:102D800004C0209530952E0D3F1D283C310508F0DC
-:102D900052C0D62E662309F49ACFE5132CC07413C3
-:102DA0002AC08091B20180FD1DC0982F92959F701E
-:102DB000C9F0D80115968C9315979F3039F09F5F15
-:102DC0009295907F8F70892B15968C93C8010E94E5
-:102DD0006D1186E0F801ADEAB1E001900D928A959F
-:102DE000E1F736C086E0F801ADEAB1E001900D925E
-:102DF0008A95E1F763C04D875E878D859E850E9429
-:102E0000A614882379F086E0F801ADEAB1E00190DC
-:102E10000D928A95E1F70E9419150E940B15DD2489
-:102E2000D3944CC08091B20181608093B201C801FB
-:102E30000E946D1143C07E2DF98AE88A89890E941B
-:102E4000CB14EDEAF1E086E0DF011D928A95E9F707
-:102E50000E940B1533C0662309F439CF4D875E8776
-:102E60008D859E850E94A614882309F430CFCBCF90
-:102E70004D875E878D859E850E940B1A292F22958E
-:102E80002F7030E0223031052CF49F7041F0811119
-:102E900006C00CC0243031052CF49F7049F4805ECC
-:102EA000883020F0C8010E946D11CF2CDC2C06C0A8
-:102EB000D80115969C91907F91F7F8CF8D2D629651
-:102EC0000FB6F894DEBF0FBECDBFDF91CF911F913B
-:102ED0000F91FF90EF90DF90CF9008951F93CF93C5
-:102EE000DF93CDB7DEB72C970FB6F894DEBF0FBED9
-:102EF000CDBF4F83588769877A878B879C87CE01A0
-:102F000007960E9481158823C1F02F8138858A8514
-:102F10009B85892B31F03F3F11F080E003C02F3FAC
-:102F2000E1F781E0811147C04F81588569857A8535
-:102F30008B859C850E94DA143EC086E0FE013796A0
-:102F4000DE01119601900D928A95E1F7FF81E885E7
-:102F50004A855B854115510531F0EF3F31F481E041
-:102F6000FF3F19F403C081E001C080E080FD23C071
-:102F700020917C0130E0C90101968770992760910A
-:102F80007B0170E086179707F1F1F983EA835D838F
-:102F90004C8396E0929FD001939FB00D1124A358CB
-:102FA000BE4FFE01319601900D929A95E1F7809304
-:102FB0007C010E94EA1416E080917B0190917C01D3
-:102FC000891779F1189FC001112483589E4F0E94E0
-:102FD0008115882331F1E0917B011E9FF0011124BE
-:102FE000E358FE4F408151816281738184819581D4
-:102FF0000E94DA1480917B0190E0019687709927F6
-:1030000080937B01D9CF0E94A21410927C01109270
-:103010007B01EDEAF1E086E0DF011D928A95E9F798
-:10302000CACF2C960FB6F894DEBF0FBECDBFDF918E
-:10303000CF911F910895EF92FF920F931F93CF931B
-:10304000DF939C01009709F471C0F12CEE24E39406
-:10305000E9012196F9018491843740F4843008F025
-:1030600056C0813081F0823021F160C0853709F48B
-:1030700049C0C0F19CE7980F903708F057C08F7790
-:103080000E94101146C089010E5F1F4FFE018491FE
-:1030900090E2980F983050F48770FE2D01C0FF0F1A
-:1030A0008A95EAF78F2F0E94BB1A15C00E9448101C
-:1030B00014C089010E5F1F4FFE01849190E2980FAA
-:1030C000983068F48770FE2D01C0FF0F8A95EAF7EB
-:1030D0008F2F0E94C11A0E94E41AE8011AC00E94B0
-:1030E0001011FBCF2E5F3F4FFE01C491CC2341F066
-:1030F0008FE99FE00197F1F700C00000C150F6CFC3
-:10310000E90107C0FE01F490E901229602C00E9485
-:1031100048108F2D882341F0EFE9FFE03197F1F758
-:1031200000C000008150F6CF9E0192CFDF91CF9179
-:103130001F910F91FF90EF90089508956093B7014C
-:103140007093B8018093B9019093BA010C948E14D6
-:103150000F931F930091B7011091B8012091B9010D
-:103160003091BA01062B172B282B392B0093B7016E
-:103170001093B8012093B9013093BA011F910F91B8
-:103180000C948E140F931F930091B7011091B80106
-:103190002091B9013091BA0106231723282339233E
-:1031A0000093B7011093B8012093B9013093BA018D
-:1031B0001F910F910C948E140F931F930091B701E0
-:1031C0001091B8012091B9013091BA010627172753
-:1031D000282739270093B7011093B8012093B9012C
-:1031E0003093BA011F910F910C948E141092B30179
-:1031F0001092B4011092B5011092B6010C948E1485
-:1032000041E050E060E070E004C0440F551F661FCD
-:10321000771F8A95D2F74093B3015093B40160931E
-:10322000B5017093B6010C948E1441E050E060E05B
-:1032300070E004C0440F551F661F771F8A95D2F7B0
-:103240008091B3019091B401A091B501B091B60104
-:10325000842B952BA62BB72B8093B3019093B401AD
-:10326000A093B501B093B6010C948E1441E050E0E8
-:1032700060E070E004C0440F551F661F771F8A95F9
-:10328000D2F740955095609570958091B3019091DB
-:10329000B401A091B501B091B60184239523A62372
-:1032A000B7238093B3019093B401A093B501B09379
-:1032B000B6010C948E1441E050E060E070E004C070
-:1032C000440F551F661F771F8A95D2F78091B3016F
-:1032D0009091B401A091B501B091B60184279527D2
-:1032E000A627B7278093B3019093B401A093B501AB
-:1032F000B093B6010C948E140F931F930091B301F9
-:103300001091B4012091B5013091B601062B172B15
-:10331000282B392B0093B3011093B4012093B501EE
-:103320003093B6011F910F910C948E140F931F933D
-:103330000091B3011091B4012091B5013091B60113
-:1033400006231723282339230093B3011093B401D4
-:103350002093B5013093B6011F910F910C948E14F8
-:103360000F931F930091B3011091B4012091B50107
-:103370003091B60106271727282739270093B30174
-:103380001093B4012093B5013093B6011F910F91B2
-:103390000C948E140895CF92DF92EF92FF920F93C8
-:1033A0001F93CF93DF93EC01C090B701D090B80189
-:1033B000E090B901F090BA018091B3019091B4010D
-:1033C000A091B501B091B601C82AD92AEA2AFB2AF0
-:1033D0000FE110E0B701A601002E04C076956795B5
-:1033E000579547950A94D2F740FD05C00150110941
-:1033F00088F780E007C0BE01802F0E9489070197EF
-:10340000A9F3802FDF91CF911F910F91FF90EF9043
-:10341000DF90CF900895CF93DF93EC010E94CB19FA
-:10342000BE010E948907DF91CF910895CB010E94D0
-:103430000B1A089590910C019923D9F090910D01E8
-:103440009923B9F0982F9695969596959F3088F583
-:10345000E0910E01F0910F01E90FF11D877021E05D
-:1034600030E001C0220F8A95EAF78181822B8183A7
-:10347000089540910E0150910F0120E030E09FEF40
-:10348000FA01E20FF31F6281681799F09F3F19F468
-:10349000611101C0922F2F5F3F4F2E30310581F710
-:1034A0009F3F39F0FA01E90FF11D97FDFA958283EC
-:1034B0000895089590910C019923E1F090910D01E8
-:1034C0009923C1F0982F9695969596959F3020F563
-:1034D000E0910E01F0910F01E90FF11D877021E0DD
-:1034E00030E001C0220F8A95EAF7209581812823D8
-:1034F0002183089540910E0150910F0120E030E0AA
-:10350000FA01E20FF31F9281981301C012822F5F1C
-:103510003F4F2E303105A1F7089581E090E0E09112
-:103520000E01F0910F01E80FF91F10820196803112
-:103530009105A9F708959091CE01982B9093CE0113
-:10354000089580959091CE0198239093CE0108958F
-:103550001092CE0108959091CD01982B9093CD01BA
-:10356000089580959091CD0198239093CD01089571
-:103570001092CD0108959091CC01982B9093CC019D
-:10358000089580959091CC0198239093CC01089553
-:103590001092CC0108958093BB0108951092BB0155
-:1035A000089540910E0150910F0120E030E080E03D
-:1035B000FA01E20FF31F918191118F5F2F5F3F4F4F
-:1035C0002F303105A9F70895E0910E01F0910F0118
-:1035D0008091CE018083E0910E01F0910F018081F6
-:1035E0009091CD01892B8083E0910E01F0910F0124
-:1035F00080819091CC01892B80839091BB0199238C
-:1036000061F0E0910E01F0910F018081892B8083A0
-:103610000E94D11A81111092BB0180910E019091EC
-:103620000F010C942B0FCF92DF92EF92FF920F932A
-:103630001F936C01EE24FF24C114D104E104F104B2
-:1036400021F46B017C0180E001C080E133272F2D44
-:103650001E2D0D2D011511052105310519F0885F6D
-:103660006801790197018601A4E0369527951795A1
-:103670000795AA95D1F7011511052105310519F016
-:103680008C5F6801790197018601F2E036952795F4
-:1036900017950795FA95D1F7011511052105310503
-:1036A00019F08E5F68017901B701A60176956795DB
-:1036B00057954795452B462B472B09F08F5F1F9158
-:1036C0000F91FF90EF90DF90CF9008958091E601E9
-:1036D000843021F11092D00120E488E190E00FB60F
-:1036E000F894A895809360000FBE2093600080E05E
-:1036F0000E94240883B7817F846083BF83B7816081
-:1037000083BF7894889583B78E7F83BF88E10FB697
-:10371000F89480936000109260000FBE08950895A1
-:103720000895CF930E948F1B0E9458040E94901B03
-:10373000C0E08C2F0E944505811105C0CF5FCE30BF
-:10374000C1F780E001C081E0CF9108950E94A214EA
-:103750000E941F0F0C94240882E084BD93E095BD65
-:103760009AEF97BD80936E0008952FB7F8948091DB
-:10377000D1019091D201A091D301B091D4012FBF7A
-:103780000895CF92DF92EF92FF920F931F932FB77E
-:10379000F8944091D1015091D2016091D301709180
-:1037A000D4012FBF6A017B01EE24FF248C0120E0AD
-:1037B00030E0C016D106E206F30610F4415051097C
-:1037C000481B590BCA011F910F91FF90EF90DF909A
-:1037D000CF9008951F920F920FB60F9211248F93DE
-:1037E0009F93AF93BF938091D1019091D201A0910B
-:1037F000D301B091D4010196A11DB11D8093D101D7
-:103800009093D201A093D301B093D401BF91AF9113
-:103810009F918F910F900FBE0F901F9018950E944F
-:10382000250CF8942FEF87EA91E6215080409040D4
-:10383000E1F700C0000087E090EBDC018093F0012D
-:103840009093F101A093F201B093F3012CE088E191
-:1038500090E00FB6F894A895809360000FBE209377
-:103860006000FFCFEF92FF920F931F93CF93DF93F0
-:10387000E82EF12C8F2D0E944505C0E0D0E0082FE6
-:1038800010E098010C2E02C0359527950A94E2F7B6
-:1038900020FD05C02196C630D10599F709C06C2FCF
-:1038A0007F2D80E00E944D05E812F4CF81E005C035
-:1038B000F3948EE0F812DECF80E0DF91CF911F917C
-:1038C0000F91FF90EF900895CF93C82F8CE20E9444
-:1038D000321C882321F08C2FCF910C94321C80E075
-:1038E000CF910895CF930E94B71D811102C00E940D
-:1038F0009D1DC5E6C15049F00E9458048FE39CE924
-:103900000197F1F700C00000F5CF89E20E94641C26
-:10391000811111C18AE20E94641C81110E949D1DC7
-:1039200085E00E94641C81110E940F1C0E94C21D30
-:103930008093CF0187E00E94641C882399F18BE17A
-:103940000E94641C882351F09091CF0191FB88273D
-:1039500080F921E0822780FB91F922C08EE00E944D
-:10396000641C882351F09091CF0192FB882780F945
-:1039700021E0822780FB92F913C080E10E94641C41
-:103980009091CF01882341F093FB882780F921E0B3
-:10399000822780FB93F904C0892F809580FB90F9E2
-:1039A0009093CF018091CF010E94C61D0E94D41D2B
-:1039B0008093EF0180EE0E94641C882341F0809187
-:1039C000EF01982F909590FB80F98093EF0189E3A8
-:1039D0000E94641C882359F09091EF0191FB882785
-:1039E00080F921E0822780FB91F99093EF0182EE2C
-:1039F0000E94641C882359F09091EF0192FB882764
-:103A000080F921E0822780FB92F99093EF0186EE06
-:103A10000E94641C882359F09091EF0193FB882742
-:103A200080F921E0822780FB93F99093EF0183EEE8
-:103A30000E94641C882359F09091EF0194FB882721
-:103A400080F921E0822780FB94F99093EF0185E3D0
-:103A50000E94641C882359F09091EF0195FB882700
-:103A600080F921E0822780FB95F99093EF0181E3B3
-:103A70000E94641C882359F09091EF0196FB8827DF
-:103A800080F921E0822780FB96F99093EF0181E194
-:103A90000E94641C882359F09091EF0197FB8827BE
-:103AA00080F921E0822780FB97F99093EF018091C4
-:103AB000EF010E94D81D8091EF0187FB882780F9D4
-:103AC00080930D0187E20E94641CC82F8EE10E9442
-:103AD000641C8111C2608FE10E94641C8111C4606A
-:103AE00080E20E94641C8111C86081E20E94641C13
-:103AF0008111C06182E20E94641C8111C06283E274
-:103B00000E94641C8111C06484E20E94641C8823AA
-:103B100011F0C06802C0CC2329F08C2F0E94CF1D69
-:103B20006C2F03C00E94CB1D682F70E080E090E0F6
-:103B3000CF910C949E18CF9108956DEE7EEF80E0AA
-:103B400090E00E94F52360E082E090E00E94E32391
-:103B500060E083E090E00E94E32360E084E090E096
-:103B60000E94E32360E085E090E00C94E32380E092
-:103B700090E00E94DD2321E08D3E9E4F09F020E081
-:103B8000822F089582E090E00C94D523682F82E084
-:103B900090E00C94E32383E090E00C94D523682F0D
-:103BA00083E090E00C94E32384E090E00C94D52330
-:103BB000682F84E090E00C94E3238091D70180FF8C
-:103BC0000BC06091130185E0689FB00111247595C9
-:103BD0006795759567952AC081FF09C060911301AB
-:103BE00085E0689FB0011124759567951FC082FF1D
-:103BF00007C06091130185E0689FB001112416C0D1
-:103C00004091D8014423C9F060911201461788F70A
-:103C10002091130185E0289F90011124429FC0014B
-:103C2000439F900D112470E00E94A7236038710516
-:103C300040F46115710539F002C065E070E0862F2F
-:103C400008958FE7089581E008958091D70180FF5E
-:103C500008C06091110170E075956795759567953D
-:103C600021C081FF06C06091110170E075956795D4
-:103C700019C082FF04C06091110170E010C08091F2
-:103C8000D8018823C1F0609110018617A0F79091A8
-:103C90001101989FC001112470E00E94A723603891
-:103CA000710528F46115710521F0862F08958FE7BD
-:103CB000089581E0089561E070E0F4CF803F21F441
-:103CC0000E94DD1D819504C0813F29F40E94DD1D05
-:103CD0008093DB010895823F21F40E94DD1D8195D0
-:103CE00004C0833F29F40E94DD1D8093DA0108950A
-:103CF000893F19F40E94251E05C08A3F31F40E94B5
-:103D0000251E81958093DC0108958B3F21F40E944C
-:103D1000251E819504C08C3F29F40E94251E8093A6
-:103D2000DD010895843F21F48091D901816017C09D
-:103D3000853F21F48091D901826011C0863F21F432
-:103D40008091D90184600BC0873F21F48091D90113
-:103D5000886005C0883F31F48091D90180618093EB
-:103D6000D90108958D3F21F48091D70181600BC066
-:103D70008E3F21F48091D701826005C08F3F29F4E6
-:103D80008091D70184608093D7010895803F39F4F2
-:103D90008091DB0187FF6CC01092DB0169C0813F1D
-:103DA00029F48091DB011816BCF362C09091DA010E
-:103DB000823F29F497FF5CC01092DA0159C0833F1B
-:103DC00019F41916CCF354C0893F41F48091DC01F9
-:103DD00018160CF04DC01092DC014AC08A3F29F43D
-:103DE0008091DC0187FF44C0F6CF8B3F39F480918E
-:103DF000DD0187FF3DC01092DD013AC08C3F29F400
-:103E00008091DD011816BCF333C0843F21F480910A
-:103E1000D9018E7F17C0853F21F48091D9018D7F14
-:103E200011C0863F21F48091D9018B7F0BC0873F61
-:103E300021F48091D901877F05C0883F31F48091BA
-:103E4000D9018F7E8093D90113C08D3F21F48091D9
-:103E5000D7018E7F0BC08E3F21F48091D7018D7FDB
-:103E600005C08F3F29F48091D7018B7F8093D701C4
-:103E70008091DA0181110EC08091DB0181110AC0AD
-:103E80008091DC01811106C08091DD01811102C0A9
-:103E90001092D801089589ED91E00E94360F0E949A
-:103EA000B51B9093D6018093D50108951F93CF93AE
-:103EB000DF938091D5019091D6010E94C11B409162
-:103EC000D801442321F02091140130E006C0209154
-:103ED00015015AE0259F900111248217930708F4D9
-:103EE00082C08091DA011091DB01D091DC01C09198
-:103EF000DD01811107C0111105C0D11103C0CC2310
-:103F000009F471C04F3F19F04F5F4093D801181664
-:103F100024F40E94DD1D8093DA018091DA0187FF8D
-:103F200005C00E94DD1D81958093DA01111624F4ED
-:103F30000E94DD1D8093DB018091DB0187FF05C0BE
-:103F40000E94DD1D81958093DB016091DA0166237B
-:103F500039F11091DB01112319F1772767FD709575
-:103F6000872F972F0E94B82223E333E343E35FE3D5
-:103F70000E941C230E9485226093DA01612F77271B
-:103F800067FD7095872F972F0E94B82223E333E3B4
-:103F900043E35FE30E941C230E9485226093DB01C0
-:103FA0001D1624F40E94251E8093DC018091DC0103
-:103FB00087FF05C00E94251E81958093DC011C1699
-:103FC00024F40E94251E8093DD018091DD0187FF8E
-:103FD00005C00E94251E81958093DD01DF91CF9160
-:103FE0001F910C944B1FDF91CF911F910895E9ED24
-:103FF000F1E085E0DF011D928A95E9F71092D80182
-:104000001092D7010895833081F128F4813059F05E
-:104010008230D1F00895853009F449C0B8F1863076
-:1040200009F456C0089520911501862F90E0820F63
-:10403000911D8F3F910520F4620F60931501089543
-:104040008FEF80931501089520911401862F90E041
-:10405000820F911D8F3F910520F4620F6093140130
-:1040600008958FEF80931401089520911301862FF6
-:1040700090E0820F911D8F3F910520F4620F6093B5
-:10408000130108958FEF8093130108952091120179
-:10409000862F90E0820F911D8F3F910520F4620FD3
-:1040A0006093120108958FEF80931201089520917B
-:1040B0001101862F90E0820F911D8F3F910520F412
-:1040C000620F6093110108958FEF8093110108959D
-:1040D00020911001862F90E0820F911D8F3F910556
-:1040E00020F4620F6093100108958FEF8093100108
-:1040F0000895833011F128F4813049F0823091F035
-:104100000895853081F120F18630C1F108958091C4
-:104110001501681720F4861B8093150108951092ED
-:104120001501089580911401681720F4861B80936F
-:1041300014010895109214010895809113016817D5
-:1041400020F4861B809313010895109213010895A3
-:1041500080911201681720F4861B80931201089544
-:1041600010921201089580911101681720F4861BA6
-:10417000809311010895109211010895809110010A
-:10418000681720F4861B8093100108951092100187
-:1041900008958D3109F442C020F58E3009F477C0BE
-:1041A00070F4873009F459C018F48630F1F134C046
-:1041B000883009F4A8C08B3009F4A5C02DC0863121
-:1041C00009F4A1C038F4803109F472C0813109F4D6
-:1041D00079C022C0893109F496C08B3109F44DC0F1
-:1041E0001BC0853309F487C048F4873209F483C0C3
-:1041F00008F473C0893209F47EC00EC0833438F4E9
-:104200008A3308F068C0883309F47DC005C0833460
-:1042100009F471C0883499F080E008950E943F222B
-:104220000E941F0F0E9424086EC08091CF01817FE1
-:104230008E7F8093CF0181E08093DF0108950E94FB
-:10424000A2142FEF83ED90E3215080409040E1F7DE
-:1042500000C000000E940F1C56C09091CF01892F12
-:104260008095817080FB90F919F0966098601DC070
-:10427000997F977F9093CF0146C09091CF0191FB9A
-:10428000882780F921E0822780FB91F909C090916D
-:10429000CF0192FB882780F921E0822780FB92F9E9
-:1042A0009093CF01882379F191609093CF01089585
-:1042B0009091CF0193FB882780F921E0822780FB32
-:1042C00093F9EECF0E94A21480910D0191E089270D
-:1042D00080930D0118C027EC01C023EE280F61E088
-:1042E00070E080E090E004C0660F771F881F991F80
-:1042F0002A95D2F704C061E070E080E090E00E946F
-:104300009E180E94A21481E0089580E0089580E044
-:104310000895CF93C82F8091DF01813079F018F094
-:104320008230D1F184C0A0910E01B0910F018C9127
-:10433000813169F0823209F07CC009C0A0910E0180
-:10434000B0910F018C91813111F0823249F48C2FA0
-:104350000E94852181111DC08C2F0E94C9201AC086
-:104360008C2F0E948721811114C0C43179F048F448
-:10437000CB3079F0C03109F060C082E08093DF017A
-:1043800008C0C93219F0C83321F057C01092DF01BC
-:1043900054C081E0817053C0C93289F118F5C4312D
-:1043A00071F1A8F4C73009F046C08AE08093150186
-:1043B00094E19093140193E0909313018093120180
-:1043C00088E08093110188E28093100134C0CE51BF
-:1043D000C63088F5EC2FF0E0E65DFE4F80818093DB
-:1043E000DE0129C0CE34E9F020F4CB3421F56AE0B7
-:1043F00013C0C13579F0C235F1F461E00DC0809190
-:10440000DE01882319F01092DE0115C081E080934F
-:10441000DF0115C061E006C08091DE010E9403202B
-:104420000AC06AE08091DE010E94792004C01092E7
-:10443000DF0180E004C081E002C080E0ABCFCF911B
-:104440000895E1E8F0E08081886080838081816068
-:1044500080838FB7F89493E09093890090ED9093C8
-:1044600088008FBF0895EFE6F0E08081826080834E
-:104470000895EFE6F0E080818D7F80830895EFE678
-:10448000F0E0808192E08927808308951F920F9247
-:104490000FB60F9211242F933F934F935F936F9317
-:1044A0007F938F939F93AF93BF93EF93FF938091ED
-:1044B000E0019091E10101969093E1018093E00188
-:1044C000811103C082E00E942408E091E101E69599
-:1044D000E695F0E0E657FB4FE4918091E0018E1302
-:1044E00003C080E00E942408FF91EF91BF91AF913B
-:1044F0009F918F917F916F915F914F913F912F91FC
-:104500000F900FBE0F901F90189504D06894B111B2
-:104510008DC0089570D088F09F5790F0B92F9927DB
-:10452000B751A0F0D1F0660F771F881F991F1AF0BE
-:10453000BA95C9F712C0B13081F077D0B1E00895D3
-:1045400074C0672F782F8827B85F39F0B93FCCF354
-:10455000869577956795B395D9F73EF490958095B4
-:10456000709561957F4F8F4F9F4F0895E89409C0D4
-:1045700097FB3EF490958095709561957F4F8F4F96
-:104580009F4F9923A9F0F92F96E9BB279395F695AC
-:10459000879577956795B795F111F8CFFAF4BB0F2A
-:1045A00011F460FF1BC06F5F7F4F8F4F9F4F16C08E
-:1045B000882311F096E911C0772321F09EE8872F18
-:1045C000762F05C0662371F096E8862F70E060E0D4
-:1045D0002AF09A95660F771F881FDAF7880F96954D
-:1045E000879597F9089557FD9058440F551F59F036
-:1045F0005F3F71F04795880F97FB991F61F09F3FD0
-:1046000079F087950895121613061406551FF2CFF8
-:104610004695F1DF08C0161617061806991FF1CF48
-:1046200086957105610508940895E894BB2766276F
-:104630007727CB0197F908950BD078C069D028F07F
-:104640006ED018F0952309F05AC05FC01124EECF48
-:10465000CADFA0F3959FD1F3950F50E0551F629FDD
-:10466000F001729FBB27F00DB11D639FAA27F00DCB
-:10467000B11DAA1F649F6627B00DA11D661F829FF2
-:104680002227B00DA11D621F739FB00DA11D621FD7
-:10469000839FA00D611D221F749F3327A00D611DF4
-:1046A000231F849F600D211D822F762F6A2F1124D6
-:1046B0009F5750408AF0E1F088234AF0EE0FFF1F29
-:1046C000BB1F661F771F881F91505040A9F79E3F60
-:1046D000510570F014C0AACF5F3FECF3983EDCF3B5
-:1046E000869577956795B795F795E7959F5FC1F79D
-:1046F000FE2B880F911D9695879597F9089597F948
-:104700009F6780E870E060E008959FEF80EC089577
-:1047100000240A94161617061806090608950024A0
-:104720000A9412161306140605060895092E03941A
-:10473000000C11F4882352F0BB0F40F4BF2B11F48E
-:1047400060FF04C06F5F7F4F8F4F9F4F089597FBAF
-:10475000072E16F4009407D077FD09D00E94C123DC
-:1047600007FC05D03EF4909581959F4F0895709574
-:1047700061957F4F0895EE0FFF1F0590F491E02D96
-:104780000994AA1BBB1B51E107C0AA1FBB1FA61798
-:10479000B70710F0A61BB70B881F991F5A95A9F7EA
-:1047A00080959095BC01CD010895F999FECF92BDF9
-:1047B00081BDF89A992780B50895A8E1B0E042E05C
-:1047C00050E00C94FD23262FF999FECF92BD81BDB8
-:1047D000F89A019700B4021639F01FBA20BD0FB63F
-:1047E000F894FA9AF99A0FBE08950196272F0E941D
-:1047F000E4230C94E323DC01CB01FC01F999FECF07
-:1048000006C0F2BDE1BDF89A319600B40D92415058
-:0A4810005040B8F70895F894FFCF68
-:10481A0020022608B30890085C0829080101BC0197
-:10482A0028080A03140A3F4D36394B04FE03C8030D
-:10483A008F0322033B0354036D030102030405069D
-:04484A000708090052
+:1011E00070E0CE010E948A0A8091E8008E77809399
+:1011F000E80080E1FE01A2E5B1E001900D928A9540
+:10120000E1F7DF91CF9108958091E701811109C045
+:101210000E941C0C0E94790C8091E20084608093F3
+:10122000E20008951092E7010895089508950C943E
+:10123000D01B42E061EC81E00E94960B42E061EC41
+:1012400082E00E94960B42E061EC83E00E94960BE4
+:1012500042E161EC84E00C94960B8091EA018330CA
+:1012600009F455C030F4813071F0823009F48EC039
+:1012700008958A3009F47AC08B3009F460C089304F
+:1012800009F09CC020C08091E901813A09F096C024
+:101290008091E800877F8093E8008091ED01909134
+:1012A000EE01892B21F060E080E090E003C060E176
+:1012B00082E591E070E00E94D30A8091E8008B778C
+:1012C0008093E80008958091E901813209F076C0A9
+:1012D0008091ED019091EE01009719F0039709F0CC
+:1012E0006DC08091E800877F8093E8008091E800DE
+:1012F00082FD05C08091E8018111F8CF5FC0809127
+:10130000F100809362018091E8008B7753C0809157
+:10131000E901813A09F052C08091ED019091EE010E
+:10132000892B09F04BC08091E800877F8093E8000B
+:101330008091E80080FFFCCF80910C0136C0809145
+:10134000E9018132D9F58091ED019091EE01892B6F
+:10135000A9F58091E800877F8093E8000E94CB0B7D
+:101360008091EB0180930C010C9419148091E90198
+:10137000813221F58091E800877F8093E8000E9408
+:10138000CB0B8091EC018093630108958091E9017A
+:10139000813AA1F48091E800877F8093E8008091F2
+:1013A000E80080FFFCCF809163018093F100809181
+:1013B000E8008E778093E8000C94CB0B089584B7F7
+:1013C000877F84BF88E10FB6F89480936000109205
+:1013D00060000FBE90E080E80FB6F8948093610043
+:1013E000909361000FBE0E94650F0E941C0C0E942A
+:1013F000790C8091E20084608093E20078940E94EE
+:10140000F40E0E94670F82E091E00E94110F80911C
+:10141000E801853069F40E94901B8091E6018823E1
+:10142000B1F30E94BB1B882391F30E94740AEFCF93
+:101430000E946D0FECCF292F332723303105A9F0FF
+:101440006CF42130310509F442C02230310509F035
+:1014500043C08DE690E02EE333E042C021323105F7
+:10146000C9F02232310519F137C099278130910531
+:1014700041F08230910541F0892B71F5EAE3F3E008
+:1014800005C0E2E2F3E002C0EAE0F3E0849190E01C
+:101490009F0126C0643000F5E62FF0E0EE0FFF1F3D
+:1014A000EE5DFE4F2081318189E090E019C064300B
+:1014B00098F4E62FF0E0DF01AA0FBB1FA65EBE4F37
+:1014C0002D913C91EA5EFE4F808190E009C082E15F
+:1014D00090E02BEA33E004C080E090E020E030E0D0
+:1014E000FA0131832083089580E189BD82E189BDBD
+:1014F00009B400FEFDCF8091D8008F7D8093D80085
+:101500008091E00082608093E0008091E00081FDA6
+:10151000FCCF0895CF92DF92EF92FF920F931F932B
+:10152000CF93DF937C018B01EA010E94EC0B8111C8
+:1015300031C0209731F088819981081B190BE80E82
+:10154000F91EC12CD12C0115110519F18091E8006B
+:1015500085FD14C08091E8008E778093E800209785
+:1015600041F0888199818C0D9D1D9983888385E048
+:1015700011C00E94EC0B882331F30CC0F70181915C
+:101580007F018093F10001501109FFEFCF1ADF0AAC
+:10159000DACF80E0DF91CF911F910F91FF90EF9014
+:1015A000DF90CF9008952091EF013091F001261740
+:1015B000370748F06115710539F42091E8002E775E
+:1015C0002093E80001C0B901FC0120E0611571051C
+:1015D000B9F18091E801882309F440C0853009F40D
+:1015E0003FC08091E80083FD3DC08091E80082FF0C
+:1015F00006C08091E80082FF26C080E008958091B7
+:10160000E80080FFE3CF2091F3008091F20090E0AA
+:10161000922B6115710551F08830910538F42191B4
+:101620002093F100615071090196F3CF21E00897F2
+:1016300009F020E08091E8008E778093E800C6CF23
+:101640002111C7CFD6CF8091E801882339F08530AA
+:1016500039F08091E80083FFCCCF04C082E0089588
+:1016600083E0089581E008952091EF013091F00129
+:101670002617370748F06115710539F42091E80005
+:101680002E772093E80001C0B901FC0120E061152C
+:101690007105C1F18091E801882309F441C08530CA
+:1016A00009F440C08091E80083FD3EC08091E800CD
+:1016B00082FF06C08091E80082FF27C080E0089585
+:1016C0008091E80080FFE3CF2091F3008091F20049
+:1016D00090E0922B6115710559F08830910540F426
+:1016E00024912093F1003196615071090196F2CF57
+:1016F00021E0089709F020E08091E8008E77809340
+:10170000E800C5CF2111C6CFD5CF8091E80188234D
+:1017100039F0853039F08091E80083FFCBCF04C0E9
+:1017200082E0089583E0089581E00895982F97302E
+:1017300058F59093E900981739F07091EC002091DA
+:10174000ED005091F00003C0242F762F50E021FFD0
+:1017500019C03091EB003E7F3093EB003091ED00EB
+:101760003D7F3093ED003091EB0031603093EB0022
+:101770007093EC002093ED005093F0002091EE0068
+:1017800027FF07C09F5FD3CF8F708093E90081E070
+:10179000089580E008958091E90187FD05C080915A
+:1017A000E80080FF0EC012C08091E80082FD05C0F5
+:1017B0008091E8018111F8CF08958091E8008B773E
+:1017C00008C08091E8018111EACF08958091E80076
+:1017D0008E778093E80008958091E4009091E50071
+:1017E00045E62091EC0020FF21C02091E80020FD7B
+:1017F00021C02091E801222389F0253089F0209131
+:10180000EB0025FD0FC02091E4003091E500281782
+:10181000390739F3415041F0C901E3CF82E008951F
+:1018200083E0089581E0089584E008952091E80020
+:1018300022FFDFCF80E008950E948A0C0E94920C64
+:10184000E0EEF0E0808181608083E8EDF0E080816F
+:101850008F77808319BCA7EDB0E08C918E7F8C933D
+:1018600080818F7E80831092E70108950F931F93EC
+:10187000CF93DF930E948A0C0E94920CC8EDD0E0B7
+:1018800088818F77888388818068888388818F7D2D
+:10189000888319BC1092E8011092E4011092E601CD
+:1018A0001092E50100EE10E0F80180818B7F8083CB
+:1018B00088818160888342E060E080E00E94960B2E
+:1018C000E1EEF0E080818E7F8083E2EEF0E08081C7
+:1018D00081608083808188608083F80180818E7F31
+:1018E0008083888180618883DF91CF911F910F91E0
+:1018F0000895E8EDF0E080818F7E8083E7EDF0E0F1
+:1019000080818160808384E082BF81E08093E701F1
+:101910000C94360CE8EDF0E080818E7F808310928D
+:10192000E20008951092DA001092E10008951F92EB
+:101930000F920FB60F9211242F933F934F935F9303
+:101940006F937F938F939F93AF93BF93EF93FF9387
+:101950008091E10082FF0BC08091E20082FF07C00E
+:101960008091E1008B7F8093E1000E94F30E8091D3
+:10197000DA0080FF1FC08091D80080FF1BC08091DB
+:10198000DA008E7F8093DA008091D90080FF0DC04D
+:1019900080E189BD82E189BD09B400FEFDCF81E00F
+:1019A0008093E8010E94040905C019BC1092E80167
+:1019B0000E9412098091E10080FF19C08091E2002D
+:1019C00080FF15C08091E2008E7F8093E2008091BD
+:1019D000E20080618093E2008091D8008062809371
+:1019E000D80019BC85E08093E8010E941609809117
+:1019F000E10084FF30C08091E20084FF2CC080E1D0
+:101A000089BD82E189BD09B400FEFDCF8091D80077
+:101A10008F7D8093D8008091E1008F7E8093E100DC
+:101A20008091E2008F7E8093E2008091E2008160ED
+:101A30008093E2008091E401882311F084E007C0E4
+:101A40008091E30087FF02C083E001C081E08093C2
+:101A5000E8010E9417098091E10083FF29C080916D
+:101A6000E20083FF25C08091E100877F8093E10041
+:101A700082E08093E8011092E4018091E1008E7F82
+:101A80008093E1008091E2008E7F8093E20080915C
+:101A9000E20080618093E20042E060E080E00E942A
+:101AA000960B8091F00088608093F0000E941509E9
+:101AB000FF91EF91BF91AF919F918F917F916F9126
+:101AC0005F914F913F912F910F900FBE0F901F90FC
+:101AD00018951F920F920FB60F9211242F933F93D8
+:101AE0004F935F936F937F938F939F93AF93BF9326
+:101AF000CF93EF93FF93C091E900CF708091EC00FA
+:101B00001092E9008091F000877F8093F000789434
+:101B10000E94A50D1092E9008091F00088608093EA
+:101B2000F000C093E900FF91EF91CF91BF91AF9189
+:101B30009F918F917F916F915F914F913F912F91E5
+:101B40000F900FBE0F901F9018951F93CF93DF93A8
+:101B5000CDB7DEB7AA970FB6F894DEBF0FBECDBFE4
+:101B6000E9EEF1E08091F100819321E0E13FF2079D
+:101B7000C9F70E942D098091E80083FF1CC12091C4
+:101B8000E9013091EA01832F90E08A30910508F055
+:101B900012C1FC01EA5AFF4F0C94A323203881F0B4
+:101BA000223809F008C18091ED018F708093E9001F
+:101BB0008091EB0085FB882780F91092E90006C030
+:101BC0008091E5019091E601911182609091E80089
+:101BD000977F9093E8008093F1001092F100C5C0C8
+:101BE000822F8D7F09F0E7C0222319F0223061F0A7
+:101BF000E2C08091EB01813009F0DDC0333009F0A3
+:101C000080E08093E60128C08091EB01811124C01F
+:101C10002091ED012F7009F4CEC02093E90080914E
+:101C2000EB0080FF19C08091EB00333011F480622B
+:101C300011C080618093EB0081E090E0022E01C032
+:101C4000880F0A94EAF78093EA001092EA008091E4
+:101C5000EB0088608093EB001092E9008091E8002F
+:101C6000877F86C02111A7C01091EB011F7780915B
+:101C7000E3008078812B8093E3008091E800877FE8
+:101C80008093E8000E94CB0B8091E80080FFFCCF9E
+:101C90008091E30080688093E300112311F083E0DA
+:101CA00001C082E08093E80186C02058223008F00D
+:101CB00082C08091EB019091EC018C3D23E0920772
+:101CC00079F583E08A838AE289834FB7F894DE014D
+:101CD000139620E03EE051E2E32FF0E050935700EE
+:101CE000E49120FF03C0E295EF703F5FEF708E2F0D
+:101CF00090E0EA3010F0C79601C0C0968D939D9396
+:101D00002F5F243149F74FBF8091E800877F809390
+:101D1000E8006AE270E0CE0101960E94D30A14C086
+:101D2000AE014F5F5F4F6091ED010E941B0A00976B
+:101D300009F441C02091E800277F2093E800BC010E
+:101D400089819A810E94340B8091E8008B7780937F
+:101D5000E80031C0203879F58091E800877F8093D2
+:101D6000E8008091E4018093F1008091E8008E7793
+:101D70008093E8000E94CB0B1EC021111CC09091E3
+:101D8000EB019230C0F48091E800877F8093E800F7
+:101D90009093E4010E94CB0B8091E401811104C077
+:101DA0008091E30087FF02C084E001C081E080935E
+:101DB000E8010E9419098091E80083FF0AC0809120
+:101DC000E800877F8093E8008091EB008062809339
+:101DD000EB00AA960FB6F894DEBF0FBECDBFDF9121
+:101DE000CF911F9108950895CF938091E8018823A2
+:101DF000B1F08091E9008F709091EC0090FF02C0EB
+:101E000090E801C090E0C92FC82B1092E9008091A2
+:101E1000E80083FD0E94A50DCF70C093E900CF912B
+:101E2000089590936901809368010895E091680195
+:101E3000F0916901309721F00190F081E02D099433
+:101E400080E00895E0916801F0916901309721F0F8
+:101E50000280F381E02D09940895E0916801F091EA
+:101E60006901309721F00480F581E02D09940895EF
+:101E700020916601309167018217930771F090936A
+:101E8000670180936601E0916801F09169013097E4
+:101E900021F00680F781E02D0994089520916401D6
+:101EA000309165018217930771F0909365018093DB
+:101EB0006401E0916801F0916901309721F000849C
+:101EC000F185E02D0994089508950C94640F0E9403
+:101ED000FF1B0E9430040C94C51CCF92DF92EF923E
+:101EE000FF920F931F93CF93DF93CDB7DEB72B975E
+:101EF0000FB6F894DEBF0FBECDBF0E9448043BE68C
+:101F0000E32E31E0F32E00E010E0C02E802F0E947F
+:101F10003505F701D1907F01D826B1F40F5F1F4F2F
+:101F20000E30110591F78FEF89838A831B820E94FF
+:101F3000081C8160782F9D838C8349815A816B8135
+:101F40008D810E94101041C09091D30191FF04C077
+:101F50008B870E943B058B8520E030E04D2D50E0C3
+:101F6000922FBA01022E02C0759567950A94E2F786
+:101F700060FF25C02E83CF82EE24E394F12C02C0B3
+:101F8000EE0CFF1C9A95E2F790E08E219F2121E054
+:101F9000892B09F420E028870E94081C8160782F93
+:101FA0009A8789874E815F8168858A850E94101093
+:101FB000F801E559FE4F80818E25808306C02F5F92
+:101FC0003F4F2630310561F6A9CF0E94A91F10911D
+:101FD0006A010E94160F1817A1F00E94160F809335
+:101FE0006A012B960FB6F894DEBF0FBECDBFDF910E
+:101FF000CF911F910F91FF90EF90DF90CF900C94B5
+:1020000024082B960FB6F894DEBF0FBECDBFDF912C
+:10201000CF911F910F91FF90EF90DF90CF90089597
+:10202000CF93DF93CDB7DEB72B970FB6F894DEBF13
+:102030000FBECDBF4F83588769877A878B87DE01B4
+:10204000119686E0FD0111928A95E9F785E0FE017F
+:10205000379601900D928A95E1F749815A816B81FB
+:102060007C818D819E810E94E9162B960FB6F89493
+:10207000DEBF0FBECDBFDF91CF9108950895CF93FE
+:10208000C82F882309F4C1C0823859F40E94160F62
+:1020900081FDBBC089E30E94301A0E94071B89E3BF
+:1020A0000CC0833879F40E94160F80FDAEC083E522
+:1020B0000E94301A0E94071B83E50E94701ACF917C
+:1020C0000C94071B843859F40E94160F82FD9DC0A2
+:1020D00087E40E94301A0E94071B87E4EECF8CEF42
+:1020E0008C0F813A48F48C2F0E94D52181118DC02C
+:1020F0008C2F0E94301AE3CF80E28C0F883048F496
+:10210000C77081E001C0880FCA95EAF70E94B41A2F
+:10211000D6CF8BE58C0F833078F4C53A29F0C63AD8
+:1021200031F482E890E005C081E890E002C083E8E5
+:1021300090E0CF910C94380F88E58C0F833108F034
+:1021400064C0C83A39F1C93A41F1CA3A49F1CB3AC7
+:1021500051F1CC3A59F1CD3A61F1C03B69F1CE3A37
+:1021600071F1CF3A79F1C13B81F1C23B89F1C33BB7
+:1021700091F1C43B99F1C53BA1F1C63BA9F1C73B25
+:10218000B1F1C83BB9F1C93BC1F1CA3BC9F58AE21B
+:1021900092E038C082EE90E035C089EE90E032C027
+:1021A0008AEE90E02FC085EB90E02CC086EB90E0AB
+:1021B00029C087EB90E026C08CEC90E023C08DEC2A
+:1021C00090E020C083E891E01DC08AE891E01AC049
+:1021D00082E991E017C084E991E014C081E292E0C5
+:1021E00011C083E292E00EC084E292E00BC085E26F
+:1021F00092E008C086E292E005C087E292E002C069
+:1022000080E090E0CF910C944E0FCF9108958823F9
+:1022100009F44BC0823859F40E94160F81FF45C063
+:1022200089E30E94301A0E94071B89E30CC083389F
+:1022300071F40E94160F80FF38C083E50E94301AA7
+:102240000E94071B83E50E94701A0C94071B8438B8
+:1022500059F40E94160F82FF28C087E40E94301AAA
+:102260000E94071B87E4EFCF9CEF980F913A58F339
+:1022700090E2980F983050F4877091E001C0990F68
+:102280008A95EAF7892F0E94BA1ADFCF9BE5980F4B
+:10229000933020F480E090E00C94380F885A83311A
+:1022A00020F480E090E00C944E0F0895882321F0F4
+:1022B0000E94B41A0C94071B0895882321F00E94F1
+:1022C000BA1A0C94071B08958F929F92AF92BF92F7
+:1022D000CF92DF92EF92FF920F931F93CF93DF93F2
+:1022E00000D000D01F92CDB7DEB77C0185E0F701AA
+:1022F000DE01119601900D928A95E1F7F701D080E9
+:1023000011810281B580B2942FE0B2222381348101
+:10231000232B39F01F3F39F481E0FFEFDF1203C0B8
+:1023200003C081E001C080E080FD5DC20E94CB1946
+:10233000882319F082E00E940E1AC7010E943E1005
+:10234000D9821A8369817A81802F0E949119182F6E
+:10235000C92E0E9445190E94181801110E94D11A15
+:102360000E94291A882379F0002369F080E2810F06
+:10237000883048F082E00E940E1A0E94291ADD245B
+:10238000D394D82601C0D12CEC2DE295EF70F0E06B
+:10239000E05AFF4F0C94A3238C2D807F9C2D9F70BF
+:1023A000B92E882319F0B29490EFB922002389F056
+:1023B000BB2009F4DAC180E2810F883020F48B2D34
+:1023C0000E94B41A03C08B2D0E94C41A0E94071BDE
+:1023D000CCC1812F0E940711BB2009F4E0C1105E1F
+:1023E0008B2D183018F40E94BA1A02C00E94CA1A23
+:1023F0000E94071BD4C18C2D807F9C2D9F70A92E1D
+:10240000803219F0A29480EFA822112319F0113024
+:1024100049F132C0002391F0BB2091F181E0B81264
+:1024200004C08A2D0E94E41ABAC192E0B91228C0F1
+:102430000E94ED1A8A2D0E94981922C0BB2079F0C3
+:10244000E1E0BE1208C00E94B11A8A2109F4A7C1B6
+:102450000E949B1904C0F2E0BF1609F4A0C10E94BB
+:10246000ED1A12C0002329F081E08B1508F497C102
+:1024700007C0B11094C108C0002321F0B11075C18C
+:102480008A2DEFC0B11078C18A2DF1C02C2D269570
+:102490002695237030E02115310521F021303105DA
+:1024A00061F07DC1002321F0812F9C2D937002C02B
+:1024B00080E090E00E94380F72C1002321F0812F4C
+:1024C0009C2D937002C080E090E00E944E0F67C187
+:1024D000812F002319F00E94B11E02C00E94191F13
+:1024E0000E949E1F5CC18C2D837009F04FC00111AA
+:1024F00056C1212F229526952770220F220F812F5A
+:102500008F70882E912CA12CB12C022E04C0880C27
+:10251000991CAA1CBB1C0A94D2F714FF10C06FE0D0
+:1025200070E080E090E004C0660F771F881F991F5D
+:102530002A95D2F7609570958095909503C060E0DC
+:1025400070E0CB012C2D269526952370422F50E06C
+:102550004230510569F04330510589F068297929E5
+:102560008A299B294130510571F00E943D1817C1FD
+:10257000682979298A299B290E94571810C10E942D
+:102580003D18C501B4010E94231809C1002319F0A8
+:102590008C2D817001C08695882309F400C1212FFC
+:1025A000229526952770220F220F812F8F70882E5B
+:1025B000912CA12CB12C022E04C0880C991CAA1CB1
+:1025C000BB1C0A94D2F714FF10C06FE070E080E0EB
+:1025D00090E004C0660F771F881F991F2A95D2F7D5
+:1025E000609570958095909503C060E070E0CB0198
+:1025F0002C2D269526952370422F50E04230510510
+:1026000069F04330510589F0682979298A299B2985
+:102610004130510571F00E941119C1C06829792912
+:102620008A299B290E942B19BAC00E941119C50141
+:10263000B4010E94F718B3C0412F50E0FA01E05EE8
+:10264000F109E531F10508F08BC0E059FF4F0C941A
+:10265000A3231F708C2D8F71002331F00E949018DE
+:10266000812F0E9456119BC00E94B118812F0E9499
+:102670005D1195C0002339F0B11091C08C2D8F7180
+:102680000E94D6188CC091E09B1508F488C0F6CF44
+:10269000002339F08C2D8F710E94901880C0002388
+:1026A000C9F38C2D8F710E94B11879C0002329F0D5
+:1026B0008C2D8F710E947B1872C00E9471186FC0A0
+:1026C0000023C9F00E9495190E94BA1A0E94C719E6
+:1026D000843029F40E94071A8C2D8F7171C0E1E0BB
+:1026E000EB1508F480C01C2D1F71812F0E949018DB
+:1026F00063E0812F0EC00E9495190E94B41AF1E088
+:10270000FB15D0F40E94071A0E949B1964E08C2DDF
+:102710008F710F900F900F900F900F90DF91CF91CE
+:102720001F910F91FF90EF90DF90CF90BF90AF90EF
+:102730009F908F900C94F71981E00F900F900F905D
+:102740000F900F90DF91CF911F910F91FF90EF901D
+:10275000DF90CF90BF90AF909F908F900C940E1A07
+:10276000002339F0BB2009F495CF812F0E943F1040
+:1027700016C0BB2009F495CF812F0E9407110FC00E
+:102780004C2D4F70612FC7010E94A2020E94961724
+:1027900006C04C2D4F70612FC7010E943C05DD2003
+:1027A00011F10E94C71980FD1EC0F70112820E941C
+:1027B000C1190E949018C7010E9464110E94C1199A
+:1027C0000F900F900F900F900F90DF91CF911F916E
+:1027D0000F91FF90EF90DF90CF90BF90AF909F90C0
+:1027E0008F900C94B1180F900F900F900F900F9046
+:1027F000DF91CF911F910F91FF90EF90DF90CF90DD
+:10280000BF90AF909F908F9008950E94D11A0E9420
+:10281000E11A0E94A31A0E94071B0E944A200E94EC
+:102820009E1F80E090E00E94380F80E090E00C94C2
+:102830004E0F0E94C11A0C9405140E948619292F6C
+:1028400022952F7030E02C3031054CF42A303105C0
+:102850006CF42250310922303105B0F407C02C301D
+:10286000310571F02F30310559F00EC0803F31F045
+:1028700018F4803E48F402C0843F31F481E00895AA
+:1028800093FB882780F9089580E00895CF93DF9324
+:1028900000D000D01F92CDB7DEB70F900F900F90F1
+:1028A0000F900F90DF91CF910895CF93DF9300D0D9
+:1028B00000D000D0CDB7DEB726960FB6F894DEBFB5
+:1028C0000FBECDBFDF91CF9108951F93CF93DF93BC
+:1028D000C091790116E080917A01C81799F0D0E093
+:1028E0001C9FF0011D9FF00D1124E558FE4F408103
+:1028F000518162817381848195810E945514219652
+:10290000C770E9CFDF91CF911F9108954091AB013E
+:102910005091AC016091AD017091AE018091AF0119
+:102920009091B0010C945514CF938091B001829591
+:102930008F7009F05FC08091AD01882309F45AC0FF
+:1029400020917901A0917A016091AB017091AC0165
+:102950008091AE019091AF0131E06F3F09F030E01E
+:10296000B32FC6E02A1709F445C0009721F07F3F36
+:1029700021F44B2F03C041E001C040E030E040FDB6
+:1029800035C0C29FF001C39FF00D1124E558FE4FE2
+:10299000418174132BC04081641328C042814111CE
+:1029A00025C0438154814817590710F441505109FB
+:1029B000481B590B483C5105C8F48091B0018F70F9
+:1029C00080618093B00186E0829FF001839FF00DCB
+:1029D0001124E058FE4F80818F70806180838BEAE4
+:1029E00091E00E946411CF910C9465142F5F3F4FCA
+:1029F0002770B8CFCF910895CF92DF92EF92FF92D8
+:102A00000F931F93CF93DF93CDB7DEB762970FB6C7
+:102A1000F894DEBF0FBECDBF8C0185E0F801DE016A
+:102A20001D9601900D928A95E1F7D8014C9111966F
+:102A30005C91119712966C9112971396ED90FC9001
+:102A400014977091AB01E091AC012091AE013091EF
+:102A5000AF012115310531F0EF3F31F481E07F3FC7
+:102A600019F403C081E001C080E0B82FB170CB2E13
+:102A700080FD6CC1D090AD01DD2009F4F5C0F0916E
+:102A8000B001E216F30638F0C701821B930B883CB5
+:102A9000910548F09BC0209530952E0D3F1D283C98
+:102AA000310508F093C08F2F807F09F052C0E513E5
+:102AB00014C0741312C0D62E61110FC0FF70F061E4
+:102AC000F093B0010E9486148BEA91E00E94641199
+:102AD0008091B001F80185836CC1EF2831F05F3F30
+:102AE00031F481E04F3F19F403C081E001C080E080
+:102AF00080FD03C081E0862701C080E0F82FF170DF
+:102B0000FF2E80FF1CC08091790120917A0136E070
+:102B1000821709F428C190E0389FF001399FF00D29
+:102B20001124E558FE4F7181571306C07081471379
+:102B300003C07281671303C001968770E9CFD62E58
+:102B4000662309F436C18091B00181608093B001A1
+:102B500053C0E51308C0741306C0611104C0D80146
+:102B60001596FC93AEC04D875E878D859E856A8BDA
+:102B70000E941D146A89882329F1D62E662311F13B
+:102B80002091B001822F82958F7090E002970CF413
+:102B900060C08091AB019091AC0198878F831986BA
+:102BA000FB86EA862C87CE01079651C0E51731F1E6
+:102BB0004D875E878D859E856A8B0E941D146A896C
+:102BC00081112EC0C8010E946411A4C08F2F807F84
+:102BD00069F77E2DF98AE88A89890E9446148BEA72
+:102BE00091E00E946411EBEAF1E086E0DF011D92C2
+:102BF0008A95E9F70E948614D12CDBC07413D8CFD4
+:102C00006111D6CFD8011596FC93C8010E946411BA
+:102C1000EBEAF1E086E0DF011D928A95E9F7C9C091
+:102C2000D62E662379F22091B001822F82958F7083
+:102C300090E0029774F08091AB019091AC019A837F
+:102C400089831B82FD82EC822E83CE0101960E9435
+:102C5000641186E0F801ABEAB1E001900D928A952B
+:102C6000E1F70E9494146FC0E216F30628F0C70142
+:102C7000821B930B9C0104C0209530952E0D3F1DA7
+:102C8000283C310508F052C0D62E662309F49ACFAD
+:102C9000E5132CC074132AC08091B00180FD1DC0C3
+:102CA000982F92959F70C9F0D80115968C9315971F
+:102CB0009F3039F09F5F9295907F8F70892B15968A
+:102CC0008C93C8010E94641186E0F801ABEAB1E080
+:102CD00001900D928A95E1F736C086E0F801ABEAE3
+:102CE000B1E001900D928A95E1F763C04D875E8750
+:102CF0008D859E850E941D14882379F086E0F80159
+:102D0000ABEAB1E001900D928A95E1F70E9494142C
+:102D10000E948614DD24D3944CC08091B001816060
+:102D20008093B001C8010E94641143C07E2DF98ACE
+:102D3000E88A89890E944614EBEAF1E086E0DF0127
+:102D40001D928A95E9F70E94861433C0662309F420
+:102D500039CF4D875E878D859E850E941D148823FF
+:102D600009F430CFCBCF4D875E878D859E850E943D
+:102D70008619292F22952F7030E0223031052CF44E
+:102D80009F7041F0811106C00CC0243031052CF435
+:102D90009F7049F4805E883020F0C8010E94641161
+:102DA000CF2CDC2C06C0D80115969C91907F91F712
+:102DB000F8CF8D2D62960FB6F894DEBF0FBECDBF53
+:102DC000DF91CF911F910F91FF90EF90DF90CF9007
+:102DD00008951F93CF93DF93CDB7DEB72C970FB62F
+:102DE000F894DEBF0FBECDBF4F83588769877A87BF
+:102DF0008B879C87CE0107960E94FC148823C1F024
+:102E00002F8138858A859B85892B31F03F3F11F0D2
+:102E100080E003C02F3FE1F781E0811147C04F817F
+:102E2000588569857A858B859C850E9455143EC09E
+:102E300086E0FE013796DE01119601900D928A958B
+:102E4000E1F7FF81E8854A855B854115510531F041
+:102E5000EF3F31F481E0FF3F19F403C081E001C08E
+:102E600080E080FD23C020917A0130E0C901019605
+:102E7000877099276091790170E086179707F1F1C3
+:102E8000F983EA835D834C8396E0929FD001939F00
+:102E9000B00D1124A558BE4FFE01319601900D9240
+:102EA0009A95E1F780937A010E94651416E080916B
+:102EB000790190917A01891779F1189FC001112445
+:102EC00085589E4F0E94FC14882331F1E0917901CE
+:102ED0001E9FF0011124E558FE4F4081518162810F
+:102EE0007381848195810E9455148091790190E0CD
+:102EF00001968770992780937901D9CF0E94191480
+:102F000010927A0110927901EBEAF1E086E0DF019C
+:102F10001D928A95E9F7CACF2C960FB6F894DEBFBA
+:102F20000FBECDBFDF91CF911F910895EF92FF9219
+:102F30000F931F93CF93DF939C01009709F471C007
+:102F4000F12CEE24E394E9012196F9018491843770
+:102F500040F4843008F056C0813081F0823021F195
+:102F600060C0853709F449C0C0F19CE7980F9037DD
+:102F700008F057C08F770E94071146C089010E5F85
+:102F80001F4FFE01849190E2980F983050F48770A3
+:102F9000FE2D01C0FF0F8A95EAF78F2F0E94D41AE9
+:102FA00015C00E943F1014C089010E5F1F4FFE0123
+:102FB000849190E2980F983068F48770FE2D01C0DC
+:102FC000FF0F8A95EAF78F2F0E94DA1A0E94071BDB
+:102FD000E8011AC00E940711FBCF2E5F3F4FFE0190
+:102FE000C491CC2341F08FE99FE00197F1F700C035
+:102FF0000000C150F6CFE90107C0FE01F490E901DD
+:10300000229602C00E943F108F2D882341F0EFE9E5
+:10301000FFE03197F1F700C000008150F6CF9E012C
+:1030200092CFDF91CF911F910F91FF90EF90089574
+:1030300008956093B5017093B6018093B7019093A2
+:10304000B8010C9405140F931F930091B5011091D2
+:10305000B6012091B7013091B801062B172B282B10
+:10306000392B0093B5011093B6012093B70130932B
+:10307000B8011F910F910C9405140F931F930091A9
+:10308000B5011091B6012091B7013091B801062326
+:103090001723282339230093B5011093B6012093F9
+:1030A000B7013093B8011F910F910C9405140F9341
+:1030B0001F930091B5011091B6012091B701309195
+:1030C000B80106271727282739270093B501109341
+:1030D000B6012093B7013093B8011F910F910C9462
+:1030E00005141092B1011092B2011092B301109226
+:1030F000B4010C94051441E050E060E070E004C0BD
+:10310000440F551F661F771F8A95D2F74093B10170
+:103110005093B2016093B3017093B4010C94051401
+:1031200041E050E060E070E004C0440F551F661FAE
+:10313000771F8A95D2F78091B1019091B201A09149
+:10314000B301B091B401842B952BA62BB72B8093A0
+:10315000B1019093B201A093B301B093B4010C9468
+:10316000051441E050E060E070E004C0440F551FDA
+:10317000661F771F8A95D2F7409550956095709598
+:103180008091B1019091B201A091B301B091B401CD
+:1031900084239523A623B7238093B1019093B20192
+:1031A000A093B301B093B4010C94051441E050E036
+:1031B00060E070E004C0440F551F661F771F8A95BA
+:1031C000D2F78091B1019091B201A091B301B09179
+:1031D000B40184279527A627B7278093B101909340
+:1031E000B201A093B301B093B4010C9405140F93F2
+:1031F0001F930091B1011091B2012091B301309160
+:10320000B401062B172B282B392B0093B1011093F7
+:10321000B2012093B3013093B4011F910F910C942C
+:1032200005140F931F930091B1011091B2012091E9
+:10323000B3013091B40106231723282339230093C7
+:10324000B1011093B2012093B3013093B4011F91E7
+:103250000F910C9405140F931F930091B1011091DD
+:10326000B2012091B3013091B40106271727282716
+:1032700039270093B1011093B2012093B301309329
+:10328000B4011F910F910C9405140895CF92DF9211
+:10329000EF92FF920F931F93CF93DF93EC01C090B7
+:1032A000B501D090B601E090B701F090B8018091DF
+:1032B000B1019091B201A091B301B091B401C82ABB
+:1032C000D92AEA2AFB2A0FE110E0B701A601002E55
+:1032D00004C076956795579547950A94D2F740FDB7
+:1032E00005C00150110988F780E007C0BE01802F9A
+:1032F0000E9489070197A9F3802FDF91CF911F9139
+:103300000F91FF90EF90DF90CF900895CF93DF93D0
+:10331000EC010E944619BE010E948907DF91CF91FE
+:103320000895CB010E94861908958091BE010895E9
+:103330008093BE0108951092BE0108950E94081C5A
+:103340002091BC013091BD018217930750F00E947B
+:10335000081C2091BC013091BD01821B930B9C0184
+:103360000AC00E94081C2091BC013091BD0120952B
+:103370003095280F391F81E0283B3B4008F480E05E
+:1033800008958091BB0185958595859508958091D7
+:10339000BB01877008950E94081C2091B9013091EB
+:1033A000BA018217930768F00E94081C2091B901A6
+:1033B0003091BA01821B930B883B9B4078F480E0EC
+:1033C00014C00E94081C2091B9013091BA012095C7
+:1033D0003095280F391F283B3B4088F38091BB0173
+:1033E00082FB882780F991E089278170089598E011
+:1033F000899F90011124622B6093BB010E94901859
+:103400000E94081C9093BA018093B901089510920C
+:10341000BB011092BA011092B90108954091BB010D
+:10342000809584238093BB01982F977089F450E096
+:10343000282F332727FD30954217530749F08595EC
+:10344000859585950E94B1181092BA011092B90124
+:1034500008959091BB01977081E009F480E0089590
+:1034600090910C019923D9F090910D019923B9F015
+:10347000982F9695969596959F3088F5E0910E0138
+:10348000F0910F01E90FF11D877021E030E001C0DC
+:10349000220F8A95EAF78181822B818308954091DA
+:1034A0000E0150910F0120E030E09FEFFA01E20F92
+:1034B000F31F6281681799F09F3F19F4611101C0F1
+:1034C000922F2F5F3F4F2E30310581F79F3F39F00C
+:1034D000FA01E90FF11D97FDFA9582830895089589
+:1034E00090910C019923E1F090910D019923C1F085
+:1034F000982F9695969596959F3020F5E0910E0120
+:10350000F0910F01E90FF11D877021E030E001C05B
+:10351000220F8A95EAF72095818128232183089537
+:1035200040910E0150910F0120E030E0FA01E20FCE
+:10353000F31F9281981301C012822F5F3F4F2E30EC
+:103540003105A1F7089581E090E0E0910E01F0913E
+:103550000F01E80FF91F1082019680319105A9F73C
+:1035600008958091D20108959091D201982B909363
+:10357000D201089580959091D20198239093D20121
+:1035800008951092D20108959091D101982B9093B3
+:10359000D101089580959091D10198239093D10104
+:1035A00008951092D10108959091D001982B909395
+:1035B000D001089580959091D00198239093D001E7
+:1035C00008951092D00108958093BF010E94081CB5
+:1035D0009093BD018093BC0108951092BF01109299
+:1035E000BD011092BC01089540910E0150910F0150
+:1035F00020E030E080E0FA01E20FF31F91819111A9
+:103600008F5F2F5F3F4F2F303105A9F70895E0916D
+:103610000E01F0910F018091D2018083E0910E01A3
+:10362000F0910F0180819091D101892B8083E091ED
+:103630000E01F0910F0180819091D001892B808340
+:103640008091BF01882399F00E949E1981110E94E8
+:10365000ED1AE0910E01F0910F0180819091BF0170
+:10366000892B80830E94F41A81110E94ED1A8091A7
+:103670000E0190910F010C94220FCF92DF92EF92E6
+:10368000FF920F931F936C01EE24FF24C114D10409
+:10369000E104F10421F46B017C0180E001C080E1D0
+:1036A00033272F2D1E2D0D2D011511052105310557
+:1036B00019F0885F6801790197018601A4E03695C9
+:1036C000279517950795AA95D1F70115110521059D
+:1036D000310519F08C5F6801790197018601F2E0EC
+:1036E0003695279517950795FA95D1F70115110588
+:1036F0002105310519F08E5F68017901B701A60136
+:103700007695679557954795452B462B472B09F09E
+:103710008F5F1F910F91FF90EF90DF90CF900895F2
+:103720008091E801843021F11092D40120E488E1F5
+:1037300090E00FB6F894A895809360000FBE209398
+:10374000600080E00E94240883B7817F846083BF8B
+:1037500083B7816083BF7894889583B78E7F83BF5A
+:1037600088E10FB6F89480936000109260000FBE5D
+:10377000089508950895CF930E94B91B0E944804AC
+:103780000E94BA1BC0E08C2F0E943505811105C034
+:10379000CF5FCE30C1F780E001C081E0CF910895C6
+:1037A0000E9419140E94160F0C9424081F920F9265
+:1037B0000FB60F9211248F939F93AF93BF93809175
+:1037C000D401811113C08091D5019091D601A091AF
+:1037D000D701B091D8014196A11DB11D8093D501AB
+:1037E0009093D601A093D701B093D801BF91AF9128
+:1037F0009F918F910F900FBE0F901F90189582E0B0
+:1038000084BD93E095BD9AEF97BD80936E000895B7
+:103810002FB7F8948091D5019091D601A091D7014E
+:10382000B091D8012FBF0895CF92DF92EF92FF920F
+:103830000F931F932FB7F8944091D5015091D60163
+:103840006091D7017091D8012FBF6A017B01EE24EE
+:10385000FF248C0120E030E0C016D106E206F3061A
+:1038600010F441505109481B590BCA011F910F9187
+:10387000FF90EF90DF90CF9008951F920F920FB6B8
+:103880000F9211248F939F93AF93BF938091D50193
+:103890009091D601A091D701B091D8010196A11DB8
+:1038A000B11D8093D5019093D601A093D701B09319
+:1038B000D801BF91AF919F918F910F900FBE0F9044
+:1038C0001F9018950E941C0CF8942FEF87EA91E640
+:1038D000215080409040E1F700C0000087E090EB6D
+:1038E000DC018093F2019093F301A093F401B09373
+:1038F000F5012CE088E190E00FB6F894A89580934C
+:1039000060000FBE20936000FFCFEF92FF920F93F5
+:103910001F93CF93DF93E82EF12C8F2D0E94350556
+:10392000C0E0D0E0082F10E098010C2E02C03595C1
+:1039300027950A94E2F720FD05C02196C630D105EF
+:1039400099F709C06C2F7F2D80E00E943D05E81299
+:10395000F4CF81E005C0F3948EE0F812DECF80E072
+:10396000DF91CF911F910F91FF90EF900895CF932A
+:10397000C82F8CE20E94851C882321F08C2FCF91C8
+:103980000C94851C80E0CF910895CF930E940A1E6D
+:10399000811102C00E94F01DC5E6C15049F00E948D
+:1039A00048048FE39CE90197F1F700C00000F5CFD0
+:1039B00089E20E94B71C811111C18AE20E94B71CE2
+:1039C00081110E94F01D85E00E94B71C81110E94A8
+:1039D000621C0E94151E8093D30187E00E94B71CD1
+:1039E000882399F18BE10E94B71C882351F09091B4
+:1039F000D30191FB882780F921E0822780FB91F990
+:103A000022C08EE00E94B71C882351F09091D30110
+:103A100092FB882780F921E0822780FB92F913C06E
+:103A200080E10E94B71C9091D301882341F093FB61
+:103A3000882780F921E0822780FB93F904C0892F31
+:103A4000809580FB90F99093D3018091D3010E94DF
+:103A5000191E0E94271E8093F10180EE0E94B71C60
+:103A6000882341F08091F101982F909590FB80F987
+:103A70008093F10189E30E94B71C882359F090914B
+:103A8000F10191FB882780F921E0822780FB91F9E1
+:103A90009093F10182EE0E94B71C882359F0909117
+:103AA000F10192FB882780F921E0822780FB92F9BF
+:103AB0009093F10186EE0E94B71C882359F09091F3
+:103AC000F10193FB882780F921E0822780FB93F99D
+:103AD0009093F10183EE0E94B71C882359F09091D6
+:103AE000F10194FB882780F921E0822780FB94F97B
+:103AF0009093F10185E30E94B71C882359F09091BF
+:103B0000F10195FB882780F921E0822780FB95F958
+:103B10009093F10181E30E94B71C882359F09091A2
+:103B2000F10196FB882780F921E0822780FB96F936
+:103B30009093F10181E10E94B71C882359F0909184
+:103B4000F10197FB882780F921E0822780FB97F914
+:103B50009093F1018091F1010E942B1E8091F1015F
+:103B600087FB882780F980930D0187E20E94B71CAC
+:103B7000C82F8EE10E94B71C8111C2608FE10E94A4
+:103B8000B71C8111C46080E20E94B71C8111C8601B
+:103B900081E20E94B71C8111C06182E20E94B71CC1
+:103BA0008111C06283E20E94B71C8111C06484E26B
+:103BB0000E94B71C882311F0C06802C0CC2329F0F2
+:103BC0008C2F0E94221E6C2F03C00E941E1E682F85
+:103BD00070E080E090E0CF910C941918CF91089597
+:103BE0006DEE7EEF80E090E00E94DD2360E082E0F9
+:103BF00090E00E94CB2360E083E090E00E94CB2322
+:103C000060E084E090E00E94CB2360E085E090E0FB
+:103C10000C94CB2380E090E00E94C52321E08D3EF0
+:103C20009E4F09F020E0822F089582E090E00C94EE
+:103C3000BD23682F82E090E00C94CB2383E090E0DA
+:103C40000C94BD23682F83E090E00C94CB2384E098
+:103C500090E00C94BD23682F84E090E00C94CB237B
+:103C60008091DB0180FF0BC06091130185E0689FAC
+:103C7000B001112475956795759567952AC081FFE8
+:103C800009C06091130185E0689FB001112475950A
+:103C900067951FC082FF07C06091130185E0689F90
+:103CA000B001112416C04091DC014423C9F0609199
+:103CB0001201461788F72091130185E0289F900193
+:103CC0001124429FC001439F900D112470E00E9477
+:103CD0008F236038710540F46115710539F002C019
+:103CE00065E070E0862F08958FE7089581E00895DC
+:103CF0008091DB0180FF08C06091110170E0759533
+:103D000067957595679521C081FF06C06091110187
+:103D100070E07595679519C082FF04C0609111012C
+:103D200070E010C08091DC018823C1F06091100127
+:103D30008617A0F790911101989FC001112470E09F
+:103D40000E948F236038710528F46115710521F0F8
+:103D5000862F08958FE7089581E0089561E070E06F
+:103D6000F4CF803F21F40E94301E819504C0813F32
+:103D700029F40E94301E8093DF010895823F21F4D0
+:103D80000E94301E819504C0833F29F40E94301E9A
+:103D90008093DE010895893F19F40E94781E05C0C2
+:103DA0008A3F31F40E94781E81958093E001089546
+:103DB0008B3F21F40E94781E819504C08C3F29F42A
+:103DC0000E94781E8093E1010895843F21F4809140
+:103DD000DD01816017C0853F21F48091DD018260A3
+:103DE00011C0863F21F48091DD0184600BC0873FC4
+:103DF00021F48091DD01886005C0883F31F4809115
+:103E0000DD0180618093DD0108958D3F21F4809173
+:103E1000DB0181600BC08E3F21F48091DB01826069
+:103E200005C08F3F29F48091DB0184608093DB0122
+:103E30000895803F39F48091DF0187FF6CC01092B4
+:103E4000DF0169C0813F29F48091DF011816BCF3BE
+:103E500062C09091DE01823F29F497FF5CC010920E
+:103E6000DE0159C0833F19F41916CCF354C0893FC1
+:103E700041F48091E00118160CF04DC01092E00161
+:103E80004AC08A3F29F48091E00187FF44C0F6CF01
+:103E90008B3F39F48091E10187FF3DC01092E10131
+:103EA0003AC08C3F29F48091E1011816BCF333C06D
+:103EB000843F21F48091DD018E7F17C0853F21F47E
+:103EC0008091DD018D7F11C0863F21F48091DD015D
+:103ED0008B7F0BC0873F21F48091DD01877F05C078
+:103EE000883F31F48091DD018F7E8093DD0113C026
+:103EF0008D3F21F48091DB018E7F0BC08E3F21F43A
+:103F00008091DB018D7F05C08F3F29F48091DB011B
+:103F10008B7F8093DB018091DE0181110EC0809147
+:103F2000DF0181110AC08091E001811106C08091FA
+:103F3000E101811102C01092DC0108958DED91E044
+:103F40000E942D0F0E94081C9093DA018093D901E2
+:103F500008951F93CF93DF938091D9019091DA0157
+:103F60000E94141C4091DC01442321F02091140193
+:103F700030E006C0209115015AE0259F90011124E0
+:103F80008217930708F482C08091DE011091DF014F
+:103F9000D091E001C091E101811107C0111105C06C
+:103FA000D11103C0CC2309F471C04F3F19F04F5F0A
+:103FB0004093DC01181624F40E94301E8093DE0129
+:103FC0008091DE0187FF05C00E94301E819580939D
+:103FD000DE01111624F40E94301E8093DF018091CF
+:103FE000DF0187FF05C00E94301E81958093DF01AD
+:103FF0006091DE01662339F11091DF01112319F17F
+:10400000772767FD7095872F972F0E94A02223E3C3
+:1040100033E343E35FE30E9404230E946D22609335
+:10402000DE01612F772767FD7095872F972F0E94FC
+:10403000A02223E333E343E35FE30E9404230E94CF
+:104040006D226093DF011D1624F40E94781E809378
+:10405000E0018091E00187FF05C00E94781E8195F4
+:104060008093E0011C1624F40E94781E8093E101E5
+:104070008091E10187FF05C00E94781E81958093A1
+:10408000E101DF91CF911F910C949E1FDF91CF91A1
+:104090001F910895EDEDF1E085E0DF011D928A9515
+:1040A000E9F71092DC011092DB010895833081F171
+:1040B00028F4813059F08230D1F00895853009F428
+:1040C00049C0B8F1863009F456C008952091150111
+:1040D000862F90E0820F911D8F3F910520F4620F93
+:1040E0006093150108958FEF809315010895209135
+:1040F0001401862F90E0820F911D8F3F910520F4CF
+:10410000620F6093140108958FEF80931401089556
+:1041100020911301862F90E0820F911D8F3F910512
+:1041200020F4620F6093130108958FEF80931301C1
+:10413000089520911201862F90E0820F911D8F3FEC
+:10414000910520F4620F6093120108958FEF809320
+:104150001201089520911101862F90E0820F911D88
+:104160008F3F910520F4620F6093110108958FEF46
+:1041700080931101089520911001862F90E0820F05
+:10418000911D8F3F910520F4620F609310010895F7
+:104190008FEF809310010895833011F128F481305E
+:1041A00049F0823091F00895853081F120F1863018
+:1041B000C1F1089580911501681720F4861B809342
+:1041C0001501089510921501089580911401681742
+:1041D00020F4861B80931401089510921401089511
+:1041E00080911301681720F4861B809313010895B2
+:1041F00010921301089580911201681720F4861B14
+:104200008093120108951092120108958091110176
+:10421000681720F4861B80931101089510921101F4
+:10422000089580911001681720F4861B8093100177
+:1042300008951092100108958B3109F46AC008F5B1
+:104240008E3009F470C070F4873009F452C018F44D
+:104250008630B9F134C0883009F4A1C08B3009F43C
+:104260009EC02DC0813109F479C020F4803109F459
+:1042700064C025C0863109F492C0893109F48FC029
+:104280001EC0853309F483C060F4873209F47FC00F
+:1042900020F48E3108F06DC012C0893209F477C065
+:1042A0000EC0833438F48A3308F061C0883309F4CF
+:1042B00076C005C0833409F46AC0883461F080E0B8
+:1042C00008958091D301817F8E7F8093D30181E017
+:1042D0008093E30108950E9419142FEF83ED90E37A
+:1042E000215080409040E1F700C000000E94621C15
+:1042F00056C09091D301892F8095817080FB90F9F1
+:1043000019F09660986027C0997F977F9093D301AA
+:1043100046C09091D30191FB882780F921E0822744
+:1043200080FB91F913C09091D30192FB882780F90B
+:1043300021E0822780FB92F909C09091D30193FB81
+:10434000882780F921E0822780FB93F99093D3019D
+:10435000882329F191609093D30108950E94191444
+:1043600080910D0191E0892780930D0118C027EC01
+:1043700001C023EE280F61E070E080E090E004C00F
+:10438000660F771F881F991F2A95D2F704C061E036
+:1043900070E080E090E00E9419180E94191481E0FA
+:1043A000089580E0089580E00895CF93C82F80910C
+:1043B000E301813079F018F08230D1F184C0A0910E
+:1043C0000E01B0910F018C91813169F0823209F0B8
+:1043D0007CC009C0A0910E01B0910F018C91813178
+:1043E00011F0823249F48C2F0E94D12181111DC01D
+:1043F0008C2F0E941C211AC08C2F0E94D321811166
+:1044000014C0C43179F048F4CB3079F0C03109F0F0
+:1044100060C082E08093E30108C0C93219F0C8335C
+:1044200021F057C01092E30154C081E0817053C065
+:10443000C93289F118F5C43171F1A8F4C73009F017
+:1044400046C08AE08093150194E19093140193E0B3
+:10445000909313018093120188E08093110188E208
+:104460008093100134C0CE51C63088F5EC2FF0E0B7
+:10447000E65DFE4F80818093E20129C0CE34E9F0F1
+:1044800020F4CB3421F56AE013C0C13579F0C23590
+:10449000F1F461E00DC08091E201882319F01092DF
+:1044A000E20115C081E08093E30115C061E006C020
+:1044B0008091E2010E9456200AC06AE08091E201E8
+:1044C0000E94CC2004C01092E30180E004C081E08F
+:1044D00002C080E0ABCFCF91089504D06894B111B1
+:1044E0008DC0089570D088F09F5790F0B92F99270C
+:1044F000B751A0F0D1F0660F771F881F991F1AF0EF
+:10450000BA95C9F712C0B13081F077D0B1E0089503
+:1045100074C0672F782F8827B85F39F0B93FCCF384
+:10452000869577956795B395D9F73EF490958095E4
+:10453000709561957F4F8F4F9F4F0895E89409C004
+:1045400097FB3EF490958095709561957F4F8F4FC6
+:104550009F4F9923A9F0F92F96E9BB279395F695DC
+:10456000879577956795B795F111F8CFFAF4BB0F5A
+:1045700011F460FF1BC06F5F7F4F8F4F9F4F16C0BE
+:10458000882311F096E911C0772321F09EE8872F48
+:10459000762F05C0662371F096E8862F70E060E004
+:1045A0002AF09A95660F771F881FDAF7880F96957D
+:1045B000879597F9089557FD9058440F551F59F066
+:1045C0005F3F71F04795880F97FB991F61F09F3F00
+:1045D00079F087950895121613061406551FF2CF29
+:1045E0004695F1DF08C0161617061806991FF1CF79
+:1045F00086957105610508940895E894BB276627A0
+:104600007727CB0197F908950BD078C069D028F0AF
+:104610006ED018F0952309F05AC05FC01124EECF78
+:10462000CADFA0F3959FD1F3950F50E0551F629F0D
+:10463000F001729FBB27F00DB11D639FAA27F00DFB
+:10464000B11DAA1F649F6627B00DA11D661F829F22
+:104650002227B00DA11D621F739FB00DA11D621F07
+:10466000839FA00D611D221F749F3327A00D611D24
+:10467000231F849F600D211D822F762F6A2F112406
+:104680009F5750408AF0E1F088234AF0EE0FFF1F59
+:10469000BB1F661F771F881F91505040A9F79E3F90
+:1046A000510570F014C0AACF5F3FECF3983EDCF3E5
+:1046B000869577956795B795F795E7959F5FC1F7CD
+:1046C000FE2B880F911D9695879597F9089597F978
+:1046D0009F6780E870E060E008959FEF80EC0895A8
+:1046E00000240A94161617061806090608950024D1
+:1046F0000A9412161306140605060895092E03944B
+:10470000000C11F4882352F0BB0F40F4BF2B11F4BE
+:1047100060FF04C06F5F7F4F8F4F9F4F089597FBDF
+:10472000072E16F4009407D077FD09D00E94A92324
+:1047300007FC05D03EF4909581959F4F08957095A4
+:1047400061957F4F0895EE0FFF1F0590F491E02DC6
+:104750000994AA1BBB1B51E107C0AA1FBB1FA617C8
+:10476000B70710F0A61BB70B881F991F5A95A9F71A
+:1047700080959095BC01CD010895F999FECF92BD29
+:1047800081BDF89A992780B50895A8E1B0E042E08C
+:1047900050E00C94E523262FF999FECF92BD81BD00
+:1047A000F89A019700B4021639F01FBA20BD0FB66F
+:1047B000F894FA9AF99A0FBE08950196272F0E944D
+:1047C000CC230C94CB23DC01CB01FC01F999FECF67
+:1047D00006C0F2BDE1BDF89A319600B40D92415089
+:0A47E0005040B8F70895F894FFCF99
+:1047EA0020022608B30890085C0829080101C001C4
+:1047FA0028080A03140A3F4D363979042C04F603B3
+:10480A00BD035003690382039B03010203040506E7
+:04481A000708090082
:00000001FF
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c b/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c
index bf5a974bfe..f257dbee36 100644
--- a/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c
@@ -140,7 +140,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
const uint16_t PROGMEM fn_actions[] = {
- [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols)
+ [1] = ACTION_LAYER_TAP_TOGGLE(SYMB), // FN1 - Momentary Layer 1 (Symbols)
+ [2] = ACTION_MACRO_TAP(0), // Eric Tang's Famous Macro!
+ [3] = ACTION_MACRO_TAP(1) // Eric Tang's Famous Macro!
};
static uint16_t key_timer;
@@ -148,33 +150,46 @@ static uint16_t key_timer;
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
{
switch(id) {
- case 0: {
- if (record->event.pressed) {
- key_timer = timer_read(); // if the key is being pressed, we start the timer.
- register_code(KC_LSFT); // we're now holding down Shift.
- } else { // this means the key was just released, so we can figure out how long it was pressed for (tap or "held down").
- if (timer_elapsed(key_timer) < 70) { // the threshhold we pick for counting something as a tap.
- register_code(KC_9); // sending 9 while Shift is held down gives us an opening paren
- unregister_code(KC_9); // now let's let go of that key
- }
- unregister_code(KC_LSFT); // let's release the Shift key now.
- }
- break;
- }
- case 1: {
- if (record->event.pressed) {
- key_timer = timer_read(); // Now we're doing the same thing, only for the right shift/close paren key
- register_code(KC_RSFT);
- } else {
- if (timer_elapsed(key_timer) < 70) {
- register_code(KC_0);
- unregister_code(KC_0);
- }
- unregister_code(KC_RSFT);
- }
- break;
+ case 0:
+ if (record->event.pressed) {
+ register_mods(MOD_BIT(KC_LSFT));
+ if (record->tap.count && !record->tap.interrupted) {
+ register_code(KC_9);
+ }
+ else {
+ record->tap.count = 0;
+ }
+ }
+ else {
+ if (record->tap.count) {
+ unregister_code(KC_9);
+ }
+ else {
+ }
+ unregister_mods(MOD_BIT(KC_LSFT));
+ }
+ break;
+
+ case 1:
+ if (record->event.pressed) {
+ register_mods(MOD_BIT(KC_LSFT));
+ if (record->tap.count && !record->tap.interrupted) {
+ register_code(KC_0);
+ }
+ else {
+ record->tap.count = 0;
+ }
+ }
+ else {
+ if (record->tap.count) {
+ unregister_code(KC_0);
+ }
+ else {
+ }
+ unregister_mods(MOD_BIT(KC_LSFT));
+ }
+ break;
}
- }
return MACRO_NONE;
};
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk b/keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk
new file mode 100644
index 0000000000..4c3a314ed6
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk
@@ -0,0 +1,5 @@
+# Having a file like this allows you to override Makefile definitions
+# for your own particular keymap
+
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+
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) {
diff --git a/keyboard/planck/keymaps/pvc/config.h b/keyboard/planck/keymaps/pvc/config.h
index 7d64f09773..d435cc795c 100644
--- a/keyboard/planck/keymaps/pvc/config.h
+++ b/keyboard/planck/keymaps/pvc/config.h
@@ -73,7 +73,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* disable debug print */
-//#define NO_DEBUG
+#define NO_DEBUG
/* disable print */
//#define NO_PRINT
diff --git a/keyboard/planck/keymaps/pvc/keymap.c b/keyboard/planck/keymaps/pvc/keymap.c
index 27850b2154..830b00a4c4 100644
--- a/keyboard/planck/keymaps/pvc/keymap.c
+++ b/keyboard/planck/keymaps/pvc/keymap.c
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[LAYER_QWERTY] = { /* QWERTY */
{ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC },
- { KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT },
+ { KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT },
{ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT },
{ KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC, KC_SPC, M_LOWER, KC_UP, KC_DOWN, KC_LEFT, KC_RGHT },
},
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[LAYER_COLEMAK] = { /* COLEMAK */
{ KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_ESC },
- { KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT },
+ { KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT },
{ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT },
{ KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC, KC_SPC, M_LOWER, KC_UP, KC_DOWN, KC_LEFT, KC_RGHT },
},
diff --git a/keyboard/planck/keymaps/pvc/makefile.mk b/keyboard/planck/keymaps/pvc/makefile.mk
index 4b9e34c53f..b3f1b9e51c 100644
--- a/keyboard/planck/keymaps/pvc/makefile.mk
+++ b/keyboard/planck/keymaps/pvc/makefile.mk
@@ -4,6 +4,7 @@ EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = yes # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
@@ -13,4 +14,4 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-CONFIG_H = keymaps/$(KEYMAP)/config.h
+CONFIG_H = keymaps/$(KEYMAP)/config.h \ No newline at end of file
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c
index e85370d958..3a7f0f5567 100644
--- a/quantum/audio/audio.c
+++ b/quantum/audio/audio.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
-#include <math.h>
+//#include <math.h>
#include <avr/pgmspace.h>
#include <avr/interrupt.h>
#include <avr/io.h>
@@ -10,30 +10,28 @@
#include "eeconfig.h"
-#ifdef VIBRATO_ENABLE
- #include "vibrato_lut.h"
-#endif
+#define CPU_PRESCALER 8
-#define PI 3.14159265
+// -----------------------------------------------------------------------------
+// Timer Abstractions
+// -----------------------------------------------------------------------------
-#define CPU_PRESCALER 8
+// TIMSK3 - Timer/Counter #3 Interrupt Mask Register
+// Turn on/off 3A interputs, stopping/enabling the ISR calls
+#define ENABLE_AUDIO_COUNTER_3_ISR TIMSK3 |= _BV(OCIE3A)
+#define DISABLE_AUDIO_COUNTER_3_ISR TIMSK3 &= ~_BV(OCIE3A)
-#ifdef PWM_AUDIO
- #include "wave.h"
- #define SAMPLE_DIVIDER 39
- #define SAMPLE_RATE (2000000.0/SAMPLE_DIVIDER/2048)
- // Resistor value of 1/ (2 * PI * 10nF * (2000000 hertz / SAMPLE_DIVIDER / 10)) for 10nF cap
+// TCCR3A: Timer/Counter #3 Control Register
+// Compare Output Mode (COM3An) = 0b00 = Normal port operation, OC3A disconnected from PC6
+#define ENABLE_AUDIO_COUNTER_3_OUTPUT TCCR3A |= _BV(COM3A1);
+#define DISABLE_AUDIO_COUNTER_3_OUTPUT TCCR3A &= ~(_BV(COM3A1) | _BV(COM3A0));
- float places[8] = {0, 0, 0, 0, 0, 0, 0, 0};
- uint16_t place_int = 0;
- bool repeat = true;
-#endif
+// Fast PWM Mode Controls
+#define TIMER_3_PERIOD ICR3
+#define TIMER_3_DUTY_CYCLE OCR3A
+
+// -----------------------------------------------------------------------------
-void delay_us(int count) {
- while(count--) {
- _delay_us(1);
- }
-}
int voices = 0;
int voice_place = 0;
@@ -45,26 +43,23 @@ float frequencies[8] = {0, 0, 0, 0, 0, 0, 0, 0};
int volumes[8] = {0, 0, 0, 0, 0, 0, 0, 0};
bool sliding = false;
-int max = 0xFF;
-float sum = 0;
float place = 0;
uint8_t * sample;
uint16_t sample_length = 0;
-// float freq = 0;
-
-bool notes = false;
-bool note = false;
-float note_frequency = 0;
-float note_length = 0;
-float note_tempo = TEMPO_DEFAULT;
-float note_timbre = TIMBRE_DEFAULT;
+
+bool playing_notes = false;
+bool playing_note = false;
+float note_frequency = 0;
+float note_length = 0;
+uint8_t note_tempo = TEMPO_DEFAULT;
+float note_timbre = TIMBRE_DEFAULT;
uint16_t note_position = 0;
float (* notes_pointer)[][2];
uint16_t notes_count;
-bool notes_repeat;
-float notes_rest;
-bool note_resting = false;
+bool notes_repeat;
+float notes_rest;
+bool note_resting = false;
uint8_t current_note = 0;
uint8_t rest_counter = 0;
@@ -77,175 +72,65 @@ float vibrato_rate = 0.125;
float polyphony_rate = 0;
-bool inited = false;
+static bool audio_initialized = false;
audio_config_t audio_config;
uint16_t envelope_index = 0;
-void audio_toggle(void) {
- audio_config.enable ^= 1;
- eeconfig_update_audio(audio_config.raw);
-}
-
-void audio_on(void) {
- audio_config.enable = 1;
- eeconfig_update_audio(audio_config.raw);
-}
-
-void audio_off(void) {
- audio_config.enable = 0;
- eeconfig_update_audio(audio_config.raw);
-}
-
-#ifdef VIBRATO_ENABLE
-// Vibrato rate functions
-
-void set_vibrato_rate(float rate) {
- vibrato_rate = rate;
-}
-
-void increase_vibrato_rate(float change) {
- vibrato_rate *= change;
-}
-
-void decrease_vibrato_rate(float change) {
- vibrato_rate /= change;
-}
-
-#ifdef VIBRATO_STRENGTH_ENABLE
-
-void set_vibrato_strength(float strength) {
- vibrato_strength = strength;
-}
-
-void increase_vibrato_strength(float change) {
- vibrato_strength *= change;
-}
-
-void decrease_vibrato_strength(float change) {
- vibrato_strength /= change;
-}
-
-#endif
-
-#endif
-
-// Polyphony functions
-
-void set_polyphony_rate(float rate) {
- polyphony_rate = rate;
-}
-
-void enable_polyphony() {
- polyphony_rate = 5;
-}
-
-void disable_polyphony() {
- polyphony_rate = 0;
-}
-
-void increase_polyphony_rate(float change) {
- polyphony_rate *= change;
-}
-
-void decrease_polyphony_rate(float change) {
- polyphony_rate /= change;
-}
-
-// Timbre function
-
-void set_timbre(float timbre) {
- note_timbre = timbre;
-}
-
-// Tempo functions
-
-void set_tempo(float tempo) {
- note_tempo = tempo;
-}
-
-void decrease_tempo(uint8_t tempo_change) {
- note_tempo += (float) tempo_change;
-}
-
-void increase_tempo(uint8_t tempo_change) {
- if (note_tempo - (float) tempo_change < 10) {
- note_tempo = 10;
- } else {
- note_tempo -= (float) tempo_change;
- }
-}
-
-void audio_init() {
+void audio_init()
+{
- /* check signature */
- if (!eeconfig_is_enabled()) {
+ // Check EEPROM
+ if (!eeconfig_is_enabled())
+ {
eeconfig_init();
}
audio_config.raw = eeconfig_read_audio();
- #ifdef PWM_AUDIO
- PLLFRQ = _BV(PDIV2);
- PLLCSR = _BV(PLLE);
- while(!(PLLCSR & _BV(PLOCK)));
- PLLFRQ |= _BV(PLLTM0); /* PCK 48MHz */
+ // Set port PC6 (OC3A and /OC4A) as output
+ DDRC |= _BV(PORTC6);
- /* Init a fast PWM on Timer4 */
- TCCR4A = _BV(COM4A0) | _BV(PWM4A); /* Clear OC4A on Compare Match */
- TCCR4B = _BV(CS40); /* No prescaling => f = PCK/256 = 187500Hz */
- OCR4A = 0;
+ DISABLE_AUDIO_COUNTER_3_ISR;
- /* Enable the OC4A output */
- DDRC |= _BV(PORTC6);
+ // TCCR3A / TCCR3B: Timer/Counter #3 Control Registers
+ // Compare Output Mode (COM3An) = 0b00 = Normal port operation, OC3A disconnected from PC6
+ // Waveform Generation Mode (WGM3n) = 0b1110 = Fast PWM Mode 14 (Period = ICR3, Duty Cycle = OCR3A)
+ // Clock Select (CS3n) = 0b010 = Clock / 8
+ TCCR3A = (0 << COM3A1) | (0 << COM3A0) | (1 << WGM31) | (0 << WGM30);
+ TCCR3B = (1 << WGM33) | (1 << WGM32) | (0 << CS32) | (1 << CS31) | (0 << CS30);
- TIMSK3 &= ~_BV(OCIE3A); // Turn off 3A interputs
-
- TCCR3A = 0x0; // Options not needed
- TCCR3B = _BV(CS31) | _BV(CS30) | _BV(WGM32); // 64th prescaling and CTC
- OCR3A = SAMPLE_DIVIDER - 1; // Correct count/compare, related to sample playback
- #else
- DDRC |= _BV(PORTC6);
-
- TIMSK3 &= ~_BV(OCIE3A); // Turn off 3A interputs
-
- TCCR3A = (0 << COM3A1) | (0 << COM3A0) | (1 << WGM31) | (0 << WGM30);
- TCCR3B = (1 << WGM33) | (1 << WGM32) | (0 << CS32) | (1 << CS31) | (0 << CS30);
- #endif
-
- inited = true;
+ audio_initialized = true;
}
-void stop_all_notes() {
- if (!inited) {
+void stop_all_notes()
+{
+ if (!audio_initialized) {
audio_init();
}
voices = 0;
- #ifdef PWM_AUDIO
- TIMSK3 &= ~_BV(OCIE3A);
- #else
- TIMSK3 &= ~_BV(OCIE3A);
- TCCR3A &= ~_BV(COM3A1);
- #endif
- notes = false;
- note = false;
+
+ DISABLE_AUDIO_COUNTER_3_ISR;
+ DISABLE_AUDIO_COUNTER_3_OUTPUT;
+
+ playing_notes = false;
+ playing_note = false;
frequency = 0;
volume = 0;
- for (int i = 0; i < 8; i++) {
+ for (uint8_t i = 0; i < 8; i++)
+ {
frequencies[i] = 0;
volumes[i] = 0;
}
}
-void stop_note(float freq) {
- if (note) {
- if (!inited) {
+void stop_note(float freq)
+{
+ if (playing_note) {
+ if (!audio_initialized) {
audio_init();
}
- #ifdef PWM_AUDIO
- freq = freq / SAMPLE_RATE;
- #endif
for (int i = 7; i >= 0; i--) {
if (frequencies[i] == freq) {
frequencies[i] = 0;
@@ -266,15 +151,11 @@ void stop_note(float freq) {
voice_place = 0;
}
if (voices == 0) {
- #ifdef PWM_AUDIO
- TIMSK3 &= ~_BV(OCIE3A);
- #else
- TIMSK3 &= ~_BV(OCIE3A);
- TCCR3A &= ~_BV(COM3A1);
- #endif
+ DISABLE_AUDIO_COUNTER_3_ISR;
+ DISABLE_AUDIO_COUNTER_3_OUTPUT;
frequency = 0;
volume = 0;
- note = false;
+ playing_note = false;
}
}
}
@@ -289,9 +170,9 @@ float mod(float a, int b)
float vibrato(float average_freq) {
#ifdef VIBRATO_STRENGTH_ENABLE
- float vibrated_freq = average_freq * pow(VIBRATO_LUT[(int)vibrato_counter], vibrato_strength);
+ float vibrated_freq = average_freq * pow(vibrato_lut[(int)vibrato_counter], vibrato_strength);
#else
- float vibrated_freq = average_freq * VIBRATO_LUT[(int)vibrato_counter];
+ float vibrated_freq = average_freq * vibrato_lut[(int)vibrato_counter];
#endif
vibrato_counter = mod((vibrato_counter + vibrato_rate * (1.0 + 440.0/average_freq)), VIBRATO_LUT_LENGTH);
return vibrated_freq;
@@ -299,295 +180,295 @@ float vibrato(float average_freq) {
#endif
-ISR(TIMER3_COMPA_vect) {
- if (note) {
- #ifdef PWM_AUDIO
- if (voices == 1) {
- // SINE
- OCR4A = pgm_read_byte(&sinewave[(uint16_t)place]) >> 2;
-
- // SQUARE
- // if (((int)place) >= 1024){
- // OCR4A = 0xFF >> 2;
- // } else {
- // OCR4A = 0x00;
- // }
-
- // SAWTOOTH
- // OCR4A = (int)place / 4;
-
- // TRIANGLE
- // if (((int)place) >= 1024) {
- // OCR4A = (int)place / 2;
- // } else {
- // OCR4A = 2048 - (int)place / 2;
- // }
-
- place += frequency;
-
- if (place >= SINE_LENGTH)
- place -= SINE_LENGTH;
-
- } else {
- int sum = 0;
- for (int i = 0; i < voices; i++) {
- // SINE
- sum += pgm_read_byte(&sinewave[(uint16_t)places[i]]) >> 2;
-
- // SQUARE
- // if (((int)places[i]) >= 1024){
- // sum += 0xFF >> 2;
- // } else {
- // sum += 0x00;
- // }
-
- places[i] += frequencies[i];
-
- if (places[i] >= SINE_LENGTH)
- places[i] -= SINE_LENGTH;
- }
- OCR4A = sum;
- }
- #else
- if (voices > 0) {
- float freq;
- if (polyphony_rate > 0) {
- if (voices > 1) {
- voice_place %= voices;
- if (place++ > (frequencies[voice_place] / polyphony_rate / CPU_PRESCALER)) {
- voice_place = (voice_place + 1) % voices;
- place = 0.0;
- }
- }
- #ifdef VIBRATO_ENABLE
- if (vibrato_strength > 0) {
- freq = vibrato(frequencies[voice_place]);
- } else {
- #else
- {
- #endif
- freq = frequencies[voice_place];
- }
- } else {
- if (frequency != 0 && frequency < frequencies[voices - 1] && frequency < frequencies[voices - 1] * pow(2, -440/frequencies[voices - 1]/12/2)) {
- frequency = frequency * pow(2, 440/frequency/12/2);
- } else if (frequency != 0 && frequency > frequencies[voices - 1] && frequency > frequencies[voices - 1] * pow(2, 440/frequencies[voices - 1]/12/2)) {
- frequency = frequency * pow(2, -440/frequency/12/2);
- } else {
- frequency = frequencies[voices - 1];
- }
-
-
- #ifdef VIBRATO_ENABLE
- if (vibrato_strength > 0) {
- freq = vibrato(frequency);
- } else {
- #else
- {
- #endif
- freq = frequency;
- }
- }
+ISR(TIMER3_COMPA_vect)
+{
+ float freq;
+
+ if (playing_note) {
+ if (voices > 0) {
+ if (polyphony_rate > 0) {
+ if (voices > 1) {
+ voice_place %= voices;
+ if (place++ > (frequencies[voice_place] / polyphony_rate / CPU_PRESCALER)) {
+ voice_place = (voice_place + 1) % voices;
+ place = 0.0;
+ }
+ }
+
+ #ifdef VIBRATO_ENABLE
+ if (vibrato_strength > 0) {
+ freq = vibrato(frequencies[voice_place]);
+ } else {
+ freq = frequencies[voice_place];
+ }
+ #else
+ freq = frequencies[voice_place];
+ #endif
+ } else {
+ if (frequency != 0 && frequency < frequencies[voices - 1] && frequency < frequencies[voices - 1] * pow(2, -440/frequencies[voices - 1]/12/2)) {
+ frequency = frequency * pow(2, 440/frequency/12/2);
+ } else if (frequency != 0 && frequency > frequencies[voices - 1] && frequency > frequencies[voices - 1] * pow(2, 440/frequencies[voices - 1]/12/2)) {
+ frequency = frequency * pow(2, -440/frequency/12/2);
+ } else {
+ frequency = frequencies[voices - 1];
+ }
+
+ #ifdef VIBRATO_ENABLE
+ if (vibrato_strength > 0) {
+ freq = vibrato(frequency);
+ } else {
+ freq = frequency;
+ }
+ #else
+ freq = frequency;
+ #endif
+ }
+
+ if (envelope_index < 65535) {
+ envelope_index++;
+ }
+
+ freq = voice_envelope(freq);
+
+ if (freq < 30.517578125) {
+ freq = 30.52;
+ }
+
+ TIMER_3_PERIOD = (uint16_t)(((float)F_CPU) / (freq * CPU_PRESCALER));
+ TIMER_3_DUTY_CYCLE = (uint16_t)((((float)F_CPU) / (freq * CPU_PRESCALER)) * note_timbre);
+ }
+ }
+
+ if (playing_notes) {
+ if (note_frequency > 0) {
+ #ifdef VIBRATO_ENABLE
+ if (vibrato_strength > 0) {
+ freq = vibrato(note_frequency);
+ } else {
+ freq = note_frequency;
+ }
+ #else
+ freq = note_frequency;
+ #endif
+
+ if (envelope_index < 65535) {
+ envelope_index++;
+ }
+ freq = voice_envelope(freq);
+
+ TIMER_3_PERIOD = (uint16_t)(((float)F_CPU) / (freq * CPU_PRESCALER));
+ TIMER_3_DUTY_CYCLE = (uint16_t)((((float)F_CPU) / (freq * CPU_PRESCALER)) * note_timbre);
+ } else {
+ TIMER_3_PERIOD = 0;
+ TIMER_3_DUTY_CYCLE = 0;
+ }
+
+ note_position++;
+ bool end_of_note = false;
+ if (TIMER_3_PERIOD > 0) {
+ end_of_note = (note_position >= (note_length / TIMER_3_PERIOD * 0xFFFF));
+ } else {
+ end_of_note = (note_position >= (note_length * 0x7FF));
+ }
+
+ if (end_of_note) {
+ current_note++;
+ if (current_note >= notes_count) {
+ if (notes_repeat) {
+ current_note = 0;
+ } else {
+ DISABLE_AUDIO_COUNTER_3_ISR;
+ DISABLE_AUDIO_COUNTER_3_OUTPUT;
+ playing_notes = false;
+ return;
+ }
+ }
+ if (!note_resting && (notes_rest > 0)) {
+ note_resting = true;
+ note_frequency = 0;
+ note_length = notes_rest;
+ current_note--;
+ } else {
+ note_resting = false;
+ envelope_index = 0;
+ note_frequency = (*notes_pointer)[current_note][0];
+ note_length = ((*notes_pointer)[current_note][1] / 4) * (((float)note_tempo) / 100);
+ }
+
+ note_position = 0;
+ }
+ }
+
+ if (!audio_config.enable) {
+ playing_notes = false;
+ playing_note = false;
+ }
+}
- if (envelope_index < 65535) {
- envelope_index++;
- }
- freq = voice_envelope(freq);
+void play_note(float freq, int vol) {
- if (freq < 30.517578125)
- freq = 30.52;
- ICR3 = (int)(((double)F_CPU) / (freq * CPU_PRESCALER)); // Set max to the period
- OCR3A = (int)((((double)F_CPU) / (freq * CPU_PRESCALER)) * note_timbre); // Set compare to half the period
- }
- #endif
+ if (!audio_initialized) {
+ audio_init();
}
- // SAMPLE
- // OCR4A = pgm_read_byte(&sample[(uint16_t)place_int]);
-
- // place_int++;
-
- // if (place_int >= sample_length)
- // if (repeat)
- // place_int -= sample_length;
- // else
- // TIMSK3 &= ~_BV(OCIE3A);
-
-
- if (notes) {
- #ifdef PWM_AUDIO
- OCR4A = pgm_read_byte(&sinewave[(uint16_t)place]) >> 0;
-
- place += note_frequency;
- if (place >= SINE_LENGTH)
- place -= SINE_LENGTH;
- #else
- if (note_frequency > 0) {
- float freq;
-
- #ifdef VIBRATO_ENABLE
- if (vibrato_strength > 0) {
- freq = vibrato(note_frequency);
- } else {
- #else
- {
- #endif
- freq = note_frequency;
- }
+ if (audio_config.enable && voices < 8) {
+ DISABLE_AUDIO_COUNTER_3_ISR;
- if (envelope_index < 65535) {
- envelope_index++;
- }
- freq = voice_envelope(freq);
+ // Cancel notes if notes are playing
+ if (playing_notes)
+ stop_all_notes();
- ICR3 = (int)(((double)F_CPU) / (freq * CPU_PRESCALER)); // Set max to the period
- OCR3A = (int)((((double)F_CPU) / (freq * CPU_PRESCALER)) * note_timbre); // Set compare to half the period
- } else {
- ICR3 = 0;
- OCR3A = 0;
- }
- #endif
-
-
- note_position++;
- bool end_of_note = false;
- if (ICR3 > 0)
- end_of_note = (note_position >= (note_length / ICR3 * 0xFFFF));
- else
- end_of_note = (note_position >= (note_length * 0x7FF));
- if (end_of_note) {
- current_note++;
- if (current_note >= notes_count) {
- if (notes_repeat) {
- current_note = 0;
- } else {
- #ifdef PWM_AUDIO
- TIMSK3 &= ~_BV(OCIE3A);
- #else
- TIMSK3 &= ~_BV(OCIE3A);
- TCCR3A &= ~_BV(COM3A1);
- #endif
- notes = false;
- return;
- }
- }
- if (!note_resting && (notes_rest > 0)) {
- note_resting = true;
- note_frequency = 0;
- note_length = notes_rest;
- current_note--;
- } else {
- note_resting = false;
- #ifdef PWM_AUDIO
- note_frequency = (*notes_pointer)[current_note][0] / SAMPLE_RATE;
- note_length = (*notes_pointer)[current_note][1] * (note_tempo / 100);
- #else
- envelope_index = 0;
- note_frequency = (*notes_pointer)[current_note][0];
- note_length = ((*notes_pointer)[current_note][1] / 4) * (note_tempo / 100);
- #endif
- }
- note_position = 0;
- }
+ playing_note = true;
- }
+ envelope_index = 0;
+
+ if (freq > 0) {
+ frequencies[voices] = freq;
+ volumes[voices] = vol;
+ voices++;
+ }
+
+ ENABLE_AUDIO_COUNTER_3_ISR;
+ ENABLE_AUDIO_COUNTER_3_OUTPUT;
+ }
- if (!audio_config.enable) {
- notes = false;
- note = false;
- }
}
-void play_note(float freq, int vol) {
+void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat, float n_rest)
+{
- if (!inited) {
+ if (!audio_initialized) {
audio_init();
}
-if (audio_config.enable && voices < 8) {
- TIMSK3 &= ~_BV(OCIE3A);
- // Cancel notes if notes are playing
- if (notes)
- stop_all_notes();
- note = true;
- envelope_index = 0;
- #ifdef PWM_AUDIO
- freq = freq / SAMPLE_RATE;
- #endif
- if (freq > 0) {
- frequencies[voices] = freq;
- volumes[voices] = vol;
- voices++;
- }
+ if (audio_config.enable) {
+
+ DISABLE_AUDIO_COUNTER_3_ISR;
+
+ // Cancel note if a note is playing
+ if (playing_note)
+ stop_all_notes();
+
+ playing_notes = true;
+
+ notes_pointer = np;
+ notes_count = n_count;
+ notes_repeat = n_repeat;
+ notes_rest = n_rest;
+
+ place = 0;
+ current_note = 0;
+
+ note_frequency = (*notes_pointer)[current_note][0];
+ note_length = ((*notes_pointer)[current_note][1] / 4) * (((float)note_tempo) / 100);
+ note_position = 0;
+
+
+ ENABLE_AUDIO_COUNTER_3_ISR;
+ ENABLE_AUDIO_COUNTER_3_OUTPUT;
+ }
- #ifdef PWM_AUDIO
- TIMSK3 |= _BV(OCIE3A);
- #else
- TIMSK3 |= _BV(OCIE3A);
- TCCR3A |= _BV(COM3A1);
- #endif
}
+bool is_playing_notes(void) {
+ return playing_notes;
}
-void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat, float n_rest) {
+void audio_toggle(void) {
+ audio_config.enable ^= 1;
+ eeconfig_update_audio(audio_config.raw);
+}
- if (!inited) {
- audio_init();
- }
+void audio_on(void) {
+ audio_config.enable = 1;
+ eeconfig_update_audio(audio_config.raw);
+}
-if (audio_config.enable) {
- TIMSK3 &= ~_BV(OCIE3A);
- // Cancel note if a note is playing
- if (note)
- stop_all_notes();
- notes = true;
-
- notes_pointer = np;
- notes_count = n_count;
- notes_repeat = n_repeat;
- notes_rest = n_rest;
-
- place = 0;
- current_note = 0;
- #ifdef PWM_AUDIO
- note_frequency = (*notes_pointer)[current_note][0] / SAMPLE_RATE;
- note_length = (*notes_pointer)[current_note][1] * (note_tempo / 100);
- #else
- note_frequency = (*notes_pointer)[current_note][0];
- note_length = ((*notes_pointer)[current_note][1] / 4) * (note_tempo / 100);
- #endif
- note_position = 0;
+void audio_off(void) {
+ audio_config.enable = 0;
+ eeconfig_update_audio(audio_config.raw);
+}
+#ifdef VIBRATO_ENABLE
- #ifdef PWM_AUDIO
- TIMSK3 |= _BV(OCIE3A);
- #else
- TIMSK3 |= _BV(OCIE3A);
- TCCR3A |= _BV(COM3A1);
- #endif
+// Vibrato rate functions
+
+void set_vibrato_rate(float rate) {
+ vibrato_rate = rate;
}
+void increase_vibrato_rate(float change) {
+ vibrato_rate *= change;
}
-#ifdef PWM_AUDIO
-void play_sample(uint8_t * s, uint16_t l, bool r) {
- if (!inited) {
- audio_init();
- }
+void decrease_vibrato_rate(float change) {
+ vibrato_rate /= change;
+}
- if (audio_config.enable) {
- TIMSK3 &= ~_BV(OCIE3A);
- stop_all_notes();
- place_int = 0;
- sample = s;
- sample_length = l;
- repeat = r;
+#ifdef VIBRATO_STRENGTH_ENABLE
+
+void set_vibrato_strength(float strength) {
+ vibrato_strength = strength;
+}
+
+void increase_vibrato_strength(float change) {
+ vibrato_strength *= change;
+}
+
+void decrease_vibrato_strength(float change) {
+ vibrato_strength /= change;
+}
+
+#endif /* VIBRATO_STRENGTH_ENABLE */
+
+#endif /* VIBRATO_ENABLE */
- TIMSK3 |= _BV(OCIE3A);
+// Polyphony functions
+
+void set_polyphony_rate(float rate) {
+ polyphony_rate = rate;
+}
+
+void enable_polyphony() {
+ polyphony_rate = 5;
+}
+
+void disable_polyphony() {
+ polyphony_rate = 0;
+}
+
+void increase_polyphony_rate(float change) {
+ polyphony_rate *= change;
+}
+
+void decrease_polyphony_rate(float change) {
+ polyphony_rate /= change;
+}
+
+// Timbre function
+
+void set_timbre(float timbre) {
+ note_timbre = timbre;
+}
+
+// Tempo functions
+
+void set_tempo(uint8_t tempo) {
+ note_tempo = tempo;
+}
+
+void decrease_tempo(uint8_t tempo_change) {
+ note_tempo += tempo_change;
+}
+
+void increase_tempo(uint8_t tempo_change) {
+ if (note_tempo - tempo_change < 10) {
+ note_tempo = 10;
+ } else {
+ note_tempo -= tempo_change;
}
}
-#endif
+
//------------------------------------------------------------------------------
// Override these functions in your keymap file to play different tunes on
@@ -597,11 +478,8 @@ void play_startup_tone()
{
}
-
-
__attribute__ ((weak))
void play_goodbye_tone()
{
-
}
//------------------------------------------------------------------------------
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h
index 89769507e1..3d706587ab 100644
--- a/quantum/audio/audio.h
+++ b/quantum/audio/audio.h
@@ -56,7 +56,7 @@ void increase_polyphony_rate(float change);
void decrease_polyphony_rate(float change);
void set_timbre(float timbre);
-void set_tempo(float tempo);
+void set_tempo(uint8_t tempo);
void increase_tempo(uint8_t tempo_change);
void decrease_tempo(uint8_t tempo_change);
@@ -83,7 +83,11 @@ void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat, float n_rest)
#define NOTE_ARRAY_SIZE(x) ((int16_t)(sizeof(x) / (sizeof(x[0]))))
#define PLAY_NOTE_ARRAY(note_array, note_repeat, note_rest_style) play_notes(&note_array, NOTE_ARRAY_SIZE((note_array)), (note_repeat), (note_rest_style));
+
+bool is_playing_notes(void);
void play_goodbye_tone(void);
void play_startup_tone(void);
+
+
#endif \ No newline at end of file
diff --git a/quantum/audio/audio_pwm.c b/quantum/audio/audio_pwm.c
new file mode 100644
index 0000000000..328a253a7e
--- /dev/null
+++ b/quantum/audio/audio_pwm.c
@@ -0,0 +1,643 @@
+#include <stdio.h>
+#include <string.h>
+//#include <math.h>
+#include <avr/pgmspace.h>
+#include <avr/interrupt.h>
+#include <avr/io.h>
+#include "print.h"
+#include "audio.h"
+#include "keymap_common.h"
+
+#include "eeconfig.h"
+
+#define PI 3.14159265
+
+#define CPU_PRESCALER 8
+
+
+// Timer Abstractions
+
+// TIMSK3 - Timer/Counter #3 Interrupt Mask Register
+// Turn on/off 3A interputs, stopping/enabling the ISR calls
+#define ENABLE_AUDIO_COUNTER_3_ISR TIMSK3 |= _BV(OCIE3A)
+#define DISABLE_AUDIO_COUNTER_3_ISR TIMSK3 &= ~_BV(OCIE3A)
+
+
+// TCCR3A: Timer/Counter #3 Control Register
+// Compare Output Mode (COM3An) = 0b00 = Normal port operation, OC3A disconnected from PC6
+#define ENABLE_AUDIO_COUNTER_3_OUTPUT TCCR3A |= _BV(COM3A1);
+#define DISABLE_AUDIO_COUNTER_3_OUTPUT TCCR3A &= ~(_BV(COM3A1) | _BV(COM3A0));
+
+
+#define NOTE_PERIOD ICR3
+#define NOTE_DUTY_CYCLE OCR3A
+
+
+#ifdef PWM_AUDIO
+ #include "wave.h"
+ #define SAMPLE_DIVIDER 39
+ #define SAMPLE_RATE (2000000.0/SAMPLE_DIVIDER/2048)
+ // Resistor value of 1/ (2 * PI * 10nF * (2000000 hertz / SAMPLE_DIVIDER / 10)) for 10nF cap
+
+ float places[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+ uint16_t place_int = 0;
+ bool repeat = true;
+#endif
+
+void delay_us(int count) {
+ while(count--) {
+ _delay_us(1);
+ }
+}
+
+int voices = 0;
+int voice_place = 0;
+float frequency = 0;
+int volume = 0;
+long position = 0;
+
+float frequencies[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+int volumes[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+bool sliding = false;
+
+float place = 0;
+
+uint8_t * sample;
+uint16_t sample_length = 0;
+// float freq = 0;
+
+bool playing_notes = false;
+bool playing_note = false;
+float note_frequency = 0;
+float note_length = 0;
+uint8_t note_tempo = TEMPO_DEFAULT;
+float note_timbre = TIMBRE_DEFAULT;
+uint16_t note_position = 0;
+float (* notes_pointer)[][2];
+uint16_t notes_count;
+bool notes_repeat;
+float notes_rest;
+bool note_resting = false;
+
+uint8_t current_note = 0;
+uint8_t rest_counter = 0;
+
+#ifdef VIBRATO_ENABLE
+float vibrato_counter = 0;
+float vibrato_strength = .5;
+float vibrato_rate = 0.125;
+#endif
+
+float polyphony_rate = 0;
+
+static bool audio_initialized = false;
+
+audio_config_t audio_config;
+
+uint16_t envelope_index = 0;
+
+void audio_init() {
+
+ // Check EEPROM
+ if (!eeconfig_is_enabled())
+ {
+ eeconfig_init();
+ }
+ audio_config.raw = eeconfig_read_audio();
+
+ #ifdef PWM_AUDIO
+
+ PLLFRQ = _BV(PDIV2);
+ PLLCSR = _BV(PLLE);
+ while(!(PLLCSR & _BV(PLOCK)));
+ PLLFRQ |= _BV(PLLTM0); /* PCK 48MHz */
+
+ /* Init a fast PWM on Timer4 */
+ TCCR4A = _BV(COM4A0) | _BV(PWM4A); /* Clear OC4A on Compare Match */
+ TCCR4B = _BV(CS40); /* No prescaling => f = PCK/256 = 187500Hz */
+ OCR4A = 0;
+
+ /* Enable the OC4A output */
+ DDRC |= _BV(PORTC6);
+
+ DISABLE_AUDIO_COUNTER_3_ISR; // Turn off 3A interputs
+
+ TCCR3A = 0x0; // Options not needed
+ TCCR3B = _BV(CS31) | _BV(CS30) | _BV(WGM32); // 64th prescaling and CTC
+ OCR3A = SAMPLE_DIVIDER - 1; // Correct count/compare, related to sample playback
+
+ #else
+
+ // Set port PC6 (OC3A and /OC4A) as output
+ DDRC |= _BV(PORTC6);
+
+ DISABLE_AUDIO_COUNTER_3_ISR;
+
+ // TCCR3A / TCCR3B: Timer/Counter #3 Control Registers
+ // Compare Output Mode (COM3An) = 0b00 = Normal port operation, OC3A disconnected from PC6
+ // Waveform Generation Mode (WGM3n) = 0b1110 = Fast PWM Mode 14 (Period = ICR3, Duty Cycle = OCR3A)
+ // Clock Select (CS3n) = 0b010 = Clock / 8
+ TCCR3A = (0 << COM3A1) | (0 << COM3A0) | (1 << WGM31) | (0 << WGM30);
+ TCCR3B = (1 << WGM33) | (1 << WGM32) | (0 << CS32) | (1 << CS31) | (0 << CS30);
+
+ #endif
+
+ audio_initialized = true;
+}
+
+void stop_all_notes() {
+ if (!audio_initialized) {
+ audio_init();
+ }
+ voices = 0;
+ #ifdef PWM_AUDIO
+ DISABLE_AUDIO_COUNTER_3_ISR;
+ #else
+ DISABLE_AUDIO_COUNTER_3_ISR;
+ DISABLE_AUDIO_COUNTER_3_OUTPUT;
+ #endif
+
+ playing_notes = false;
+ playing_note = false;
+ frequency = 0;
+ volume = 0;
+
+ for (uint8_t i = 0; i < 8; i++)
+ {
+ frequencies[i] = 0;
+ volumes[i] = 0;
+ }
+}
+
+void stop_note(float freq)
+{
+ if (playing_note) {
+ if (!audio_initialized) {
+ audio_init();
+ }
+ #ifdef PWM_AUDIO
+ freq = freq / SAMPLE_RATE;
+ #endif
+ for (int i = 7; i >= 0; i--) {
+ if (frequencies[i] == freq) {
+ frequencies[i] = 0;
+ volumes[i] = 0;
+ for (int j = i; (j < 7); j++) {
+ frequencies[j] = frequencies[j+1];
+ frequencies[j+1] = 0;
+ volumes[j] = volumes[j+1];
+ volumes[j+1] = 0;
+ }
+ break;
+ }
+ }
+ voices--;
+ if (voices < 0)
+ voices = 0;
+ if (voice_place >= voices) {
+ voice_place = 0;
+ }
+ if (voices == 0) {
+ #ifdef PWM_AUDIO
+ DISABLE_AUDIO_COUNTER_3_ISR;
+ #else
+ DISABLE_AUDIO_COUNTER_3_ISR;
+ DISABLE_AUDIO_COUNTER_3_OUTPUT;
+ #endif
+ frequency = 0;
+ volume = 0;
+ playing_note = false;
+ }
+ }
+}
+
+#ifdef VIBRATO_ENABLE
+
+float mod(float a, int b)
+{
+ float r = fmod(a, b);
+ return r < 0 ? r + b : r;
+}
+
+float vibrato(float average_freq) {
+ #ifdef VIBRATO_STRENGTH_ENABLE
+ float vibrated_freq = average_freq * pow(vibrato_lut[(int)vibrato_counter], vibrato_strength);
+ #else
+ float vibrated_freq = average_freq * vibrato_lut[(int)vibrato_counter];
+ #endif
+ vibrato_counter = mod((vibrato_counter + vibrato_rate * (1.0 + 440.0/average_freq)), VIBRATO_LUT_LENGTH);
+ return vibrated_freq;
+}
+
+#endif
+
+ISR(TIMER3_COMPA_vect)
+{
+ if (playing_note) {
+ #ifdef PWM_AUDIO
+ if (voices == 1) {
+ // SINE
+ OCR4A = pgm_read_byte(&sinewave[(uint16_t)place]) >> 2;
+
+ // SQUARE
+ // if (((int)place) >= 1024){
+ // OCR4A = 0xFF >> 2;
+ // } else {
+ // OCR4A = 0x00;
+ // }
+
+ // SAWTOOTH
+ // OCR4A = (int)place / 4;
+
+ // TRIANGLE
+ // if (((int)place) >= 1024) {
+ // OCR4A = (int)place / 2;
+ // } else {
+ // OCR4A = 2048 - (int)place / 2;
+ // }
+
+ place += frequency;
+
+ if (place >= SINE_LENGTH)
+ place -= SINE_LENGTH;
+
+ } else {
+ int sum = 0;
+ for (int i = 0; i < voices; i++) {
+ // SINE
+ sum += pgm_read_byte(&sinewave[(uint16_t)places[i]]) >> 2;
+
+ // SQUARE
+ // if (((int)places[i]) >= 1024){
+ // sum += 0xFF >> 2;
+ // } else {
+ // sum += 0x00;
+ // }
+
+ places[i] += frequencies[i];
+
+ if (places[i] >= SINE_LENGTH)
+ places[i] -= SINE_LENGTH;
+ }
+ OCR4A = sum;
+ }
+ #else
+ if (voices > 0) {
+ float freq;
+ if (polyphony_rate > 0) {
+ if (voices > 1) {
+ voice_place %= voices;
+ if (place++ > (frequencies[voice_place] / polyphony_rate / CPU_PRESCALER)) {
+ voice_place = (voice_place + 1) % voices;
+ place = 0.0;
+ }
+ }
+ #ifdef VIBRATO_ENABLE
+ if (vibrato_strength > 0) {
+ freq = vibrato(frequencies[voice_place]);
+ } else {
+ #else
+ {
+ #endif
+ freq = frequencies[voice_place];
+ }
+ } else {
+ if (frequency != 0 && frequency < frequencies[voices - 1] && frequency < frequencies[voices - 1] * pow(2, -440/frequencies[voices - 1]/12/2)) {
+ frequency = frequency * pow(2, 440/frequency/12/2);
+ } else if (frequency != 0 && frequency > frequencies[voices - 1] && frequency > frequencies[voices - 1] * pow(2, 440/frequencies[voices - 1]/12/2)) {
+ frequency = frequency * pow(2, -440/frequency/12/2);
+ } else {
+ frequency = frequencies[voices - 1];
+ }
+
+
+ #ifdef VIBRATO_ENABLE
+ if (vibrato_strength > 0) {
+ freq = vibrato(frequency);
+ } else {
+ #else
+ {
+ #endif
+ freq = frequency;
+ }
+ }
+
+ if (envelope_index < 65535) {
+ envelope_index++;
+ }
+ freq = voice_envelope(freq);
+
+ if (freq < 30.517578125)
+ freq = 30.52;
+ NOTE_PERIOD = (int)(((double)F_CPU) / (freq * CPU_PRESCALER)); // Set max to the period
+ NOTE_DUTY_CYCLE = (int)((((double)F_CPU) / (freq * CPU_PRESCALER)) * note_timbre); // Set compare to half the period
+ }
+ #endif
+ }
+
+ // SAMPLE
+ // OCR4A = pgm_read_byte(&sample[(uint16_t)place_int]);
+
+ // place_int++;
+
+ // if (place_int >= sample_length)
+ // if (repeat)
+ // place_int -= sample_length;
+ // else
+ // DISABLE_AUDIO_COUNTER_3_ISR;
+
+
+ if (playing_notes) {
+ #ifdef PWM_AUDIO
+ OCR4A = pgm_read_byte(&sinewave[(uint16_t)place]) >> 0;
+
+ place += note_frequency;
+ if (place >= SINE_LENGTH)
+ place -= SINE_LENGTH;
+ #else
+ if (note_frequency > 0) {
+ float freq;
+
+ #ifdef VIBRATO_ENABLE
+ if (vibrato_strength > 0) {
+ freq = vibrato(note_frequency);
+ } else {
+ #else
+ {
+ #endif
+ freq = note_frequency;
+ }
+
+ if (envelope_index < 65535) {
+ envelope_index++;
+ }
+ freq = voice_envelope(freq);
+
+ NOTE_PERIOD = (int)(((double)F_CPU) / (freq * CPU_PRESCALER)); // Set max to the period
+ NOTE_DUTY_CYCLE = (int)((((double)F_CPU) / (freq * CPU_PRESCALER)) * note_timbre); // Set compare to half the period
+ } else {
+ NOTE_PERIOD = 0;
+ NOTE_DUTY_CYCLE = 0;
+ }
+ #endif
+
+
+ note_position++;
+ bool end_of_note = false;
+ if (NOTE_PERIOD > 0)
+ end_of_note = (note_position >= (note_length / NOTE_PERIOD * 0xFFFF));
+ else
+ end_of_note = (note_position >= (note_length * 0x7FF));
+ if (end_of_note) {
+ current_note++;
+ if (current_note >= notes_count) {
+ if (notes_repeat) {
+ current_note = 0;
+ } else {
+ #ifdef PWM_AUDIO
+ DISABLE_AUDIO_COUNTER_3_ISR;
+ #else
+ DISABLE_AUDIO_COUNTER_3_ISR;
+ DISABLE_AUDIO_COUNTER_3_OUTPUT;
+ #endif
+ playing_notes = false;
+ return;
+ }
+ }
+ if (!note_resting && (notes_rest > 0)) {
+ note_resting = true;
+ note_frequency = 0;
+ note_length = notes_rest;
+ current_note--;
+ } else {
+ note_resting = false;
+ #ifdef PWM_AUDIO
+ note_frequency = (*notes_pointer)[current_note][0] / SAMPLE_RATE;
+ note_length = (*notes_pointer)[current_note][1] * (((float)note_tempo) / 100);
+ #else
+ envelope_index = 0;
+ note_frequency = (*notes_pointer)[current_note][0];
+ note_length = ((*notes_pointer)[current_note][1] / 4) * (((float)note_tempo) / 100);
+ #endif
+ }
+ note_position = 0;
+ }
+
+ }
+
+ if (!audio_config.enable) {
+ playing_notes = false;
+ playing_note = false;
+ }
+}
+
+void play_note(float freq, int vol) {
+
+ if (!audio_initialized) {
+ audio_init();
+ }
+
+ if (audio_config.enable && voices < 8) {
+ DISABLE_AUDIO_COUNTER_3_ISR;
+
+ // Cancel notes if notes are playing
+ if (playing_notes)
+ stop_all_notes();
+
+ playing_note = true;
+
+ envelope_index = 0;
+
+ #ifdef PWM_AUDIO
+ freq = freq / SAMPLE_RATE;
+ #endif
+ if (freq > 0) {
+ frequencies[voices] = freq;
+ volumes[voices] = vol;
+ voices++;
+ }
+
+ #ifdef PWM_AUDIO
+ ENABLE_AUDIO_COUNTER_3_ISR;
+ #else
+ ENABLE_AUDIO_COUNTER_3_ISR;
+ ENABLE_AUDIO_COUNTER_3_OUTPUT;
+ #endif
+ }
+
+}
+
+void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat, float n_rest)
+{
+
+ if (!audio_initialized) {
+ audio_init();
+ }
+
+ if (audio_config.enable) {
+
+ DISABLE_AUDIO_COUNTER_3_ISR;
+
+ // Cancel note if a note is playing
+ if (playing_note)
+ stop_all_notes();
+
+ playing_notes = true;
+
+ notes_pointer = np;
+ notes_count = n_count;
+ notes_repeat = n_repeat;
+ notes_rest = n_rest;
+
+ place = 0;
+ current_note = 0;
+
+ #ifdef PWM_AUDIO
+ note_frequency = (*notes_pointer)[current_note][0] / SAMPLE_RATE;
+ note_length = (*notes_pointer)[current_note][1] * (((float)note_tempo) / 100);
+ #else
+ note_frequency = (*notes_pointer)[current_note][0];
+ note_length = ((*notes_pointer)[current_note][1] / 4) * (((float)note_tempo) / 100);
+ #endif
+ note_position = 0;
+
+
+ #ifdef PWM_AUDIO
+ ENABLE_AUDIO_COUNTER_3_ISR;
+ #else
+ ENABLE_AUDIO_COUNTER_3_ISR;
+ ENABLE_AUDIO_COUNTER_3_OUTPUT;
+ #endif
+ }
+
+}
+
+#ifdef PWM_AUDIO
+void play_sample(uint8_t * s, uint16_t l, bool r) {
+ if (!audio_initialized) {
+ audio_init();
+ }
+
+ if (audio_config.enable) {
+ DISABLE_AUDIO_COUNTER_3_ISR;
+ stop_all_notes();
+ place_int = 0;
+ sample = s;
+ sample_length = l;
+ repeat = r;
+
+ ENABLE_AUDIO_COUNTER_3_ISR;
+ }
+}
+#endif
+
+
+void audio_toggle(void) {
+ audio_config.enable ^= 1;
+ eeconfig_update_audio(audio_config.raw);
+}
+
+void audio_on(void) {
+ audio_config.enable = 1;
+ eeconfig_update_audio(audio_config.raw);
+}
+
+void audio_off(void) {
+ audio_config.enable = 0;
+ eeconfig_update_audio(audio_config.raw);
+}
+
+#ifdef VIBRATO_ENABLE
+
+// Vibrato rate functions
+
+void set_vibrato_rate(float rate) {
+ vibrato_rate = rate;
+}
+
+void increase_vibrato_rate(float change) {
+ vibrato_rate *= change;
+}
+
+void decrease_vibrato_rate(float change) {
+ vibrato_rate /= change;
+}
+
+#ifdef VIBRATO_STRENGTH_ENABLE
+
+void set_vibrato_strength(float strength) {
+ vibrato_strength = strength;
+}
+
+void increase_vibrato_strength(float change) {
+ vibrato_strength *= change;
+}
+
+void decrease_vibrato_strength(float change) {
+ vibrato_strength /= change;
+}
+
+#endif /* VIBRATO_STRENGTH_ENABLE */
+
+#endif /* VIBRATO_ENABLE */
+
+// Polyphony functions
+
+void set_polyphony_rate(float rate) {
+ polyphony_rate = rate;
+}
+
+void enable_polyphony() {
+ polyphony_rate = 5;
+}
+
+void disable_polyphony() {
+ polyphony_rate = 0;
+}
+
+void increase_polyphony_rate(float change) {
+ polyphony_rate *= change;
+}
+
+void decrease_polyphony_rate(float change) {
+ polyphony_rate /= change;
+}
+
+// Timbre function
+
+void set_timbre(float timbre) {
+ note_timbre = timbre;
+}
+
+// Tempo functions
+
+void set_tempo(uint8_t tempo) {
+ note_tempo = tempo;
+}
+
+void decrease_tempo(uint8_t tempo_change) {
+ note_tempo += tempo_change;
+}
+
+void increase_tempo(uint8_t tempo_change) {
+ if (note_tempo - tempo_change < 10) {
+ note_tempo = 10;
+ } else {
+ note_tempo -= tempo_change;
+ }
+}
+
+
+//------------------------------------------------------------------------------
+// Override these functions in your keymap file to play different tunes on
+// startup and bootloader jump
+__attribute__ ((weak))
+void play_startup_tone()
+{
+}
+
+__attribute__ ((weak))
+void play_goodbye_tone()
+{
+}
+//------------------------------------------------------------------------------
diff --git a/quantum/audio/frequency_lut.h b/quantum/audio/frequency_lut.h
deleted file mode 100644
index e62da5be4e..0000000000
--- a/quantum/audio/frequency_lut.h
+++ /dev/null
@@ -1,357 +0,0 @@
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <avr/pgmspace.h>
-
-#define FREQUENCY_LUT_LENGTH 349
-
-const uint16_t FREQUENCY_LUT[FREQUENCY_LUT_LENGTH] = {
-0x8E0B,
-0x8C02,
-0x8A00,
-0x8805,
-0x8612,
-0x8426,
-0x8241,
-0x8063,
-0x7E8C,
-0x7CBB,
-0x7AF2,
-0x792E,
-0x7772,
-0x75BB,
-0x740B,
-0x7261,
-0x70BD,
-0x6F20,
-0x6D88,
-0x6BF6,
-0x6A69,
-0x68E3,
-0x6762,
-0x65E6,
-0x6470,
-0x6300,
-0x6194,
-0x602E,
-0x5ECD,
-0x5D71,
-0x5C1A,
-0x5AC8,
-0x597B,
-0x5833,
-0x56EF,
-0x55B0,
-0x5475,
-0x533F,
-0x520E,
-0x50E1,
-0x4FB8,
-0x4E93,
-0x4D73,
-0x4C57,
-0x4B3E,
-0x4A2A,
-0x491A,
-0x480E,
-0x4705,
-0x4601,
-0x4500,
-0x4402,
-0x4309,
-0x4213,
-0x4120,
-0x4031,
-0x3F46,
-0x3E5D,
-0x3D79,
-0x3C97,
-0x3BB9,
-0x3ADD,
-0x3A05,
-0x3930,
-0x385E,
-0x3790,
-0x36C4,
-0x35FB,
-0x3534,
-0x3471,
-0x33B1,
-0x32F3,
-0x3238,
-0x3180,
-0x30CA,
-0x3017,
-0x2F66,
-0x2EB8,
-0x2E0D,
-0x2D64,
-0x2CBD,
-0x2C19,
-0x2B77,
-0x2AD8,
-0x2A3A,
-0x299F,
-0x2907,
-0x2870,
-0x27DC,
-0x2749,
-0x26B9,
-0x262B,
-0x259F,
-0x2515,
-0x248D,
-0x2407,
-0x2382,
-0x2300,
-0x2280,
-0x2201,
-0x2184,
-0x2109,
-0x2090,
-0x2018,
-0x1FA3,
-0x1F2E,
-0x1EBC,
-0x1E4B,
-0x1DDC,
-0x1D6E,
-0x1D02,
-0x1C98,
-0x1C2F,
-0x1BC8,
-0x1B62,
-0x1AFD,
-0x1A9A,
-0x1A38,
-0x19D8,
-0x1979,
-0x191C,
-0x18C0,
-0x1865,
-0x180B,
-0x17B3,
-0x175C,
-0x1706,
-0x16B2,
-0x165E,
-0x160C,
-0x15BB,
-0x156C,
-0x151D,
-0x14CF,
-0x1483,
-0x1438,
-0x13EE,
-0x13A4,
-0x135C,
-0x1315,
-0x12CF,
-0x128A,
-0x1246,
-0x1203,
-0x11C1,
-0x1180,
-0x1140,
-0x1100,
-0x10C2,
-0x1084,
-0x1048,
-0x100C,
-0xFD1,
-0xF97,
-0xF5E,
-0xF25,
-0xEEE,
-0xEB7,
-0xE81,
-0xE4C,
-0xE17,
-0xDE4,
-0xDB1,
-0xD7E,
-0xD4D,
-0xD1C,
-0xCEC,
-0xCBC,
-0xC8E,
-0xC60,
-0xC32,
-0xC05,
-0xBD9,
-0xBAE,
-0xB83,
-0xB59,
-0xB2F,
-0xB06,
-0xADD,
-0xAB6,
-0xA8E,
-0xA67,
-0xA41,
-0xA1C,
-0x9F7,
-0x9D2,
-0x9AE,
-0x98A,
-0x967,
-0x945,
-0x923,
-0x901,
-0x8E0,
-0x8C0,
-0x8A0,
-0x880,
-0x861,
-0x842,
-0x824,
-0x806,
-0x7E8,
-0x7CB,
-0x7AF,
-0x792,
-0x777,
-0x75B,
-0x740,
-0x726,
-0x70B,
-0x6F2,
-0x6D8,
-0x6BF,
-0x6A6,
-0x68E,
-0x676,
-0x65E,
-0x647,
-0x630,
-0x619,
-0x602,
-0x5EC,
-0x5D7,
-0x5C1,
-0x5AC,
-0x597,
-0x583,
-0x56E,
-0x55B,
-0x547,
-0x533,
-0x520,
-0x50E,
-0x4FB,
-0x4E9,
-0x4D7,
-0x4C5,
-0x4B3,
-0x4A2,
-0x491,
-0x480,
-0x470,
-0x460,
-0x450,
-0x440,
-0x430,
-0x421,
-0x412,
-0x403,
-0x3F4,
-0x3E5,
-0x3D7,
-0x3C9,
-0x3BB,
-0x3AD,
-0x3A0,
-0x393,
-0x385,
-0x379,
-0x36C,
-0x35F,
-0x353,
-0x347,
-0x33B,
-0x32F,
-0x323,
-0x318,
-0x30C,
-0x301,
-0x2F6,
-0x2EB,
-0x2E0,
-0x2D6,
-0x2CB,
-0x2C1,
-0x2B7,
-0x2AD,
-0x2A3,
-0x299,
-0x290,
-0x287,
-0x27D,
-0x274,
-0x26B,
-0x262,
-0x259,
-0x251,
-0x248,
-0x240,
-0x238,
-0x230,
-0x228,
-0x220,
-0x218,
-0x210,
-0x209,
-0x201,
-0x1FA,
-0x1F2,
-0x1EB,
-0x1E4,
-0x1DD,
-0x1D6,
-0x1D0,
-0x1C9,
-0x1C2,
-0x1BC,
-0x1B6,
-0x1AF,
-0x1A9,
-0x1A3,
-0x19D,
-0x197,
-0x191,
-0x18C,
-0x186,
-0x180,
-0x17B,
-0x175,
-0x170,
-0x16B,
-0x165,
-0x160,
-0x15B,
-0x156,
-0x151,
-0x14C,
-0x148,
-0x143,
-0x13E,
-0x13A,
-0x135,
-0x131,
-0x12C,
-0x128,
-0x124,
-0x120,
-0x11C,
-0x118,
-0x114,
-0x110,
-0x10C,
-0x108,
-0x104,
-0x100,
-0xFD,
-0xF9,
-0xF5,
-0xF2,
-0xEE
-}; \ No newline at end of file
diff --git a/quantum/audio/luts.c b/quantum/audio/luts.c
new file mode 100644
index 0000000000..9f3de9a05c
--- /dev/null
+++ b/quantum/audio/luts.c
@@ -0,0 +1,382 @@
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <avr/pgmspace.h>
+#include "luts.h"
+
+const float vibrato_lut[VIBRATO_LUT_LENGTH] =
+{
+ 1.0022336811487,
+ 1.0042529943610,
+ 1.0058584256028,
+ 1.0068905285205,
+ 1.0072464122237,
+ 1.0068905285205,
+ 1.0058584256028,
+ 1.0042529943610,
+ 1.0022336811487,
+ 1.0000000000000,
+ 0.9977712970630,
+ 0.9957650169978,
+ 0.9941756956510,
+ 0.9931566259436,
+ 0.9928057204913,
+ 0.9931566259436,
+ 0.9941756956510,
+ 0.9957650169978,
+ 0.9977712970630,
+ 1.0000000000000,
+};
+
+const uint16_t frequency_lut[FREQUENCY_LUT_LENGTH] =
+{
+ 0x8E0B,
+ 0x8C02,
+ 0x8A00,
+ 0x8805,
+ 0x8612,
+ 0x8426,
+ 0x8241,
+ 0x8063,
+ 0x7E8C,
+ 0x7CBB,
+ 0x7AF2,
+ 0x792E,
+ 0x7772,
+ 0x75BB,
+ 0x740B,
+ 0x7261,
+ 0x70BD,
+ 0x6F20,
+ 0x6D88,
+ 0x6BF6,
+ 0x6A69,
+ 0x68E3,
+ 0x6762,
+ 0x65E6,
+ 0x6470,
+ 0x6300,
+ 0x6194,
+ 0x602E,
+ 0x5ECD,
+ 0x5D71,
+ 0x5C1A,
+ 0x5AC8,
+ 0x597B,
+ 0x5833,
+ 0x56EF,
+ 0x55B0,
+ 0x5475,
+ 0x533F,
+ 0x520E,
+ 0x50E1,
+ 0x4FB8,
+ 0x4E93,
+ 0x4D73,
+ 0x4C57,
+ 0x4B3E,
+ 0x4A2A,
+ 0x491A,
+ 0x480E,
+ 0x4705,
+ 0x4601,
+ 0x4500,
+ 0x4402,
+ 0x4309,
+ 0x4213,
+ 0x4120,
+ 0x4031,
+ 0x3F46,
+ 0x3E5D,
+ 0x3D79,
+ 0x3C97,
+ 0x3BB9,
+ 0x3ADD,
+ 0x3A05,
+ 0x3930,
+ 0x385E,
+ 0x3790,
+ 0x36C4,
+ 0x35FB,
+ 0x3534,
+ 0x3471,
+ 0x33B1,
+ 0x32F3,
+ 0x3238,
+ 0x3180,
+ 0x30CA,
+ 0x3017,
+ 0x2F66,
+ 0x2EB8,
+ 0x2E0D,
+ 0x2D64,
+ 0x2CBD,
+ 0x2C19,
+ 0x2B77,
+ 0x2AD8,
+ 0x2A3A,
+ 0x299F,
+ 0x2907,
+ 0x2870,
+ 0x27DC,
+ 0x2749,
+ 0x26B9,
+ 0x262B,
+ 0x259F,
+ 0x2515,
+ 0x248D,
+ 0x2407,
+ 0x2382,
+ 0x2300,
+ 0x2280,
+ 0x2201,
+ 0x2184,
+ 0x2109,
+ 0x2090,
+ 0x2018,
+ 0x1FA3,
+ 0x1F2E,
+ 0x1EBC,
+ 0x1E4B,
+ 0x1DDC,
+ 0x1D6E,
+ 0x1D02,
+ 0x1C98,
+ 0x1C2F,
+ 0x1BC8,
+ 0x1B62,
+ 0x1AFD,
+ 0x1A9A,
+ 0x1A38,
+ 0x19D8,
+ 0x1979,
+ 0x191C,
+ 0x18C0,
+ 0x1865,
+ 0x180B,
+ 0x17B3,
+ 0x175C,
+ 0x1706,
+ 0x16B2,
+ 0x165E,
+ 0x160C,
+ 0x15BB,
+ 0x156C,
+ 0x151D,
+ 0x14CF,
+ 0x1483,
+ 0x1438,
+ 0x13EE,
+ 0x13A4,
+ 0x135C,
+ 0x1315,
+ 0x12CF,
+ 0x128A,
+ 0x1246,
+ 0x1203,
+ 0x11C1,
+ 0x1180,
+ 0x1140,
+ 0x1100,
+ 0x10C2,
+ 0x1084,
+ 0x1048,
+ 0x100C,
+ 0xFD1,
+ 0xF97,
+ 0xF5E,
+ 0xF25,
+ 0xEEE,
+ 0xEB7,
+ 0xE81,
+ 0xE4C,
+ 0xE17,
+ 0xDE4,
+ 0xDB1,
+ 0xD7E,
+ 0xD4D,
+ 0xD1C,
+ 0xCEC,
+ 0xCBC,
+ 0xC8E,
+ 0xC60,
+ 0xC32,
+ 0xC05,
+ 0xBD9,
+ 0xBAE,
+ 0xB83,
+ 0xB59,
+ 0xB2F,
+ 0xB06,
+ 0xADD,
+ 0xAB6,
+ 0xA8E,
+ 0xA67,
+ 0xA41,
+ 0xA1C,
+ 0x9F7,
+ 0x9D2,
+ 0x9AE,
+ 0x98A,
+ 0x967,
+ 0x945,
+ 0x923,
+ 0x901,
+ 0x8E0,
+ 0x8C0,
+ 0x8A0,
+ 0x880,
+ 0x861,
+ 0x842,
+ 0x824,
+ 0x806,
+ 0x7E8,
+ 0x7CB,
+ 0x7AF,
+ 0x792,
+ 0x777,
+ 0x75B,
+ 0x740,
+ 0x726,
+ 0x70B,
+ 0x6F2,
+ 0x6D8,
+ 0x6BF,
+ 0x6A6,
+ 0x68E,
+ 0x676,
+ 0x65E,
+ 0x647,
+ 0x630,
+ 0x619,
+ 0x602,
+ 0x5EC,
+ 0x5D7,
+ 0x5C1,
+ 0x5AC,
+ 0x597,
+ 0x583,
+ 0x56E,
+ 0x55B,
+ 0x547,
+ 0x533,
+ 0x520,
+ 0x50E,
+ 0x4FB,
+ 0x4E9,
+ 0x4D7,
+ 0x4C5,
+ 0x4B3,
+ 0x4A2,
+ 0x491,
+ 0x480,
+ 0x470,
+ 0x460,
+ 0x450,
+ 0x440,
+ 0x430,
+ 0x421,
+ 0x412,
+ 0x403,
+ 0x3F4,
+ 0x3E5,
+ 0x3D7,
+ 0x3C9,
+ 0x3BB,
+ 0x3AD,
+ 0x3A0,
+ 0x393,
+ 0x385,
+ 0x379,
+ 0x36C,
+ 0x35F,
+ 0x353,
+ 0x347,
+ 0x33B,
+ 0x32F,
+ 0x323,
+ 0x318,
+ 0x30C,
+ 0x301,
+ 0x2F6,
+ 0x2EB,
+ 0x2E0,
+ 0x2D6,
+ 0x2CB,
+ 0x2C1,
+ 0x2B7,
+ 0x2AD,
+ 0x2A3,
+ 0x299,
+ 0x290,
+ 0x287,
+ 0x27D,
+ 0x274,
+ 0x26B,
+ 0x262,
+ 0x259,
+ 0x251,
+ 0x248,
+ 0x240,
+ 0x238,
+ 0x230,
+ 0x228,
+ 0x220,
+ 0x218,
+ 0x210,
+ 0x209,
+ 0x201,
+ 0x1FA,
+ 0x1F2,
+ 0x1EB,
+ 0x1E4,
+ 0x1DD,
+ 0x1D6,
+ 0x1D0,
+ 0x1C9,
+ 0x1C2,
+ 0x1BC,
+ 0x1B6,
+ 0x1AF,
+ 0x1A9,
+ 0x1A3,
+ 0x19D,
+ 0x197,
+ 0x191,
+ 0x18C,
+ 0x186,
+ 0x180,
+ 0x17B,
+ 0x175,
+ 0x170,
+ 0x16B,
+ 0x165,
+ 0x160,
+ 0x15B,
+ 0x156,
+ 0x151,
+ 0x14C,
+ 0x148,
+ 0x143,
+ 0x13E,
+ 0x13A,
+ 0x135,
+ 0x131,
+ 0x12C,
+ 0x128,
+ 0x124,
+ 0x120,
+ 0x11C,
+ 0x118,
+ 0x114,
+ 0x110,
+ 0x10C,
+ 0x108,
+ 0x104,
+ 0x100,
+ 0xFD,
+ 0xF9,
+ 0xF5,
+ 0xF2,
+ 0xEE,
+};
+
diff --git a/quantum/audio/luts.h b/quantum/audio/luts.h
new file mode 100644
index 0000000000..7df3078a7f
--- /dev/null
+++ b/quantum/audio/luts.h
@@ -0,0 +1,15 @@
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <avr/pgmspace.h>
+
+#ifndef LUTS_H
+#define LUTS_H
+
+#define VIBRATO_LUT_LENGTH 20
+
+#define FREQUENCY_LUT_LENGTH 349
+
+extern const float vibrato_lut[VIBRATO_LUT_LENGTH];
+extern const uint16_t frequency_lut[FREQUENCY_LUT_LENGTH];
+
+#endif /* LUTS_H */ \ No newline at end of file
diff --git a/quantum/audio/vibrato_lut.h b/quantum/audio/vibrato_lut.h
deleted file mode 100644
index a2b1f3e5ce..0000000000
--- a/quantum/audio/vibrato_lut.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <avr/pgmspace.h>
-
-#define VIBRATO_LUT_LENGTH 20
-
-const float VIBRATO_LUT[VIBRATO_LUT_LENGTH] = { \
-1.00223368114872,
-1.00425299436105,
-1.00585842560279,
-1.00689052852052,
-1.0072464122237,
-1.00689052852052,
-1.00585842560279,
-1.00425299436105,
-1.00223368114872,
-1,
-0.99777129706302,
-0.99576501699778,
-0.994175695650927,
-0.993156625943589,
-0.992805720491269,
-0.993156625943589,
-0.994175695650927,
-0.99576501699778,
-0.99777129706302,
-1
-}; \ No newline at end of file
diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c
index d2316ba1b3..6d4172a06c 100644
--- a/quantum/audio/voices.c
+++ b/quantum/audio/voices.c
@@ -1,6 +1,6 @@
#include "voices.h"
+#include "audio.h"
#include "stdlib.h"
-#include "vibrato_lut.h"
// these are imported from audio.c
extern uint16_t envelope_index;
@@ -109,7 +109,7 @@ float voice_envelope(float frequency) {
case 0 ... VOICE_VIBRATO_DELAY:
break;
default:
- frequency = frequency * VIBRATO_LUT[(int)fmod((((float)compensated_index - (VOICE_VIBRATO_DELAY + 1))/1000*VOICE_VIBRATO_SPEED), VIBRATO_LUT_LENGTH)];
+ frequency = frequency * vibrato_lut[(int)fmod((((float)compensated_index - (VOICE_VIBRATO_DELAY + 1))/1000*VOICE_VIBRATO_SPEED), VIBRATO_LUT_LENGTH)];
break;
}
break;
@@ -160,4 +160,6 @@ float voice_envelope(float frequency) {
}
return frequency;
-} \ No newline at end of file
+}
+
+
diff --git a/quantum/audio/voices.h b/quantum/audio/voices.h
index 74c873f42f..b2495b23b5 100644
--- a/quantum/audio/voices.h
+++ b/quantum/audio/voices.h
@@ -2,8 +2,7 @@
#include <stdbool.h>
#include <avr/io.h>
#include <util/delay.h>
-#include "musical_notes.h"
-#include "song_list.h"
+#include "luts.h"
#ifndef VOICES_H
#define VOICES_H
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 4b4bd62109..8f00f9cc32 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -24,10 +24,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "action_macro.h"
#include "debug.h"
#include "backlight.h"
-#include "keymap_midi.h"
#include "bootloader.h"
#include "eeconfig.h"
+#ifdef MIDI_ENABLE
+ #include "keymap_midi.h"
+#endif
+
+
extern keymap_config_t keymap_config;
#include <stdio.h>
@@ -268,6 +272,14 @@ static action_t keycode_to_action(uint16_t keycode)
// Set default layer
int layer = keycode & 0xFF;
action.code = ACTION_LAYER_TOGGLE(layer);
+ } else if (type == 0x5) {
+ // OSL(layer) - One-shot layer
+ int layer = keycode & 0xFF;
+ action.code = ACTION_LAYER_ONESHOT(layer);
+ } else if (type == 0x6) {
+ // OSM(mod) - One-shot mod
+ int mod = keycode & 0xFF;
+ action.code = ACTION_MODS_ONESHOT(mod);
}
break;
#ifdef MIDI_ENABLE
diff --git a/quantum/keymap_common.h b/quantum/keymap_common.h
index 0ede0296b9..ab80ea45c7 100644
--- a/quantum/keymap_common.h
+++ b/quantum/keymap_common.h
@@ -67,6 +67,9 @@ extern const uint16_t fn_actions[];
#define MEH(kc) kc | 0x0700
#define LCAG(kc) kc | 0x0D00 // Modifier Ctrl Alt and GUI
+#define MOD_HYPR 0xf
+#define MOD_MEH 0x7
+
#define RCTL(kc) kc | 0x1100
#define RSFT(kc) kc | 0x1200
#define RALT(kc) kc | 0x1400
@@ -205,6 +208,12 @@ extern const uint16_t fn_actions[];
// Toggle to layer - 256 layer max
#define TG(layer) (layer | 0x5400)
+// One-shot layer - 256 layer max
+#define OSL(layer) (layer | 0x5500)
+
+// One-shot mod
+#define OSM(layer) (layer | 0x5600)
+
// M-od, T-ap - 256 keycode max
#define MT(mod, kc) (kc | 0x7000 | ((mod & 0xF) << 8))
#define CTL_T(kc) MT(0x1, kc)
diff --git a/quantum/quantum.mk b/quantum/quantum.mk
index 83c4f1d1db..ff34c463a0 100644
--- a/quantum/quantum.mk
+++ b/quantum/quantum.mk
@@ -28,7 +28,9 @@ ifeq ($(strip $(MIDI_ENABLE)), yes)
endif
ifeq ($(strip $(AUDIO_ENABLE)), yes)
- SRC += $(QUANTUM_DIR)/audio/audio.c $(QUANTUM_DIR)/audio/voices.c
+ SRC += $(QUANTUM_DIR)/audio/audio.c
+ SRC += $(QUANTUM_DIR)/audio/voices.c
+ SRC += $(QUANTUM_DIR)/audio/luts.c
endif
ifeq ($(strip $(UNICODE_ENABLE)), yes)
diff --git a/quantum/tools/README.md b/quantum/tools/README.md
index 0702144238..5f355256de 100644
--- a/quantum/tools/README.md
+++ b/quantum/tools/README.md
@@ -1,6 +1,6 @@
`eeprom_reset.hex` is to reset the eeprom on the Atmega32u4, like this:
dfu-programmer atmega32u4 erase
- dfu-programmer atmega32u4 flash --eeprom eeprom-reset.bin
+ dfu-programmer atmega32u4 flash --eeprom eeprom_reset.hex
- You'll need to reflash afterwards, because DFU requires the flash to be erased before messing with the eeprom. \ No newline at end of file
+ You'll need to reflash afterwards, because DFU requires the flash to be erased before messing with the eeprom.
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index f9e6c17dc3..081e90b2db 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -74,6 +74,7 @@ void process_action_kb(keyrecord_t *record) {}
void process_action(keyrecord_t *record)
{
+ bool do_release_oneshot = false;
keyevent_t event = record->event;
#ifndef NO_ACTION_TAPPING
uint8_t tap_count = record->tap.count;
@@ -81,6 +82,13 @@ void process_action(keyrecord_t *record)
if (IS_NOEVENT(event)) { return; }
+#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
+ if (has_oneshot_layer_timed_out()) {
+ dprintf("Oneshot layer: timeout\n");
+ clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
+ }
+#endif
+
process_action_kb(record);
action_t action = store_or_get_action(event.pressed, event.key);
@@ -95,6 +103,15 @@ void process_action(keyrecord_t *record)
// clear the potential weak mods left by previously pressed keys
clear_weak_mods();
}
+
+#ifndef NO_ACTION_ONESHOT
+ // notice we only clear the one shot layer if the pressed key is not a modifier.
+ if (is_oneshot_layer_active() && event.pressed && !IS_MOD(action.key.code)) {
+ clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
+ do_release_oneshot = !is_oneshot_layer_active();
+ }
+#endif
+
switch (action.kind.id) {
/* Key and Mods */
case ACT_LMODS:
@@ -139,24 +156,37 @@ void process_action(keyrecord_t *record)
// Oneshot modifier
if (event.pressed) {
if (tap_count == 0) {
+ dprint("MODS_TAP: Oneshot: 0\n");
register_mods(mods);
- }
- else if (tap_count == 1) {
+ } else if (tap_count == 1) {
dprint("MODS_TAP: Oneshot: start\n");
set_oneshot_mods(mods);
- }
- else {
+ #if defined(ONESHOT_TAP_TOGGLE) && ONESHOT_TAP_TOGGLE > 1
+ } else if (tap_count == ONESHOT_TAP_TOGGLE) {
+ dprint("MODS_TAP: Toggling oneshot");
+ clear_oneshot_mods();
+ set_oneshot_locked_mods(mods);
+ register_mods(mods);
+ #endif
+ } else {
register_mods(mods);
}
} else {
if (tap_count == 0) {
clear_oneshot_mods();
unregister_mods(mods);
- }
- else if (tap_count == 1) {
+ } else if (tap_count == 1) {
// Retain Oneshot mods
- }
- else {
+ #if defined(ONESHOT_TAP_TOGGLE) && ONESHOT_TAP_TOGGLE > 1
+ if (mods & get_mods()) {
+ clear_oneshot_locked_mods();
+ clear_oneshot_mods();
+ unregister_mods(mods);
+ }
+ } else if (tap_count == ONESHOT_TAP_TOGGLE) {
+ // Toggle Oneshot Layer
+ #endif
+ } else {
clear_oneshot_mods();
unregister_mods(mods);
}
@@ -309,6 +339,44 @@ void process_action(keyrecord_t *record)
event.pressed ? layer_move(action.layer_tap.val) :
layer_clear();
break;
+ #ifndef NO_ACTION_ONESHOT
+ case OP_ONESHOT:
+ // Oneshot modifier
+ #if defined(ONESHOT_TAP_TOGGLE) && ONESHOT_TAP_TOGGLE > 1
+ do_release_oneshot = false;
+ if (event.pressed) {
+ del_mods(get_oneshot_locked_mods());
+ if (get_oneshot_layer_state() == ONESHOT_TOGGLED) {
+ reset_oneshot_layer();
+ layer_off(action.layer_tap.val);
+ break;
+ } else if (tap_count < ONESHOT_TAP_TOGGLE) {
+ layer_on(action.layer_tap.val);
+ set_oneshot_layer(action.layer_tap.val, ONESHOT_START);
+ }
+ } else {
+ add_mods(get_oneshot_locked_mods());
+ if (tap_count >= ONESHOT_TAP_TOGGLE) {
+ reset_oneshot_layer();
+ clear_oneshot_locked_mods();
+ set_oneshot_layer(action.layer_tap.val, ONESHOT_TOGGLED);
+ } else {
+ clear_oneshot_layer_state(ONESHOT_PRESSED);
+ }
+ }
+ #else
+ if (event.pressed) {
+ layer_on(action.layer_tap.val);
+ set_oneshot_layer(action.layer_tap.val, ONESHOT_START);
+ } else {
+ clear_oneshot_layer_state(ONESHOT_PRESSED);
+ if (tap_count > 1) {
+ clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
+ }
+ }
+ #endif
+ break;
+ #endif
default:
/* tap key */
if (event.pressed) {
@@ -372,6 +440,18 @@ void process_action(keyrecord_t *record)
default:
break;
}
+
+#ifndef NO_ACTION_ONESHOT
+ /* Because we switch layers after a oneshot event, we need to release the
+ * key before we leave the layer or no key up event will be generated.
+ */
+ if (do_release_oneshot && !(get_oneshot_layer_state() & ONESHOT_PRESSED ) ) {
+ record->event.pressed = false;
+ layer_on(get_oneshot_layer());
+ process_action(record);
+ layer_off(get_oneshot_layer());
+ }
+#endif
}
@@ -560,6 +640,7 @@ bool is_tap_key(keypos_t key)
switch (action.layer_tap.code) {
case 0x00 ... 0xdf:
case OP_TAP_TOGGLE:
+ case OP_ONESHOT:
return true;
}
return false;
diff --git a/tmk_core/common/action_code.h b/tmk_core/common/action_code.h
index 2b0b0b077e..ca729aaece 100644
--- a/tmk_core/common/action_code.h
+++ b/tmk_core/common/action_code.h
@@ -76,7 +76,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* 101E|LLLL|1111 0001 On/Off (0xF1) [NOT TAP]
* 101E|LLLL|1111 0010 Off/On (0xF2) [NOT TAP]
* 101E|LLLL|1111 0011 Set/Clear (0xF3) [NOT TAP]
- * 101E|LLLL|1111 xxxx Reserved (0xF4-FF)
+ * 101E|LLLL|1111 0100 One Shot Layer (0xF4) [TAP]
+ * 101E|LLLL|1111 xxxx Reserved (0xF5-FF)
* ELLLL: layer 0-31(E: extra bit for layer 16-31)
*
*
@@ -250,6 +251,7 @@ enum layer_pram_tap_op {
OP_ON_OFF,
OP_OFF_ON,
OP_SET_CLEAR,
+ OP_ONESHOT,
};
#define ACTION_LAYER_BITOP(op, part, bits, on) (ACT_LAYER<<12 | (op)<<10 | (on)<<8 | (part)<<5 | ((bits)&0x1f))
#define ACTION_LAYER_TAP(layer, key) (ACT_LAYER_TAP<<12 | (layer)<<8 | (key))
@@ -266,6 +268,7 @@ enum layer_pram_tap_op {
#define ACTION_LAYER_ON_OFF(layer) ACTION_LAYER_TAP((layer), OP_ON_OFF)
#define ACTION_LAYER_OFF_ON(layer) ACTION_LAYER_TAP((layer), OP_OFF_ON)
#define ACTION_LAYER_SET_CLEAR(layer) ACTION_LAYER_TAP((layer), OP_SET_CLEAR)
+#define ACTION_LAYER_ONESHOT(layer) ACTION_LAYER_TAP((layer), OP_ONESHOT)
#define ACTION_LAYER_MODS(layer, mods) ACTION_LAYER_TAP((layer), 0xe0 | ((mods)&0x0f))
/* With Tapping */
#define ACTION_LAYER_TAP_KEY(layer, key) ACTION_LAYER_TAP((layer), (key))
diff --git a/tmk_core/common/action_util.c b/tmk_core/common/action_util.c
index a2d6577b24..61ff202bef 100644
--- a/tmk_core/common/action_util.c
+++ b/tmk_core/common/action_util.c
@@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "report.h"
#include "debug.h"
#include "action_util.h"
+#include "action_layer.h"
#include "timer.h"
static inline void add_key_byte(uint8_t code);
@@ -47,11 +48,70 @@ report_keyboard_t *keyboard_report = &(report_keyboard_t){};
#ifndef NO_ACTION_ONESHOT
static int8_t oneshot_mods = 0;
+static int8_t oneshot_locked_mods = 0;
+int8_t get_oneshot_locked_mods(void) { return oneshot_locked_mods; }
+void set_oneshot_locked_mods(int8_t mods) { oneshot_locked_mods = mods; }
+void clear_oneshot_locked_mods(void) { oneshot_locked_mods = 0; }
#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
static int16_t oneshot_time = 0;
+inline bool has_oneshot_mods_timed_out() {
+ return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT;
+}
#endif
#endif
+/* oneshot layer */
+#ifndef NO_ACTION_ONESHOT
+/* oneshot_layer_data bits
+* LLLL LSSS
+* where:
+* L => are layer bits
+* S => oneshot state bits
+*/
+static int8_t oneshot_layer_data = 0;
+
+inline uint8_t get_oneshot_layer(void) { return oneshot_layer_data >> 3; }
+inline uint8_t get_oneshot_layer_state(void) { return oneshot_layer_data & 0b111; }
+
+#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
+static int16_t oneshot_layer_time = 0;
+inline bool has_oneshot_layer_timed_out() {
+ return TIMER_DIFF_16(timer_read(), oneshot_layer_time) >= ONESHOT_TIMEOUT &&
+ !(get_oneshot_layer_state() & ONESHOT_TOGGLED);
+}
+#endif
+
+/* Oneshot layer */
+void set_oneshot_layer(uint8_t layer, uint8_t state)
+{
+ oneshot_layer_data = layer << 3 | state;
+ layer_on(layer);
+#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
+ oneshot_layer_time = timer_read();
+#endif
+}
+void reset_oneshot_layer(void) {
+ oneshot_layer_data = 0;
+#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
+ oneshot_layer_time = 0;
+#endif
+}
+void clear_oneshot_layer_state(oneshot_fullfillment_t state)
+{
+ uint8_t start_state = oneshot_layer_data;
+ oneshot_layer_data &= ~state;
+ if (!get_oneshot_layer_state() && start_state != oneshot_layer_data) {
+ layer_off(get_oneshot_layer());
+#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
+ oneshot_layer_time = 0;
+#endif
+ }
+}
+bool is_oneshot_layer_active(void)
+{
+ return get_oneshot_layer_state();
+}
+#endif
void send_keyboard_report(void) {
keyboard_report->mods = real_mods;
@@ -60,7 +120,7 @@ void send_keyboard_report(void) {
#ifndef NO_ACTION_ONESHOT
if (oneshot_mods) {
#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
- if (TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT) {
+ if (has_oneshot_mods_timed_out()) {
dprintf("Oneshot: timeout\n");
clear_oneshot_mods();
}
@@ -70,6 +130,7 @@ void send_keyboard_report(void) {
clear_oneshot_mods();
}
}
+
#endif
host_keyboard_send(keyboard_report);
}
@@ -143,11 +204,12 @@ void clear_oneshot_mods(void)
oneshot_time = 0;
#endif
}
+uint8_t get_oneshot_mods(void)
+{
+ return oneshot_mods;
+}
#endif
-
-
-
/*
* inspect keyboard state
*/
diff --git a/tmk_core/common/action_util.h b/tmk_core/common/action_util.h
index 1a95cec10e..dd0c4c2bfe 100644
--- a/tmk_core/common/action_util.h
+++ b/tmk_core/common/action_util.h
@@ -56,10 +56,30 @@ void clear_macro_mods(void);
/* oneshot modifier */
void set_oneshot_mods(uint8_t mods);
+uint8_t get_oneshot_mods(void);
void clear_oneshot_mods(void);
void oneshot_toggle(void);
void oneshot_enable(void);
void oneshot_disable(void);
+bool has_oneshot_mods_timed_out(void);
+
+int8_t get_oneshot_locked_mods(void);
+void set_oneshot_locked_mods(int8_t mods);
+void clear_oneshot_locked_mods(void);
+
+typedef enum {
+ ONESHOT_PRESSED = 0b01,
+ ONESHOT_OTHER_KEY_PRESSED = 0b10,
+ ONESHOT_START = 0b11,
+ ONESHOT_TOGGLED = 0b100
+} oneshot_fullfillment_t;
+void set_oneshot_layer(uint8_t layer, uint8_t state);
+uint8_t get_oneshot_layer(void);
+void clear_oneshot_layer_state(oneshot_fullfillment_t state);
+void reset_oneshot_layer(void);
+bool is_oneshot_layer_active(void);
+uint8_t get_oneshot_layer_state(void);
+bool has_oneshot_layer_timed_out(void);
/* inspect */
uint8_t has_anykey(void);
diff --git a/tmk_core/doc/keymap.md b/tmk_core/doc/keymap.md
index d4a129b208..4d42fbe5cb 100644
--- a/tmk_core/doc/keymap.md
+++ b/tmk_core/doc/keymap.md
@@ -528,14 +528,20 @@ This is a feature to assign both toggle layer and momentary switch layer action
### 4.3 Oneshot Modifier
-This runs onetime effects which modify only on just one following key. It works as normal modifier key when holding down while oneshot modifier when tapping.
+This runs onetime effects which modify only on just one following key. It works as normal modifier key when holding down while oneshot modifier when tapping. The behavior of oneshot modifiers is similar to the [sticky keys](https://en.wikipedia.org/wiki/StickyKeys) functionality found in most operating systems.
ACTION_MODS_ONESHOT(MOD_LSFT)
+Oneshot layer key:
+
+ ACTION_LAYER_ONESHOT(MY_LAYER)
+
Say you want to type 'The', you have to push and hold Shift key before type 't' then release it before type 'h' and 'e', otherwise you'll get 'THe' or 'the' unintentionally. With Oneshot Modifier you can tap Shift then type 't', 'h' and 'e' normally, you don't need to holding Shift key properly here. This mean you can release Shift before 't' is pressed down.
Oneshot effect is cancel unless following key is pressed down within `ONESHOT_TIMEOUT` of `config.h`. No timeout when it is `0` or not defined.
+Most implementations of sticky keys allow you to lock a modifier by double tapping the modifier. The layer then remains locked untill the modifier is tapped again. To enable this behaviour for oneshot modifiers set `ONESHOT_TAP_TOGGLE` to the number taps required. The feature is disabled if `ONESHOT_TAP_TOGGLE<2` or not defined.
+
### 4.4 Tap Toggle Mods
Similar to layer tap toggle, this works as a momentary modifier when holding, but toggles on with several taps. A single tap will 'unstick' the modifier again.
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 860fc1a931..69c7985b48 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -142,6 +142,9 @@ CFLAGS += $(CSTANDARD)
ifdef CONFIG_H
CFLAGS += -include $(CONFIG_H)
endif
+ifdef CONFIG_USER_H
+ CFLAGS += -include $(CONFIG_USER_H)
+endif
#---------------- Compiler Options C++ ----------------
@@ -176,6 +179,9 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
ifdef CONFIG_H
CPPFLAGS += -include $(CONFIG_H)
endif
+ifdef CONFIG_USER_H
+ CPPFLAGS += -include $(CONFIG_USER_H)
+endif
#---------------- Assembler Options ----------------
@@ -192,6 +198,9 @@ ASFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
ifdef CONFIG_H
ASFLAGS += -include $(CONFIG_H)
endif
+ifdef CONFIG_USER_H
+ ASFLAGS += -include $(CONFIG_USER_H)
+endif
#---------------- Library Options ----------------