diff --git a/trunk/bsr.hex b/trunk/bsr.hex index 934e368..6bc717b 100644 --- a/trunk/bsr.hex +++ b/trunk/bsr.hex @@ -1,259 +1,261 @@ -:020000003C0DB5 -:04001000574A594AA8 -:02001C002E4C68 -:020024009A4CF4 -:02002A00074D80 -:08003400364ED24D2B4E654FF4 -:02004A005B4A0F -:02005A00964AC4 -:02006200E94E65 -:0400C0007EFBFF04C0 +:020000003D0DB4 +:02000200FFFFFE +:04001000864A884A4A +:02001C005D4C39 +:02002400C94CC5 +:02002A00364D51 +:08003400654E014E5A4E944F37 +:02004A008A4AE0 +:02005A00C54A95 +:02006200184F35 +:0400C0007EFBFF853F :0A00C4001B339499E033F240BFAA09 -:1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A -:1000DE00D8710020F98EA89C018C015C10D1DD0A2C -:1000EE007110DAFB710020F9EF0B8C015C80D1618D -:1000FE00E8710020F98F20F931030FF6BBBBF6B182 -:10010E00614900DD05617900EFF4FDAA01CC000024 -:10011E00CC01008C014C09DE468C01318E04F60FA9 -:10012E00C1317B9EFDC41189728C01318E04F64F54 -:10013E0014896142DF03F6EF01E6600D9B8C0131FD -:10014E008E12490020728C01318E04F64F14896193 -:10015E0042DF03F6EF01E6600D9B615901EFB440FB -:10016E00F84F3A61E86159008BD161E8FD650731BE -:10017E00020406714020F9EF04714820F9FDC70210 -:10018E00EDD300C0C6D7717BFACEA010CEA180E50C -:10019E00F300CEA408F5AAFFF5A9FFD78F20F931F9 -:1001AE00050ACD0003CD0307F40EEF07F400CD03CF -:1001BE0006F40ECE20FFCE23F0CE2EFC8F20F9318A -:1001CE00031FF51005CD01C0F402CD0408F405F4AB -:1001DE0006CD0740F40CF40F7108F200F690BFB490 -:1001EE0001F6BEE0BEE2BED0CBE4FFFFCBE6FFFFE2 -:1001FE00CBD4FFFFCF1105FCF521FFCE22E9CE2493 -:10020E00F3CE25F2CE26FCCE275FCE2CFFCE2FFFCF -:10021E00CF120511F53000F53100F53300F534003D -:10022E00CF350002CF370019F53C00F53E00F543FF -:10023E0000F54700CF530006F55700CBE8FFFFCB84 -:10024E00EAFFFFCBECFFFFCBEEFEFFCED8FFCEDCFE -:10025E00FFCE3831CE3970CF38050AF53905F5376E -:10026E00FF7158F000F530FF7128F0005087BF186D -:10027E0001BF1A01BF1C01BF1E017148F000F5300D -:10028E000271080105F55005F5BCFFF5BDFFF5A59A -:10029E00FFF5A6FFD7C7C1C1FBF8FFCEABAC8C02F2 -:1002AE00D1DD12616902305C03BBF6614900DDEEFF -:1002BE00618900EFF51004C6D7FDF532FD503CFD07 -:1002CE003D05717AFAFDC023F51EF98F20F931052F -:1002DE00175003C15084FD4703C0625C01D161E831 -:1002EE00CF1EF902CFE3FB64FDD533FD6848717272 -:1002FE0022712BE7FD533CFDF53CA2D6FBF642D610 -:10030E00FBDFF1717B9D7178F00050C8FDA302FDFB -:10031E00F532EFE0D7D7C7F616FD3D05717BFA3102 -:10032E00022105710221EF0B717AFAA7F647DFEC75 -:10033E00E2EF04717AFAF2C6D7C7C1C1FBF8FF1714 -:10034E00A1C1E0C18C0A70C18C0270FD7103100650 -:10035E00D2DF05F541FBEF04CF41FB028C01721099 -:10036E0004C6D7C7C1FBF8FFFD2403D2DD03E2EFBD -:10037E00618B70FD9104D2DD077103215202EF52A1 -:10038E008C0870FDA604FDF1048B6C0170FDA604B3 -:10039E00300400BF2401301740BF1C01300400BFE1 -:1003AE0022018C0A91DF04F6BF2A01710BE2CE44C2 -:1003BE00FF3182E202EFFAAC0C148E449961790C93 -:1003CE0061690A8C0AD1DFDAFD1A05710BE271033D -:1003DE0021F2C0C6D7C7C1FBF8FFFD2403D2DD034F -:1003EE00E2EF25710AE68B70FD9104D2DD077103F1 -:1003FE00215202EF138C0870FDA6048C0A70FDA624 -:10040E0004FD1A05710321F2C0C6D7C7C1FBF8FF60 -:10041E00FD2403D2DD03E2EF67710AE6710BE28B76 -:10042E0070FD9104D2DD077103215202EF52710B60 -:10043E00E231722039C7343AFBAC0C1652048B9958 -:10044E00A5A792DFF9C63184BD02EFFA717ABDCE4F -:10045E00B144CBB43AFB8C0A318EBEB8CEBB4871D8 -:10046E004BE1714BE5710ABD8C089E44EF11710B87 -:10047E00E68C089E448C0A9F40FBAC0CBF3EFBF200 -:10048E00C0C6D7C716FDC90417FDA604D2DD06FDEA -:10049E001A05E2EF01F2C6D7C716710AE6710BE232 -:1004AE00669E443182E202EFFAF6420401DD09AFA4 -:1004BE000401BF0C01E2EF01F2C6D7AF2801085CC0 -:1004CE00FB08BF2801FD2303AF28015CFBBF2801F9 -:1004DE00300400BF2A01301780BF1C01300400BF5A -:1004EE002201D7AF2401086C0408BF2401AF2801F4 -:1004FE006C0F086C0B08BF2801FD2303AF2A0108FF -:10050E005CFB08BF2A01FD2303EDC904300400BFC4 -:10051E002401F6BF2A01300B0BBF2801FD23033047 -:10052E000B0FBF2801FD2303300F0FBF2801D7315A -:10053E00142101D7710221710BBD0000717BBD71B9 -:10054E003A25713A236A0E03713205713B257132D9 -:10055E0003713B23500AFDA3027120F000FD23031B -:10056E00F6BF26015024BF1401CB440014300F0FE8 -:10057E00BF2801717320710BE2710AE6FDC904CE2A -:10058E0044FF3182E202EFFAFD1A05AF0401BF0CFF -:10059E0001710321711221D731042102EFFAFDF10D -:1005AE0004713A25713A235A0EFC713305713B25BD -:1005BE00713303713B237128F000711321D7C78863 -:1005CE000616FD2403D2DD03E2EF38710AE650A4CD -:1005DE00FD9104D2DD077103215202EF2617FDA60D -:1005EE00046770FDA604FDF10450A4FDA60450207E -:1005FE00FDA604D942FBFDA604A042FBFD1A05711F -:10060E000321F2C6D7C72008FBF8FFFD6F0950146F -:10061E00C15008FDA108C0CC07048C074C14DE0C99 -:10062E008C07318EFD1E0A615907EFEECC07048C44 -:10063E00074C1461C8ED0107CC06008C064C046112 -:10064E00C8EDE0063022F9BC02F6BBCEABAC31B23F -:10065E00D109C73641057184C6DEF3F1C7364105AF -:10066E007184C661DC9C05713BD1AC02148F4005D0 -:10067E009971505005617902617900F0E16149008C -:10068E00DD09C73641057184C6DEC3F1C7364105A3 -:10069E007184C661DC0E059C055040C18C07318EFD -:1006AE0031AD128C06318E318D03BDD831FFBDDADE -:1006BE00DADAADD8FDEA0CC0D2DD0C5008C1501408 -:1006CE00FDA108C0FDA70B8C05D1DF06615906ED13 -:1006DE0049068C07318EFD220AD2DD0C5008C1501E -:1006EE0014FDA108C0FDA70B8C05D1DF06615907CB -:1006FE00ED3D0671605005CC0400CC05008C054C18 -:10070E0009DE2B8C05318E04F61FC1317B9EFDC494 -:10071E001189728C05318E04F64F14896142DF0304 -:10072E00F6EF01E6600E049C04615905EFCF41001F -:10073E001140F81F3A61E86159048C04D1DF08FDBD -:10074E00A80BFDBA0CEF0C5008C15014FDA108C047 -:10075E00FDA70B1008C6D7C72004FBF8FF715B215D -:10076E00CC0100F6BC02AC02440900DE3EAC020431 -:10077E00F60F144100118972AC020C5014896142BB -:10078E00DF03F6EF01E6600E019C01AC0212490098 -:10079E005072AC0204F67F14896142DF03F6EF015A -:1007AE00E6600E019C01617902EFBB40F67FFF61AE -:1007BE00F86159018C01D161F8ED6F08CC0100711F -:1007CE007AFAFD3D05711300711B2071030371024E -:1007DE0005E0C15003C15084FDE30310045013FD26 -:1007EE00A302500FC1E0C15084FDE3031004CEAB51 -:1007FE00AC6159018C0191DD068C014C03DF03E6DF -:10080E00EF01F66061FB7151018C014C0861F8CC6F -:10081E00010031320705A084FCEF03F584FC40840F -:10082E00FC11DC11F584FCF0C15003C15084FDE3D2 -:10083E00031004EF12E6BC02F6614902DDB00000BF -:10084E000000617902EFF1CE3708CBE4FFFFCBE673 -:10085E00FFF7CED4FFCF370008F5120561FDF5ABDB -:10086E00FFFD6F09D25008C15014FDA108C0D2FD82 -:10087E00A70B1004C6D73184BD02EFFA717BBDCB36 -:10088E00E4FFFFCBE6FFFFCBD4FFFF717ABED7713B -:10089E007BBED7C7C1200CFBF8FF8C0C318E31AD5F -:1008AE00C1317B9DD4C0BC068DD49C088C149C0B8E -:1008BE008C14318E040C00128C0B318EBDD813FDAE -:1008CE00790F61C8ED6A09CEABACCC05068C0B3145 -:1008DE008EFD1A0AD2DD158C0B318EFD1E0A616952 -:1008EE00058C05D1DFE7FD9D08E2EF71CC0A008C87 -:1008FE000A4C04DE54F6BC023022F9BBAC06148C52 -:10090E00089EFD118972AB146299AC06A1BC0661FA -:10091E007900617902F0E1614902DFE05040C18C5B -:10092E000B318E31AD128C0A318E318D03BDD83123 -:10093E00FFBDDADADAADD8FDEA0CC0D2DD06FD9DD8 -:10094E0008E2EF1961590AEFA68C0B318EFD220ACF -:10095E00D2DD03E2EF0761590BEDBE08F2100EC6B1 -:10096E00D7C7717B9D717BFAFD84083022F9FDCDCE -:10097E000AFD580AC6D7FD6F09FDA70BFD9D08F5A8 -:10098E00ABFFF2D7C7D56CFDDD05B06CFDEF7BCFAD -:10099E006CFD02311407067110E7FBEF047118E7C6 -:1009AE00FB8FE7FB7F32FD76D1DD5F8FE7FB9F325A -:1009BE00FD401EF903DF25665C10D1DD1F7122207C -:1009CE008FE7FB5C10D1DD0B5080C15011FD053857 -:1009DE00C0EF095040C15011FD0538C0401EF9034B -:1009EE00DD06401EF904DF22665C02D1DD1C8FE7B6 -:1009FE00FB5C02D1DD0B5040C15010FD0538C0EF3D -:0C0A0E00095020C15010FD0538C0C6D7AB -:100A1A005208EF065203EF025206FEE600FE1B00E2 -:100A2A00DC16089F03088F0408089F040862FE2446 -:100A3A0000089F0408EEBF00EEBA00C1C514410EBB -:100A4A0011D9D0FF118FD1FF312E45C4C0D7F23151 -:100A5A00A2C401E2D79DE261DD4C09DF12717BFA83 -:100A6A00C18F06089F7DFDC0CF060800EE27003122 -:100A7A00F2FA04CF0608004C00DF05D50008DD169F -:100A8A0061DD717BFAD50608DD0ACDE31F61CD6110 -:100A9A00CDEE160061CDFED40061FFFE9A00FCF88F -:100AAA00FF0EFEB20061CDFED5004C09DF0EC18FEC -:100ABA0006086F7DFD9F0608C0EE0400CF060800F9 -:100ACA00F8E3D75200EF025202FE3700CF7CFD0056 -:100ADA00CF060800BF0408C716629F00084100112C -:100AEA008F8C229B4100118F8D229F0108C65100D5 -:100AFA00FE62FFEF025205CF060800C1510CFE0A42 -:100B0A0000C0D7C1511DFE0200C0D761DD717BFA5A -:100B1A0070CEC0A59EC47CFF9EC4609EC461CDD722 -:100B2A0061DD717BFAC18EC45C1BFED6FFCF06085D -:100B3A0001FED7FFC061CDD731F2FA1AC1AEE4BFC8 -:100B4A006EFDAEE6BF70FDAED4BF72FD30FFFFBED4 -:100B5A00E4BEE6BED4C0D731F2FA11C1AF6EFDBE13 -:100B6A00E4AF70FDBEE6AF72FDBED4C0D7C1BF749C -:100B7A00FD13BF76FD15BF78FD17BF7AFDC0D7AF4D -:100B8A0074FDDB76FDEB78FDFB7AFDD7534B3052D3 -:100B9A005430324E323030475631323000FFC15075 -:100BAA00FEFEAB0061DD717BFACF060800FE0A008B -:100BBA00FEA4FF61CDF8E3EECF00C7FB0408BF6EC9 -:100BCA00FD8FC0009C05C5C337040600BF70FD3504 -:100BDA00360C0C300000522BFE6600C2C4C630BA76 -:100BEA000BB800300000B8022004AF70FDB8003026 -:100BFA000F00B802AF6EFD61FF520AFE3AFFECF831 -:100C0A00FF0E717BFAC1C7FB04088C05C65C80FE27 -:100C1A000200C0D761DD717BFA70CFC0FFA59FC00B -:100C2A00007CFF9FC000609FC00061CDD7618BFE32 -:100C3A00E2FF717BBE410011FB000017CEFC006190 -:100C4A00CB089EFDF31161C999A58392DFF7D7FE00 -:100C5A00B1FED57CFDDF23C1CF0308035109FEF4A1 -:100C6A00FDC0D2DF37FE3800A20408CF03080751BF -:100C7A0009FEE1FDD2B20408DF22C7FB0408318372 -:100C8A0002C6D7C6510AFECCFD624C1FDF06CF7CD6 -:100C9A00FD01EF04CF7CFD00C0EE5BFEC0EE55FE09 -:100CAA00C7C1FB04088B31196C0161589BC0C6D7B8 -:100CBA00717BFAFE4DFEAF0408040600C114361E0D -:100CCA000C300000522DF3FE77FF8FC000FE2BFE82 -:100CDA0061CF5C807C8073C0041900CEFC0F61CBAD -:100CEA00C55404EF03C55417FE18FEC7360008BBE7 -:100CFA00629C0288089C03D1DD334C41DE2F70F1DF -:100D0A00312DB161090033081C000851FF612A41E5 -:100D1A000E118FD0FF613B118FD1FF6138DC0E8B32 -:100D2A005C03DF0964C6C4FE2BFDEECAFDC6C4EE31 -:020D3A00C3FDF7 -:100D3C0061CF5100718C7109FECBF800FEFC94015F -:100D4C0000F6BF00F953C0F693935820FEDFF9412B -:100D5C000036864F3434FDEF05118B99A7A5174447 -:100D6C00C04FDFF53602F93034FDEF04CC0000A79C -:100D7C0047DFF94100366B4F346EFDEF05118B994F -:100D8C00A7A517446B4FDFF5366EFD306EFDEF04F3 -:100D9C00CC0000A747DFF9FCCE0000EFFE61DD714F -:100DAC007BFABEF0ADD8BEF200AEF661CDD7C36112 -:100DBC00DD717BFABEF0ADD8BEF200DBF6FFADDC28 -:100DCC00BEF000AEF6BDD8AEF40312ADDABEF20042 -:100DDC00AEF661CD03BDDAC2D7C3F33174D9088343 -:100DEC00C1F626D8BDD8C031750683C312F623C20E -:100DFC00FD070E93DF0312F623C2D7440000DD2655 -:100E0C0061DD717BFACFE80080BEF6F6BEF4BEF26F -:100E1C00ADD8BEF0CFE800818FE8003103FAAEF018 -:100E2C00F5E80061CDD7B1D7C3F33174D90883C1CC -:100E3C00F626D8BDD8C0317505C312F623C2FD55B0 -:100E4C000E93DF0312F623C2D7440000DD2761DDC9 -:100E5C00717BFACFE80080BEF6F6BEF4BEF2ADD8D8 -:100E6C00BEF0CFE800818FE8003103FAAFE000F567 -:100E7C00E80061CDD7ADD8D7C3F33174DB0F83C194 -:100E8C00F626D8BDD861317026DABDDAC031750DC1 -:100E9C0083C312F626DCBDDC61317023C2FDBD0EAE -:100EAC0093DF0CF626D8BDD861317026DABDDAC2D4 -:100EBC00D7C161686BDC6BDDC0DD2F61DD717BFA46 -:100ECC00CFE80080BEF4ADDCBEF6ADD8BEF0ADDA36 -:100EDC00BEF2CFE800818FE8003103FAAEF0BDD846 -:100EEC00AEF2BDDAF5E80061CDD7F6BDD8BDDAD7E4 -:100EFC008292DD2B61DD717BFACFE80080BEF0F6CB -:100F0C00BEF2BEF46208BEF6CFE800818FE8003175 -:100F1C0003FAAFE0006072AEF0F5E80061CDD76087 -:100F2C0072F6B1D706DABDDAADDC06D8BDD861D819 -:100F3C00A6DAD7D1DD17C1C3DAD89DD8ADDA311C0A -:100F4C0061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD9D -:100F5C001BC1C3DADA9DDAADD8311E33311E3371C1 -:100F6C00F9B4DADFF4BDD813BDDAC2C0D746D8DD88 -:100F7C000771FF7177D971C0D746DADF08C1ADDCD4 -:100F8C0046D8C0DD077177DB71FF71C0D75BDB9D85 -:100F9C00DB605BDA9DDAADDC5BD9085BD808BDD8C9 -:100FAC00D7C3C7F3728EFDC162314C4100366C4F12 -:100FBC001161A072C09EFD62C6C2D7C3C7F3728E08 -:100FCC00FDC1625C0F0C000FFE00314C4100367607 -:0F0FDC004F1161800FFE0073C09EFD63C6C2D728 -:0A0FF60031373A34333A303100004D -:0A20000031373A34333A3031000032 +:0A00CE00FFFFFFFFFFFFFFFFFFFF32 +:1000D800C7C1FBF8FFCEABACC736F00071F4C66100 +:1000E800D8710020F98EA89C018C015C10D1DD0A22 +:1000F8007110DAFB710020F9EF0B8C015C80D16183 +:10010800E8710020F98F20F931030FF6BBBBF6B177 +:10011800614900DD05617900EFF4FDB401CC000010 +:10012800CC01008C014C09DE468C01318E04F60F9F +:10013800C1317B9EFDC41189728C01318E04F64F4A +:1001480014896142DF03F6EF01E6600D9B8C0131F3 +:100158008E12490020728C01318E04F64F14896189 +:1001680042DF03F6EF01E6600D9B615901EFB440F1 +:10017800F84F3A61E86159008BD161E8FD660731B3 +:10018800020406714020F9EF04714820F9FDD102FC +:10019800EDDD00C0C6D7717BFACEA010CEA180E5F8 +:1001A800F300CEA408F5AAFFF5A9FFD78F20F931EF +:1001B800050ACD0003CD0307F40EEF07F400CD03C5 +:1001C80006F40ECE20FFCE23F0CE2EFC8F20F93180 +:1001D800031FF51005CD01C0F402CD0408F405F4A1 +:1001E80006CD0740F40CF40F7108F200F690BFB486 +:1001F80001F6BEE0BEE2BED0CBE4FFFFCBE6FFFFD8 +:10020800CBD4FFFFCF1105FCF521FFCE22E9CE2488 +:10021800F3CE25F2CE26FCCE275FCE2CFFCE2FFFC5 +:10022800CF120511F53000F53100F53300F5340033 +:10023800CF350002CF370019F53C00F53E00F543F5 +:1002480000F54700CF530006F55700CBE8FFFFCB7A +:10025800EAFFFFCBECFFFFCBEEFEFFCED8FFCEDCF4 +:10026800FFCE3831CE3970CF38050AF53905F53764 +:10027800FF7158F000F530FF7128F0005087BF1863 +:1002880001BF1A01BF1C01BF1E017148F000F53003 +:100298000271080105F55005F5BCFFF5BDFFF5A590 +:1002A800FFF5A6FFD7C7C1C1FBF8FFCEABAC8C02E8 +:1002B800D1DD12616902305C03BBF6614900DDEEF5 +:1002C800618900EFF51004C6D7717320FDF532FD82 +:1002D800503CFD3E05717AFAFDC023F51EF98F20CA +:1002E800F93105175003C15084FD4803C0625C0111 +:1002F800D161E8CF1EF902CFE3FB64FDD533FD974A +:1003080048710223712BE7FD533CFDF53C31742005 +:1003180003FDE64161EDEFEFD7D7C7F616FD3E05C1 +:10032800717BFA31122105711221EF0E717AFAA749 +:10033800F647DFEC717220E2EF04717AFAF2C6D761 +:10034800C7C1C1FBF8FF17A1C1E0C18C0A70C18CFD +:100358000270FD72031006D2DF05F541FBEF04CFF2 +:1003680041FB028C01721004C6D7C7C1FBF8FFFD20 +:100378002203D2DD03E2EF618B70FD9204D2DD0728 +:100388007113215202EF528C0870FDA704FDF2048C +:100398008B6C0170FDA704300400BF2401301740A6 +:1003A800BF1C01300400BF22018C0A91DF04F6BF94 +:1003B8002A01710BE2CE44FF3182E202EFFAAC0C63 +:1003C800148E449961790C61690A8C0AD1DFDAFDCF +:1003D8001B05710BE2711321F2C0C6D7C7C1FBF828 +:1003E800FFFD2203D2DD03E2EF25710AE68B70FDE3 +:1003F8009204D2DD077113215202EF138C0870FDAD +:10040800A7048C0A70FDA704FD1B05711321F2C017 +:10041800C6D7C7C1FBF8FFFD2203D2DD03E2EF67B1 +:10042800710AE6710BE28B70FD9204D2DD0771133D +:10043800215202EF52710BE231022139C7343AFBE3 +:10044800AC0C1652048B99A5A792DFF9C63184BD6E +:1004580002EFFA717ABDCEB144CBB43AFB8C0A31C3 +:100468008EBEB8CEBB48714BE1714BE5710ABD8CAD +:10047800089E44EF11710BE68C089E448C0A9F403D +:10048800FBAC0CBF3EFBF2C0C6D7C716FDCA0417AB +:10049800FDA704D2DD06FD1B05E2EF01F2C6D7C7B2 +:1004A80016710AE6710BE2669E443182E202EFFAA7 +:1004B800F6420401DD09AF0401BF0C01E2EF01F2CD +:1004C800C6D7AF2801085CFB08BF2801FD2103AF90 +:1004D80028015CFBBF2801300400BF2A01301780C7 +:1004E800BF1C01300400BF2201D7AF2401086C04EF +:1004F80008BF2401AF28016C0F086C0B08BF280146 +:10050800FD2103AF2A01085CFB08BF2A01FD210376 +:10051800EDCA04300400BF2401F6BF2A01300B0BDA +:10052800BF2801FD2103300B0FBF2801FD21033037 +:100538000F0FBF2801D731242101D7711221710B68 +:10054800BD0000717BBD713A25713A236A0E0371B3 +:100558003205713B25713203713B23500AFDAD0210 +:100568007120F000FD2103F6BF26015024BF1401BD +:10057800CB440014300F0FBF2801710321710BE227 +:10058800710AE6FDCA04CE44FF3182E202EFFAFDA9 +:100598001B05AF0401BF0C01711321712221D73152 +:1005A800142102EFFAFDF204713A25713A235A0E2A +:1005B800FC713305713B25713303713B237128F0BE +:1005C80000712321D7C7880616FD2203D2DD03E276 +:1005D800EF38710AE650A4FD9204D2DD07711321A9 +:1005E8005202EF2617FDA7046770FDA704FDF20469 +:1005F80050A4FDA7045020FDA704D942FBFDA70481 +:10060800A042FBFD1B05711321F2C6D7C72008FBCA +:10061800F8FFFD70095014C15008FDA208C0CC07AE +:10062800048C074C14DE0C8C07318EFD1F0A6159AF +:1006380007EFEECC07048C074C1461C8ED0207CC19 +:1006480006008C064C0461C8EDE1063022F9BC02B4 +:10065800F6BBCEABAC31B2D109C73641057184C601 +:10066800DEF3F1C73641057184C661DC9C05713B38 +:10067800D1AC02148F40059971505005617902611F +:100688007900F0E1614900DD09C73641057184C68A +:10069800DEC3F1C73641057184C661DC0E059C05D1 +:1006A8005040C18C07318E31AD128C06318E318DA0 +:1006B80003BDD831FFBDDADADAADD8FDEB0CC0D214 +:1006C800DD0C5008C15014FDA208C0FDA80B8C0514 +:1006D800D1DF06615906ED4A068C07318EFD230AE3 +:1006E800D2DD0C5008C15014FDA208C0FDA80B8C27 +:1006F80005D1DF06615907ED3E0671605005CC044F +:1007080000CC05008C054C09DE2B8C05318E04F6D7 +:100718001FC1317B9EFDC41189728C05318E04F690 +:100728004F14896142DF03F6EF01E6600E049C0472 +:10073800615905EFCF41001140F81F3A61E861594E +:10074800048C04D1DF08FDA90BFDBB0CEF0C50088D +:10075800C15014FDA208C0FDA80B1008C6D7C720B9 +:1007680004FBF8FF715B21CC0100F6BC02AC02442B +:100778000900DE3EAC0204F60F144100118972AC88 +:10078800020C5014896142DF03F6EF01E6600E01A6 +:100798009C01AC021249005072AC0204F67F148925 +:1007A8006142DF03F6EF01E6600E019C0161790208 +:1007B800EFBB40F67FFF61F86159018C01D161F808 +:1007C800ED7008CC0100717AFAFD3E0571130071D5 +:1007D8001B20710303710205E0C15003C15084FD61 +:1007E800E40310045013FDAD02500FC1E0C1508462 +:1007F800FDE4031004CEABAC6159018C0191DD0618 +:100808008C014C03DF03E6EF01F66061FB715101D7 +:100818008C014C0861F8CC010031320705A084FC3A +:10082800EF03F584FC4084FC11DC11F584FCF0C175 +:100838005003C15084FDE4031004EF12E6BC02F635 +:10084800614902DDB000000000617902EFF1CE37A6 +:1008580008CBE4FFFFCBE6FFF7CED4FFCF37000885 +:10086800F5120561FDF5ABFFFD7009D25008C150C6 +:1008780014FDA208C0D2FDA80B1004C6D73184BD50 +:1008880002EFFA717BBDCBE4FFFFCBE6FFFFCBD4D1 +:10089800FFFF717ABED7717BBED7C7C1200CFBF8AA +:1008A800FF8C0C318E31ADC1317B9DD4C0BC068D1F +:1008B800D49C088C149C0B8C14318E040C00128C64 +:1008C8000B318EBDD813FD7A0F61C8ED6B09CEAB25 +:1008D800ACCC05068C0B318EFD1B0AD2DD158C0BBA +:1008E800318EFD1F0A6169058C05D1DFE7FD9E0881 +:1008F800E2EF71CC0A008C0A4C04DE54F6BC0230DC +:1009080022F9BBAC06148C089EFD118972AB1462E7 +:1009180099AC06A1BC06617900617902F0E16149F0 +:1009280002DFE05040C18C0B318E31AD128C0A31A0 +:100938008E318D03BDD831FFBDDADADAADD8FDEBE3 +:100948000CC0D2DD06FD9E08E2EF1961590AEFA638 +:100958008C0B318EFD230AD2DD03E2EF0761590BC0 +:10096800EDBF08F2100EC6D7C7717B9D717BFAFDEB +:1009780085083022F9FDCE0AFD590AC6D7FD70094F +:10098800FDA80BFD9E08F5ABFFF2D7C7D56CFDDDC2 +:1009980005B06CFDEF7BCF6CFD02311407067110BA +:1009A800E7FBEF047118E7FB8FE7FB7F32FD76D199 +:1009B800DD5F8FE7FB9F32FD401EF903DF25665C94 +:1009C80010D1DD1F7122208FE7FB5C10D1DD0B50A9 +:1009D80080C15011FD0538C0EF095040C15011FDCC +:1009E8000538C0401EF903DD06401EF904DF226603 +:1009F8005C02D1DD1C8FE7FB5C02D1DD0B5040C1EE +:100A08005010FD0538C0EF095020C15010FD0538C1 +:030A1800C0C6D77E +:100A1B005208EF065203EF025206FEE600FE1B00E1 +:100A2B00DC16089F03088F0408089F040862FE2445 +:100A3B0000089F0408EEBF00EEBA00C1C514410EBA +:100A4B0011D9D0FF118FD1FF312E45C4C0D7F23150 +:100A5B00A2C401E2D79DE261DD4C09DF12717BFA82 +:100A6B00C18F06089F7DFDC0CF060800EE27003121 +:100A7B00F2FA04CF0608004C00DF05D50008DD169E +:100A8B0061DD717BFAD50608DD0ACDE31F61CD610F +:100A9B00CDEE160061CDFED40061FFFE9A00FCF88E +:100AAB00FF0EFEB20061CDFED5004C09DF0EC18FEB +:100ABB0006086F7DFD9F0608C0EE0400CF060800F8 +:100ACB00F8E3D75200EF025202FE3700CF7CFD0055 +:100ADB00CF060800BF0408C716629F00084100112B +:100AEB008F8C229B4100118F8D229F0108C65100D4 +:100AFB00FE62FFEF025205CF060800C1510CFE0A41 +:100B0B0000C0D7C1511DFE0200C0D761DD717BFA59 +:100B1B0070CEC0A59EC47CFF9EC4609EC461CDD721 +:100B2B0061DD717BFAC18EC45C1BFED6FFCF06085C +:100B3B0001FED7FFC061CDD731F2FA1AC1AEE4BFC7 +:100B4B006EFDAEE6BF70FDAED4BF72FD30FFFFBED3 +:100B5B00E4BEE6BED4C0D731F2FA11C1AF6EFDBE12 +:100B6B00E4AF70FDBEE6AF72FDBED4C0D7C1BF749B +:100B7B00FD13BF76FD15BF78FD17BF7AFDC0D7AF4C +:100B8B0074FDDB76FDEB78FDFB7AFDD7534B3052D2 +:100B9B005430324E323030475631323000FFC15074 +:100BAB00FEFEAB0061DD717BFACF060800FE0A008A +:100BBB00FEA4FF61CDF8E3EECF00C7FB0408BF6EC8 +:100BCB00FD8FC0009C05C5C337040600BF70FD3503 +:100BDB00360D0C300000522BFE6600C2C4C630BB73 +:100BEB000BB800300000B8022004AF70FDB8003025 +:100BFB000F00B802AF6EFD61FF520AFE3AFFECF830 +:100C0B00FF0E717BFAC1C7FB04088C05C65C80FE26 +:100C1B000200C0D761DD717BFA70CFC0FFA59FC00A +:100C2B00007CFF9FC000609FC00061CDD7618BFE31 +:100C3B00E2FF717BBE410011FB000017CEFC00618F +:100C4B00CB089EFDF31161C999A58392DFF7D7FEFF +:100C5B00B1FED57CFDDF23C1CF0308035109FEF4A0 +:100C6B00FDC0D2DF37FE3800A20408CF03080751BE +:100C7B0009FEE1FDD2B20408DF22C7FB0408318371 +:100C8B0002C6D7C6510AFECCFD624C1FDF06CF7CD5 +:100C9B00FD01EF04CF7CFD00C0EE5BFEC0EE55FE08 +:100CAB00C7C1FB04088B31196C0161589BC0C6D7B7 +:100CBB00717BFAFE4DFEAF0408040600C114361F0B +:100CCB000C300000522DF3FE77FF8FC000FE2BFE81 +:100CDB0061CF5C807C8073C0041900CEFC0F61CBAC +:100CEB00C55404EF03C55417FE18FEC7360008BBE6 +:100CFB00629C0288089C03D1DD334C41DE2F70F1DE +:100D0B00312DB161090033081C000851FF612A41E4 +:100D1B000E118FD0FF613B118FD1FF6138DC0E8B31 +:100D2B005C03DF0964C6C4FE2BFDEECAFDC6C4EE30 +:020D3B00C3FDF6 +:100D3D0061CF5100718C7109FECBF800FEFC9E0154 +:100D4D0000F6BF00F953C0F693935820FEDFF9412A +:100D5D000036B44F3434FDEF05118B99A7A5174418 +:100D6D00EE4FDFF53602F93034FDEF04CC0000A76D +:100D7D0047DFF9410036EE4F346EFDEF05118B99CB +:100D8D00A7A51744EE4FDFF5366EFD306EFDEF046F +:100D9D00CC0000A747DFF9FCD80000EFFE61DD7144 +:100DAD007BFABEF0ADD8BEF200AEF661CDD7C36111 +:100DBD00DD717BFABEF0ADD8BEF200DBF6FFADDC27 +:100DCD00BEF000AEF6BDD8AEF40312ADDABEF20041 +:100DDD00AEF661CD03BDDAC2D7C3F33174D9088342 +:100DED00C1F626D8BDD8C031750683C312F623C20D +:100DFD00FD080E93DF0312F623C2D7440000DD2653 +:100E0D0061DD717BFACFE80080BEF6F6BEF4BEF26E +:100E1D00ADD8BEF0CFE800818FE8003103FAAEF017 +:100E2D00F5E80061CDD7B1D7C3F33174D90883C1CB +:100E3D00F626D8BDD8C0317505C312F623C2FD56AE +:100E4D000E93DF0312F623C2D7440000DD2761DDC8 +:100E5D00717BFACFE80080BEF6F6BEF4BEF2ADD8D7 +:100E6D00BEF0CFE800818FE8003103FAAFE000F566 +:100E7D00E80061CDD7ADD8D7C3F33174DB0F83C193 +:100E8D00F626D8BDD861317026DABDDAC031750DC0 +:100E9D0083C312F626DCBDDC61317023C2FDBE0EAC +:100EAD0093DF0CF626D8BDD861317026DABDDAC2D3 +:100EBD00D7C161686BDC6BDDC0DD2F61DD717BFA45 +:100ECD00CFE80080BEF4ADDCBEF6ADD8BEF0ADDA35 +:100EDD00BEF2CFE800818FE8003103FAAEF0BDD845 +:100EED00AEF2BDDAF5E80061CDD7F6BDD8BDDAD7E3 +:100EFD008292DD2B61DD717BFACFE80080BEF0F6CA +:100F0D00BEF2BEF46208BEF6CFE800818FE8003174 +:100F1D0003FAAFE0006072AEF0F5E80061CDD76086 +:100F2D0072F6B1D706DABDDAADDC06D8BDD861D818 +:100F3D00A6DAD7D1DD17C1C3DAD89DD8ADDA311C09 +:100F4D0061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD9C +:100F5D001BC1C3DADA9DDAADD8311E33311E3371C0 +:100F6D00F9B4DADFF4BDD813BDDAC2C0D746D8DD87 +:100F7D000771FF7177D971C0D746DADF08C1ADDCD3 +:100F8D0046D8C0DD077177DB71FF71C0D75BDB9D84 +:100F9D00DB605BDA9DDAADDC5BD9085BD808BDD8C8 +:100FAD00D7C3C7F3728EFDC162314C4100369A4FE3 +:100FBD001161A072C09EFD62C6C2D7C3C7F3728E07 +:100FCD00FDC1625C0F0C000FFE00314C410036A4D8 +:0F0FDD004F1161800FFE0073C09EFD63C6C2D727 +:0A0FF60031333A35363A3333000048 +:0A20000031333A35363A333300002D :10200A00AEF0B430B740BA30BB50BBB0BC50BD1014 :10201A00BD60BDB0BFE0C2B0C420C7B0CAE0CE1038 :10202A0001F0141014200630639049006E00777096 @@ -315,75 +317,75 @@ :1023A800C0CF0BF91EEF0F7138E7FBE0C15011FDEC :1023B8000538C0F50BF9C6D7C78F34FD76FD012463 :1023C800D521F9DD05710320EF2D664F34FD61F845 -:1023D8003144201A714320FD3D05664C07DD038119 +:1023D8003144201A714320FD3E05664C07DD038118 :1023E800DF098F20F9310303FD7F24FDA424710246 :1023F80020302926FDAB3CC6D7C771620171720136 -:10240800E0FDA3025008FD1F3B629F02F95009FD41 +:10240800E0FDAD025008FD1F3B629F02F95009FD37 :102418001F3B6276716301713820F94002F9F1DCE3 :1024280005E521F9EF244002F904DE1BCF21F9026A -:102438005008C1506CFD4703C092DF0ED541FBDF49 +:102438005008C1506CFD4803C092DF0ED541FBDF48 :1024480009713020F9EF03F521F9CF34FD07570062 :10245800674C08DE1173091722614EDC06679F344A :10246800FDEF0387EFEA4034FD07DF09D521F96165 -:10247800F8CF21F903C6D7C7C1FBF8FF500AFDA35F +:10247800F8CF21F903C6D7C7C1FBF8FF500AFDAD55 :1024880002304000BB17C15002C15006C1506CFD5C -:10249800190410065096FDA302C0C6D7C72008FB32 +:102498001A0410065096FDAD02C0C6D7C72008FB27 :1024A800F8FF8F34FD5006D604CA2114F750068968 :1024B800A54804F9A390DFF7D521F961E8ED2526B1 -:1024C800304A57BB17C15002C1503EC1506CFD196C +:1024C800304A57BB17C15002C1503EC1506CFD1A6B :1024D800041006D2DD077100E6FBED25267108E63B -:1024E800FB17040300C15004C1500CC1506CFD71AE +:1024E800FB17040300C15004C1500CC1506CFD72AD :1024F800031006D934FDF10104F42114A9318D1219 :10250800A9318E616B08616A08BB17C15002C150BE -:102518000EC1506CFD19041006F690BB17C150028D -:10252800C1500CC1506CFD1904100631042102EF92 -:10253800FA7172208F34FDF0312E040A20C1501038 -:10254800C15040C1506CFD1904100631042102EF3E -:10255800FA7172208F34FDF0312E041A20C1501008 -:10256800C15050C1506CFD1904100631042102EF0E -:10257800FA7172208F34FDF0312E042A20C15010D8 -:10258800C15060C1506CFD1904100631042102EFDE -:10259800FA7172208F34FDF0312E043A20C15010A8 -:1025A800C15070C1506CFD1904100650A5FDA3025E +:102518000EC1506CFD1A041006F690BB17C150028C +:10252800C1500CC1506CFD1A04100631142102EF81 +:10253800FA7102218F34FDF0312E040A20C15010A7 +:10254800C15040C1506CFD1A04100631142102EF2D +:10255800FA7102218F34FDF0312E041A20C1501077 +:10256800C15050C1506CFD1A04100631142102EFFD +:10257800FA7102218F34FDF0312E042A20C1501047 +:10258800C15060C1506CFD1A04100631142102EFCD +:10259800FA7102218F34FDF0312E043A20C1501017 +:1025A800C15070C1506CFD1A04100650A5FDAD0253 :1025B800D934FDF10104F42114A9318D12A9318E09 :1025C800616B08616A08BB17C15002C1500EC15047 -:1025D8006CFD1904100650A5FDA3025004C1506CEF -:1025E800FD4703C0629C07E934FD0909224E0761D3 +:1025D8006CFD1A04100650A5FDAD025004C1506CE4 +:1025E800FD4803C0629C07E934FD0909224E0761D2 :1025F800C308E934FD0902224E0717040300C1503D -:1026080004C1500CC1506CFD19041006F6BB17C16B -:102618005002C1503EC1506CFD190410061008C686 +:1026080004C1500CC1506CFD1A041006F6BB17C16A +:102618005002C1503EC1506CFD1A0410061008C685 :10262800D7C7C1FBF8FF8F10F94F02F961F8EDE346 :10263800264012F928DE06A012F9EDE326F512F974 :102648008F02F99F10F98F02F95070D6123073512A :10265800230480001231FF318E039F11F99FE2FBA2 :10266800F6BB8F11F97C804C95DC1B8F11F9318FEB -:10267800241400BDD8AF06F9FDA90D1231FF318E23 +:10267800241400BDD8AF06F9FDAA0D1231FF318E22 :1026880003318FBBEF198F11F9318F241400BDD896 -:10269800AF08F9FDA90D1231FF318E03318FBBD977 +:10269800AF08F9FDAA0D1231FF318E03318FBBD976 :1026A80004F9F1610900BB44000171FEDC03F690F6 :1026B800BB8C0101DE02F6BBABABBF8EFC17C15071 -:1026C80002C1500CC1506CFD19041006D2DF088FEE +:1026C80002C1500CC1506CFD1A041006D2DF088FED :1026D80002F99F10F9EF047100E6FBF2C0C6D7C7F4 :1026E8002008FBF8FF4021F901DF0BCFE3FB63CFA4 :1026F800E5FBC8ED5A284021F902DF2C1704060033 -:10270800C15002C15004C1506CFD71031006D2DDE6 +:10270800C15002C15004C1506CFD72031006D2DDE5 :1027180006CFE3FB63EF0A8C069FE3FB8C079FE47D :10272800FBCFE5FBC8ED5A2817040600C15002C1CB -:102738005004C1506CFD71031006D2DD117100E622 +:102738005004C1506CFD72031006D2DD117100E621 :10274800FB710320F5E3FB712020F9ED2F288C069F :10275800318E318D080E07081C00BBD934FDF104F9 -:102768001022148972ABFDFC0EBB8C019C068B9C5D -:102778000717040400C15002C1C1506CFD71031059 +:102768001022148972ABFDFD0EBB8C019C068B9C5C +:102778000717040400C15002C1C1506CFD72031058 :1027880006D261E8ED2F288C049FE5FB8C04318E7E :10279800318D080E05081C00BBBDD8F6BDDAC9DCB2 -:1027A80001A5FD850FDC09CC0364F6BF14F9EF77AA +:1027A80001A5FD860FDC09CC0364F6BF14F9EF77A9 :1027B800ABBDD8F6BDDAAF14F9BDDCF6BDDEADD8D9 -:1027C800C1ADDAC1C9D800A0F6BDDAADDEFD300F63 +:1027C800C1ADDAC1C9D800A0F6BDDAADDEFD310F62 :1027D800ADD8BDDCADDABDDEC0BDDAC0BDD8ADDE7A -:1027E800FD850F61D309CC031EF6BF14F9EF38AB92 -:1027F800BDD8F6BDDAC9DC819DFD850FDC0BCC03A5 +:1027E800FD860F61D309CC031EF6BF14F9EF38AB91 +:1027F800BDD8F6BDDAC9DC819DFD860FDC0BCC03A4 :102808000A30F401BF14F9EF1EABBDD8F6BDDAC922 -:10281800DC019BFD850FDC0BCC030530F401BF14F4 +:10281800DC019BFD860FDC0BCC030530F401BF14F3 :10282800F9EF04712020F93132040D31140509CF74 :10283800E3FB64F5E4FBEF1A8C064E03DE0C8C0612 :102848009FE3FB8C079FE4FBEF088C039FE3FBF5FA @@ -398,52 +400,52 @@ :1028D80005715320EF3340E3FB0BDE03E6EF01F60F :1028E8006061FB71612071142071672061C83152E9 :1028F8002017715220716420711120F171642061D8 -:10290800DC70C15012FDCC05C01008C6D7C75007EF -:10291800C15002C15084FDE30310045012FDA3020C -:10292800500FC15002C15084FDE30310045003FD51 -:10293800A302501FC15002C15084FDE3031004508C -:1029480016FDA3025003C15084FD4703C0625C0119 +:10290800DC70C15012FDCD05C01008C6D7C75007EE +:10291800C15002C15084FDE40310045012FDAD0201 +:10292800500FC15002C15084FDE40310045003FD50 +:10293800AD02501FC15002C15084FDE40310045081 +:1029480016FDAD025003C15084FD4803C0625C010E :10295800D1DD107170E7FB5002C15013FD0538C07E -:10296800F2EF01E2C6D7C75004C15084FD4703C047 +:10296800F2EF01E2C6D7C75004C15084FD4803C046 :10297800625C03D1DD405014FD072A34E7FB895C13 :102988009F998A0C7CFF50FF5C14D1DD228A0C7C55 :10299800FF5C147234EBFB89616A99716207560017 :1029A800316207058666D1DFF7716307716B2734DB -:1029B800FAFB895CEB995002C15084FD4703C0D2F1 -:1029C800DD335017C15002C15084FDE3031004E009 -:1029D800FDA3025007C15002C15084FDE303100457 -:1029E8005033FDA302F0C15002C15084FDE303102F +:1029B800FAFB895CEB995002C15084FD4803C0D2F0 +:1029C800DD335017C15002C15084FDE4031004E008 +:1029D800FDAD025007C15002C15084FDE40310044C +:1029E8005033FDAD02F0C15002C15084FDE4031024 :1029F800047178E7FBE0C15013FD0538C0C6D7C79E -:102A0800C12004FBF8FFCC02005004C15084FD47EC +:102A0800C12004FBF8FFCC02005004C15084FD48EB :102A180003C0629C038C045C20D1DD0E8C036C0126 :102A28009C038C026C209C02EF138C045C10D1DD9B :102A38000C8C035CFE9C038C026C109C028C045C66 :102A480008D1DD0E8C036C029C038C026C089C027E :102A5800EF138C045C04D1DD0C8C035CFD9C038CAF -:102A6800026C049C028C03D1DD05501AFDA3028C74 -:102A78000370C15004C15084FDE30310048FE7FBC9 +:102A6800026C049C028C03D1DD05501AFDAD028C6A +:102A78000370C15004C15084FDE40310048FE7FBC8 :102A88005C9F728C03318E316D148C03318E314D05 :102A9800616D08616C5C606162629FE7FB8FF3FBAC :102AA8007CFF50FF5E02D1DD278FF3FB7CFF5E02C7 :102AB8007234EBFB89616A99716207CC010031625B :102AC80007086159018C01D1DFF4716307716B2725 -:102AD800F21006C6D7D9DBFBC15006C15084FDE30E -:102AE800031004D9DCFBC15007C15084FDE3031077 +:102AD800F21006C6D7D9DBFBC15006C15084FDE40D +:102AE800031004D9DCFBC15007C15084FDE4031076 :102AF80004D7FDDD2AF2D7711300711B207103037F -:102B0800710205E0C15003C15084FDE30310045075 -:102B180013FDA302F0C15005C15084FDE303100466 -:102B2800500FC1E0C15084FDE3031004500AFDA317 -:102B3800027103055008FDA302501FC1E0C1508473 -:102B4800FDE30310045012FDA3025003C15084FD9D -:102B58004703C0625C01D1DF02E2D75003C1C15014 -:102B680084FDE3031004710203711A20FDC72CF5DC -:102B78000AF9F2D75003C15084FD4703C0625C01D3 -:102B8800D1DD195014FD072AFD6E295014FDA3024A -:102B9800E0C15003C15084FDE303100471130071B8 -:102BA8001B207103035014FDA302F0C1E0C150843F -:102BB800FDE3031004F0C15003C15084FDE303108A +:102B0800710205E0C15003C15084FDE40310045074 +:102B180013FDAD02F0C15005C15084FDE40310045B +:102B2800500FC1E0C15084FDE4031004500AFDAD0C +:102B3800027103055008FDAD02501FC1E0C1508469 +:102B4800FDE40310045012FDAD025003C15084FD92 +:102B58004803C0625C01D1DF02E2D75003C1C15013 +:102B680084FDE4031004710203711A20FDC72CF5DB +:102B78000AF9F2D75003C15084FD4803C0625C01D2 +:102B8800D1DD195014FD072AFD6E295014FDAD0240 +:102B9800E0C15003C15084FDE403100471130071B7 +:102BA8001B207103035014FDAD02F0C1E0C1508435 +:102BB800FDE4031004F0C15003C15084FDE4031088 :102BC80004D7C72004FBF8FFCC02008F0AF99C0346 -:102BD8005010C150A4FD4703C0629F0AF9D541FBBC +:102BD8005010C150A4FD4803C0629F0AF9D541FBBB :102BE800DD04F2EDA42C8C037F0AF95C08D1DD101A :102BF8008F0AF95C08D1DF05CC0210EF03CC022064 :102C08008C037F0AF95C04D1DD168F0AF95C04D1C4 @@ -455,11 +457,11 @@ :102C6800F95C40D1DD095002C15012FD0538C08F12 :102C78000AF95C01D1DD08E0C15012FD0538C071C8 :102C88007AFA8F0AF95C41D1DD11340AF9895CBE00 -:102C980099D90AF9C15010FDCC05C0F21004C6D765 +:102C980099D90AF9C15010FDCD05C0F21004C6D764 :102CA800FD1529F2D7FD6E29F2D7C78FFAFB7617E3 :102CB800FD072A664FFAFBDFF2F5FAFBF2C6D7509A -:102CC80064FDA30240E3FB0BDE03E6EF01F660615F -:102CD800FB711120F171142061DC70C15012FDCC20 +:102CC80064FDAD0240E3FB0BDE03E6EF01F6606155 +:102CD800FB711120F171142061DC70C15012FDCD1F :102CE80005C0FDC939CF4BFC03D7710001057178C8 :102CF8005005713AD5713BD1713ADD713BD98F10CE :102D0800055CFC9F1005CF54054AE5420571104249 @@ -474,8 +476,8 @@ :102D980030028F11055CFC9F110571603002D771FC :102DA8007830027148F000D7C788061666614FDD93 :102DB8000967614EDE0396EF01866672C6D7C716AD -:102DC8001714AA0412A943DD29AA0412A923FDC0D5 -:102DD8004FC3AC02FDC04F13C2BDD813FD790FDE3F +:102DC8001714AA0412A943DD29AA0412A923FDEEA7 +:102DD8004FC3AC02FDEE4F13C2BDD813FD7A0FDE10 :102DE8000C1714AA0212AA0403BA04EF051714A9AF :102DF800BA04AC041231FF319E03317F087208C651 :102E0800D7C771201205712011057100F2003044F6 @@ -486,18 +488,18 @@ :102E58001020F94021F901DF06711820F9EF0B362F :102E6800100571A461D8711820F97128100571280E :102E78001105F6BE6EBE64BE6A7123047153078FD6 -:102E880020F9310507F501FCCB6CFF00713321C631 +:102E880020F9310507F501FCCB6CFF00714321C621 :102E9800D730EF00BFB401F6BFBA017108F2007174 -:102EA8002304715307715301D7714321D901FCF1F0 +:102EA8002304715307715301D7715321D901FCF1E0 :102EB800E7240000DD1223DD1923DD1123DD26239D :102EC800DD3423DD3923DD3FFD4C2FEF3DFD902F11 :102ED800EF38D900FCC1AE6CFDB02DC0F313BE6C49 -:102EE800712321EF25F0C1AE6CFDB02DC0F313BEE8 -:102EF8006C712321EF14F6BE6C712221EF0CCB6CA0 -:102F0800FF00712321EF03FD0D308F20F9311508E3 -:102F1800712421712104EF0671242171510131447A -:102F280021218F20F9311510F6BE64BE6A312421A3 -:102F38000390EF01F6BE6ED731242104F690EF011D +:102EE800713321EF25F0C1AE6CFDB02DC0F313BED8 +:102EF8006C713321EF14F6BE6C713221EF0CCB6C80 +:102F0800FF00713321EF03FD0D308F20F9311508D3 +:102F1800713421712104EF0671342171510131544A +:102F280021218F20F9311510F6BE64BE6A31342193 +:102F38000390EF01F6BE6ED731342104F690EF010D :102F4800F6BE6AD7CF3CFD47F5A8FBAE6C317DBF16 :102F5800AEFBFDE22FD2DF2F401EF903DF1BA0B02E :102F6800FB40B0FB02DC20F5B0FBD900FCC1AE6C25 @@ -505,16 +507,16 @@ :102F8800B02DC0F313BE6CD7FDE22FD2DD0FCF3CBE :102F9800FD47F5A8FBAE6C317DBFAEFBD7E9A8FBBA :102FA8000924225080D6BFAAFB22AEFBBDD83047E9 -:102FB80000FDE50DBFACFB30AAFBFDC62DF313BE2B +:102FB80000FDE60DBFACFB30AAFBFDC62DF313BE2A :102FC8006CB03CFDD53CFDDF10CF3CFD47A0A8FB15 :102FD80040A8FB1F61C8F5A8FBD740E3FB0BDC0545 -:102FE800712321F2D740E3FB0661D831120511F0B5 -:102FF800C1AE6CFDB02DC0F313BE6C712221EF037E -:10300800FD0D30E2D7714221F0C1AE6CFDB02DC08C +:102FE800713321F2D740E3FB0661D831120511F0A5 +:102FF800C1AE6CFDB02DC0F313BE6C713221EF036E +:10300800FD0D30E2D7715221F0C1AE6CFDB02DC07C :10301800F313BE6CA0B1FB40B1FB40DC3DF5B1FB46 :10302800D9B2FBF1313F0438FD14D9B2FBF1BDD858 -:103038005008FD340E087208E6D2DD040192DFFC68 -:10304800896158D1DD05712221EF03712321A0B2D6 +:103038005008FD350E087208E6D2DD040192DFFC67 +:10304800896158D1DD05713221EF03713321A0B2B6 :10305800FB40B2FB2061C8F5B2FBD78FB3FBB0B31E :10306800FBD1DF7331D4D106715BD1E5B5FBD5B5A2 :10307800FBDD347140E6FBD9B4FBF1E734020023F1 @@ -523,29 +525,29 @@ :1030A800B5FBCFB3FB19D7CFB3FB1E7148E6FBD5F1 :1030B80002FCDF04F6BE66D7D900FCF14266FFDDEC :1030C80016D900FCF112AE6643DE05A266FFEF03D7 -:1030D800B266FFCFB3FB03D731442101D7401EF9B5 +:1030D800B266FFCFB3FB03D731542101D7401EF9A5 :1030E80002DF10F6BE64BE6EBE6ABFBEFBBFC4FB85 -:1030F800BFCAFB31342139F6BFBAFBBFC0FBBFC61C +:1030F800BFCAFB31442139F6BFBAFBBFC0FBBFC60C :10310800FB22BEFB1231FF31AE03316FBFBCFBF6B1 :1031180022C4FB1231FF31AE03316FBFC2FBF6226E :10312800CAFB1231FF31AE03316FBFC8FBEDFC3172 -:103138003164210E710806FCCFB7FB1FF5B6FBED15 +:103138003174210E710806FCCFB7FB1FF5B6FBED05 :10314800FC31D5B6FB61E8EDF9318F44FB9FB6FB46 -:1031580040B7FB1FDC2631642108716321F5B7FBFA +:1031580040B7FB1FDC2631742108717321F5B7FBDA :10316800EF2C710006FC4046FBFFDD22A0B8FB8F68 :1031780046FB4FB8FBDE17F5B7FBEF12D9B7FBF1EB :10318800A1605C1F9FB7FB710806FCF5B8FBE9B7A7 :10319800FB0948FB5080D6BFBAFBE9B7FB0968FBBF :1031A8005080D6BFC0FBE9B7FB0988FB5080D6BF6B :1031B800C6FBAFBAFB22BEFB12D945FBF133BDD823 -:1031C80013FDE50DBFBCFBAFC0FB22C4FB12D94504 -:1031D800FBF133BDD813FDE50DBFC2FBAFC6FB2223 -:1031E800CAFB12D945FBF133BDD813FDE50DBFC8A5 +:1031C80013FDE60DBFBCFBAFC0FB22C4FB12D94503 +:1031D800FBF133BDD813FDE60DBFC2FBAFC6FB2222 +:1031E800CAFB12D945FBF133BDD813FDE60DBFC8A4 :1031F800FBB0B6FB8F20F931151F30C6FBFDC62D7D :10320800F313BE6430BAFBFDC62DF313BE6E30C097 :10321800FBFDC62DF313BE6AD730C6FBFDC62DF3E2 -:1032280013BE6AD7C73152210BD5CCFBDD06B0CC13 -:10323800FBEDF332715321D903FCF1E7240000DDE3 +:1032280013BE6AD7C73162210BD5CCFBDD06B0CC03 +:10323800FBEDF332716321D903FCF1E7240000DDD3 :103248000F23DD1B23DD1123DD5723DD2923DD3B80 :103258005600F53DFDEDDF325601F53DFDEF78D521 :103268003DFDDF075601E53DFDEF055600F53DFD47 @@ -561,15 +563,15 @@ :103308009F80F594FFF593FFF592FFE597FFE5960B :10331800FFE595FFE598FFCE9C7F7100DAFB711BF6 :10332800E3712BE3711AE7712BE7717A9D710A9E9D -:1033380031929E02EFFA710B9E7173217103227113 -:103348001322C6D7C73172211E717221710A9E31AC +:1033380031929E02EFFA710B9E7103227113227172 +:103348002322C6D7C73102221E710222710A9E317A :10335800929E02EFFA3408FC3692FF52078B99A529 -:10336800A792DFF9710B9EC6D7C7880616310222CD -:1033780015710222C734CEFB3092FF1652078B9983 +:10336800A792DFF9710B9EC6D7C7880616311222BD +:1033780015711222C734CEFB3092FF1652078B9973 :10338800A5A792DFF9C666736718CEFBC6D7C771C3 -:1033980073213104221E710322710A9E31929E020A +:1033980003223114221E711322710A9E31929E0259 :1033A800EFFA3492FF36CEFB52078B99A5A792DF2E -:1033B800F9710B9E31142213711322717B9E8F10A9 +:1033B800F9710B9E31242213712322717B9E8F1089 :1033C800FC9E9A8F11FC9E9B717A9EC6D7CFDBFB21 :1033D8005CCFDCFB5FCFFCFB20CF30FC36CF31FC71 :1033E800C9D7C7CFD8FB11CFD9FB0CCF00FCFFF54D @@ -591,7 +593,7 @@ :1034E8000061F8EDFE3624120061F8ED1B37236108 :1034F800F8ED0937ED4B37679FDAFBED553730FAB2 :103508002AFDAB3C66736718D8FBED553740DDFBE9 -:103518006ADF1440DEFB68DF0E674C6CDF09306041 +:103518006ADF1440DEFB68DF0E674C6CDF09308F12 :1035280045FDAB3C713AD5679FDFFBED553767D159 :10353800DD0630B740FDAB3C34F8FB89616F99ED8F :103548005537675C02D1DD0830A82CFDAB3CEF0C89 @@ -609,22 +611,22 @@ :103608005537675C0F7266736218D8FBED55374003 :1036180018F964DE1F4018F901DF0667D161F85711 :1036280001E918F9671844FBA018F94018F9056171 -:10363800C8716221675C7F70C117F1243000FD7189 +:10363800C8717221675C7F70C117F1243000FD7179 :1036480033C0ED5537675C3F70C117F1243000FD7A :103658007133C0ED5537675C0770C117F12430002E :10366800FD7133C0ED5537675C1F70C117F1243009 :1036780000FD7133C0ED55376770C117F124300074 :10368800FD7133C0ED5537CEABAC710A9E31929EB9 :1036980002EFFAD592FFDF05710B9EEFED679E9959 -:1036A800710B9E9F0FFCED5537711222675C7F9F4F -:1036B80010FCED5537711222675C3F9F11FCED55E8 +:1036A800710B9E9F0FFCED5537712222675C7F9F3F +:1036B80010FCED5537712222675C3F9F11FCED55D8 :1036C80037675C3F9F12FCED5537675C1F9F13FC03 :1036D800EF7B30A93EFDAB3C679F18FCEF6F306471 :1036E8003EFDAB3C679F19FCEF6330863EFDAB3C6B -:1036F800679F1CFCEF57675C01D1DD51FD6848EFFF +:1036F800679F1CFCEF57675C01D1DD51FD9748EFD0 :103708004C4032FCC8DE46E932FC671872FAA03237 :10371800FCEF3A679F32FCEF3467318E247200DF8A -:1037280006308409FDAB3C679FFBFBEF208FFEFB57 +:1037280006308509FDAB3C679FFBFBEF208FFEFB56 :10373800617F5C10D161E8CF4BFC03679FFEFBEF14 :103748000CEF0A664C5ADE05736718D8FBC6D7C754 :1037580016664C30DC094C37DE05FD4C33EF6766E6 @@ -632,71 +634,71 @@ :103778008E316D08616A08128F39FC5C80312A61CC :1037880062EF49664C3DDF0AAE90BF34FCF934FC69 :10379800EF3A664C3EDF05F935FCEF30664C4FDFFB -:1037A80005FD8C48EF26664C61DF09E932FC097299 +:1037A80005FDBB48EF26664C61DF09E932FC09726A :1037B800FA72EF18664C7FDF0D303141FDAB3C717A :1037C8003AD5524AEF06667309D8FB72C6D7C7883E :1037D800061617F1241000240500DC07244C00DD30 :1037E80017EF18717BFA17F104D8FB1489617F99D8 -:1037F800717AFA712222EF03A032FCC6D7C7C1C181 +:1037F800717AFA713222EF03A032FCC6D7C7C1C171 :10380800FBF8FF401EF903DD06401EF904DF2F8C8C :10381800027309E0FB5E0AD1DF248C02318E04D8E2 :10382800FB14896E0A99716207CC0100316207089E :103838006159018C01D1DFF4716307716B271004A2 :10384800C6D7CF39FC03F537FCF53BFCF53DFCD773 :10385800C788061617F1E734020025DD3E23DD1878 -:1038680025DD1D23DD0523DD2CEF3C715222679FEA +:1038680025DD1D23DD0523DD2CEF3C716222679FDA :103878003CFCCF4BFC03EF2F675C839F39FCEF27A1 -:10388800675C039F3BFC675C034C0261F871522143 +:10388800675C039F3BFC675C034C0261F871622133 :10389800FD2C32EF12679F3DFCEF0C6791DF08E0CB :1038A800C15012FD0538C0C6D7C71617F1E7240066 :1038B80000DD3A23DD23240300DD0C240200DD2291 :1038C80024F900DD2FEF3031020705308000EF01C9 :1038D800F6086F3AFC7208EF248F37FCF537FC7254 -:1038E800EF1B8F45FC9F46FCF93CFCEF107142230F +:1038E800EF1B8F45FC9F46FCF93CFCEF10715223FF :1038F8005235EF09F2EF0666730936FC72C6D7C770 :103908001617F1E7240000DD38241000DD1C23DD44 :103918001C23DD30240E00DD18241100DD1B240FCC :1039280000DD12243000DD15EF1EE2EF1D5202EF1C :10393800195204EF155206EF115205EF0D5207EF19 -:1039480009F2EF065203EF0252FFC6D7C7313422FD -:10395800417133228F4AFC9FE0FB8F49FC9FFFFB9C +:1039480009F2EF065203EF0252FFC6D7C7314422ED +:10395800417143228F4AFC9FE0FB8F49FC9FFFFB8C :103968003644FDC7D949FCFD503B618A70618AFD28 :10397800953BC0D94DFCF1312F609F4CFC8F48FC22 -:103988004F4CFCDD0D7142228F4CFC9F48FCCF4B05 +:103988004F4CFCDD0D7152228F4CFC9F48FCCF4BF5 :10399800FC03404BFC05DE0A30D639FDAB3CCF4B6F :1039A800FC6BB04BFC7150F000CE300BCF1700060B -:1039B800CE3106FD2303717A30710BE3710BE7C634 +:1039B800CE3106FD2103717A30710BE3710BE7C636 :1039C800D78F4CFC9F48FC8F4CFC9FE1FBD7C7402E :1039D8001EF903DF06401EF904DF04F2EDCB3A8F2F :1039E800FEFB5C10D1DD0C8F4CFC9F51FC7148FE36 -:1039F800FBEF61314422247143227163228FFEFB65 +:1039F800FBEF61315422247153227173228FFEFB35 :103A08005C04D1DD088FFDFB9F52FCEF068F4CFC58 -:103A18009F52FC8F52FC9F51FCEF39315422237185 -:103A28005322716222D53CFCDF05F553FCEF0B8F66 +:103A18009F52FC8F52FC9F51FCEF39316422237175 +:103A28006322717222D53CFCDF05F553FCEF0B8F46 :103A38003CFC5002D6A1609F53FC8F53FC9F51FC65 -:103A4800EF12316422088F53FC9F51FCEF068F520E +:103A4800EF12317422088F53FC9F51FCEF068F52FE :103A5800FC9F51FC8F51FC9FE1FBD551FCDF05F524 :103A68003CFCEF1A4051FC05DE06CF3CFC02EF0E91 :103A7800D951FCF11231FE03311F609F3CFC8F5578 :103A8800FC4F3CFCDD23571F8F3CFC9F55FC560028 :103A9800664C08DE10730984224F3CFCDC04667710 :103AA800EF0386EFEB679F45FC8FFEFB5C01D1DDE2 -:103AB80003F2EF0FE951FC09442270C15013FDCC09 +:103AB80003F2EF0FE951FC09442270C15013FDCD08 :103AC80005C0F2C6D7C7168B728C01614ADE248BFB :103AD800728C02614ADE188C01728C02614ADE0621 :103AE8008C01318EEF048C02318E087208EF268B20 :103AF80072EF228B728C02614ADE048B72EF168C95 :103B080001728C026142DE068C01318EEF048C0258 :103B1800318E087208C6D7C716710AE7710BE371B0 -:103B280050F000CE300BCF170006669E31FD230300 +:103B280050F000CE300BCF170006669E31FD210302 :103B3800717A30710BE33182E302EFFA8D1F71580D :103B4800F000710BE772C6D7C7C1C1FBF8FF8F3011 :103B5800FC4E02DC03F2EF318C024F31FCDC0452E4 :103B6800FFEF268C022F30FC706131318D128F31BE -:103B7800FC2F30FC70613133BDD813FD070EBB44F8 +:103B7800FC2F30FC70613133BDD813FD080EBB44F7 :103B88000001DC03F690BB8B721004C6D7C7C1C115 :103B9800FBF8FFAC0A14A91489708C0261287061C3 -:103BA80031FDC04F1344030071FEDC24AC0A148AB3 +:103BA80031FDEE4F1344030071FEDC24AC0A148A85 :103BB80004819A04AC0A148A044C11DC11A9148CEF :103BC8000299AC0A14CA0200AC0A14CA0310EF74B2 :103BD800AC0A14CA0400AC0A14A914894E02DE0AFD @@ -707,8 +709,8 @@ :103C280017AC0A148A024CF0DF0EA91489318EB140 :103C380012AC0A14A9146299AC0A14CA0200AC0A9C :103C480014CA03101004C6D7ED963C717BFAC7D589 -:103C580060FC61F831742230717422711123717320 -:103C680022D560FCDD06B060FCCEABAC717AFA56AA +:103C580060FC61F83104233071042371212371035E +:103C680023D560FCDD06B060FCCEABAC717AFA56A9 :103C780000664C0ADD1272F3311C794AFDCEFC0055 :103C880061CAFDF53C86EFE9717AFAF2C6D7C756E4 :103C980000664C10DE0BF0317E12F67862FC86EF7F @@ -732,294 +734,297 @@ :103DB800F0317E337862FC8C01F0317E12E6786255 :103DC800FC615902717AFA615901EF98615902ED63 :103DD800513D00F21004C6D7C72006FBF8FF341D7A -:103DE800FCC55006C150A8C15030FD71031006D261 +:103DE800FCC55006C150A8C15030FD72031006D260 :103DF800DD1DA082FC4082FC08DE03E2EF5A341885 :103E0800FC895CFC99FDA93E7110E6FBF2EF49F5CF :103E180082FC8F18FC5C01D1DD26401EF903DF20EF :103E28005010C180FD0538C0C736100571D4C6DEF4 -:103E38000F17C15006C150A8C15030FD71031006BC +:103E38000F17C15006C150A8C15030FD72031006BB :103E4800401EF901DD11401EF905DD0B8F18FC5CE1 -:103E580002D161E8FD6545F21006C6D7D919FCC143 -:103E68005030FD4703C0629F1CFC7130E9FB8FF1A5 +:103E580002D161E8FD9445F21006C6D7D919FCC114 +:103E68005030FD4803C0629F1CFC7130E9FB8FF1A4 :103E7800FB5C08D1DF06716307716B27F2D7D91C89 -:103E8800FCC1D91BFCC15030FDE30310047130E9BB +:103E8800FCC1D91BFCC15030FDE40310047130E9BA :103E9800FB8FF1FB5C08D1DF06716307716B27F2BA -:103EA800D7C7200AFBF8FF500FC15030FD4703C0A9 +:103EA800D7C7200AFBF8FF500FC15030FD4803C0A8 :103EB8004041FB02DF077110E6FBF2EF547118E690 :103EC800FBCC0700CC0812CC09808F18FC5C03D10E :103ED800DF08717AD5CC0607EF06717BD5CC062FA3 -:103EE80017040600C15004C150A0C15030FD190488 +:103EE80017040600C15004C150A0C15030FD1A0487 :103EF8001006C736100571D4C6DE15401EF903DF5B -:103F08000F17C15006C150A8C15030FD71031006EB +:103F08000F17C15006C150A8C15030FD72031006EA :103F1800F2100AC6D7C7401EF902DF04F6BF86FCB6 :103F2800B05EFDD55EFD61E8ED2D40CF5EFD048FEE :103F38001EF9318FE723DD0B24020024030061C83A :103F4800ED2D403028004286FCDF0AE0C15010FD0C :103F58000538C0EF2530FA004286FCDF0B5002C15D :103F68005010FD0538C0EF128FFCFB5010D604FA34 -:103F7800004286FC61D8712020F931340709712389 -:103F880023F6BF86FCEF1731242306F6BF86FCEF25 +:103F7800004286FC61D8712020F931340709713379 +:103F880023F6BF86FCEF1731342306F6BF86FCEF15 :103F98000DA286FCF64286FCDF04B1BF86FC8F21A9 :103FA800F9318FE7240000DD0623DD0D23DF12360B -:103FB800100571C4713123EF0B710402713123EFC5 -:103FC800037132233132231A4088FC0361D8A08858 +:103FB800100571C4714123EF0B710402714123EFA5 +:103FC800037142233142231A4088FC0361D8A08838 :103FD800FC4088FC02DF0E5004C15010FD0538C0BB -:103FE800EF03F588FC3134231A408AFC0361D8A01A +:103FE800EF03F588FC3144231A408AFC0361D8A00A :103FF8008AFC408AFC02DF0E5008C15010FD0538CB :10400800C0EF03F58AFC314207184089FC0361D8E8 :10401800A089FC4089FC02DF0C5010C1FD0538C0A6 :10402800EF03F589FCC6D7C736100571D4DE073013 :10403800E03DFDAB3CD2401EF903DF4131220706CB -:1040480030CA2BFDAB3C3144230C7143235080C153 +:1040480030CA2BFDAB3C3154230C7153235080C133 :104058005012FD0538C0D58CFCDD05B08CFCEF1D79 :10406800CF8CFC068F39FC5C01D1DD118F45FC4FEC :1040780046FCDD095040C15012FD0538C0401EF90C :1040880003DD05F6BD1AEF25D504FCDF09F6461A4F :10409800DD1BB61AEF17D900FCF1461ADD0FD9005F :1040A800FC12AD1A43DE04A61AEF02B61AC6D7C729 -:1040B8008FF8FB76F5F8FB5C10D161E87152236646 +:1040B8008FF8FB76F5F8FB5C10D161E87162236636 :1040C8005C0FD1DD61665C01D1DD05F51EF9EF56A7 -:1040D800665C02D1DD15E0C15003C15084FDE303E5 +:1040D800665C02D1DD15E0C15003C15084FDE403E4 :1040E8001004711300711B20710303665C08D1DD95 :1040F80005710303EF17665C04D1DD1171130071BC :104108001B20D539FC61F8710303F539FC5005FD16 -:10411800A3027102035003C1C15084FDE3031004DC +:10411800AD027102035003C1C15084FDE4031004D1 :10412800711A20FDC72CF2C6D7C7364105718461C4 :10413800D8EDD5413641057194DE0771405005CE62 :10414800ABAC31B2D104E2EDE441713BD1CEABACC2 :104158004018F909DE77D518F9DF618F20F9313376 :10416800088F21F99F4005EF04CF400504F0C150A6 -:1041780084FD4703C0629F90FC8F34FD9F91FC36FD -:1041880092FCC75002C15008C1506CFD7103100663 +:1041780084FD4803C0629F90FC8F34FD9F91FC36FC +:1041880092FCC75002C15008C1506CFD7203100662 :104198008F8EFC9F94FC8F02F99F95FC713420E66A :1041A80061301271042061DC31196162629F96FCF2 :1041B8008F20F93169317A9F97FCEF0BD918F9F103 :1041C80012498FFC9F4005A018F9E2EF0F7160506B -:1041D8000571485005713BD5F518F9F2C6D7C78F58 -:1041E8001EF9318FE724000061F8EDB74323DD1B8A -:1041F8002361F8EDBE422361F8ED3C432361F8EDFD -:1042080085432361F8ED5444EDB743D51FF9DF2BFF -:10421800F64286FCDD05F560FDEF03A060FD406019 -:10422800FD65DC09F51EF9717222EDD444AF86FCF8 -:10423800440A0061D8EDD444E51FF9712223F560E2 -:10424800FDF5FBFBFD3D05714320FDC0234021F931 -:1042580003DF09717222F51EF9EDD444FDE726400B -:10426800E5FB9BDE09717222F51EF9EDD444714A13 -:10427800277140110571301105713A22715A227166 -:104288001A2EFDFF2AD2DD09717222F51EF9EDD42E -:104298004471103500CF37001D71401205401FF9D9 -:1042A80001DF05F501FCEF04CF01FC03CF1EF90285 -:1042B800FDDD2AEDD444FDF22CFD522D714A9DFD01 -:1042C8004A38FDEA33F537FF712BE0F51FF97172B3 -:1042D80022CBE43FEFCBE6F6F0FD3D05713BD48FF2 -:1042E80020F93105305004C15084FD4703C0625C99 -:1042F80003318E315D34E7FB896168995002C15002 -:1043080084FD4703C0D2DD067170E7FBEF047178C6 -:10431800E7FBFDC023FD092E710820F9CF1EF90324 -:104328008FDAFB5C02D1DD095080C15010FD0538E1 -:10433800C0EDD444FDD64431A4E020712BE0310215 -:104348000C05FD5045EF145027C15005C15084FDA0 -:10435800E3031004CF1EF9047172223154230BA019 -:104368009AFCD59AFC61F8FD5045FD43458F20F92C -:1043780031450731040703F51EF9EDD444FDD64451 -:1043880031020C18F0C15005C15084FDE30310043C -:104398005005FDA302FD5045CF1EF903FD43458F8F -:1043A80020F931450731040703F51EF9EDD444F52A -:1043B8001EF9CF01FC03F502FCF504FC713221F66D -:1043C800426CFF61E8EDD444712820F9F518FCFD32 -:1043D800A93EFD992EFD492DFDA72D714B9DF5E8B0 -:1043E800FBF5E9FBF5EAFBF5EBFB31042102EFFAFB -:1043F800CE3708CBE4BFFFCBE6FFF1CED4FFCF37F3 -:10440800000971481205F6BEE0BEE2BED0716A2707 -:10441800FD7C2B714307714B2771481005714811BA -:10442800057138100571381105713302713B22711D -:104438005302715B2271130E711B2EFDA605F560E8 -:10444800FDCF1EF905712223F6BF86FC3102072C29 -:10445800FDC023AF86FC440A00DC06E51FF9E51E13 -:10446800F9D521F961E8FDA6058F20F931455D50A0 -:104478002EFDA302E51FF9E51EF9EF50D50BF9DF74 -:104488004BF51FF9FDA605FD8523717301713204F3 -:1044980031120502EFFA7143027103207142203193 -:1044A800949E02EFFA712AE7CEA409F5F30061FDA4 -:1044B80031040703712323E5F300CEA408712BE729 -:1044C800E51EF98F20F9314503F51EF9C6D7D59BAE -:1044D800FCDF1E310200195003C15084FD4703C0A0 -:1044E800625C01D1DF07F51EF9717222D7E59BFCEA -:1044F800D7409BFCF0DF083104003FF59BFCD74018 -:104508009BFCC8DF0BF51EF9717222CF9BFCF0D71C -:1045180031020004A09BFCD7F0C15004C15084FDB7 -:10452800E30310048FE7FB5C9F9FE7FB7110F8FB28 -:1045380030B740FDAB3CCF9BFCF0D78F20F931253D -:1045480006F51EF9717222D7715323F59AFC717220 -:1045580007FD2303717307D7FD1306F2D7C7200C95 -:10456800FBF8FF8F1EFCF0F91DFCF303FDC04F1391 -:10457800BC048F20FCF0F91FFCF303FDC04F13BCF3 -:10458800028F22FCF0F921FCF303FDC04F13BBACF2 -:1045980004BDD8F6BDDAAC04311EBDDCF6BDDEFDC7 -:1045A800BA0DADD8BDDCADDABDDEAC02BDD8F6BD06 -:1045B800DAAC02311EDADCC3DADEC3BDDCF6BDDEFE -:1045C800FDBA0DC0BDDEC0BDDCADDEFD300FADD81F -:1045D800BDDCADDABDDEABBDD8F6BDDAAB311EDA77 -:1045E800DCC3DADEC3BDDCF6BDDEFDBA0DC0BDDE60 -:1045F800C0BDDCADDEFD300FDADAADD8FDB649C39B -:10460800C58F28FD5C3FF0317E04A8FC14C2C0B9F8 -:10461800A028FDF6BC08BC0A9C078C074C2EDD3E82 -:104628008F28FD0E0770F161DC605C3FF0317E126F -:1046380079A8FCBDD8F6BDDA8C0773098E22318FB4 -:10464800BDDC70BDDEFDBA0DAC08BDDCAC0AFD30CA -:104658000FADDABC0AADD8BC08615907EFBCAC088D -:10466800BDD8AC0ABDDAC9DC0004F6FD840EC9DC8D -:10467800FFFFF6FD990FADD8BFA2FCAF9CFC42A28C -:10468800FCDD12AF9EFCBFA0FCAF9CFCBF9EFCAF44 -:10469800A2FCBF9CFCAF9EFC42A0FCDC50AF9CFC83 -:1046A800429EFCDE48AF62FD429CFCDE404066FD57 -:1046B80016DC1F4066FDA0DE168FA4FC4F66FDDEEB -:1046C8000EAF9CFC22A6FC44691061C8FD3E47F56C -:1046D80066FDAF9CFC445146DC0BAF9CFC241027C4 -:1046E800BF64FDEF1930F82ABF64FDEF114066FD85 -:1046F800FFDD03E6EF01F63466FD89610899AFA096 -:10470800FC429EFCDC1BAF9EFC429CFCDE13AF9C73 -:10471800FC4264FDDE0BF5A4FCAF9CFCBFA6FCEFDD -:104728001140A4FCFFDD03E6EF01F634A4FC896127 -:104738000899100CC6D7C72006FBF8FFA023FCD5A4 -:1047480023FCDF1CA024FCD524FCDF14A025FCD509 -:1047580025FCDF0CCF23FCFFCF24FCFFCF25FCFF7B -:10476800717BFA710A9E31929E02EFFA8E98FDAD26 -:104778000F9C039F2CFD8E949F67FD8E969F68FD6E -:104788008E979F69FD8E939F2AFD8E929F2BFDFD2C -:104798001F4913BC04BDD8F6BDDA46DADF03B146BB -:1047A800D8DF198C035C0391DF03E6EF01F6046D93 -:1047B80001313D120103B1BC046169038F6AFD4EEA -:1047C80003DF12AF2EFD614904DE40AC04222EFD4A -:1047D800FD4048EF368C03318EB112D96AFDF143A2 -:1047E800DF1E8C035C0391DF03E6EF01F6046D0125 -:1047F800313D120103222EFD610904FD4048EF0BF3 -:104808008F6AFD4E03DE04F6FD40488C039F6AFD67 -:10481800AC04BF2EFDD929FDF1010422F9BB14A96E -:1048280044FFFFDF04E6B9EF0BAB14A944FEFFDD3C -:1048380003A9A1B91006C6D7C7161744A90061C8AD -:1048480036A800A029FD4029FDA861C8F529FDF971 -:1048580029FDF3311CF67822F9B7F647DFE5C6D70C -:10486800C756A89666F0317E12F6B17822F966D15D -:10487800DFF1F523FCF524FCF525FCF529FDC6D769 -:10488800716323D7C72004FBF8FFD918F9F1E7248F -:104898000000DD1123DD1C23DD2123DD2623DD2F90 -:1048A80023DD34EF3A8F29FD9F30FDA018F9F96711 -:1048B800FDEF60A018F9F968FDEF58A018F9F9693B -:1048C800FDEF50A018F98F2CFDFDC70F72EF44A023 -:1048D80018F9F92AFDEF3CA018F9F92BFDEF34F986 -:1048E80030FDF3311C7922F9BB316223058B9C031F -:1048F800EF128C019C03D530FDDF06CF30FDA7EF0A -:1049080003B030FD718071672361DC61FB71612345 -:104918008C03721004C6D7C72008FBF8FF8E989C3A -:10492800058E979C048E969C038E949C028E939C75 -:10493800018E929B710B9E717AFA8C05FDAD0F9CCE -:10494800058C04FDAD0F9C048C03FDAD0F9C038CFE -:1049580002FDAD0F9C028C04F0317E1279BE22BCA0 -:10496800068C055C03D1DF098C044C0361C86179AE -:10497800068C03318EB1610906BC06313D12010374 -:10498800BC068C060E02708C071C00BC068F28FC27 -:104998004E01DC0D8C014F28FCDC0B8F29FC4DDE11 -:1049A80005AC0612EF04AC06B1121008C6D7C7C38F -:1049B800C12008FBF8FFF661490A61F8614908DF80 -:1049C80007F7340000ED534AE6BC04F6BC06AC0A0F -:1049D800BC02AC08BBAC06614902AC0461F8614991 -:1049E80000DE28AC04BDD8AC06BDDAE1FD3F0FAD52 -:1049F800DABC06ADD8BC04ABBDD8AC02BDDAE1FD6B -:104A08005A0FADDABC02ADD8BBEFCAAC06BC02ACDB -:104A180004BBAC08BDD8AC0ABDDAAC04BDDCAC063E -:104A2800FDBD0EAC04BDDCAC06FD300FE1FD5A0F38 -:104A3800ADDABC06ADD8BC04AC06614902AC046171 -:0F4A4800F8614900DCC5AC0214AB12100CC6D7E4 -:104A570061FC61FCC1C3C5C7520C929269D4FEC107 -:104A6700DFF88EFD708EFCC1717AFA401EF903DF04 -:104A77000630CA2BFDAB3CC09EFC609EFD34D4FEC5 -:104A87005206C0B9A5A592DFF9C6C4C2C061FC61D0 -:104A9700DF520C929269D4FEC1DFF88EFD708EFC56 -:104AA700C1717AFAC736410571A4C6DC51F536FDE6 -:104AB70071485005716050053124223671620771C3 -:104AC70023228FE8FB5FF0FBD1DF1B8FE9FB5FF150 -:104AD700FBD1DF128FEAFB5FF2FBD1DF098FEBFB24 -:104AE7005FF3FBD1DD0C31620702EFFA71630771E7 -:104AF7006B27FD8848FD9633F518F9ED1A4CC73634 -:104B070041057184C6DE0DF536FD71485005FD96E9 -:104B170033ED1A4CC73641057194C6DE154036FD94 -:104B270003DD0C4036FD04DD064036FD0161F8F576 -:104B370036FDD936FDF1E7240000DD0823DD132318 -:104B4700DD39EF6071405005E536FD71505005EDD8 -:104B57001A4C8F40059F19F99F1CF9D919F9FD5770 -:104B670037629F1BF94019F97FDD06CF36FD02EF4B -:104B770003F536FD71505005ED1A4CC736410571E6 -:104B870094C6DE1CC736410571C4C6DE06CF36FDA6 -:104B970003EF11F536FD7148500571605005EF734D -:104BA700CF36FD044036FD03DF138F1BF99F400509 -:104BB700D91BF9C1D919F9FDD637C0EF108F4005B8 -:104BC70076C7D919F9FD1B34C071505005D91CF9A6 -:104BD700F1242900DD2D240400DD28242200DD2313 -:104BE700241100DD0C240100DD19241E00DD14EF63 -:104BF7000C4019F960DF0CCF19F961EF06F518F9C8 -:104C0700A019F94036FD03DF0AD919F9FD573762B4 -:104C17009F1BF9C09EFC609EFD34D4FE5206C0B9AE -:104C2700A5A592DFF961FCC1C3C5C7520C92926971 -:104C3700D4FEC1DFF88EFD708EFCC1F616717AFACC -:104C4700714AE5717BBD51405F0401D1DD05A7F6CF -:104C570047DFF3300400BF2401F6BF2A01300B0BF6 -:104C6700BF2801FD2303300B0FBF2801FD230330AD -:104C77000F0FBF2801710AE6710321C09EFC609ED9 -:104C8700FD34D4FE5206C0B9A5A592DFF9C6C4C249 -:104C9700C061FCC1C3C5C7520C929269D4FEC1DF83 -:104CA700F88EFD708EFCC1717AFAD540FBDD0EEBF4 -:104CB7003EFB899E44A23EFBB040FBEF2B710AE608 -:104CC700300400BF2401F6BF2A01300B0BBF2801B7 -:104CD700FD2303300B0FBF2801FD2303300F0FBF48 -:104CE7002801717320710321C09EFC609EFD34D49E -:104CF700FE5206C0B9A5A592DFF9C6C4C2C061FCC1 -:104D070061EF520C929269D4FEC1DFF88EFD708E6E -:104D1700FCC12008FBF8FF71503002CEABACCC01D0 -:104D270000F6BC0231B2E20F617902F6614902DF97 -:104D3700F371603002EF7E8E519B713BE28B5C0218 -:104D4700D1DD1D8B5C08D1DF0971503002CC010029 -:104D5700EFCF8C0770FDB138629E50CC0102EFC1D6 -:104D67008B5C03D1DF408E509C05715030028C0163 -:104D7700D1DF0E8C0570FD0739629C07CC0101EF6E -:104D8700318C014C02DF0671603002EF28CF34020C -:104D97005A716030028C0570C18C0770FD5838C09D -:104DA700CF34024AEF0F8B5C01D1DD067160300210 -:104DB700EF03ED284D1008C09EFC609EFD34D4FE25 -:104DC7005206C0B9A5A592DFF961FCC1C3C5C75298 -:104DD7000C929269D4FEC1DFF88EFD708EFCC17112 -:104DE7000A9E31929E02EFFA8F12FC4F96FFDF194F -:104DF7008F13FC4F97FFDF118F14FC4F98FFDF09CC -:104E07005004C15011FD0538C0710B9EC09EFC6057 -:104E17009EFD34D4FE5206C0B9A5A592DFF9C6C4DB -:104E2700C2C061FCC1A060FCE6BFD6FBC061FCC18B -:104E3700C3C5C7520C929269D4FEC1DFF88EFD70CC -:104E47008EFCC1C1FBF8FF8D1F9C018E31318EE7AF -:104E5700240600DD0823DD0F23DD25EF45717AFAEF -:104E67008C019F4AFCEF3B717AFA4021F901DF0779 -:104E77008C019F49FCEF2B51FF2E019F49FCEF222C -:104E8700717AFA8C019F02F98FE6FB5C01D1DF1280 -:104E9700401EF903DD06401EF904DF06302926FD12 -:104EA700AB3C4031FF09DE05A031FFEF197158F027 -:104EB70000713222405FFC02DF03F6EF05D95FFC89 -:104EC700F1A1609F5FFC710BE3C0C09EFC609EFD7B -:104ED70034D4FE5206C0B9A5A592DFF9C6C4C2C034 -:104EE70061FC61FF520C929269D4FEC1DFF88EFD1E -:104EF700708EFCC1717AFA8F18FC5C03D1DD194002 -:104F07001EF903DD06401EF904DF0D36100571D4C6 -:104F1700DE0630E03DFDAB3CC09EFC609EFD34D418 -:104F2700FE5206C0B9A5A592DFF961FC61FC61FCE0 -:104F370061FC61FC61FC61FC61FC61FC61FC61FC82 -:104F470061FC61FC61FC61FC61FC61FC61FC61FC72 -:104F570061FC61FC61FC61FC61FC61FC61FC61FC62 -:044F670061FC61FC8C -:0A4F6C0000060C12181E242A30362D -:104F760000163248648096122844607692082440CF -:104F8600FF000000555555554700E0FB00000000A6 -:104F96004DFC000000001D3F5439D822B12E63306D -:104FA600E0302C322F409209E64101000000983A89 -:0A4FB600F82AFF23301299000000D2 -:084FC000317503F7332312D70A -:0A4FF60031373A34333A303100000D +:1041D8000571485005713BD5F518F9F2C6D7CB6C77 +:1041E800FF00C91AFF00CB6EFF00CB6AFF00CB644B +:1041F800FF00712204715207D7C78F1EF9318FE76C +:1042080024000061F8EDE64323DD1B2361F8EDD9B6 +:10421800422361F8ED6B432361F8EDB4432361F861 +:10422800ED8344EDE643D51FF9DF2BF64286FCDD2E +:1042380005F560FDEF03A060FD4060FD65DC09F554 +:104248001EF9710223ED0345AF86FC440A0061D8CC +:10425800ED0345E51FF9713223F560FDF5FBFBFD24 +:104268003E05714320FDC0234021F903DF09710297 +:1042780023F51EF9ED0345FDE72640E5FB9BDE0926 +:10428800710223F51EF9ED0345714A2771401105A6 +:1042980071301105713A22715A22711A2EFDFF2AC6 +:1042A800D2DD09710223F51EF9ED034571103500C1 +:1042B800CF37001D71401205401FF901DF05F501D8 +:1042C800FCEF04CF01FC03CF1EF902FDDD2AED034C +:1042D80045F6BE6CBD1ABE6EBE6ABE64712304711B +:1042E8005307717320FDF22CFD522D714A9DFD4A32 +:1042F80038FDEA33F537FF712BE0F51FF97102231A +:10430800CBE43FEFCBE6F6F0FD3E05713BD48F20C2 +:10431800F93105305004C15084FD4803C0625C0384 +:10432800318E315D34E7FB896168995002C1508450 +:10433800FD4803C0D2DD067170E7FBEF047178E732 +:10434800FBFDC023FD092E710820F9CF1EF9038F4C +:10435800DAFB5C02D1DD095080C15010FD0538C080 +:10436800ED0345FD054531A4E020712BE031020C39 +:1043780005FD7F45EF145027C15005C15084FDE469 +:10438800031004CF1EF9047102233164230BA09A91 +:10439800FCD59AFC61F8FD7F45FD72458F20F93107 +:1043A800450731040703F51EF9ED0345FD054531C1 +:1043B800020C18F0C15005C15084FDE403100450EC +:1043C80005FDAD02FD7F45CF1EF903FD72458F2027 +:1043D800F931450731040703F51EF9ED0345F51ECC +:1043E800F9CF01FC03F502FCF504FC714221F64209 +:1043F8006CFF61E8ED0345712820F9F518FCFDA96B +:104408003EFD992EFD492DFDA72D714B9DF5E8FB2D +:10441800F5E9FBF5EAFBF5EBFB31142102EFFACEE7 +:104428003708CBE4BFFFCBE6FFF1CED4FFCF370090 +:104438000971481205F6BEE0BEE2BED0716A27FDDA +:104448007C2B714307714B27714810057148110582 +:104458007138100571381105713302713B2271539F +:1044680002715B2271130E711B2EFDA705F560FD0D +:10447800CF1EF905713223F6BF86FC3102072CFDE9 +:10448800C023AF86FC440A00DC06E51FF9E51EF9E7 +:10449800D521F961E8FDA7058F20F931455D502E3A +:1044A800FDAD02E51FF9E51EF9EF50D50BF9DF4B1D +:1044B800F51FF9FDA705FD852371730171320431DC +:1044C800120502EFFA714302710320714220319400 +:1044D8009E02EFFA712AE7CEA409F5F30061FD31D7 +:1044E800040703713323E5F300CEA408712BE7E535 +:1044F8001EF98F20F9314503F51EF9C6D7D59BFC67 +:10450800DF1E310200195003C15084FD4803C06208 +:104518005C01D1DF07F51EF9710223D7E59BFCD7B3 +:10452800409BFCF0DF083104003FF59BFCD7409B23 +:10453800FCC8DF0BF51EF9710223CF9BFCF0D731C5 +:10454800020004A09BFCD7F0C15004C15084FDE4D4 +:104558000310048FE7FB5C9F9FE7FB7110F8FB30AB +:10456800B740FDAB3CCF9BFCF0D78F20F931250637 +:10457800F51EF9710223D7716323F59AFC7172074E +:10458800FD2103717307D7FD1406F2D7C7200CFB72 +:10459800F8FF8F1EFCF0F91DFCF303FDEE4F13BC72 +:1045A800048F20FCF0F91FFCF303FDEE4F13BC024F +:1045B8008F22FCF0F921FCF303FDEE4F13BBAC0492 +:1045C800BDD8F6BDDAAC04311EBDDCF6BDDEFDBBE0 +:1045D8000DADD8BDDCADDABDDEAC02BDD8F6BDDAB6 +:1045E800AC02311EDADCC3DADEC3BDDCF6BDDEFDAB +:1045F800BB0DC0BDDEC0BDDCADDEFD310FADD8BD2D +:10460800DCADDABDDEABBDD8F6BDDAAB311EDADC27 +:10461800C3DADEC3BDDCF6BDDEFDBB0DC0BDDEC04A +:10462800BDDCADDEFD310FDADAADD8FDE549C3C535 +:104638008F28FD5C3FF0317E04A8FC14C2C0B9A0ED +:1046480028FDF6BC08BC0A9C078C074C2EDD3E8F63 +:1046580028FD0E0770F161DC605C3FF0317E127955 +:10466800A8FCBDD8F6BDDA8C0773098E22318FBD40 +:10467800DC70BDDEFDBB0DAC08BDDCAC0AFD310F46 +:10468800ADDABC0AADD8BC08615907EFBCAC08BDAF +:10469800D8AC0ABDDAC9DC0004F6FD850EC9DCFF1A +:1046A800FFF6FD9A0FADD8BFA2FCAF9CFC42A2FC5E +:1046B800DD12AF9EFCBFA0FCAF9CFCBF9EFCAFA26E +:1046C800FCBF9CFCAF9EFC42A0FCDC50AF9CFC42B3 +:1046D8009EFCDE48AF62FD429CFCDE404066FD1653 +:1046E800DC1F4066FDA0DE168FA4FC4F66FDDE0EC3 +:1046F800AF9CFC22A6FC44691061C8FD6D47F566B5 +:10470800FDAF9CFC445146DC0BAF9CFC241027BF3A +:1047180064FDEF1930F82ABF64FDEF114066FDFF14 +:10472800DD03E6EF01F63466FD89610899AFA0FC68 +:10473800429EFCDC1BAF9EFC429CFCDE13AF9CFC43 +:104748004264FDDE0BF5A4FCAF9CFCBFA6FCEF1198 +:1047580040A4FCFFDD03E6EF01F634A4FC89610800 +:1047680099100CC6D7C72006FBF8FFA023FCD52359 +:10477800FCDF1CA024FCD524FCDF14A025FCD525D7 +:10478800FCDF0CCF23FCFFCF24FCFFCF25FCFF71FF +:104798007BFA710A9E31929E02EFFA8E98FDAE0F57 +:1047A8009C039F2CFD8E949F67FD8E969F68FD8EBF +:1047B800979F69FD8E939F2AFD8E929F2BFDFD4E3C +:1047C8004913BC04BDD8F6BDDA46DADF03B146D8D2 +:1047D800DF198C035C0391DF03E6EF01F6046D013A +:1047E800313D120103B1BC046169038F6AFD4E03B8 +:1047F800DF12AF2EFD614904DE40AC04222EFDFD20 +:104808006F48EF368C03318EB112D96AFDF143DF60 +:104818001E8C035C0391DF03E6EF01F6046D0131A2 +:104828003D120103222EFD610904FD6F48EF0B8F35 +:104838006AFD4E03DE04F6FD6F488C039F6AFDACEB +:1048480004BF2EFDD929FDF1010422F9BB14A944A6 +:10485800FFFFDF04E6B9EF0BAB14A944FEFFDD034D +:10486800A9A1B91006C6D7C7161744A90061C8364A +:10487800A800A029FD4029FDA861C8F529FDF9294E +:10488800FDF3311CF67822F9B7F647DFE5C6D7C73E +:1048980056A89666F0317E12F6B17822F966D1DF15 +:1048A800F1F523FCF524FCF525FCF529FDC6D771A7 +:1048B8007323D7C72004FBF8FFD918F9F1E72400C0 +:1048C80000DD1123DD1C23DD2123DD2623DD2F233D +:1048D800DD34EF3A8F29FD9F30FDA018F9F967FD07 +:1048E800EF60A018F9F968FDEF58A018F9F969FD0B +:1048F800EF50A018F98F2CFDFDC80F72EF44A018D7 +:10490800F9F92AFDEF3CA018F9F92BFDEF34F9303D +:10491800FDF3311C7922F9BB317223058B9C03EF1F +:10492800128C019C03D530FDDF06CF30FDA7EF03C5 +:10493800B030FD718071772361DC61FB7171238C6C +:1049480003721004C6D7C72008FBF8FF8E989C0591 +:104958008E979C048E969C038E949C028E939C0149 +:104968008E929B710B9E717AFA8C05FDAE0F9C0599 +:104978008C04FDAE0F9C048C03FDAE0F9C038C02CF +:10498800FDAE0F9C028C04F0317E1279BE22BC066B +:104998008C055C03D1DF098C044C0361C86179067E +:1049A8008C03318EB1610906BC06313D120103BC8E +:1049B800068C060E02708C071C00BC068F28FC4E65 +:1049C80001DC0D8C014F28FCDC0B8F29FC4DDE052A +:1049D800AC0612EF04AC06B1121008C6D7C7C3C1A3 +:1049E8002008FBF8FFF661490A61F8614908DF070A +:1049F800F7340000ED824AE6BC04F6BC06AC0ABCFB +:104A080002AC08BBAC06614902AC0461F86149001C +:104A1800DE28AC04BDD8AC06BDDAE1FD400FADDA46 +:104A2800BC06ADD8BC04ABBDD8AC02BDDAE1FD5BB9 +:104A38000FADDABC02ADD8BBEFCAAC06BC02AC0401 +:104A4800BBAC08BDD8AC0ABDDAAC04BDDCAC06FD15 +:104A5800BE0EAC04BDDCAC06FD310FE1FD5B0FAD55 +:104A6800DABC06ADD8BC04AC06614902AC0461F8F6 +:0E4A7800614900DCC5AC0214AB12100CC6D7AD +:104A860061FC61FCC1C3C5C7520C929269D4FEC1D8 +:104A9600DFF88EFD708EFCC1717AFA401EF903DFD5 +:104AA6000630CA2BFDAB3CC09EFC609EFD34D4FE96 +:104AB6005206C0B9A5A592DFF9C6C4C2C061FC61A1 +:104AC600DF520C929269D4FEC1DFF88EFD708EFC27 +:104AD600C1717AFAC736410571A4C6DC51F536FDB7 +:104AE6007148500571605005313422367162077184 +:104AF60033228FE8FB5FF0FBD1DF1B8FE9FB5FF111 +:104B0600FBD1DF128FEAFB5FF2FBD1DF098FEBFBF4 +:104B16005FF3FBD1DD0C31620702EFFA71630771B7 +:104B26006B27FDB748FD9633F518F9ED494CC736A6 +:104B360041057184C6DE0DF536FD71485005FD96BA +:104B460033ED494CC73641057194C6DE154036FD36 +:104B560003DD0C4036FD04DD064036FD0161F8F547 +:104B660036FDD936FDF1E7240000DD0823DD1323E9 +:104B7600DD39EF6071405005E536FD71505005EDA9 +:104B8600494C8F40059F19F99F1CF9D919F9FD5712 +:104B960037629F1BF94019F97FDD06CF36FD02EF1C +:104BA60003F536FD71505005ED494CC73641057188 +:104BB60094C6DE1CC736410571C4C6DE06CF36FD77 +:104BC60003EF11F536FD7148500571605005EF731E +:104BD600CF36FD044036FD03DF138F1BF99F4005DA +:104BE600D91BF9C1D919F9FDD637C0EF108F400589 +:104BF60076C7D919F9FD1B34C071505005D91CF977 +:104C0600F1242900DD2D240400DD28242200DD23E3 +:104C1600241100DD0C240100DD19241E00DD14EF33 +:104C26000C4019F960DF0CCF19F961EF06F518F998 +:104C3600A019F94036FD03DF0AD919F9FD57376285 +:104C46009F1BF9C09EFC609EFD34D4FE5206C0B97F +:104C5600A5A592DFF961FCC1C3C5C7520C92926942 +:104C6600D4FEC1DFF88EFD708EFCC1F616717AFA9D +:104C7600714AE5717BBD51405F0401D1DD05A7F6A0 +:104C860047DFF3300400BF2401F6BF2A01300B0BC7 +:104C9600BF2801FD2103300B0FBF2801FD21033082 +:104CA6000F0FBF2801710AE6711321C09EFC609E9A +:104CB600FD34D4FE5206C0B9A5A592DFF9C6C4C21A +:104CC600C061FCC1C3C5C7520C929269D4FEC1DF54 +:104CD600F88EFD708EFCC1717AFAD540FBDD0EEBC5 +:104CE6003EFB899E44A23EFBB040FBEF2B710AE6D9 +:104CF600300400BF2401F6BF2A01300B0BBF280188 +:104D0600FD2103300B0FBF2801FD2103300F0FBF1C +:104D16002801710321711321C09EFC609EFD34D4CD +:104D2600FE5206C0B9A5A592DFF9C6C4C2C061FC91 +:104D360061EF520C929269D4FEC1DFF88EFD708E3F +:104D4600FCC12008FBF8FF71503002CEABACCC01A1 +:104D560000F6BC0231B2E20F617902F6614902DF68 +:104D6600F371603002EF7E8E519B713BE28B5C02E9 +:104D7600D1DD1D8B5C08D1DF0971503002CC0100FA +:104D8600EFCF8C0770FDB138629E50CC0102EFC1A7 +:104D96008B5C03D1DF408E509C05715030028C0134 +:104DA600D1DF0E8C0570FD0739629C07CC0101EF3F +:104DB600318C014C02DF0671603002EF28CF3402DD +:104DC6005A716030028C0570C18C0770FD5838C06E +:104DD600CF34024AEF0F8B5C01D1DD0671603002E1 +:104DE600EF03ED574D1008C09EFC609EFD34D4FEC7 +:104DF6005206C0B9A5A592DFF961FCC1C3C5C75269 +:104E06000C929269D4FEC1DFF88EFD708EFCC171E2 +:104E16000A9E31929E02EFFA8F12FC4F96FFDF191F +:104E26008F13FC4F97FFDF118F14FC4F98FFDF099C +:104E36005004C15011FD0538C0710B9EC09EFC6028 +:104E46009EFD34D4FE5206C0B9A5A592DFF9C6C4AC +:104E5600C2C061FCC1A060FCE6BFD6FBC061FCC15C +:104E6600C3C5C7520C929269D4FEC1DFF88EFD709D +:104E76008EFCC1C1FBF8FF8D1F9C018E31318EE780 +:104E8600240600DD0823DD0F23DD25EF45717AFAC0 +:104E96008C019F4AFCEF3B717AFA4021F901DF074A +:104EA6008C019F49FCEF2B51FF2E019F49FCEF22FD +:104EB600717AFA8C019F02F98FE6FB5C01D1DF1251 +:104EC600401EF903DD06401EF904DF06302926FDE3 +:104ED600AB3C4031FF09DE05A031FFEF197158F0F8 +:104EE60000714222405FFC02DF03F6EF05D95FFC4A +:104EF600F1A1609F5FFC710BE3C0C09EFC609EFD4C +:104F060034D4FE5206C0B9A5A592DFF9C6C4C2C004 +:104F160061FC61FF520C929269D4FEC1DFF88EFDEE +:104F2600708EFCC1717AFA8F18FC5C03D1DD1940D2 +:104F36001EF903DD06401EF904DF0D36100571D497 +:104F4600DE0630E03DFDAB3CC09EFC609EFD34D4E9 +:104F5600FE5206C0B9A5A592DFF961FC61FC61FCB1 +:104F660061FC61FC61FC61FC61FC61FC61FC61FC53 +:104F760061FC61FC61FC61FC61FC61FC61FC61FC43 +:104F860061FC61FC61FC61FC61FC61FC61FC61FC33 +:044F960061FC61FC5D +:0A4F9A0000060C12181E242A3036FF +:104FA40000163248648096122844607692082440A1 +:104FB400FF000000555555554700E0FB0000000078 +:104FC4004DFC000000001D3F5439D822B12E63303F +:104FD400E0302C322F409309014201000000983A3E +:0A4FE400F82AFF23301299000000A4 +:084FEE00317503F7332312D7DC +:0A4FF60031333A35363A3333000008 :00000001FF  \ No newline at end of file diff --git a/trunk/bsr_k0r.map b/trunk/bsr_k0r.map index 896ddd8..76b50f5 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.31 Date:28 Oct 2010 Page: 1 +78K0R Linker W1.31 Date: 9 Nov 2010 Page: 1 Command: -yC:\Program Files\NEC Electronics Tools\DEV -_msgoff -obsr.l mf ..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10 @@ -22,9 +22,9 @@ Direc-file:bsr_mcu.dr *** Link information *** - 64 output segment(s) - 3F20H byte(s) real data - 5440 symbol(s) defined + 63 output segment(s) + 3F27H byte(s) real data + 5450 symbol(s) defined *** Memory map *** @@ -97,55 +97,55 @@ Direc-file:bsr_mcu.dr LDR_CODL task_status 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - LDR_CODE 000CEH 0094CH CSEG + LDR_CODE 000CEH 00943H CSEG LDR_CODE loader 000CEH 001F9H - LDR_CODE main 002C7H 0005CH - LDR_CODE WDT 00323H 00000H - LDR_CODE i2c_mcu 00323H 002F0H + LDR_CODE main 002C7H 00050H + LDR_CODE WDT 00317H 00000H + LDR_CODE i2c_mcu 00317H 002F3H LDR_CODE self_flash - 00613H 0037FH + 0060AH 0037FH LDR_CODE task_debug - 00992H 00000H + 00989H 00000H LDR_CODE task_status - 00992H 00088H - FSL_CODE 00A1AH 00322H CSEG + 00989H 00088H + FSL_CODE 00A11H 00322H CSEG FSL_CODE fsl_block_cmd - 00A1AH 0002BH + 00A11H 0002BH FSL_CODE fsl_block_check - 00A45H 00013H + 00A3CH 00013H FSL_CODE fsl_common - 00A58H 0014FH + 00A4FH 0014FH FSL_CODE fsl_reset - 00BA7H 00001H + 00B9EH 00001H FSL_CODE fsl_si_ibf - 00BA8H 00064H + 00B9FH 00064H FSL_CODE fsl_phySwap - 00C0CH 0004DH + 00C03H 0004DH FSL_CODE fsl_si_common - 00C59H 00061H - FSL_CODE fsl_swap 00CBAH 00030H + 00C50H 00061H + FSL_CODE fsl_swap 00CB1H 00030H FSL_CODE fsl_write - 00CEAH 00052H - @@LCODE 00D3CH 002AFH CSEG - @@LCODE @cstart 00D3CH 0006DH - @@LCODE @imul 00DA9H 00011H - @@LCODE @lumul 00DBAH 0002BH - @@LCODE @isdiv 00DE5H 00022H - @@LCODE @iudiv 00E07H 0002DH - @@LCODE @isrem 00E34H 00021H - @@LCODE @iurem 00E55H 0002FH - @@LCODE @lsdiv 00E84H 00039H - @@LCODE @ludiv 00EBDH 0003FH - @@LCODE @divuw 00EFCH 00034H - @@LCODE @ladd 00F30H 0000FH - @@LCODE @llsh 00F3FH 0001BH - @@LCODE @lursh 00F5AH 0001FH - @@LCODE @iscmp 00F79H 0000CH - @@LCODE @lscmp 00F85H 00014H - @@LCODE @lband 00F99H 00014H - @@LCODE @bcdtob 00FADH 0001AH - @@LCODE @bbcd 00FC7H 00024H -* gap * 00FEBH 0000BH + 00CE1H 00052H + @@LCODE 00D33H 002AFH CSEG + @@LCODE @cstart 00D33H 0006DH + @@LCODE @imul 00DA0H 00011H + @@LCODE @lumul 00DB1H 0002BH + @@LCODE @isdiv 00DDCH 00022H + @@LCODE @iudiv 00DFEH 0002DH + @@LCODE @isrem 00E2BH 00021H + @@LCODE @iurem 00E4CH 0002FH + @@LCODE @lsdiv 00E7BH 00039H + @@LCODE @ludiv 00EB4H 0003FH + @@LCODE @divuw 00EF3H 00034H + @@LCODE @ladd 00F27H 0000FH + @@LCODE @llsh 00F36H 0001BH + @@LCODE @lursh 00F51H 0001FH + @@LCODE @iscmp 00F70H 0000CH + @@LCODE @lscmp 00F7CH 00014H + @@LCODE @lband 00F90H 00014H + @@LCODE @bcdtob 00FA4H 0001AH + @@LCODE @bbcd 00FBEH 00024H +* gap * 00FE2H 00014H MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -185,235 +185,204 @@ Direc-file:bsr_mcu.dr @@CNST ini_VECT 022D8H 00000H @@CNST task_status 022D8H 00000H - ROM_CODE 022D8H 0277FH CSEG - ROM_CODE pm 022D8H 00A1AH - ROM_CODE i2c_ctr 02CF2H 00060H - ROM_CODE i2c_twl 02D52H 0005EH - ROM_CODE led 02DB0H 00545H - ROM_CODE rtc 032F5H 000E0H - ROM_CODE vreg_ctr 033D5H 00475H - ROM_CODE vreg_twl 0384AH 0010AH - ROM_CODE adc 03954H 002FCH - ROM_CODE renge 03C50H 00190H - ROM_CODE accero 03DE0H 0013DH - ROM_CODE sw 03F1DH 00112H + ROM_CODE 022D8H 027CFH CSEG + ROM_CODE pm 022D8H 00A3BH + ROM_CODE i2c_ctr 02D13H 00060H + ROM_CODE i2c_twl 02D73H 0005EH + ROM_CODE led 02DD1H 00545H + ROM_CODE rtc 03316H 000E0H + ROM_CODE vreg_ctr 033F6H 00475H + ROM_CODE vreg_twl 0386BH 0010AH + ROM_CODE adc 03975H 002FCH + ROM_CODE renge 03C71H 00190H + ROM_CODE accero 03E01H 0013DH + ROM_CODE sw 03F3EH 00112H ROM_CODE task_misc - 0402FH 001B7H - ROM_CODE task_sys 041E6H 0037FH + 04050H 001D2H + ROM_CODE task_sys 04222H 00393H ROM_CODE pedo_alg_thre_det2 - 04565H 004F2H - @@BASE 04A57H 00514H CSEG BASE - @@BASE loader 04A57H 00000H - @@BASE pm 04A57H 0003FH - @@BASE i2c_ctr 04A96H 00198H - @@BASE main 04C2EH 00000H - @@BASE magic 04C2EH 00000H - @@BASE WDT 04C2EH 00000H - @@BASE i2c_mcu 04C2EH 000D9H - @@BASE i2c_twl 04D07H 000CBH - @@BASE led 04DD2H 00000H - @@BASE rtc 04DD2H 00064H - @@BASE vreg_ctr 04E36H 00000H - @@BASE vreg_twl 04E36H 00000H - @@BASE adc 04E36H 000B3H - @@BASE renge 04EE9H 00000H - @@BASE accero 04EE9H 0004AH + 045B5H 004F2H + @@BASE 04AA7H 0050EH CSEG BASE + @@BASE loader 04AA7H 00000H + @@BASE pm 04AA7H 0003FH + @@BASE i2c_ctr 04AE6H 00198H + @@BASE main 04C7EH 00000H + @@BASE magic 04C7EH 00000H + @@BASE WDT 04C7EH 00000H + @@BASE i2c_mcu 04C7EH 000D9H + @@BASE i2c_twl 04D57H 000CBH + @@BASE led 04E22H 00000H + @@BASE rtc 04E22H 0005EH + @@BASE vreg_ctr 04E80H 00000H + @@BASE vreg_twl 04E80H 00000H + @@BASE adc 04E80H 000B3H + @@BASE renge 04F33H 00000H + @@BASE accero 04F33H 0004AH @@BASE self_flash - 04F33H 00000H - @@BASE sw 04F33H 00000H + 04F7DH 00000H + @@BASE sw 04F7DH 00000H @@BASE task_debug - 04F33H 00000H + 04F7DH 00000H @@BASE task_misc - 04F33H 00000H - @@BASE task_sys 04F33H 00000H + 04F7DH 00000H + @@BASE task_sys 04F7DH 00000H @@BASE pedo_alg_thre_det2 - 04F33H 00000H - @@BASE ini_VECT 04F33H 00038H + 04F7DH 00000H + @@BASE ini_VECT 04F7DH 00038H @@BASE task_status - 04F6BH 00000H - @@CNSTL 04F6BH 00000H CSEG PAGE64KP - @@CNSTL @cstart 04F6BH 00000H - @@CNSTL 04F6BH 00000H CSEG PAGE64KP - @@CNSTL pm 04F6BH 00000H - @@CNSTL 04F6BH 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04F6BH 00000H - @@CNSTL 04F6BH 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04F6BH 00000H - @@CNSTL 04F6BH 00000H CSEG PAGE64KP - @@CNSTL led 04F6BH 00000H - @@CNSTL 04F6BH 00000H CSEG PAGE64KP - @@CNSTL rtc 04F6BH 00000H - @@CNSTL 04F6BH 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04F6BH 00000H - @@CNSTL 04F6BH 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04F6BH 00000H - @@CNSTL 04F6BH 00000H CSEG PAGE64KP - @@CNSTL adc 04F6BH 00000H - @@CNSTL 04F6BH 00000H CSEG PAGE64KP - @@CNSTL renge 04F6BH 00000H - @@CNSTL 04F6BH 00000H CSEG PAGE64KP - @@CNSTL accero 04F6BH 00000H - @@CNSTL 04F6BH 00000H CSEG PAGE64KP - @@CNSTL sw 04F6BH 00000H - @@CNSTL 04F6BH 00000H CSEG PAGE64KP + 04FB5H 00000H + @@CNSTL 04FB5H 00000H CSEG PAGE64KP + @@CNSTL @cstart 04FB5H 00000H + @@CNSTL 04FB5H 00000H CSEG PAGE64KP + @@CNSTL pm 04FB5H 00000H + @@CNSTL 04FB5H 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04FB5H 00000H + @@CNSTL 04FB5H 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04FB5H 00000H + @@CNSTL 04FB5H 00000H CSEG PAGE64KP + @@CNSTL led 04FB5H 00000H + @@CNSTL 04FB5H 00000H CSEG PAGE64KP + @@CNSTL rtc 04FB5H 00000H + @@CNSTL 04FB5H 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04FB5H 00000H + @@CNSTL 04FB5H 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04FB5H 00000H + @@CNSTL 04FB5H 00000H CSEG PAGE64KP + @@CNSTL adc 04FB5H 00000H + @@CNSTL 04FB5H 00000H CSEG PAGE64KP + @@CNSTL renge 04FB5H 00000H + @@CNSTL 04FB5H 00000H CSEG PAGE64KP + @@CNSTL accero 04FB5H 00000H + @@CNSTL 04FB5H 00000H CSEG PAGE64KP + @@CNSTL sw 04FB5H 00000H + @@CNSTL 04FB5H 00000H CSEG PAGE64KP @@CNSTL task_misc - 04F6BH 00000H - @@CNSTL 04F6BH 00000H CSEG PAGE64KP - @@CNSTL task_sys 04F6BH 00000H - @@CNSTL 04F6BH 00000H CSEG PAGE64KP + 04FB5H 00000H + @@CNSTL 04FB5H 00000H CSEG PAGE64KP + @@CNSTL task_sys 04FB5H 00000H + @@CNSTL 04FB5H 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04F6BH 00000H - @@CNSTL 04F6BH 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04F6BH 00000H - @@R_INIS 04F6BH 00000H CSEG UNIT64KP - @@R_INIS @cstart 04F6BH 00000H - @@R_INIS loader 04F6BH 00000H - @@R_INIS pm 04F6BH 00000H - @@R_INIS i2c_ctr 04F6BH 00000H - @@R_INIS main 04F6BH 00000H - @@R_INIS magic 04F6BH 00000H - @@R_INIS WDT 04F6BH 00000H - @@R_INIS i2c_mcu 04F6BH 00000H - @@R_INIS i2c_twl 04F6BH 00000H - @@R_INIS led 04F6BH 00000H - @@R_INIS rtc 04F6BH 00000H - @@R_INIS vreg_ctr 04F6BH 00000H - @@R_INIS vreg_twl 04F6BH 00000H - @@R_INIS adc 04F6BH 00000H - @@R_INIS renge 04F6BH 00000H - @@R_INIS accero 04F6BH 00000H + 04FB5H 00000H + @@CNSTL 04FB5H 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04FB5H 00000H + @@R_INIS 04FB5H 00000H CSEG UNIT64KP + @@R_INIS @cstart 04FB5H 00000H + @@R_INIS loader 04FB5H 00000H + @@R_INIS pm 04FB5H 00000H + @@R_INIS i2c_ctr 04FB5H 00000H + @@R_INIS main 04FB5H 00000H + @@R_INIS magic 04FB5H 00000H + @@R_INIS WDT 04FB5H 00000H + @@R_INIS i2c_mcu 04FB5H 00000H + @@R_INIS i2c_twl 04FB5H 00000H + @@R_INIS led 04FB5H 00000H + @@R_INIS rtc 04FB5H 00000H + @@R_INIS vreg_ctr 04FB5H 00000H + @@R_INIS vreg_twl 04FB5H 00000H + @@R_INIS adc 04FB5H 00000H + @@R_INIS renge 04FB5H 00000H + @@R_INIS accero 04FB5H 00000H @@R_INIS self_flash - 04F6BH 00000H - @@R_INIS sw 04F6BH 00000H + 04FB5H 00000H + @@R_INIS sw 04FB5H 00000H @@R_INIS task_debug - 04F6BH 00000H + 04FB5H 00000H @@R_INIS task_misc - 04F6BH 00000H - @@R_INIS task_sys 04F6BH 00000H + 04FB5H 00000H + @@R_INIS task_sys 04FB5H 00000H @@R_INIS pedo_alg_thre_det2 - 04F6BH 00000H - @@R_INIS ini_VECT 04F6BH 00000H + 04FB5H 00000H + @@R_INIS ini_VECT 04FB5H 00000H @@R_INIS task_status - 04F6BH 00000H - @@R_INIS @rom 04F6BH 00000H - @@CALT 04F6BH 00000H CSEG - @@CALT @cstart 04F6BH 00000H - @@CALT loader 04F6BH 00000H - @@CALT pm 04F6BH 00000H - @@CALT i2c_ctr 04F6BH 00000H - @@CALT main 04F6BH 00000H - @@CALT magic 04F6BH 00000H - @@CALT WDT 04F6BH 00000H - @@CALT i2c_mcu 04F6BH 00000H - @@CALT i2c_twl 04F6BH 00000H - @@CALT led 04F6BH 00000H - @@CALT rtc 04F6BH 00000H - @@CALT vreg_ctr 04F6BH 00000H - @@CALT vreg_twl 04F6BH 00000H - @@CALT adc 04F6BH 00000H - @@CALT renge 04F6BH 00000H - @@CALT accero 04F6BH 00000H + 04FB5H 00000H + @@R_INIS @rom 04FB5H 00000H + @@CALT 04FB5H 00000H CSEG + @@CALT @cstart 04FB5H 00000H + @@CALT loader 04FB5H 00000H + @@CALT pm 04FB5H 00000H + @@CALT i2c_ctr 04FB5H 00000H + @@CALT main 04FB5H 00000H + @@CALT magic 04FB5H 00000H + @@CALT WDT 04FB5H 00000H + @@CALT i2c_mcu 04FB5H 00000H + @@CALT i2c_twl 04FB5H 00000H + @@CALT led 04FB5H 00000H + @@CALT rtc 04FB5H 00000H + @@CALT vreg_ctr 04FB5H 00000H + @@CALT vreg_twl 04FB5H 00000H + @@CALT adc 04FB5H 00000H + @@CALT renge 04FB5H 00000H + @@CALT accero 04FB5H 00000H @@CALT self_flash - 04F6BH 00000H - @@CALT sw 04F6BH 00000H + 04FB5H 00000H + @@CALT sw 04FB5H 00000H @@CALT task_debug - 04F6BH 00000H + 04FB5H 00000H @@CALT task_misc - 04F6BH 00000H - @@CALT task_sys 04F6BH 00000H + 04FB5H 00000H + @@CALT task_sys 04FB5H 00000H @@CALT pedo_alg_thre_det2 - 04F6BH 00000H - @@CALT ini_VECT 04F6BH 00000H + 04FB5H 00000H + @@CALT ini_VECT 04FB5H 00000H @@CALT task_status - 04F6BH 00000H - @@RLINIT 04F6BH 00000H CSEG UNIT64KP - @@RLINIT loader 04F6BH 00000H - @@RLINIT pm 04F6BH 00000H - @@RLINIT i2c_ctr 04F6BH 00000H - @@RLINIT main 04F6BH 00000H - @@RLINIT magic 04F6BH 00000H - @@RLINIT WDT 04F6BH 00000H - @@RLINIT i2c_mcu 04F6BH 00000H - @@RLINIT i2c_twl 04F6BH 00000H - @@RLINIT led 04F6BH 00000H - @@RLINIT rtc 04F6BH 00000H - @@RLINIT vreg_ctr 04F6BH 00000H - @@RLINIT vreg_twl 04F6BH 00000H - @@RLINIT adc 04F6BH 00000H - @@RLINIT renge 04F6BH 00000H - @@RLINIT accero 04F6BH 00000H + 04FB5H 00000H + @@RLINIT 04FB5H 00000H CSEG UNIT64KP + @@RLINIT loader 04FB5H 00000H + @@RLINIT pm 04FB5H 00000H + @@RLINIT i2c_ctr 04FB5H 00000H + @@RLINIT main 04FB5H 00000H + @@RLINIT magic 04FB5H 00000H + @@RLINIT WDT 04FB5H 00000H + @@RLINIT i2c_mcu 04FB5H 00000H + @@RLINIT i2c_twl 04FB5H 00000H + @@RLINIT led 04FB5H 00000H + @@RLINIT rtc 04FB5H 00000H + @@RLINIT vreg_ctr 04FB5H 00000H + @@RLINIT vreg_twl 04FB5H 00000H + @@RLINIT adc 04FB5H 00000H + @@RLINIT renge 04FB5H 00000H + @@RLINIT accero 04FB5H 00000H @@RLINIT self_flash - 04F6BH 00000H - @@RLINIT sw 04F6BH 00000H + 04FB5H 00000H + @@RLINIT sw 04FB5H 00000H @@RLINIT task_debug - 04F6BH 00000H + 04FB5H 00000H @@RLINIT task_misc - 04F6BH 00000H - @@RLINIT task_sys 04F6BH 00000H + 04FB5H 00000H + @@RLINIT task_sys 04FB5H 00000H @@RLINIT pedo_alg_thre_det2 - 04F6BH 00000H - @@RLINIT ini_VECT 04F6BH 00000H + 04FB5H 00000H + @@RLINIT ini_VECT 04FB5H 00000H @@RLINIT task_status - 04F6BH 00000H - @@RLINIT @rom 04F6BH 00000H - @@CODEL 04F6BH 00000H CSEG - @@CODEL pm 04F6BH 00000H - @@CODEL i2c_ctr 04F6BH 00000H - @@CODEL magic 04F6BH 00000H - @@CODEL i2c_twl 04F6BH 00000H - @@CODEL led 04F6BH 00000H - @@CODEL rtc 04F6BH 00000H - @@CODEL vreg_ctr 04F6BH 00000H - @@CODEL vreg_twl 04F6BH 00000H - @@CODEL adc 04F6BH 00000H - @@CODEL renge 04F6BH 00000H - @@CODEL accero 04F6BH 00000H - @@CODEL sw 04F6BH 00000H + 04FB5H 00000H + @@RLINIT @rom 04FB5H 00000H + @@CODEL 04FB5H 00000H CSEG + @@CODEL pm 04FB5H 00000H + @@CODEL i2c_ctr 04FB5H 00000H + @@CODEL magic 04FB5H 00000H + @@CODEL i2c_twl 04FB5H 00000H + @@CODEL led 04FB5H 00000H + @@CODEL rtc 04FB5H 00000H + @@CODEL vreg_ctr 04FB5H 00000H + @@CODEL vreg_twl 04FB5H 00000H + @@CODEL adc 04FB5H 00000H + @@CODEL renge 04FB5H 00000H + @@CODEL accero 04FB5H 00000H + @@CODEL sw 04FB5H 00000H @@CODEL task_misc - 04F6BH 00000H - @@CODEL task_sys 04F6BH 00000H + 04FB5H 00000H + @@CODEL task_sys 04FB5H 00000H @@CODEL pedo_alg_thre_det2 - 04F6BH 00000H - @@CODEL ini_VECT 04F6BH 00000H -* gap * 04F6BH 00001H - @@CNSTL 04F6CH 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04F6CH 0000AH - @@CNSTL 04F76H 00010H CSEG PAGE64KP - @@CNSTL @bbcd 04F76H 00010H - @@R_INIT 04F86H 0003AH CSEG UNIT64KP - @@R_INIT @cstart 04F86H 00000H - @@R_INIT loader 04F86H 00000H - @@R_INIT pm 04F86H 00002H - @@R_INIT i2c_ctr 04F88H 00002H - @@R_INIT main 04F8AH 00000H - @@R_INIT magic 04F8AH 00000H - @@R_INIT WDT 04F8AH 00000H - @@R_INIT i2c_mcu 04F8AH 00000H - @@R_INIT i2c_twl 04F8AH 00000H - @@R_INIT led 04F8AH 00006H - @@R_INIT rtc 04F90H 00000H - @@R_INIT vreg_ctr 04F90H 00000H - @@R_INIT vreg_twl 04F90H 00000H - @@R_INIT adc 04F90H 0000CH - @@R_INIT renge 04F9CH 00014H - @@R_INIT accero 04FB0H 00000H - @@R_INIT self_flash - 04FB0H 00000H - @@R_INIT sw 04FB0H 00002H - @@R_INIT task_debug - 04FB2H 00000H - @@R_INIT task_misc - 04FB2H 00000H - @@R_INIT task_sys 04FB2H 00002H - @@R_INIT pedo_alg_thre_det2 - 04FB4H 0000AH - @@R_INIT ini_VECT 04FBEH 00000H - @@R_INIT task_status - 04FBEH 00002H - @@R_INIT @rom 04FC0H 00000H - @@LCODEL 04FC0H 00008H CSEG - @@LCODEL abs 04FC0H 00008H -* gap * 04FC8H 0002EH + 04FB5H 00000H + @@CODEL ini_VECT 04FB5H 00000H +* gap * 04FB5H 00001H + @@CNSTL 04FB6H 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04FB6H 0000AH + @@CNSTL 04FC0H 00010H CSEG PAGE64KP + @@CNSTL @bbcd 04FC0H 00010H + @@LCODEL 04FD0H 00008H CSEG + @@LCODEL abs 04FD0H 00008H +* gap * 04FD8H 0001EH MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL magic 04FF6H 0000AH @@ -421,7 +390,7 @@ Direc-file:bsr_mcu.dr BASE ADDRESS=FF900H SIZE=00500H OUTPUT INPUT INPUT BASE SIZE SEGMENT SEGMENT MODULE ADDRESS - @@DATA FF900H 00434H DSEG BASEP + @@DATA FF900H 00432H DSEG BASEP @@DATA @cstart FF900H 00002H @@DATA loader FF902H 00000H @@DATA pm FF902H 00016H @@ -432,183 +401,183 @@ Direc-file:bsr_mcu.dr @@DATA i2c_mcu FFB3AH 0000AH @@DATA i2c_twl FFB44H 00000H @@DATA led FFB44H 0008AH - @@DATA rtc FFBCEH 0000AH - @@DATA vreg_ctr FFBD8H 0005EH - @@DATA vreg_twl FFC36H 00012H - @@DATA adc FFC48H 00018H - @@DATA renge FFC60H 00022H - @@DATA accero FFC82H 00002H + @@DATA rtc FFBCEH 00008H + @@DATA vreg_ctr FFBD6H 0005EH + @@DATA vreg_twl FFC34H 00012H + @@DATA adc FFC46H 00018H + @@DATA renge FFC5EH 00022H + @@DATA accero FFC80H 00002H @@DATA self_flash - FFC84H 00002H - @@DATA sw FFC86H 00006H + FFC82H 00002H + @@DATA sw FFC84H 00006H @@DATA task_debug - FFC8CH 00000H + FFC8AH 00000H @@DATA task_misc - FFC8CH 0000EH - @@DATA task_sys FFC9AH 00002H + FFC8AH 0000EH + @@DATA task_sys FFC98H 00002H @@DATA pedo_alg_thre_det2 - FFC9CH 00096H - @@DATA ini_VECT FFD32H 00000H + FFC9AH 00096H + @@DATA ini_VECT FFD30H 00000H @@DATA task_status - FFD32H 00002H - @@DATA @rom FFD34H 00000H - @@INIT FFD34H 0003AH DSEG BASEP - @@INIT @cstart FFD34H 00000H - @@INIT loader FFD34H 00000H - @@INIT pm FFD34H 00002H - @@INIT i2c_ctr FFD36H 00002H - @@INIT main FFD38H 00000H - @@INIT magic FFD38H 00000H - @@INIT WDT FFD38H 00000H - @@INIT i2c_mcu FFD38H 00000H - @@INIT i2c_twl FFD38H 00000H - @@INIT led FFD38H 00006H - @@INIT rtc FFD3EH 00000H - @@INIT vreg_ctr FFD3EH 00000H - @@INIT vreg_twl FFD3EH 00000H - @@INIT adc FFD3EH 0000CH - @@INIT renge FFD4AH 00014H - @@INIT accero FFD5EH 00000H + FFD30H 00002H + @@DATA @rom FFD32H 00000H + @@INIT FFD32H 0003AH DSEG BASEP + @@INIT @cstart FFD32H 00000H + @@INIT loader FFD32H 00000H + @@INIT pm FFD32H 00002H + @@INIT i2c_ctr FFD34H 00002H + @@INIT main FFD36H 00000H + @@INIT magic FFD36H 00000H + @@INIT WDT FFD36H 00000H + @@INIT i2c_mcu FFD36H 00000H + @@INIT i2c_twl FFD36H 00000H + @@INIT led FFD36H 00006H + @@INIT rtc FFD3CH 00000H + @@INIT vreg_ctr FFD3CH 00000H + @@INIT vreg_twl FFD3CH 00000H + @@INIT adc FFD3CH 0000CH + @@INIT renge FFD48H 00014H + @@INIT accero FFD5CH 00000H @@INIT self_flash - FFD5EH 00000H - @@INIT sw FFD5EH 00002H + FFD5CH 00000H + @@INIT sw FFD5CH 00002H @@INIT task_debug - FFD60H 00000H + FFD5EH 00000H @@INIT task_misc - FFD60H 00000H - @@INIT task_sys FFD60H 00002H + FFD5EH 00000H + @@INIT task_sys FFD5EH 00002H @@INIT pedo_alg_thre_det2 - FFD62H 0000AH - @@INIT ini_VECT FFD6CH 00000H + FFD60H 0000AH + @@INIT ini_VECT FFD6AH 00000H @@INIT task_status - FFD6CH 00002H - @@INIT @rom FFD6EH 00000H - @@INIS FFD6EH 00000H DSEG UNITP - @@INIS @cstart FFD6EH 00000H - @@INIS loader FFD6EH 00000H - @@INIS pm FFD6EH 00000H - @@INIS i2c_ctr FFD6EH 00000H - @@INIS main FFD6EH 00000H - @@INIS magic FFD6EH 00000H - @@INIS WDT FFD6EH 00000H - @@INIS i2c_mcu FFD6EH 00000H - @@INIS i2c_twl FFD6EH 00000H - @@INIS led FFD6EH 00000H - @@INIS rtc FFD6EH 00000H - @@INIS vreg_ctr FFD6EH 00000H - @@INIS vreg_twl FFD6EH 00000H - @@INIS adc FFD6EH 00000H - @@INIS renge FFD6EH 00000H - @@INIS accero FFD6EH 00000H + FFD6AH 00002H + @@INIT @rom FFD6CH 00000H + @@INIS FFD6CH 00000H DSEG UNITP + @@INIS @cstart FFD6CH 00000H + @@INIS loader FFD6CH 00000H + @@INIS pm FFD6CH 00000H + @@INIS i2c_ctr FFD6CH 00000H + @@INIS main FFD6CH 00000H + @@INIS magic FFD6CH 00000H + @@INIS WDT FFD6CH 00000H + @@INIS i2c_mcu FFD6CH 00000H + @@INIS i2c_twl FFD6CH 00000H + @@INIS led FFD6CH 00000H + @@INIS rtc FFD6CH 00000H + @@INIS vreg_ctr FFD6CH 00000H + @@INIS vreg_twl FFD6CH 00000H + @@INIS adc FFD6CH 00000H + @@INIS renge FFD6CH 00000H + @@INIS accero FFD6CH 00000H @@INIS self_flash - FFD6EH 00000H - @@INIS sw FFD6EH 00000H + FFD6CH 00000H + @@INIS sw FFD6CH 00000H @@INIS task_debug - FFD6EH 00000H + FFD6CH 00000H @@INIS task_misc - FFD6EH 00000H - @@INIS task_sys FFD6EH 00000H + FFD6CH 00000H + @@INIS task_sys FFD6CH 00000H @@INIS pedo_alg_thre_det2 - FFD6EH 00000H - @@INIS ini_VECT FFD6EH 00000H + FFD6CH 00000H + @@INIS ini_VECT FFD6CH 00000H @@INIS task_status - FFD6EH 00000H - @@INIS @rom FFD6EH 00000H - @@DATS FFD6EH 00000H DSEG UNITP - @@DATS @cstart FFD6EH 00000H - @@DATS loader FFD6EH 00000H - @@DATS pm FFD6EH 00000H - @@DATS i2c_ctr FFD6EH 00000H - @@DATS main FFD6EH 00000H - @@DATS magic FFD6EH 00000H - @@DATS WDT FFD6EH 00000H - @@DATS i2c_mcu FFD6EH 00000H - @@DATS i2c_twl FFD6EH 00000H - @@DATS led FFD6EH 00000H - @@DATS rtc FFD6EH 00000H - @@DATS vreg_ctr FFD6EH 00000H - @@DATS vreg_twl FFD6EH 00000H - @@DATS adc FFD6EH 00000H - @@DATS renge FFD6EH 00000H - @@DATS accero FFD6EH 00000H + FFD6CH 00000H + @@INIS @rom FFD6CH 00000H + @@DATS FFD6CH 00000H DSEG UNITP + @@DATS @cstart FFD6CH 00000H + @@DATS loader FFD6CH 00000H + @@DATS pm FFD6CH 00000H + @@DATS i2c_ctr FFD6CH 00000H + @@DATS main FFD6CH 00000H + @@DATS magic FFD6CH 00000H + @@DATS WDT FFD6CH 00000H + @@DATS i2c_mcu FFD6CH 00000H + @@DATS i2c_twl FFD6CH 00000H + @@DATS led FFD6CH 00000H + @@DATS rtc FFD6CH 00000H + @@DATS vreg_ctr FFD6CH 00000H + @@DATS vreg_twl FFD6CH 00000H + @@DATS adc FFD6CH 00000H + @@DATS renge FFD6CH 00000H + @@DATS accero FFD6CH 00000H @@DATS self_flash - FFD6EH 00000H - @@DATS sw FFD6EH 00000H + FFD6CH 00000H + @@DATS sw FFD6CH 00000H @@DATS task_debug - FFD6EH 00000H + FFD6CH 00000H @@DATS task_misc - FFD6EH 00000H - @@DATS task_sys FFD6EH 00000H + FFD6CH 00000H + @@DATS task_sys FFD6CH 00000H @@DATS pedo_alg_thre_det2 - FFD6EH 00000H - @@DATS ini_VECT FFD6EH 00000H + FFD6CH 00000H + @@DATS ini_VECT FFD6CH 00000H @@DATS task_status - FFD6EH 00000H - @@DATS @rom FFD6EH 00000H - FSL_DATA FFD6EH 00010H DSEG UNITP + FFD6CH 00000H + @@DATS @rom FFD6CH 00000H + FSL_DATA FFD6CH 00010H DSEG UNITP FSL_DATA fsl_common - FFD6EH 00010H - @@INITL FFD7EH 00000H DSEG UNIT64KP - @@INITL loader FFD7EH 00000H - @@INITL pm FFD7EH 00000H - @@INITL i2c_ctr FFD7EH 00000H - @@INITL main FFD7EH 00000H - @@INITL magic FFD7EH 00000H - @@INITL WDT FFD7EH 00000H - @@INITL i2c_mcu FFD7EH 00000H - @@INITL i2c_twl FFD7EH 00000H - @@INITL led FFD7EH 00000H - @@INITL rtc FFD7EH 00000H - @@INITL vreg_ctr FFD7EH 00000H - @@INITL vreg_twl FFD7EH 00000H - @@INITL adc FFD7EH 00000H - @@INITL renge FFD7EH 00000H - @@INITL accero FFD7EH 00000H + FFD6CH 00010H + @@INITL FFD7CH 00000H DSEG UNIT64KP + @@INITL loader FFD7CH 00000H + @@INITL pm FFD7CH 00000H + @@INITL i2c_ctr FFD7CH 00000H + @@INITL main FFD7CH 00000H + @@INITL magic FFD7CH 00000H + @@INITL WDT FFD7CH 00000H + @@INITL i2c_mcu FFD7CH 00000H + @@INITL i2c_twl FFD7CH 00000H + @@INITL led FFD7CH 00000H + @@INITL rtc FFD7CH 00000H + @@INITL vreg_ctr FFD7CH 00000H + @@INITL vreg_twl FFD7CH 00000H + @@INITL adc FFD7CH 00000H + @@INITL renge FFD7CH 00000H + @@INITL accero FFD7CH 00000H @@INITL self_flash - FFD7EH 00000H - @@INITL sw FFD7EH 00000H + FFD7CH 00000H + @@INITL sw FFD7CH 00000H @@INITL task_debug - FFD7EH 00000H + FFD7CH 00000H @@INITL task_misc - FFD7EH 00000H - @@INITL task_sys FFD7EH 00000H + FFD7CH 00000H + @@INITL task_sys FFD7CH 00000H @@INITL pedo_alg_thre_det2 - FFD7EH 00000H - @@INITL ini_VECT FFD7EH 00000H + FFD7CH 00000H + @@INITL ini_VECT FFD7CH 00000H @@INITL task_status - FFD7EH 00000H - @@INITL @rom FFD7EH 00000H - @@DATAL FFD7EH 00000H DSEG UNIT64KP - @@DATAL loader FFD7EH 00000H - @@DATAL pm FFD7EH 00000H - @@DATAL i2c_ctr FFD7EH 00000H - @@DATAL main FFD7EH 00000H - @@DATAL magic FFD7EH 00000H - @@DATAL WDT FFD7EH 00000H - @@DATAL i2c_mcu FFD7EH 00000H - @@DATAL i2c_twl FFD7EH 00000H - @@DATAL led FFD7EH 00000H - @@DATAL rtc FFD7EH 00000H - @@DATAL vreg_ctr FFD7EH 00000H - @@DATAL vreg_twl FFD7EH 00000H - @@DATAL adc FFD7EH 00000H - @@DATAL renge FFD7EH 00000H - @@DATAL accero FFD7EH 00000H + FFD7CH 00000H + @@INITL @rom FFD7CH 00000H + @@DATAL FFD7CH 00000H DSEG UNIT64KP + @@DATAL loader FFD7CH 00000H + @@DATAL pm FFD7CH 00000H + @@DATAL i2c_ctr FFD7CH 00000H + @@DATAL main FFD7CH 00000H + @@DATAL magic FFD7CH 00000H + @@DATAL WDT FFD7CH 00000H + @@DATAL i2c_mcu FFD7CH 00000H + @@DATAL i2c_twl FFD7CH 00000H + @@DATAL led FFD7CH 00000H + @@DATAL rtc FFD7CH 00000H + @@DATAL vreg_ctr FFD7CH 00000H + @@DATAL vreg_twl FFD7CH 00000H + @@DATAL adc FFD7CH 00000H + @@DATAL renge FFD7CH 00000H + @@DATAL accero FFD7CH 00000H @@DATAL self_flash - FFD7EH 00000H - @@DATAL sw FFD7EH 00000H + FFD7CH 00000H + @@DATAL sw FFD7CH 00000H @@DATAL task_debug - FFD7EH 00000H + FFD7CH 00000H @@DATAL task_misc - FFD7EH 00000H - @@DATAL task_sys FFD7EH 00000H + FFD7CH 00000H + @@DATAL task_sys FFD7CH 00000H @@DATAL pedo_alg_thre_det2 - FFD7EH 00000H - @@DATAL ini_VECT FFD7EH 00000H + FFD7CH 00000H + @@DATAL ini_VECT FFD7CH 00000H @@DATAL task_status - FFD7EH 00000H - @@DATAL @rom FFD7EH 00000H -* gap * FFD7EH 00082H + FFD7CH 00000H + @@DATAL @rom FFD7CH 00000H +* gap * FFD7CH 00084H MEMORY=RAM2 BASE ADDRESS=FFE20H SIZE=000C0H @@ -619,31 +588,31 @@ Direc-file:bsr_mcu.dr @@BITS loader FFE20H.0 00000H.0 @@BITS pm FFE20H.0 00000H.7 @@BITS i2c_ctr FFE20H.7 00000H.0 - @@BITS main FFE20H.7 00000H.0 - @@BITS magic FFE20H.7 00000H.0 - @@BITS WDT FFE20H.7 00000H.0 - @@BITS i2c_mcu FFE20H.7 00000H.3 - @@BITS i2c_twl FFE21H.2 00000H.0 - @@BITS led FFE21H.2 00000H.5 - @@BITS rtc FFE21H.7 00000H.3 - @@BITS vreg_ctr FFE22H.2 00000H.1 - @@BITS vreg_twl FFE22H.3 00000H.0 - @@BITS adc FFE22H.3 00000H.4 - @@BITS renge FFE22H.7 00000H.3 - @@BITS accero FFE23H.2 00000H.0 + @@BITS main FFE20H.7 00000H.1 + @@BITS magic FFE21H.0 00000H.0 + @@BITS WDT FFE21H.0 00000H.0 + @@BITS i2c_mcu FFE21H.0 00000H.3 + @@BITS i2c_twl FFE21H.3 00000H.0 + @@BITS led FFE21H.3 00000H.5 + @@BITS rtc FFE22H.0 00000H.3 + @@BITS vreg_ctr FFE22H.3 00000H.1 + @@BITS vreg_twl FFE22H.4 00000H.0 + @@BITS adc FFE22H.4 00000H.4 + @@BITS renge FFE23H.0 00000H.3 + @@BITS accero FFE23H.3 00000H.0 @@BITS self_flash - FFE23H.2 00000H.0 - @@BITS sw FFE23H.2 00000H.2 + FFE23H.3 00000H.0 + @@BITS sw FFE23H.3 00000H.2 @@BITS task_debug - FFE23H.4 00000H.0 + FFE23H.5 00000H.0 @@BITS task_misc - FFE23H.4 00000H.2 - @@BITS task_sys FFE23H.6 00000H.0 + FFE23H.5 00000H.2 + @@BITS task_sys FFE23H.7 00000H.0 @@BITS pedo_alg_thre_det2 - FFE23H.6 00000H.1 - @@BITS ini_VECT FFE23H.7 00000H.0 + FFE23H.7 00000H.1 + @@BITS ini_VECT FFE24H.0 00000H.0 @@BITS task_status - FFE23H.7 00000H.0 + FFE24H.0 00000H.0 * gap * FFE24H 000B0H @@SEGREG FFED4H 00004H DSEG AT @@SEGREG @SEGREG FFED4H 00004H @@ -651,6 +620,16 @@ Direc-file:bsr_mcu.dr @@RTARG0 @RTARG0 FFED8H 00008H + +78K0R Linker W1.31 Date: 9 Nov 2010 Page: 2 + +*** Not allocated segment *** + +SEGMENT SIZE TYPE MEMORY + +@@R_INIT 00003AH CSEG UNIT64KP ROM + + Target chip : uPD79F0104 Device file : E1.00b  \ No newline at end of file diff --git a/trunk/hoge.bin b/trunk/hoge.bin index fc6afe5..4beb9dd 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/i2c_mcu.c b/trunk/i2c_mcu.c index a4265e0..25ad57b 100644 --- a/trunk/i2c_mcu.c +++ b/trunk/i2c_mcu.c @@ -72,7 +72,9 @@ u8 iic_send_wo_dma_len; u8 iic_mcu_result; // 一文字リードの時はデータを返す。 // ステータスが必要ならこっちを呼んで - +#ifdef i2c_timeout_test +extern bit i2c_mcu_time_out_error; +#endif // ======================================================== void nop8() @@ -97,6 +99,9 @@ static err iic_mcu_wait_free() EI(); if( ++tot == 0 ) { +#ifdef i2c_timeout_test + i2c_mcu_time_out_error = true; +#endif return( ERR_ERR ); } } diff --git a/trunk/main.c b/trunk/main.c index 3a7b8dd..57bac84 100644 --- a/trunk/main.c +++ b/trunk/main.c @@ -22,14 +22,20 @@ system_status_ system_status; uni_pool pool; -extern u16 rtc_stop_check; - +#ifdef i2c_timeout_test +bit i2c_mcu_time_out_error; // I2Cが何らかで詰まった。結露など含む。 +extern void i2c_mcu_error_monitor(); +#endif /* ======================================================== 本当のエントリ関数は loader.c にあります ======================================================== */ void main_loop( void ) { +#ifdef i2c_timeout_test + i2c_mcu_time_out_error = false; +#endif + // 電池投入時、ファームアップデート後のみ RTC_init( ); // 内部でリブートか判定しています @@ -65,16 +71,13 @@ void main_loop( void ) { // システムtick、または割り込みで廻ります。 renge_task_interval_run( ); // 内部で、システムtickまたは強制起動します renge_task_immed_run(); -// HALT( ); - if( ++rtc_stop_check == 0 ) +#ifdef i2c_timeout_test + if( i2c_mcu_time_out_error ) { - // RTC割り込みが来ない - RTCE = 0; - RTCEN = 0; - wait_ms( 200 ); - RTC_init(); -// mcu_wdt_reset; + i2c_mcu_error_monitor(); } +#endif + HALT( ); } } diff --git a/trunk/pm.c b/trunk/pm.c index d968e17..06dfda3 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -586,7 +586,7 @@ void BT_get_left(){ else { // バッテリパラメータの関係でビットシフトが必要 - temp16 = ( temp_fuel[0] << 8 ) + temp_fuel[1]; + temp16 = temp_fuel[0] * 256 + temp_fuel[1]; temp16 /= BT_RCOMP_SCALE[ battery_manufacturer ]; temp_fuel[0] = (u8)(( temp16 >> 8 ) & 0xFF); temp_fuel[1] = (u8)(temp16 & 0xFF); @@ -596,7 +596,7 @@ void BT_get_left(){ { vreg_ctr[ VREG_C_BT_VOLTAGE ] = temp_v[0]; - temp16 = ( temp_v[0] << 8 ) + temp_v[1]; + temp16 = temp_v[0] * 256 + temp_v[1]; if( temp16 > V_TH_30 ) { @@ -618,10 +618,15 @@ void BT_get_left(){ temp_force_fule_left = BATT_TH_EMPTY; hysteresis = 500; } + else if( temp16 > V_TH_FORCE_OFF ) + { + temp_force_fule_left = 0; + hysteresis = 500; + } else { -// temp_force_fule_left = 0; system_status.force_off = 1; // 強制電源断フラグ（カウンタ） + hysteresis = 500; } } } diff --git a/trunk/pm.h b/trunk/pm.h index 603f815..74926ba 100644 --- a/trunk/pm.h +++ b/trunk/pm.h @@ -19,7 +19,8 @@ #define V_TH_LO 40960 #define V_TH_EMPTY 40320 #define V_TH_ZERO 39680 -// 上から順に 3300, 3200, 3150, 3100[mV] +#define V_TH_FORCE_OFF 37120 +// 上から順に 3300, 3200, 3150, 3100, 2900[mV] //========================================================= diff --git a/trunk/rtc.c b/trunk/rtc.c index a79b7c6..ce00e45 100644 --- a/trunk/rtc.c +++ b/trunk/rtc.c @@ -15,8 +15,6 @@ bit rtc_lock; bit rtc_dirty; bit rtc_alarm_dirty; -u16 rtc_stop_check; - /* ======================================================== ペリフェラルの初期化 @@ -168,5 +166,4 @@ void rtc_unlock( ) __interrupt void int_rtc_int( ) { renge_flg_interval += 1; // インクリメント/デクリメント命令を使うので DI()不要 - rtc_stop_check = 1; } diff --git a/trunk/task_misc.c b/trunk/task_misc.c index 48b3c80..b792be0 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -315,3 +315,15 @@ end: return( ERR_FINISED ); } +#ifdef i2c_timeout_test +void i2c_mcu_error_monitor() + { + LED_duty_pow_blu = 0xff; + LED_duty_3d = 0xff; + LED_duty_notify_red = 0xff; + LED_duty_notify_grn = 0xff; + LED_duty_notify_blu = 0xff; + LED_pow_red = 1; + LED_CAM = 1; + } +#endif diff --git a/trunk/task_sys.c b/trunk/task_sys.c index 749eea2..569ed1c 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -34,6 +34,9 @@ extern bit bt_chg_ready; static u8 timeout_sleep; extern u8 chg_led_override; +#ifdef i2c_timeout_test +extern bit i2c_mcu_time_out_error; +#endif /* ======================================================== マイコン内部で必要なもの @@ -159,6 +162,16 @@ void tsk_sys( ) break; case ON_TRIG: //------------------------------------------------------- +#ifdef i2c_timeout_test + LED_duty_pow_blu = 0; // debug + LED_duty_3d = 0; + LED_duty_notify_red = 0; + LED_duty_notify_grn = 0; + LED_duty_notify_blu = 0; + LED_pow_red = 0; + LED_CAM = 0; + i2c_mcu_time_out_error = false; +#endif IIC_ctr_Init( ); IIC_twl_Init( ); RTC_32k_on( ); @@ -231,6 +244,7 @@ void tsk_sys( ) } } + // 絶対に SLP_REQ の前に予告が来るので、sleepに入るときはピンでのチェック不用 if( going_to_sleep ) { timeout_sleep += 1; diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index c19fb26..5257145 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -80,8 +80,8 @@ Kanji=SJIS [Source] Geometry=89, 128, 1021, 817 Window=Normal -DispStart=423 -CaretPos=424,0 +DispStart=38 +CaretPos=91,0 Mode=Normal DispFile= Address1= @@ -142,19 +142,27 @@ Accumulative=ON [Source1] Geometry=100, 100, 1021, 817 Window=Normal -DispStart=25 -CaretPos=1,0 +DispStart=24 +CaretPos=25,0 Mode=Normal DispFile=main.c Accumulative=ON [Source2] Geometry=125, 125, 1021, 817 Window=Normal -DispStart=116 -CaretPos=1,0 +DispStart=115 +CaretPos=116,0 Mode=Normal DispFile=rtc.c Accumulative=ON +[Source3] +Geometry=0, 0, 1021, 817 +Window=Normal +DispStart=79 +CaretPos=1,0 +Mode=Normal +DispFile=i2c_mcu.c +Accumulative=ON [Assemble] Geometry=30, 440, 968, 626 Window=Hide @@ -1016,15 +1024,11 @@ Line=18 Geometry=709, 826, 445, 260 Window=Normal Width=150 30 200 100 -Name0=Swb00001 -Address0=main.c#_main_loop+0x4d +Name0=Swb00003 +Address0=i2c_mcu.c#_iic_mcu_wait_free+0x1a Window0=ASM Status0=ON -Name1=Swb00002 -Address1=loader.c#_main+0x8 -Window1=ASM -Status1=ON -Count=2 +Count=1 [Reset] Debugger=ON Symbol=OFF diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index f00613c..a6d60ba 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -7,16 +7,18 @@ FrameCY=854 OpenFile1=jhl_defs.h,0,286,286,1530,1012,0,15,26,0 OpenFile2=self_flash.c,0,352,352,1596,1078,0,142,5,0 OpenFile3=ini_VECT.c,0,330,330,1574,1056,6,93,6,0 -OpenFile4=main.c,0,220,220,1464,946,3,59,3,0 -OpenFile5=renge\renge.c,0,348,332,1592,1058,0,31,0,0 -OpenFile6=renge\renge.h,0,264,264,1508,990,3,4,3,0 -OpenFile7=adc.c,0,220,220,1464,946,8,230,8,0 -OpenFile8=ProjectWindow +OpenFile4=renge\renge.c,0,348,332,1592,1058,0,31,0,0 +OpenFile5=renge\renge.h,0,264,264,1508,990,3,4,3,0 +OpenFile6=adc.c,0,220,220,1464,946,8,230,8,0 +OpenFile7=ProjectWindow PrjPos=0,0,1039,0,345 -OpenFile9=config.h,0,242,242,1486,968,0,40,0,0 -OpenFile10=led.c,0,264,264,1508,990,0,751,0,0 -OpenFile11=task_misc.c,0,286,286,1530,1012,65,141,69,0 -OpenFile12=OutputWindow +OpenFile8=config.h,0,242,242,1486,968,0,40,0,0 +OpenFile9=led.c,0,264,264,1508,990,0,751,0,0 +OpenFile10=task_misc.c,0,286,286,1530,1012,65,141,69,0 +OpenFile11=main.c,0,220,220,1464,946,3,27,1,0 +OpenFile12=i2c_mcu.c,0,308,308,1552,1034,10,76,7,0 +OpenFile13=task_sys.c,0,330,330,1574,1056,10,38,7,0 +OpenFile14=OutputWindow OutputPos=0,3,734,347,1591 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow]