diff --git a/trunk/bsr.hex b/trunk/bsr.hex index 540c449..59a6f02 100644 --- a/trunk/bsr.hex +++ b/trunk/bsr.hex @@ -1,21 +1,21 @@ -:02000000F60CFC +:02000000F50CFD :02000200FFFFFE :0C000400FFFFFFFFFFFFFFFFFFFFFFFFFC -:04001000904A964A32 +:040010008D4A934A38 :08001400FFFFFFFFFFFFFFFFEC -:02001C006B4C2B +:02001C00684C2E :06001E00FFFFFFFFFFFFE2 -:02002400D74CB7 +:02002400D44CBA :04002600FFFFFFFFDA -:02002A00444D43 +:02002A00414D46 :08002C00FFFFFFFFFFFFFFFFD4 -:08003400634E114E5E4E954F24 +:08003400604E0E4E5B4E924F30 :0E003C00FFFFFFFFFFFFFFFFFFFFFFFFFFFFC4 -:02004A00984AD2 +:02004A00954AD5 :0E004C00FFFFFFFFFFFFFFFFFFFFFFFFFFFFB4 -:02005A00D34A87 +:02005A00D04A8A :06005C00FFFFFFFFFFFFA4 -:02006200164F37 +:02006200134F3A :10006400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF9C :10007400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8C :10008400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7C @@ -57,7 +57,7 @@ :1002A800D43CFD2D05717AFAFDB924F51EF98F208D :1002B800F93135175003C15084FD3603C0625C0123 :1002C800D161E8CF1EF902CFDFFB64FDA234FDED5A -:1002D80002FD9548714222712BE7CEABACFDD73CAD +:1002D80002FD9248714222712BE7CEABACFDD73CB0 :1002E80061EDEFF6D731020403F6EF01E660342042 :1002F800F9718C8971899931120403F6EF01E6606E :100308003420F9718C89719999D7D7C7F616FD2DC4 @@ -108,24 +108,24 @@ :1005D80002EF2617FD95046770FD9504FDE10450B0 :1005E800A4FD95045020FD9504D942FBFD9504A077 :1005F80042FBFD0A05715320F2C6D7C72006FBF857 -:10060800FFFD2E095015C15008FD6B08C0CC05042C -:100618008C054C15DE0C8C05318EFDD80961590509 -:10062800EFEECC05048C054C1561C8EDDD06CC0455 +:10060800FFFD2D095014C15008FD6B08C0CC05042E +:100618008C054C14DE0C8C05318EFDD7096159050B +:10062800EFEECC05048C054C1461C8EDDD06CC0456 :10063800008C044C04DE79C73641057184C6DC7031 :100648003022F9BC02F6BB31B2D10EC73641057172 :1006580084C6DC05CEABACEFEE713BD1AC02148F97 :1006680040059971505005617902617900F0E161A6 :100678004900DD09C73641057184C6DECA5040C14C :100688008C05318E31AD128C04318E318D03BDD87D -:1006980031FFBDDADADAADD8FDA40CC0D2DD0C50DA -:1006A80008C15015FD6B08C0FD740C615904EF8139 -:1006B8008C05318EFDDC09D2DD0C5008C15015FDCA -:1006C8006B08C0FD740CC73641057184C6DC066131 +:1006980031FFBDDADADAADD8FDA30CC0D2DD0C50DB +:1006A80008C15014FD6B08C0FD730C615904EF813B +:1006B8008C05318EFDDB09D2DD0C5008C15014FDCC +:1006C8006B08C0FD730CC73641057184C6DC066132 :1006D8005905ED2D0671605005CC0200CC03008C45 :1006E800034C09DE248C03318E1249F61F728C03E9 :1006F800318E04F64F14896142DF03F6EF01E6609C -:100708000E029C02615903EFD68C02D1DF05FD620F -:100718000BEF095008C15015FD6B08C0FD740C1093 +:100708000E029C02615903EFD68C02D1DF05FD6110 +:100718000BEF095008C15014FD6B08C0FD730C1095 :1007280006C6D7C72004FBF8FF715B21CC0100F691 :10073800BC02AC02440900DE3EAC0204F61F1441C0 :1007480000118972AC020C5114896142DF03F6EF83 @@ -142,134 +142,134 @@ :1007F800F570FCF0C15003C15084FDD2031004EF22 :1008080012E6BC02F6614902DDB000000000617921 :1008180002EFF1CE3708CBE4FFFFCBE6FFF7CED4EB -:10082800FFCF370008F5120561FDF5ABFFFD2E0976 -:10083800D25008C15015FD6B08C0D2FD620BD2FD25 -:10084800740C1004C6D73184BD02EFFA717BBDCB9E +:10082800FFCF370008F5120561FDF5ABFFFD2D0977 +:10083800D25008C15014FD6B08C0D2FD610BD2FD27 +:10084800730C1004C6D73184BD02EFFA717BBDCB9F :10085800E4FFFFCBE6FFFFCBD4FFFF717ABED77171 :100868007BBED7C7C1200AFBF8FF8C0A318E31AD99 :10087800C1317B9DD4C0BC048DD49C068C129C09CC -:100888008C12318E040C00128C09318E33BDD813B2 -:10089800FD330F61D8ED2909CEABAC8C09318EFD43 -:1008A800D409D2DD098C09318EFDD809EFEDCC08C9 -:1008B800008C084C04DE57CEABACF6BC023022F9F3 -:1008C800BBAC04148C069EFD118972AB146299AC02 -:1008D80004A1BC04617900617902F0E1614902DF99 -:1008E800E05040C18C09318E31AD128C08318E3107 -:1008F8008D03BDD831FFBDDADADAADD8FDA40CC05E -:10090800D2DD06FD6708E2EF19615908EFA38C09EB -:10091800318EFDDC09D2DD03E2EF07615909ED886C -:1009280008F2100CC6D7C7717B9D717BFAFD4E0883 -:100938003022F9FD870AFD120AC6D7FD2E09FD618E -:100948000BFD6708F2D7D7C7D54AFDDD05B04AFDCC -:10095800EF78CF4AFD02311407067110E3FBEF046C -:100968007118E3FB8FE3FB7F0EFD76D1DD5C8FE32F -:10097800FB9F0EFD401EF903DF22665C10D1DD1CD3 -:100988008FE3FB5C10D1DD0B5080C15011FDB438F2 -:10099800C0EF095040C15011FDB438C0401EF903E2 -:1009A800DD06401EF904DF22665C02D1DD1C8FE300 -:1009B800FB5C02D1DD0B5040C15010FDB438C0EFD4 -:0C09C800095020C15010FDB438C0C6D743 -:1009D4005208EF065203EF025206FEE600FE1B0029 -:1009E400DC16089F03088F0408089F040862FE248D -:1009F40000089F0408EEBF00EEBA00C1C514410E02 -:100A040011D9D0FF118FD1FF312E45C4C0D7F23197 -:100A1400A2C401E2D79DE261DD4C09DF12717BFAC9 -:100A2400C18F06089F5BFDC0CF060800EE2700318A -:100A3400F2FA04CF0608004C00DF05D50008DD16E5 -:100A440061DD717BFAD50608DD0ACDE31F61CD6156 -:100A5400CDEE160061CDFED40061FFFE9A00FCF8D5 -:100A6400FF0EFEB20061CDFED5004C09DF0EC18F32 -:100A740006086F5BFD9F0608C0EE0400CF06080061 -:100A8400F8E3D75200EF025202FE3700CF5AFD00BE -:100A9400CF060800BF0408C716629F000841001172 -:100AA4008F78239B4100118F79239F0108C6510041 -:100AB400FE62FFEF025205CF060800C1510CFE0A88 -:100AC40000C0D7C1511DFE0200C0D761DD717BFAA1 -:100AD40070CEC0A59EC47CFF9EC4609EC461CDD769 -:100AE40061DD717BFAC18EC45C1BFED6FFCF0608A4 -:100AF40001FED7FFC061CDD731F2FA1AC1AEE4BF0F -:100B04004CFDAEE6BF4EFDAED4BF50FD30FFFFBE80 -:100B1400E4BEE6BED4C0D731F2FA11C1AF4CFDBE7B -:100B2400E4AF4EFDBEE6AF50FDBED4C0D7C1BF5248 -:100B3400FD13BF54FD15BF56FD17BF58FDC0D7AFF9 -:100B440052FDDB54FDEB56FDFB58FDD7534B3052A1 -:100B54005430324E323030475631323000FFC150BB -:100B6400FEFEAB0061DD717BFACF060800FE0A00D1 -:100B7400FEA4FF61CDF8E3EECF00C7FB0408BF4C31 -:100B8400FD8FC0009C05C5C337040600BF4EFD356C -:100B940036C60B300000522BFE6600C2C4C6307449 -:100BA4000BB800300000B8022004AF4EFDB800308E -:100BB4000F00B802AF4CFD61FF520AFE3AFFECF899 -:100BC400FF0E717BFAC1C7FB04088C05C65C80FE6E -:100BD4000200C0D761DD717BFA70CFC0FFA59FC052 -:100BE400007CFF9FC000609FC00061CDD7618BFE79 -:100BF400E2FF717BBE410011FB000017CEFC0061D7 -:100C0400CB089EFDF31161C999A58392DFF7D7FE46 -:100C1400B1FED55AFDDF23C1CF0308035109FEF409 -:100C2400FDC0D2DF37FE3800A20408CF0308075105 -:100C340009FEE1FDD2B20408DF22C7FB04083183B8 -:100C440002C6D7C6510AFECCFD624C1FDF06CF5A3E -:100C5400FD01EF04CF5AFD00C0EE5BFEC0EE55FE71 -:100C6400C7C1FB04088B31196C0161589BC0C6D7FE -:100C7400717BFAFE4DFEAF0408040600C11436D899 -:100C84000B300000522DF3FE77FF8FC000FE2BFEC9 -:100C940061CF5C807C8073C0041900CEFC0F61CBF3 -:100CA400C55404EF03C55417FE18FEC7360008BB2D -:100CB400629C0288089C03D1DD334C41DE2F70F125 -:100CC400312DB161090033081C000851FF612A412C -:100CD4000E118FD0FF613B118FD1FF6138DC0E8B79 -:100CE4005C03DF0964C6C4FE2BFDEECAFDC6C4EE78 -:020CF400C3FD3E -:100CF60061CF5100718C7109FECBF800FEFC9401A6 -:100D060000F6BF00F953C0F693935820FEDFF94171 -:100D160000361A203410FDEF05118B99A7A517444C -:100D26005620DFF53602F93010FDEF04CC0000A79F -:100D360047DFF94100365620344CFDEF05118B99FB -:100D4600A7A517445620DFF5364CFD304CFDEF04C1 -:100D5600CC0000A747DFF9FCD80000EFFE61DD718B -:100D66007BFABEF0ADD8BEF200AEF661CDD7C36158 -:100D7600DD717BFABEF0ADD8BEF200DBF6FFADDC6E -:100D8600BEF000AEF6BDD8AEF40312ADDABEF20088 -:100D9600AEF661CD03BDDAC2D7C3F33174D9088389 -:100DA600C1F626D8BDD8C031750683C312F623C254 -:100DB600FDC10D93DF0312F623C2D7440000DD26E2 -:100DC60061DD717BFACFE80080BEF6F6BEF4BEF2B6 -:100DD600ADD8BEF0CFE800818FE8003103FAAEF05F -:100DE600F5E80061CDD7B1D7C3F33174D90883C113 -:100DF600F626D8BDD8C0317505C312F623C2FD0F3D -:100E06000E93DF0312F623C2D7440000DD2761DD0F -:100E1600717BFACFE80080BEF6F6BEF4BEF2ADD81E -:100E2600BEF0CFE800818FE8003103FAAFE000F5AD -:100E3600E80061CDD7ADD8D7C3F33174DB0F83C1DA -:100E4600F626D8BDD861317026DABDDAC031750D07 -:100E560083C312F626DCBDDC61317023C2FD770E3A -:100E660093DF0CF626D8BDD861317026DABDDAC21A -:100E7600D7C161686BDC6BDDC0DD2F61DD717BFA8C -:100E8600CFE80080BEF4ADDCBEF6ADD8BEF0ADDA7C -:100E9600BEF2CFE800818FE8003103FAAEF0BDD88C -:100EA600AEF2BDDAF5E80061CDD7F6BDD8BDDAD72A -:100EB6008292DD2B61DD717BFACFE80080BEF0F611 -:100EC600BEF2BEF46208BEF6CFE800818FE80031BC -:100ED60003FAAFE0006072AEF0F5E80061CDD760CE -:100EE60072F6B1D706DABDDAADDC06D8BDD861D860 -:100EF600A6DAD7D1DD17C1C3DAD89DD8ADDA311C51 -:100F060061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDE3 -:100F16001BC1C3DADA9DDAADD8311E33311E337107 -:100F2600F9B4DADFF4BDD813BDDAC2C0D746D8DDCE -:100F36000771FF7177D971C0D746DADF08C1ADDC1A -:100F460046D8C0DD077177DB71FF71C0D75BDB9DCB -:100F5600DB605BDA9DDAADDC5BD9085BD808BDD80F -:100F6600D7C3C7F3728EFDC162314C4100360020F3 -:100F76001161A072C09EFD62C6C2D7C3C7F3728E4E -:100F8600FDC1625C0F0C000FFE00314C4100360AB9 -:0F0F9600201161800FFE0073C09EFD63C6C2D79D -:100FA500FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4C -:100FB500FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3C -:100FC500FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2C -:100FD500FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1C -:100FE500FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0C -:010FF500FFFC -:0A0FF60031373A30323A313800004A +:100888008C12318E040C00128C09318EBDD813FDE8 +:10089800320F61C8ED2809CEABAC8C09318EFDD37F +:1008A80009D2DD098C09318EFDD709EFEDCC08009E +:1008B8008C084C04DE57CEABACF6BC023022F9BB38 +:1008C800AC04148C069EFD118972AB146299AC04B9 +:1008D800A1BC04617900617902F0E1614902DFE0BD +:1008E8005040C18C09318E31AD128C08318E318D5A +:1008F80003BDD831FFBDDADADAADD8FDA30CC0D21A +:10090800DD06FD6708E2EF19615908EFA38C09318C +:100918008EFDDB09D2DD03E2EF07615909ED880896 +:10092800F2100CC6D7C7717B9D717BFAFD4E08305B +:1009380022F9FD860AFD110AC6D7FD2D09FD600BB7 +:10094800FD6708F2D7D7C7D54AFDDD05B04AFDEFE8 +:1009580078CF4AFD02311407067110E3FBEF0471EA +:1009680018E3FB8FE3FB7F0EFD76D1DD5C8FE3FBA5 +:100978009F0EFD401EF903DF22665C10D1DD1C8F3F +:10098800E3FB5C10D1DD0B5080C15011FDB438C0C1 +:10099800EF095040C15011FDB438C0401EF903DDC5 +:1009A80006401EF904DF22665C02D1DD1C8FE3FBE2 +:1009B8005C02D1DD0B5040C15010FDB438C0EF09C6 +:0B09C8005020C15010FDB438C0C6D74D +:1009D3005208EF065203EF025206FEE600FE1B002A +:1009E300DC16089F03088F0408089F040862FE248E +:1009F30000089F0408EEBF00EEBA00C1C514410E03 +:100A030011D9D0FF118FD1FF312E45C4C0D7F23198 +:100A1300A2C401E2D79DE261DD4C09DF12717BFACA +:100A2300C18F06089F5BFDC0CF060800EE2700318B +:100A3300F2FA04CF0608004C00DF05D50008DD16E6 +:100A430061DD717BFAD50608DD0ACDE31F61CD6157 +:100A5300CDEE160061CDFED40061FFFE9A00FCF8D6 +:100A6300FF0EFEB20061CDFED5004C09DF0EC18F33 +:100A730006086F5BFD9F0608C0EE0400CF06080062 +:100A8300F8E3D75200EF025202FE3700CF5AFD00BF +:100A9300CF060800BF0408C716629F000841001173 +:100AA3008F78239B4100118F79239F0108C6510042 +:100AB300FE62FFEF025205CF060800C1510CFE0A89 +:100AC30000C0D7C1511DFE0200C0D761DD717BFAA2 +:100AD30070CEC0A59EC47CFF9EC4609EC461CDD76A +:100AE30061DD717BFAC18EC45C1BFED6FFCF0608A5 +:100AF30001FED7FFC061CDD731F2FA1AC1AEE4BF10 +:100B03004CFDAEE6BF4EFDAED4BF50FD30FFFFBE81 +:100B1300E4BEE6BED4C0D731F2FA11C1AF4CFDBE7C +:100B2300E4AF4EFDBEE6AF50FDBED4C0D7C1BF5249 +:100B3300FD13BF54FD15BF56FD17BF58FDC0D7AFFA +:100B430052FDDB54FDEB56FDFB58FDD7534B3052A2 +:100B53005430324E323030475631323000FFC150BC +:100B6300FEFEAB0061DD717BFACF060800FE0A00D2 +:100B7300FEA4FF61CDF8E3EECF00C7FB0408BF4C32 +:100B8300FD8FC0009C05C5C337040600BF4EFD356D +:100B930036C50B300000522BFE6600C2C4C630734C +:100BA3000BB800300000B8022004AF4EFDB800308F +:100BB3000F00B802AF4CFD61FF520AFE3AFFECF89A +:100BC300FF0E717BFAC1C7FB04088C05C65C80FE6F +:100BD3000200C0D761DD717BFA70CFC0FFA59FC053 +:100BE300007CFF9FC000609FC00061CDD7618BFE7A +:100BF300E2FF717BBE410011FB000017CEFC0061D8 +:100C0300CB089EFDF31161C999A58392DFF7D7FE47 +:100C1300B1FED55AFDDF23C1CF0308035109FEF40A +:100C2300FDC0D2DF37FE3800A20408CF0308075106 +:100C330009FEE1FDD2B20408DF22C7FB04083183B9 +:100C430002C6D7C6510AFECCFD624C1FDF06CF5A3F +:100C5300FD01EF04CF5AFD00C0EE5BFEC0EE55FE72 +:100C6300C7C1FB04088B31196C0161589BC0C6D7FF +:100C7300717BFAFE4DFEAF0408040600C11436D79B +:100C83000B300000522DF3FE77FF8FC000FE2BFECA +:100C930061CF5C807C8073C0041900CEFC0F61CBF4 +:100CA300C55404EF03C55417FE18FEC7360008BB2E +:100CB300629C0288089C03D1DD334C41DE2F70F126 +:100CC300312DB161090033081C000851FF612A412D +:100CD3000E118FD0FF613B118FD1FF6138DC0E8B7A +:100CE3005C03DF0964C6C4FE2BFDEECAFDC6C4EE79 +:020CF300C3FD3F +:100CF50061CF5100718C7109FECBF800FEFC9401A7 +:100D050000F6BF00F953C0F693935820FEDFF94172 +:100D150000361A203410FDEF05118B99A7A517444D +:100D25005620DFF53602F93010FDEF04CC0000A7A0 +:100D350047DFF94100365620344CFDEF05118B99FC +:100D4500A7A517445620DFF5364CFD304CFDEF04C2 +:100D5500CC0000A747DFF9FCD80000EFFE61DD718C +:100D65007BFABEF0ADD8BEF200AEF661CDD7C36159 +:100D7500DD717BFABEF0ADD8BEF200DBF6FFADDC6F +:100D8500BEF000AEF6BDD8AEF40312ADDABEF20089 +:100D9500AEF661CD03BDDAC2D7C3F33174D908838A +:100DA500C1F626D8BDD8C031750683C312F623C255 +:100DB500FDC00D93DF0312F623C2D7440000DD26E4 +:100DC50061DD717BFACFE80080BEF6F6BEF4BEF2B7 +:100DD500ADD8BEF0CFE800818FE8003103FAAEF060 +:100DE500F5E80061CDD7B1D7C3F33174D90883C114 +:100DF500F626D8BDD8C0317505C312F623C2FD0E3F +:100E05000E93DF0312F623C2D7440000DD2761DD10 +:100E1500717BFACFE80080BEF6F6BEF4BEF2ADD81F +:100E2500BEF0CFE800818FE8003103FAAFE000F5AE +:100E3500E80061CDD7ADD8D7C3F33174DB0F83C1DB +:100E4500F626D8BDD861317026DABDDAC031750D08 +:100E550083C312F626DCBDDC61317023C2FD760E3C +:100E650093DF0CF626D8BDD861317026DABDDAC21B +:100E7500D7C161686BDC6BDDC0DD2F61DD717BFA8D +:100E8500CFE80080BEF4ADDCBEF6ADD8BEF0ADDA7D +:100E9500BEF2CFE800818FE8003103FAAEF0BDD88D +:100EA500AEF2BDDAF5E80061CDD7F6BDD8BDDAD72B +:100EB5008292DD2B61DD717BFACFE80080BEF0F612 +:100EC500BEF2BEF46208BEF6CFE800818FE80031BD +:100ED50003FAAFE0006072AEF0F5E80061CDD760CF +:100EE50072F6B1D706DABDDAADDC06D8BDD861D861 +:100EF500A6DAD7D1DD17C1C3DAD89DD8ADDA311C52 +:100F050061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDE4 +:100F15001BC1C3DADA9DDAADD8311E33311E337108 +:100F2500F9B4DADFF4BDD813BDDAC2C0D746D8DDCF +:100F35000771FF7177D971C0D746DADF08C1ADDC1B +:100F450046D8C0DD077177DB71FF71C0D75BDB9DCC +:100F5500DB605BDA9DDAADDC5BD9085BD808BDD810 +:100F6500D7C3C7F3728EFDC162314C4100360020F4 +:100F75001161A072C09EFD62C6C2D7C3C7F3728E4F +:100F8500FDC1625C0F0C000FFE00314C4100360ABA +:0F0F9500201161800FFE0073C09EFD63C6C2D79E +:100FA400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4D +:100FB400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3D +:100FC400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2D +:100FD400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1D +:100FE400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0D +:020FF400FFFFFD +:0A0FF60031373A31383A3234000046 :10100000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0 :10101000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0 :10102000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD0 @@ -530,7 +530,7 @@ :10200A00001632486480961228446076920824406A :10201A00FF000000555555554700DCFB0000000045 :10202A0046FC000000000000D43F1B3AC423A02F46 -:10203A003131AE31F932C9404F094E098A420000A6 +:10203A003131AE31F932C9404E094D098A420000A8 :0C204A000000983AF82A23301299000098 :08205600317503F7332312D7A3 :10205E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF82 @@ -544,7 +544,7 @@ :1020DE00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF02 :1020EE00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2 :0220FE00FFFFE2 -:0A21000031373A30323A313800002E +:0A21000031373A31383A323400002A :10210A00AEF0B430B740BA30BB50BBB0BC50BD1013 :10211A00BD60BDB0BFE0C2B0C420C7B0CAE0CE1037 :10212A0001F0141014200630639049006E00777095 @@ -651,9 +651,9 @@ :10277400F512F98F02F99F10F98F02F95070D612F1 :10278400307351230480001231FF318E039F11F9FD :102794009FDEFBF6BB8F11F97C804C95DC1B8F11FF -:1027A400F9318F241400BDD8AF06F9FD630D123141 +:1027A400F9318F241400BDD8AF06F9FD620D123142 :1027B400FF318E03318FBBEF198F11F9318F241440 -:1027C40000BDD8AF08F9FD630D1231FF318E03311E +:1027C40000BDD8AF08F9FD620D1231FF318E03311F :1027D4008FBBD904F9F1610900BB44000171FEDC2F :1027E40003F690BB8C0101DE02F6BBABABBF76FCFB :1027F40017C15002C1500CC1506CFD08041006D220 @@ -666,18 +666,18 @@ :102864005002C15004C1506CFD60031006D2DD114A :102874007100E2FB710320F5DFFB715020F9ED5E7E :10288400298C06318E318D080E07081C00BBD91027 -:10289400FDF1041023148972ABFDB60EBB8C019CB0 +:10289400FDF1041023148972ABFDB50EBB8C019CB1 :1028A400068B9C0717040400C15002C1C1506CFD83 :1028B40060031006D261E8ED5E298C049FE1FB8C75 :1028C40004318E318D080E05081C00BBBDD8F6BD41 -:1028D400DAC9DC01A5FD3F0FDC09CC0364F6BF14A3 +:1028D400DAC9DC01A5FD3E0FDC09CC0364F6BF14A4 :1028E400F9EF77ABBDD8F6BDDAAF14F9BDDCF6BDB0 :1028F400DEADD8C1ADDAC1C9D800A0F6BDDAADDE0F -:10290400FDEA0EADD8BDDCADDABDDEC0BDDAC0BDBA -:10291400D8ADDEFD3F0F61D309CC031EF6BF14F919 -:10292400EF38ABBDD8F6BDDAC9DC819DFD3F0FDCC5 +:10290400FDE90EADD8BDDCADDABDDEC0BDDAC0BDBB +:10291400D8ADDEFD3E0F61D309CC031EF6BF14F91A +:10292400EF38ABBDD8F6BDDAC9DC819DFD3E0FDCC6 :102934000BCC030A30F401BF14F9EF1EABBDD8F67B -:10294400BDDAC9DC019BFD3F0FDC0BCC030530F481 +:10294400BDDAC9DC019BFD3E0FDC0BCC030530F482 :1029540001BF14F9EF04715020F93134040D311220 :102964000509CFDFFB64F5E0FBEF1A8C064E03DEAE :102974000C8C069FDFFB8C079FE0FBEF088C039F0A @@ -767,7 +767,7 @@ :102EB40000D7C788061666614FDD0967614EDE03D9 :102EC40096EF01866672C6D7C7161714AA0412A90C :102ED40043DD29AA0412A923FD5620C3AC02FD56E2 -:102EE4002013C2BDD813FD330FDE0C1714AA02122F +:102EE4002013C2BDD813FD320FDE0C1714AA021230 :102EF400AA0403BA04EF051714A9BA04AC041231E6 :102F0400FF319E03317F087208C6D7C77100F200F3 :102F1400304400BFB601300188BF9001300984BF3E @@ -793,7 +793,7 @@ :103054006CFDB62EC0F313BE6CD7FDB030D2DD0FBD :10306400CF18FD47F5A8FBAE6C317DBFAEFBD7E9A9 :10307400A8FB0918235080D6BFAAFB22AEFBBDD8FB -:10308400304700FD9F0DBFACFB30AAFBFDCC2EF3F7 +:10308400304700FD9E0DBFACFB30AAFBFDCC2EF3F8 :1030940013BE6CB018FDD518FDDF10CF18FD47A086 :1030A400A8FB40A8FB1F61C8F5A8FBD740DFFB0BBA :1030B400DC05717320F2D740DFFB0661D8311205BD @@ -801,7 +801,7 @@ :1030D400EF03FDDB30E2D7711221F0C1AE6CFDB617 :1030E4002EC0F313BE6CA0B0FB40B0FB40DC3DF53A :1030F400B0FBD9B1FBF1313F0414FD14D9B1FBF19C -:10310400BDD85008FDEE0D087208E6D2DD04019228 +:10310400BDD85008FDED0D087208E6D2DD04019229 :10311400DFFC896158D1DD05717220EF03717320E2 :10312400A0B1FB40B1FB2061C8F5B1FBD78FB2FB66 :10313400B0B2FBD1DF7331D4D106715BD1E5B4FBFE @@ -826,9 +826,9 @@ :10326400B6FB0948FB5080D6BFB8FBE9B6FB09683A :10327400FB5080D6BFBEFBE9B6FB0988FB5080D665 :10328400BFC4FBAFB8FB22BCFB12D945FBF133BD75 -:10329400D813FD9F0DBFBAFBAFBEFB22C2FB12D9F0 -:1032A40045FBF133BDD813FD9F0DBFC0FBAFC4FB7D -:1032B40022C8FB12D945FBF133BDD813FD9F0DBFC6 +:10329400D813FD9E0DBFBAFBAFBEFB22C2FB12D9F1 +:1032A40045FBF133BDD813FD9E0DBFC0FBAFC4FB7E +:1032B40022C8FB12D945FBF133BDD813FD9E0DBFC7 :1032C400C6FBB0B5FB8F20F931451F30C4FBFDCCE4 :1032D4002EF313BE6430B8FBFDCC2EF313BE6E3058 :1032E400BEFBFDCC2EF313BE6AD730C4FBFDCC2E3F @@ -907,10 +907,10 @@ :103774000438675C3F9F0EFCED0438675C1F9F0FA5 :10378400FCEF7D30603FFD263D679F14FCEF7130F8 :103794001B3FFD263D679F15FCEF65303D3FFD2631 -:1037A4003D679F18FCEF59675C01D1DD53FD9548D7 +:1037A4003D679F18FCEF59675C01D1DD53FD9248DA :1037B400EF4E402EFCC8DE48E92EFC671872FAA0D2 :1037C4002EFCEF3C679F2EFCEF3667318E2472008F -:1037D400DF06304309FD263D679FF7FBEF228FFA92 +:1037D400DF06304209FD263D679FF7FBEF228FFA93 :1037E400FB617F5C12D1DD0630923AFD263D679F76 :1037F400FAFBEF0CEF0A664C5ADE05736718D4FB2C :10380400C6D7C716664C30DC094C37DE05FD1934C3 @@ -918,7 +918,7 @@ :103824005C03318E316D08616A08128F35FC5C804F :10383400312A6162EF49664C3DDF0AAE90BF30FC2D :10384400F930FCEF3A664C3EDF05F931FCEF3066A7 -:103854004C4FDF05FDB948EF26664C61DF09E92EC0 +:103854004C4FDF05FDB648EF26664C61DF09E92EC3 :10386400FC0972FA72EF18664C7FDF0D30BB41FD24 :10387400263D713AD5524AEF06667309D4FB72C6E7 :10388400D7C788061617F1241000240500DC072486 @@ -977,7 +977,7 @@ :103BD400C7C1C1FBF8FF8F2CFC4E02DC03F2EF31AE :103BE4008C024F2DFCDC0452FFEF268C022F2CFCA0 :103BF400706131318D128F2DFC2F2CFC70613133AB -:103C0400BDD813FDC10DBB440001DC03F690BB8B92 +:103C0400BDD813FDC00DBB440001DC03F690BB8B93 :103C1400721004C6D7C7C1C1FBF8FFAC0A14A914BB :103C240089708C026128706131FD562013440300B1 :103C340071FEDC24AC0A148A04819A04AC0A148A46 @@ -1134,20 +1134,20 @@ :1045A400FD562013BC048F1CFCF0F91BFCF303FD27 :1045B400562013BC028F1EFCF0F91DFCF303FD56BC :1045C4002013BBAC04BDD8F6BDDAAC04311EBDDC8F -:1045D400F6BDDEFD740DADD8BDDCADDABDDEAC02DA +:1045D400F6BDDEFD730DADD8BDDCADDABDDEAC02DB :1045E400BDD8F6BDDAAC02311EDADCC3DADEC3BDF7 -:1045F400DCF6BDDEFD740DC0BDDEC0BDDCADDEFD90 -:10460400EA0EADD8BDDCADDABDDEABBDD8F6BDDAA1 -:10461400AB311EDADCC3DADEC3BDDCF6BDDEFD740D -:104624000DC0BDDEC0BDDCADDEFDEA0EDADAADD80C -:10463400FDEF49C3C58F06FD5C3FF0317E0486FC67 +:1045F400DCF6BDDEFD730DC0BDDEC0BDDCADDEFD91 +:10460400E90EADD8BDDCADDABDDEABBDD8F6BDDAA2 +:10461400AB311EDADCC3DADEC3BDDCF6BDDEFD730E +:104624000DC0BDDEC0BDDCADDEFDE90EDADAADD80D +:10463400FDEC49C3C58F06FD5C3FF0317E0486FC6A :1046440014C2C0B9A006FDF6BC08BC0A9C078C07BE :104654004C2EDD3E8F06FD0E0770F161DC605C3F81 :10466400F0317E127986FCBDD8F6BDDA8C07730969 -:104674007A23318FBDDC70BDDEFD740DAC08BDDC6A -:10468400AC0AFDEA0EADDABC0AADD8BC0861590724 +:104674007A23318FBDDC70BDDEFD730DAC08BDDC6B +:10468400AC0AFDE90EADDABC0AADD8BC0861590725 :10469400EFBCAC08BDD8AC0ABDDAC9DC0004F6FD39 -:1046A4003E0EC9DCFFFFF6FD530FADD8BF80FCAF53 +:1046A4003D0EC9DCFFFFF6FD520FADD8BF80FCAF55 :1046B4007AFC4280FCDD12AF7CFCBF7EFCAF7AFC4E :1046C400BF7CFCAF80FCBF7AFCAF7CFC427EFCDC90 :1046D40050AF7AFC427CFCDE48AF42FD427AFCDEFD @@ -1163,141 +1163,141 @@ :10477400A01FFCD51FFCDF1CA020FCD520FCDF14EF :10478400A021FCD521FCDF0CCF1FFCFFCF20FCFFB8 :10479400CF21FCFF717BFA710A9E31929E02EFFADF -:1047A4008E98FD670F9C038E949F46FD8E969F47BF +:1047A4008E98FD660F9C038E949F46FD8E969F47C0 :1047B400FD8E979F48FD8E939F08FD8E929F09FD65 -:1047C400FD4C4913BC04BDD8F6BDDA46DADF03B1AB -:1047D40046D8DF198C035C0391DF03E6EF01F6048E -:1047E4006D01313D120103B1BC046169038F49FDC0 -:1047F4004E03DF12AF0AFD614904DE40AC04220A15 -:10480400FDFD6D48EF368C03318EB112D949FDF1AF -:1048140043DF1E8C035C0391DF03E6EF01F6046DB6 -:1048240001313D120103220AFD610904FD6D48EFC7 -:104834000B8F49FD4E03DE04F6FD6D488C039F4942 -:10484400FDAC04BF0AFDD907FDF1010422F9BB1434 -:10485400A944FFFFDF04E6B9EF0BAB14A944FEFF44 -:10486400DD03A9A1B91006C6D7C7161744A900616C -:10487400C836A800A007FD4007FDA861C8F507FDDC -:10488400F907FDF3311CF67822F9B7F647DFE5C6E0 -:10489400D7C756A89666F0317E12F6B17822F9662B -:1048A400D1DFF1F51FFCF520FCF521FCF507FDC671 -:1048B400D7713323D7C72004FBF8FFD918F9F1E7E0 -:1048C400240000DD1123DD1C23DD2123DD2623DD6F -:1048D4002F23DD34EF3A8F07FD9F0CFDA018F9F963 -:1048E40046FDEF60A018F9F947FDEF58A018F9F953 -:1048F40048FDEF50A018F98F49FDFD810F72EF4478 -:10490400A018F9F908FDEF3CA018F9F909FDEF34F6 -:10491400F90CFDF3311C7922F9BB313223058B9C50 -:1049240003EF128C019C03D50CFDDF06CF0CFDA711 -:10493400EF03B00CFD718071372361DC61FB7131D1 -:10494400238C03721004C6D7C72008FBF8FF8E9887 -:104954009C058E979C048E969C038E949C028E9349 -:104964009C018E929B710B9E717AFA8C05FD670FE8 -:104974009C058C04FD670F9C048C03FD670F9C034E -:104984008C02FD670F9C028C04F0317E1279AA23FD -:10499400BC068C055C03D1DF158C044C03DE0C8C47 -:1049A400044C02DF098C034C1D61F86179068C0309 -:1049B400318EB1610906BC06313D120103BC068C7F -:1049C400060E02708C071C00BC068F24FC4E01DC12 -:1049D4000D8C014F24FCDC0B8F25FC4DDE05AC0651 -:1049E40012EF04AC06B1121008C6D7C7C3C1200821 -:1049F400FBF8FFF661490A61F8614908DF07F734FB -:104A04000000ED8C4AE6BC04F6BC06AC0ABC02AC61 -:104A140008BBAC06614902AC0461F8614900DE28B8 -:104A2400AC04BDD8AC06BDDAE1FDF90EADDABC06C6 -:104A3400ADD8BC04ABBDD8AC02BDDAE1FD140FADFA -:104A4400DABC02ADD8BBEFCAAC06BC02AC04BBAC4A -:104A540008BDD8AC0ABDDAAC04BDDCAC06FD770EEB -:104A6400AC04BDDCAC06FDEA0EE1FD140FADDABC0E -:104A740006ADD8BC04AC06614902AC0461F86149D6 -:0C4A840000DCC5AC0214AB12100CC6D74D -:104A9000CF0BF90461FC61FCC1C3C5C7520C9292F3 -:104AA00069D4FEC1DFF88EFD708EFCC1717AFA40C8 -:104AB0001EF903DF0630FB2CFD263DC09EFC609EE8 -:104AC000FD34D4FE5206C0B9A5A592DFF9C6C4C212 -:104AD000C061FC61DF520C929269D4FEC1DFF88E96 -:104AE000FD708EFCC1717AFAC736410571A4C6DC2F -:104AF00051F512FD71485005716050053174213631 -:104B00007162077173218FE4FB5FECFBD1DF1B8FB8 -:104B1000E5FB5FEDFBD1DF128FE6FB5FEEFBD1DF44 -:104B2000098FE7FB5FEFFBD1DD0C31620702EFFA83 -:104B3000716307716B27FDB548FD6334F518F9ED16 -:104B4000574CC73641057184C6DE0DF512FD71481C -:104B50005005FD6334ED574CC73641057194C6DEF0 -:104B6000154012FD03DD0C4012FD04DD064012FD70 -:104B70000161F8F512FDD912FDF1E7240000DD080E -:104B800023DD1323DD39EF6071405005E512FD711F -:104B9000505005ED574C8F40059F19F99F1CF9D9CE -:104BA00019F9FD0638629F1BF94019F97FDD06CF20 -:104BB00012FD02EF03F512FD71505005ED574CC781 -:104BC0003641057194C6DE1CC736410571C4C6DE88 -:104BD00006CF12FD03EF11F512FD7148500571600B -:104BE0005005EF73CF12FD044012FD03DF138F1B3E -:104BF000F99F4005D91BF9C1D919F9FD8538C0EFD6 -:104C0000108F400576C7D919F9FDE834C0715050AE -:104C100005D91CF9F1242900DD2D240400DD282408 -:104C20002200DD23241100DD0C240100DD19241EE7 -:104C300000DD14EF0C4019F960DF0CCF19F961EFBA -:104C400006F518F9A019F94012FD03DF0AD919F980 -:104C5000FD0638629F1BF9C09EFC609EFD34D4FEA9 -:104C60005206C0B9A5A592DFF961FCC1C3C5C75200 -:104C70000C929269D4FEC1DFF88EFD708EFCC1F6F5 -:104C800016717AFA714AE5717BBD51405F0401D11A -:104C9000DD05A7F647DFF3300400BF2401F6BF2A85 -:104CA00001300B0BBF2801FD1203300B0FBF280191 -:104CB000FD1203300F0FBF2801710AE6715320C0A7 -:104CC0009EFC609EFD34D4FE5206C0B9A5A592DFBD -:104CD000F9C6C4C2C061FCC1C3C5C7520C92926977 -:104CE000D4FEC1DFF88EFD708EFCC1717AFAD5401A -:104CF000FBDD0EEB3EFB899E44A23EFBB040FBEF8A -:104D00002B710AE6300400BF2401F6BF2A01300BE4 -:104D10000BBF2801FD1203300B0FBF2801FD12034A -:104D2000300F0FBF2801714320715320C09EFC60DB -:104D30009EFD34D4FE5206C0B9A5A592DFF9C6C4C3 -:104D4000C2C061FC61EF520C929269D4FEC1DFF8DF -:104D50008EFD708EFCC12008FBF8FF71503002CE32 -:104D6000ABACCC0100F6BC0231B2E210617902F6C4 -:104D7000614902DFF371603002EDFB4D8E519B7192 -:104D80003BE28B5C02D1DD1D8B5C08D1DF097150E9 -:104D90003002CC0100EFCE8C0770FD6B39629E5063 -:104DA000CC0102EFC08B5C03D1DF408E509C0571BB -:104DB0005030028C01D1DF0E8C0570FDCE39629C23 -:104DC00007CC0101EF328C014C02DF06716030022A -:104DD000EF29CF34025A716030028C0570C18C0704 -:104DE00070FD0739C0CF34024AEF108B5C01D1DD72 -:104DF0000671603002EF0400ED654D1008C09EFCA6 -:104E0000609EFD34D4FE5206C0B9A5A592DFF961BB -:104E1000FCC1710A9E31929E02EFFA8F0EFC4F96F2 -:104E2000FFDF358F0FFC4F97FFDF2D8F10FC4F9862 -:104E3000FFDF258FEDFB5C04D1DF1D7120E5FB71E9 -:104E40006307716B27401EF905DD06401EF901DF7F -:104E500007CF1FF902E51EF9710B9EC061FCA05837 -:104E6000FC61FCC1C3C5C7520C929269D4FEC1DF7C -:104E7000F88EFD708EFCC1C1FBF8FF8D1F9C018E6A -:104E800031318EE7240600DD0823DD0F23DD25EF19 -:104E900045717AFA8C019F44FCEF3B717AFA40210C -:104EA000F901DF078C019F43FCEF2B51FF2E019F7F -:104EB00043FCEF22717AFA8C019F02F98FE2FB5CCE -:104EC00001D1DF12401EF903DD06401EF904DF06A2 -:104ED000305827FD263D4031FF09DE05A031FFEFA8 -:104EE000197158F0007102224057FC02DF03F6EFFF -:104EF00005D957FCF1A1609F57FC710BE3C0C09E20 -:104F0000FC609EFD34D4FE5206C0B9A5A592DFF91F -:104F1000C6C4C2C061FC61FF520C929269D4FEC14A -:104F2000DFF88EFD708EFCC1717AFA8F14FC5C0381 -:104F3000D1DD19401EF903DD06401EF904DF0D36F0 -:104F4000100571D4DE0630973EFD263DC09EFC6004 -:104F50009EFD34D4FE5206C0B9A5A592DFF961FCCE -:104F600061FC00EFFD61FC61FC61FC61FC61FC61C6 -:104F7000FC61FC61FC61FC61FC61FC61FC61FC6149 -:104F8000FC61FC61FC61FC61FC61FC61FC61FC6139 -:0B4F9000FC61FC61FC61FC61FC61FC49 -:104F9B00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF16 -:104FAB00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF06 -:104FBB00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6 -:104FCB00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE6 -:104FDB00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD6 -:0B4FEB00FFFFFFFFFFFFFFFFFFFFFFC6 -:0A4FF60031373A30323A313800000A +:1047C400FD494913BC04BDD8F6BDDA46DADF03B1AE +:1047D40046D8DF168C035C0391DF03E6EF01F60491 +:1047E4006D01313D120103B1BC048F49FD4E03DF5D +:1047F40012AF0AFD614904DE40AC04220AFDFD6AE1 +:1048040048EF368C03318EB112D949FDF143DF1ED6 +:104814008C035C0391DF03E6EF01F6046D01313D87 +:10482400120103220AFD610904FD6A48EF0B8F4956 +:10483400FD4E03DE04F6FD6A488C039F49FDAC047B +:10484400BF0AFDD907FDF1010422F9BB14A944FFF5 +:10485400FFDF04E6B9EF0BAB14A944FEFFDD03A9A7 +:10486400A1B91006C6D7C7161744A90061C836A84F +:1048740000A007FD4007FDA861C8F507FDF907FD85 +:10488400F3311CF67822F9B7F647DFE5C6D7C756E9 +:10489400A89666F0317E12F6B17822F966D1DFF17E +:1048A400F51FFCF520FCF521FCF507FDC6D7713397 +:1048B40023D7C72004FBF8FFD918F9F1E724000037 +:1048C400DD1123DD1C23DD2123DD2623DD2F23DD64 +:1048D40034EF3A8F07FD9F0CFDA018F9F946FDEF60 +:1048E40060A018F9F947FDEF58A018F9F948FDEF51 +:1048F40050A018F98F49FDFD800F72EF44A018F9FC +:10490400F908FDEF3CA018F9F909FDEF34F90CFDA5 +:10491400F3311C7922F9BB313223058B9C03EF124E +:104924008C019C03D50CFDDF06CF0CFDA7EF03B073 +:104934000CFD718071372361DC61FB7131238C03C1 +:10494400721004C6D7C72008FBF8FF8E989C058E0A +:10495400979C048E969C038E949C028E939C018E4D +:10496400929B710B9E717AFA8C05FD660F9C058CE7 +:1049740004FD660F9C048C03FD660F9C038C02FDF2 +:10498400660F9C028C04F0317E1279AA23BC068C3B +:10499400055C03D1DF158C044C03DE0C8C044C0243 +:1049A400DF098C034C1D61F86179068C03318EB1EB +:1049B400610906BC06313D120103BC068C060E02D9 +:1049C400708C071C00BC068F24FC4E01DC0D8C018E +:1049D4004F24FCDC0B8F25FC4DDE05AC0612EF04E6 +:1049E400AC06B1121008C6D7C7C3C12008FBF8FF34 +:1049F400F661490A61F8614908DF07F7340000ED00 +:104A0400894AE6BC04F6BC06AC0ABC02AC08BBACE2 +:104A140006614902AC0461F8614900DE28AC04BDBA +:104A2400D8AC06BDDAE1FDF80EADDABC06ADD8BCF3 +:104A340004ABBDD8AC02BDDAE1FD130FADDABC02A4 +:104A4400ADD8BBEFCAAC06BC02AC04BBAC08BDD845 +:104A5400AC0ABDDAAC04BDDCAC06FD760EAC04BD1C +:104A6400DCAC06FDE90EE1FD130FADDABC06ADD8F2 +:104A7400BC04AC06614902AC0461F8614900DCC5C0 +:094A8400AC0214AB12100CC6D7F1 +:104A8D00CF0BF90461FC61FCC1C3C5C7520C9292F6 +:104A9D0069D4FEC1DFF88EFD708EFCC1717AFA40CB +:104AAD001EF903DF0630FB2CFD263DC09EFC609EEB +:104ABD00FD34D4FE5206C0B9A5A592DFF9C6C4C215 +:104ACD00C061FC61DF520C929269D4FEC1DFF88E99 +:104ADD00FD708EFCC1717AFAC736410571A4C6DC32 +:104AED0051F512FD71485005716050053174213634 +:104AFD007162077173218FE4FB5FECFBD1DF1B8FBC +:104B0D00E5FB5FEDFBD1DF128FE6FB5FEEFBD1DF47 +:104B1D00098FE7FB5FEFFBD1DD0C31620702EFFA86 +:104B2D00716307716B27FDB248FD6334F518F9ED1C +:104B3D00544CC73641057184C6DE0DF512FD714822 +:104B4D005005FD6334ED544CC73641057194C6DEF6 +:104B5D00154012FD03DD0C4012FD04DD064012FD73 +:104B6D000161F8F512FDD912FDF1E7240000DD0811 +:104B7D0023DD1323DD39EF6071405005E512FD7122 +:104B8D00505005ED544C8F40059F19F99F1CF9D9D4 +:104B9D0019F9FD0638629F1BF94019F97FDD06CF23 +:104BAD0012FD02EF03F512FD71505005ED544CC787 +:104BBD003641057194C6DE1CC736410571C4C6DE8B +:104BCD0006CF12FD03EF11F512FD7148500571600E +:104BDD005005EF73CF12FD044012FD03DF138F1B41 +:104BED00F99F4005D91BF9C1D919F9FD8538C0EFD9 +:104BFD00108F400576C7D919F9FDE834C0715050B2 +:104C0D0005D91CF9F1242900DD2D240400DD28240B +:104C1D002200DD23241100DD0C240100DD19241EEA +:104C2D0000DD14EF0C4019F960DF0CCF19F961EFBD +:104C3D0006F518F9A019F94012FD03DF0AD919F983 +:104C4D00FD0638629F1BF9C09EFC609EFD34D4FEAC +:104C5D005206C0B9A5A592DFF961FCC1C3C5C75203 +:104C6D000C929269D4FEC1DFF88EFD708EFCC1F6F8 +:104C7D0016717AFA714AE5717BBD51405F0401D11D +:104C8D00DD05A7F647DFF3300400BF2401F6BF2A88 +:104C9D0001300B0BBF2801FD1203300B0FBF280194 +:104CAD00FD1203300F0FBF2801710AE6715320C0AA +:104CBD009EFC609EFD34D4FE5206C0B9A5A592DFC0 +:104CCD00F9C6C4C2C061FCC1C3C5C7520C9292697A +:104CDD00D4FEC1DFF88EFD708EFCC1717AFAD5401D +:104CED00FBDD0EEB3EFB899E44A23EFBB040FBEF8D +:104CFD002B710AE6300400BF2401F6BF2A01300BE8 +:104D0D000BBF2801FD1203300B0FBF2801FD12034D +:104D1D00300F0FBF2801714320715320C09EFC60DE +:104D2D009EFD34D4FE5206C0B9A5A592DFF9C6C4C6 +:104D3D00C2C061FC61EF520C929269D4FEC1DFF8E2 +:104D4D008EFD708EFCC12008FBF8FF71503002CE35 +:104D5D00ABACCC0100F6BC0231B2E210617902F6C7 +:104D6D00614902DFF371603002EDF84D8E519B7198 +:104D7D003BE28B5C02D1DD1D8B5C08D1DF097150EC +:104D8D003002CC0100EFCE8C0770FD6B39629E5066 +:104D9D00CC0102EFC08B5C03D1DF408E509C0571BE +:104DAD005030028C01D1DF0E8C0570FDCE39629C26 +:104DBD0007CC0101EF328C014C02DF06716030022D +:104DCD00EF29CF34025A716030028C0570C18C0707 +:104DDD0070FD0739C0CF34024AEF108B5C01D1DD75 +:104DED000671603002EF0400ED624D1008C09EFCAC +:104DFD00609EFD34D4FE5206C0B9A5A592DFF961BF +:104E0D00FCC1710A9E31929E02EFFA8F0EFC4F96F5 +:104E1D00FFDF358F0FFC4F97FFDF2D8F10FC4F9865 +:104E2D00FFDF258FEDFB5C04D1DF1D7120E5FB71EC +:104E3D006307716B27401EF905DD06401EF901DF82 +:104E4D0007CF1FF902E51EF9710B9EC061FCA0583A +:104E5D00FC61FCC1C3C5C7520C929269D4FEC1DF7F +:104E6D00F88EFD708EFCC1C1FBF8FF8D1F9C018E6D +:104E7D0031318EE7240600DD0823DD0F23DD25EF1C +:104E8D0045717AFA8C019F44FCEF3B717AFA40210F +:104E9D00F901DF078C019F43FCEF2B51FF2E019F82 +:104EAD0043FCEF22717AFA8C019F02F98FE2FB5CD1 +:104EBD0001D1DF12401EF903DD06401EF904DF06A5 +:104ECD00305827FD263D4031FF09DE05A031FFEFAB +:104EDD00197158F0007102224057FC02DF03F6EF02 +:104EED0005D957FCF1A1609F57FC710BE3C0C09E23 +:104EFD00FC609EFD34D4FE5206C0B9A5A592DFF923 +:104F0D00C6C4C2C061FC61FF520C929269D4FEC14D +:104F1D00DFF88EFD708EFCC1717AFA8F14FC5C0384 +:104F2D00D1DD19401EF903DD06401EF904DF0D36F3 +:104F3D00100571D4DE0630973EFD263DC09EFC6007 +:104F4D009EFD34D4FE5206C0B9A5A592DFF961FCD1 +:104F5D0061FC00EFFD61FC61FC61FC61FC61FC61C9 +:104F6D00FC61FC61FC61FC61FC61FC61FC61FC614C +:104F7D00FC61FC61FC61FC61FC61FC61FC61FC613C +:0B4F8D00FC61FC61FC61FC61FC61FC4C +:104F9800FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF19 +:104FA800FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF09 +:104FB800FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF9 +:104FC800FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9 +:104FD800FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD9 +:0E4FE800FFFFFFFFFFFFFFFFFFFFFFFFFFFFC9 +:0A4FF60031373A31383A3234000006 :10500000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB0 :10501000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA0 :10502000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF90 diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index e189a8a..6bcb61f 100644 Binary files a/trunk/bsr.lmf and b/trunk/bsr.lmf differ diff --git a/trunk/bsr_k0r.map b/trunk/bsr_k0r.map index 99c5550..61cf9b2 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,19 +1,19 @@ -78K0R Linker W1.31 Date: 4 Aug 2010 Page: 1 +78K0R Linker W1.33 Date: 4 Aug 2010 Page: 1 -Command: -yC:\Program Files\NEC Electronics Tools\DEV -_msgoff -obsr.l - mf ..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10 - \lib78k0r\s0rm.rel -go85h,0FC00h,1024 -pbsr_k0r.map -nkd -gb7 - EFFFFh -bC:\Program Files\NEC Electronics Tools\FSL78K0R_Type - 02ES\V1.20\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0rm.lib -bcl0rmf - .lib -iC:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\l - ib78k0r -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel mai - n.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.r - el vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel sel - f_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel - pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel +Command: -yd:\program files\nec electronics tools\dev -_msgoff -obsr.l + mf ..\..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2 + .12\lib78k0r\s0rm.rel -go85h,0FC00h,1024 -pbsr_k0r.map -nkd - + gb7EFFFFh -bC:\Program Files\NEC Electronics Tools\FSL78K0R_T + ype02ES\V1.20\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0rm.lib -bcl0 + rmf.lib -iD:\Program Files\NEC Electronics Tools\CC78K0R\W2.1 + 2\lib78k0r -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel + main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rt + c.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel + self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.r + el pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map @@ -23,7 +23,7 @@ Direc-file:bsr_mcu.dr *** Link information *** 65 output segment(s) - 3E04H byte(s) real data + 3E00H byte(s) real data 5479 symbol(s) defined @@ -99,55 +99,55 @@ Direc-file:bsr_mcu.dr 000C4H 00000H * gap * 000C4H 0000AH ?OCDSTAD 000CEH 0000AH CSEG - LDR_CODE 000D8H 008FCH CSEG + LDR_CODE 000D8H 008FBH CSEG LDR_CODE loader 000D8H 001CCH LDR_CODE main 002A4H 0006EH LDR_CODE WDT 00312H 00000H LDR_CODE i2c_mcu 00312H 002F1H LDR_CODE self_flash - 00603H 0034BH + 00603H 0034AH LDR_CODE task_debug - 0094EH 00001H + 0094DH 00001H LDR_CODE task_status - 0094FH 00085H - FSL_CODE 009D4H 00322H CSEG + 0094EH 00085H + FSL_CODE 009D3H 00322H CSEG FSL_CODE fsl_block_cmd - 009D4H 0002BH + 009D3H 0002BH FSL_CODE fsl_block_check - 009FFH 00013H + 009FEH 00013H FSL_CODE fsl_common - 00A12H 0014FH + 00A11H 0014FH FSL_CODE fsl_reset - 00B61H 00001H + 00B60H 00001H FSL_CODE fsl_si_ibf - 00B62H 00064H + 00B61H 00064H FSL_CODE fsl_phySwap - 00BC6H 0004DH + 00BC5H 0004DH FSL_CODE fsl_si_common - 00C13H 00061H - FSL_CODE fsl_swap 00C74H 00030H + 00C12H 00061H + FSL_CODE fsl_swap 00C73H 00030H FSL_CODE fsl_write - 00CA4H 00052H - @@LCODE 00CF6H 002AFH CSEG - @@LCODE @cstart 00CF6H 0006DH - @@LCODE @imul 00D63H 00011H - @@LCODE @lumul 00D74H 0002BH - @@LCODE @isdiv 00D9FH 00022H - @@LCODE @iudiv 00DC1H 0002DH - @@LCODE @isrem 00DEEH 00021H - @@LCODE @iurem 00E0FH 0002FH - @@LCODE @lsdiv 00E3EH 00039H - @@LCODE @ludiv 00E77H 0003FH - @@LCODE @divuw 00EB6H 00034H - @@LCODE @ladd 00EEAH 0000FH - @@LCODE @llsh 00EF9H 0001BH - @@LCODE @lursh 00F14H 0001FH - @@LCODE @iscmp 00F33H 0000CH - @@LCODE @lscmp 00F3FH 00014H - @@LCODE @lband 00F53H 00014H - @@LCODE @bcdtob 00F67H 0001AH - @@LCODE @bbcd 00F81H 00024H -* gap * 00FA5H 00051H + 00CA3H 00052H + @@LCODE 00CF5H 002AFH CSEG + @@LCODE @cstart 00CF5H 0006DH + @@LCODE @imul 00D62H 00011H + @@LCODE @lumul 00D73H 0002BH + @@LCODE @isdiv 00D9EH 00022H + @@LCODE @iudiv 00DC0H 0002DH + @@LCODE @isrem 00DEDH 00021H + @@LCODE @iurem 00E0EH 0002FH + @@LCODE @lsdiv 00E3DH 00039H + @@LCODE @ludiv 00E76H 0003FH + @@LCODE @divuw 00EB5H 00034H + @@LCODE @ladd 00EE9H 0000FH + @@LCODE @llsh 00EF8H 0001BH + @@LCODE @lursh 00F13H 0001FH + @@LCODE @iscmp 00F32H 0000CH + @@LCODE @lscmp 00F3EH 00014H + @@LCODE @lband 00F52H 00014H + @@LCODE @bcdtob 00F66H 0001AH + @@LCODE @bbcd 00F80H 00024H +* gap * 00FA4H 00052H MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -369,7 +369,7 @@ Direc-file:bsr_mcu.dr @@CNST ini_VECT 023C4H 00000H @@CNST task_status 023C4H 00000H - ROM_CODE 023C4H 026CCH CSEG + ROM_CODE 023C4H 026C9H CSEG ROM_CODE pm 023C4H 00A34H ROM_CODE i2c_ctr 02DF8H 00060H ROM_CODE i2c_twl 02E58H 0005EH @@ -385,37 +385,37 @@ Direc-file:bsr_mcu.dr 040C9H 001C1H ROM_CODE task_sys 0428AH 0030BH ROM_CODE pedo_alg_thre_det2 - 04595H 004FBH - @@BASE 04A90H 0050BH CSEG BASE - @@BASE loader 04A90H 00000H - @@BASE pm 04A90H 00043H - @@BASE i2c_ctr 04AD3H 00198H - @@BASE main 04C6BH 00000H - @@BASE magic 04C6BH 00000H - @@BASE WDT 04C6BH 00000H - @@BASE i2c_mcu 04C6BH 000D9H - @@BASE i2c_twl 04D44H 000CDH - @@BASE led 04E11H 00000H - @@BASE rtc 04E11H 00052H - @@BASE vreg_ctr 04E63H 00000H - @@BASE vreg_twl 04E63H 00000H - @@BASE adc 04E63H 000B3H - @@BASE renge 04F16H 00000H - @@BASE accero 04F16H 0004AH + 04595H 004F8H + @@BASE 04A8DH 0050BH CSEG BASE + @@BASE loader 04A8DH 00000H + @@BASE pm 04A8DH 00043H + @@BASE i2c_ctr 04AD0H 00198H + @@BASE main 04C68H 00000H + @@BASE magic 04C68H 00000H + @@BASE WDT 04C68H 00000H + @@BASE i2c_mcu 04C68H 000D9H + @@BASE i2c_twl 04D41H 000CDH + @@BASE led 04E0EH 00000H + @@BASE rtc 04E0EH 00052H + @@BASE vreg_ctr 04E60H 00000H + @@BASE vreg_twl 04E60H 00000H + @@BASE adc 04E60H 000B3H + @@BASE renge 04F13H 00000H + @@BASE accero 04F13H 0004AH @@BASE self_flash - 04F60H 00000H - @@BASE sw 04F60H 00000H + 04F5DH 00000H + @@BASE sw 04F5DH 00000H @@BASE task_debug - 04F60H 00000H + 04F5DH 00000H @@BASE task_misc - 04F60H 00000H - @@BASE task_sys 04F60H 00000H + 04F5DH 00000H + @@BASE task_sys 04F5DH 00000H @@BASE pedo_alg_thre_det2 - 04F60H 00000H - @@BASE ini_VECT 04F60H 0003BH + 04F5DH 00000H + @@BASE ini_VECT 04F5DH 0003BH @@BASE task_status - 04F9BH 00000H -* gap * 04F9BH 0005BH + 04F98H 00000H +* gap * 04F98H 0005EH MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL magic 04FF6H 0000AH diff --git a/trunk/hoge.bin b/trunk/hoge.bin index ed98c24..60737c0 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/pedo_alg_thre_det2.c b/trunk/pedo_alg_thre_det2.c index 889a151..4997042 100644 --- a/trunk/pedo_alg_thre_det2.c +++ b/trunk/pedo_alg_thre_det2.c @@ -238,6 +238,7 @@ static void hosu_increment() // 元旦零時台で昨日扱いになった場合の帳尻合わせ if( now_longhour == 65535 ) + { now_longhour = ( ( 365 + (( now_year & 0x03 ) == 1 ? 1: 0 )) * 24 ) -1; }