Menu
▾
▴
[Krobot-commits] [SCM] krobot branch, master, updated. 46c68826d321ead8c8275d217416d0c30750e21c
|
From: Xavier L. <Ba...@us...> - 2010-02-20 23:49:07
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "krobot".
The branch, master has been updated
via 46c68826d321ead8c8275d217416d0c30750e21c (commit)
from 88a46a02c10984a60294ece535b3fcbad4e2fe89 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 46c68826d321ead8c8275d217416d0c30750e21c
Author: Xavier Lagorce <Xav...@cr...>
Date: Sun Feb 21 00:47:26 2010 +0100
New version of the 'goto' function
This version finally works in every mode.
-----------------------------------------------------------------------
Changes:
diff --git a/USB_Module/Motor_Controller/Firmware/Motor_Controller.mcs b/USB_Module/Motor_Controller/Firmware/Motor_Controller.mcs
deleted file mode 100644
index 7e843b1..0000000
--- a/USB_Module/Motor_Controller/Firmware/Motor_Controller.mcs
+++ /dev/null
@@ -1,149 +0,0 @@
-[Header]
-MagicCookie={0b13fe8c-dfe0-40eb-8900-6712719559a7}
-Version=1.0
-[File000]
-Location=C:\krobot\USB_Module\Motor_Controller\Firmware\output\usb_descriptors.o
-Folder=Intermediary
-DeviceName=PIC18F4550
-LanguageToolSuiteID={5B7D72DD-9861-47BD-9F60-2BE967BF8416}
-LanguageToolID={E56A1C86-9D32-4DF6-8C34-FE0388B1B644}
-LanguageToolLocation=C:\MCC18\bin\mcc18.exe
-PPAD=$(BINDIR)|output||$(TMPDIR)|output||$(AINDIR)||$(INCDIR)|C:\MCC18\h;.;Include||$(LIBDIR)|C:\mcc18\lib||$(LKRDIR)||
-SOLK=<src>|usb_descriptors.c|main.c|eeprom.c|motor.c|lm629.c|usb_device.c|usb_function_hid.c|error.c||<obj>||<lib>||<lkr>|rm18f4550.lkr||
-SuiteArgsString=
-ToolArgsString=
-TraceCmdString=
-DebugOptions=
-[File001]
-Location=C:\krobot\USB_Module\Motor_Controller\Firmware\output\main.o
-Folder=Intermediary
-DeviceName=PIC18F4550
-LanguageToolSuiteID={5B7D72DD-9861-47BD-9F60-2BE967BF8416}
-LanguageToolID={E56A1C86-9D32-4DF6-8C34-FE0388B1B644}
-LanguageToolLocation=C:\MCC18\bin\mcc18.exe
-PPAD=$(BINDIR)|output||$(TMPDIR)|output||$(AINDIR)||$(INCDIR)|C:\MCC18\h;.;Include||$(LIBDIR)|C:\mcc18\lib||$(LKRDIR)||
-SOLK=<src>|usb_descriptors.c|main.c|eeprom.c|motor.c|lm629.c|usb_device.c|usb_function_hid.c|error.c||<obj>||<lib>||<lkr>|rm18f4550.lkr||
-SuiteArgsString=
-ToolArgsString=
-TraceCmdString=
-DebugOptions=
-[File002]
-Location=C:\krobot\USB_Module\Motor_Controller\Firmware\output\eeprom.o
-Folder=Intermediary
-DeviceName=PIC18F4550
-LanguageToolSuiteID={5B7D72DD-9861-47BD-9F60-2BE967BF8416}
-LanguageToolID={E56A1C86-9D32-4DF6-8C34-FE0388B1B644}
-LanguageToolLocation=C:\MCC18\bin\mcc18.exe
-PPAD=$(BINDIR)|output||$(TMPDIR)|output||$(AINDIR)||$(INCDIR)|C:\MCC18\h;.;Include||$(LIBDIR)|C:\mcc18\lib||$(LKRDIR)||
-SOLK=<src>|usb_descriptors.c|main.c|eeprom.c|motor.c|lm629.c|usb_device.c|usb_function_hid.c|error.c||<obj>||<lib>||<lkr>|rm18f4550.lkr||
-SuiteArgsString=
-ToolArgsString=
-TraceCmdString=
-DebugOptions=
-[File003]
-Location=C:\krobot\USB_Module\Motor_Controller\Firmware\output\motor.o
-Folder=Intermediary
-DeviceName=PIC18F4550
-LanguageToolSuiteID={5B7D72DD-9861-47BD-9F60-2BE967BF8416}
-LanguageToolID={E56A1C86-9D32-4DF6-8C34-FE0388B1B644}
-LanguageToolLocation=C:\MCC18\bin\mcc18.exe
-PPAD=$(BINDIR)|output||$(TMPDIR)|output||$(AINDIR)||$(INCDIR)|C:\MCC18\h;.;Include||$(LIBDIR)|C:\mcc18\lib||$(LKRDIR)||
-SOLK=<src>|usb_descriptors.c|main.c|eeprom.c|motor.c|lm629.c|usb_device.c|usb_function_hid.c|error.c||<obj>||<lib>||<lkr>|rm18f4550.lkr||
-SuiteArgsString=
-ToolArgsString=
-TraceCmdString=
-DebugOptions=
-[File004]
-Location=C:\krobot\USB_Module\Motor_Controller\Firmware\output\lm629.o
-Folder=Intermediary
-DeviceName=PIC18F4550
-LanguageToolSuiteID={5B7D72DD-9861-47BD-9F60-2BE967BF8416}
-LanguageToolID={E56A1C86-9D32-4DF6-8C34-FE0388B1B644}
-LanguageToolLocation=C:\MCC18\bin\mcc18.exe
-PPAD=$(BINDIR)|output||$(TMPDIR)|output||$(AINDIR)||$(INCDIR)|C:\MCC18\h;.;Include||$(LIBDIR)|C:\mcc18\lib||$(LKRDIR)||
-SOLK=<src>|usb_descriptors.c|main.c|eeprom.c|motor.c|lm629.c|usb_device.c|usb_function_hid.c|error.c||<obj>||<lib>||<lkr>|rm18f4550.lkr||
-SuiteArgsString=
-ToolArgsString=
-TraceCmdString=
-DebugOptions=
-[File005]
-Location=C:\krobot\USB_Module\Motor_Controller\Firmware\output\usb_device.o
-Folder=Intermediary
-DeviceName=PIC18F4550
-LanguageToolSuiteID={5B7D72DD-9861-47BD-9F60-2BE967BF8416}
-LanguageToolID={E56A1C86-9D32-4DF6-8C34-FE0388B1B644}
-LanguageToolLocation=C:\MCC18\bin\mcc18.exe
-PPAD=$(BINDIR)|output||$(TMPDIR)|output||$(AINDIR)||$(INCDIR)|C:\MCC18\h;.;Include||$(LIBDIR)|C:\mcc18\lib||$(LKRDIR)||
-SOLK=<src>|usb_descriptors.c|main.c|eeprom.c|motor.c|lm629.c|usb_device.c|usb_function_hid.c|error.c||<obj>||<lib>||<lkr>|rm18f4550.lkr||
-SuiteArgsString=
-ToolArgsString=
-TraceCmdString=
-DebugOptions=
-[File006]
-Location=C:\krobot\USB_Module\Motor_Controller\Firmware\output\usb_function_hid.o
-Folder=Intermediary
-DeviceName=PIC18F4550
-LanguageToolSuiteID={5B7D72DD-9861-47BD-9F60-2BE967BF8416}
-LanguageToolID={E56A1C86-9D32-4DF6-8C34-FE0388B1B644}
-LanguageToolLocation=C:\MCC18\bin\mcc18.exe
-PPAD=$(BINDIR)|output||$(TMPDIR)|output||$(AINDIR)||$(INCDIR)|C:\MCC18\h;.;Include||$(LIBDIR)|C:\mcc18\lib||$(LKRDIR)||
-SOLK=<src>|usb_descriptors.c|main.c|eeprom.c|motor.c|lm629.c|usb_device.c|usb_function_hid.c|error.c||<obj>||<lib>||<lkr>|rm18f4550.lkr||
-SuiteArgsString=
-ToolArgsString=
-TraceCmdString=
-DebugOptions=
-[File007]
-Location=C:\krobot\USB_Module\Motor_Controller\Firmware\output\error.o
-Folder=Intermediary
-DeviceName=PIC18F4550
-LanguageToolSuiteID={5B7D72DD-9861-47BD-9F60-2BE967BF8416}
-LanguageToolID={E56A1C86-9D32-4DF6-8C34-FE0388B1B644}
-LanguageToolLocation=C:\MCC18\bin\mcc18.exe
-PPAD=$(BINDIR)|output||$(TMPDIR)|output||$(AINDIR)||$(INCDIR)|C:\MCC18\h;.;Include||$(LIBDIR)|C:\mcc18\lib||$(LKRDIR)||
-SOLK=<src>|usb_descriptors.c|main.c|eeprom.c|motor.c|lm629.c|usb_device.c|usb_function_hid.c|error.c||<obj>||<lib>||<lkr>|rm18f4550.lkr||
-SuiteArgsString=
-ToolArgsString=
-TraceCmdString=
-DebugOptions=
-[File008]
-Location=C:\krobot\USB_Module\Motor_Controller\Firmware\output\Motor_controller.cof
-Folder=Output
-DeviceName=PIC18F4550
-LanguageToolSuiteID={5B7D72DD-9861-47BD-9F60-2BE967BF8416}
-LanguageToolID={96C98149-AA1B-4CF9-B967-FAE79CAB663C}
-LanguageToolLocation=C:\MCC18\bin\mplink.exe
-PPAD=$(BINDIR)|output||$(TMPDIR)|output||$(AINDIR)||$(INCDIR)|C:\MCC18\h;.;Include||$(LIBDIR)|C:\mcc18\lib||$(LKRDIR)||
-SOLK=<src>|usb_descriptors.c|main.c|eeprom.c|motor.c|lm629.c|usb_device.c|usb_function_hid.c|error.c||<obj>||<lib>||<lkr>|rm18f4550.lkr||
-SuiteArgsString=
-ToolArgsString=/m"$(BINDIR_)$(TARGETBASE).map" /w /o"$(BINDIR_)$(TARGETBASE).cof"
-TraceCmdString=
-DebugOptions=
-[File009]
-Location=C:\krobot\USB_Module\Motor_Controller\Firmware\output\Motor_controller.hex
-Folder=Output
-DeviceName=PIC18F4550
-LanguageToolSuiteID={5B7D72DD-9861-47BD-9F60-2BE967BF8416}
-LanguageToolID={96C98149-AA1B-4CF9-B967-FAE79CAB663C}
-LanguageToolLocation=C:\MCC18\bin\mplink.exe
-PPAD=$(BINDIR)|output||$(TMPDIR)|output||$(AINDIR)||$(INCDIR)|C:\MCC18\h;.;Include||$(LIBDIR)|C:\mcc18\lib||$(LKRDIR)||
-SOLK=<src>|usb_descriptors.c|main.c|eeprom.c|motor.c|lm629.c|usb_device.c|usb_function_hid.c|error.c||<obj>||<lib>||<lkr>|rm18f4550.lkr||
-SuiteArgsString=
-ToolArgsString=/m"$(BINDIR_)$(TARGETBASE).map" /w /o"$(BINDIR_)$(TARGETBASE).cof"
-TraceCmdString=
-DebugOptions=
-[File010]
-Location=C:\krobot\USB_Module\Motor_Controller\Firmware\output\Motor_controller.map
-Folder=Output
-DeviceName=PIC18F4550
-LanguageToolSuiteID={5B7D72DD-9861-47BD-9F60-2BE967BF8416}
-LanguageToolID={96C98149-AA1B-4CF9-B967-FAE79CAB663C}
-LanguageToolLocation=C:\MCC18\bin\mplink.exe
-PPAD=$(BINDIR)|output||$(TMPDIR)|output||$(AINDIR)||$(INCDIR)|C:\MCC18\h;.;Include||$(LIBDIR)|C:\mcc18\lib||$(LKRDIR)||
-SOLK=<src>|usb_descriptors.c|main.c|eeprom.c|motor.c|lm629.c|usb_device.c|usb_function_hid.c|error.c||<obj>||<lib>||<lkr>|rm18f4550.lkr||
-SuiteArgsString=
-ToolArgsString=/m"$(BINDIR_)$(TARGETBASE).map" /w /o"$(BINDIR_)$(TARGETBASE).cof"
-TraceCmdString=
-DebugOptions=
-[TOOL_LOC_STAMPS]
-tool_loc{96C98149-AA1B-4CF9-B967-FAE79CAB663C}=C:\MCC18\bin\mplink.exe
-tool_loc{E56A1C86-9D32-4DF6-8C34-FE0388B1B644}=C:\MCC18\bin\mcc18.exe
diff --git a/USB_Module/Motor_Controller/Firmware/lm629.c b/USB_Module/Motor_Controller/Firmware/lm629.c
index 77d23a7..0ee0b12 100644
--- a/USB_Module/Motor_Controller/Firmware/lm629.c
+++ b/USB_Module/Motor_Controller/Firmware/lm629.c
@@ -577,11 +577,11 @@ void moveForward(short pos, short vel, short acc) {
resetInterrupt(MOTOR_BOTH);
newPosition(MOTOR_RIGHT,
- CON_MOTOR_RIGHT * (long) ((float) pos * COEF_RIGHT_WHEEL),
+ - CON_MOTOR_RIGHT * (long) ((float) pos * COEF_RIGHT_WHEEL),
(long) ((float) vel * COEF_RIGHT_WHEEL * CONST_VEL),
(long) ((float) acc * COEF_RIGHT_WHEEL * CONST_ACC));
newPosition(MOTOR_LEFT,
- CON_MOTOR_LEFT * (long) ((float) pos * COEF_LEFT_WHEEL),
+ - CON_MOTOR_LEFT * (long) ((float) pos * COEF_LEFT_WHEEL),
(long) ((float) vel * COEF_LEFT_WHEEL * CONST_VEL),
(long) ((float) acc * COEF_LEFT_WHEEL * CONST_ACC));
@@ -599,11 +599,11 @@ void moveBackward(short pos, short vel, short acc) {
resetInterrupt(MOTOR_BOTH);
newPosition(MOTOR_RIGHT,
- - CON_MOTOR_RIGHT * (long) ((float) pos * COEF_RIGHT_WHEEL),
+ CON_MOTOR_RIGHT * (long) ((float) pos * COEF_RIGHT_WHEEL),
(long) ((float) vel * COEF_RIGHT_WHEEL * CONST_VEL),
(long) ((float) acc * COEF_RIGHT_WHEEL * CONST_ACC));
newPosition(MOTOR_LEFT,
- - CON_MOTOR_LEFT * (long) ((float) pos * COEF_LEFT_WHEEL),
+ CON_MOTOR_LEFT * (long) ((float) pos * COEF_LEFT_WHEEL),
(long) ((float) vel * COEF_LEFT_WHEEL * CONST_VEL),
(long) ((float) acc * COEF_LEFT_WHEEL * CONST_ACC));
@@ -621,11 +621,11 @@ void turnRight(short angle, short vel, short acc) {
resetInterrupt(MOTOR_BOTH);
newPosition(MOTOR_RIGHT,
- - CON_MOTOR_RIGHT * (long) ((float) angle * CONST_POS * WHEELS_DIST * COEF_RIGHT_WHEEL),
+ CON_MOTOR_RIGHT * (long) ((float) angle * CONST_POS * WHEELS_DIST * COEF_RIGHT_WHEEL),
(long) ((float) vel * COEF_RIGHT_WHEEL * CONST_VEL),
(long) ((float) acc * COEF_RIGHT_WHEEL * CONST_ACC));
newPosition(MOTOR_LEFT,
- CON_MOTOR_LEFT * (long) ((float) angle * CONST_POS * WHEELS_DIST * COEF_LEFT_WHEEL),
+ - CON_MOTOR_LEFT * (long) ((float) angle * CONST_POS * WHEELS_DIST * COEF_LEFT_WHEEL),
(long) ((float) vel * COEF_LEFT_WHEEL * CONST_VEL),
(long) ((float) acc * COEF_LEFT_WHEEL * CONST_ACC));
@@ -643,11 +643,11 @@ void turnLeft(short angle, short vel, short acc) {
resetInterrupt(MOTOR_BOTH);
newPosition(MOTOR_RIGHT,
- CON_MOTOR_RIGHT * (long) ((float) angle * CONST_POS * WHEELS_DIST * COEF_RIGHT_WHEEL),
+ - CON_MOTOR_RIGHT * (long) ((float) angle * CONST_POS * WHEELS_DIST * COEF_RIGHT_WHEEL),
(long) ((float) vel * COEF_RIGHT_WHEEL * CONST_VEL),
(long) ((float) acc * COEF_RIGHT_WHEEL * CONST_ACC));
newPosition(MOTOR_LEFT,
- - CON_MOTOR_LEFT * (long) ((float) angle * CONST_POS * WHEELS_DIST * COEF_LEFT_WHEEL),
+ CON_MOTOR_LEFT * (long) ((float) angle * CONST_POS * WHEELS_DIST * COEF_LEFT_WHEEL),
(long) ((float) vel * COEF_LEFT_WHEEL * CONST_VEL),
(long) ((float) acc * COEF_LEFT_WHEEL * CONST_ACC));
@@ -681,7 +681,7 @@ void turnLeft(short angle, short vel, short acc) {
void goTo(short x, short y, short vel, short acc, BYTE mode, short d) {
short posRight, posLeft, velRight, velLeft;
float angle1, angle2, angle3;
- float xc, r;
+ float r, ux, uy, vx, vy, Ox, Oy, u2x, u2y;
float a;
a = (((float) x)*((float) x) + ((float) y)*((float) y))/4.0;
@@ -695,17 +695,35 @@ void goTo(short x, short y, short vel, short acc, BYTE mode, short d) {
moveForward(sqrt(4.0 * a), vel, acc);
}
else {
- xc = a/(2.0*d)-d/2.0;
- r = xc + d;
-
- angle2 = -atan2(((float) y)/2.0 - xc*x/(4.0*a), ((float) x)/2.0 + xc*y/(4.0*a));
- angle3 = atan2(2.0*xc*a, xc*xc - a*a);
- angle3 = (angle3 >= 0.0) ? angle3 : -angle3;
+ // Trajectory radius
+ r = a/(2.0*d)+d/2.0;
+
+ // Director vector of start to end
+ ux = 1.0/(2.0*sqrt(a))*x;
+ uy = 1.0/(2.0*sqrt(a))*y;
+
+ // Rotate last vector by 90
+ vx = - uy;
+ vy = ux;
+
+ // Position of the circle's center
+ Ox = x/2.0 - (r-d)*vx;
+ Oy = y/2.0 - (r-d)*vy;
+
+ // Director vector of start to center rotated by 90
+ u2x = - Oy / r;
+ u2y = Ox / r;
+
+ // Tangent angle from the X axis
+ angle2 = atan2(u2y, u2x);
+
+ // Angle to travel on the circle
+ angle3 = 2.0*atan2(sqrt(a), r-d);
if (mode == GOTO_CURVE_LEFT) {
- // angle2 = angle2 si on contourne par la gauche
+ // angle2 = angle2 if we pass left
- turnRight(angle2*180.0/PI, vel, acc);
+ turnRight(90.0-angle2*180.0/PI, vel, acc);
posRight = (r - (float) WHEELS_DIST/2.0)*angle3;
posLeft = (r + (float) WHEELS_DIST/2.0)*angle3;
@@ -713,11 +731,10 @@ void goTo(short x, short y, short vel, short acc, BYTE mode, short d) {
velRight = ((float) posRight / ((float) posLeft)) * vel;
}
else {
- // Si on on contourne par la droite, il faut faire le symique
- // de la trajectoire par rapport au chemin direct
+ // If we pass right, we need to adjust the calculated angle
angle2 = 2.0*angle1 - angle2;
- turnRight(angle2*180.0/PI, vel, acc);
+ turnRight(90.0-angle2*180.0/PI, vel, acc);
posRight = (r + (float) WHEELS_DIST/2.0)*angle3;
posLeft = (r - (float) WHEELS_DIST/2.0)*angle3;
@@ -728,11 +745,11 @@ void goTo(short x, short y, short vel, short acc, BYTE mode, short d) {
waitTrajComplete();
newPosition(MOTOR_RIGHT,
- - (long) ((float) posRight * COEF_RIGHT_WHEEL),
+ (long) ((float) posRight * COEF_RIGHT_WHEEL),
(long) ((float) velRight * COEF_RIGHT_WHEEL * CONST_VEL),
(long) ((float) acc * COEF_RIGHT_WHEEL * CONST_ACC));
newPosition(MOTOR_LEFT,
- (long) ((float) posLeft * COEF_LEFT_WHEEL),
+ - (long) ((float) posLeft * COEF_LEFT_WHEEL),
(long) ((float) velLeft * COEF_LEFT_WHEEL * CONST_VEL),
(long) ((float) acc * COEF_LEFT_WHEEL * CONST_ACC));
diff --git a/USB_Module/Motor_Controller/Firmware/output/Motor_controller.cof b/USB_Module/Motor_Controller/Firmware/output/Motor_controller.cof
index f106d0e..591696c 100644
Binary files a/USB_Module/Motor_Controller/Firmware/output/Motor_controller.cof and b/USB_Module/Motor_Controller/Firmware/output/Motor_controller.cof differ
diff --git a/USB_Module/Motor_Controller/Firmware/output/Motor_controller.hex b/USB_Module/Motor_Controller/Firmware/output/Motor_controller.hex
index d6ded68..278bba0 100644
--- a/USB_Module/Motor_Controller/Firmware/output/Motor_controller.hex
+++ b/USB_Module/Motor_Controller/Firmware/output/Motor_controller.hex
@@ -1,25 +1,25 @@
:020000040000FA
-:060000002AEF33F01200AC
+:060000005EEF33F0120078
:0600080004EF04F01200F9
:060018000CEF04F01200E1
-:060800002AEF33F01200A4
+:060800005EEF33F0120070
:060808002EEF04F01200C7
:0608180096EF04F012004F
-:06082A000400E766000077
-:100830002601000021000000DF6600005F010000CB
-:1008400008000000D1660000470100000E00000013
-:0C085000CE6600006A01000003000000FA
+:06082A0004004F6700000E
+:100830002601000021000000476700005F01000062
+:100840000800000039670000470100000E000000AA
+:0C085000366700006A0100000300000091
:04085C00DACFE4FF0C
:10086000E2CFDAFFE9CFE4FFEACFE4FFF6CFE4FF1F
:10087000F7CFE4FFF5CFE4FFF3CFE4FFF4CFE4FFDD
-:10088000FACFE4FF00EE45F0140EE80403E3EECFE8
-:10089000E4FFFBD700EE00F0450EE80403E3EECFE3
+:10088000FACFE4FF00EE29F0140EE80403E3EECF04
+:10089000E4FFFBD700EE00F0290EE80403E3EECFFF
:1008A000E4FFFBD75EEC13F09EA013D068EC13F0CE
:1008B00001014D2B000E4E23E80E4D5D030E4E59E7
-:1008C00005E34D6B4E6B4F2B000E5023D4EC2BF0F9
+:1008C00005E34D6B4E6B4F2B000E502308EC2CF0C4
:1008D0009E9071EC13F002E2E16AE552E16EE5529E
-:1008E000E7CFD9FFE55200EE44F0450EE80403E3FC
-:1008F000E5CFEDFFFBD700EE58F0140EE80403E35C
+:1008E000E7CFD9FFE55200EE28F0290EE80403E334
+:1008F000E5CFEDFFFBD700EE3CF0140EE80403E378
:10090000E5CFEDFFFBD7E5CFFAFFE5CFF4FFE5CF6D
:10091000F3FFE5CFF5FFE5CFF7FFE5CFF6FFE5CF36
:10092000EAFFE5CFE9FFE5CFDAFF1100D8CFE4FF1A
@@ -27,18 +27,18 @@
:10094000E4FFF4CFE4FF5EEC13F071EC13F002E28D
:10095000E16AE552E16EE552E7CFD9FFE552E5CF16
:10096000F4FFE5CFF3FFE5CFDAFFE550E5CFE0FF99
-:10097000E5CFD8FF100004D8B7EC1EF060D8FCD744
-:100980000F0EC11202D881EF1EF081EC13F0E65277
+:10097000E5CFD8FF100004D8EBEC1EF060D8FCD710
+:100980000F0EC11202D8B5EF1EF081EC13F0E65243
:1009900035EC13F00101676F070E675D10E1E66A41
-:1009A00044EC32F0E552DF6E000EDF8079EC13F09C
-:1009B000E66AFDEC32F0E552DF7079EC13F0D08E90
+:1009A00078EC32F0E552DF6E000EDF8079EC13F068
+:1009B000E66A31EC33F0E552DF7079EC13F0D08E5B
:1009C000F28EF28CF30E8C1695160101476B486B74
:1009D000496B4A6B010E4B6FF90E921680160E0E84
-:1009E000E66E7C0EE66EE10EE66EB7EC31F0E55297
+:1009E000E66E7C0EE66EE10EE66EEBEC31F0E55263
:1009F000E552E552CF0E9216939894943F0E9516B9
:100A0000010EE66E86EC13F0E552838C81888284B9
-:100A1000808A838E80888294010EE66E38EC33F0F3
-:100A2000E55282849D80C50EE66E8DEC32F0E55273
+:100A1000808A838E80888294010EE66E6CEC33F0BF
+:100A2000E55282849D80C50EE66EC1EC32F0E5523F
:100A300068EC13F0E552E552E7CFD9FF1200D9CFA9
:100A4000E6FFE1CFD9FF0F0EE12601014B5102E095
:100A50007AEC12F0200E0101005D03E36D50020BF1
@@ -49,33 +49,33 @@
:100AA0004C514C2B0501416F0501040E426F0101B1
:100AB0004651EA6A260FE96E010EEA22EFCF43F5AE
:100AC000400EE66E400EE66E050EE66E010EE66E18
-:100AD000010EE66ED2EC22F0006E050EE15E0050D3
+:100AD000010EE66E06EC23F0006E050EE15E00509E
:100AE000F3CF49F1F4CF4AF101014651EA6A260FEA
:100AF000E96E010EEA22EF6A01014651000803E2A5
:100B00000101460707D001014551000803E2010138
:100B10001F0E466F010149514A1102E1000E08D033
:100B200049C1E9FF4AC1EAFFEF50800B01E0010E25
-:100B300000092CE10101520529E10BEC1BF0000931
+:100B300000092CE10101520529E1E4EC1AF0000959
:100B400025E00501406B01014C514C2B0501416F23
:100B500005010A0E426F0501436B0501010E486F46
:100B6000400EE66E400EE66E050EE66E010EE66E77
-:100B7000010EE66ED2EC22F0006E050EE15E005032
+:100B7000010EE66E06EC23F0006E050EE15E0050FD
:100B8000F3CF49F1F4CF4AF10101526B000E01019C
:100B9000E76E5119E8AE02D0513503D0E750D88046
:100BA000515501E38ED001015151FF0A29E0FD0AA0
-:100BB00013E0030A01E06ED0020EE66E20EC2DF089
+:100BB00013E0030A01E06ED0020EE66E54EC2DF055
:100BC000E552ADEC16F0000904E00101020E516F90
:100BD00002D00101516960D0200EE66E030EE66E70
-:100BE000C80EE66EE66AE80EE66E030EE66E0DECE3
+:100BE000C80EE66EE66AE80EE66E030EE66E06ECEA
:100BF00018F0006E060EE15E00500101516B4CD002
:100C0000010149514A1102E1000E08D049C1E9FF32
:100C10004AC1EAFFEF50800B01E0010E000939E103
:100C20000501406B01014C514C2B0501416F050141
-:100C3000050E426F0501436B0501486B4F0E006EB8
+:100C3000050E426F0501436B0501486BB70E006E50
:100C4000630E016E026A00C0E6FF01C0E6FF02C04B
-:100C5000E6FF480EE66E050EE66E08EC32F0036E17
+:100C5000E6FF480EE66E050EE66E3CEC32F0036EE3
:100C6000050EE15E0350400EE66E400EE66E050E88
-:100C7000E66E010EE66E010EE66ED2EC22F0006E1C
+:100C7000E66E010EE66E010EE66E06EC23F0006EE7
:100C8000050EE15E0050F3CF49F1F4CF4AF10101C6
:100C9000516B02D00101516B020EE66EE66A48EC20
:100CA00016F0E552E55200090AE1020EE66E010E69
@@ -85,8 +85,8 @@
:100CE00002E070EF12F005010251070A02E1D1EFB4
:100CF00011F00D0A01E10CD2010A01E1DCD10D0A6B
:100D000001E174D1040A1AE0030A07E0010A02E0D3
-:100D10002FEF12F0FF0070EF12F0E66A44EC32F0B1
-:100D2000E552DF6E000EDB80DFCFE6FFE66A24ECE3
+:100D10002FEF12F0FF0070EF12F0E66A78EC32F07D
+:100D2000E552DF6E000EDB80DFCFE6FFE66A58ECAF
:100D300032F0E552E552FF0070EF12F00101495127
:100D40004A1102E1000E08D049C1E9FF4AC1EAFF99
:100D5000EF50800B01E0010E000901E045D100C514
@@ -94,26 +94,26 @@
:100D700005010851070A01E1BBD0010A01E17ED05B
:100D8000020A71E0070A64E0010A20E0030A06E0B3
:100D9000010A01E0FFD067C148F5FFD00501486BAB
-:100DA0002B0E006E630E016E026A00C0E6FF01C0EA
-:100DB000E6FF02C0E6FF480EE66E050EE66E08ECA2
+:100DA000930E006E630E016E026A00C0E6FF01C082
+:100DB000E6FF02C0E6FF480EE66E050EE66E3CEC6E
:100DC00032F0036E050EE15E0350E7D00501486B7B
-:100DD0001F0E006E630E016E026A00C0E6FF01C0C6
-:100DE000E6FF02C0E6FF480EE66E050EE66E08EC72
-:100DF00032F0036E050EE15E03501D0E006E630EB1
+:100DD000870E006E630E016E026A00C0E6FF01C05E
+:100DE000E6FF02C0E6FF480EE66E050EE66E3CEC3E
+:100DF00032F0036E050EE15E0350850E006E630E49
:100E0000016E026A00C0E6FF01C0E6FF02C0E6FF15
-:100E1000480EE66E050EE66E08EC32F0036E050E27
-:100E2000E15E0350140E006E630E016E026A00C094
+:100E1000480EE66E050EE66E3CEC32F0036E050EF3
+:100E2000E15E03507C0E006E630E016E026A00C02C
:100E3000E6FF01C0E6FF02C0E6FF480EE66E050EC3
-:100E4000E66E08EC32F0036E050EE15E0350A5D0AD
+:100E4000E66E3CEC32F0036E050EE15E0350A5D079
:100E500092CF48F593CF49F594CF4AF595CF4BF50E
:100E600096CF4CF59AD080CF48F581CF49F582CF07
-:100E70004AF583CF4BF584CF4CF58FD0E66A7AECF8
-:100E80002CF0E552010E49C0DBFF020E4AC0DBFF29
-:100E9000030E4BC0DBFF040E4CC0DBFF040EDBCFA8
+:100E70004AF583CF4BF584CF4CF58FD0E66AAEECC4
+:100E80002CF0E552010E2DC0DBFF020E2EC0DBFF61
+:100E9000030E2FC0DBFF040E30C0DBFF040EDBCFE0
:100EA00048F5030EDBCF49F5020EDBCF4AF5010E04
-:100EB000DBCF4BF5010EE66E7AEC2CF0E552010E1D
-:100EC00049C0DBFF020E4AC0DBFF030E4BC0DBFF55
-:100ED000040E4CC0DBFF040EDBCF4CF5030EDBCF62
+:100EB000DBCF4BF5010EE66EAEEC2CF0E552010EE9
+:100EC0002DC0DBFF020E2EC0DBFF030E2FC0DBFFA9
+:100ED000040E30C0DBFF040EDBCF4CF5030EDBCF7E
:100EE0004DF5020EDBCF4EF5010EDBCF4FF555D0A1
:100EF0000A0EE66EE66AD6EC13F0E552E552E66AB3
:100F00003AEC15F0E552030EF3CFDBFF040EF4CFFD
@@ -126,10 +126,10 @@
:100F7000F3CFDEFFF4CFDDFFDD52040EDBCF4CF507
:100F8000030EDBCF4DF5020EDBCF4EF5010EDBCFAE
:100F90004FF503D00501020E436F400EE66E400E82
-:100FA000E66E050EE66E010EE66E010EE66ED2EC02
-:100FB00022F0006E050EE15E0050F3CF49F1F4CF50
+:100FA000E66E050EE66E010EE66E010EE66E06ECCE
+:100FB00023F0006E050EE15E0050F3CF49F1F4CF4F
:100FC0004AF1400EE66E000EE66E050EE66EE66A2B
-:100FD000010EE66ED2EC22F0006E050EE15E0050CE
+:100FD000010EE66E06EC23F0006E050EE15E005099
:100FE000F3CF47F1F4CF48F170EF12F0050108514B
:100FF000030A37E0010A25E0030A13E0010A01E0D1
:1010000040D005010951921205010A5193120501C0
@@ -140,14 +140,14 @@
:101050000B1D8B1605010C1D8C1605010D1D8D1623
:1010600015D005010951891205010A518A1205019D
:101070000B518B1205010C518C1205010D518D1273
-:1010800005D0030EE66ECAEC32F0E552400EE66E75
-:10109000000EE66E050EE66EE66A010EE66ED2EC16
-:1010A00022F0006E050EE15E0050F3CF47F1F4CF61
+:1010800005D0030EE66EFEEC32F0E552400EE66E41
+:10109000000EE66E050EE66EE66A010EE66E06ECE2
+:1010A00023F0006E050EE15E0050F3CF47F1F4CF60
:1010B00048F170EF12F005010851020A09E0030A35
-:1010C00001E00CD009C5E6FF20EC2DF0E5520BD075
-:1010D00009C5E6FF30EC2DF0E55205D0010EE66EB5
-:1010E000CAEC32F0E552400EE66E000EE66E050EDA
-:1010F000E66EE66A010EE66ED2EC22F0006E050E98
+:1010C00001E00CD009C5E6FF54EC2DF0E5520BD041
+:1010D00009C5E6FF64EC2DF0E55205D0010EE66E81
+:1010E000FEEC32F0E552400EE66E000EE66E050EA6
+:1010F000E66EE66A010EE66E06EC23F0006E050E63
:10110000E15E0050F3CF47F1F4CF48F170EF12F0F9
:1011100005010851060A02E190EF11F0080A02E108
:1011200056EF11F0030A02E14DEF11F0070A02E158
@@ -157,80 +157,80 @@
:10116000030A01E1ACD1010A01E1A5D10C0A01E1B8
:1011700026D1030A01E194D0040A02E0B8EF11F08D
:101180000501095104E0020E0501095D40E10AC5AF
-:10119000E6FF010EE66E24EC32F0E552E5520BC597
-:1011A000E6FF020EE66E24EC32F0E552E5520CC585
-:1011B000E6FF030EE66E24EC32F0E552E5520DC573
-:1011C000E6FF040EE66E24EC32F0E552E5520EC561
-:1011D000E6FF050EE66E24EC32F0E552E5520FC54F
-:1011E000E6FF060EE66E24EC32F0E552E55210C53D
-:1011F000E6FF070EE66E24EC32F0E552E55211C52B
-:10120000E6FF080EE66E24EC32F0E552E5520501E9
+:10119000E6FF010EE66E58EC32F0E552E5520BC563
+:1011A000E6FF020EE66E58EC32F0E552E5520CC551
+:1011B000E6FF030EE66E58EC32F0E552E5520DC53F
+:1011C000E6FF040EE66E58EC32F0E552E5520EC52D
+:1011D000E6FF050EE66E58EC32F0E552E5520FC51B
+:1011E000E6FF060EE66E58EC32F0E552E55210C509
+:1011F000E6FF070EE66E58EC32F0E552E55211C5F7
+:10120000E6FF080EE66E58EC32F0E552E5520501B5
:10121000090504E0020E0501095D40E10AC5E6FF8B
-:10122000090EE66E24EC32F0E552E5520BC5E6FFFE
-:101230000A0EE66E24EC32F0E552E5520CC5E6FFEC
-:101240000B0EE66E24EC32F0E552E5520DC5E6FFDA
-:101250000C0EE66E24EC32F0E552E5520EC5E6FFC8
-:101260000D0EE66E24EC32F0E552E5520FC5E6FFB6
-:101270000E0EE66E24EC32F0E552E55210C5E6FFA4
-:101280000F0EE66E24EC32F0E552E55211C5E6FF92
-:10129000100EE66E24EC32F0E552E552BDEF11F08F
+:10122000090EE66E58EC32F0E552E5520BC5E6FFCA
+:101230000A0EE66E58EC32F0E552E5520CC5E6FFB8
+:101240000B0EE66E58EC32F0E552E5520DC5E6FFA6
+:101250000C0EE66E58EC32F0E552E5520EC5E6FF94
+:101260000D0EE66E58EC32F0E552E5520FC5E6FF82
+:101270000E0EE66E58EC32F0E552E55210C5E6FF70
+:101280000F0EE66E58EC32F0E552E55211C5E6FF5E
+:10129000100EE66E58EC32F0E552E552BDEF11F05B
:1012A00000C540F50501416B0501030E426F0501C4
-:1012B000436B010EE66E44EC32F0E5520501486FD7
-:1012C000020EE66E44EC32F0E5520501496F030E62
-:1012D000E66E44EC32F0E55205014A6F040EE66E0C
-:1012E00044EC32F0E55205014B6F050EE66E44EC1E
-:1012F00032F0E55205014C6F060EE66E44EC32F01A
-:10130000E55205014D6F070EE66E44EC32F0E552F2
-:1013100005014E6F080EE66E44EC32F0E552050111
-:101320004F6F090EE66E44EC32F0E5520501506F46
-:101330000A0EE66E44EC32F0E5520501516F0B0ED9
-:10134000E66E44EC32F0E5520501526F0C0EE66E8B
-:1013500044EC32F0E5520501536F0D0EE66E44EC9D
-:1013600032F0E5520501546F0E0EE66E44EC32F099
-:10137000E5520501556F0F0EE66E44EC32F0E55272
-:101380000501566F100EE66E44EC32F0E552050191
+:1012B000436B010EE66E78EC32F0E5520501486FA3
+:1012C000020EE66E78EC32F0E5520501496F030E2E
+:1012D000E66E78EC32F0E55205014A6F040EE66ED8
+:1012E00078EC32F0E55205014B6F050EE66E78ECB6
+:1012F00032F0E55205014C6F060EE66E78EC32F0E6
+:10130000E55205014D6F070EE66E78EC32F0E552BE
+:1013100005014E6F080EE66E78EC32F0E5520501DD
+:101320004F6F090EE66E78EC32F0E5520501506F12
+:101330000A0EE66E78EC32F0E5520501516F0B0EA5
+:10134000E66E78EC32F0E5520501526F0C0EE66E57
+:1013500078EC32F0E5520501536F0D0EE66E78EC35
+:1013600032F0E5520501546F0E0EE66E78EC32F065
+:10137000E5520501556F0F0EE66E78EC32F0E5523E
+:101380000501566F100EE66E78EC32F0E55205015D
:10139000576F400EE66E400EE66E050EE66E010ECD
-:1013A000E66E010EE66ED2EC22F0006E050EE15EF6
+:1013A000E66E010EE66E06EC23F0006E050EE15EC1
:1013B0000050F3CF49F1F4CF4AF1BDEF11F0030E25
-:1013C000E66E010EE66E24EC32F0E552E552E80ED0
-:1013D000E66E020EE66E24EC32F0E552E552E66A65
-:1013E000030EE66E24EC32F0E552E552010EE66E95
-:1013F000040EE66E24EC32F0E552E552E66A050E84
-:10140000E66E24EC32F0E552E552E66A060EE66E30
-:1014100024EC32F0E552E552270EE66E070EE66E3A
-:1014200024EC32F0E552E552100EE66E080EE66E40
-:1014300024EC32F0E552E552030EE66E090EE66E3C
-:1014400024EC32F0E552E552E80EE66E0A0EE66E46
-:1014500024EC32F0E552E552E66A0B0EE66E24EC1F
-:1014600032F0E552E552010EE66E0C0EE66E24EC0B
-:1014700032F0E552E552E66A0D0EE66E24EC32F0EB
-:10148000E552E552E66A0E0EE66E24EC32F0E552C5
-:10149000E552270EE66E0F0EE66E24EC32F0E552B2
-:1014A000E552100EE66E100EE66E24EC32F0E552B8
+:1013C000E66E010EE66E58EC32F0E552E552E80E9C
+:1013D000E66E020EE66E58EC32F0E552E552E66A31
+:1013E000030EE66E58EC32F0E552E552010EE66E61
+:1013F000040EE66E58EC32F0E552E552E66A050E50
+:10140000E66E58EC32F0E552E552E66A060EE66EFC
+:1014100058EC32F0E552E552270EE66E070EE66E06
+:1014200058EC32F0E552E552100EE66E080EE66E0C
+:1014300058EC32F0E552E552030EE66E090EE66E08
+:1014400058EC32F0E552E552E80EE66E0A0EE66E12
+:1014500058EC32F0E552E552E66A0B0EE66E58ECB7
+:1014600032F0E552E552010EE66E0C0EE66E58ECD7
+:1014700032F0E552E552E66A0D0EE66E58EC32F0B7
+:10148000E552E552E66A0E0EE66E58EC32F0E55291
+:10149000E552270EE66E0F0EE66E58EC32F0E5527E
+:1014A000E552100EE66E100EE66E58EC32F0E55284
:1014B000E552BDEF11F0ADEC16F0BDEF11F0060EE8
:1014C00009C5DBFF050E0AC5DBFF080E0BC5DBFFF8
:1014D000070E0CC5DBFF0A0E0DC5DBFF090E0EC59E
:1014E000DBFF090EDBCFE6FF0A0EDBCFE6FF070EC0
:1014F000DBCFE6FF080EDBCFE6FF050EDBCFE6FF16
-:10150000060EDBCFE6FF0DEC18F0006E060EE15E76
+:10150000060EDBCFE6FF06EC18F0006E060EE15E7D
:1015100000500101010E526FBDEF11F0060E09C51A
:10152000DBFF050E0AC5DBFF080E0BC5DBFF070E50
:101530000CC5DBFF0A0E0DC5DBFF090E0EC5DBFF78
:10154000090EDBCFE6FF0A0EDBCFE6FF070EDBCF8F
:10155000E6FF080EDBCFE6FF050EDBCFE6FF060E4B
-:10156000DBCFE6FF18EC18F0006E060EE15E0050CF
+:10156000DBCFE6FF11EC18F0006E060EE15E0050D6
:101570000101010E526FBDEF11F0060E09C5DBFF30
:10158000050E0AC5DBFF080E0BC5DBFF070E0CC5F9
:10159000DBFF0A0E0DC5DBFF090E0EC5DBFF090ED2
:1015A000DBCFE6FF0A0EDBCFE6FF070EDBCFE6FF61
:1015B000080EDBCFE6FF050EDBCFE6FF060EDBCF26
-:1015C000E6FF23EC18F0006E060EE15E005001010C
+:1015C000E6FF1EEC18F0006E060EE15E0050010111
:1015D000010E526FBDEF11F0060E09C5DBFF050EBF
:1015E0000AC5DBFF080E0BC5DBFF070E0CC5DBFFD2
:1015F0000A0E0DC5DBFF090E0EC5DBFF090EDBCFA2
:10160000E6FF0A0EDBCFE6FF070EDBCFE6FF080E94
:10161000DBCFE6FF050EDBCFE6FF060EDBCFE6FFF6
-:1016200032EC18F0006E060EE15E00500101010E72
+:101620002AEC18F0006E060EE15E00500101010E7A
:10163000526FBDEF11F0060E09C5DBFF050E0AC59E
:10164000DBFF080E0BC5DBFF070E0CC5DBFF0A0E28
:101650000DC5DBFF090E0EC5DBFF0C0E0FC5DBFF52
@@ -239,232 +239,232 @@
:10168000E6FF0B0EDBCFE6FF0C0EDBCFE6FF090E0D
:10169000DBCFE6FF0A0EDBCFE6FF070EDBCFE6FF70
:1016A000080EDBCFE6FF050EDBCFE6FF060EDBCF35
-:1016B000E6FF3FEC18F0006E0B0EE15E00500101FA
+:1016B000E6FF36EC18F0006E0B0EE15E0050010103
:1016C000010E526FBDEF11F0060E0AC5DBFF050ECD
:1016D0000BC5DBFF050EDBCFE6FF060EDBCFE6FF1B
-:1016E00009C5E6FF05EC18F0E552E552E552BDEFFD
+:1016E00009C5E6FFFCEC17F0E552E552E552BDEF07
:1016F00011F0060E0AC5DBFF050E0BC5DBFF080E59
:101700000CC5DBFF070E0DC5DBFF0A0E0EC5DBFFA8
:10171000090E0FC5DBFF020E0501095D01E0B8D11E
-:10172000090EDBCF4BF00A0EDBCF4CF027EC24F098
-:101730004AC008F04BC009F04CC00AF04DC00BF095
-:10174000A60E4F6E280E506E940E516E3F0E526EC6
-:1017500008C04AF009C04BF00AC04CF00BC04DF075
-:1017600041EC25F04AC004F04BC005F04CC006F037
-:101770004DC007F0CC0E4F6EBC0E506E8C0E516EED
-:101780003B0E526E04C04AF005C04BF006C04CF050
-:1017900007C04DF041EC25F0DDEC25F049C000F02C
-:1017A0004AC001F04BC002F04CC003F000C0E6FF9D
+:10172000090EDBCF2FF00A0EDBCF30F05BEC24F09C
+:101730002EC008F02FC009F030C00AF031C00BF005
+:10174000A60E336E280E346E940E356E3F0E366E36
+:1017500008C02EF009C02FF00AC030F00BC031F0E5
+:1017600075EC25F02EC004F02FC005F030C006F057
+:1017700031C007F0CC0E336EBC0E346E8C0E356E5D
+:101780003B0E366E04C02EF005C02FF006C030F0C0
+:1017900007C031F075EC25F011EC26F02DC000F0FB
+:1017A0002EC001F02FC002F030C003F000C0E6FFF1
:1017B00001C0E6FF02C0E6FF03C0E6FF070EDBCF75
-:1017C0004BF0080EDBCF4CF027EC24F04AC014F0AD
-:1017D0004BC015F04CC016F04DC017F0A60E4F6E62
-:1017E000280E506E940E516E3F0E526E14C04AF089
-:1017F00015C04BF016C04CF017C04DF041EC25F071
-:101800004AC010F04BC011F04CC012F04DC013F0A4
-:10181000BD0E4F6E370E506E860E516E410E526EDB
-:1018200010C04AF011C04BF012C04CF013C04DF084
-:1018300041EC25F0DDEC25F049C00CF04AC00DF07C
-:101840004BC00EF04CC00FF00CC0E6FF0DC0E6FF21
-:101850000EC0E6FF0FC0E6FF050EDBCF4BF0060E15
-:10186000DBCF4CF027EC24F04AC01CF04BC01DF03D
-:101870004CC01EF04DC01FF0A60E4F6E280E506ECD
-:10188000940E516E3F0E526E1CC04AF01DC04BF0BC
-:101890001EC04CF01FC04DF041EC25F0DDEC25F0F2
-:1018A00049C018F04AC019F04BC01AF04CC01BF0E8
+:1017C0002FF0080EDBCF30F05BEC24F02EC014F0CD
+:1017D0002FC015F030C016F031C017F0A60E336ED2
+:1017E000280E346E940E356E3F0E366E14C02EF0F9
+:1017F00015C02FF016C030F017C031F075EC25F091
+:101800002EC010F02FC011F030C012F031C013F014
+:10181000BD0E336E370E346E860E356E410E366E4B
+:1018200010C02EF011C02FF012C030F013C031F0F4
+:1018300075EC25F011EC26F02DC00CF02EC00DF04B
+:101840002FC00EF030C00FF00CC0E6FF0DC0E6FF59
+:101850000EC0E6FF0FC0E6FF050EDBCF2FF0060E31
+:10186000DBCF30F05BEC24F02EC01CF02FC01DF05D
+:1018700030C01EF031C01FF0A60E336E280E346E3D
+:10188000940E356E3F0E366E1CC02EF01DC02FF02C
+:101890001EC030F01FC031F075EC25F011EC26F0C1
+:1018A0002DC018F02EC019F02FC01AF030C01BF058
:1018B000000E186C191E19221A1E1A221B1E1B223A
:1018C00018C0E6FF19C0E6FF1AC0E6FF1BC0E6FF1E
:1018D000E66A2FEC17F0206E0D0EE15E2050090E27
-:1018E000DBCF4BF00A0EDBCF4CF027EC24F04AC0E4
-:1018F00008F04BC009F04CC00AF04DC00BF0A60E2A
-:101900004F6E280E506E940E516E3F0E526E08C0F0
-:101910004AF009C04BF00AC04CF00BC04DF041EC4E
-:1019200025F04AC004F04BC005F04CC006F04DC095
-:1019300007F0CC0E4F6EBC0E506E8C0E516E3B0EEF
-:10194000526E04C04AF005C04BF006C04CF007C010
-:101950004DF041EC25F0DDEC25F049C000F04AC027
-:1019600001F04BC002F04CC003F000C0E6FF01C024
-:10197000E6FF02C0E6FF03C0E6FF070EDBCF4BF039
-:10198000080EDBCF4CF027EC24F04AC014F04BC01B
-:1019900015F04CC016F04DC017F0A60E4F6E280E75
-:1019A000506E940E516E3F0E526E14C04AF015C028
-:1019B0004BF016C04CF017C04DF041EC25F04AC07A
-:1019C00010F04BC011F04CC012F04DC013F0BD0E22
-:1019D0004F6E370E506E860E516E410E526E10C015
-:1019E0004AF011C04BF012C04CF013C04DF041EC66
-:1019F00025F0DDEC25F049C00CF04AC00DF04BC0DD
-:101A00000EF04CC00FF00CC0E6FF0DC0E6FF0EC09C
-:101A1000E6FF0FC0E6FF050EDBCF4BF0060EDBCF77
-:101A20004CF027EC24F04AC01CF04BC01DF04CC019
-:101A30001EF04DC01FF0A60E4F6E280E506E940E75
-:101A4000516E3F0E526E1CC04AF01DC04BF01EC0BE
-:101A50004CF01FC04DF041EC25F0DDEC25F049C005
-:101A600018F04AC019F04BC01AF04CC01BF018C057
+:1018E000DBCF2FF00A0EDBCF30F05BEC24F02EC004
+:1018F00008F02FC009F030C00AF031C00BF0A60E7E
+:10190000336E280E346E940E356E3F0E366E08C060
+:101910002EF009C02FF00AC030F00BC031F075EC8A
+:1019200025F02EC004F02FC005F030C006F031C005
+:1019300007F0CC0E336EBC0E346E8C0E356E3B0E43
+:10194000366E04C02EF005C02FF006C030F007C080
+:1019500031F075EC25F011EC26F02DC000F02EC012
+:1019600001F02FC002F030C003F000C0E6FF01C05C
+:10197000E6FF02C0E6FF03C0E6FF070EDBCF2FF055
+:10198000080EDBCF30F05BEC24F02EC014F02FC03B
+:1019900015F030C016F031C017F0A60E336E280EC9
+:1019A000346E940E356E3F0E366E14C02EF015C098
+:1019B0002FF016C030F017C031F075EC25F02EC0B6
+:1019C00010F02FC011F030C012F031C013F0BD0E76
+:1019D000336E370E346E860E356E410E366E10C085
+:1019E0002EF011C02FF012C030F013C031F075ECA2
+:1019F00025F011EC26F02DC00CF02EC00DF02FC0FC
+:101A00000EF030C00FF00CC0E6FF0DC0E6FF0EC0B8
+:101A1000E6FF0FC0E6FF050EDBCF2FF0060EDBCF93
+:101A200030F05BEC24F02EC01CF02FC01DF030C055
+:101A30001EF031C01FF0A60E336E280E346E940EC9
+:101A4000356E3F0E366E1CC02EF01DC02FF01EC02E
+:101A500030F01FC031F075EC25F011EC26F02DC0F0
+:101A600018F02EC019F02FC01AF030C01BF018C0AB
:101A7000E6FF19C0E6FF1AC0E6FF1BC0E6FF010E35
:101A8000E66E2FEC17F0206E0D0EE15E2050E0D0D8
-:101A9000090EDBCF4BF00A0EDBCF4CF027EC24F025
-:101AA0004AC008F04BC009F04CC00AF04DC00BF022
-:101AB000A60E4F6E280E506E940E516E3F0E526E53
-:101AC00008C04AF009C04BF00AC04CF00BC04DF002
-:101AD00041EC25F04AC004F04BC005F04CC006F0C4
-:101AE0004DC007F0CC0E4F6EBC0E506E8C0E516E7A
-:101AF0003B0E526E04C04AF005C04BF006C04CF0DD
-:101B000007C04DF041EC25F0DDEC25F049C000F0B8
-:101B10004AC001F04BC002F04CC003F000C0E6FF29
+:101A9000090EDBCF2FF00A0EDBCF30F05BEC24F029
+:101AA0002EC008F02FC009F030C00AF031C00BF092
+:101AB000A60E336E280E346E940E356E3F0E366EC3
+:101AC00008C02EF009C02FF00AC030F00BC031F072
+:101AD00075EC25F02EC004F02FC005F030C006F0E4
+:101AE00031C007F0CC0E336EBC0E346E8C0E356EEA
+:101AF0003B0E366E04C02EF005C02FF006C030F04D
+:101B000007C031F075EC25F011EC26F02DC000F087
+:101B10002EC001F02FC002F030C003F000C0E6FF7D
:101B200001C0E6FF02C0E6FF03C0E6FF070EDBCF01
-:101B30004BF0080EDBCF4CF027EC24F04AC014F039
-:101B40004BC015F04CC016F04DC017F0A60E4F6EEE
-:101B5000280E506E940E516E3F0E526E14C04AF015
-:101B600015C04BF016C04CF017C04DF041EC25F0FD
-:101B70004AC010F04BC011F04CC012F04DC013F031
-:101B8000BD0E4F6E370E506E860E516E410E526E68
-:101B900010C04AF011C04BF012C04CF013C04DF011
-:101BA00041EC25F0DDEC25F049C00CF04AC00DF009
-:101BB0004BC00EF04CC00FF00CC0E6FF0DC0E6FFAE
-:101BC0000EC0E6FF0FC0E6FF050EDBCF4BF0060EA2
-:101BD000DBCF4CF027EC24F04AC01CF04BC01DF0CA
-:101BE0004CC01EF04DC01FF0A60E4F6E280E506E5A
-:101BF000940E516E3F0E526E1CC04AF01DC04BF049
-:101C00001EC04CF01FC04DF041EC25F0DDEC25F07E
-:101C100049C018F04AC019F04BC01AF04CC01BF074
+:101B30002FF0080EDBCF30F05BEC24F02EC014F059
+:101B40002FC015F030C016F031C017F0A60E336E5E
+:101B5000280E346E940E356E3F0E366E14C02EF085
+:101B600015C02FF016C030F017C031F075EC25F01D
+:101B70002EC010F02FC011F030C012F031C013F0A1
+:101B8000BD0E336E370E346E860E356E410E366ED8
+:101B900010C02EF011C02FF012C030F013C031F081
+:101BA00075EC25F011EC26F02DC00CF02EC00DF0D8
+:101BB0002FC00EF030C00FF00CC0E6FF0DC0E6FFE6
+:101BC0000EC0E6FF0FC0E6FF050EDBCF2FF0060EBE
+:101BD000DBCF30F05BEC24F02EC01CF02FC01DF0EA
+:101BE00030C01EF031C01FF0A60E336E280E346ECA
+:101BF000940E356E3F0E366E1CC02EF01DC02FF0B9
+:101C00001EC030F01FC031F075EC25F011EC26F04D
+:101C10002DC018F02EC019F02FC01AF030C01BF0E4
:101C2000000E186C191E19221A1E1A221B1E1B22C6
:101C300018C0E6FF19C0E6FF1AC0E6FF1BC0E6FFAA
:101C400009C5E6FF2FEC17F0206E0D0EE15E205067
:101C500094D3060E0AC5DBFF050E0BC5DBFF080E8D
:101C60000CC5DBFF070E0DC5DBFF020E0501095D8C
:101C700001E04FD1FF0E05010E03F350E66E070E93
-:101C8000DBCF4BF0080EDBCF4CF027EC24F04AC042
-:101C900008F04BC009F04CC00AF04DC00BF0A60E86
-:101CA0004F6E280E506E940E516E3F0E526E08C04D
-:101CB0004AF009C04BF00AC04CF00BC04DF041ECAB
-:101CC00025F04AC004F04BC005F04CC006F04DC0F2
-:101CD00007F0CC0E4F6EBC0E506E8C0E516E3B0E4C
-:101CE000526E04C04AF005C04BF006C04CF007C06D
-:101CF0004DF041EC25F0DDEC25F049C000F04AC084
-:101D000001F04BC002F04CC003F000C0E6FF01C080
-:101D1000E6FF02C0E6FF03C0E6FF050EDBCF4BF097
-:101D2000060EDBCF4CF027EC24F04AC014F04BC079
-:101D300015F04CC016F04DC017F0A60E4F6E280ED1
-:101D4000506E940E516E3F0E526E14C04AF015C084
-:101D50004BF016C04CF017C04DF041EC25F04AC0D6
-:101D600010F04BC011F04CC012F04DC013F0BD0E7E
-:101D70004F6E370E506E860E516E410E526E10C071
-:101D80004AF011C04BF012C04CF013C04DF041ECC2
-:101D900025F0DDEC25F049C00CF04AC00DF04BC039
-:101DA0000EF04CC00FF00CC0E6FF0DC0E6FF0EC0F9
+:101C8000DBCF2FF0080EDBCF30F05BEC24F02EC062
+:101C900008F02FC009F030C00AF031C00BF0A60EDA
+:101CA000336E280E346E940E356E3F0E366E08C0BD
+:101CB0002EF009C02FF00AC030F00BC031F075ECE7
+:101CC00025F02EC004F02FC005F030C006F031C062
+:101CD00007F0CC0E336EBC0E346E8C0E356E3B0EA0
+:101CE000366E04C02EF005C02FF006C030F007C0DD
+:101CF00031F075EC25F011EC26F02DC000F02EC06F
+:101D000001F02FC002F030C003F000C0E6FF01C0B8
+:101D1000E6FF02C0E6FF03C0E6FF050EDBCF2FF0B3
+:101D2000060EDBCF30F05BEC24F02EC014F02FC099
+:101D300015F030C016F031C017F0A60E336E280E25
+:101D4000346E940E356E3F0E366E14C02EF015C0F4
+:101D50002FF016C030F017C031F075EC25F02EC012
+:101D600010F02FC011F030C012F031C013F0BD0ED2
+:101D7000336E370E346E860E356E410E366E10C0E1
+:101D80002EF011C02FF012C030F013C031F075ECFE
+:101D900025F011EC26F02DC00CF02EC00DF02FC058
+:101DA0000EF030C00FF00CC0E6FF0DC0E6FF0EC015
:101DB000E6FF0FC0E6FFE66A71EC17F0186E0A0E38
-:101DC000E15E18500EC5E6FF070EDBCF4BF0080EA4
-:101DD000DBCF4CF027EC24F04AC008F04BC009F0F0
-:101DE0004CC00AF04DC00BF0A60E4F6E280E506E80
-:101DF000940E516E3F0E526E08C04AF009C04BF06F
-:101E00000AC04CF00BC04DF041EC25F04AC004F084
-:101E10004BC005F04CC006F04DC007F0CC0E4F6E25
-:101E2000BC0E506E8C0E516E3B0E526E04C04AF0CA
-:101E300005C04BF006C04CF007C04DF041EC25F05A
-:101E4000DDEC25F049C000F04AC001F04BC002F0C3
-:101E50004CC003F000C0E6FF01C0E6FF02C0E6FF91
-:101E600003C0E6FF050EDBCF4BF0060EDBCF4CF0D8
-:101E700027EC24F04AC014F04BC015F04CC016F00B
-:101E80004DC017F0A60E4F6E280E506E940E516E78
-:101E90003F0E526E14C04AF015C04BF016C04CF005
-:101EA00017C04DF041EC25F04AC010F04BC011F0C6
-:101EB0004CC012F04DC013F0BD0E4F6E370E506E79
-:101EC000860E516E410E526E10C04AF011C04BF09A
-:101ED00012C04CF013C04DF041EC25F0DDEC25F0C4
-:101EE00049C00CF04AC00DF04BC00EF04CC00FF0D2
+:101DC000E15E18500EC5E6FF070EDBCF2FF0080EC0
+:101DD000DBCF30F05BEC24F02EC008F02FC009F010
+:101DE00030C00AF031C00BF0A60E336E280E346EF0
+:101DF000940E356E3F0E366E08C02EF009C02FF0DF
+:101E00000AC030F00BC031F075EC25F02EC004F0A4
+:101E10002FC005F030C006F031C007F0CC0E336E95
+:101E2000BC0E346E8C0E356E3B0E366E04C02EF03A
+:101E300005C02FF006C030F007C031F075EC25F07A
+:101E400011EC26F02DC000F02EC001F02FC002F0E2
+:101E500030C003F000C0E6FF01C0E6FF02C0E6FFAD
+:101E600003C0E6FF050EDBCF2FF0060EDBCF30F010
+:101E70005BEC24F02EC014F02FC015F030C016F02B
+:101E800031C017F0A60E336E280E346E940E356EE8
+:101E90003F0E366E14C02EF015C02FF016C030F075
+:101EA00017C031F075EC25F02EC010F02FC011F0E6
+:101EB00030C012F031C013F0BD0E336E370E346EE9
+:101EC000860E356E410E366E10C02EF011C02FF00A
+:101ED00012C030F013C031F075EC25F011EC26F093
+:101EE0002DC00CF02EC00DF02FC00EF030C00FF042
:101EF0000CC0E6FF0DC0E6FF0EC0E6FF0FC0E6FF18
:101F0000010EE66E71EC17F0186E0A0EE15E1850C5
:101F1000A9D0FF0E05010E03F350E66E070EDBCFCE
-:101F20004BF0080EDBCF4CF027EC24F04AC008F051
-:101F30004BC009F04CC00AF04DC00BF0A60E4F6E1E
-:101F4000280E506E940E516E3F0E526E08C04AF02D
-:101F500009C04BF00AC04CF00BC04DF041EC25F02D
-:101F60004AC004F04BC005F04CC006F04DC007F06D
-:101F7000CC0E4F6EBC0E506E8C0E516E3B0E526EE0
-:101F800004C04AF005C04BF006C04CF007C04DF04D
-:101F900041EC25F0DDEC25F049C000F04AC001F02D
-:101FA0004BC002F04CC003F000C0E6FF01C0E6FFEA
-:101FB00002C0E6FF03C0E6FF050EDBCF4BF0060EC6
-:101FC000DBCF4CF027EC24F04AC014F04BC015F0E6
-:101FD0004CC016F04DC017F0A60E4F6E280E506E76
-:101FE000940E516E3F0E526E14C04AF015C04BF065
-:101FF00016C04CF017C04DF041EC25F04AC010F06F
-:102000004BC011F04CC012F04DC013F0BD0E4F6E1E
-:10201000370E506E860E516E410E526E10C04AF051
-:1020200011C04BF012C04CF013C04DF041EC25F044
-:10203000DDEC25F049C00CF04AC00DF04BC00EF0AD
-:102040004CC00FF00CC0E6FF0DC0E6FF0EC0E6FF6F
+:101F20002FF0080EDBCF30F05BEC24F02EC008F071
+:101F30002FC009F030C00AF031C00BF0A60E336E8E
+:101F4000280E346E940E356E3F0E366E08C02EF09D
+:101F500009C02FF00AC030F00BC031F075EC25F04D
+:101F60002EC004F02FC005F030C006F031C007F0DD
+:101F7000CC0E336EBC0E346E8C0E356E3B0E366E50
+:101F800004C02EF005C02FF006C030F007C031F0BD
+:101F900075EC25F011EC26F02DC000F02EC001F0FC
+:101FA0002FC002F030C003F000C0E6FF01C0E6FF22
+:101FB00002C0E6FF03C0E6FF050EDBCF2FF0060EE2
+:101FC000DBCF30F05BEC24F02EC014F02FC015F006
+:101FD00030C016F031C017F0A60E336E280E346EE6
+:101FE000940E356E3F0E366E14C02EF015C02FF0D5
+:101FF00016C030F017C031F075EC25F02EC010F08F
+:102000002FC011F030C012F031C013F0BD0E336E8E
+:10201000370E346E860E356E410E366E10C02EF0C1
+:1020200011C02FF012C030F013C031F075EC25F064
+:1020300011EC26F02DC00CF02EC00DF02FC00EF0CC
+:1020400030C00FF00CC0E6FF0DC0E6FF0EC0E6FF8B
:102050000FC0E6FF09C5E6FF71EC17F0186E0A0E17
:10206000E15E18508AD1060E0AC5DBFF050E0BC5CE
:10207000DBFF020E0501095D01E0B3D0FF0E050193
-:102080000C03F350E66E050EDBCF4BF0060EDBCFF4
-:102090004CF027EC24F04AC008F04BC009F04CC0CB
-:1020A0000AF04DC00BF0A60E4F6E280E506E940E27
-:1020B000516E3F0E526E08C04AF009C04BF00AC084
-:1020C0004CF00BC04DF041EC25F04AC004F04BC081
-:1020D00005F04CC006F04DC007F0BD0E4F6E370E38
-:1020E000506E860E516E410E526E04C04AF005C00D
-:1020F0004BF006C04CF007C04DF041EC25F0DDEC94
-:1021000025F049C000F04AC001F04BC002F04CC0BD
+:102080000C03F350E66E050EDBCF2FF0060EDBCF10
+:1020900030F05BEC24F02EC008F02FC009F030C007
+:1020A0000AF031C00BF0A60E336E280E346E940E7B
+:1020B000356E3F0E366E08C02EF009C02FF00AC0F4
+:1020C00030F00BC031F075EC25F02EC004F02FC0BD
+:1020D00005F030C006F031C007F0BD0E336E370E8C
+:1020E000346E860E356E410E366E04C02EF005C07D
+:1020F0002FF006C030F007C031F075EC25F011EC80
+:1021000026F02DC000F02EC001F02FC002F030C02C
:1021100003F000C0E6FF01C0E6FF02C0E6FF03C017
-:10212000E6FFE66AB9EC17F00C6E060EE15E0C50A5
-:102130000CC5E6FF050EDBCF4BF0060EDBCF4CF0F7
-:1021400027EC24F04AC008F04BC009F04CC00AF05C
-:102150004DC00BF0A60E4F6E280E506E940E516EB1
-:102160003F0E526E08C04AF009C04BF00AC04CF056
-:102170000BC04DF041EC25F04AC004F04BC005F017
-:102180004CC006F04DC007F0BD0E4F6E370E506EBE
-:10219000860E516E410E526E04C04AF005C04BF0DF
-:1021A00006C04CF007C04DF041EC25F0DDEC25F009
-:1021B00049C000F04AC001F04BC002F04CC003F02F
+:10212000E6FFE66AB5EC17F00C6E060EE15E0C50A9
+:102130000CC5E6FF050EDBCF2FF0060EDBCF30F02F
+:102140005BEC24F02EC008F02FC009F030C00AF07C
+:1021500031C00BF0A60E336E280E346E940E356E21
+:102160003F0E366E08C02EF009C02FF00AC030F0C6
+:102170000BC031F075EC25F02EC004F02FC005F037
+:1021800030C006F031C007F0BD0E336E370E346E2E
+:10219000860E356E410E366E04C02EF005C02FF04F
+:1021A00006C030F007C031F075EC25F011EC26F0D8
+:1021B0002DC000F02EC001F02FC002F030C003F09F
:1021C00000C0E6FF01C0E6FF02C0E6FF03C0E6FF75
-:1021D000010EE66EB9EC17F00C6E060EE15E0C50C7
+:1021D000010EE66EB5EC17F00C6E060EE15E0C50CB
:1021E0005BD0FF0E05010C03F350E66E050EDBCF4E
-:1021F0004BF0060EDBCF4CF027EC24F04AC008F081
-:102200004BC009F04CC00AF04DC00BF0A60E4F6E4B
-:10221000280E506E940E516E3F0E526E08C04AF05A
-:1022200009C04BF00AC04CF00BC04DF041EC25F05A
-:102230004AC004F04BC005F04CC006F04DC007F09A
-:10224000BD0E4F6E370E506E860E516E410E526EA1
-:1022500004C04AF005C04BF006C04CF007C04DF07A
-:1022600041EC25F0DDEC25F049C000F04AC001F05A
-:102270004BC002F04CC003F000C0E6FF01C0E6FF17
-:1022800002C0E6FF03C0E6FF09C5E6FFB9EC17F0A0
-:102290000C6E060EE15E0C5070D009C5E6FFD7EC5F
-:1022A00017F0E5520101010E526F67D0DAEC1AF017
-:1022B000050EF3CFDBFF060EF4CFDBFFF2EC1AF0D6
+:1021F0002FF0060EDBCF30F05BEC24F02EC008F0A1
+:102200002FC009F030C00AF031C00BF0A60E336EBB
+:10221000280E346E940E356E3F0E366E08C02EF0CA
+:1022200009C02FF00AC030F00BC031F075EC25F07A
+:102230002EC004F02FC005F030C006F031C007F00A
+:10224000BD0E336E370E346E860E356E410E366E11
+:1022500004C02EF005C02FF006C030F007C031F0EA
+:1022600075EC25F011EC26F02DC000F02EC001F029
+:102270002FC002F030C003F000C0E6FF01C0E6FF4F
+:1022800002C0E6FF03C0E6FF09C5E6FFB5EC17F0A4
+:102290000C6E060EE15E0C5070D009C5E6FFCDEC69
+:1022A00017F0E5520101010E526F67D0B3EC1AF03E
+:1022B000050EF3CFDBFF060EF4CFDBFFCBEC1AF0FD
:1022C000070EF3CFDBFF080EF4CFDBFF00C540F5B0
:1022D0000501416B0501030E426F0501436B060EBC
:1022E000DBCF48F5050EDBCF49F5080EDBCF4AF50D
:1022F000070EDBCF4BF5400EE66E400EE66E050E88
-:10230000E66E010EE66E010EE66ED2EC22F0006E75
+:10230000E66E010EE66E010EE66E06EC23F0006E40
:10231000050EE15E0050F3CF49F1F4CF4AF12DD024
:1023200000C540F50501416B0501030E426F050133
-:10233000436B0BEC1BF0000904E00501010E486F34
+:10233000436BE4EC1AF0000904E00501010E486F5C
:1023400002D00501486B400EE66E400EE66E050EAB
-:10235000E66E010EE66E010EE66ED2EC22F0006E25
+:10235000E66E010EE66E010EE66E06EC23F0006EF0
:10236000050EE15E0050F3CF49F1F4CF4AF105D0FC
-:10237000010EE66ECAEC32F0E552400EE66E000E3B
-:10238000E66E050EE66EE66A010EE66ED2EC22F00F
+:10237000010EE66EFEEC32F0E552400EE66E000E07
+:10238000E66E050EE66EE66A010EE66E06EC23F0DA
:10239000006E050EE15E0050F3CF47F1F4CF48F137
:1023A0009FD0010149514A1102E1000E08D049C1F4
:1023B000E9FF4AC1EAFFEF50800B01E0010E00097E
:1023C0004DE10101010E516F0501406B01014C51BE
:1023D0004C2B0501416F0501050E426F0501436B52
-:1023E0000501486B000E006E630E016E026A00C0AC
+:1023E0000501486B680E006E630E016E026A00C044
:1023F000E6FF01C0E6FF02C0E6FF480EE66E050EEE
-:10240000E66E08EC32F0036E050EE15E0350400EFE
+:10240000E66E3CEC32F0036E050EE15E0350400ECA
:10241000E66E400EE66E050EE66E010EE66E010EED
-:10242000E66ED2EC22F0006E050EE15E0050F3CFB6
+:10242000E66E06EC23F0006E050EE15E0050F3CF81
:1024300049F1F4CF4AF1400EE66E000EE66E050E4D
-:10244000E66EE66A010EE66ED2EC22F0006E050E34
+:10244000E66EE66A010EE66E06EC23F0006E050EFF
:10245000E15E0050F3CF47F1F4CF48F141D00101E4
:1024600049514A1102E1000E08D049C1E9FF4AC1B1
:10247000EAFFEF50800B01E0010E000931E100C5D9
:1024800040F50501416B0501030E426F0501010E88
:10249000436F400EE66E400EE66E050EE66E010ED0
-:1024A000E66E010EE66ED2EC22F0006E050EE15EE5
+:1024A000E66E010EE66E06EC23F0006E050EE15EB0
:1024B0000050F3CF49F1F4CF4AF1400EE66E000E22
-:1024C000E66E050EE66EE66A010EE66ED2EC22F0CE
+:1024C000E66E050EE66EE66A010EE66E06EC23F099
:1024D000006E050EE15E0050F3CF47F1F4CF48F1F6
:1024E0000F0EE15C02E2E16AE552E16EE552E7CFF0
:1024F000D9FF120001015351541104E1100E536F22
@@ -475,19 +475,19 @@
:102540008C861200100E005D06E1010153515411FA
:102550000FE18C740AD0200E005D0AE10101535195
:10256000541106E18C748CA402D08C9612008C86D7
-:102570001200120012001200120071EF30F012006F
-:102580001E0EE66E010EE66EA0EC22F0E552E5525C
+:1025700012001200120012001200A5EF30F012003B
+:102580001E0EE66E010EE66ED4EC22F0E552E55228
:10259000400EE66E000EE66E050EE66EE66A010E71
-:1025A000E66ED2EC22F0006E050EE15E0050F3CF35
+:1025A000E66E06EC23F0006E050EE15E0050F3CF00
:1025B00047F1F4CF48F112006D840101080E686FF5
:1025C000070E696F6807000E695B68516911FAE1CF
:1025D0006D941200D9CFE6FFE1CFD9FFFD0EDBCF1E
-:1025E0004BF0FE0EDBCF4CF0010E4B1801E14C50CE
-:1025F00033E0E8684B1802E1E8684C182BE0030E62
-:102600004B1801E14C5024E0040E4B1801E14C50F2
-:102610001DE0020E4B1801E14C5016E0170E4B184E
-:1026200001E14C500FE0160E4B1801E14C5008E050
-:10263000150E4B1801E14C5001E010D0A1DF0FD076
+:1025E0002FF0FE0EDBCF30F0010E2F1801E130503E
+:1025F00033E0E8682F1802E1E86830182BE0030E9A
+:102600002F1801E1305024E0040E2F1801E1305062
+:102610001DE0020E2F1801E1305016E0170E2F18A2
+:1026200001E130500FE0160E2F1801E1305008E0A4
+:10263000150E2F1801E1305001E010D0A1DF0FD0AE
:102640009EDF0DD09ADF0BD096DF09D092DF07D046
:1026500091DF05D091DF03D0000001D000D0010E42
:1026600000D0E552E7CFD9FF12004BD8E652D0B2E6
@@ -497,14 +497,14 @@
:1026A000DF6ED088D086D084D082D080FC9EFC9C07
:1026B000DF50E552E552E7CFD9FF1200E65221D8AC
:1026C000020EE126F350DF6E010EF4CFDBFF1200A5
-:1026D000C00EE66EE00EE66EAEEC32F0E552E5526C
+:1026D000C00EE66EE00EE66EE2EC32F0E552E55238
:1026E0001200DF50F36E010EDB50F46E020EE15C5F
-:1026F0001200DFCFE6FFE66A24EC32F0E552E55245
+:1026F0001200DFCFE6FFE66A58EC32F0E552E55211
:0C2700001200D9CFE6FFE1CFD9FF120094
-:04270C00D4EC1BF0FE
+:04270C001BEC1CF0B6
:10271000FE0EDB5006E1F80E96163C0E94169598C8
:1027200008D0FE0EDB0405E1070E9612C30E9412CC
-:102730009588D9EF1BF0D9CFE6FFE1CFD9FFE6525C
+:10273000958820EF1CF0D9CFE6FFE1CFD9FFE65214
:10274000010EE66EE3DFE552809AFE0EDB5004E0F8
:10275000FE0EDB5002080FE1839C81880000839EFF
:102760000000000000008450010BDF6E838E00002B
@@ -590,970 +590,976 @@
:102C6000F3CF00F08250400B01E0010E800DF350D5
:102C70000010011002100310041005100610DF6E82
:102C8000838EDF5000D0E552E552E7CFD9FF120026
-:102C9000D4EC1BF0E652DF6A2BEC1CF0DF6EFD0E6D
+:102C90001BEC1CF0E652DF6A58EC1CF0DF6EFD0EF8
:102CA000DB50DF14DF6EDF5002E0010E01D0000EBA
-:102CB000E552D9EF1BF0D4EC1BF01D0E82EC1BF09B
-:102CC000000EABEC1DF0D9EF1BF0D4EC1BF02BEC9D
-:102CD0001CF084080DE02BEC1CF0C40809E0E66A47
-:102CE000B9EC1DF0ADEC1CF0FDEC32F0E552EFD785
-:102CF0001C0E82EC1BF00A0EABEC1DF0B1EC1CF0CC
-:102D00002BEC1CF0800804E02BEC1CF0C008E7E181
-:102D10002BEC1CF0C00802E1B1EC1CF01E0E82ECA2
-:102D20001BF00F0EABEC1DF05DEC1EF0FA0EDBCFCE
-:102D3000E6FFFB0E49EC1DF0F80EDBCFE6FFF90EC7
-:102D400049EC1DF0F60EDBCFE6FFF70E49EC1DF067
-:102D5000040E82EC1BF0D9EF1BF0D4EC1BF0080E34
-:102D6000E126010EACEC1BF0010EE7CFDBFF020EFB
-:102D7000DEEC1DF0DF6E030EACEC1BF0030EE7CFB4
-:102D8000DBFF040EACEC1BF0020EE7CFDBFF050E01
-:102D9000ACEC1BF0050EE7CFDBFF060EACEC1BF036
-:102DA000040EE7CFDBFF070EACEC1BF0070EE7CFFE
-:102DB000DBFF080EACEC1BF009EC1CF0E66AB6EC8D
-:102DC0001CF0090EACEC1BF0010EE7CFDBFF0A0E86
-:102DD000DEEC1DF0DF6E0B0EACEC1BF0030EE7CF4C
-:102DE000DBFF0C0EACEC1BF0020EE7CFDBFF0D0E91
-:102DF000ACEC1BF0050EE7CFDBFF0E0EACEC1BF0CE
-:102E0000040EE7CFDBFF0F0EACEC1BF0070EE7CF95
-:102E1000DBFF100EACEC1BF009EC1CF0010EE66EB3
-:102E2000B6EC1CF0020EE66EE66EADEC1CF0E66A47
-:102E30008EEC1CF007E1020EE66E010EE66E8EECE3
+:102CB000E55220EF1CF01BEC1CF01D0EBDEC1BF0D0
+:102CC000000EE1EC1DF020EF1CF01BEC1CF058ECAA
+:102CD0001CF084080DE058EC1CF0C40809E0E66A1A
+:102CE000EFEC1DF0B0EC1CF031EC33F0E552EFD717
+:102CF0001C0EBDEC1BF00A0EE1EC1DF0B4EC1CF058
+:102D000058EC1CF0800804E058EC1CF0C008E7E127
+:102D100058EC1CF0C00802E1B4EC1CF01E0EBDEC37
+:102D20001BF00F0EE1EC1DF085EC1EF0FA0EDBCF70
+:102D3000E6FFFB0E5AEC1DF0F80EDBCFE6FFF90EB6
+:102D40005AEC1DF0F60EDBCFE6FFF70E5AEC1DF045
+:102D5000040EBDEC1BF020EF1CF01BEC1CF0080E69
+:102D6000E126010EEFEC1BF0010EE7CFDBFF020EB8
+:102D700000EC1EF0DF6E030EEFEC1BF0030EE7CF4E
+:102D8000DBFF040EEFEC1BF0020EE7CFDBFF050EBE
+:102D9000EFEC1BF0050EE7CFDBFF060EEFEC1BF0B0
+:102DA000040EE7CFDBFF070EEFEC1BF0070EE7CFBB
+:102DB000DBFF080EEFEC1BF024EC1CF0E66AB9EC2C
+:102DC0001CF0090EEFEC1BF0010EE7CFDBFF0A0E43
+:102DD00000EC1EF0DF6E0B0EEFEC1BF0030EE7CFE6
+:102DE000DBFF0C0EEFEC1BF0020EE7CFDBFF0D0E4E
+:102DF000EFEC1BF0050EE7CFDBFF0E0EEFEC1BF048
+:102E0000040EE7CFDBFF0F0EEFEC1BF0070EE7CF52
+:102E1000DBFF100EEFEC1BF024EC1CF0010EE66E55
+:102E2000B9EC1CF0020EE66EE66EB0EC1CF0E66A41
+:102E30009EEC1CF007E1020EE66E010EE66E9EECC3
:102E40001CF002E0000E01D0010E006E080EE15CE5
-:102E500002E2E16AE552E16E0050D9EF1BF0D4ECDA
-:102E60001BF00C0EB3EC1BF0D950F20FAFEC1DF0C1
+:102E500002E2E16AE552E16E005020EF1CF01BEC4B
+:102E60001CF00C0EF2EC1BF0D950F20FE5EC1DF04B
:102E7000080EEECFDBFF090EEECFDBFF0A0EEECF22
-:102E8000DBFF0B0EEECFDBFF1F0E82EC1BF094EC92
-:102E90001CF00A0EDBCF02F00B0EBDEC1CF010E0B4
-:102EA0002B0EABEC1DF00A0EDBCFE6FF0B0E49EC50
+:102E8000DBFF0B0EEECFDBFF1F0EBDEC1BF0A4EC47
+:102E90001CF00A0EDBCF02F00B0EC0EC1CF010E0B1
+:102EA0002B0EE1EC1DF00A0EDBCFE6FF0B0E5AEC09
:102EB0001DF0080EDBCFE6FF090EDBCFE6FF03D0E7
-:102EC0000B0EE66EE66A25EC1EF049EC1DF037ECC1
-:102ED0001EF00C0EE15C02E2E16AE552E16ED9EF10
-:102EE0001BF0D4EC1BF00A0EB3EC1BF0080EDB6AEF
-:102EF000090EDB6A1F0E82EC1BF0F50EDBCF00F033
+:102EC0000B0EE66EE66A54EC1EF05AEC1DF05FEC59
+:102ED0001EF00C0EE15C02E2E16AE552E16E20EFC9
+:102EE0001CF01BEC1CF00A0EF2EC1BF0080EDB6A67
+:102EF000090EDB6A1F0EBDEC1BF0F50EDBCF00F0F8
:102F0000003407E2080EDB6A100EF36E090EF3CFF1
:102F1000DBFF040EDBCF00F0050EDBCF01F0060E69
-:102F2000DBCF02F0070EBDEC1CF00FE094EC1CF0C0
-:102F3000280E0012080E011200C0E6FF01C0E6FFD5
-:102F400025EC1EF0DBCFE6FF09D094EC1CF0080E58
-:102F50000012011200C0E6FF01C0E6FF7FDB37EC84
-:102F60001EF00A0EE15C02E2E16AE552E16ED9EF81
-:102F70001BF0D4EC1BF0F90EDBCFE6FFE66AE66A45
-:102F8000E66AE66AD950FA0FAFEC1DF0EECFE6FF25
-:102F9000EECFE6FFEECFE6FFEFCFE6FFB9EC1DF098
-:102FA000A0DF006E0A0EE15E0050D9EF1BF0D4ECFA
-:102FB0001BF0FE0EDB5004E0FE0EDB5002080DE1BC
-:102FC0007DEC1CF0F3CF61F1F4CF62F1E66AF5EC31
-:102FD0001DF0F3CF5FF1F4CF60F1FE0EDB0404E0EF
-:102FE000FE0EDB5002080EE155EC1CF0F3CF65F14C
-:102FF000F4CF66F1010EE66EF5EC1DF0F3CF63F150
-:10300000F4CF64F1010E7EDBD4D3CEDB1F0E7ADB6E
-:103010005DEC1EF0010E76DBCCD356EC1EF0C3EC5B
-:103020001DF075EC1CF071EC1DF022EC1CF0C1D30E
-:1030300056EC1EF071EC1DF075EC1CF0C3EC1DF0AD
-:1030400022EC1CF0B6D356EC1EF0F2EC1CF0F9ECBE
-:103050001DF0E66A48EC1CF0F2EC1CF0F9EC1DF0F7
-:103060007AEF1DF056EC1EF0F2EC1CF02EDBE66A57
-:1030700048EC1CF0F2EC1CF028DB7AEF1DF094DB3E
-:10308000200EE1264DEC1DF0FDEC1DF0C7EC1DF00F
-:10309000ECDAF2DB41EC25F006EC1EF07EEC1EF0E3
-:1030A00013EC1EF075EC1DF05EEC1CF0DEDA9BEC10
-:1030B0001CF041EC25F053EC1DF085DB58EC24F0BE
-:1030C0002BDB4F6A506A800E516E6AEC1EF01C0EAC
-:1030D0004AC0DBFF1D0E4BC0DBFF1E0E4CC0DBFFEA
-:1030E0001F0E4DC0DBFF4DEC1DF016DB38DB75EC21
-:1030F0001DF066DBE3EC1DF0086E080EE15E085083
-:10310000080E49C0DBFF090E4AC0DBFF0A0E4BC0A8
-:10311000DBFF0B0E4CC0DBFFC2DBF60EDB5007E023
-:10312000D950F40FAFEC1DF0EE50ED1059E13CEC2E
-:103130001DF0026A036AB40E046E420E056E080E9C
-:10314000DBCF0EF0090EDBCF0FF00A0EDBCF10F055
-:103150000B0EDBCF11F0CDEC1DF00EC04AF00FC00E
-:103160004BF010C04CF011C04DF041EC25F04AC0BE
-:103170000AF04BC00BF04CC00CF04DC00DF083ECCE
-:103180001DF0E2DB72DA02C04AF0C4EC1CF057EC2E
-:1031900024F056EC1DF057DF126E060EE15E125061
-:1031A00047DA3CEC1DF069EC1DF0CEDBD8DAB3EC6D
-:1031B00029F0E552E552E552E55249C002F04AC015
-:1031C00003F04BC004F04CC005F049C04AF0DCDB12
-:1031D00056EC1DF022DF0A6E060EE15E0A50E3D1C6
-:1031E0001C0EDBCF04F01D0EDBCF05F01E0EDBCF77
-:1031F00006F01F0EDBCF07F00C6A0D6A0E6A400E58
-:103200000F6EE6EC1DF00FEC1EF053EC1DF00CC041
-:103210004AF00DC04BF00EC04CF00FC04DF041EC29
-:1032200025F0FDEC1DF047EC1EF0E6EC1DF046DB52
-:103230005FDB13EC1EF08BEC1DF057EC24F0140E4A
-:103240004AC0DBFF150E4BC0DBFF160E4CC0DBFF88
-:10325000170E4DC0DBFF140EDBCF00F0150EDBCFD9
-:1032600001F0160EDBCF02F0170EDBCF03F0E6EC19
-:103270001DF0A6DA8BEC1DF058EC24F0180E4AC0B5
-:10328000DBFF190E4BC0DBFF1A0E4CC0DBFF1B0E21
-:103290004DC0DBFFC7EC1DF02BDBFDEC1DF0140E69
-:1032A000DBCF18F0150EDBCF19F0160EDBCF1AF0BE
-:1032B000170EDBCF1BF07EEC1EF090EC1DF0D5D985
-:1032C00018C04AF019C04BF01AC04CF01BC04DF0AA
-:1032D00041EC25F013EC1EF069EC1DF091DAC5D934
-:1032E0002ADBEEEC24F0DFDBC7DA58EC24F006EC46
-:1032F0001EF035DA7EEC1EF04AC02CF04BC02DF0EB
-:103300004CC02EF04DC02FF0F3DA4AC028F04BC06D
-:1033100029F04CC02AF04DC02BF0140EDBCF38F052
-:10332000150EDBCF39F0160EDBCF3AF0170EDBCFE0
-:103330003BF0B3DB4AC03CF04BC03DF04CC03EF02C
-:103340004DC03FF092D938C04AF039C04BF03AC076
-:103350004CF03BC04DF041EC25F04AC034F04BC07E
-:1033600035F04CC036F04DC037F0B3DB4AC040F00A
-:103370004BC041F04CC042F04DC043F076D934C050
-:103380004AF035C04BF036C04CF037C04DF0EEEC93
-:1033900024F04AC030F04BC031F04CC032F04DC088
-:1033A00033F063D928C04AF029C04BF02AC04CF052
-:1033B0002BC04DF057EC24F01ADAE3EC1DF0446E0C
-:1033C000080EE15E44503EEC1EF0E5DA49C04AF0DA
-:1033D0005CDA7EDA140EDBCF4AF0150EDBCF4BF051
-:1033E000160EDBCF4CF0170EDBCF4DF039DA06ECC2
-:1033F0001EF01C0EDBCF4AF01D0EDBCF4BF01E0E75
-:10340000DBCF4CF01F0EDBCF4DF070D9F6DB2DD9A2
-:10341000DAD957EC24F080D9A2D94A6A4B6A4C6AAF
-:10342000400E4D6E1DDA62D984DBCDDB106E080EC6
-:10343000E15E1050100E49C0DBFF110E4AC0DBFFE9
-:10344000120E4BC0DBFF130E4CC0DBFF100EDBCFA8
-:1034500004F0110EDBCF05F0120EDBCF06F0130ED9
-:10346000DBCF07F04F6A506A516A526AACD914EC4C
-:1034700026F0010A0DE0100EDBCF00F0110EDBCFBD
-:1034800001F0120EDBCF02F0130EDBCF03F011D0F0
-:10349000100EDBCF08F0110EDBCF09F0120EDBCFE0
-:1034A0000AF0130EDBCF0BF076DAE6D941EC25F00B
-:1034B00033D9100E00C0DBFF110E01C0DBFF120E6E
-:1034C00002C0DBFF130E03C0DBFFF60EDB50020869
-:1034D00016E1D4D857EC24F019D958EC24F07CD953
-:1034E000060E4BC0DBFF070E4CC0DBFF74DB68D958
-:1034F00077DBA1DA040E4BC0DBFF050E3DD04A6A34
-:103500004B6A4C6A400E4D6E080EDBCF4FF0090E31
-:10351000DBCF50F00A0EDBCF51F00B0ECADBFCD82C
-:103520000C0EDBCF04F00D0EDBCF05F00E0EDBCF63
-:1035300006F00F0EDBCF07F004C04FF005C050F0CF
-:1035400006C051F007C052F057EC24F0C1D996D80C
-:1035500058EC24F0DBD857EC24F03ED9040E4BC0D5
-:10356000DBFF050E4CC0DBFF3BDB2AD934DB63DA23
-:10357000060E4BC0DBFF070E4CC0DBFF59D89FD8AF
-:10358000040EDBCF4BF0050E14DA25DB0DDB9DD8E6
-:10359000ACD995D8060EDBCF4BF0070E0ADA20DB4C
-:1035A00003DB27DB4FD9200EE15C02E2E16AE55242
-:1035B000E16EFFD0F9D8040EE1269FD9F3D9E66A6F
-:1035C000A3D901015F51EE5C066E6051EE58076EA3
-:1035D0006151EE58086E6251A8D802E2E16AE552E4
-:1035E000E16EE7D0E1D8040EE1265FD9DBD9010E08
-:1035F000E66E8AD901016351EE5C066E6451EE58A5
-:10360000076E6551EE58086E66518FD802E2E16A86
-:10361000E552E16ECED0040EE66EE66A7FD906E092
-:10362000040EE66E010EE66E79D901E1000C010C84
-:10363000F2DF0009FDE0120051DBEBD956DAB9D90F
-:103640004DEF1DF06DDAF8DA4EDB49C018F04AC0D4
-:1036500019F04BC01AF04CC01BF012008ADA55EC7E
-:1036600014F0E552E552E55212004AC04FF04BC04B
-:1036700050F04CC051F04DC052F01200FDD90C0E6C
-:10368000DBCF06F00D0EDBCF07F00E0EDBCF08F020
-:103690000F0EDBCF09F081DA06C04AF007C04BF00D
-:1036A00008C04CF009C04DF041EC25F04BDA2BDAA4
-:1036B000FDD9C9DC0A6E060EE15E0A50C7D1F70ECD
-:1036C000DBCF4BF0F80E09EF1DF0000E186C191E41
-:1036D00019221A1E1A221B1E1B2218C0E6FF19C02F
-:1036E000E6FF1AC0E6FF1BC0E6FF12001C0EDBCF90
-:1036F0004FF01D0EDBCF50F01E0EDBCF51F01F0E32
-:1037000059EF1EF0E66E35DAB4EF1DF0D5D94BC097
-:10371000DEFF4CC0DDFF9AD14AC000F04BC001F083
-:103720004CC002F04DC003F01200EE58096E06C006
-:1037300049F007C04AF008C04BF04C6E3EEC24F054
-:1037400001DA7ADAEEEC24F0BEDA4BC0F3FF4CC0BB
-:10375000F4FF040EE15C120031DAE76E1200C7DA02
-:103760004DC0E6FF1200E126D9CFE9FFDACFEAFF...
[truncated message content] |
