Author: bklaas
Date: Tue Jan 19 13:14:55 2010
New Revision: 8377
URL: http://svn.slimdevices.com/jive?rev=8377&view=rev
Log:
r38...@daddymac-520 (orig r8368): ayoung | 2010-01-19 03:36:03 -0500
bug 15265: Battery discharges while on external power
Charging algorithm modified to take into account discharge while
running on AC, self-discharge and discharge when powered-off.
r38...@daddymac-520 (orig r8369): ayoung | 2010-01-19 03:40:28 -0500
Update set of installed firmwares even though this recipe is not currently in
use.
r38...@daddymac-520 (orig r8370): bklaas | 2010-01-19 09:30:37 -0500
Bug: 14870
Description: restart decodeStatePoller regardless of caller to
openAlarmWindow()
r38...@daddymac-520 (orig r8375): bklaas | 2010-01-19 15:07:25 -0500
Bug: 14870
Description:
- allow Player:alarmStop() to be executed when self.alarmState is not 'active'
- 9 minute snooze timer is set on a snooze event regardless of what type of
alarmInProgress it is.
- self.alarmInProgress is explicitly set to 'snooze' when the snooze command
is sent
- self.alarmInProgress is explicitly set to 'snooze' on an alarmState
notification of 'snooze'
- serverDisconnected notification is now set to not fire a fallback alarm when
alarmInProgress is set to snooze (instead, wait for the snooze timer to expire)
r38...@daddymac-520 (orig r8376): bklaas | 2010-01-19 15:10:24 -0500
Bug: 14870
Description: accidentally missed this part in the last checkin
- allow Player:alarmStop() to be executed when self.alarmState is not 'active'
Modified:
7.5/trunk/ (props changed)
7.5/trunk/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-bin_1.0.bb
7.5/trunk/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-src_svn.bb
7.5/trunk/squeezeos/poky/meta-squeezeos/packages/msp430/files/msp430-0003.txt
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
7.5/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Propchange: 7.5/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jan 19 13:14:55 2010
@@ -12,7 +12,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/fab4-autoswitch:5831
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/fab4-skin:4552
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/new-alsa:6567
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8360
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8376
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.5/trunk/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-bin_1.0.bb
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-bin_1.0.bb?rev=8377&r1=8376&r2=8377&view=diff
==============================================================================
---
7.5/trunk/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-bin_1.0.bb
(original)
+++
7.5/trunk/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-bin_1.0.bb
Tue Jan 19 13:14:55 2010
@@ -1,7 +1,7 @@
DESCRIPTION = "baby msp430 firmware"
LICENSE = "Confidential"
-PR="r27"
+PR="r28"
PROVIDES = "baby-msp430"
Modified:
7.5/trunk/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-src_svn.bb
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-src_svn.bb?rev=8377&r1=8376&r2=8377&view=diff
==============================================================================
---
7.5/trunk/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-src_svn.bb
(original)
+++
7.5/trunk/squeezeos/poky/meta-squeezeos/packages/msp430/baby-msp430-src_svn.bb
Tue Jan 19 13:14:55 2010
@@ -21,6 +21,9 @@
install -m 0644 ${S}/msp430-0001.txt ${INSTALL_DIR}/msp430-0001.txt
install -m 0644 ${S}/msp430-0002.txt ${INSTALL_DIR}/msp430-0002.txt
install -m 0644 ${S}/msp430-0003.txt ${INSTALL_DIR}/msp430-0003.txt
+ install -m 0644 ${S}/msp430-0003.txt ${INSTALL_DIR}/msp430-0004.txt
+ install -m 0644 ${S}/msp430-0003.txt ${INSTALL_DIR}/msp430-0005.txt
+ install -m 0644 ${S}/msp430-0003.txt ${INSTALL_DIR}/msp430-0006.txt
}
PACKAGES = "baby-msp430"
Modified:
7.5/trunk/squeezeos/poky/meta-squeezeos/packages/msp430/files/msp430-0003.txt
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeos/poky/meta-squeezeos/packages/msp430/files/msp430-0003.txt?rev=8377&r1=8376&r2=8377&view=diff
==============================================================================
---
7.5/trunk/squeezeos/poky/meta-squeezeos/packages/msp430/files/msp430-0003.txt
(original)
+++
7.5/trunk/squeezeos/poky/meta-squeezeos/packages/msp430/files/msp430-0003.txt
Tue Jan 19 13:14:55 2010
@@ -1,462 +1,478 @@
-#507
+#521
@e000
0A 12 09 12 4F 43 E2 B2 20 00 01 20 5F 43 C2 4F
-BE 02 B0 12 62 FA 09 4C B0 12 A8 FA 0A 4C 1F 42
-BC 02 3F 92 F3 2C 0F 5F 10 4F 2C E0 02 E2 0C E2
-B4 E1 62 E1 F8 E0 AC E0 76 E0 3C E0 D2 D3 8A 02
-C2 43 B6 02 49 93 03 20 B2 40 03 00 BC 02 4A 93
-03 20 B2 40 05 00 BC 02 B0 12 6C FB 4C 93 03 20
-E2 93 BA 02 D8 20 B2 40 06 00 BC 02 B0 12 6E EF
-B0 12 EE E2 CB 3C D2 C3 8A 02 C2 93 BE 02 07 24
-B2 40 07 00 BC 02 B0 12 BE E6 B0 12 60 F3 4A 93
-04 20 A2 42 BC 02 B0 12 EE E2 5F 42 9C 02 C2 43
-9C 02 4F 93 B3 24 B0 12 D0 E2 B0 3C B0 12 62 FA
-4C 93 09 20 82 43 BC 02 B0 12 22 EC B0 12 A8 FA
-0A 4C B0 12 62 FA 4A 93 03 24 B2 40 07 00 BC 02
-B0 12 90 F9 3C 90 A0 28 02 2C D2 43 B6 02 B0 12
-6C FB 4C 93 06 20 E2 93 BA 02 03 24 C2 93 B6 02
-8D 24 A2 42 BC 02 BA 3F E2 C2 25 00 E2 C2 24 00
-E2 C2 23 00 E2 D2 25 00 B0 12 20 F8 32 D0 D0 00
-B0 12 32 F2 B0 12 BE FA B0 12 EE E2 B0 12 62 FA
-B0 12 A8 FA 0A 4C C2 93 BE 02 09 24 C2 93 B6 02
-06 20 3C 40 64 00 B0 12 D2 F7 B0 12 C4 E2 4A 93
-04 24 C2 43 B6 02 B0 12 D0 E2 5F 42 9C 02 C2 43
-9C 02 4F 93 5B 24 C2 93 B6 02 58 20 B0 12 C4 E2
-55 3C C2 43 B6 02 4A 93 0A 20 32 C2 82 43 BC 02
-B0 12 22 EC B0 12 A8 FA B0 12 62 FA 09 4C 49 93
-03 24 B2 40 07 00 BC 02 B0 12 6C FB 4C 93 03 20
-E2 93 BA 02 40 20 32 C2 A2 43 BC 02 B0 12 6E EF
-B0 12 EE E2 B0 12 EE E2 B0 12 EE E2 B0 12 EE E2
-32 D2 2C 3C C2 93 BE 02 05 24 B2 40 03 00 BC 02
-B0 12 DC E2 49 93 05 24 B2 40 06 00 BC 02 B0 12
-EE E2 4A 93 06 20 B0 12 22 EC B0 12 A8 FA B0 12
-62 FA 5F 42 9C 02 C2 43 9C 02 4F 93 0F 24 B2 40
-03 00 BC 02 B0 12 BE E6 B0 12 EE E2 B0 12 60 F3
-05 3C B0 12 BE E6 B2 40 03 00 BC 02 E2 93 BA 02
-02 20 C2 43 BA 02 1F 42 B8 02 0F 93 42 24 1F 83
-34 24 1F 83 1B 24 1F 83 08 24 1F 83 49 20 C2 93
-BE 02 46 20 82 43 B8 02 43 3C B0 12 D2 FA 1C 82
-B0 02 3C F0 FF 7F 3C 90 65 00 3A 28 82 43 B8 02
-C2 93 BA 02 35 24 E2 43 BA 02 32 3C C2 93 BE 02
-2F 20 B0 12 56 F9 1C 82 B2 02 1D 72 B4 02 03 20
-3C 90 0B 00 02 28 D2 43 BA 02 B2 40 03 00 B8 02
-B0 12 D2 FA 82 4C B0 02 1B 3C B0 12 D2 FA 1C 82
-B0 02 3C F0 FF 7F 3C 90 65 00 12 28 A2 43 B8 02
-0F 3C C2 93 BE 02 0C 24 B0 12 D2 FA 82 4C B0 02
-B0 12 56 F9 82 4C B2 02 82 4D B4 02 92 43 B8 02
-30 40 46 FB B2 40 05 00 BC 02 B0 12 DC E2 30 41
-B2 40 07 00 BC 02 B0 12 DC E2 30 41 B0 12 BE E6
-3C 40 64 00 B0 12 D2 F7 B0 12 60 F3 30 41 3C 40
-32 00 B0 12 D2 F7 30 41 0A 12 09 12 08 12 07 12
-B0 12 90 F9 08 4C B0 12 AC F9 B0 12 46 F5 B0 12
-E2 F9 07 4C B0 12 46 F5 09 4C 4A 43 38 90 80 3E
-04 2C 37 90 81 3E 01 28 5A 43 92 B3 BC 02 DB 24
-82 43 72 02 B0 12 68 F8 1F 42 8C 02 1F 83 C4 24
-1F 83 8F 24 1F 83 09 24 3F 80 05 00 2E 24 3F 80
-10 00 2B 24 3F 80 0B 00 C8 20 A2 B3 BC 02 1F 20
-38 90 94 2A 09 2C B2 40 23 00 8C 02 82 43 8E 02
-3C 40 40 00 B0 12 7A FA 92 B3 BC 02 B6 24 92 53
-98 02 1F 42 98 02 1F 83 82 9F 86 02 AE 2C 82 93
-8E 02 02 24 92 83 8E 02 82 43 98 02 A6 3C A2 43
-8C 02 3C 42 B0 12 7A FA A0 3C 92 83 90 02 92 83
-96 02 B2 93 96 02 02 20 82 43 96 02 D2 83 92 02
-5F 42 92 02 5F 53 0A 20 F2 40 3C 00 92 02 0F 49
-1F 82 94 02 82 4F 9A 02 82 49 94 02 38 90 81 3E
-37 2C 37 90 80 3E 06 2C A2 43 8C 02 3C 40 80 00
-B0 12 7A FA F2 90 3C 00 92 02 07 20 B2 90 10 00
-9A 02 03 38 82 93 96 02 23 24 82 93 90 02 20 24
-39 90 A1 05 19 34 B2 90 18 00 8C 02 0F 24 92 53
-98 02 1F 42 98 02 1F 83 82 9F 88 02 04 2C 92 53
-8E 02 82 43 98 02 B0 12 D4 EE 57 3C 39 90 00 05
-54 34 B2 42 8C 02 51 3C B2 40 18 00 8C 02 4D 3C
-A2 43 8C 02 92 42 84 02 8E 02 1C 43 B0 12 7A FA
-44 3C 82 43 98 02 A2 B2 BC 02 28 24 A2 B3 BC 02
-1A 24 B2 90 6C 07 8E 02 38 2C 4A 93 36 24 B2 42
-8C 02 B2 40 B0 9A 90 02 F2 40 3C 00 92 02 B2 40
-D5 04 96 02 B0 12 46 F5 82 4C 94 02 3C 40 10 00
-B0 12 7A FA 22 3C B2 40 03 00 8C 02 3C 40 20 00
-B0 12 7A FA B2 40 78 00 90 02 17 3C 92 43 8C 02
-2C 42 B0 12 7A FA 11 3C A2 B2 BC 02 0E 24 39 90
-00 05 0B 34 B2 40 20 03 8E 02 A2 43 8C 02 3C 42
-B0 12 7A FA 02 3C A2 43 8C 02 30 40 42 FB 5F 42
-80 02 3F 90 47 00 1A 34 3F 90 46 00 6E 24 1F 83
-DA 24 1F 83 D4 24 3F 82 C6 24 3F 80 0A 00 BD 24
-1F 83 B5 24 3F 80 09 00 AB 24 3F 80 0A 00 A1 24
-3F 80 0A 00 3F 90 11 00 17 28 2A 3C 3F 80 47 00
-4D 24 3F 80 1C 00 46 24 3F 80 16 00 3F 24 3F 80
-03 00 BC 24 2F 83 36 24 1F 83 2F 24 3F 80 03 00
-3F 90 10 00 21 28 14 3C 0F 5F 10 4F 5E E5 5A E6
-80 E5 50 E6 80 E5 80 E5 46 E6 80 E5 3C E6 34 E6
-2A E6 22 E6 18 E6 0E E6 04 E6 F8 E5 F0 E5 E8 E5
-B2 40 07 06 6A 02 B2 40 05 04 6C 02 B2 40 03 02
-6E 02 92 43 70 02 30 41 3C 40 7E 00 5C 52 80 02
-B0 12 74 F9 82 4C 6A 02 30 41 1F 42 7C 02 A2 4F
-6A 02 30 41 92 42 7C 02 6A 02 30 41 92 42 72 02
-6A 02 30 41 F2 40 EE 00 6A 02 30 41 B0 12 62 FB
-82 4C 6A 02 82 4D 6C 02 30 41 B0 12 56 F9 82 4C
-6A 02 82 4D 6C 02 30 41 92 42 BC 02 6A 02 30 41
-92 42 8C 02 6A 02 30 41 92 42 78 02 6A 02 82 43
-78 02 30 41 B0 12 E2 F9 82 4C 6A 02 30 41 B0 12
-46 F5 82 4C 6A 02 30 41 B0 12 16 FA 82 4C 6A 02
-30 41 92 42 88 02 6A 02 30 41 B0 12 AC F9 82 4C
-6A 02 30 41 92 42 86 02 6A 02 30 41 B0 12 FC F9
-82 4C 6A 02 30 41 B0 12 90 F9 82 4C 6A 02 30 41
-B0 12 9A FB 82 4C 6A 02 30 41 92 42 8E 02 6A 02
-30 41 B0 12 58 FB 82 4C 6A 02 82 4D 6C 02 30 41
-92 42 74 02 6A 02 92 42 76 02 6C 02 30 41 D2 42
-7B 02 6A 02 C2 43 7B 02 30 41 D2 42 7A 02 6A 02
-C2 43 7A 02 30 41 D2 42 69 02 6A 02 C2 43 69 02
-F2 D0 10 00 19 00 F2 F0 EF 00 1A 00 30 41 B2 40
-07 05 6A 02 30 41 F2 40 CC 00 6A 02 30 41 21 83
-C1 43 00 00 6C 43 7D 40 05 00 5E 43 5F 43 B0 12
-04 F0 3C 40 0A 00 B0 12 D2 F7 C1 43 00 00 5C 43
-4D 43 5E 43 5F 43 B0 12 04 F0 C1 43 00 00 5C 43
-5D 43 4E 43 4F 43 B0 12 04 F0 D1 43 00 00 5C 43
-6D 43 5F 43 B0 12 04 F0 C1 43 00 00 5C 43 7D 40
-03 00 4F 43 B0 12 04 F0 C1 43 00 00 5C 43 6D 42
-5E 43 5F 43 B0 12 04 F0 E1 43 00 00 5C 43 7D 40
-06 00 4F 43 B0 12 04 F0 C1 43 00 00 5C 43 7D 40
-07 00 4E 43 B0 12 04 F0 C1 43 00 00 6C 43 4D 43
-5E 43 B0 12 04 F0 C1 43 00 00 6C 43 5D 43 4E 43
-B0 12 04 F0 C1 43 00 00 6C 43 6D 43 B0 12 04 F0
-C1 43 00 00 6C 43 7D 40 03 00 B0 12 04 F0 C1 43
-00 00 6C 43 6D 42 B0 12 04 F0 B0 12 FA E7 4D 43
-B0 12 04 F0 E1 43 00 00 7C 40 03 00 5D 43 B0 12
-04 F0 E1 43 00 00 7C 40 03 00 6D 43 B0 12 04 F0
-B0 12 FA E7 7D 40 03 00 B0 12 04 F0 B0 12 FA E7
-6D 42 B0 12 04 F0 B0 12 FA E7 7D 40 05 00 B0 12
-04 F0 B0 12 FA E7 7D 40 06 00 B0 12 04 F0 B0 12
-FA E7 7D 40 07 00 B0 12 04 F0 3C 40 64 00 B0 12
-D2 F7 B0 12 F6 F8 21 53 30 41 C1 43 02 00 7C 40
-03 00 30 41 0F 12 0E 12 0D 12 0C 12 0B 12 0A 12
-09 12 E2 B2 23 00 09 24 E2 C2 23 00 E2 C2 25 00
-B1 C0 D0 00 0E 00 D2 43 BE 02 E2 B3 23 00 82 24
-B0 12 D2 FA 1C 82 C2 02 3C F0 FF 7F 0A 4C 49 43
-1F 42 C0 02 0F 93 58 24 1F 83 38 24 3F 80 03 00
-50 20 3A 90 1B 00 1D 28 3A 90 30 00 13 28 3A 90
-40 00 17 28 3A 90 54 00 14 2C 1E 42 C8 02 1F 42
-CA 02 0E 5E 0F 6F 1E 53 0F 63 82 4E C8 02 82 4F
-CA 02 08 3C 92 52 C8 02 C8 02 92 62 CA 02 CA 02
-01 3C 69 42 D2 83 C4 02 49 93 3C 20 C2 93 C4 02
-25 20 82 43 C0 02 D2 43 C6 02 C2 43 C5 02 1C 42
-C8 02 1D 42 CA 02 B0 12 30 FA 2C 3C 3A 90 91 01
-03 28 3A 90 F4 01 12 28 3A 90 37 01 0D 28 3A 90
-90 01 0A 2C C2 43 C5 02 C2 93 C6 02 0A 24 0C 43
-0D 43 B0 12 30 FA 05 3C 59 43 14 3C A2 42 C0 02
-11 3C 82 43 C0 02 0E 3C B0 12 D2 FA 82 4C C2 02
-92 43 C0 02 F2 40 20 00 C4 02 82 43 C8 02 82 43
-CA 02 0A 43 1A 52 C2 02 3A F0 FF 7F 82 4A C2 02
-49 93 06 24 3C 40 14 00 B0 12 D2 F7 82 43 C0 02
-E2 C3 23 00 39 41 3A 41 3B 41 3C 41 3D 41 3E 41
-3F 41 00 13 3B 40 80 00 01 3C 0B 43 0A 12 09 12
-08 12 07 12 21 83 3F B0 80 7F 6F 24 3D B0 80 7F
-05 20 0C 4E 0D 4F 8B 10 0D EB 67 3C 0D 5D 08 4D
-4D 10 38 F0 00 FF 0D D8 0F 5F 08 4F 4F 10 38 F0
-00 FF 0F D8 09 4C 0A 4D 3D F0 80 00 C1 4D 00 00
-0B EA 0B EF 3B C0 7F FF 3A D0 80 00 3F D0 80 00
-0A 9F 02 20 09 9E 0A 24 0B 2C 0D 4F 0F 4A 0A 4D
-0C 4E 0E 49 09 4C 81 EB 00 00 02 3C 0B 93 43 20
-0C 43 08 4A 88 10 47 48 8F 10 48 8F 8F 10 0E 24
-38 90 19 00 28 2C 18 83 05 24 12 C3 4F 10 0E 10
-18 83 FB 23 12 C3 4F 10 0E 10 0C 10 0B 93 0B 24
-09 8E 4A 7F 4A 93 17 30 0C 6C 09 69 0C 43 4A 6A
-17 83 21 24 F7 3F 09 5E 4A 6F 04 28 4A 10 09 10
-0C 10 17 53 0C 6C 09 63 4A 63 07 63 17 93 13 38
-37 90 FF 00 13 34 7A C0 80 00 87 10 D1 51 00 00
-00 00 07 10 0A D7 0C 49 0D 4A 21 53 37 41 38 41
-39 41 3A 41 30 41 0D 43 0C 43 F7 3F 3D 40 FF FE
-D1 61 00 00 00 00 0D 10 3C 43 EF 3F 0A 12 F2 B2
-18 00 02 24 2F 43 01 3C 0F 43 4A 43 F2 B0 20 00
-18 00 01 24 5A 43 4A 5F 5F 42 D8 02 2F 93 05 20
+BC 02 B0 12 34 FB 09 4C B0 12 7A FB 0A 4C 1F 42
+BA 02 3F 92 F1 2C 0F 5F 10 4F 2C E0 FE E1 08 E2
+B0 E1 5E E1 F4 E0 AC E0 76 E0 3C E0 D2 D3 8A 02
+C2 43 B4 02 49 93 03 20 B2 40 03 00 BA 02 4A 93
+03 20 B2 40 05 00 BA 02 B0 12 68 FC 4C 93 03 20
+E2 93 B8 02 D6 20 B2 40 06 00 BA 02 B0 12 0A F0
+B0 12 EA E2 C9 3C D2 C3 8A 02 C2 93 BC 02 07 24
+B2 40 07 00 BA 02 B0 12 5A E7 B0 12 FC F3 4A 93
+04 20 A2 42 BA 02 B0 12 EA E2 5F 42 9A 02 C2 43
+9A 02 4F 93 B1 24 B0 12 CC E2 AE 3C 49 93 09 20
+82 43 BA 02 B0 12 BE EC B0 12 7A FB 0A 4C B0 12
+34 FB 4A 93 03 24 B2 40 07 00 BA 02 B0 12 62 FA
+3C 90 A0 28 02 2C D2 43 B4 02 B0 12 68 FC 4C 93
+06 20 E2 93 B8 02 03 24 C2 93 B4 02 8D 24 A2 42
+BA 02 BC 3F E2 C2 25 00 E2 C2 24 00 E2 C2 23 00
+E2 D2 25 00 B0 12 F2 F8 32 D0 D0 00 B0 12 CE F2
+B0 12 A6 FB B0 12 EA E2 B0 12 34 FB B0 12 7A FB
+0A 4C C2 93 BC 02 09 24 C2 93 B4 02 06 20 3C 40
+64 00 B0 12 A4 F8 B0 12 C0 E2 4A 93 04 24 C2 43
+B4 02 B0 12 CC E2 5F 42 9A 02 C2 43 9A 02 4F 93
+5B 24 C2 93 B4 02 58 20 B0 12 C0 E2 55 3C C2 43
+B4 02 4A 93 0A 20 32 C2 82 43 BA 02 B0 12 BE EC
+B0 12 7A FB B0 12 34 FB 09 4C 49 93 03 24 B2 40
+07 00 BA 02 B0 12 68 FC 4C 93 03 20 E2 93 B8 02
+40 20 32 C2 A2 43 BA 02 B0 12 0A F0 B0 12 EA E2
+B0 12 EA E2 B0 12 EA E2 B0 12 EA E2 32 D2 2C 3C
+C2 93 BC 02 05 24 B2 40 03 00 BA 02 B0 12 D8 E2
+49 93 05 24 B2 40 06 00 BA 02 B0 12 EA E2 4A 93
+06 20 B0 12 BE EC B0 12 7A FB B0 12 34 FB 5F 42
+9A 02 C2 43 9A 02 4F 93 0F 24 B2 40 03 00 BA 02
+B0 12 5A E7 B0 12 EA E2 B0 12 FC F3 05 3C B0 12
+5A E7 B2 40 03 00 BA 02 E2 93 B8 02 02 20 C2 43
+B8 02 1F 42 B6 02 0F 93 42 24 1F 83 34 24 1F 83
+1B 24 1F 83 08 24 1F 83 49 20 C2 93 BC 02 46 20
+82 43 B6 02 43 3C B0 12 BA FB 1C 82 AE 02 3C F0
+FF 7F 3C 90 65 00 3A 28 82 43 B6 02 C2 93 B8 02
+35 24 E2 43 B8 02 32 3C C2 93 BC 02 2F 20 B0 12
+28 FA 1C 82 B0 02 1D 72 B2 02 03 20 3C 90 0B 00
+02 28 D2 43 B8 02 B2 40 03 00 B6 02 B0 12 BA FB
+82 4C AE 02 1B 3C B0 12 BA FB 1C 82 AE 02 3C F0
+FF 7F 3C 90 65 00 12 28 A2 43 B6 02 0F 3C C2 93
+BC 02 0C 24 B0 12 BA FB 82 4C AE 02 B0 12 28 FA
+82 4C B0 02 82 4D B2 02 92 43 B6 02 30 40 42 FC
+B2 40 05 00 BA 02 B0 12 D8 E2 30 41 B2 40 07 00
+BA 02 B0 12 D8 E2 30 41 B0 12 5A E7 3C 40 64 00
+B0 12 A4 F8 B0 12 FC F3 30 41 3C 40 32 00 B0 12
+A4 F8 30 41 0A 12 09 12 82 93 96 02 02 24 92 83
+96 02 92 B3 BA 02 38 20 A2 B2 BA 02 3C 25 B2 B2
+8C 02 15 24 82 43 98 02 3C 40 20 FD 1D 42 84 02
+B0 12 90 FB 1D 42 8E 02 B0 12 CE FB 82 4C 96 02
+92 92 8E 02 84 02 03 2C 92 42 84 02 8E 02 82 93
+96 02 03 24 3F 40 2A 03 08 3C A2 B3 BA 02 03 24
+3F 40 C0 5D 02 3C 3F 40 28 23 92 53 98 02 1F 92
+98 02 07 2C 82 93 8E 02 02 24 92 83 8E 02 82 43
+98 02 A2 43 8C 02 07 3D 82 43 72 02 B0 12 3A F9
+B0 12 62 FA 0A 4C B0 12 B4 FA 09 4C B0 12 E2 F5
+1F 42 8C 02 1F 83 E7 24 1F 83 95 24 1F 83 09 24
+3F 80 05 00 30 24 3F 80 10 00 2D 24 3F 80 0B 00
+EA 20 A2 B2 BA 02 24 24 92 53 98 02 1F 42 98 02
+82 9F 86 02 07 2C 82 93 8E 02 02 24 92 83 8E 02
+82 43 98 02 A2 B3 BA 02 0D 20 3A 90 94 2A D3 2C
+B2 40 23 00 8C 02 82 43 8E 02 3C 40 40 00 B0 12
+4C FB C9 3C A2 43 8C 02 3C 42 B0 12 4C FB C3 3C
+92 43 8C 02 C0 3C 92 83 90 02 D2 83 92 02 5F 42
+92 02 5F 53 09 20 F2 40 3C 00 92 02 0F 4C 1F 82
+94 02 82 4C 94 02 01 3C 0F 43 3A 90 81 3E 45 2C
+3F 90 10 00 03 38 82 93 96 02 3F 24 82 93 90 02
+3C 24 39 90 80 3E 32 28 5E 42 8A 02 5F 42 8A 02
+0F 11 0E FF 1E B3 24 24 3C 90 A1 05 1D 34 B2 90
+18 00 8C 02 0E 24 92 53 98 02 1F 42 98 02 82 9F
+88 02 04 2C 92 53 8E 02 82 43 98 02 B0 12 70 EF
+82 3C 3C 90 00 05 7F 34 B2 42 8C 02 F2 40 3C 00
+92 02 82 4C 94 02 77 3C B2 40 18 00 8C 02 73 3C
+1C 42 8E 02 0D 43 B0 12 F0 F7 6D 3C 1C 42 8E 02
+3D 40 80 00 B0 12 F0 F7 66 3C 1C 42 84 02 1D 43
+B0 12 F0 F7 60 3C A2 B2 BA 02 47 24 A2 B3 BA 02
+37 24 5E 42 8A 02 5F 42 8A 02 0F 11 0E FF 1E B3
+0D 24 B2 90 08 07 8E 02 09 2C 3A 90 80 3E 06 2C
+3C 90 00 05 03 34 39 90 81 3E 0E 2C 92 53 98 02
+B2 90 D1 02 98 02 3F 28 82 93 8E 02 02 24 92 83
+8E 02 82 43 98 02 37 3C B2 42 8C 02 82 43 98 02
+B2 40 B0 9A 90 02 F2 40 3C 00 92 02 B2 40 D5 04
+96 02 82 4C 94 02 3C 40 10 00 B0 12 4C FB 23 3C
+B2 40 03 00 8C 02 82 43 98 02 3C 40 20 00 B0 12
+4C FB B2 40 78 00 90 02 16 3C 92 43 8C 02 2C 42
+B0 12 4C FB 10 3C A2 B2 BA 02 0D 24 3C 90 00 05
+0A 34 B2 40 20 03 8E 02 A2 43 8C 02 3C 42 B0 12
+4C FB 82 43 98 02 30 40 42 FC 5F 42 80 02 3F 90
+47 00 1A 34 3F 90 46 00 6E 24 1F 83 DA 24 1F 83
+D4 24 3F 82 C6 24 3F 80 0A 00 BD 24 1F 83 B5 24
+3F 80 09 00 AB 24 3F 80 0A 00 A1 24 3F 80 0A 00
+3F 90 11 00 17 28 2A 3C 3F 80 47 00 4D 24 3F 80
+1C 00 46 24 3F 80 16 00 3F 24 3F 80 03 00 BC 24
+2F 83 36 24 1F 83 2F 24 3F 80 03 00 3F 90 10 00
+21 28 14 3C 0F 5F 10 4F FA E5 F6 E6 1C E6 EC E6
+1C E6 1C E6 E2 E6 1C E6 D8 E6 D0 E6 C6 E6 BE E6
+B4 E6 AA E6 A0 E6 94 E6 8C E6 84 E6 B2 40 07 06
+6A 02 B2 40 05 04 6C 02 B2 40 03 02 6E 02 92 43
+70 02 30 41 3C 40 7E 00 5C 52 80 02 B0 12 46 FA
+82 4C 6A 02 30 41 1F 42 7C 02 A2 4F 6A 02 30 41
+92 42 7C 02 6A 02 30 41 92 42 72 02 6A 02 30 41
+F2 40 EE 00 6A 02 30 41 B0 12 5E FC 82 4C 6A 02
+82 4D 6C 02 30 41 B0 12 28 FA 82 4C 6A 02 82 4D
+6C 02 30 41 92 42 BA 02 6A 02 30 41 92 42 8C 02
+6A 02 30 41 92 42 78 02 6A 02 82 43 78 02 30 41
+B0 12 B4 FA 82 4C 6A 02 30 41 B0 12 E2 F5 82 4C
+6A 02 30 41 B0 12 E8 FA 82 4C 6A 02 30 41 92 42
+88 02 6A 02 30 41 B0 12 7E FA 82 4C 6A 02 30 41
+92 42 86 02 6A 02 30 41 B0 12 CE FA 82 4C 6A 02
+30 41 B0 12 62 FA 82 4C 6A 02 30 41 B0 12 96 FC
+82 4C 6A 02 30 41 92 42 8E 02 6A 02 30 41 B0 12
+54 FC 82 4C 6A 02 82 4D 6C 02 30 41 92 42 74 02
+6A 02 92 42 76 02 6C 02 30 41 D2 42 7B 02 6A 02
+C2 43 7B 02 30 41 D2 42 7A 02 6A 02 C2 43 7A 02
+30 41 D2 42 69 02 6A 02 C2 43 69 02 F2 D0 10 00
+19 00 F2 F0 EF 00 1A 00 30 41 B2 40 21 05 6A 02
+30 41 F2 40 CC 00 6A 02 30 41 21 83 C1 43 00 00
+6C 43 7D 40 05 00 5E 43 5F 43 B0 12 A0 F0 3C 40
+0A 00 B0 12 A4 F8 C1 43 00 00 5C 43 4D 43 5E 43
+5F 43 B0 12 A0 F0 C1 43 00 00 5C 43 5D 43 4E 43
+4F 43 B0 12 A0 F0 D1 43 00 00 5C 43 6D 43 5F 43
+B0 12 A0 F0 C1 43 00 00 5C 43 7D 40 03 00 4F 43
+B0 12 A0 F0 C1 43 00 00 5C 43 6D 42 5E 43 5F 43
+B0 12 A0 F0 E1 43 00 00 5C 43 7D 40 06 00 4F 43
+B0 12 A0 F0 C1 43 00 00 5C 43 7D 40 07 00 4E 43
+B0 12 A0 F0 C1 43 00 00 6C 43 4D 43 5E 43 B0 12
+A0 F0 C1 43 00 00 6C 43 5D 43 4E 43 B0 12 A0 F0
+C1 43 00 00 6C 43 6D 43 B0 12 A0 F0 C1 43 00 00
+6C 43 7D 40 03 00 B0 12 A0 F0 C1 43 00 00 6C 43
+6D 42 B0 12 A0 F0 B0 12 96 E8 4D 43 B0 12 A0 F0
+E1 43 00 00 7C 40 03 00 5D 43 B0 12 A0 F0 E1 43
+00 00 7C 40 03 00 6D 43 B0 12 A0 F0 B0 12 96 E8
+7D 40 03 00 B0 12 A0 F0 B0 12 96 E8 6D 42 B0 12
+A0 F0 B0 12 96 E8 7D 40 05 00 B0 12 A0 F0 B0 12
+96 E8 7D 40 06 00 B0 12 A0 F0 B0 12 96 E8 7D 40
+07 00 B0 12 A0 F0 3C 40 64 00 B0 12 A4 F8 B0 12
+C8 F9 21 53 30 41 C1 43 02 00 7C 40 03 00 30 41
+0F 12 0E 12 0D 12 0C 12 0B 12 0A 12 09 12 E2 B2
+23 00 09 24 E2 C2 23 00 E2 C2 25 00 B1 C0 D0 00
+0E 00 D2 43 BC 02 E2 B3 23 00 82 24 B0 12 BA FB
+1C 82 C0 02 3C F0 FF 7F 0A 4C 49 43 1F 42 BE 02
+0F 93 58 24 1F 83 38 24 3F 80 03 00 50 20 3A 90
+1B 00 1D 28 3A 90 30 00 13 28 3A 90 40 00 17 28
+3A 90 54 00 14 2C 1E 42 C6 02 1F 42 C8 02 0E 5E
+0F 6F 1E 53 0F 63 82 4E C6 02 82 4F C8 02 08 3C
+92 52 C6 02 C6 02 92 62 C8 02 C8 02 01 3C 69 42
+D2 83 C2 02 49 93 3C 20 C2 93 C2 02 25 20 82 43
+BE 02 D2 43 C4 02 C2 43 C3 02 1C 42 C6 02 1D 42
+C8 02 B0 12 02 FB 2C 3C 3A 90 91 01 03 28 3A 90
+F4 01 12 28 3A 90 37 01 0D 28 3A 90 90 01 0A 2C
+C2 43 C3 02 C2 93 C4 02 0A 24 0C 43 0D 43 B0 12
+02 FB 05 3C 59 43 14 3C A2 42 BE 02 11 3C 82 43
+BE 02 0E 3C B0 12 BA FB 82 4C C0 02 92 43 BE 02
+F2 40 20 00 C2 02 82 43 C6 02 82 43 C8 02 0A 43
+1A 52 C0 02 3A F0 FF 7F 82 4A C0 02 49 93 06 24
+3C 40 14 00 B0 12 A4 F8 82 43 BE 02 E2 C3 23 00
+39 41 3A 41 3B 41 3C 41 3D 41 3E 41 3F 41 00 13
+3B 40 80 00 01 3C 0B 43 0A 12 09 12 08 12 07 12
+21 83 3F B0 80 7F 6F 24 3D B0 80 7F 05 20 0C 4E
+0D 4F 8B 10 0D EB 67 3C 0D 5D 08 4D 4D 10 38 F0
+00 FF 0D D8 0F 5F 08 4F 4F 10 38 F0 00 FF 0F D8
+09 4C 0A 4D 3D F0 80 00 C1 4D 00 00 0B EA 0B EF
+3B C0 7F FF 3A D0 80 00 3F D0 80 00 0A 9F 02 20
+09 9E 0A 24 0B 2C 0D 4F 0F 4A 0A 4D 0C 4E 0E 49
+09 4C 81 EB 00 00 02 3C 0B 93 43 20 0C 43 08 4A
+88 10 47 48 8F 10 48 8F 8F 10 0E 24 38 90 19 00
+28 2C 18 83 05 24 12 C3 4F 10 0E 10 18 83 FB 23
+12 C3 4F 10 0E 10 0C 10 0B 93 0B 24 09 8E 4A 7F
+4A 93 17 30 0C 6C 09 69 0C 43 4A 6A 17 83 21 24
+F7 3F 09 5E 4A 6F 04 28 4A 10 09 10 0C 10 17 53
+0C 6C 09 63 4A 63 07 63 17 93 13 38 37 90 FF 00
+13 34 7A C0 80 00 87 10 D1 51 00 00 00 00 07 10
+0A D7 0C 49 0D 4A 21 53 37 41 38 41 39 41 3A 41
+30 41 0D 43 0C 43 F7 3F 3D 40 FF FE D1 61 00 00
+00 00 0D 10 3C 43 EF 3F 0A 12 F2 B2 18 00 02 24
+2F 43 01 3C 0F 43 4A 43 F2 B0 20 00 18 00 01 24
+5A 43 4A 5F 5F 42 D6 02 2F 93 05 20 4A 93 03 20
+C2 93 D7 02 0E 24 0F 93 12 20 6A 93 10 20 C2 93
+D7 02 0D 20 1C 43 1D 43 B0 12 EA F9 D2 43 D7 02
+06 3C 1C 43 3D 43 B0 12 EA F9 D2 43 D7 02 0E 43
+5A 93 01 20 1E 43 0F 43 7A 90 03 00 01 20 1F 43
+0E DF 0E 93 02 24 C2 43 D7 02 C2 4A D6 02 F2 B0
+80 FF 20 00 02 24 2F 43 01 3C 0F 43 4A 43 F2 B2
+20 00 01 24 5A 43 4A 5F 5F 42 D8 02 2F 93 05 20
4A 93 03 20 C2 93 D9 02 0E 24 0F 93 12 20 6A 93
-10 20 C2 93 D9 02 0D 20 1C 43 1D 43 B0 12 18 F9
-D2 43 D9 02 06 3C 1C 43 3D 43 B0 12 18 F9 D2 43
+10 20 C2 93 D9 02 0D 20 0C 43 1D 43 B0 12 EA F9
+D2 43 D9 02 06 3C 0C 43 3D 43 B0 12 EA F9 D2 43
D9 02 0E 43 5A 93 01 20 1E 43 0F 43 7A 90 03 00
01 20 1F 43 0E DF 0E 93 02 24 C2 43 D9 02 C2 4A
-D8 02 F2 B0 80 FF 20 00 02 24 2F 43 01 3C 0F 43
-4A 43 F2 B2 20 00 01 24 5A 43 4A 5F 5F 42 DA 02
-2F 93 05 20 4A 93 03 20 C2 93 DB 02 0E 24 0F 93
-12 20 6A 93 10 20 C2 93 DB 02 0D 20 0C 43 1D 43
-B0 12 18 F9 D2 43 DB 02 06 3C 0C 43 3D 43 B0 12
-18 F9 D2 43 DB 02 0E 43 5A 93 01 20 1E 43 0F 43
-7A 90 03 00 01 20 1F 43 0E DF 0E 93 02 24 C2 43
-DB 02 C2 4A DA 02 3A 41 30 41 5F 42 80 02 3F 90
-47 00 0D 34 3F 90 46 00 3A 24 3F 80 32 00 53 24
-2F 82 44 24 2F 82 3E 24 2F 83 38 24 15 3C 3F 80
-47 00 26 24 3F 80 1C 00 06 24 3F 80 1B 00 1C 24
-1F 83 14 24 09 3C F2 90 DE 00 6A 02 3F 20 D2 43
-68 02 B0 12 E6 FA 3A 3C B2 40 3D 22 6A 02 82 43
-6C 02 82 43 6E 02 82 43 70 02 30 3C 1F 42 7C 02
-9F 42 6A 02 00 00 2A 3C 92 42 6A 02 7C 02 26 3C
-1C 42 6A 02 1D 42 6C 02 B0 12 80 FB 1F 3C 1C 42
-6A 02 1D 42 6C 02 B0 12 8A FB 18 3C 92 42 6A 02
-88 02 14 3C 92 42 6A 02 86 02 10 3C 82 93 6A 02
-02 24 2E 43 01 3C 0E 43 5F 42 8A 02 6F C3 4E DF
-C2 4E 8A 02 03 3C 92 42 6A 02 8E 02 82 43 6E 02
-82 43 70 02 5F 42 80 02 82 4F 6A 02 82 43 6C 02
-30 41 0A 12 32 C2 4C 43 B0 12 0A FB B0 12 E6 FA
-B0 12 20 F8 B0 12 94 FB B0 12 76 FB B0 12 C8 F9
-B0 12 2C EE 82 43 BC 02 F2 F0 DF 00 29 00 F2 F0
-DF 00 2A 00 3C 40 90 01 B0 12 D2 F7 32 D2 4A 43
-0E 3C 32 D0 D0 00 1C 43 B0 12 D2 F7 B0 12 A8 FA
-4C 93 04 20 B0 12 62 FA 4C 93 01 24 5A 43 4A 93
-F0 27 C2 43 B6 02 B0 12 A8 FA 4C 93 03 24 B2 40
-03 00 BC 02 B0 12 62 FA 4C 93 03 24 B2 D0 05 00
-BC 02 F2 D0 20 00 29 00 3C 40 32 00 B0 12 D2 F7
-B0 12 BE E6 B0 12 60 F3 B0 12 32 F2 B0 12 BE FA
-B0 12 44 F8 B0 12 F6 F8 B0 12 BE F3 5C 43 B0 12
-0A FB 3A 41 30 41 0F 12 0E 12 0D 12 0C 12 0B 12
-0A 12 09 12 B2 90 0A 00 1E 01 43 20 92 53 9E 02
-82 63 A0 02 5C 42 BC 02 B0 12 92 FA 92 92 A0 02
-A4 02 05 28 0C 20 92 92 9E 02 A2 02 08 2C A2 92
-BC 02 03 20 B1 C0 D0 00 0E 00 D2 43 9C 02 A2 92
-BC 02 08 20 B0 12 E2 F9 3C 90 99 3A 03 28 B1 C0
-D0 00 0E 00 82 93 BC 02 0E 20 F2 90 03 00 AE 02
-07 28 E2 B3 18 00 09 24 B1 C0 D0 00 0E 00 05 3C
-D2 53 AE 02 02 3C C2 43 AE 02 C2 93 9D 02 09 24
-29 42 3A 40 A6 02 3F 4A 0F 93 01 24 8F 12 19 83
-FA 23 39 41 3A 41 3B 41 3C 41 3D 41 3E 41 3F 41
-00 13 0A 12 09 12 08 12 07 12 07 4F 07 ED 0A 4F
-0A 5A 8A 10 4A 4A 0A 93 40 24 7F D0 80 00 0B 4D
-0B 5B 8B 10 4B 4B 0B 93 33 24 7D D0 80 00 0B 5A
-3B 80 7F 00 08 43 09 43 0E 93 09 24 1A 43 0E 10
-02 28 08 5C 09 6D 09 10 08 10 0A 5A F8 2B 1A 43
-0F 10 02 28 08 5C 09 6D 09 10 08 10 0E 10 4A 5A
-F7 23 49 93 02 34 1B 53 03 3C 0E 6E 08 68 49 69
-0E 6E 08 63 49 63 0B 63 1B 93 0F 38 3B 90 FF 00
-0F 34 49 59 8B 10 09 DB 07 57 09 10 0D 49 0C 48
-37 41 38 41 39 41 3A 41 30 41 0C 43 0D 43 F8 3F
-3D 40 FF FE 3C 43 07 57 0D 10 F2 3F 21 83 B0 12
-76 FB B0 12 C8 F9 B0 12 E6 FA F2 C2 2D 00 F2 C2
-2B 00 D1 43 00 00 6C 43 7D 40 03 00 4E 43 4F 43
-B0 12 04 F0 C1 43 00 00 5C 43 4D 43 B0 12 04 F0
-C1 43 00 00 5C 43 6D 43 B0 12 04 F0 C1 43 00 00
-5C 43 6D 42 5E 43 B0 12 04 F0 D1 43 00 00 5C 43
-7D 40 06 00 4E 43 B0 12 04 F0 C1 43 00 00 6C 43
-4D 43 5E 43 B0 12 04 F0 C1 43 00 00 7C 40 03 00
-5D 43 4E 43 B0 12 04 F0 C1 43 00 00 7C 40 03 00
-6D 43 B0 12 04 F0 C1 43 00 00 7C 40 03 00 6D 42
-B0 12 04 F0 3C 40 32 00 B0 12 D2 F7 B0 12 6C FB
-21 53 30 41 0A 12 09 12 B0 12 90 F9 0A 4C B0 12
-E2 F9 0C 8A 3C 80 C2 01 B0 12 B0 F8 09 4C 0A 4D
-3E 40 00 20 3F 40 7D 45 B0 12 FC F4 0C 93 12 34
-0C 49 0D 4A 3E 40 63 D4 3F 40 B5 BB B0 12 82 ED
-3E 40 52 B8 3F 40 2E 42 B0 12 4A E9 B0 12 9A F2
-0A 4C 11 3C 0C 49 0D 4A 3E 40 4A F0 3F 40 06 BB
-B0 12 82 ED 3E 40 BB A7 3F 40 ED 41 B0 12 4A E9
-B0 12 9A F2 0A 4C 3A 90 05 00 06 38 3A 90 24 00
-05 38 3A 40 23 00 02 3C 3A 40 05 00 B0 12 E2 F6
-3C 40 2D 00 0D 4A B0 12 1C FB 30 40 46 FB 21 83
-B0 12 76 FB B0 12 C8 F9 B0 12 E6 FA F2 C2 2D 00
-F2 C2 2B 00 D1 43 00 00 6C 43 7D 40 03 00 4E 43
-4F 43 B0 12 04 F0 C1 43 00 00 5C 43 4D 43 5E 43
-B0 12 04 F0 D1 43 00 00 5C 43 6D 43 4E 43 5F 43
-B0 12 04 F0 C1 43 00 00 5C 43 6D 42 5E 43 4F 43
-B0 12 04 F0 C1 43 00 00 5C 43 7D 40 06 00 B0 12
-04 F0 C1 43 00 00 6C 43 4D 43 B0 12 04 F0 C1 43
-00 00 6C 43 7D 40 05 00 B0 12 04 F0 C1 43 00 00
-7C 40 03 00 6D 42 4E 43 B0 12 04 F0 B0 12 6C FB
-21 53 30 41 0A 12 09 12 08 12 0B 4C 5A 41 08 00
-4D 4D 1C 43 B0 12 54 F7 4B 4B 1B 83 16 24 1B 83
-0B 24 1B 83 1A 20 3D 40 1A 00 3B 40 19 00 39 40
-1B 00 38 40 10 00 11 3C 3D 40 2A 00 3B 40 29 00
-39 40 2E 00 38 40 2F 00 08 3C 3D 40 22 00 3B 40
-21 00 39 40 26 00 38 40 27 00 4E 93 03 20 CD CC
-00 00 02 3C CD DC 00 00 4F 93 03 20 CB CC 00 00
-02 3C CB DC 00 00 5A B3 03 20 C8 CC 00 00 02 3C
-C8 DC 00 00 6A B3 03 20 C9 CC 00 00 02 3C C9 DC
-00 00 30 40 44 FB 0A 12 21 83 B0 12 2C EE 3C 40
-0A 00 B0 12 D2 F7 02 3C B0 12 22 EC B0 12 FC F9
-3C 90 40 1F F9 2B E2 B2 20 00 03 24 82 43 B8 02
-02 3C A2 42 B8 02 82 43 BC 02 C1 43 00 00 5C 43
-6D 42 5E 43 5F 43 B0 12 04 F0 3C 40 0A 00 B0 12
-D2 F7 B0 12 A8 FA 0A 4C B0 12 62 FA 4A 93 03 24
-B2 D0 03 00 BC 02 4C 93 03 24 B2 D0 05 00 BC 02
-82 93 BC 02 05 20 B0 12 22 EC 82 93 BC 02 DD 27
-B0 12 BE E6 C2 43 B6 02 3C 40 2C 01 B0 12 D2 F7
-21 53 3A 41 30 41 0F 12 E2 B2 03 00 14 20 F2 B2
-03 00 2B 24 B2 90 03 00 7E 02 08 20 5F 42 81 02
-D2 4F 6A 02 6F 00 D2 53 81 02 1F 3C 92 43 7E 02
-C2 43 6F 00 1A 3C 1F 42 7E 02 2F 83 1D 24 2F 83
-2F 93 0A 28 92 43 7E 02 5F 42 6E 00 B2 40 AD DE
-6A 02 82 43 6C 02 09 3C 5F 42 81 02 DF 42 6E 00
-6A 02 D2 53 81 02 A2 42 7E 02 F2 92 81 02 0C 28
-F2 40 07 00 81 02 08 3C D2 42 6E 00 80 02 C2 43
-81 02 B2 40 05 00 7E 02 3F 41 00 13 0F 12 0E 12
-0D 12 0C 12 0B 12 E2 B3 6D 00 18 24 E2 C3 6D 00
-1F 42 7E 02 1F 83 03 24 2F 82 0B 24 07 3C F2 B0
-10 00 69 00 0B 20 A2 43 7E 02 08 3C 92 43 7E 02
-05 3C B2 40 03 00 7E 02 B0 12 EE E4 E2 B2 6D 00
-0C 24 E2 C2 6D 00 A2 92 7E 02 05 20 B0 12 4A EB
-92 43 7E 02 02 3C 92 43 7E 02 F2 B2 6D 00 04 24
-F2 C2 6D 00 92 43 7E 02 D2 B3 6D 00 04 24 D2 C3
-6D 00 92 43 7E 02 3B 41 3C 41 3D 41 3E 41 3F 41
-00 13 0A 12 B0 12 20 F8 B2 40 F8 38 B0 01 B2 40
-F6 F0 B2 01 F2 40 F6 00 4A 00 92 B3 B2 01 FD 23
-3B 40 20 4E 3A 40 E8 03 3C 40 10 00 3D 40 22 02
-3E 40 42 02 3F 40 02 02 2F 53 8F 4B FE FF 2E 53
-8E 4A FE FF 2D 53 8D 4B FE FF 1C 83 F5 23 E2 42
-48 00 F2 40 10 00 49 00 B2 D0 03 00 B0 01 D2 43
-00 02 C2 43 01 02 3A 41 30 41 0B 4D 0E 4B 3B F0
-80 7F 2D 24 0B 5B 8B 10 7E D0 80 00 3B 80 7F 00
-26 30 3B 90 0F 00 11 24 1D 34 0E 11 0C 10 1E 93
-01 24 FB 3F 1B 83 03 30 0C 5C 0E 6E FB 3F 0D 93
-02 34 3E E3 1E 53 0C 4E 30 41 8E 10 8C 10 4C 4C
-0C DE 3C 90 00 80 01 24 05 3C 0D 93 03 34 3C 40
-00 80 30 41 0D 93 FB 33 3C 40 FF 7F 30 41 0C 43
+D8 02 3A 41 30 41 5F 42 80 02 3F 90 47 00 0D 34
+3F 90 46 00 3A 24 3F 80 32 00 53 24 2F 82 44 24
+2F 82 3E 24 2F 83 38 24 15 3C 3F 80 47 00 26 24
+3F 80 1C 00 06 24 3F 80 1B 00 1C 24 1F 83 14 24
+09 3C F2 90 DE 00 6A 02 3F 20 D2 43 68 02 B0 12
+E2 FB 3A 3C B2 40 3D 22 6A 02 82 43 6C 02 82 43
+6E 02 82 43 70 02 30 3C 1F 42 7C 02 9F 42 6A 02
+00 00 2A 3C 92 42 6A 02 7C 02 26 3C 1C 42 6A 02
+1D 42 6C 02 B0 12 7C FC 1F 3C 1C 42 6A 02 1D 42
+6C 02 B0 12 86 FC 18 3C 92 42 6A 02 88 02 14 3C
+92 42 6A 02 86 02 10 3C 82 93 6A 02 02 24 2E 43
+01 3C 0E 43 5F 42 8A 02 6F C3 4E DF C2 4E 8A 02
+03 3C 92 42 6A 02 8E 02 82 43 6E 02 82 43 70 02
+5F 42 80 02 82 4F 6A 02 82 43 6C 02 30 41 0A 12
+32 C2 4C 43 B0 12 06 FC B0 12 E2 FB B0 12 F2 F8
+B0 12 90 FC B0 12 72 FC B0 12 9A FA B0 12 C8 EE
+82 43 BA 02 F2 F0 DF 00 29 00 F2 F0 DF 00 2A 00
+3C 40 90 01 B0 12 A4 F8 32 D2 4A 43 0E 3C 32 D0
+D0 00 1C 43 B0 12 A4 F8 B0 12 7A FB 4C 93 04 20
+B0 12 34 FB 4C 93 01 24 5A 43 4A 93 F0 27 C2 43
+B4 02 B0 12 7A FB 4C 93 03 24 B2 40 03 00 BA 02
+B0 12 34 FB 4C 93 03 24 B2 D0 05 00 BA 02 F2 D0
+20 00 29 00 3C 40 32 00 B0 12 A4 F8 B0 12 5A E7
+B0 12 FC F3 B0 12 CE F2 B0 12 A6 FB B0 12 16 F9
+B0 12 C8 F9 B0 12 5A F4 5C 43 B0 12 06 FC 3A 41
30 41 0F 12 0E 12 0D 12 0C 12 0B 12 0A 12 09 12
-F2 B2 2B 00 1D 24 B0 12 56 F9 B0 12 74 F4 09 4C
-0A 4D B0 12 D2 FA 09 DC 0E 49 0F 4A 1E 82 CE 02
-1F 72 D0 02 82 4E D2 02 82 4F D4 02 82 49 CE 02
-82 4A D0 02 F2 C2 2D 00 F2 C2 2B 00 D2 C3 D6 02
-39 41 3A 41 3B 41 3C 41 3D 41 3E 41 3F 41 00 13
-21 83 81 43 00 00 F2 D0 10 00 19 00 F2 F0 EF 00
-1A 00 92 43 7E 02 D2 D3 69 00 F2 40 07 00 68 00
-F2 40 C1 00 69 00 C2 43 6D 00 B2 40 10 00 18 01
-F2 D0 06 00 1B 00 F2 40 C0 00 69 00 F2 40 0F 00
-6C 00 E2 D2 01 00 F2 D2 01 00 C2 43 7A 02 3F 40
-7B 02 CF 43 00 00 82 43 78 02 21 53 30 41 0A 12
-09 12 E2 B3 D6 02 06 20 3C 40 14 F4 B0 12 8C F8
-E2 D3 D6 02 D2 B3 D6 02 1B 20 D2 D3 D6 02 F2 C2
-2D 00 F2 D2 2A 00 F2 C2 29 00 F2 C2 2C 00 B0 12
-56 F9 B0 12 74 F4 0A 4C 09 4D B0 12 D2 FA 0A DC
-82 4A CE 02 82 49 D0 02 F2 C2 2A 00 F2 D2 2D 00
-30 40 46 FB 0A 12 09 12 B0 12 56 F9 B0 12 74 F4
-09 4C 0A 4D B0 12 D2 FA 09 DC 0E 49 0F 4A 1E 82
-CE 02 1F 72 D0 02 1F 93 13 28 03 20 3E 90 A1 86
-0F 28 B2 40 A0 86 D2 02 92 43 D4 02 82 49 CE 02
-82 4A D0 02 F2 C2 2D 00 F2 C2 2B 00 D2 C3 D6 02
-30 40 46 FB 3E F0 1F 00 04 24 0C 5C 0D 6D 1E 83
-FC 23 30 41 0C 5C 0D 6D 0C 5C 0D 6D 0C 5C 0D 6D
+B2 90 0A 00 1E 01 43 20 92 53 9C 02 82 63 9E 02
+5C 42 BA 02 B0 12 64 FB 92 92 9E 02 A2 02 05 28
+0C 20 92 92 9C 02 A0 02 08 2C A2 92 BA 02 03 20
+B1 C0 D0 00 0E 00 D2 43 9A 02 A2 92 BA 02 08 20
+B0 12 B4 FA 3C 90 99 3A 03 28 B1 C0 D0 00 0E 00
+82 93 BA 02 0E 20 F2 90 03 00 AC 02 07 28 E2 B3
+18 00 09 24 B1 C0 D0 00 0E 00 05 3C D2 53 AC 02
+02 3C C2 43 AC 02 C2 93 9B 02 09 24 29 42 3A 40
+A4 02 3F 4A 0F 93 01 24 8F 12 19 83 FA 23 39 41
+3A 41 3B 41 3C 41 3D 41 3E 41 3F 41 00 13 0A 12
+09 12 08 12 07 12 07 4F 07 ED 0A 4F 0A 5A 8A 10
+4A 4A 0A 93 40 24 7F D0 80 00 0B 4D 0B 5B 8B 10
+4B 4B 0B 93 33 24 7D D0 80 00 0B 5A 3B 80 7F 00
+08 43 09 43 0E 93 09 24 1A 43 0E 10 02 28 08 5C
+09 6D 09 10 08 10 0A 5A F8 2B 1A 43 0F 10 02 28
+08 5C 09 6D 09 10 08 10 0E 10 4A 5A F7 23 49 93
+02 34 1B 53 03 3C 0E 6E 08 68 49 69 0E 6E 08 63
+49 63 0B 63 1B 93 0F 38 3B 90 FF 00 0F 34 49 59
+8B 10 09 DB 07 57 09 10 0D 49 0C 48 37 41 38 41
+39 41 3A 41 30 41 0C 43 0D 43 F8 3F 3D 40 FF FE
+3C 43 07 57 0D 10 F2 3F 21 83 B0 12 72 FC B0 12
+9A FA B0 12 E2 FB F2 C2 2D 00 F2 C2 2B 00 D1 43
+00 00 6C 43 7D 40 03 00 4E 43 4F 43 B0 12 A0 F0
+C1 43 00 00 5C 43 4D 43 B0 12 A0 F0 C1 43 00 00
+5C 43 6D 43 B0 12 A0 F0 C1 43 00 00 5C 43 6D 42
+5E 43 B0 12 A0 F0 D1 43 00 00 5C 43 7D 40 06 00
+4E 43 B0 12 A0 F0 C1 43 00 00 6C 43 4D 43 5E 43
+B0 12 A0 F0 C1 43 00 00 7C 40 03 00 5D 43 4E 43
+B0 12 A0 F0 C1 43 00 00 7C 40 03 00 6D 43 B0 12
+A0 F0 C1 43 00 00 7C 40 03 00 6D 42 B0 12 A0 F0
+3C 40 32 00 B0 12 A4 F8 B0 12 68 FC 21 53 30 41
+0A 12 09 12 B0 12 62 FA 0A 4C B0 12 B4 FA 0C 8A
+3C 80 C2 01 B0 12 82 F9 09 4C 0A 4D 3E 40 00 20
+3F 40 7D 45 B0 12 98 F5 0C 93 12 34 0C 49 0D 4A
+3E 40 63 D4 3F 40 B5 BB B0 12 1E EE 3E 40 52 B8
+3F 40 2E 42 B0 12 E6 E9 B0 12 36 F3 0A 4C 11 3C
+0C 49 0D 4A 3E 40 4A F0 3F 40 06 BB B0 12 1E EE
+3E 40 BB A7 3F 40 ED 41 B0 12 E6 E9 B0 12 36 F3
+0A 4C 3A 90 05 00 06 38 3A 90 24 00 05 38 3A 40
+23 00 02 3C 3A 40 05 00 B0 12 7E F7 3C 40 2D 00
+0D 4A B0 12 18 FC 30 40 42 FC 21 83 B0 12 72 FC
+B0 12 9A FA B0 12 E2 FB F2 C2 2D 00 F2 C2 2B 00
+D1 43 00 00 6C 43 7D 40 03 00 4E 43 4F 43 B0 12
+A0 F0 C1 43 00 00 5C 43 4D 43 5E 43 B0 12 A0 F0
+D1 43 00 00 5C 43 6D 43 4E 43 5F 43 B0 12 A0 F0
+C1 43 00 00 5C 43 6D 42 5E 43 4F 43 B0 12 A0 F0
+C1 43 00 00 5C 43 7D 40 06 00 B0 12 A0 F0 C1 43
+00 00 6C 43 4D 43 B0 12 A0 F0 C1 43 00 00 6C 43
+7D 40 05 00 B0 12 A0 F0 C1 43 00 00 7C 40 03 00
+6D 42 4E 43 B0 12 A0 F0 B0 12 68 FC 21 53 30 41
+0A 12 09 12 08 12 0B 4C 5A 41 08 00 4D 4D 1C 43
+B0 12 26 F8 4B 4B 1B 83 16 24 1B 83 0B 24 1B 83
+1A 20 3D 40 1A 00 3B 40 19 00 39 40 1B 00 38 40
+10 00 11 3C 3D 40 2A 00 3B 40 29 00 39 40 2E 00
+38 40 2F 00 08 3C 3D 40 22 00 3B 40 21 00 39 40
+26 00 38 40 27 00 4E 93 03 20 CD CC 00 00 02 3C
+CD DC 00 00 4F 93 03 20 CB CC 00 00 02 3C CB DC
+00 00 5A B3 03 20 C8 CC 00 00 02 3C C8 DC 00 00
+6A B3 03 20 C9 CC 00 00 02 3C C9 DC 00 00 30 40
+40 FC 0A 12 21 83 B0 12 C8 EE 3C 40 0A 00 B0 12
+A4 F8 02 3C B0 12 BE EC B0 12 CE FA 3C 90 40 1F
+F9 2B E2 B2 20 00 03 24 82 43 B6 02 02 3C A2 42
+B6 02 82 43 BA 02 C1 43 00 00 5C 43 6D 42 5E 43
+5F 43 B0 12 A0 F0 3C 40 0A 00 B0 12 A4 F8 B0 12
+7A FB 0A 4C B0 12 34 FB 4A 93 03 24 B2 D0 03 00
+BA 02 4C 93 03 24 B2 D0 05 00 BA 02 82 93 BA 02
+05 20 B0 12 BE EC 82 93 BA 02 DD 27 B0 12 5A E7
+C2 43 B4 02 3C 40 2C 01 B0 12 A4 F8 21 53 3A 41
+30 41 0F 12 E2 B2 03 00 14 20 F2 B2 03 00 2B 24
+B2 90 03 00 7E 02 08 20 5F 42 81 02 D2 4F 6A 02
+6F 00 D2 53 81 02 1F 3C 92 43 7E 02 C2 43 6F 00
+1A 3C 1F 42 7E 02 2F 83 1D 24 2F 83 2F 93 0A 28
+92 43 7E 02 5F 42 6E 00 B2 40 AD DE 6A 02 82 43
+6C 02 09 3C 5F 42 81 02 DF 42 6E 00 6A 02 D2 53
+81 02 A2 42 7E 02 F2 92 81 02 0C 28 F2 40 07 00
+81 02 08 3C D2 42 6E 00 80 02 C2 43 81 02 B2 40
+05 00 7E 02 3F 41 00 13 0F 12 0E 12 0D 12 0C 12
+0B 12 E2 B3 6D 00 18 24 E2 C3 6D 00 1F 42 7E 02
+1F 83 03 24 2F 82 0B 24 07 3C F2 B0 10 00 69 00
+0B 20 A2 43 7E 02 08 3C 92 43 7E 02 05 3C B2 40
+03 00 7E 02 B0 12 8A E5 E2 B2 6D 00 0C 24 E2 C2
+6D 00 A2 92 7E 02 05 20 B0 12 E6 EB 92 43 7E 02
+02 3C 92 43 7E 02 F2 B2 6D 00 04 24 F2 C2 6D 00
+92 43 7E 02 D2 B3 6D 00 04 24 D2 C3 6D 00 92 43
+7E 02 3B 41 3C 41 3D 41 3E 41 3F 41 00 13 0A 12
+B0 12 F2 F8 B2 40 F8 38 B0 01 B2 40 F6 F0 B2 01
+F2 40 F6 00 4A 00 92 B3 B2 01 FD 23 3B 40 20 4E
+3A 40 E8 03 3C 40 10 00 3D 40 22 02 3E 40 42 02
+3F 40 02 02 2F 53 8F 4B FE FF 2E 53 8E 4A FE FF
+2D 53 8D 4B FE FF 1C 83 F5 23 E2 42 48 00 F2 40
+10 00 49 00 B2 D0 03 00 B0 01 D2 43 00 02 C2 43
+01 02 3A 41 30 41 0B 4D 0E 4B 3B F0 80 7F 2D 24
+0B 5B 8B 10 7E D0 80 00 3B 80 7F 00 26 30 3B 90
+0F 00 11 24 1D 34 0E 11 0C 10 1E 93 01 24 FB 3F
+1B 83 03 30 0C 5C 0E 6E FB 3F 0D 93 02 34 3E E3
+1E 53 0C 4E 30 41 8E 10 8C 10 4C 4C 0C DE 3C 90
+00 80 01 24 05 3C 0D 93 03 34 3C 40 00 80 30 41
+0D 93 FB 33 3C 40 FF 7F 30 41 0C 43 30 41 0F 12
+0E 12 0D 12 0C 12 0B 12 0A 12 09 12 F2 B2 2B 00
+1D 24 B0 12 28 FA B0 12 10 F5 09 4C 0A 4D B0 12
+BA FB 09 DC 0E 49 0F 4A 1E 82 CC 02 1F 72 CE 02
+82 4E D0 02 82 4F D2 02 82 49 CC 02 82 4A CE 02
+F2 C2 2D 00 F2 C2 2B 00 D2 C3 D4 02 39 41 3A 41
+3B 41 3C 41 3D 41 3E 41 3F 41 00 13 21 83 81 43
+00 00 F2 D0 10 00 19 00 F2 F0 EF 00 1A 00 92 43
+7E 02 D2 D3 69 00 F2 40 07 00 68 00 F2 40 C1 00
+69 00 C2 43 6D 00 B2 40 10 00 18 01 F2 D0 06 00
+1B 00 F2 40 C0 00 69 00 F2 40 0F 00 6C 00 E2 D2
+01 00 F2 D2 01 00 C2 43 7A 02 3F 40 7B 02 CF 43
+00 00 82 43 78 02 21 53 30 41 0A 12 09 12 E2 B3
+D4 02 06 20 3C 40 B0 F4 B0 12 5E F9 E2 D3 D4 02
+D2 B3 D4 02 1B 20 D2 D3 D4 02 F2 C2 2D 00 F2 D2
+2A 00 F2 C2 29 00 F2 C2 2C 00 B0 12 28 FA B0 12
+10 F5 0A 4C 09 4D B0 12 BA FB 0A DC 82 4A CC 02
+82 49 CE 02 F2 C2 2A 00 F2 D2 2D 00 30 40 42 FC
+0A 12 09 12 B0 12 28 FA B0 12 10 F5 09 4C 0A 4D
+B0 12 BA FB 09 DC 0E 49 0F 4A 1E 82 CC 02 1F 72
+CE 02 1F 93 13 28 03 20 3E 90 A1 86 0F 28 B2 40
+A0 86 D0 02 92 43 D2 02 82 49 CC 02 82 4A CE 02
+F2 C2 2D 00 F2 C2 2B 00 D2 C3 D4 02 30 40 42 FC
+3E F0 1F 00 04 24 0C 5C 0D 6D 1E 83 FC 23 30 41
0C 5C 0D 6D 0C 5C 0D 6D 0C 5C 0D 6D 0C 5C 0D 6D
0C 5C 0D 6D 0C 5C 0D 6D 0C 5C 0D 6D 0C 5C 0D 6D
0C 5C 0D 6D 0C 5C 0D 6D 0C 5C 0D 6D 0C 5C 0D 6D
-30 41 0A 12 21 83 C2 93 83 02 1D 24 4C 93 15 24
-4A 4C C1 43 00 00 5C 43 7D 40 05 00 5E 43 5F 43
-B0 12 04 F0 C1 43 00 00 5C 43 7D 40 05 00 5E 43
-4F 43 B0 12 04 F0 1A 83 EC 23 0D 12 3D 40 4B 01
-1D 83 FE 23 3D 41 21 53 3A 41 30 41 0B 4D 0B EF
-0A 30 0D 93 12 30 0D 9F 02 24 19 34 16 3C 0C 9E
-18 24 13 28 14 3C 3D B0 80 7F 04 20 3F B0 80 7F
-01 20 0F 24 0D 9F 0B 34 08 3C 0F 9D 02 24 07 34
-04 3C 0E 9C EC 27 01 28 02 3C 3C 43 30 41 1C 43
-30 41 0C 43 30 41 7C 40 06 00 B0 12 74 F9 3C 90
-CA 00 14 38 3C 90 96 01 07 34 0F 4C 0F 5F 0F 5F
-3C 40 A0 0B 0C 8F 30 41 0E 4C 0E 5E 3F 40 E0 08
-0F 8E 0C 11 0C 11 0F 8C 0C 4F 30 41 0F 4C 0F 5F
-0F 5F 0F 5F 3C 40 C0 0E 0C 8F 30 41 B2 40 80 5A
-20 01 0C 43 B0 12 FA F7 B0 12 5E F6 B0 12 96 F0
-B0 12 32 F2 B0 12 BE FA B0 12 60 F3 B0 12 44 F8
-B0 12 D2 F5 B0 12 F6 F8 B0 12 BE F3 32 D2 B0 12
-00 E0 92 B3 BC 02 FB 27 B0 12 5C EA B0 12 BE F3
-F6 3F F2 B2 18 00 02 24 2E 43 01 3C 0E 43 4F 43
-F2 B0 20 00 18 00 01 24 5F 43 4E 5F C2 4E D8 02
-F2 B0 80 FF 20 00 02 24 2E 43 01 3C 0E 43 4F 43
-F2 B2 20 00 01 24 5F 43 4E 5F C2 4E DA 02 C2 43
-DB 02 C2 43 D9 02 30 41 0B 4D 0E 4B 3B F0 80 7F
-1C 24 0B 5B 8B 10 7E D0 80 00 3B 80 7F 00 15 30
-3B 90 10 00 10 34 0E 11 0C 10 1E 93 01 24 FB 3F
-1B 83 03 30 0C 5C 0E 6E FB 3F 0D 93 02 34 3E E3
-1E 53 0C 4E 30 41 3C 43 30 41 0C 43 30 41 D2 43
-9D 02 F2 F0 EF 00 53 00 F2 D2 53 00 82 43 9E 02
-82 43 A0 02 82 43 90 01 B2 40 FF 7F 92 01 B2 40
-12 01 80 01 2E 42 3F 40 A6 02 2F 53 8F 43 FE FF
-1E 83 FB 23 C2 43 9C 02 B2 43 A2 02 B2 43 A4 02
-30 41 0A 12 09 12 0D 4C 3D 93 10 24 0C 3C 8F 12
-2A 53 12 3C 3C 4D 0A 4D 0E 49 B0 12 F8 FA 0A 59
-0D 4A 1D 53 1D C3 39 4D 09 93 F4 23 3F 40 FF FF
-3F 93 05 24 3A 40 FF FF 2F 4A 0F 93 E8 23 30 40
-46 FB 21 83 5E 42 8A 02 5F 42 8A 02 0F 11 0E FF
-1E B3 0A 20 C1 43 00 00 5C 43 7D 40 06 00 5E 43
-4F 43 B0 12 04 F0 09 3C E1 43 00 00 5C 43 7D 40
-06 00 5E 43 4F 43 B0 12 04 F0 21 53 30 41 0D 4C
-4C 4D B0 12 66 F7 82 4C B2 01 4D 4D 1C 43 B0 12
-54 F7 C2 4C 4A 00 B2 40 73 35 B0 01 92 B3 B0 01
-FD 23 1C 42 B4 01 82 43 B0 01 82 43 B2 01 C2 43
-4A 00 30 41 3D F0 0F 00 3D E0 0F 00 0D 5D 00 5D
+0C 5C 0D 6D 0C 5C 0D 6D 0C 5C 0D 6D 30 41 0A 12
+21 83 C2 93 83 02 1D 24 4C 93 15 24 4A 4C C1 43
+00 00 5C 43 7D 40 05 00 5E 43 5F 43 B0 12 A0 F0
+C1 43 00 00 5C 43 7D 40 05 00 5E 43 4F 43 B0 12
+A0 F0 1A 83 EC 23 0D 12 3D 40 4B 01 1D 83 FE 23
+3D 41 21 53 3A 41 30 41 0B 4D 0B EF 0A 30 0D 93
+12 30 0D 9F 02 24 19 34 16 3C 0C 9E 18 24 13 28
+14 3C 3D B0 80 7F 04 20 3F B0 80 7F 01 20 0F 24
+0D 9F 0B 34 08 3C 0F 9D 02 24 07 34 04 3C 0E 9C
+EC 27 01 28 02 3C 3C 43 30 41 1C 43 30 41 0C 43
+30 41 7C 40 06 00 B0 12 46 FA 3C 90 CA 00 14 38
+3C 90 96 01 07 34 0F 4C 0F 5F 0F 5F 3C 40 A0 0B
+0C 8F 30 41 0E 4C 0E 5E 3F 40 E0 08 0F 8E 0C 11
+0C 11 0F 8C 0C 4F 30 41 0F 4C 0F 5F 0F 5F 0F 5F
+3C 40 C0 0E 0C 8F 30 41 B2 40 80 5A 20 01 0C 43
+B0 12 CC F8 B0 12 FA F6 B0 12 32 F1 B0 12 CE F2
+B0 12 A6 FB B0 12 FC F3 B0 12 16 F9 B0 12 6E F6
+B0 12 C8 F9 B0 12 5A F4 32 D2 B0 12 00 E0 92 B3
+BA 02 FB 27 B0 12 F8 EA B0 12 5A F4 F6 3F F2 B2
+18 00 02 24 2E 43 01 3C 0E 43 4F 43 F2 B0 20 00
+18 00 01 24 5F 43 4E 5F C2 4E D6 02 F2 B0 80 FF
+20 00 02 24 2E 43 01 3C 0E 43 4F 43 F2 B2 20 00
+01 24 5F 43 4E 5F C2 4E D8 02 C2 43 D9 02 C2 43
+D7 02 30 41 0B 4D 0E 4B 3B F0 80 7F 1C 24 0B 5B
+8B 10 7E D0 80 00 3B 80 7F 00 15 30 3B 90 10 00
+10 34 0E 11 0C 10 1E 93 01 24 FB 3F 1B 83 03 30
+0C 5C 0E 6E FB 3F 0D 93 02 34 3E E3 1E 53 0C 4E
+30 41 3C 43 30 41 0C 43 30 41 D2 43 9B 02 F2 F0
+EF 00 53 00 F2 D2 53 00 82 43 9C 02 82 43 9E 02
+82 43 90 01 B2 40 FF 7F 92 01 B2 40 12 01 80 01
+2E 42 3F 40 A4 02 2F 53 8F 43 FE FF 1E 83 FB 23
+C2 43 9A 02 B2 43 A0 02 B2 43 A2 02 30 41 0A 12
+09 12 0D 4C 3D 93 10 24 0C 3C 8F 12 2A 53 12 3C
+3C 4D 0A 4D 0E 49 B0 12 F4 FB 0A 59 0D 4A 1D 53
+1D C3 39 4D 09 93 F4 23 3F 40 FF FF 3F 93 05 24
+3A 40 FF FF 2F 4A 0F 93 E8 23 30 40 42 FC 21 83
+5E 42 8A 02 5F 42 8A 02 0F 11 0E FF 1E B3 0A 20
+C1 43 00 00 5C 43 7D 40 06 00 5E 43 4F 43 B0 12
+A0 F0 09 3C E1 43 00 00 5C 43 7D 40 06 00 5E 43
+4F 43 B0 12 A0 F0 21 53 30 41 0D 4C 4C 4D B0 12
+38 F8 82 4C B2 01 4D 4D 1C 43 B0 12 26 F8 C2 4C
+4A 00 B2 40 73 35 B0 01 92 B3 B0 01 FD 23 1C 42
+B4 01 82 43 B0 01 82 43 B2 01 C2 43 4A 00 30 41
+0B 4D A2 43 8C 02 82 43 98 02 82 9C 84 02 02 2C
+1C 42 84 02 82 4C 8E 02 3C 40 20 FD 1D 42 84 02
+B0 12 90 FB 1D 42 8E 02 B0 12 CE FB 82 4C 96 02
+0C 4B 30 40 4C FB 3D F0 0F 00 3D E0 0F 00 0D 5D
+00 5D 0C 5C 0C 5C 0C 5C 0C 5C 0C 5C 0C 5C 0C 5C
0C 5C 0C 5C 0C 5C 0C 5C 0C 5C 0C 5C 0C 5C 0C 5C
-0C 5C 0C 5C 0C 5C 0C 5C 0C 5C 0C 5C 0C 5C 30 41
-0A 12 0A 4C 92 12 DC 02 82 93 E2 02 03 24 0C 4A
-92 12 E2 02 82 93 E0 02 02 24 92 12 E0 02 92 12
-DE 02 B0 12 A0 FB 3A 41 30 41 0F 12 0E 12 0D 12
-3D 40 10 00 3F 40 22 02 3E 40 02 02 2F 53 BF 4E
-FE FF 1D 83 FB 23 D2 43 01 02 3D 41 3E 41 3F 41
-00 13 21 82 81 43 00 00 0B 3C 81 43 02 00 02 3C
-91 53 02 00 B1 90 96 05 02 00 FA 3B 91 53 00 00
-81 9C 00 00 F2 3B 21 52 30 41 D2 42 F9 10 57 00
-D2 42 F8 10 56 00 0C 93 08 24 1C 93 02 24 30 40
-4C FB F2 40 30 00 58 00 30 41 C2 43 58 00 30 41
-82 43 B2 01 82 43 B0 01 C2 43 4A 00 C2 43 48 00
-C2 43 49 00 92 B3 B2 01 FD 23 C2 43 00 02 C2 43
-01 02 30 41 B2 40 10 02 60 01 B2 40 60 20 64 01
-B0 12 68 F8 3C 40 F8 E2 B0 12 8C F8 92 43 8C 02
-B2 40 20 03 8E 02 30 41 21 83 C1 43 00 00 5C 43
-7D 40 06 00 4E 43 4F 43 B0 12 04 F0 3C 40 32 00
-3D 40 37 00 B0 12 1C FB 21 53 30 41 4D 43 0E 43
-4D 93 0A 20 0F 4E 0F 5F 3F 50 A6 02 8F 93 00 00
-03 20 8F 4C 00 00 5D 43 1E 53 2E 92 F1 3B 30 41
-0D 4C 0D 93 0E 24 3B 40 8F 00 1B 83 0D 5D FD 2B
-4C 4D 8C 10 8D 10 4D 4D 8B 10 0D DB 12 C3 0D 10
-0C 10 30 41 3D 40 FF FF 3F 40 FF FF 3F 93 05 20
-3D 93 03 20 0C 43 0D 43 04 3C 0F 4D 2C 4F 2D 43
-0D 5F 30 40 8C F5 82 43 C0 02 E2 D3 24 00 E2 B3
-20 00 FD 27 E2 C3 23 00 C2 43 C5 02 E2 D3 25 00
-3C 40 2C FB 30 40 8C F8 CC 5D 7A 02 0C 93 02 24
-2F 43 01 3C 1F 43 C2 DF 69 02 F2 D0 10 00 1A 00
-F2 F0 EF 00 19 00 30 41 31 40 00 04 B0 12 4A FA
-0C 93 04 24 3C 40 A6 FB B0 12 A2 F6 B0 12 D4 F8
-1C 43 B0 12 80 F7 92 B3 80 01 07 24 1C 42 9E 02
-1D 42 A0 02 1C 53 0D 63 30 41 1C 42 9E 02 1D 42
-A0 02 30 41 C2 93 00 02 08 24 4C 4C 0C 5C 3F 40
-22 02 0F 8C 1C 4F 1E 00 30 41 30 40 1E F7 30 41
-7C 40 07 00 B0 12 74 F9 B0 12 B0 F8 3E 40 29 5C
-3F 40 A1 41 B0 12 82 ED 30 40 18 F6 7C 40 05 00
-B0 12 74 F9 B0 12 B0 F8 3E 40 29 5C 3F 40 A1 41
-B0 12 82 ED 30 40 18 F6 D2 C3 D6 02 F2 C2 2D 00
-F2 C2 2B 00 F2 C2 2A 00 F2 C2 29 00 F2 D2 2F 00
-30 41 6C 42 B0 12 74 F9 B0 12 B0 F8 3E 40 29 5C
-3F 40 A1 41 B0 12 82 ED 30 40 18 F6 5C 43 B0 12
-74 F9 B0 12 B0 F8 3E 40 98 6E 3F 40 43 42 B0 12
-82 ED 30 40 18 F6 6C 43 B0 12 74 F9 B0 12 B0 F8
-3E 40 29 5C 3F 40 A1 41 B0 12 82 ED 30 40 18 F6
-82 4C 74 02 82 4D 76 02 E2 D2 69 02 F2 D0 10 00
-1A 00 F2 F0 EF 00 19 00 30 41 3E 40 D2 04 3F 40
-00 02 8F 4E 00 00 2F 53 3F 90 F0 03 FA 2B 1C 43
-30 41 B0 12 46 F5 4F 43 3C 90 ED FF 04 38 3C 90
-80 0C 01 34 5F 43 0C 4F 30 41 82 4C 78 02 F2 D0
-10 00 69 02 F2 D0 10 00 1A 00 F2 F0 EF 00 19 00
-30 41 0A 12 5A 42 83 02 D2 43 83 02 B0 12 B2 F4
-C2 4A 83 02 3A 41 30 41 0A 12 4A 43 B0 12 E2 F9
-3C 90 B1 36 01 28 5A 43 0C 4A 3A 41 30 41 F2 40
-10 00 49 00 B2 40 02 02 BC 01 3C 40 05 00 30 40
-D2 F7 1F 42 90 01 1E 42 90 01 0F 9E FA 23 3C 40
-FF 7F 0C FF 30 41 92 43 7E 02 C2 43 6C 00 C2 43
-6D 00 D2 D3 69 00 30 41 0F 4C 0E 93 05 24 1F 53
-FF 4D FF FF 1E 83 FB 23 30 41 5F 42 9D 02 7C B0
-FE FF 02 20 C2 4C 9D 02 0C 4F 30 41 0F 4C 1F 83
-82 4F 72 01 0C 8D 82 4C 74 01 30 41 D2 53 C5 02
-E2 93 C5 02 02 28 C2 43 C6 02 30 41 34 41 35 41
-36 41 37 41 38 41 39 41 3A 41 30 41 7C 40 0B 00
-B0 12 92 FA 10 42 FE FF 1C 42 D2 02 1D 42 D4 02
-30 41 1C 42 A2 02 1D 42 A4 02 30 41 5C 42 68 02
-C2 43 68 02 30 41 E2 C3 25 00 E2 C3 23 00 30 41
-82 4C A2 02 82 4D A4 02 30 41 82 4C 9E 02 82 4D
-A0 02 30 41 82 43 60 01 30 41 1C 42 84 02 30 41
-03 43 FF 3F 30 41 02 00 84 02 D0 07 02 00 86 02
-0B 00 02 00 88 02 0A 00 01 00 8A 02 02 00 04 00
-CE 02 00 00 00 00 04 00 D2 02 00 00 00 00 01 00
-D6 02 00 00 01 00 00 02 00 00 01 00 01 02 00 00
-02 00 66 02 00 00 01 00 C6 02 00 00 02 00 CC 02
-00 00 02 00 DC 02 A4 FB 02 00 DE 02 A4 FB 02 00
-E0 02 00 00 02 00 E2 02 00 00 02 00 B8 02 00 00
-01 00 BA 02 00 00 01 00 68 02 00 00 01 00 83 02
-00 00 01 00 AE 02 00 00 00 00 00 00
+30 41 0A 12 0A 4C 92 12 DA 02 82 93 E0 02 03 24
+0C 4A 92 12 E0 02 82 93 DE 02 02 24 92 12 DE 02
+92 12 DC 02 B0 12 9C FC 3A 41 30 41 0F 12 0E 12
+0D 12 3D 40 10 00 3F 40 22 02 3E 40 02 02 2F 53
+BF 4E FE FF 1D 83 FB 23 D2 43 01 02 3D 41 3E 41
+3F 41 00 13 21 82 81 43 00 00 0B 3C 81 43 02 00
+02 3C 91 53 02 00 B1 90 96 05 02 00 FA 3B 91 53
+00 00 81 9C 00 00 F2 3B 21 52 30 41 D2 42 F9 10
+57 00 D2 42 F8 10 56 00 0C 93 08 24 1C 93 02 24
+30 40 48 FC F2 40 30 00 58 00 30 41 C2 43 58 00
+30 41 82 43 B2 01 82 43 B0 01 C2 43 4A 00 C2 43
+48 00 C2 43 49 00 92 B3 B2 01 FD 23 C2 43 00 02
+C2 43 01 02 30 41 B2 40 10 02 60 01 B2 40 60 20
+64 01 B0 12 3A F9 3C 40 F4 E2 B0 12 5E F9 92 43
+8C 02 B2 40 20 03 8E 02 30 41 21 83 C1 43 00 00
+5C 43 7D 40 06 00 4E 43 4F 43 B0 12 A0 F0 3C 40
+32 00 3D 40 37 00 B0 12 18 FC 21 53 30 41 4D 43
+0E 43 4D 93 0A 20 0F 4E 0F 5F 3F 50 A4 02 8F 93
+00 00 03 20 8F 4C 00 00 5D 43 1E 53 2E 92 F1 3B
+30 41 0D 4C 0D 93 0E 24 3B 40 8F 00 1B 83 0D 5D
+FD 2B 4C 4D 8C 10 8D 10 4D 4D 8B 10 0D DB 12 C3
+0D 10 0C 10 30 41 3D 40 FF FF 3F 40 FF FF 3F 93
+05 20 3D 93 03 20 0C 43 0D 43 04 3C 0F 4D 2C 4F
+2D 43 0D 5F 30 40 28 F6 82 43 BE 02 E2 D3 24 00
+E2 B3 20 00 FD 27 E2 C3 23 00 C2 43 C3 02 E2 D3
+25 00 3C 40 28 FC 30 40 5E F9 CC 5D 7A 02 0C 93
+02 24 2F 43 01 3C 1F 43 C2 DF 69 02 F2 D0 10 00
+1A 00 F2 F0 EF 00 19 00 30 41 31 40 00 04 B0 12
+1C FB 0C 93 04 24 3C 40 A2 FC B0 12 3E F7 B0 12
+A6 F9 1C 43 B0 12 52 F8 92 B3 80 01 07 24 1C 42
+9C 02 1D 42 9E 02 1C 53 0D 63 30 41 1C 42 9C 02
+1D 42 9E 02 30 41 C2 93 00 02 08 24 4C 4C 0C 5C
+3F 40 22 02 0F 8C 1C 4F 1E 00 30 41 30 40 BA F7
+30 41 7C 40 07 00 B0 12 46 FA B0 12 82 F9 3E 40
+29 5C 3F 40 A1 41 B0 12 1E EE 30 40 B4 F6 7C 40
+05 00 B0 12 46 FA B0 12 82 F9 3E 40 29 5C 3F 40
+A1 41 B0 12 1E EE 30 40 B4 F6 D2 C3 D4 02 F2 C2
+2D 00 F2 C2 2B 00 F2 C2 2A 00 F2 C2 29 00 F2 D2
+2F 00 30 41 6C 42 B0 12 46 FA B0 12 82 F9 3E 40
+29 5C 3F 40 A1 41 B0 12 1E EE 30 40 B4 F6 5C 43
+B0 12 46 FA B0 12 82 F9 3E 40 98 6E 3F 40 43 42
+B0 12 1E EE 30 40 B4 F6 6C 43 B0 12 46 FA B0 12
+82 F9 3E 40 29 5C 3F 40 A1 41 B0 12 1E EE 30 40
+B4 F6 82 4C 74 02 82 4D 76 02 E2 D2 69 02 F2 D0
+10 00 1A 00 F2 F0 EF 00 19 00 30 41 3E 40 D2 04
+3F 40 00 02 8F 4E 00 00 2F 53 3F 90 F0 03 FA 2B
+1C 43 30 41 B0 12 E2 F5 4F 43 3C 90 ED FF 04 38
+3C 90 80 0C 01 34 5F 43 0C 4F 30 41 82 4C 78 02
+F2 D0 10 00 69 02 F2 D0 10 00 1A 00 F2 F0 EF 00
+19 00 30 41 0A 12 5A 42 83 02 D2 43 83 02 B0 12
+4E F5 C2 4A 83 02 3A 41 30 41 0A 12 4A 43 B0 12
+B4 FA 3C 90 B1 36 01 28 5A 43 0C 4A 3A 41 30 41
+0E 43 0F 4C 1C 43 0F 5F 0E 6E 0E 9D 01 28 0E 8D
+0C 6C F9 2B 30 41 F2 40 10 00 49 00 B2 40 02 02
+BC 01 3C 40 05 00 30 40 A4 F8 1F 42 90 01 1E 42
+90 01 0F 9E FA 23 3C 40 FF 7F 0C FF 30 41 0E 43
+12 C3 0C 10 01 28 0E 5D 0D 5D 0C 93 F9 23 0C 4E
+30 41 92 43 7E 02 C2 43 6C 00 C2 43 6D 00 D2 D3
+69 00 30 41 0F 4C 0E 93 05 24 1F 53 FF 4D FF FF
+1E 83 FB 23 30 41 5F 42 9B 02 7C B0 FE FF 02 20
+C2 4C 9B 02 0C 4F 30 41 0F 4C 1F 83 82 4F 72 01
+0C 8D 82 4C 74 01 30 41 D2 53 C3 02 E2 93 C3 02
+02 28 C2 43 C4 02 30 41 34 41 35 41 36 41 37 41
+38 41 39 41 3A 41 30 41 7C 40 0B 00 B0 12 64 FB
+10 42 FE FF 1C 42 D0 02 1D 42 D2 02 30 41 1C 42
+A0 02 1D 42 A2 02 30 41 5C 42 68 02 C2 43 68 02
+30 41 E2 C3 25 00 E2 C3 23 00 30 41 82 4C A0 02
+82 4D A2 02 30 41 82 4C 9C 02 82 4D 9E 02 30 41
+82 43 60 01 30 41 1C 42 84 02 30 41 03 43 FF 3F
+30 41 02 00 84 02 D0 07 02 00 86 02 0B 00 02 00
+88 02 0A 00 01 00 8A 02 02 00 04 00 CC 02 00 00
+00 00 04 00 D0 02 00 00 00 00 01 00 D4 02 00 00
+01 00 00 02 00 00 01 00 01 02 00 00 02 00 66 02
+00 00 01 00 C4 02 00 00 02 00 CA 02 00 00 02 00
+DA 02 A0 FC 02 00 DC 02 A0 FC 02 00 DE 02 00 00
+02 00 E0 02 00 00 02 00 B6 02 00 00 01 00 B8 02
+00 00 01 00 68 02 00 00 01 00 83 02 00 00 01 00
+AC 02 00 00 00 00 00 00
@ffe4
-04 E8 02 F3
+A0 E8 9E F3
@ffea
-AA F7 26 F1 AC F1
+7C F8 C2 F1 48 F2
@fff8
-D6 EC
+72 ED
@fffe
-38 F9
+0A FA
q
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua?rev=8377&r1=8376&r2=8377&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Tue Jan 19 13:14:55 2010
@@ -121,8 +121,8 @@
elseif alarmState == 'snooze' then
log:warn('snooze state received')
- -- just leave state as in progress for now
- -- self.alarmInProgress = alarmState
+ self.alarmInProgress = alarmState
+ log:warn('self.alarmInProgress set to: ',
self.alarmInProgress)
elseif alarmState == 'none' then
@@ -284,7 +284,9 @@
log:info('notify_serverDisconnected: ', server, ' is now disconnected')
-- blindly check state here irrespective of which server caused this
notification
- if self.alarmInProgress and self.alarmInProgress ~= 'rtc' then
+ if self.alarmInProgress == 'snooze' or self.alarmInProgress == 'rtc'
then
+ log:warn('notify_serverDisconnected: ', server, ' -
disconnected, but no server alarm in progress : ', self.alarmInProgress)
+ elseif self.alarmInProgress == 'server' then
if not self.localPlayer:isConnected() then
log:warn('notify_serverDisconnected: ', server, ' -
while server alarm in progress! state ', self.alarmInProgress, ' triggering
fallback alarm!')
self:openAlarmWindow('rtc')
@@ -377,6 +379,12 @@
-- when the alarm time is hit, unset the wakeup mcu time
self:_setWakeupTime('none')
+ if self.decodeStatePoller:isRunning() then
+ self.decodeStatePoller:restart()
+ else
+ self.decodeStatePoller:start()
+ end
+
if caller == 'server' then
-- if we're connected, first drop the now playing window
underneath the alarm window
if self.localPlayer:isConnected() then
@@ -393,13 +401,6 @@
-- where did we come from?
log:error('CALL STACK TRAP: ')
end
-
- if self.decodeStatePoller:isRunning() then
- self.decodeStatePoller:restart()
- else
- self.decodeStatePoller:start()
- end
-
elseif caller == 'rtc' then
if self.alarmInProgress ~= 'rtc' then
@@ -497,6 +498,7 @@
end
self.alarmInProgress = nil
self.alarmWindow = nil
+ log:warn('self.alarmInProgress set to: ',
self.alarmInProgress)
end
)
@@ -527,6 +529,7 @@
end
if self.localPlayer:isConnected() and stopStream then
+ log:warn('_alarmOff: send stopAlarm to connected server')
self.localPlayer:stopAlarm()
end
end
@@ -596,27 +599,27 @@
function _alarmSnooze(self)
log:warn('_alarmSnooze: alarmInProgress is ', self.alarmInProgress, ' :
connection status is ', self.localPlayer:isConnected())
+
+ log:warn('_alarmSnooze: fallback alarm snoozing for hardwired 9
minutes')
+ self:_stopTimer()
+ -- start another hardwired timer for 9 minutes
+ self:_startTimer(540000)
+ --self:_startTimer(20000)
if self.alarmInProgress == 'rtc' then
+ log:warn('_alarmSnooze: stopping fallback alarm audio')
-- stop playback
self.localPlayer:stop(true)
- log:warn('_alarmSnooze: fallback alarm snoozing for hardwired 9
minutes')
- self:_stopTimer()
- -- start another hardwired timer for 9 minutes
- --self:_startTimer(60000)
- self:_startTimer(540000)
- else
- if self.localPlayer:isConnected() then
- self.localPlayer:snooze()
- else
- -- playerDisconnect event should be hit first, but for
completeness...
- log:warn('_alarmSnooze: lost connection after server
alarm notification! triggering fallback alarm')
- self:openAlarmWindow('rtc')
- end
+ end
+
+ if self.localPlayer:isConnected() then
+ log:warn('_alarmSnooze: sending snooze command to connected
server for connected player ', self.localPlayer)
+ self.localPlayer:snooze()
end
self.alarmWindow:playSound("WINDOWHIDE")
self:_hideAlarmWindow()
+ self.alarmInProgress = 'snooze'
end
Modified: 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=8377&r1=8376&r2=8377&view=diff
==============================================================================
--- 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Tue Jan 19
13:14:55 2010
@@ -1422,10 +1422,8 @@
-- stopAlarm pauses audio
self:pause()
- if self.alarmState == 'active' then
- self.alarmState = 'none'
- self:call({'jivealarm', 'stop:1'})
- end
+ self.alarmState = 'none'
+ self:call({'jivealarm', 'stop:1'})
self:updateIconbar()
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
