fixed bug with 1st thermometer on 1-wire @ 3-digit voltmeter

voltmeters/3_digit_voltmeter_as_thermometer/kicad/3digit_voltmeter.pro

@@ -1,4 +1,4 @@
-update=Пт 10 апр 2015 00:07:11
+update=Чт 23 апр 2015 20:20:15
 version=1
 last_client=kicad
 [cvpcb]
@@ -83,7 +83,4 @@ LibName28=atmel
 LibName29=contrib
 LibName30=valves
 LibName31=stm8
-LibName32=ht7136
+LibName32=local
-LibName33=mcp3421
-LibName34=seven_segm
-LibName35=stm8s003

voltmeters/3_digit_voltmeter_as_thermometer/kicad/3digit_voltmeter.sch

@@ -30,6 +30,7 @@ LIBS:atmel
 LIBS:contrib
 LIBS:valves
 LIBS:stm8
+LIBS:local
 LIBS:3digit_voltmeter-cache
 EELAYER 24 0
 EELAYER END
@@ -90,10 +91,10 @@ F 3 "~" H 3200 3050 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR01
+L GND #PWR6
 U 1 1 54CD1463
 P 3200 3400
-F 0 "#PWR01" H 3200 3400 30  0001 C CNN
+F 0 "#PWR6" H 3200 3400 30  0001 C CNN
 F 1 "GND" H 3200 3330 30  0001 C CNN
 F 2 "" H 3200 3400 60  0000 C CNN
 F 3 "" H 3200 3400 60  0000 C CNN
@@ -116,10 +117,10 @@ $EndComp
 Wire Wire Line
 	2700 3150 2700 3000
 $Comp
-L GND #PWR02
+L GND #PWR4
 U 1 1 54CD148D
 P 2700 3650
-F 0 "#PWR02" H 2700 3650 30  0001 C CNN
+F 0 "#PWR4" H 2700 3650 30  0001 C CNN
 F 1 "GND" H 2700 3580 30  0001 C CNN
 F 2 "" H 2700 3650 60  0000 C CNN
 F 3 "" H 2700 3650 60  0000 C CNN
@@ -142,10 +143,10 @@ $EndComp
 Wire Wire Line
 	3600 3000 3900 3000
 $Comp
-L GND #PWR03
+L GND #PWR9
 U 1 1 54CD271D
 P 3750 3500
-F 0 "#PWR03" H 3750 3500 30  0001 C CNN
+F 0 "#PWR9" H 3750 3500 30  0001 C CNN
 F 1 "GND" H 3750 3430 30  0001 C CNN
 F 2 "" H 3750 3500 60  0000 C CNN
 F 3 "" H 3750 3500 60  0000 C CNN
@@ -156,10 +157,10 @@ Wire Wire Line
 	3750 3400 3750 3500
 Connection ~ 3750 3000
 $Comp
-L VCC #PWR04
+L VCC #PWR11
 U 1 1 54CD31C2
 P 3900 3000
-F 0 "#PWR04" H 3900 3100 30  0001 C CNN
+F 0 "#PWR11" H 3900 3100 30  0001 C CNN
 F 1 "VCC" H 3900 3100 30  0000 C CNN
 F 2 "" H 3900 3000 60  0000 C CNN
 F 3 "" H 3900 3000 60  0000 C CNN
@@ -233,10 +234,10 @@ A2
 Text Label 7600 3250 0    60   ~ 0
 A3
 $Comp
-L VCC #PWR05
+L VCC #PWR10
 U 1 1 54CD9F1D
 P 3750 5050
-F 0 "#PWR05" H 3750 5150 30  0001 C CNN
+F 0 "#PWR10" H 3750 5150 30  0001 C CNN
 F 1 "VCC" H 3750 5150 30  0000 C CNN
 F 2 "" H 3750 5050 60  0000 C CNN
 F 3 "" H 3750 5050 60  0000 C CNN
@@ -244,10 +245,10 @@ F 3 "" H 3750 5050 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR06
+L GND #PWR8
 U 1 1 54CDA116
 P 3700 4850
-F 0 "#PWR06" H 3700 4850 30  0001 C CNN
+F 0 "#PWR8" H 3700 4850 30  0001 C CNN
 F 1 "GND" H 3700 4780 30  0001 C CNN
 F 2 "" H 3700 4850 60  0000 C CNN
 F 3 "" H 3700 4850 60  0000 C CNN
@@ -270,10 +271,10 @@ Wire Wire Line
 Wire Wire Line
 	3600 4950 3800 4950
 $Comp
-L GND #PWR07
+L GND #PWR7
 U 1 1 54CDA4A6
 P 3600 5750
-F 0 "#PWR07" H 3600 5750 30  0001 C CNN
+F 0 "#PWR7" H 3600 5750 30  0001 C CNN
 F 1 "GND" H 3600 5680 30  0001 C CNN
 F 2 "" H 3600 5750 60  0000 C CNN
 F 3 "" H 3600 5750 60  0000 C CNN
@@ -310,40 +311,25 @@ Wire Wire Line
 Wire Wire Line
 	6400 4850 6750 4850
 $Comp
-L CONN_2 P2
+L GND #PWR1
-U 1 1 54E2B17F
-P 1400 2950
-F 0 "P2" V 1350 2950 40  0000 C CNN
-F 1 "CONN_2" V 1450 2950 40  0000 C CNN
-F 2 "" H 1400 2950 60  0000 C CNN
-F 3 "" H 1400 2950 60  0000 C CNN
-	1    1400 2950
-	-1   0    0    1   
-$EndComp
-$Comp
-L GND #PWR08
 U 1 1 54E2B1F6
-P 1750 3200
+P 950 3150
-F 0 "#PWR08" H 1750 3200 30  0001 C CNN
+F 0 "#PWR1" H 950 3150 30  0001 C CNN
-F 1 "GND" H 1750 3130 30  0001 C CNN
+F 1 "GND" H 950 3080 30  0001 C CNN
-F 2 "" H 1750 3200 60  0000 C CNN
+F 2 "" H 950 3150 60  0000 C CNN
-F 3 "" H 1750 3200 60  0000 C CNN
+F 3 "" H 950 3150 60  0000 C CNN
-	1    1750 3200
+	1    950  3150
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	1750 3050 1750 3200
-Text Label 1750 2850 0    60   ~ 0
-VIN
 Text Label 2700 3000 2    60   ~ 0
 VIN
 Text Label 4950 3300 3    60   ~ 0
 VIN
 $Comp
-L GND #PWR09
+L GND #PWR12
 U 1 1 54CD4689
 P 5050 3450
-F 0 "#PWR09" H 5050 3450 30  0001 C CNN
+F 0 "#PWR12" H 5050 3450 30  0001 C CNN
 F 1 "GND" H 5050 3380 30  0001 C CNN
 F 2 "" H 5050 3450 60  0000 C CNN
 F 3 "" H 5050 3450 60  0000 C CNN
@@ -362,10 +348,10 @@ F 3 "" H 2550 4450 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR010
+L VCC #PWR3
 U 1 1 54E2B7D6
 P 2550 4100
-F 0 "#PWR010" H 2550 4200 30  0001 C CNN
+F 0 "#PWR3" H 2550 4200 30  0001 C CNN
 F 1 "VCC" H 2550 4200 30  0000 C CNN
 F 2 "" H 2550 4100 60  0000 C CNN
 F 3 "" H 2550 4100 60  0000 C CNN
@@ -453,10 +439,10 @@ NoConn ~ 3800 4650
 NoConn ~ 3800 4750
 NoConn ~ 6400 4350
 $Comp
-L GND #PWR?
+L GND #PWR5
 U 1 1 54E2711D
 P 2700 5400
-F 0 "#PWR?" H 2700 5400 30  0001 C CNN
+F 0 "#PWR5" H 2700 5400 30  0001 C CNN
 F 1 "GND" H 2700 5330 30  0001 C CNN
 F 2 "" H 2700 5400 60  0000 C CNN
 F 3 "" H 2700 5400 60  0000 C CNN
@@ -466,8 +452,8 @@ $EndComp
 Wire Wire Line
 	2700 5400 2700 5300
 Connection ~ 2700 5300
-Text Notes 900  5000 0    60   ~ 0
+Text Notes 500  3900 0    60   ~ 0
-Remove R2 & C4\nSolder R3: 4.7k\nInstead o9f R1 solder jumper
+Remove R1, R2 & C4\nSolder R3: 4.7k (or simply put here R2, 10k)\nSolder DS18 leg2 somewhere to AIN\n\nAlso you can remove C1 & U2 if wanna connect 5V directly to Vcc
 $Comp
 L DS18x20 DD1
 U 1 1 5526FD33
@@ -479,24 +465,19 @@ F 3 "" H 1050 2050 60  0000 C CNN
 	1    1050 2050
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	1750 2850 1750 2550
 Wire Wire Line
 	1750 2550 1050 2550
 Wire Wire Line
 	1050 2550 1050 2350
-Wire Wire Line
-	1750 3150 950  3150
 Wire Wire Line
 	950  3150 950  2350
-Connection ~ 1750 3150
 Wire Wire Line
 	1150 2350 2050 2350
 $Comp
-L VCC #PWR?
+L VCC #PWR2
 U 1 1 552709AA
 P 2050 2350
-F 0 "#PWR?" H 2050 2450 30  0001 C CNN
+F 0 "#PWR2" H 2050 2450 30  0001 C CNN
 F 1 "VCC" H 2050 2450 30  0000 C CNN
 F 2 "" H 2050 2350 60  0000 C CNN
 F 3 "" H 2050 2350 60  0000 C CNN
@@ -505,76 +486,12 @@ F 3 "" H 2050 2350 60  0000 C CNN
 $EndComp
 Text Notes 1600 2200 0    60   ~ 0
 Solder this wire to Vcc
-Text Notes 8100 4850 0    60   ~ 0
-To attach keys solder wires to them directly to LED legs\nCapacitor (10nF) and resisror (47..56kOhm) solder on key
 $Comp
-L SW_PUSH SWN
+L SW_PUSH SW1
-U 1 1 552713A2
-P 8400 5150
-F 0 "SWN" H 8550 5260 50  0000 C CNN
-F 1 "SW_PUSH" H 8400 5070 50  0000 C CNN
-F 2 "" H 8400 5150 60  0000 C CNN
-F 3 "" H 8400 5150 60  0000 C CNN
-	1    8400 5150
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	7150 5150 8100 5150
-$Comp
-L C CN
-U 1 1 5527146F
-P 9000 5150
-F 0 "CN" H 9000 5250 40  0000 L CNN
-F 1 "10n" H 9006 5065 40  0000 L CNN
-F 2 "" H 9038 5000 30  0000 C CNN
-F 3 "" H 9000 5150 60  0000 C CNN
-	1    9000 5150
-	0    1    1    0   
-$EndComp
-$Comp
-L R RN
-U 1 1 55271518
-P 8750 5400
-F 0 "RN" V 8830 5400 40  0000 C CNN
-F 1 "56k" V 8757 5401 40  0000 C CNN
-F 2 "" V 8680 5400 30  0000 C CNN
-F 3 "" H 8750 5400 30  0000 C CNN
-	1    8750 5400
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	8000 5150 8000 5400
-Wire Wire Line
-	8000 5400 8500 5400
-Connection ~ 8000 5150
-Wire Wire Line
-	8700 5150 8800 5150
-$Comp
-L GND #PWR?
-U 1 1 552716D4
-P 9450 5300
-F 0 "#PWR?" H 9450 5300 30  0001 C CNN
-F 1 "GND" H 9450 5230 30  0001 C CNN
-F 2 "" H 9450 5300 60  0000 C CNN
-F 3 "" H 9450 5300 60  0000 C CNN
-	1    9450 5300
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	9450 5300 9450 5150
-Wire Wire Line
-	9450 5150 9200 5150
-Wire Wire Line
-	9000 5400 9300 5400
-Wire Wire Line
-	9300 5400 9300 5150
-Connection ~ 9300 5150
-$Comp
-L SW_PUSH SWX
 U 1 1 55283145
 P 8350 3700
-F 0 "SWX" H 8500 3810 50  0000 C CNN
+F 0 "SW1" H 8500 3810 50  0000 C CNN
-F 1 "SW_PUSH" H 8350 3620 50  0000 C CNN
+F 1 "Store new rom" H 8350 3620 50  0000 C CNN
 F 2 "" H 8350 3700 60  0000 C CNN
 F 3 "" H 8350 3700 60  0000 C CNN
 	1    8350 3700
@@ -597,29 +514,80 @@ Wire Wire Line
 	8650 3700 8800 3700
 Text Label 9300 3700 0    60   ~ 0
 A1
-Wire Wire Line
-	7700 5150 7700 3700
 Wire Wire Line
 	7700 3700 8050 3700
-Connection ~ 7700 5150
+$Comp
-Text Notes 8150 3450 0    60   ~ 0
+L SW_PUSH SW2
-Another variant of button's attaching:\nafter power off current digit we setup all segments pins\nas pullup inputs and turn current ditit's pin into 0\nif button pressed we get 0 at appropriate pin else we have 1\n\n!!! When digit is off set anode pin into input mode !!!
+U 1 1 55394881
+P 8350 4050
+F 0 "SW2" H 8500 4160 50  0000 C CNN
+F 1 "Delete nonexistant" H 8350 3970 50  0000 C CNN
+F 2 "" H 8350 4050 60  0000 C CNN
+F 3 "" H 8350 4050 60  0000 C CNN
+	1    8350 4050
+	1    0    0    -1  
+$EndComp
+$Comp
+L DIODE D2
+U 1 1 55394887
+P 9000 4050
+F 0 "D2" H 9000 4150 40  0000 C CNN
+F 1 "DIODE" H 9000 3950 40  0000 C CNN
+F 2 "" H 9000 4050 60  0000 C CNN
+F 3 "" H 9000 4050 60  0000 C CNN
+	1    9000 4050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9300 4050 9200 4050
+Wire Wire Line
+	8650 4050 8800 4050
+Text Label 9300 4050 0    60   ~ 0
+A1
+Wire Wire Line
+	7700 4050 8050 4050
+$Comp
+L SW_PUSH SW3
+U 1 1 5539496C
+P 8350 4450
+F 0 "SW3" H 8500 4560 50  0000 C CNN
+F 1 "Delete all" H 8350 4370 50  0000 C CNN
+F 2 "" H 8350 4450 60  0000 C CNN
+F 3 "" H 8350 4450 60  0000 C CNN
+	1    8350 4450
+	1    0    0    -1  
+$EndComp
+$Comp
+L DIODE D3
+U 1 1 55394972
+P 9000 4450
+F 0 "D3" H 9000 4550 40  0000 C CNN
+F 1 "DIODE" H 9000 4350 40  0000 C CNN
+F 2 "" H 9000 4450 60  0000 C CNN
+F 3 "" H 9000 4450 60  0000 C CNN
+	1    9000 4450
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9300 4450 9200 4450
+Wire Wire Line
+	8650 4450 8800 4450
+Text Label 9300 4450 0    60   ~ 0
+A1
+Wire Wire Line
+	7700 4450 8050 4450
+Text Label 7700 3700 2    60   ~ 0
+C
+Text Label 7700 4050 2    60   ~ 0
+A
+Text Label 7700 4450 2    60   ~ 0
+E
 Wire Notes Line
-	8000 2800 8000 3900
+	2300 5050 3150 5050
 Wire Notes Line
-	8000 3900 11050 3900
+	1900 4350 2350 4350
-Wire Notes Line
+Text Notes 2700 4400 0    60   ~ 0
-	11050 3900 11050 2800
+4.7..10k
-Wire Notes Line
+Text Label 1750 2550 0    60   ~ 0
-	11050 2800 8000 2800
+AIN
-Wire Notes Line
-	7900 4500 7900 5550
-Wire Notes Line
-	10850 4500 7900 4500
-Wire Notes Line
-	10850 5550 10850 4500
-Wire Notes Line
-	7900 5550 10850 5550
-Text Notes 9300 3850 0    39   ~ 0
-This variant lets us to connect 8 buttons to each digit!
 $EndSCHEMATC

voltmeters/3_digit_voltmeter_as_thermometer/kicad/local.lib

@@ -0,0 +1,106 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# ARK-SP410361N
+#
+DEF ARK-SP410361N DIS 0 40 Y Y 1 F N
+F0 "DIS" 0 500 60 H V C CNN
+F1 "ARK-SP410361N" 0 -450 60 H V C CNN
+F2 "" -250 0 60 H V C CNN
+F3 "" -250 0 60 H V C CNN
+DRAW
+C -320 -320 20 0 1 0 F
+C 130 -320 20 0 1 0 F
+C 580 -320 20 0 1 0 F
+S -800 400 750 -400 0 1 0 N
+P 6 0 1 0  -650 -20  -350 -20  -400 -320  -700 -320  -650 -20  -650 -20 N
+P 6 0 1 0  -600 320  -300 320  -350 20  -650 20  -600 320  -600 320 N
+P 6 0 1 0  -200 -20  100 -20  50 -320  -250 -320  -200 -20  -200 -20 N
+P 6 0 1 0  -150 320  150 320  100 20  -200 20  -150 320  -150 320 N
+P 6 0 1 0  250 -20  550 -20  500 -320  200 -320  250 -20  250 -20 N
+P 6 0 1 0  300 320  600 320  550 20  250 20  300 320  300 320 N
+X E 1 -1100 250 300 R 50 50 1 1 I
+X D 2 -1100 150 300 R 50 50 1 1 I
+X DP 3 -1100 50 300 R 50 50 1 1 I
+X C 4 -1100 -50 300 R 50 50 1 1 I
+X G 5 -1100 -150 300 R 50 50 1 1 I
+X NC 6 -1100 -250 300 R 50 50 1 1 N
+X B 7 1050 -250 300 L 50 50 1 1 I
+X DIG3 8 1050 -150 300 L 50 50 1 1 I
+X DIG2 9 1050 -50 300 L 50 50 1 1 I
+X F 10 1050 50 300 L 50 50 1 1 I
+X A 11 1050 150 300 L 50 50 1 1 I
+X DIG1 12 1050 250 300 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# DS18x20
+#
+DEF DS18x20 DD 0 40 Y Y 1 F N
+F0 "DD" 0 450 60 H V C CNN
+F1 "DS18x20" 0 350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -150 250 150 0 0 1 0 N
+X GND 1 -100 -300 300 U 60 60 1 1 W
+X DQ 2 0 -300 300 U 60 60 1 1 B
+X VDD 3 100 -300 300 U 60 60 1 1 W
+ENDDRAW
+ENDDEF
+#
+# HT7136
+#
+DEF HT7136 U 0 30 Y Y 1 F N
+F0 "U" 150 -196 60 H V C CNN
+F1 "HT7136" 0 200 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ SOT23*
+ SOT-23*
+$ENDFPLIST
+DRAW
+S -200 -150 200 150 0 1 0 N
+X GND 1 0 -250 100 U 40 40 1 1 I
+X Vin 2 -400 50 200 R 40 40 1 1 I
+X Vout 3 400 50 200 L 40 40 1 1 w
+ENDDRAW
+ENDDEF
+#
+# STM8S003F3P6
+#
+DEF STM8S003F3P6 IC 0 40 Y Y 1 F N
+F0 "IC" 0 600 60 H V C CNN
+F1 "STM8S003F3P6" 0 -800 60 H V C CNN
+F2 "TSSOP20" -100 500 60 H I C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ TSSOP*
+$ENDFPLIST
+DRAW
+S -1100 450 1200 -650 0 1 0 N
+X PD4(HS)/BEEP/TIM2_CH1/UART1_CK 1 -1250 350 149 R 40 40 1 1 B
+X PD5(HS)/UART1_TX/AIN5 2 -1250 250 149 R 40 40 1 1 B
+X PD6(HS)/UART1_RX/AIN6 3 -1250 150 149 R 40 40 1 1 B
+X NRST 4 -1250 50 149 R 40 40 1 1 I
+X PA1/OSCI 5 -1250 -50 149 R 40 40 1 1 B
+X PA2/OSCOUT 6 -1250 -150 149 R 40 40 1 1 B
+X VSS 7 -1250 -250 149 R 40 40 1 1 W
+X Vcap 8 -1250 -350 149 R 40 40 1 1 O
+X VDD 9 -1250 -450 149 R 40 40 1 1 W
+X PA3(HS)/[SPI_NSS]TIM2_CH3 10 -1250 -550 149 R 40 40 1 1 B
+X AIN4/ADC_ETR/TIM2_CH2/(HS)PD3 20 1350 350 149 L 40 40 1 1 B
+X [TIM1_BKIN]/I2C_SDA/(T)PB5 11 1350 -550 149 L 40 40 1 1 B
+X [ADC_ETR]/I2C_SCL/(T)PB4 12 1350 -450 149 L 40 40 1 1 B
+X [TLI]/[TIM1_CH1N]/TIM1_CH3/(HS)PC3 13 1350 -350 149 L 40 40 1 1 B
+X CLK_CCO/TIM1_CH4/AIN2/[TIM1_CH2N]/(HS)PC4 14 1350 -250 149 L 40 40 1 1 B
+X [TIM2_CH1]/SPI_SCK/(HS)PC5 15 1350 -150 149 L 40 40 1 1 B
+X [TIM1_CH1]/SPI_MOSI/(HS)PC6 16 1350 -50 149 L 40 40 1 1 B
+X [TIM1_CH2]/SPI_MISO/(HS)PC7 17 1350 50 149 L 40 40 1 1 B
+X SWIM/(HS)PD1 18 1350 150 149 L 40 40 1 1 B
+X AIN3/[TIM2_CH3]/(HS)PD2 19 1350 250 149 L 40 40 1 1 B
+ENDDRAW
+ENDDEF
+#
+#End Library

voltmeters/3_digit_voltmeter_as_thermometer/src/main.c

@@ -214,6 +214,7 @@ int main() {
 								set_display_buf("eee");
 							}else{
 								display_int(starting_val+1,0);
+								read_next_sensor();
 							}
 						}
 					}

voltmeters/3_digit_voltmeter_as_thermometer/src/testproj.ihx

@@ -1,130 +1,130 @@
-:2080A000808080808080808080AE5255F644241B90CE005B72A90001C6005AA90097C60077
+:2080A000AE530EA604F7AE5011F6AA08F7AE5013F6AA08F7AE5308A668F7AE5307A602F7FD
-:2080C00059A9009590CF005BCF0059AE52557F808080AE5304F6A4FDF7AE5311F65F9758EA
+:2080C000AE530AA631F7AE5303A602F7AE5300A684F781725F001C3501000AAE530FA6039B
-:2080E00058585858585858CF001AAE5312F6974FCA001A959FCA001B97CF001A725D000AEA
+:2080E000F7AE5310A6E8F7AE5313A601F7AE5314A6F4F7AE5306A601F7AE5300F6AA01F75D
-:208100002759C6000A4AC7000A725D001C2726C6000944C70009CE001AA3000A2408C60052
+:2081000035030019AE5300F64425F9CE001AA302262304A60120014F817B03C70009725F24
-:2081200009AA80C70009725D000A2636AE5300F6A4FEF7202D7200000902200CAE53137FEE
+:20812000001C3507000AAE530F7FAE5310A664F77200000902200CAE53137FAE5314A60A3B
-:20814000AE5314A60AF7200AAE53137FAE5314A63CF7C6000944C700092007AE5300F6A413
+:20814000F7200AAE53137FAE5314A63CF7AE5306A601F7725400097210530081725F0009D9
-:09816000FEF780808080808080A1
+:208160003501001C3508000AAE530F7FAE5310A664F7AE53137FAE5314A605F7AE5306A6CE
-:20816900AE530EA604F7AE5011F6AA08F7AE5013F6AA08F7AE5308A668F7AE5307A602F733
+:2081800001F772105300817B03C7001535020019CC815C7B03C70015350100198188AE538B
-:20818900AE530AA631F7AE5303A602F7AE5300A684F781725F001C3501000AAE530FA603D1
+:2081A00000F6442403CC8222C6001988C600154A6B0284A1012739A1022706A103275F2055
-:2081A900F7AE5310A6E8F7AE5313A601F7AE5314A6F4F7AE5306A601F7AE5300F6AA01F793
+:2081C00061AE000B7B01C700159FCB0015979EA90095C60009F7725D00152705CD815C209B
-:2081C90035030019AE5300F64425F9CE001AA302262304A60120014F817B03C70009725F5B
+:2081E00041725F0019CE001D2738CE001DFD2032725D00152719AE000B7B01C700159FCB31
-:2081E900001C3507000AAE530F7FAE5310A664F77200000902200CAE53137FAE5314A60A72
+:208200000015979EA90095F688CD8119842013725F0019CE001D270ACE001DFD2004725F57
-:20820900F7200AAE53137FAE5314A63CF7AE5306A601F7725400097210530081725F00090F
+:2082200000198481522090AE000B93E601A1FF260AAE0D4090AE0003CC832793E6076B0A74
-:208229003501001C3508000AAE530F7FAE5310A664F7AE53137FAE5314A605F7AE5306A604
+:2082400093E6086B0590E604957B0AA4806B189EA1FF26477B05441A1897494FA20095905B
-:2082490001F772105300817B03C7001535020019CC82257B03C70015350100198188AE53F7
+:208260009790958990894B0A5F894B00CD8D815B081F0E170C7B05442503CC83231E0E1CE4
-:2082690000F6442403CC82EBC6001988C600154A6B0284A1012739A1022706A103275F20C2
+:2082800000051F167B0DA9006B157B0CA9006B0C1616170E7B156B0DCC83237B054EA40F00
-:2082890061AE000B7B01C700159FCB0015979EA90095C60009F7725D00152705CD82252007
+:2082A0006B0B7B0AA407484848481A0B0D182702AA8097494FA20095909790958990894BBC
-:2082A90041725F0019CE001D2738CE001DFD2032725D00152719AE000B7B01C700159FCB67
+:2082C0000A5F894B00CD8D815B08511F017B05A40F6B200F1F5F72F91F1708889F190397E4
-:2082C9000015979EA90095F688CD81E2842013725F0019CE001D270ACE001DFD2004725FC5
+:2082E0009E190295841F0C1608170EA10123191E0E1C00017B0DA9006B117B0CA9001F0E0D
-:2082E90000198481522090AE000B93E601A1FF260AAE0D4090AE0003CC83F093E6076B0AE2
+:208300006B0C7B116B0D201BA10523171E0E1C00027B0DA9006B1A7B0CA9001F0E6B0C7B78
-:2083090093E6086B0590E604957B0AA4806B189EA1FF26477B05441A1897494FA200959091
+:208320001A6B0D1E0E160C5B2081AE5064A6AEF7AE5064A656F7AE505FF6A50826034F20C7
-:208329009790958990894B0A5F894B00CD8D7E5B081F0E170C7B05442503CC83EC1E0E1C54
+:2083400002A60181AE505FF6A50427F8A4F7AE505FF7815203CE0017FEA3123427332000CD
-:2083490000051F167B0DA9006B157B0CA9006B0C1616170E7B156B0DCC83EC7B054EA40F6D
+:20836000CD832A4D272BCE001790AE1234FF0F014FCE00175C5C1F025F9772FB0288A601CB
-:208369006B0B7B0AA407484848481A0B0D182702AA8097494FA20095909790958990894BF2
+:20838000F784AB090C01887B02A10E8425E3CD83445B03815202CD832A4D26034F201ACE53
-:208389000A5F894B00CD8D7E5B08511F017B05A40F6B200F1F5F72F91F1708889F1903971D
+:2083A00000175C5C1F017B0597A609424F9572FB01A601F7CD8344A6015B02815209AE00B4
-:2083A9009E190295841F0C1608170EA10123191E0E1C00017B0DA9006B117B0CA9001F0E43
+:2083C000011F050F030F04CE00175C5C9F1B046B099EA9006B081E08F64D26291E085C1F71
-:2083C9006B0C7B116B0D201BA10523171E0E1C00027B0DA9006B1A7B0CA9001F0E6B0C7BAF
+:2083E000014F5F9772FB0188F69095845F9772FB0588F66B08909E11088426054CA1082539
-:2083E9001A6B0D1E0E160C5B2081AE5064A6AEF7AE5064A656F7AE505FF6A50826034F20FE
+:20840000E1A108270E7B04AB096B040C037B03A10E25B47B035B09815208CD83BCA10E2747
-:2084090002A60181AE505FF6A50427F8A4F7AE505FF7815203CE0017FEA312342733200003
+:20842000044CCC84930F014F9095CE00175C5C1F045F41909E4172FB04F64D260C72A909AC
-:20842900CD83F34D272BCE001790AE1234FF0F014FCE00175C5C1F025F9772FB0288A60138
+:20844000000C017B01A10E25E17B016B067B01A10E26034F203D7B0197A609424F9572FB9C
-:20844900F784AB090C01887B02A10E8425E3CD840D5B03815202CD83F34D26034F201ACEF6
+:208460000489CD832A854D26034F20277F5C1F07AE00011F024F905F909772F9075F977254
-:2084690000175C5C1F017B0597A609424F9572FB01A601F7CD840DA6015B02815209AE0020
+:16848000FB0288F69790F7844CA10825E9CD83447B064C5B088181
-:20848900011F050F030F04CE00175C5C9F1B046B099EA9006B081E08F64D26291E085C1FA7
+:088F3F004000000000000000EA
-:2084A900014F5F9772FB0188F69095845F9772FB0588F66B08909E11088426054CA108256F
+:20849600808080808080808080AE5255F644241B90CE002172A90001C60020A90097C600F1
-:2084C900E1A108270E7B04AB096B040C037B03A10E25B47B035B09815208CD8485A10E27B4
+:2084B6001FA9009590CF0021CF001FAE52557F808080AE5304F6A4FDF7AE5311F65F97589E
-:2084E900044CCC855C0F014F9095CE00175C5C1F045F41909E4172FB04F64D260C72A90919
+:2084D60058585858585858CF001AAE5312F6974FCA001A959FCA001B97CF001A725D000AF0
-:20850900000C017B01A10E25E17B016B067B01A10E26034F203D7B0197A609424F9572FBD2
+:2084F6002759C6000A4AC7000A725D001C2726C6000944C70009CE001AA3000A2408C60059
-:208529000489CD83F3854D26034F20277F5C1F07AE00011F024F905F909772F9075F9772C1
+:2085160009AA80C70009725D000A2636AE5300F6A4FEF7202D7200000902200CAE53137FF4
-:16854900FB0288F69790F7844CA10825E9CD840D7B064C5B0881ED
+:20853600AE5314A60AF7200AAE53137FAE5314A63CF7C6000944C700092007AE5300F6A419
-:088F3C004000000000000000ED
+:09855600FEF780808080808080A7
-:20855F00AE5002F6AA08F7AE5011F6AA30F7AE5003F6AA08F7AE5012F6AA30F7AE5005F617
+:208000008200808382000000820084968200849782008498820084998200849A8200849BA2
-:20857F00A4CFF7AE500AF6A407F7AE500FF6A4FDF7815208AE001F1F04C60022974F957297
+:208020008200849C8200849D82000000820000008200849E8200849F820084C6820084C715
-:20859F00FB04F6A47F6B01AE500FF6A4CFF7AE5000F6A4F7F7AE5007F6A4CFF7AE500CF6E0
+:20804000820084C88200000082000000820085598200855A8200855B820000008200000027
-:2085BF00A407F7AE5011F6A4FDF7AE5008F6AA30F7AE500DF6AAF8F7AE5012F6AA02F7C687
+:208060008200855C8200855D8200855E82000000820000008200000082000000820000004A
-:2085DF000022A1012621AE5006F6A4304EA40F6B06AE5010F6A402481A066B03AE500BF6B2
+:1D808300AE00162707724F00005A26F9AE00562709D68F3ED700165A26F7CC8080AD
-:2085FF00A4F81A03C70016AE5002F6A4F7F7AE5003F6A4F7F7AE5011F6A4CFF7AE5012F640
+:03808000CC86D8D3
-:20861F00A4CFF7AE5008F6A4CFF7AE500DF6A407F7AE5012F6A4FDF77B01A1122448AE5091
+:20855F004B09CD818784AE85FFCF001D815202C6002AA10E2424CE00175C5C1F01C6002AC8
-:20863F0007F66B02AE00239F1B01979EA90095F61A02AE5007F7AE500CF66B08AE00359FAF
+:20857F0097A609424F9572FB01F64D2604A601200AC6002A4CC7002A20D54F5B028152061D
-:20865F001B01979EA90095F61A08AE500CF7AE5011F66B07AE00479F1B01979EA90095F6C3
+:20859F00CE00175C5C1F05C6002A97A609424F9572FB055C1F01CD80D34D260A725F001E25
-:20867F001A07AE5011F7C60022974F9572FB04F6482407AE500CF6AA40F7C60022A10027E6
+:2085BF00725F001D2037AE000B1F031E03A6BEF7AE855FCF001D4F5F975C72FB0390935FEF
-:20869F0010C60022A1012720C60022A10227302043AE5002F6AA08F7AE5003F6AA08F7AEA8
+:2085DF009772FB0188F69790F7844CA10825E81E031C0009A655F74B0ACD8193845B068181
-:2086BF005000F6AA08F7202CAE5011F6AA10F7AE5012F6AA10F7AE500FF6AA10F72015AE5C
+:2085FF00725F001E725F001DCD8224CF002690CF0024CE0026A30D402615CE0024A30003DD
-:2086DF005011F6AA20F7AE5012F6AA20F7AE500FF6AA20F7C600224CC70022A1022304727F
+:20861F00260D725D002B27073B002ACD8394843501002881AE000BF6A1FF260E3501002358
-:2086FF005F00225B08815212725F0022AE001F1F0D4F5F9772FB0D88A620F7844CA1032FFF
+:20863F00725F001E725F001D20064B01CD81878481CD80D34D260CAE894F89CD8B095B0286
-:20871F00F11E152603CC8835961C00041F0B0F01161517091E09F66B03887B024A6B098457
+:20865F004F2018AE000BA644F75CA6CCF7AE8633CF001D4B02CD819384A601815204AE00E4
-:20873F004D2603CC88097B01A1032F03CC88094F957B03A12F2D0C7B03A13A2E06A6309535
+:20867F00011F01AE000B1F03A607905F909772F9015F9772FB0388F69790F7844AA1FF2C14
-:20875F00CC87EE7B03A1602C040F072004A6016B077B03A1672F034F2002A60114074D2758
+:20869F00E990CE0021CE001F90CF002ECF002C35D0003135070030CD84184D270C5F974B12
-:20877F0006A65795CC87EE7B03A1402C040F122004A6016B127B03A1472F034F2002A60159
+:2086BF000089CD8C3C5B032009AE895389CD8B095B02725F00325B048152185F1F0D1F0B23
-:20879F0014124D2705A6379520457B03A12D2605A61D95203A7B03A1682605A65795202F88
+:2086DF005F1F071F055F1F031F010F0A0F09AE50C67FAE7F60F6AA01F7CD8963AE7F0AF6B2
-:2087BF007B03A1482605A6379520247B03A12E26180D0126071E0BA6FFF720265F7B089708
+:2086FF00AA28F7AE52607FAE5261A60FF7AE5262A603F7AE5263A6E8F7AE5254A601F7AE1C
-:2087DF0072FB0BF6AA80F720197B03A1202613905F7B01909772F90B7B038910018590F70E
+:20871F005250A685F7CD80A0CD83539AAE89571F0F1E0F89CD8B095B02CD856C4D270835AD
-:2087FF000C011E095C1F09CC87337B086B027B026B11A6026B037B11A1FF2D1A5F7B039736
+:20873F00010029725F002ACD8650CE002172B0002EC60020C2002D6B15C6001FC2002CC328
-:20881F0072FB0D1F0F5F7B119772FB0BF61E0FF70A110A0320E05B1281520A0F020F011ECC
+:20875F0000302217CE0021C3002EC60020C2002DC6001FC2002C2503CC884090CE0021CE00
-:20883F000DA3FF9D2F131E0DA303E72C040F062004A6016B060D06270CAE893B89CD8705B8
+:20877F00001F90CF002ECF002C0D09275235BC0031350200300F09725D00282710CE0026E1
-:20885F005B02CC89230D0F2729AE001F1F044F5F9772FB047F4CA1032FF50D0627294B0AC7
+:20879F00A30D402613CE0024A30003260BAE895B89CD8B095B022015725F0028CE00264B82
-:20887F004B001E0F89CD8EE75B041F0DA6016B022015AE001F1F094F5F9772FB0988A620C4
+:2087BF000089CD8C3C5B034B01CD8D2A84725D00292603CC8840C6002A4CC7002A2062A6C0
-:20889F00F7844CA1032FF11E0D2607AE00217FCC89231E0DA300002E09A6016B011E0D507D
+:2087DF00016B09352C003135010030725D0029274DCD856C4D2714C6002A974F955C4B0049
-:2088BF001F0DAE001F1F07A6026B034B0A4B001E0F89CD8D405B04905F7B03909772F9070F
+:2087FF0089CD8C3C5B03CD859D2036725F002ACD86504D272CCD856C4D260F725F0029AE73
-:2088DF009F90F74B0A4B001E0F89CD8EE75B041F0D0A037B03A1FF2C034F2002A6014D274A
+:20881F00895F89CD8B095B022017C6002A974F955C4B0089CD8C3C5B03CD859D2003CD86E0
-:2088FF00041E0D26C60D01270D4D270A5F7B039772FB07A610F70D0F270A5F7B029772FBBC
+:20883F0050C60022887B0F6B19841018A101230DCE00211F0DCE001F1F0BCD8995C60022C8
-:20891F00077999765B0A817B03A102220EAE001F9F1B03979EA90095799976812D2D4500CD
+:20885F00887B056B12841011A11E2203CC88F6CE00211F03CE001F1F01725D00322703CC8C
-:208F4400202020003020202030101020303030101020101000103800B8A880A8B808B8A8CD
+:20887F0088F17B0AC100162603CC88F1C6001643140A4D2603CC88F1A5042729CD80D34D38
-:1A8F640098B038B0B898809002020002020202020202020200020000000249
+:20889F002750725F002B350100324B33CD811984AE5300F64425F9AE867BCF001D4B08CD61
-:208000008200808382000000820080A0820080A1820080A2820080A3820080A4820080A57E
+:2088BF00818784202DA50827063501002B2023A510271F160F17124F8888CD839484841E90
-:20802000820080A6820080A78200000082000000820080A8820080A9820080D0820080D1F1
+:2088DF00128889CD8B095B0284725F00294CA10E25E6C600166B0A1E07C3002126071E056A
-:20804000820080D2820000008200000082008163820081648200816582000000820000000F
+:2088FF00C3001F270DCE00211F07CE001F1F05CD819D725D00232603CC8749CD80D34D26E8
-:20806000820081668200816782008168820000008200000082000000820000008200000038
+:20891F0003CC8749AE855FCF001D725F0023725D00292613AE000BA6BEF75CA6CCF74B02D0
-:1D808300AE00162707724F00005A26F9AE00562709D68F3BD700165A26F7CC8080B0
+:20893F00CD819384CC8749CD859DCC87495B188165303000656666002D2D2D0065616200F3
-:03808000CC8AB8EF
+:04895F0065656500E5
-:20893F004B09CD825084AE89DFCF001D815202C60064A10E2424CE00175C5C1F01C60064C2
+:148F4700000000000000030D400000000000000000012C0099
-:20895F0097A609424F9572FB01F64D2604A601200AC600644CC7006420D54F5B02815206C5
+:20896300AE5002F6AA08F7AE5011F6AA30F7AE5003F6AA08F7AE5012F6AA30F7AE5005F60F
-:20897F00CE00175C5C1F05C6006497A609424F9572FB055C1F01CD819C4D260A725F001E3D
+:20898300A4CFF7AE500AF6A407F7AE500FF6A4FDF7815208AE00331F04C60036974F957267
-:20899F00725F001D2037AE000B1F031E03A6BEF7AE893FCF001D4F5F975C72FB0390935F27
+:2089A300FB04F6A47F6B01AE500FF6A4CFF7AE5000F6A4F7F7AE5007F6A4CFF7AE500CF6D8
-:2089BF009772FB0188F69790F7844CA10825E81E031C0009A655F74B0ACD825C845B0681D3
+:2089C300A407F7AE5011F6A4FDF7AE5008F6AA30F7AE500DF6AAF8F7AE5012F6AA02F7C67F
-:2089DF00725F001E725F001DCD82EDCF006090CF005ECE0060A30D402615CE005EA3000348
+:2089E3000036A1012621AE5006F6A4304EA40F6B06AE5010F6A402481A066B03AE500BF696
-:2089FF00260D725D006527073B0064CD845D843501006281AE000BF6A1FF260E3501005DC3
+:208A0300A4F81A03C70016AE5002F6A4F7F7AE5003F6A4F7F7AE5011F6A4CFF7AE5012F637
-:208A1F00725F001E725F001D20064B01CD82508481CD819C4D260CAE8D2C89CD87055B0235
+:208A2300A4CFF7AE5008F6A4CFF7AE500DF6A407F7AE5012F6A4FDF77B01A1122448AE5089
-:208A3F004F2018AE000BA644F75CA6CCF7AE8A13CF001D4B02CD825C84A601815204AE0052
+:208A430007F66B02AE00379F1B01979EA90095F61A02AE5007F7AE500CF66B08AE00499F7F
-:208A5F00011F01AE000B1F03A607905F909772F9015F9772FB0388F69790F7844AA1FF2C30
+:208A63001B01979EA90095F61A08AE500CF7AE5011F66B07AE005B9F1B01979EA90095F6A7
-:208A7F00E990CE005BCE005990CF0068CF006635D0006B3507006ACD84E14D270C5F974B09
+:208A83001A07AE5011F7C60036974F9572FB04F6482407AE500CF6AA40F7C60036A10027B6
-:208A9F000089CD88385B032009AE8D3089CD87055B02725F006C5B048152185F1F0D1F0B34
+:208AA30010C60036A1012720C60036A10227302043AE5002F6AA08F7AE5003F6AA08F7AE78
-:208ABF005F1F071F055F1F031F010F0A0F09AE50C67FAE7F60F6AA01F7CD855FAE7F0AF6D6
+:208AC3005000F6AA08F7202CAE5011F6AA10F7AE5012F6AA10F7AE500FF6AA10F72015AE54
-:208ADF00AA28F7AE52607FAE5261A60FF7AE5262A603F7AE5263A6E8F7AE5254A601F7AE38
+:208AE3005011F6AA20F7AE5012F6AA20F7AE500FF6AA20F7C600364CC70036A1022304724F
-:208AFF005250A685F7CD8169CD841C9AAE8D341F171E1789CD87055B02CD894C4D27083569
+:208B03005F00365B08815212725F0036AE00331F0D4F5F9772FB0D88A620F7844CA1032FBA
-:208B1F00010063725F0064CD8A30CE005B72B00068C6005AC200676B14C60059C20066C391
+:208B2300F11E152603CC8C39961C00041F0B0F01161517091E09F66B03887B024A6B098447
-:208B3F00006A2217CE005BC30068C6005AC20067C60059C200662503CC8C1D90CE005BCE6B
+:208B43004D2603CC8C0D7B01A1032F03CC8C0D4F957B03A12F2D0C7B03A13A2E06A630951D
-:208B5F00005990CF0068CF00660D09275235BC006B3502006A0F09725D00622710CE006067
+:208B6300CC8BF27B03A1602C040F072004A6016B077B03A1672F034F2002A60114074D2748
-:208B7F00A30D402613CE005EA30003260BAE8D3889CD87055B022015725F0062CE00604B17
+:208B830006A65795CC8BF27B03A1402C040F122004A6016B127B03A1472F034F2002A60149
-:208B9F000089CD88385B034B01CD892684725D00632603CC8C1DC600644CC70064205FA660
+:208BA30014124D2705A6379520457B03A12D2605A61D95203A7B03A1682605A65795202F80
-:208BBF00016B09352C006B3501006A725D0063274ACD894C4D2714C60064974F955C4B009C
+:208BC3007B03A1482605A6379520247B03A12E26180D0126071E0BA6FFF720265F7B089700
-:208BDF0089CD88385B03CD897D2033725F0064CD8A304D2729CD894C4D260F725F0063AE7D
+:208BE30072FB0BF6AA80F720197B03A1202613905F7B01909772F90B7B038910018590F706
-:208BFF008D3C89CD87055B022014C60064974F955C4B0089CD88385B032003CD8A30C600EA
+:208C03000C011E095C1F09CC8B377B086B027B026B11A6026B037B11A1FF2D1A5F7B039725
-:208C1F005C887B0F6B11841010A101230DCE005B1F0DCE00591F0BCD8591C6005C887B0522
+:208C230072FB0D1F0F5F7B119772FB0BF61E0FF70A110A0320E05B1281520A0F020F011EC4
-:208C3F006B1084100FA11E2203CC8CD3CE005B1F03CE00591F01725D006C2703CC8CCE7B50
+:208C43000DA3FF9D2F131E0DA303E72C040F062004A6016B060D06270CAE8D3F89CD8B09A0
-:208C5F000AC100162603CC8CCEC6001643140A4D2603CC8CCEA5042729CD819C4D275072D3
+:208C63005B02CC8D270D0F2729AE00331F044F5F9772FB047F4CA1032FF50D0627294B0AA3
-:208C7F005F00653501006C4B33CD81E284AE5300F64425F9AE8A5BCF001D4B08CD825084EF
+:208C83004B001E0F89CD8EEA5B041F0DA6016B022015AE00331F094F5F9772FB0988A620A5
-:208C9F00202DA5082706350100652023A510271F161717114F8888CD845D84841E1188890B
+:208CA300F7844CA1032FF11E0D2607AE00357FCC8D271E0DA300002E09A6016B011E0D5059
-:208CBF00CD87055B0284725F00634CA10E25E6C600166B0A1E07C3005B26071E05C3005921
+:208CC3001F0DAE00331F07A6026B034B0A4B001E0F89CD8D435B04905F7B03909772F907F0
-:208CDF00270DCE005B1F07CE00591F05CD8266725D005D2603CC8B29CD819C4D2603CC8B66
+:208CE3009F90F74B0A4B001E0F89CD8EEA5B041F0D0A037B03A1FF2C034F2002A6014D273F
-:208CFF0029AE893FCF001D725F005D725D00632613AE000BA6BEF75CA6CCF74B02CD825C60
+:208D0300041E0D26C60D01270D4D270A5F7B039772FB07A610F70D0F270A5F7B029772FBB3
-:208D1F0084CC8B29CD897DCC8B295B188165303000656666002D2D2D006561620065656515
+:208D2300077999765B0A817B03A102220EAE00339F1B03979EA90095799976812D2D4500B1
-:018D3F000033
+:208F5B00202020003020202030101020303030101020101000103800B8A880A8B808B8A8B6
-:148F7E00000000000000030D400000000000000000012C0062
+:1A8F7B0098B038B0B898809002020002020202020202020200020000000232
-:208D400052051E08A300002F040F012004A6016B010D0127051E085020021E081F041E0A36
+:208D430052051E08A300002F040F012004A6016B010D0127051E085020021E081F041E0A33
-:208D6000A300002E071E0A501F022004160A170216021E0465930D012701505B05815240FA
+:208D6300A300002E071E0A501F022004160A170216021E0465930D012701505B05815240F7
-:208D80009096905C961C00431F051E05E603961C00471F0B1E0B1F0D1E0D1F3F1E3F88E6D0
+:208D83009096905C961C00431F051E05E603961C00471F0B1E0B1F0D1E0D1F3F1E3F88E6CD
-:208DA0000197844290FF72A900021E05E6031E0B1F071E071F091E091F0F1E0F88E6039777
+:208DA3000197844290FF72A900021E05E6031E0B1F071E071F091E091F0F1E0F88E6039774
-:208DC000844290FF965C1F151E15F66B171E05F697160B90E603429F1B171E15F71E15F6BD
+:208DC300844290FF965C1F151E15F66B171E05F697160B90E603429F1B171E15F71E15F6BA
-:208DE0006B1C1E05E60197160B90E602429F1B1C1E15F79096905C93FE1F1D1E05E6011E69
+:208DE3006B1C1E05E60197160B90E602429F1B1C1E15F79096905C93FE1F1D1E05E6011E66
-:208E00000B1F231E231F251E251F271E2788E60397844272FB1D90FF93FE1F291E05E602E7
+:208E03000B1F231E231F251E251F271E2788E60397844272FB1D90FF93FE1F291E05E602E4
-:208E20001E0B1F2B1E2B1F2D1E2D1F311E3188E60297844272FB2990FF16051E05E6021E0A
+:208E23001E0B1F2B1E2B1F2D1E2D1F311E3188E60297844272FB2990FF16051E05E6021E07
-:208E40000B1F331E331F351E351F371E3788E6019784429F90F71E055C1F391E05E60290AE
+:208E43000B1F331E331F351E351F371E3788E6019784429F90F71E055C1F391E05E60290AB
-:208E6000971E0BE60390421E39FF160B1E05E6031E0B1F3D1E3D1F2F1E2F88F69784429FFF
+:208E6300971E0BE60390421E39FF160B1E05E6031E0B1F3D1E3D1F2F1E2F88F69784429FFC
-:208E800090F71E0B5C1F3B1E05E60390971E0BE60290421E3BFF1E0B1C00037F1E051C00F8
+:208E830090F71E0B5C1F3B1E05E60390971E0BE60290421E3BFF1E0B1C00037F1E051C00F5
-:208EA000037F965CE6036B14E6026B13E6016B12F616431718164572F9131721887B13194E
+:208EA300037F965CE6036B14E6026B13E6016B12F616431718164572F9131721887B13194B
-:208EC0001A6B218419186B1F1621EF02161FFFE603E602FE16491E4772F9219F1920979E25
+:208EC3001A6B218419186B1F1621EF02161FFFE603E602FE16491E4772F9219F1920979E22
-:208EE000191F95515B408152081E0BA300002F040F052004A6016B050D0527051E0B5020B9
+:208EE300191F95515B408152081E0BA300002F040F052004A6016B050D0527051E0B5020B6
-:208F0000021E0B1F011E0DA300002F040F062004A6016B060D0627107B0E406B044F120DC4
+:208F0300021E0B1F011E0DA300002F040F062004A6016B060D0627107B0E406B044F120DC1
-:1C8F20006B03160317072004160D170716071E01657B0518064D2701505B088143
+:1C8F23006B03160317072004160D170716071E01657B0518064D2701505B088140
 :00000001FF