diff --git a/flower_toriaezu2/VCProj/bsr_trunk.sdf b/flower_toriaezu2/VCProj/bsr_trunk.sdf index c052f1d..e0ab00e 100644 Binary files a/flower_toriaezu2/VCProj/bsr_trunk.sdf and b/flower_toriaezu2/VCProj/bsr_trunk.sdf differ diff --git a/flower_toriaezu2/VCProj/bsr_trunk.suo b/flower_toriaezu2/VCProj/bsr_trunk.suo index 9ce39f8..8ce573c 100644 Binary files a/flower_toriaezu2/VCProj/bsr_trunk.suo and b/flower_toriaezu2/VCProj/bsr_trunk.suo differ diff --git a/flower_toriaezu2/bsr.hex b/flower_toriaezu2/bsr.hex index b6448bf..25310c4 100644 --- a/flower_toriaezu2/bsr.hex +++ b/flower_toriaezu2/bsr.hex @@ -1,261 +1,259 @@ -:02000000650D8C -:02000200FFFFFE -:04001000A348A54814 -:02001C00514A47 -:02002400F84A98 -:02002A00434B46 -:08003400704C134C6C4CB14EF2 -:02004A00A748C5 -:02005A00E1487B -:020062006F4EDF -:06008000044D3D4D874DCB -:0400C0007EFBFF853F +:02000000570D9A +:0400100098489A482A +:02001C00464A52 +:02002400ED4AA3 +:02002A00384B51 +:08003400654C084C614CA64E1E +:02004A009C48D0 +:02005A00D64886 +:02006200644EEA +:06008000F94C324D7C4DED +:0400C0007EFBFF04C0 :0A00C4001B339499E033F240BFAA09 -:0A00CE00FFFFFFFFFFFFFFFFFFFF32 -:1000D800C7C1FBF8FFCEABACC736F00071F4C66100 -:1000E800D8710006F98EA89C018C015C10D1DD0A3C -:1000F8007110A6FB710006F9EF0B8C015C80D161D1 -:10010800E8710006F98F06F931030EF6B1BBF66106 -:100118004900DD05618900EFF5FD0202FD3B01FDA7 -:100128009301FD0C0AFD4309FDA52FFDDC2CEFA56D -:10013800C0C6D7C7360000674C09DE3F318E04F6CB -:100148000FC1317B9EFDC411897267318E04F64F51 -:1001580014896142DF03F6EF01E660610667318EBC -:10016800124900207267318E04F64F14896142DF0C -:1001780003F6EF01E660610687EFBC40F84F3A618D -:10018800E88666D161E8FDB006C6D751065B0C313A -:100198001A9F08F9CF08F903D508F9DF0671000995 -:1001A800F9EF04710809F98F09F9310505CD370709 -:1001B800EF03CD3705D908F9FD61298F06F95CE30E -:1001C8009F06F951035B04318EE7240000DD1023FC -:1001D800DD0823DF0E712006F9D7713006F9D771D3 -:1001E8004006F9D7717BFACEA010CEA180E5F300C6 -:1001F800000000CEA408F5AAFFD78F06F93105083C -:10020800CD0003CD030FEF08CD030EF690BFB40168 -:10021800CD0408CD0508F521FFCE22E9CE23F8CE7E -:1002280024F3CE25FACE26FCCE275FCE2EFCCF11A6 -:1002380005F8CF120511CF350002CF370019CF537B -:100248000006CBEEFEFFCE3831CE3970CF38050A26 -:10025800308700BF1801BF1A01BF1C01BF1E01D79C -:10026800D7C7F616FD9504717BFA31329B087132B7 -:100278009B717AFAEF0C717AFAA7F647DFE9520315 -:10028800EF01F2C6D7C7C1C1FBF8FF17A1C1E0C192 -:100298008C0A70C18C0270FDAE021006629D548CEF -:1002A80001721004C6D7C7C1FBF8FFFD6902D2DD91 -:1002B800045203EF698B70FDE203D2DD0771339BB3 -:1002C8005202EF5A8C0870FDFE03FD49048B6C0145 -:1002D80070FDFE03300400BF2401301740BF1C012D -:1002E800300400BF22018C0A91DF04F6BF2A017195 -:1002F8000BE2CE44FF3182E202EFFAAC0C148E44DA -:100308009961790C61690A8C0AD1DFDA8B4CA46196 -:10031800F8FD9148FD7204710BE271339BF2C0C67F -:10032800D7C7C1FBF8FFFD6902D2DD045203EF25F0 -:10033800710AE68B70FDE203D2DD0771339B52022E -:10034800EF138C0870FDFE038C0A70FDFE03FD722E -:100358000471339BF2C0C6D7C7C1FBF8FFFD690221 -:10036800D2DD045203EF70710AE6710BE28B70FD67 -:10037800E203D2DD0771339B5202EF5B710BE2316E -:10038800229B44C73422FBAC0C1652048B99A5A7B8 -:1003980092DFF9C68B9D518C089D528C0A9D533172 -:1003A80084BD02EFFA717ABDCEB144CBB422FB8C86 -:1003B8000A318EBEB8CEBB48714BE1714BE5710A6C -:1003C800BD8C089E44EF0F710BE68C089E448C0A86 -:1003D8009D50AC0CBD4EF2C0C6D7C716FD2104AF68 -:1003E8000401BF0C0117FDFE03D2DD07FD720452A4 -:1003F80002EF01F2C6D7C716710AE6710BE2669ED4 -:10040800443182E202EFFAF6420401DD09AF040149 -:10041800BF0C01E2EF01F2C6D7AF2801085CFB0868 -:10042800BF2801FD6802AF28015CFBBF280130042A -:1004380000BF2A01301780BF1C01300400BF220111 -:10044800D7AF2401086C0408BF2401AF28016C0F42 -:10045800086C0B08BF2801FD6802AF2A01085CFB85 -:1004680008BF2A01FD6802ED2104300400BF240101 -:10047800F6BF2A01300B0BBF2801FD6802300B0FB5 -:10048800BF2801FD6802300F0FBF2801D731449BF8 -:1004980001D771329B6A0E03713B25713B23E0FD46 -:1004A8001F0A7120F000FD6802F6BF26015024BF24 -:1004B8001401CB440014300F0FBF280171239B7126 -:1004C8000BE2710AE6FD2104CE44FF3182E202EF1D -:1004D800FAFD7204AF0401BF0C0171339B71429B9A -:1004E800D731349B02EFFAFD4904713A25713A235A -:1004F8005A0EFC7128F00071439BD77140F00071CF -:10050800783002713AE6713BE2713BEA713BEE5A90 -:1005180006FCCF34024AE552FF711A52710A527131 -:100528004830027130300271203002CF330209CFD7 -:1005380032020B7130310271203102713BE6717069 -:1005480030028E265CFC9E2671603002D7717830AE -:10055800027148F000D7C72008FBF8FFFDAB085030 -:1005680014C15008FDDD07C0CC07048C074C14DE0D -:100578000C8C07318EFD470A615907EFEECC070452 -:100588008C074C1461C8ED4C06CC06008C064C0454 -:1005980061C8ED2B06300AF9BC02F6BBCEABAC3114 -:1005A800B2D109C73641057184C6DEF3F1C73641B9 -:1005B800057184C661DC9C05713BD1AC02148F4087 -:1005C800059971505005617902617900F0E161493E -:1005D80000DD09C73641057184C6DEC3F1C736415F -:1005E800057184C661DC0E059C055040C18C07313D -:1005F8008E31AD128C06318E318D03BDD831FFBDE1 -:10060800DADADAADD8FD130DC0D2DD0C5008C150CE -:1006180014FDDD07C0FDD00B8C05D1DF066159063E -:10062800ED94058C07318EFD4B0AD2DD0C5008C1C4 -:100638005014FDDD07C0FDD00B8C05D1DF066159D4 -:1006480007ED880571605005CC0400CC05008C05C9 -:100658004C09DE2B8C05318E04F61FC1317B9EFDC3 -:10066800C41189728C05318E04F64F14896142DFFA -:1006780003F6EF01E6600E049C04615905EFCF41D3 -:10068800001140F81F3A61E86159048C04D1DF0871 -:10069800FDD10BFDE30CEF0C5008C15014FDDD0734 -:1006A800C0FDD00B1008C6D7C72004FBF8FF712B7C -:1006B80024CC0100F6BC02AC02440900DE3EAC02C8 -:1006C80004F60F144100118972AC020C50148961B0 -:1006D80042DF03F6EF01E6600E019C01AC0212490D -:1006E800005072AC0204F67F14896142DF03F6EF12 -:1006F80001E6600E019C01617902EFBB40F67FFFC5 -:1007080061F86159018C01D161F8EDA907CC0100AC -:10071800717AFAFD9504711300711B20710303713E -:100728000205E0C15003FD722BC05013FD1F0A5093 -:100738000FC1E0FD722BC0CEABAC6159018C0191A9 -:10074800DD068C014C03DF03E6EF01F66061FB7107 -:1007580021048C014C0861F8CC010031320705A056 -:1007680024FCEF03F524FC4024FC11DC22F524FCD6 -:10077800F0C15003FD722BC0CE3708CBE4FFFFCB8E -:10078800E6FFF7CED4FFCF370008F5120561FDE686 -:10079800BC02F6614902DD9F00000000617902EFAA -:1007A800F1FDAB08D2DFFA5008C15014FDDD07C0D7 -:1007B800D2FDD00B1004C6D73184BD02EFFA717B8D -:1007C800BDCBE4FFFFCBE6FFFFCBD4FFFF717ABEC2 -:1007D800D7717BBED7C7C1200CFBF8FF8C0C318EBC -:1007E80031ADC1317B9DD4C0BC068DD49C088C141E -:1007F8009C0B8C14318E040C00128C0B318EBDD8DE -:1008080013FDA20F61C8EDA608CEABACCC05068CD3 -:100818000B318EFD430AD2DD158C0B318EFD470A54 -:100828006169058C05D1DFE7FDD907E2EF71CC0AD4 -:10083800008C0A4C04DE54F6BC02300AF9BBAC0644 -:10084800148C089EFD118972AB146299AC06A1BC88 -:1008580006617900617902F0E1614902DFE0504008 -:10086800C18C0B318E31AD128C0A318E318D03BDA6 -:10087800D831FFBDDADADAADD8FD130DC0D2DD0606 -:10088800FDD907E2EF1961590AEFA68C0B318EFDED -:100898004B0AD2DD03E2EF0761590BEDFA07F210BC -:1008A8000EC6D7C7717B9D717BFAFDC007300AF968 -:1008B800FDF60AFD810AC6D7FDAB08FDD00BFDD9B0 -:1008C80007F5ABFFF2D7C731049F067110B3FBEFF2 -:1008D800047118B3FB8FB3FB7B9276D1DD5B8FB3CA -:1008E800FB9D924004F903DF22665C10D1DD1C8F6A -:1008F800B3FB5C10D1DD0B5080C15011FDCA34C070 -:10090800EF095040C15011FDCA34C04004F903DD5D -:10091800064004F904DF22665C02D1DD1C8FB3FBBC -:100928005C02D1DD0B5040C15010FDCA34C0EF0944 -:100938005020C15010FDCA34C0C6D7C73600006663 -:100948005C80D1DD10675C80D1DF0571339EEF0BD1 -:1009580071329EEF0671040771319E665C40D1DDED -:1009680010675C40D1DF0571439EEF0B71429EEF2B -:100978000671140571419E665C01D1DD10675C014A -:10098800D1DF0571539EEF0B71529EEF067134074C -:1009980071519E665C02D1DD10675C02D1DF057182 -:1009A800639EEF1D71629EEF184007F901DF087121 -:1009B800040271619EEF0AC736100571C4C67161E1 -:1009C8009E665C04D1DD10675C04D1DF0571739EFF -:1009D800EF0B71729EEF0671440771719E665C0899 -:1009E800D1DD10675C08D1DF0571039FEF0B710241 -:1009F8009FEF0671140771019F665C10D161E87161 -:100A08005AD1C6D7F5F6FBF5F8FBCFFEFBFFCFFAB8 -:100A1800FBFFCFFBFBFFD7C7C1C1FBF8FFCEABACD9 -:100A28008C02D1DD12616902305C03BBF6614900BA -:0B0A3800DDEE618900EFF51004C6D769 -:100A43005208EF065203EF025206FEE600FE1B00B9 -:100A5300DC16089F03088F0408089F040862FE241D -:100A630000089F0408EEBF00EEBA00C1C514410E92 -:100A730011D9D0FF118FD1FF312E45C4C0D7F23128 -:100A8300A2C401E2D79DE261DD4C09DF12717BFA5A -:100A9300C18F06089F25FDC0CF060800EE27003151 -:100AA300F2FA04CF0608004C00DF05D50008DD1676 -:100AB30061DD717BFAD50608DD0ACDE31F61CD61E7 -:100AC300CDEE160061CDFED40061FFFE9A00FCF866 -:100AD300FF0EFEB20061CDFED5004C09DF0EC18FC3 -:100AE30006086F25FD9F0608C0EE0400CF06080028 -:100AF300F8E3D75200EF025202FE3700CF24FD0085 -:100B0300CF060800BF0408C716629F000841001102 -:100B13008F1A209B4100118F1B209F0108C6510093 -:100B2300FE62FFEF025205CF060800C1510CFE0A18 -:100B330000C0D7C1511DFE0200C0D761DD717BFA31 -:100B430070CEC0A59EC47CFF9EC4609EC461CDD7F9 -:100B530061DD717BFAC18EC45C1BFED6FFCF060834 -:100B630001FED7FFC061CDD731F2FA1AC1AEE4BF9F -:100B730016FDAEE6BF18FDAED4BF1AFD30FFFFBEB3 -:100B8300E4BEE6BED4C0D731F2FA11C1AF16FDBE42 -:100B9300E4AF18FDBEE6AF1AFDBED4C0D7C1BF1C7B -:100BA300FD13BF1EFD15BF20FD17BF22FDC0D7AF2C -:100BB3001CFDDB1EFDEB20FDFB22FDD7534B30520A -:100BC3005430324E323030475631323000FFC1504C -:100BD300FEFEAB0061DD717BFACF060800FE0A0062 -:100BE300FEA4FF61CDF8E3EECF00C7FB0408BF16F8 -:100BF300FD8FC0009C05C5C337040600BF18FD3533 -:100C030036350C300000522BFE6600C2C4C630E3FA -:100C13000BB800300000B8022004AF18FDB8003054 -:100C23000F00B802AF16FD61FF520AFE3AFFECF85F -:100C3300FF0E717BFAC1C7FB04088C05C65C80FEFE -:100C43000200C0D761DD717BFA70CFC0FFA59FC0E2 -:100C5300007CFF9FC000609FC00061CDD7618BFE09 -:100C6300E2FF717BBE410011FB000017CEFC006167 -:100C7300CB089EFDF31161C999A58392DFF7D7FED7 -:100C8300B1FED524FDDF23C1CF0308035109FEF4D0 -:100C9300FDC0D2DF37FE3800A20408CF0308075196 -:100CA30009FEE1FDD2B20408DF22C7FB0408318349 -:100CB30002C6D7C6510AFECCFD624C1FDF06CF2405 -:100CC300FD01EF04CF24FD00C0EE5BFEC0EE55FE38 -:100CD300C7C1FB04088B31196C0161589BC0C6D78F -:100CE300717BFAFE4DFEAF0408040600C1143647BB -:100CF3000C300000522DF3FE77FF8FC000FE2BFE59 -:100D030061CF5C807C8073C0041900CEFC0F61CB83 -:100D1300C55404EF03C55417FE18FEC7360008BBBD -:100D2300629C0288089C03D1DD334C41DE2F70F1B5 -:100D3300312DB161090033081C000851FF612A41BC -:100D43000E118FD0FF613B118FD1FF6138DC0E8B09 -:100D53005C03DF0964C6C4FE2BFDEECAFDC6C4EE08 -:020D6300C3FDCE -:100D650061CF5100718C7109FECBF800FEFCEC01DE -:100D750000F6BF00F953C0F693935820FEDFF94102 -:100D85000036C24E34CCFCEF05118B99A7A517444C -:100D95000C4FDFF53602F930CCFCEF04CC0000A790 -:100DA50047DFF94100360C4F3420FEEF05118B99D2 -:100DB500A7A517441C4FDFF53630FE309AFEEF0429 -:100DC500CC0000A747DFF9FCD80000EFFE61DD711C -:100DD5007BFABEF0ADD8BEF200AEF661CDD7C361E9 -:100DE500DD717BFABEF0ADD8BEF200DBF6FFADDCFF -:100DF500BEF000AEF6BDD8AEF40312ADDABEF20019 -:100E0500AEF661CD03BDDAC2D7C3F33174D9088319 -:100E1500C1F626D8BDD8C031750683C312F623C2E4 -:100E2500FD300E93DF0312F623C2D7440000DD2602 -:100E350061DD717BFACFE80080BEF6F6BEF4BEF246 -:100E4500ADD8BEF0CFE800818FE8003103FAAEF0EF -:100E5500F5E80061CDD7B1D7C3F33174D90883C1A3 -:100E6500F626D8BDD8C0317505C312F623C2FD7E5E -:100E75000E93DF0312F623C2D7440000DD2761DDA0 -:100E8500717BFACFE80080BEF6F6BEF4BEF2ADD8AF -:100E9500BEF0CFE800818FE8003103FAAFE000F53E -:100EA500E80061CDD7ADD8D7C3F33174DB0F83C16B -:100EB500F626D8BDD861317026DABDDAC031750D98 -:100EC50083C312F626DCBDDC61317023C2FDE60E5C -:100ED50093DF0CF626D8BDD861317026DABDDAC2AB -:100EE500D7C161686BDC6BDDC0DD2F61DD717BFA1D -:100EF500CFE80080BEF4ADDCBEF6ADD8BEF0ADDA0D -:100F0500BEF2CFE800818FE8003103FAAEF0BDD81C -:100F1500AEF2BDDAF5E80061CDD7F6BDD8BDDAD7BA -:100F25008292DD2B61DD717BFACFE80080BEF0F6A1 -:100F3500BEF2BEF46208BEF6CFE800818FE800314C -:100F450003FAAFE0006072AEF0F5E80061CDD7605E -:100F550072F6B1D706DABDDAADDC06D8BDD861D8F0 -:100F6500A6DAD7D1DD17C1C3DAD89DD8ADDA311CE1 -:100F750061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD74 -:100F85001BC1C3DADA9DDAADD8311E33311E337198 -:100F9500F9B4DADFF4BDD813BDDAC2C0D746D8DD5F -:100FA5000771FF7177D971C0D75BDB9DDB605BDAB9 -:100FB5009DDAADDC5BD9085BD808BDD8D7C3C7F3CC -:100FC500728EFDC162314C410036B84E1161A0727E -:070FD500C09EFD62C6C2D7F9 -:0A0FF60031383A30373A3332000048 -:0A20000031383A30373A333200002D +:1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A +:1000DE00D8710006F98EA89C018C015C10D1DD0A46 +:1000EE007110A6FB710006F9EF0B8C015C80D161DB +:1000FE00E8710006F98F06F931030EF6B1BBF66111 +:10010E004900DD05618900EFF5FDF401FD3101FDCA +:10011E008901FDFE09FD3509FDA52FFDDC2CEFA59E +:10012E00C0C6D7C7360000674C09DE3F318E04F6D5 +:10013E000FC1317B9EFDC411897267318E04F64F5B +:10014E0014896142DF03F6EF01E660610667318EC6 +:10015E00124900207267318E04F64F14896142DF16 +:10016E0003F6EF01E660610687EFBC40F84F3A6197 +:10017E00E88666D161E8FDA206C6D751065B0C3152 +:10018E001A9F08F9D508F9DF06710009F9EF047115 +:10019E000809F98F09F9310505CD3707EF03CD377A +:1001AE0005D908F9FD61298F06F95CE39F06F9511F +:1001BE00035B04318EE7240000DD1023DD0823DF0E +:1001CE000E712006F9D7713006F9D7714006F9D7AE +:1001DE00717BFACEA010CEA180E5F300000000CE18 +:1001EE00A408F5AAFFD78F06F9310508CD0003CD77 +:1001FE00030FEF08CD030EF690BFB401CD0408CD6A +:10020E000508F521FFCE22E9CE23F8CE24F3CE2524 +:10021E00FACE26FCCE275FCE2EFCCF1105F8CF12DC +:10022E000511CF350002CF370019CF530006CBEEA4 +:10023E00FEFFCE3831CE3970CF38050A308700BF79 +:10024E001801BF1A01BF1C01BF1E01D7D7C7F61672 +:10025E00FD8704717BFA31329B0871329B717AFAF9 +:10026E00EF0C717AFAA7F647DFE95203EF01F2C6F7 +:10027E00D7C7C1C1FBF8FF17A1C1E0C18C0A70C17D +:10028E008C0270FDA0021006629D548C0172100447 +:10029E00C6D7C7C1FBF8FFFD5B02D2DD045203EFE8 +:1002AE00698B70FDD403D2DD0771339B5202EF5A76 +:1002BE008C0870FDF003FD3B048B6C0170FDF003A8 +:1002CE00300400BF2401301740BF1C01300400BFB2 +:1002DE0022018C0A91DF04F6BF2A01710BE2CE4493 +:1002EE00FF3182E202EFFAAC0C148E449961790C64 +:1002FE0061690A8C0AD1DFDA8B4CA461F8FD86485D +:10030E00FD6404710BE271339BF2C0C6D7C7C1FB0B +:10031E00F8FFFD5B02D2DD045203EF25710AE68B76 +:10032E0070FDD403D2DD0771339B5202EF138C089C +:10033E0070FDF0038C0A70FDF003FD640471339BB5 +:10034E00F2C0C6D7C7C1FBF8FFFD5B02D2DD045277 +:10035E0003EF70710AE6710BE28B70FDD403D2DDF0 +:10036E000771339B5202EF5B710BE231229B44C744 +:10037E003422FBAC0C1652048B99A5A792DFF9C65A +:10038E008B9D518C089D528C0A9D533184BD02EF7A +:10039E00FA717ABDCEB144CBB422FB8C0A318EBE3B +:1003AE00B8CEBB48714BE1714BE5710ABD8C089E0E +:1003BE0044EF0F710BE68C089E448C0A9D50AC0CDA +:1003CE00BD4EF2C0C6D7C716FD1304AF0401BF0C55 +:1003DE000117FDF003D2DD07FD64045202EF01F2B6 +:1003EE00C6D7C716710AE6710BE2669E443182E2E9 +:1003FE0002EFFAF6420401DD09AF0401BF0C01E27F +:10040E00EF01F2C6D7AF2801085CFB08BF2801FD3B +:10041E005A02AF28015CFBBF2801300400BF2A013D +:10042E00301780BF1C01300400BF2201D7AF24015A +:10043E00086C0408BF2401AF28016C0F086C0B0870 +:10044E00BF2801FD5A02AF2A01085CFB08BF2A0132 +:10045E00FD5A02ED1304300400BF2401F6BF2A0139 +:10046E00300B0BBF2801FD5A02300B0FBF2801FDC8 +:10047E005A02300F0FBF2801D731449B01D771327A +:10048E009B6A0E03713B25713B23E0FD110A71201F +:10049E00F000FD5A02F6BF26015024BF1401CB44D2 +:1004AE000014300F0FBF280171239B710BE2710AEC +:1004BE00E6FD1304CE44FF3182E202EFFAFD64043E +:1004CE00AF0401BF0C0171339B71429BD731349B3A +:1004DE0002EFFAFD3B04713A25713A235A0EFC7174 +:1004EE0028F00071439BD77140F000717830027193 +:1004FE003AE6713BE2713BEA713BEE5A06FCCF34B1 +:10050E00024AE552FF711A52710A52714830027155 +:10051E0030300271203002CF330209CF32020B711C +:10052E0030310271203102713BE6717030028E263D +:10053E005CFC9E2671603002D7717830027148F0F3 +:10054E0000D7C72008FBF8FFFD9D085014C15008C6 +:10055E00FDCF07C0CC07048C074C14DE0C8C073182 +:10056E008EFD390A615907EFEECC07048C074C1447 +:10057E0061C8ED3E06CC06008C064C0461C8ED1D2C +:10058E0006300AF9BC02F6BBCEABAC31B2D109C70C +:10059E003641057184C6DEF3F1C73641057184C656 +:1005AE0061DC9C05713BD1AC02148F4005997150F2 +:1005BE005005617902617900F0E1614900DD09C7FA +:1005CE003641057184C6DEC3F1C73641057184C656 +:1005DE0061DC0E059C055040C18C07318E31AD1289 +:1005EE008C06318E318D03BDD831FFBDDADADAAD2E +:1005FE00D8FD050DC0D2DD0C5008C15014FDCF073B +:10060E00C0FDC20B8C05D1DF06615906ED86058C47 +:10061E0007318EFD3D0AD2DD0C5008C15014FDCFBE +:10062E0007C0FDC20B8C05D1DF06615907ED7A05B7 +:10063E0071605005CC0400CC05008C054C09DE2BF6 +:10064E008C05318E04F61FC1317B9EFDC41189725B +:10065E008C05318E04F64F14896142DF03F6EF01EB +:10066E00E6600E049C04615905EFCF41001140F87D +:10067E001F3A61E86159048C04D1DF08FDC30BFDFC +:10068E00D50CEF0C5008C15014FDCF07C0FDC20BA6 +:10069E001008C6D7C72004FBF8FF712B24CC01002D +:1006AE00F6BC02AC02440900DE3EAC0204F60F14A6 +:1006BE004100118972AC020C5014896142DF03F6BD +:1006CE00EF01E6600E019C01AC021249005072ACC3 +:1006DE000204F67F14896142DF03F6EF01E6600E35 +:1006EE00019C01617902EFBB40F67FFF61F8615911 +:1006FE00018C01D161F8ED9B07CC0100717AFAFDF6 +:10070E008704711300711B20710303710205E0C190 +:10071E005003FD722BC05013FD110A500FC1E0FDA6 +:10072E00722BC0CEABAC6159018C0191DD068C01F0 +:10073E004C03DF03E6EF01F66061FB7121048C01CF +:10074E004C0861F8CC010031320705A024FCEF0300 +:10075E00F524FC4024FC11DC22F524FCF0C15003EE +:10076E00FD722BC0CE3708CBE4FFFFCBE6FFF7CEF2 +:10077E00D4FFCF370008F5120561FDE6BC02F66125 +:10078E004902DD9F00000000617902EFF1FD9D0836 +:10079E00D2DFFA5008C15014FDCF07C0D2FDC20BF4 +:1007AE001004C6D73184BD02EFFA717BBDCBE4FFD6 +:1007BE00FFCBE6FFFFCBD4FFFF717ABED7717BBEB6 +:1007CE00D7C7C1200CFBF8FF8C0C318E31ADC13177 +:1007DE007B9DD4C0BC068DD49C088C149C0B8C14B1 +:1007EE00318E040C00128C0B318EBDD813FD940F7C +:1007FE0061C8ED9808CEABACCC05068C0B318EFDE6 +:10080E00350AD2DD158C0B318EFD390A6169058CE6 +:10081E0005D1DFE7FDCB07E2EF71CC0A008C0A4C65 +:10082E0004DE54F6BC02300AF9BBAC06148C089EEA +:10083E00FD118972AB146299AC06A1BC06617900F8 +:10084E00617902F0E1614902DFE05040C18C0B3169 +:10085E008E31AD128C0A318E318D03BDD831FFBD74 +:10086E00DADADAADD8FD050DC0D2DD06FDCB07E232 +:10087E00EF1961590AEFA68C0B318EFD3D0AD2DDC0 +:10088E0003E2EF0761590BEDEC07F2100EC6D7C766 +:10089E00717B9D717BFAFDB207300AF9FDE80AFD06 +:1008AE00730AC6D7FD9D08FDC20BFDCB07F5ABFF46 +:1008BE00F2D7C731049F067110B3FBEF047118B362 +:1008CE00FB8FB3FB7B9276D1DD5B8FB3FB9D9240AA +:1008DE0004F903DF22665C10D1DD1C8FB3FB5C10C4 +:1008EE00D1DD0B5080C15011FDCA34C0EF0950400C +:1008FE00C15011FDCA34C04004F903DD064004F9AD +:10090E0004DF22665C02D1DD1C8FB3FB5C02D1DDFD +:10091E000B5040C15010FDCA34C0EF095020C150D9 +:10092E0010FDCA34C0C6D7C7360000665C80D1DD64 +:10093E0010675C80D1DF0571339EEF0B71329EEF35 +:10094E000671040771319E665C40D1DD10675C4014 +:10095E00D1DF0571439EEF0B71429EEF06711405B8 +:10096E0071419E665C01D1DD10675C01D1DF0571BE +:10097E00539EEF0B71529EEF0671340771519E66B6 +:10098E005C02D1DD10675C02D1DF0571639EEF1D45 +:10099E0071629EEF184007F901DF08710402716160 +:1009AE009EEF0AC736100571C4C671619E665C045F +:1009BE00D1DD10675C04D1DF0571739EEF0B717290 +:1009CE009EEF0671440771719E665C08D1DD10675B +:1009DE005C08D1DF0571039FEF0B71029FEF06716B +:1009EE00140771019F665C10D161E8715AD1C6D7A8 +:1009FE00F5F6FBF5F8FBCFFEFBFFCFFAFBFFCFFBC7 +:100A0E00FBFFD7C7C1C1FBF8FFCEABAC8C02D1DD6B +:100A1E0012616902305C03BBF6614900DDEE61894B +:070A2E0000EFF51004C6D72C +:100A35005208EF065203EF025206FEE600FE1B00C7 +:100A4500DC16089F03088F0408089F040862FE242B +:100A550000089F0408EEBF00EEBA00C1C514410EA0 +:100A650011D9D0FF118FD1FF312E45C4C0D7F23136 +:100A7500A2C401E2D79DE261DD4C09DF12717BFA68 +:100A8500C18F06089F25FDC0CF060800EE2700315F +:100A9500F2FA04CF0608004C00DF05D50008DD1684 +:100AA50061DD717BFAD50608DD0ACDE31F61CD61F5 +:100AB500CDEE160061CDFED40061FFFE9A00FCF874 +:100AC500FF0EFEB20061CDFED5004C09DF0EC18FD1 +:100AD50006086F25FD9F0608C0EE0400CF06080036 +:100AE500F8E3D75200EF025202FE3700CF24FD0093 +:100AF500CF060800BF0408C716629F000841001111 +:100B05008F1A209B4100118F1B209F0108C65100A1 +:100B1500FE62FFEF025205CF060800C1510CFE0A26 +:100B250000C0D7C1511DFE0200C0D761DD717BFA3F +:100B350070CEC0A59EC47CFF9EC4609EC461CDD707 +:100B450061DD717BFAC18EC45C1BFED6FFCF060842 +:100B550001FED7FFC061CDD731F2FA1AC1AEE4BFAD +:100B650016FDAEE6BF18FDAED4BF1AFD30FFFFBEC1 +:100B7500E4BEE6BED4C0D731F2FA11C1AF16FDBE50 +:100B8500E4AF18FDBEE6AF1AFDBED4C0D7C1BF1C89 +:100B9500FD13BF1EFD15BF20FD17BF22FDC0D7AF3A +:100BA5001CFDDB1EFDEB20FDFB22FDD7534B305218 +:100BB5005430324E323030475631323000FFC1505A +:100BC500FEFEAB0061DD717BFACF060800FE0A0070 +:100BD500FEA4FF61CDF8E3EECF00C7FB0408BF1606 +:100BE500FD8FC0009C05C5C337040600BF18FD3541 +:100BF50036270C300000522BFE6600C2C4C630D525 +:100C05000BB800300000B8022004AF18FDB8003062 +:100C15000F00B802AF16FD61FF520AFE3AFFECF86D +:100C2500FF0E717BFAC1C7FB04088C05C65C80FE0C +:100C35000200C0D761DD717BFA70CFC0FFA59FC0F0 +:100C4500007CFF9FC000609FC00061CDD7618BFE17 +:100C5500E2FF717BBE410011FB000017CEFC006175 +:100C6500CB089EFDF31161C999A58392DFF7D7FEE5 +:100C7500B1FED524FDDF23C1CF0308035109FEF4DE +:100C8500FDC0D2DF37FE3800A20408CF03080751A4 +:100C950009FEE1FDD2B20408DF22C7FB0408318357 +:100CA50002C6D7C6510AFECCFD624C1FDF06CF2413 +:100CB500FD01EF04CF24FD00C0EE5BFEC0EE55FE46 +:100CC500C7C1FB04088B31196C0161589BC0C6D79D +:100CD500717BFAFE4DFEAF0408040600C1143639D7 +:100CE5000C300000522DF3FE77FF8FC000FE2BFE67 +:100CF50061CF5C807C8073C0041900CEFC0F61CB92 +:100D0500C55404EF03C55417FE18FEC7360008BBCB +:100D1500629C0288089C03D1DD334C41DE2F70F1C3 +:100D2500312DB161090033081C000851FF612A41CA +:100D35000E118FD0FF613B118FD1FF6138DC0E8B17 +:100D45005C03DF0964C6C4FE2BFDEECAFDC6C4EE16 +:020D5500C3FDDC +:100D570061CF5100718C7109FECBF800FEFCDE01FA +:100D670000F6BF00F953C0F693935820FEDFF94110 +:100D77000036B64E34CCFCEF05118B99A7A5174466 +:100D8700004FDFF53602F930CCFCEF04CC0000A7AA +:100D970047DFF9410036004F3420FEEF05118B99EC +:100DA700A7A51744104FDFF53630FE309AFEEF0443 +:100DB700CC0000A747DFF9FCCE0000EFFE61DD7134 +:100DC7007BFABEF0ADD8BEF200AEF661CDD7C361F7 +:100DD700DD717BFABEF0ADD8BEF200DBF6FFADDC0D +:100DE700BEF000AEF6BDD8AEF40312ADDABEF20027 +:100DF700AEF661CD03BDDAC2D7C3F33174D9088328 +:100E0700C1F626D8BDD8C031750683C312F623C2F2 +:100E1700FD220E93DF0312F623C2D7440000DD261E +:100E270061DD717BFACFE80080BEF6F6BEF4BEF254 +:100E3700ADD8BEF0CFE800818FE8003103FAAEF0FD +:100E4700F5E80061CDD7B1D7C3F33174D90883C1B1 +:100E5700F626D8BDD8C0317505C312F623C2FD707A +:100E67000E93DF0312F623C2D7440000DD2761DDAE +:100E7700717BFACFE80080BEF6F6BEF4BEF2ADD8BD +:100E8700BEF0CFE800818FE8003103FAAFE000F54C +:100E9700E80061CDD7ADD8D7C3F33174DB0F83C179 +:100EA700F626D8BDD861317026DABDDAC031750DA6 +:100EB70083C312F626DCBDDC61317023C2FDD80E78 +:100EC70093DF0CF626D8BDD861317026DABDDAC2B9 +:100ED700D7C161686BDC6BDDC0DD2F61DD717BFA2B +:100EE700CFE80080BEF4ADDCBEF6ADD8BEF0ADDA1B +:100EF700BEF2CFE800818FE8003103FAAEF0BDD82B +:100F0700AEF2BDDAF5E80061CDD7F6BDD8BDDAD7C8 +:100F17008292DD2B61DD717BFACFE80080BEF0F6AF +:100F2700BEF2BEF46208BEF6CFE800818FE800315A +:100F370003FAAFE0006072AEF0F5E80061CDD7606C +:100F470072F6B1D706DABDDAADDC06D8BDD861D8FE +:100F5700A6DAD7D1DD17C1C3DAD89DD8ADDA311CEF +:100F670061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD82 +:100F77001BC1C3DADA9DDAADD8311E33311E3371A6 +:100F8700F9B4DADFF4BDD813BDDAC2C0D746D8DD6D +:100F97000771FF7177D971C0D75BDB9DDB605BDAC7 +:100FA7009DDAADDC5BD9085BD808BDD8D7C3C7F3DA +:100FB700728EFDC162314C410036AC4E1161A07298 +:070FC700C09EFD62C6C2D707 +:0A0FF60031333A34333A3538000045 +:0A20000031333A34333A353800002A :10200A0005214F7B9EC5E9000104080D12171C1F0C :10201A00080100001F003B005A0078009700B50035 :10202A00D400F300110130014E01192634445362E1 @@ -317,40 +315,40 @@ :10239C00009BDC05D5AFFBDF095020C15011FDCAF5 :1023AC0034C0C0C6D78D209D41FDF323FD8E2BD5A7 :1023BC0007F9DD0471039AD78D414B2061F8316424 -:1023CC009A1C71639AFD95044A4107DD054A41FF49 +:1023CC009A1C71639AFD87044A4107DD054A41FF57 :1023DC00DF098F06F9310303FD8224FD9624710277 :1023EC009A3079256194D7C77162017172015003DB -:1023FC00FD1F0A5008FD4737629D305009FD4737D5 +:1023FC00FD110A5008FD4737629D305009FD4737E3 :10240C006276716301711806F94A30F1DC0BE5074D :10241C00F9F508F9CD3707EF224A3004DE1ACF0759 -:10242C00F9025008C1506CFD8D02C092DF0DD454DE +:10242C00F9025008C1506CFD7F02C092DF0DD454EC :10243C00DF09711006F9EF03F507F94007F901DF21 :10244C0005710A22EF06710B22710302CD2007578A :10245C0000674C08DE1073090A20614EDC05679D8D :10246C0020EF0387EFEB4A2007DF09D507F961F866 -:10247C00CF07F903C6D7500AFD1F0A304000C150E0 -:10248C0006FD3D2BC05096ED1F0AC72006FBF8FF3A +:10247C00CF07F903C6D7500AFD110A304000C150EE +:10248C0006FD3D2BC05096ED110AC72006FBF8FF48 :10249C00D507F961E8ED7525304A57C1503EFD3D31 :1024AC002BC0D2DD077100B2FBED75257108B2FBB4 -:1024BC0017040200C15004C1500CC1506CFDAE0297 +:1024BC0017040200C15004C1500CC1506CFDA002A5 :1024CC001006EA38AA48318D12AA48318E616B0881 :1024DC00616A08C1500EFD3D2BC0F690C1500CFD39 :1024EC003D2BC0CC01008C014C04DE2831349B0206 :1024FC00EFFA71229BEA388C015010D605C15010AE -:10250C00C18C01D6044000C1506CFD600310066103 -:10251C005901EFD250A5FD1F0AEA38AA48318D1295 +:10250C00C18C01D6044000C1506CFD520310066111 +:10251C005901EFD250A5FD110AEA38AA48318D12A3 :10252C00AA48318E616B08616A08C1500EFD3D2BC3 -:10253C00C050A5FD1F0A5004C1506CFD8D02C06235 +:10253C00C050A5FD110A5004C1506CFD7F02C06251 :10254C009C01EA388A4B4E0161C3048A4A4E01173A -:10255C00040200C15004C1500CC1506CFD6003104A +:10255C00040200C15004C1500CC1506CFD52031058 :10256C0006F6C1503EFD3D2BC01006C6D7C78D42A6 :10257C004B3061F8ED18264A4428DE05A444ED18CA :10258C0026F4448D309D428D305070D612307351EC :10259C00230480001231FF318E039D439FAEFBF666 :1025AC008D437C804C95DC1B8D43318F241400EAC9 -:1025BC0038BDD8AA44FDD20D1231FF318E03318FB4 +:1025BC0038BDD8AA44FDC40D1231FF318E03318FC2 :1025CC0016EF198D43318F241400EA38BDD8AA4672 -:1025DC00FDD20D1231FF318E03318F16EA388A424B +:1025DC00FDC40D1231FF318E03318F16EA388A4259 :1025EC007217F3031644000171FE61C836FF001721 :1025FC0001DE02F61617BD7CC7500CFD3D2BC0D278 :10260C00DF068D309D42EF047100B2FBF2C6D7C7D6 @@ -359,7 +357,7 @@ :10263C00079C04EF4ECC0563CC0400EF4617040650 :10264C0000FD602CD2DD0F7100B2FB71039ACC053A :10265C000071129BEF2D7108B2FB8C06318E318DFF -:10266C00080E07081C00BBEA388A4072ABFD250F28 +:10266C00080E07081C00BBEA388A4072ABFD170F36 :10267C00BB8C019C05D1DF08CC0501CC0400EF0319 :10268C008B9C0417040600FD6B2CD2DD06CC06C80F :10269C00CC07008C069FB1FB8C06318E318D080E59 @@ -376,10 +374,10 @@ :10274C0006DE09D5AFFBDF0DD448DD095020C150A2 :10275C0011FDCA34C08FAFFB9D48FD2A2C1008C652 :10276C00D7C75601D837C15002FD722BC08F09F95B -:10277C003105075012FD1F0AEF0E500AFD1F0A719A -:10278C002010055008FD1F0A8D376C0870C15002CF -:10279C00FD722BC05003FD1F0A8D376C1870C15091 -:1027AC0002FD722BC05016FD1F0A5003FD832B62D5 +:10277C003105075012FD110AEF0E500AFD110A71B6 +:10278C002010055008FD110A8D376C0870C15002DD +:10279C00FD722BC05003FD110A8D376C1870C1509F +:1027AC0002FD722BC05016FD110A5003FD832B62E3 :1027BC005C01D1DD0F7170B3FB5002C15013FDCA27 :1027CC0034C056006672C6D7C75004FD832B625CBA :1027DC0003D1DD405014FD6B2834B3FB895C9F9909 @@ -387,9 +385,9 @@ :1027FC00147234B7FB89616A9971620756003162B1 :10280C0007058666D1DFF7716307716B2734C6FB4A :10281C00895CEB995002FD832BD2DD398D376C101E -:10282C0070C15002FD722BC0E0FD1F0AD837C15099 -:10283C0002FD722BC05033FD1F0A8F09F9310309B9 -:10284C0071281005500AFD1F0AF0C15002FD722BB1 +:10282C0070C15002FD722BC0E0FD110AD837C150A7 +:10283C0002FD722BC05033FD110A8F09F9310309C7 +:10284C0071281005500AFD110AF0C15002FD722BBF :10285C00C07178B3FBE0C15013FDCA34C0C6D7C7F2 :10286C00C12004FBF8FFCC02005004FD832B629CBA :10287C00038C045C20D1DD0E8C036C019C038C0258 @@ -398,7 +396,7 @@ :1028AC008C036C029C038C026C089C02EF138C044E :1028BC005C04D1DD0C8C035CFD9C038C026C049CD1 :1028CC00024008F903DF088C03D161E8CC03028CC9 -:1028DC0003D1DD05501AFD1F0A8C0370C15004FD95 +:1028DC0003D1DD05501AFD110A8C0370C15004FDA3 :1028EC00722BC08FB3FB5C9F728C03318E316D14D5 :1028FC008C03318E314D616D08616C5C606162627C :10290C009FB3FB8FBFFB7CFF50FF5E02D1DD278F97 @@ -409,18 +407,18 @@ :10295C00FD4729F2D7C716664C02DD044C04DF058F :10296C00CD3A10EF02F43AC6D7C7711300711B2091 :10297C00710303710205E0C15003FD722BC05013AB -:10298C00FD1F0AD83AC15005FD722BC0500FC1E093 -:10299C00FD722BC0500AFD1F0A7103055008FD1F64 -:1029AC000A501FC1E0FD722BC05012FD1F0A5003CC +:10298C00FD110AD83AC15005FD722BC0500FC1E0A1 +:10299C00FD722BC0500AFD110A7103055008FD1180 +:1029AC000A501FC1E0FD722BC05012FD110A5003DA :1029BC00FD832B625C01D1DF03E2EF12F0FD832B70 :1029CC00629D363602F9C75008FD5A2BC0F2C6D7A5 :1029DC005003C1FD722BC0710203711A20FD1A2B1A :1029EC00F431D75003FD832B625C01D1DD155014FB -:1029FC00FD6B28FDD4275014FD1F0AE0C15003FDC8 -:102A0C00722BC0711300711B207103035014FD1F36 +:1029FC00FD6B28FDD4275014FD110AE0C15003FDD6 +:102A0C00722BC0711300711B207103035014FD1144 :102A1C000AF0C1E0FD722BC0F0C15003FD722BC057 :102A2C00D7C72004FBF8FFCC02008D319C0350105B -:102A3C00C150A4FD8D02C0629D31D454DD04F2ED71 +:102A3C00C150A4FD7F02C0629D31D454DD04F2ED7F :102A4C00F72A8C037B315C08D1DD0F8D315C08D10A :102A5C00DF05CC0210EF03CC02208C037B315C042D :102A6C00D1DD158D315C04D1DF088C026C049C0225 @@ -431,16 +429,16 @@ :102ABC006307716B278D315C40D1DD095002C15029 :102ACC0012FDCA34C08D315C01D1DD08E0C1501259 :102ADC00FDCA34C0717AFA8D315C41D1DD0C5A31AA -:102AEC00BED831C15010FDEE47C0F21004C6D7FD60 +:102AEC00BED831C15010FDE347C0F21004C6D7FD6B :102AFC006D27F2D7FDD427F2D7C78FC6FB7617FD0B :102B0C006B28664FC6FBDFF2F5C6FBF2C6D75064E6 -:102B1C00FD1F0AFD762C6261FB71119AF171149AFA -:102B2C0061DC70C15012FDEE47C0FD7836CD6303F9 +:102B1C00FD110AFD762C6261FB71119AF171149A08 +:102B2C0061DC70C15012FDE347C0FD7836CD630304 :102B3C00D7C7C1C1FBF8FFAC0ABB17C15002C18C8F -:102B4C000270C1506CFD600310061004C6D7C7C1DB -:102B5C00FBF8FFAC08C15002C18B70C1506CFDAECC +:102B4C000270C1506CFD520310061004C6D7C7C1E9 +:102B5C00FBF8FFAC08C15002C18B70C1506CFDA0DA :102B6C00021006C0C6D7C78806166770C1C7508446 -:102B7C00FD29031004C6D7C716C75084FD8D02C0AB +:102B7C00FD1B031004C6D7C716C75084FD7F02C0C7 :102B8C00C6D7C74A2004DE045600EF0256018F0850 :102B9C00F9318FE7240000DD1A23DD0B23DD0C2334 :102BAC00DD1123DD0CEF0C8686EF0851046106EF76 @@ -454,7 +452,7 @@ :102C2C00F9DF0471739AD7FD762C6261FB71019BFD :102C3C0071149A71079B61C831729A1771729A71EB :102C4C00049B71119AF171049B61DC70C15012FDEF -:102C5C00EE47C0D7C716C75004FD5A2BC0C6D7C7FE +:102C5C00E347C0D7C716C75004FD5A2BC0C6D7C709 :102C6C0016C75002FD5A2BC0C6D740AFFB0BDE0275 :102C7C00E2D7F2D77100010571785005713AD57120 :102C8C003BD18F10055CFC9F1005CF54054AE542E3 @@ -462,15 +460,15 @@ :102CAC000571205005CF530509CF52050B713051DA :102CBC000571205105713BD5717050058F11055C64 :102CCC00FC9F1105F422D77178500571080105D7C6 -:102CDC00FD7238FD9504717AFAFDB123F504F98F74 +:102CDC00FD7238FD8704717AFAFDB123F504F98F82 :102CEC0006F931051B5003FD832B625C01D161E8B1 :102CFC00CF04F902CFAFFB6471040771419AEF1056 :102D0C00F6710407611012F6B1236061FB71419AF0 -:102D1C00FD8530FD924371229D712BE7618461A486 +:102D1C00FD8530FD874371229D712BE7618461A491 :102D2C0061EDEFF8D7C788061666614FDD0967615C :102D3C004EDE0396EF01866672C6D7C7161714AA25 -:102D4C000412A943DD29AA0412A923FD1C4FC3AC0C -:102D5C0002FD1C4F13C2BDD813FDA20FDE0C1714BD +:102D4C000412A943DD29AA0412A923FD104FC3AC18 +:102D5C0002FD104F13C2BDD813FD940FDE0C1714D7 :102D6C00AA0212AA0403BA04EF051714A9BA04ACF8 :102D7C00041231FF319E03317F087208C6D77100EF :102D8C00F200304400BFB601300188BF9001300919 @@ -493,7 +491,7 @@ :102E9C0003B266FFCD5803D7C7161714F6B9AA04A8 :102EAC0012F6231231FF31AE03316FBA02C6D7C707 :102EBC00C1FBF8FF8C085080D612AB1413B9AB14BD -:102ECC00AA0412A92312D927FBF133BDD813FD0E86 +:102ECC00AA0412A92312D927FBF133BDD813FD0094 :102EDC000EBA02C0C6D731049C01D74004F902DFF8 :102EEC0010F6BE64BE6EBE6ABF8EFBBF94FBBF9A6B :102EFC00FB31749B14308AFBFDA42E3090FBFDA497 @@ -522,7 +520,7 @@ :10306C0031449C1371439C717B9E8FDCFB9E9A8F29 :10307C00DDFB9E9B717A9EC6D7CFA7FB5CCFA8FBCE :10308C005FCFC8FB5DCFFCFB36CFFDFBC9D7C7CFED -:10309C00A4FB12CFA5FB30CFCCFBFFF5CDFBF5CEBF +:10309C00A4FB12CFA5FB24CFCCFBFFF5CDFBF5CECB :1030AC00FBF5CFFBF5D0FB5600664C64DE0872389E :1030BC0026FB0086EFF3F5E3FB714A9D712B217122 :1030CC000A20711A20710203C6D7C788061617F199 @@ -560,7 +558,7 @@ :1032CC00A44A4A4A0561C871129CED0E3434A6FB1F :1032DC0089615F99ED0E34305C29619466736718CF :1032EC00A4FBED0E3440A9FB6ADF1340AAFB68DF98 -:1032FC000D674C6CDF0830CF406194713AD5679FF5 +:1032FC000D674C6CDF0830C4406194713AD5679F00 :10330C00ABFBED0E34675C7F70C117F1243000FD10 :10331C002130C0ED0E34675C3F70C117F1243000D2 :10332C00FD2130C0ED0E34675C0770C117F12430FD @@ -573,7 +571,7 @@ :10339C00675C3F9FDEFBEF6A675C1F9FDFFBEF62A2 :1033AC003056396194679FE4FBEF573023396194B1 :1033BC00679FE5FBEF4C303C396194679FE8FBEF6E -:1033CC0041675C01D1DD3BFD9243EF36675C02D176 +:1033CC0041675C01D1DD3BFD8743EF36675C02D181 :1033DC00DD05712A21EF06714A9D712B21675C0175 :1033EC00D1DD06710300710B20679FE3FBEF1367C0 :1033FC00318EEF0EEF0CEF0A664C5BDE057367182F @@ -582,7 +580,7 @@ :10342C0003FC5C03318E316D08616A08128F03FC5A :10343C005C80312A6162EF56664C3DDF08AE90BD70 :10344C005EF85EEF49664C3EDF04F85FEF40664C79 -:10345C004FDF05FDBA43EF36664C61DF08E85C09C7 +:10345C004FDF05FDAF43EF36664C61DF08E85C09D2 :10346C005AFA72EF29664C7FDF05FD223CEF1F668E :10347C004C4EDF0B31049E045210EF12F2EF0F662C :10348C004C5BDC0452FFEF06667309A4FB72C6D7D3 @@ -598,7 +596,7 @@ :10352C00E734020025DD3D23DD1725DD1C23DD05F9 :10353C0023DD2BEF3B71029D679F06FCCD6303EFF0 :10354C002F675C839F03FCEF27675C039F05FC6779 -:10355C005C034C0261F871229EFDA845EF12679F37 +:10355C005C034C0261F871229EFD9D45EF12679F42 :10356C0007FCEF0C6791DF08E0C15012FDCA34C0B4 :10357C00C6D7C71617F1E7240000DD2A23DD1E2469 :10358C000300DD0724FB00DD24EF2531329E0530DE @@ -614,7 +612,7 @@ :10362C00618A70618AFDBD37C0D866F1312F609D0B :10363C00658D604B65DD0A71729C8D659D60CD63F7 :10364C00034A6305DE083082366194CD636BB46344 -:10365C007150F000CE300BCF170006CE3106FD684E +:10365C007150F000CE300BCF170006CE3106FD5A5C :10366C0002717A30710BE3710BE7C6D78D659D60E3 :10367C008D659FADFBD74004F903DF064004F904C8 :10368C00DF02F2D731749C0C71739C71139D8D65A4 @@ -622,7 +620,7 @@ :1036AC00FCDF04F468EF0A8F06FC5002D6A1609D83 :1036BC00688D689D67EF0E31149D068D689D67EFD0 :1036CC00048D659D678D679FADFBD867FDEA36E875 -:1036DC0067091C2270C15013FDEE47C0F2D7C7C159 +:1036DC0067091C2270C15013FDE347C0F2D7C7C164 :1036EC00C1FBF8FF8C02D1DF05F506FCEF1A8C024A :1036FC004C05DE06CF06FC02EF0E8C02318E123129 :10370C00FE03311F609F06FC8D694F06FCDD28CC43 @@ -630,14 +628,14 @@ :10372C00730912204F06FCDC058B9C01EF056159D7 :10373C0000EFE78C019D641004C6D7C716710AE729 :10374C00710BE37150F000CE300BCF170006669E64 -:10375C0031FD6802717A30710BE33182E302EFFACA +:10375C0031FD5A02717A30710BE33182E302EFFAD8 :10376C008D1F7158F000710BE772C6D7C7C1C1FB32 :10377C00F8FF8FFCFB4E02DC03F2EF318C024FFDA5 :10378C00FBDC0452FFEF268C022FFCFB7061313105 :10379C008D128FFDFB2FFCFB70613133BDD813FDF7 -:1037AC00300EBB440001DC03F690BB8B721004C6D8 +:1037AC00220EBB440001DC03F690BB8B721004C6E6 :1037BC00D7C7C1FBF8FFAC0814A91489708B61281A -:1037CC00706131FD1C4F1344030071FEDC23AC0807 +:1037CC00706131FD104F1344030071FEDC23AC0813 :1037DC00148A04819A04AC08148A044C11DC10A9D4 :1037EC00148B99AC0814CA0200AC0814CA0310EF6D :1037FC0072AC0814CA0400AC0814A914894DDE0A72 @@ -650,25 +648,25 @@ :10386C00CA0310C0C6D7ED7538C75600664C0ADEC1 :10387C000BF0317E12F67810FC86EFF0C6D7C7201D :10388C000CFBF8FF17040600C15006C150A8C1502C -:10389C0030FDAE021006D2DD1B4A6C04DE05A46CB2 +:10389C0030FDA0021006D2DD1B4A6C04DE05A46CC0 :1038AC00E2EF7034E4FB895CFC99FD56397110B27F :1038BC00FBF2EF5F717BFA300600C117040600C102 -:1038CC0030E9FBFD244F1004717AFAF46C8FE4FBA1 +:1038CC0030E9FBFD184F1004717AFAF46C8FE4FBAD :1038DC005C01D1DD264004F903DF205010C180FDCE :1038EC00CA34C0C736100571D4C6DE0F17C15006D6 -:1038FC00C150A8C15030FDAE0210064004F903DDE2 +:1038FC00C150A8C15030FDA00210064004F903DDF0 :10390C00064004F904DF0B8FE4FB5C02D161E8FD97 -:10391C00D440F2100CC6D7D9E5FBC15030FD8D0256 +:10391C00C940F2100CC6D7D9E5FBC15030FD7F026F :10392C00C0629FE8FB5008C15011FDCA34C0F2D7E9 -:10393C00D9E8FBC1D9E7FBC15030FD290310045075 +:10393C00D9E8FBC1D9E7FBC15030FD1B0310045083 :10394C0008C15011FDCA34C0F2D7C7200CFBF8FFD8 :10395C00CC09004007F901DF05CC0A02EF03CC0AC1 :10396C0010CC0B808FE4FB5C039C07D1DF08717AD1 :10397C00D5CC0807EF06717BD5CC082F17040800AF -:10398C00C15004C150A0C15030FD60031006624C00 +:10398C00C15004C150A0C15030FD52031006624C0E :10399C0002DF077110B2FBF2EF357118B2FBF46C59 :1039AC00C736100571D4C6DE164004F903DF1017B4 -:1039BC00A1C15006C150A8C15030FDAE0210067115 +:1039BC00A1C15006C150A8C15030FDA00210067123 :1039CC007BFA8FE4FB5C034E07DD03E2EF01F210A0 :1039DC000CC6D7D504F9DF03F6BD6E4004F901DD42 :1039EC000AD478DD03B478D7CD78038F04F9318FFE @@ -705,7 +703,7 @@ :103BDC0003FD722BC0711300711B20710303665C13 :103BEC0004D1DD11711300711B20D503FC61F87138 :103BFC000303FD1835665C08D161E87103035005B9 -:103C0C00FD1F0A7102035003C1FD722BC0711A20F3 +:103C0C00FD110A7102035003C1FD722BC0711A2001 :103C1C00FD1A2BF2C6D7C756FF4A4A1361C8EDD816 :103C2C003C8F06F9311505300400EF0F8F06F93182 :103C3C004505300500EF04D907F9F1609F28FC8D8C @@ -718,304 +716,303 @@ :103CAC00EF01F6C2616B08616A9F2CFCF171240470 :103CBC0061DC9F26FCF171540761DC9F27FCD84A1C :103CCC00F10104ECFC14A9148976A44A6672C6D7D7 -:103CDC00FD43098F04F9318FE724000061F8ED5A98 -:103CEC003E23DD212361F8EDBE3D2361F8ED293E35 -:103CFC002361F8ED403E2361F8EDA03E2361F8ED21 -:103D0C00A13DED573EF6BD7471139B4005F901DFE3 -:103D1C001831349E07FD073F92DF04D7FDB123AD68 -:103D2C006E440A0061D8ED063F71429DFD95047109 +:103CDC00FD35098F04F9318FE724000061F8ED4FB1 +:103CEC003E23DD212361F8EDB33D2361F8ED1E3E4B +:103CFC002361F8ED353E2361F8ED953E2361F8ED37 +:103D0C00963DED4C3EF6BD7471139B4005F901DFF9 +:103D1C001831349E07FDFC3E92DF04D7FDB123AD74 +:103D2C006E440A0061D8EDFB3E71429DFD87047123 :103D3C00639AFDB1234007F903DF0771229DF50457 :103D4C00F9D7FD1B2640B1FB9BDE0771229DF504C4 :103D5C00F9D7714A277140110571301105713A225A :103D6C00715A2271501105FD7529D2DD0771229D02 :103D7C00F504F9D771103500CF37001D71401205CD -:103D8C005032FD1F0A4008F903DF05CF04F906D7AE -:103D9C00CF04F902D7FD933F62318FE7240000DD99 -:103DAC000D23DD0523DD06EF05F504F9D7D7CF0488 -:103DBC00F902FDDC294005F901DD064005F903DFB8 -:103DCC0005F5CDFBEF04CFCDFB03CF04F902FD4786 -:103DDC0029FD802CFD0305FD1835FD9A30F505F9FC -:103DEC0071229DF537FF712BE0CBE43FEFCBE6F66C -:103DFC00F0FD9504713BD48F06F9310503FD8A4023 -:103E0C00FD8A2D710806F9CF04F9038FA6FB5C021D -:103E1C00D1DD095080C15010FDCA34C0D7FD2140FE -:103E2C00FD263FFDB5408F06F931250731349E0341 -:103E3C00F504F9D7FD2140FD5A3FFDB5408F06F939 -:103E4C0031250731349E03F504F9D7F504F9FD0A41 -:103E5C0040D261E8ED063FF6BD7471139BF5E4FBAF -:103E6C00FD5639717AFAFD082EFDD32CFD550571DE -:103E7C002B21714B9D31349B02EFFAFDE83F716AA7 -:103E8C0027FDEF29FDB53FCF04F90571429DF6BD25 -:103E9C006EFD0C0AF505F931349E04D432DD1FE5B4 -:103EAC0005F9E504F98F06F931254FF5F8FBF5F620 -:103EBC00FB502EFD1F0ACF05F903E504F9D7FDE9E8 -:103ECC0004FD442371730171320471430271039A2E -:103EDC00FD743FFD4309F46A71629A31329E06CF3C -:103EEC0004F905EF0971439DE505F9E504F9712B1A -:103EFC00E78F06F9312503F504F9D7F6466EDD0494 -:103F0C00F424EF02A4244A2465DC0BF6BD6EF50400 -:103F1C00F971229DE2D7F424F2D731649D2FA47E4F -:103F2C00D47EDD0831A4E00A31020C06712BE0FDD1 -:103F3C00C04031A4E01731040C13712BE05027C1A1 -:103F4C005005FD722BC0CF04F90471229DD73102AC -:103F5C000C15D83AC15005FD722BC05005FD1F0A37 -:103F6C00FDC040CF04F903D731949E02EFFA712AB9 -:103F7C00E7CEA409F5F3003104070261FDE5F30077 -:103F8C00FD6802CEA408D731029F193132020431E8 -:103F9C00549E05F6BD80E2D7A680AD80440002DEBB -:103FAC00035202D7F6BD80F2D7714307714B2771CC -:103FBC0048100571481105713810057138110571DB -:103FCC003302713B22715302715B227158100571DF -:103FDC00581105CF37000971481205D7CE3708CBD9 -:103FEC00E4BFFFCBE6FFF3CED4FFF5B4FBF5B5FB96 -:103FFC00F5B6FBF5B7FBF6BEE0BEE2BED0D7CFCD33 -:10400C00FB03F5CEFBF5D0FB71729BF6426CFFDD2A -:10401C0002E2D7F2D78FE3FB5C01D1DF60D482DF01 -:10402C0019310200585003FD832B625C01D1DF076C -:10403C00F504F971229DD7E482D74A82F0DF07316B -:10404C0004003AF482D74A82C8DF0AF504F97122D7 -:10405C009DCD82F0D7310200084A82FFDD1FA48279 -:10406C00D7F0C15004FD722BC08FB3FB5C9F9FB384 -:10407C00FB7110C4FB30AC3B6194CD82F0D7C750C0 -:10408C0004FD832B625C03318E315D34B3FB89619B -:10409C0068995002FD832BD2DD067170B3FBEF04DF -:1040AC007178B3FBFDB123C6D731149B06F504F927 -:1040BC0071229DD771639DF47E717207FD68027148 -:1040CC007307D7FD5E05F2D7717BFAC7200CFBF89E -:1040DC00FF8FEAFBF0F9E9FBF303FD1C4F13BC0463 -:1040EC008FECFBF0F9EBFBF303FD1C4F13BC028FC1 -:1040FC00EEFBF0F9EDFBF303FD1C4F13BB717AFAE9 -:10410C00AC04BDD8F6BDDAAC04311EBDDCF6BDDEA8 -:10411C00FDE30DADD8BDDCADDABDDEAC02BDD8F62D -:10412C00BDDAAC02311EDADCC3DADEC3BDDCF6BDAF -:10413C00DEFDE30DC0BDDEC0BDDCADDEFD590FAD57 -:10414C00D8BDDCADDABDDEABBDD8F6BDDAAB311E09 -:10415C00DADCC3DADEC3BDDCF6BDDEFDE30DC0BDCB -:10416C00DEC0BDDCADDEFD590FDADAADD8FDA344FF -:10417C00C3C58D905C3FF0317E0440FC14C2C0B9C5 -:10418C00A490F6BC08BC0A9C078C074C2EDD3D8D18 -:10419C00900E0770F161DC605C3FF0317E1279406B -:1041AC00FCBDD8F6BDDA8C0773095C22318FBDDCFF -:1041BC0070BDDEFDE30DAC08BDDCAC0AFD590FADE6 -:1041CC00DABC0AADD8BC08615907EFBDAC08BDD844 -:1041DC00AC0ABDDAC9DC0004F6FDAD0EC9DCFFFF8C -:1041EC00F6FDAE0FADD8BD8AAF3AFC468ADD11AFF5 -:1041FC003CFCBF3EFCAF3AFCBF3CFCAD8ABF3AFC7A -:10420C00AF3CFC423EFCDC46AF3AFC423CFCDE3EA2 -:10421C00AD26423AFCDE374A2A16DC1A4A2AA0DEC0 -:10422C00138D8C4B2ADE0DAF3AFC268E446910613F -:10423C00C8FD8C42F42AAF3AFC445146DC0AAF3A32 -:10424C00FC241027BD28EF0DC928F82AEF074A2AAD -:10425C00FF61E8A42AAF3EFC423CFCDC18AF3CFCFE -:10426C00423AFCDE10AF3AFC4628DE09F48CAF3A39 -:10427C00FCBD8EEF074A8CFF61E8A48C100CC6D7EE -:10428C00717BFAC7710A9E31929E02EFFA8E949F4F -:10429C0034FC8E969F35FC8E979F36FC8E989F37FC -:1042AC00FC8E939F38FC8E929F39FC710B9E717A19 -:1042BC00FA8F37FCFDC20F76FD214413BD88D5EF74 -:1042CC00FBDF0AD5F0FBDF05D5F1FBDD25F6B146AA -:1042DC0088DF11C9883722665C0391DF060A8818CB -:1042EC001A89009617FD444513FD644331049E0260 -:1042FC00EF61520692926934FC682EFCDFF6AD88B1 -:10430C00BD86F884F3311C790AF944FEFFDD44D8EC -:10431C0084F101040AF914A944FFFFDF04E6B9EFA4 -:10432C000BD884F101040AF914A9A1B9717BFAA084 -:10433C00EFFBD5EFFBDF1CA0F0FBD5F0FBDF14A0EF -:10434C00F1FBD5F1FBDF0CCFEFFBFFCFF0FBFFCF89 -:10435C00F1FBFFC6717AFAD7C716D884F10744A8C7 -:10436C0000DC0571029EEF1CF647DD18A4844A841C -:10437C00A8DC0571029EEF0CF884F3311CF6780A68 -:10438C00F9B7EFE4C6D7C756A89666F0317E12F699 -:10439C00B1780AF966D1DFF1717BFAF5EFFBF5F034 -:1043AC00FBF5F1FBF48471039EC6717AFAD7C72032 -:1043BC0004FBF8FFD44ADF168D849D91717BFA5271 -:1043CC00069292692EFC68C0FCDFF6717AFA4A4AB2 -:1043DC0006DE0EE84A09C0FC9C03A44A8C0372EF6B -:1043EC0030F891F3311C790AF9BB31129E058B9C84 -:1043FC0003EF0F8C019C03D491DF05CD91A7EF0245 -:10440C00B491718071179E61DC61FB71119E8C03FC -:10441C00721004C6D7C72008FBF8FF8F37FCFDC20B -:10442C000F9C078F36FCFDC20F9C068F35FCFDC21E -:10443C000F9C058F34FCFDC20F9C048F38FC9C0331 -:10444C008F39FC9C028C06318E0112791A20BB8CA0 -:10445C00075C03D1DF098C064C0361C86179008CC1 -:10446C0005318EB1610900BB313D120103BB8B0ECE -:10447C0004708C011C00BB8FF4FB4E03DC0E8C0310 -:10448C004FF4FBDC0B8C024FF5FBDC04AB12EF039F -:10449C00ABB1121008C6D7C7C3C12008FBF8FFF692 -:1044AC0061490A61F8614908DF07F7340000ED4003 -:1044BC0045E6BC04F6BC06AC0ABC02AC08BBAC06B8 -:1044CC00614902AC0461F8614900DE28AC04BDD836 -:1044DC00AC06BDDAE1FD680FADDABC06ADD8BC04A4 -:1044EC00ABBDD8AC02BDDAE1FD830FADDABC02ADD9 -:1044FC00D8BBEFCAAC06BC02AC04BBAC08BDD8AC94 -:10450C000ABDDAAC04BDDCAC06FDE60EAC04BDDCC9 -:10451C00AC06FD590FE1FD830FADDABC06ADD8BC7E -:10452C0004AC06614902AC0461F8614900DCC5AC1D -:10453C000214AB12100CC6D7C7C12004FBF8FF8FB6 -:10454C0031FCFDC20F9C034E04DF1CAD864688DE99 -:10455C0007AD88268612EF40F64688DF074686DDD3 -:10456C0003E7EF34F7EF318C04318EB1128C033149 -:10457C008E43DF1830382226860688BB8C045C03F9 -:10458C0091DF05AB041800BBAB12EF0C8C034E048F -:10459C00DE0532A900EF01F71006C6D7717BFA31A0 -:1045AC00229E0CF64694DD07B694717AFAEF7C7174 -:1045BC00239E717AFA4004F904DF07715307F42C37 -:1045CC00EF69D9CFFBF1E7240000DD0F23DD1A23BF -:1045DC00DD1023DD5323DD2723DD38715307F42C45 -:1045EC00EF49715207F42CEF42D42CDF07715207BC -:1045FC00E42CEF05715307F42CC994FA00EF2CD47A -:10460C002CDF0B715207E42CC994FA00EF1DF5CF87 -:10461C00FBEF18D42CDF0B715307E42CC994FA0070 -:10462C00EF09CFCFFB02EF03FD3846D7D905FCF1DC -:10463C00E7240000DD0923DD2123DD0923EF1B71B5 -:10464C005307F42CD7D42CDF07715207E42CEF0559 -:10465C00715307F42CC9942D01D7715207E42CD750 -:10466C0031629B01D771039CD9CDFBF1E72400008B -:10467C00DD1223DD1923DD1123DD2623DD3423DDBB -:10468C003923DD3FFDF846EF3DFD1947EF38D9CC16 -:10469C00FBC1AE6CFD312DC0F313BE6C712304EF66 -:1046AC0025F0C1AE6CFD312DC0F313BE6C7123042B -:1046BC00EF14F6BE6C712204EF0CCB6CFF0071236F -:1046CC0004EF03FD8D474004F905DD064004F901B4 -:1046DC00DF0671230471039C31049C0FF6BE64BE8B -:1046EC006A31220402EF02F690BE6ED7CD2E47F44B -:1046FC0096AE6C317DBFCAFCFD6247D2DF0ED9CCC1 -:10470C00FBC1AE6CFD312DC0F313BE6CD7FD6247FF -:10471C00D2DD0DCD2E47F496AE6C317DBFCAFCD7E1 -:10472C00E8960934205080D6BFC6FC22CAFCBDD8FE -:10473C00304700FD0E0EBFC8FC30C6FCFD472DF304 -:10474C0013BE6CB42ED42EDF0CCD2E47A4964A96F5 -:10475C001F61C8F496D740AFFB0BDC05712304F244 -:10476C00D740AFFB0661D831229A11F0C1AE6CFD77 -:10477C00312DC0F313BE6C712204EF03FD8D47E2A3 -:10478C00D771029CF0C1AE6CFD312DC0F313BE6C21 -:10479C00A4974A9740DC37F497D898F1313F04122C -:1047AC00FD14D898F1BDD85008FD5D0E087208E6CE -:1047BC00D2DD040192DFFC896158D1DD0571220440 -:1047CC00EF03712304A4984A982061C8F498D7C7C2 -:1047DC003026FDC6D77180717DFADE035201D752A7 -:1047EC0000D7C7C12004FBF8FF17040300C1E0C1C8 -:1047FC005010C150A4FDAE021006629C02D1DD0522 -:10480C008C0272EF518C0C70C18C0470FD6648C028 -:10481C00629C02D1DD058C0272EF3B8C035C7DD176 -:10482C00DF03F2EF3117A1C1E0C15010C150A4FD5C -:10483C00AE021006629C02D1DD058C0272EF178C61 -:10484C00015C7DD1DD03F2EF0D8C0370C15010FDC6 -:10485C006648C0629C021006C6D7C7880616710A45 -:10486C00E650A4FDE203D2DD0771339B5202EF1335 -:10487C0017FDFE036770FDFE03FD9148FD72047188 -:10488C00339BF2C6D7FD490450A4FDFE035020FD16 -:07489C00FE0350AAEDFE032C -:1048A30061FC61FCC1C3C5C7520C929269D4FEC1BD -:1048B300DFF88EFD708EFCC1717AFA4004F903DFD4 -:1048C30005302D2A6194C09EFC609EFD34D4FE52B7 -:1048D30006C0B9A5A592DFF9C6C4C2C061FC61DFF9 -:1048E300520C929269D4FEC1DFF88EFD708EFCC12A -:1048F3008F4105775C04D1DD06675C01D1DD503162 -:10490300549C3671620771539C8FB4FB5FBCFBD11F -:10491300DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE25 -:10492300FBD1DF098FB7FB5FBFFBD1DD0C31620722 -:1049330002EFFA716307716B2771139EFD4630F422 -:10494300227148500571605005717AFAED3D4A674E -:104953005C02D1DD16D422DD124A2202DD0DF422DF -:104963007148500571605005717AFA717AFA8D2297 -:10497300318FE7240000DD0823DD1423DD2CEF4A0B -:10498300F44A7140500571505005E422ED3D4A8FC1 -:1049930040059D4B715050058D4B9D4DD84BFD10DF -:1049A30034629D4CCD2202ED3D4A675C02D1DD1796 -:1049B300675C10D1DD05CD2203EF0F7148500571FF -:1049C300605005F422EF73CD22044A2203DF108DD9 -:1049D3004C9F4005D84CC1D84BFD9C34C0EF1F8F72 -:1049E30040057671744BDC054A4B02DE067160505C -:1049F30005EF47C7D84BFDD630C071505005D84D91 -:104A0300F1242900DD27240400DD22242200DD1DFA -:104A1300241100DD0C240100DD13241E00DD0EEF44 -:104A23000A4A4B60DF07CD4B61EF02A44B4A2203D6 -:104A3300DF08D84BFD1034629D4CC09EFC609EFD88 -:104A430034D4FE5206C0B9A5A592DFF961FCC1C3F7 -:104A5300C5C7520C929269D4FEC1DFF88EFD708EE9 -:104A6300FCC1717AFA51405F0401D1DD06F616A745 -:104A730047DFF2300400BF2401F6BF2A01300B0BDD -:104A8300BF2801FD6802300B0FBF2801FD6802300B -:104A93000F0FBF2801710AE6F6420C01DD33AF04A4 -:104AA30001BF0C0131529B2971529B710BE2D8510A -:104AB300FDE2033184BD02EFFACBB422FBD853F1FC -:104AC300BEB8714BE1714BE5710ABD8D529E44EF47 -:104AD3000C71539B714AE5717BBD71339BC09EFC86 -:104AE300609EFD34D4FE5206C0B9A5A592DFF9C677 -:104AF300C4C2C061FCC1C5717AFAD450DD0BEA4E61 -:104B0300899E44A64EB450EF33710AE6300400BFC9 -:104B13002401F6BF2A01300B0BBF2801000000005F -:104B230000000000510FBF2801000000000000003A -:104B330000500FBF280171239B71339BC4C061FCDC -:104B430061EF520C929269D4FEC1DFF88EFD708E34 -:104B5300FCC12006FBF8FF71503002CEABACCC0495 -:104B630000F6BB31B2E210617900F6614900DFF370 -:104B730071603002EDFD4B8E519C03713BE28C035F -:104B83005C02D1DD1E8C035C08D1DF097150300259 -:104B9300CC0400EFCC8C0570FD7E35629E50CC04B6 -:104BA30002EFBE8C035C03D1DF408E509C02715038 -:104BB30030028C04D1DF0E8C0270FDC435629C057B -:104BC300CC0401EF328C044C02DF0671603002EF3B -:104BD30029CF34025A716030028C0270C18C057087 -:104BE300FD2635C0CF34024AEF108C035C01D1DDC2 -:104BF3000671603002EF03ED644B1006C09EFC604B -:104C03009EFD34D4FE5206C0B9A5A592DFF961FC1E -:104C1300C1C3C5C7520C929269D4FEC1DFF88EFDA1 -:104C2300708EFCC1710A9E31929E02EFFA8FDEFBF9 -:104C33004F96FFDF198FDFFB4F97FFDF118FE0FBED -:104C43004F98FFDF095004C15011FDCA34C0710BE6 -:104C53009EC09EFC609EFD34D4FE5206C0B9A5A53D -:104C630092DFF9C6C4C2C061FCE46A61FCC1C3C57A -:104C7300C7520C929269D4FEC1DFF88EFD708EFC90 -:104C8300C1C1FBF8FF8D1F9C018E31318EE72406D5 -:104C930000DD0823DD0E23DD22EF38717AFA8C0163 -:104CA3009D62EF2F717AFA4007F901DF068C019DAF -:104CB30061EF2051FF2E019D61EF18717AFA8C018B -:104CC3009D304004F903DD064004F904DF05307923 -:104CD3002561944031FF09DE05A031FFEF077158CC -:104CE300F00071629C710BE3C0C09EFC609EFD34BA -:104CF300D4FE5206C0B9A5A592DFF9C6C4C2C061ED -:104D0300FC717BFAC7D46A61F831249D2771239D16 -:104D1300D46ADD05B46ACEABAC717AFA5600664C40 -:104D23000ADD1172F3311C79D8FCCEFC0061CA6133 -:104D3300A486EFEA717AFAF2C6D7C7C1C1FBF8FFBE -:104D4300CC01008C014C0ADE36717BFA8C01F03108 -:104D53007E0410FC14A96168DF09AC02B9717AFA08 -:104D6300F2EF1D8C01F0317E127910FC614902DFF4 -:104D730006717AFAE2EF09717AFA615901EFC4E236 -:104D83001004C6D7C72004FBF8FFF64210FC61F8F5 -:104D9300ED694E717BFA9C038C034C0ADE3C8C0359 -:104DA300F0317E0410FC14A96168DF05717AFAEF13 -:104DB30029717AFA8C0372F3311C7910FCCEFC0052 -:104DC30061CA629C02D1DF0A8C03F0317E12E6785D -:104DD30010FC717BFA615903EFBECC0200CC0101D8 -:104DE3008C02F0317E0410FC14A96168DD788C021A -:104DF300F0317E127910FCE743DF658C014C0ADE4B -:104E03005F8C01F0317E127910FCE743DD4D717B3D -:104E1300FA8C01F0317E0410FC14A96168DF18617B -:104E230069018C01F0317E12F67810FC8C024E0180 -:104E3300DCED717AFAEF2F8C01F0317E0410FC1453 -:104E4300A9128C02F0317E337810FC8C01F0317E94 -:104E530012E67810FC615902717AFA615901EF9BED -:104E6300615902EDE34D00F21004C6D761FF520C05 -:104E7300929269D4FEC1DFF88EFD708EFCC1717A07 -:104E8300FA8FE4FB5C03D1DD114004F903DD064036 -:104E930004F904DF05308A386194C09EFC609EFDEE -:104EA30034D4FE5206C0B9A5A592DFF961FC61FCBA -:044EB30061FC61FC41 -:0A4EB80000060C12181E242A3036E2 -:104EC200ACFB0000000066FE00000000DF39113676 -:104ED2008C226C46332EE22EA8451B3BCE08DC3CCE -:104EE20028FC36FE20FE02F903F929FC30FE2AFCDA -:104EF2002BFC08F926FC6CFF1AFF6EFF6AFF64FFA9 -:0A4F020027FC66FF2CFC55555555A1 -:104F0C00FF0000000000983AF82AFF00000047005C -:104F1C00317503F7332312D714AEF8C716AC06124B -:104F2C00C5AC0416F643DD078B99A7A5B3EFF5C204 -:024F3C00C6D7D6 -:024FF400326029 -:0A4FF60031383A30373A3332000008 +:103D8C005032FD110ACF04F906D7FD883F62318FFE +:103D9C00E7240000DD0D23DD0523DD06EF05F5042A +:103DAC00F9D7D7CF04F902FDDC294005F901DD066E +:103DBC004005F903DF05F5CDFBEF04CFCDFB03CFB9 +:103DCC0004F902FD4729FD802CFDF504FD1835FD95 +:103DDC009A30F505F971229DF537FF712BE0CBE494 +:103DEC003FEFCBE6F6F0FD8704713BD48F06F9313B +:103DFC000503FD7F40FD8A2D710806F9CF04F903F8 +:103E0C008FA6FB5C02D1DD095080C15010FDCA3475 +:103E1C00C0D7FD1640FD1B3FFDAA408F06F931258A +:103E2C000731349E03F504F9D7FD1640FD4F3FFDD5 +:103E3C00AA408F06F931250731349E03F504F9D7D2 +:103E4C00F504F9FDFF3FD261E8EDFB3EF6BD747160 +:103E5C00139BF5E4FBFD5639717AFAFD082EFDD360 +:103E6C002CFD4705712B21714B9D31349B02EFFAD0 +:103E7C00FDDD3F716A27FDEF29FDAA3FCF04F9054F +:103E8C0071429DF6BD6EFDFE09F505F931349E04B7 +:103E9C00D432DD1FE505F9E504F98F06F931254F1C +:103EAC00F5F8FBF5F6FB502EFD110ACF05F903E5ED +:103EBC0004F9D7FDDB04FD442371730171320471E5 +:103ECC00430271039AFD693FFD3509F46A71629AE8 +:103EDC0031329E06CF04F905EF0971439DE505F9D2 +:103EEC00E504F9712BE78F06F9312503F504F9D7B1 +:103EFC00F6466EDD04F424EF02A4244A2465DC0BA0 +:103F0C00F6BD6EF504F971229DE2D7F424F2D73197 +:103F1C00649D2FA47ED47EDD0831A4E00A31020C0E +:103F2C0006712BE0FDB54031A4E01731040C137180 +:103F3C002BE05027C15005FD722BC0CF04F9047142 +:103F4C00229DD731020C15D83AC15005FD722BC0F9 +:103F5C005005FD110AFDB540CF04F903D731949EED +:103F6C0002EFFA712AE7CEA409F5F3003104070237 +:103F7C0061FDE5F300FD5A02CEA408D731029F196A +:103F8C003132020431549E05F6BD80E2D7A680ADD5 +:103F9C0080440002DE035202D7F6BD80F2D7714393 +:103FAC0007714B27714810057148110571381005C0 +:103FBC0071381105713302713B22715302715B220E +:103FCC007158100571581105CF3700097148120549 +:103FDC00D7CE3708CBE4BFFFCBE6FFF3CED4FFF54B +:103FEC00B4FBF5B5FBF5B6FBF5B7FBF6BEE0BEE2F0 +:103FFC00BED0D7CFCDFB03F5CEFBF5D0FB71729BBA +:10400C00F6426CFFDD02E2D7F2D78FE3FB5C01D105 +:10401C00DF60D482DF19310200585003FD832B621C +:10402C005C01D1DF07F504F971229DD7E482D74AF0 +:10403C0082F0DF073104003AF482D74A82C8DF0AE3 +:10404C00F504F971229DCD82F0D7310200084A8225 +:10405C00FFDD1FA482D7F0C15004FD722BC08FB3BB +:10406C00FB5C9F9FB3FB7110C4FB30AC3B6194CDE8 +:10407C0082F0D7C75004FD832B625C03318E315D17 +:10408C0034B3FB896168995002FD832BD2DD067134 +:10409C0070B3FBEF047178B3FBFDB123C6D73114B9 +:1040AC009B06F504F971229DD771639DF47E7172A4 +:1040BC0007FD5A02717307D7FD5005F2D7717BFAD1 +:1040CC00C7200CFBF8FF8FEAFBF0F9E9FBF303FDCB +:1040DC00104F13BC048FECFBF0F9EBFBF303FD105A +:1040EC004F13BC028FEEFBF0F9EDFBF303FD104F09 +:1040FC0013BB717AFAAC04BDD8F6BDDAAC04311E30 +:10410C00BDDCF6BDDEFDD50DADD8BDDCADDABDDE5A +:10411C00AC02BDD8F6BDDAAC02311EDADCC3DADE95 +:10412C00C3BDDCF6BDDEFDD50DC0BDDEC0BDDCAD56 +:10413C00DEFD4B0FADD8BDDCADDABDDEABBDD8F6C8 +:10414C00BDDAAB311EDADCC3DADEC3BDDCF6BDDEB4 +:10415C00FDD50DC0BDDEC0BDDCADDEFD4B0FDADA2A +:10416C00ADD8FD9844C3C58D905C3FF0317E0440C2 +:10417C00FC14C2C0B9A490F6BC08BC0A9C078C07FE +:10418C004C2EDD3D8D900E0770F161DC605C3FF0D4 +:10419C00317E127940FCBDD8F6BDDA8C0773095C10 +:1041AC0022318FBDDC70BDDEFDD50DAC08BDDCACA5 +:1041BC000AFD4B0FADDABC0AADD8BC08615907EF4C +:1041CC00BDAC08BDD8AC0ABDDAC9DC0004F6FD9F55 +:1041DC000EC9DCFFFFF6FDA00FADD8BD8AAF3AFCCF +:1041EC00468ADD11AF3CFCBF3EFCAF3AFCBF3CFC49 +:1041FC00AD8ABF3AFCAF3CFC423EFCDC46AF3AFC1D +:10420C00423CFCDE3EAD26423AFCDE374A2A16DC46 +:10421C001A4A2AA0DE138D8C4B2ADE0DAF3AFC26EF +:10422C008E44691061C8FD8142F42AAF3AFC4451B6 +:10423C0046DC0AAF3AFC241027BD28EF0DC928F83C +:10424C002AEF074A2AFF61E8A42AAF3EFC423CFC55 +:10425C00DC18AF3CFC423AFCDE10AF3AFC4628DEE0 +:10426C0009F48CAF3AFCBD8EEF074A8CFF61E8A4D1 +:10427C008C100CC6D7717BFAC7710A9E31929E02C4 +:10428C00EFFA8E949F34FC8E969F35FC8E979F365A +:10429C00FC8E989F37FC8E939F38FC8E929F39FC36 +:1042AC00710B9E717AFA8F37FCFDB40F76FD1644B4 +:1042BC0013BD88D5EFFBDF0AD5F0FBDF05D5F1FB8D +:1042CC00DD25F6B14688DF11C9883722665C03917B +:1042DC00DF060A88181A89009617FD394513FD590F +:1042EC004331049E02EF61520692926934FC682EAF +:1042FC00FCDFF6AD88BD86F884F3311C790AF944ED +:10430C00FEFFDD44D884F101040AF914A944FFFF2F +:10431C00DF04E6B9EF0BD884F101040AF914A9A162 +:10432C00B9717BFAA0EFFBD5EFFBDF1CA0F0FBD53E +:10433C00F0FBDF14A0F1FBD5F1FBDF0CCFEFFBFFA3 +:10434C00CFF0FBFFCFF1FBFFC6717AFAD7C716D8B7 +:10435C0084F10744A800DC0571029EEF1CF647DDD2 +:10436C0018A4844A84A8DC0571029EEF0CF884F32F +:10437C00311CF6780AF9B7EFE4C6D7C756A896668B +:10438C00F0317E12F6B1780AF966D1DFF1717BFA61 +:10439C00F5EFFBF5F0FBF5F1FBF48471039EC671B0 +:1043AC007AFAD7C72004FBF8FFD44ADF168D849D18 +:1043BC0091717BFA52069292692EFC68C0FCDFF672 +:1043CC00717AFA4A4A06DE0EE84A09C0FC9C03A43C +:1043DC004A8C0372EF30F891F3311C790AF9BB3136 +:1043EC00129E058B9C03EF0F8C019C03D491DF056F +:1043FC00CD91A7EF02B491718071179E61DC61FBC6 +:10440C0071119E8C03721004C6D7C72008FBF8FFED +:10441C008F37FCFDB40F9C078F36FCFDB40F9C0648 +:10442C008F35FCFDB40F9C058F34FCFDB40F9C0440 +:10443C008F38FC9C038F39FC9C028C06318E011248 +:10444C00791A20BB8C075C03D1DF098C064C036105 +:10445C00C86179008C05318EB1610900BB313D1208 +:10446C000103BB8B0E04708C011C00BB8FF4FB4E44 +:10447C0003DC0E8C034FF4FBDC0B8C024FF5FBDCE6 +:10448C0004AB12EF03ABB1121008C6D7C7C3C120DF +:10449C0008FBF8FFF661490A61F8614908DF07F784 +:1044AC00340000ED3545E6BC04F6BC06AC0ABC0293 +:1044BC00AC08BBAC06614902AC0461F8614900DE92 +:1044CC0028AC04BDD8AC06BDDAE1FD5A0FADDABCA0 +:1044DC0006ADD8BC04ABBDD8AC02BDDAE1FD750F9E +:1044EC00ADDABC02ADD8BBEFCAAC06BC02AC04BBA7 +:1044FC00AC08BDD8AC0ABDDAAC04BDDCAC06FDD84A +:10450C000EAC04BDDCAC06FD4B0FE1FD750FADDA56 +:10451C00BC06ADD8BC04AC06614902AC0461F861C0 +:10452C004900DCC5AC0214AB12100CC6D7C7C120B5 +:10453C0004FBF8FF8F31FCFDB40F9C034E04DF1C11 +:10454C00AD864688DE07AD88268612EF40F6468893 +:10455C00DF074686DD03E7EF34F7EF318C04318E4D +:10456C00B1128C03318E43DF183038222686068830 +:10457C00BB8C045C0391DF05AB041800BBAB12EFE2 +:10458C000C8C034E04DE0532A900EF01F71006C6B1 +:10459C00D7717BFA31229E0CF64694DD07B69471E6 +:1045AC007AFAEF7C71239E717AFA4004F904DF07E2 +:1045BC00715307F42CEF69D9CFFBF1E7240000DD30 +:1045CC000F23DD1A23DD1023DD5323DD2723DD38F4 +:1045DC00715307F42CEF49715207F42CEF42D42C91 +:1045EC00DF07715207E42CEF05715307F42CC994C3 +:1045FC00FA00EF2CD42CDF0B715207E42CC994FA7F +:10460C0000EF1DF5CFFBEF18D42CDF0B715307E433 +:10461C002CC994FA00EF09CFCFFB02EF03FD2D4616 +:10462C00D7D905FCF1E7240000DD0923DD2123DDCA +:10463C000923EF1B715307F42CD7D42CDF077152CD +:10464C0007E42CEF05715307F42CC9942D01D77195 +:10465C005207E42CD731629B01D771039CD9CDFB57 +:10466C00F1E7240000DD1223DD1923DD1123DD2603 +:10467C0023DD3423DD3923DD3FFDED46EF3DFD0E1B +:10468C0047EF38D9CCFBC1AE6CFD312DC0F313BE56 +:10469C006C712304EF25F0C1AE6CFD312DC0F3130A +:1046AC00BE6C712304EF14F6BE6C712204EF0CCBBC +:1046BC006CFF00712304EF03FD82474004F905DD14 +:1046CC00064004F901DF0671230471039C31049C3C +:1046DC000FF6BE64BE6A31220402EF02F690BE6E83 +:1046EC00D7CD2E47F496AE6C317DBFCAFCFD574733 +:1046FC00D2DF0ED9CCFBC1AE6CFD312DC0F313BE95 +:10470C006CD7FD5747D2DD0DCD2E47F496AE6C31EC +:10471C007DBFCAFCD7E8960934205080D6BFC6FCB2 +:10472C0022CAFCBDD8304700FD000EBFC8FC30C605 +:10473C00FCFD472DF313BE6CB42ED42EDF0CCD2E06 +:10474C0047A4964A961F61C8F496D740AFFB0BDC82 +:10475C0005712304F2D740AFFB0661D831229A11C0 +:10476C00F0C1AE6CFD312DC0F313BE6C712204EFA1 +:10477C0003FD8247E2D771029CF0C1AE6CFD312D76 +:10478C00C0F313BE6CA4974A9740DC37F497D898C3 +:10479C00F1313F0412FD14D898F1BDD85008FD4FEB +:1047AC000E087208E6D2DD040192DFFC896158D153 +:1047BC00DD05712204EF03712304A4984A9820614B +:1047CC00C8F498D7C73026FDC6D77180717DFADE44 +:1047DC00035201D75200D7C7C12004FBF8FF1704BE +:1047EC000300C1E0C15010C150A4FDA0021006622C +:1047FC009C02D1DD058C0272EF518C0C70C18C04C3 +:10480C0070FD5B48C0629C02D1DD058C0272EF3BEF +:10481C008C035C7DD1DF03F2EF3117A1C1E0C150F5 +:10482C0010C150A4FDA0021006629C02D1DD058CC3 +:10483C000272EF178C015C7DD1DD03F2EF0D8C035E +:10484C0070C15010FD5B48C0629C021006C6D7C7F1 +:10485C00880616710AE650A4FDD403D2DD07713325 +:10486C009B5202EF1317FDF0036770FDF003FD86FA +:10487C0048FD640471339BF2C6D7FD3B0450A4FD84 +:0C488C00F0035020FDF00350AAEDF003F3 +:1048980061FC61FCC1C3C5C7520C929269D4FEC1C8 +:1048A800DFF88EFD708EFCC1717AFA4004F903DFDF +:1048B80005302D2A6194C09EFC609EFD34D4FE52C2 +:1048C80006C0B9A5A592DFF9C6C4C2C061FC61DF04 +:1048D800520C929269D4FEC1DFF88EFD708EFCC135 +:1048E8008F4105775C04D1DD06675C01D1DD50316D +:1048F800549C3671620771539C8FB4FB5FBCFBD12B +:10490800DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE30 +:10491800FBD1DF098FB7FB5FBFFBD1DD0C3162072D +:1049280002EFFA716307716B2771139EFD4630F42D +:10493800227148500571605005717AFAED324A6764 +:104948005C02D1DD16D422DD124A2202DD0DF422EA +:104958007148500571605005717AFA717AFA8D22A2 +:10496800318FE7240000DD0823DD1423DD2CEF4A16 +:10497800F44A7140500571505005E422ED324A8FD7 +:1049880040059D4B715050058D4B9D4DD84BFD10EA +:1049980034629D4CCD2202ED324A675C02D1DD17AC +:1049A800675C10D1DD05CD2203EF0F71485005710A +:1049B800605005F422EF73CD22044A2203DF108DE4 +:1049C8004C9F4005D84CC1D84BFD9C34C0EF1F8F7D +:1049D80040057671744BDC054A4B02DE0671605067 +:1049E80005EF47C7D84BFDD630C071505005D84D9C +:1049F800F1242900DD27240400DD22242200DD1D06 +:104A0800241100DD0C240100DD13241E00DD0EEF4F +:104A18000A4A4B60DF07CD4B61EF02A44B4A2203E1 +:104A2800DF08D84BFD1034629D4CC09EFC609EFD93 +:104A380034D4FE5206C0B9A5A592DFF961FCC1C302 +:104A4800C5C7520C929269D4FEC1DFF88EFD708EF4 +:104A5800FCC1717AFA51405F0401D1DD06F616A750 +:104A680047DFF2300400BF2401F6BF2A01300B0BE8 +:104A7800BF2801FD5A02300B0FBF2801FD5A023032 +:104A88000F0FBF2801710AE6F6420C01DD33AF04AF +:104A980001BF0C0131529B2971529B710BE2D85115 +:104AA800FDD4033184BD02EFFACBB422FBD853F115 +:104AB800BEB8714BE1714BE5710ABD8D529E44EF52 +:104AC8000C71539B714AE5717BBD71339BC09EFC91 +:104AD800609EFD34D4FE5206C0B9A5A592DFF9C682 +:104AE800C4C2C061FCC1C5717AFAD450DD0BEA4E6C +:104AF800899E44A64EB450EF33710AE6300400BFD5 +:104B08002401F6BF2A01300B0BBF2801000000006A +:104B180000000000510FBF28010000000000000045 +:104B280000500FBF280171239B71339BC4C061FCE7 +:104B380061EF520C929269D4FEC1DFF88EFD708E3F +:104B4800FCC12006FBF8FF71503002CEABACCC04A0 +:104B580000F6BB31B2E210617900F6614900DFF37B +:104B680071603002EDF24B8E519C03713BE28C0375 +:104B78005C02D1DD1E8C035C08D1DF097150300264 +:104B8800CC0400EFCC8C0570FD7E35629E50CC04C1 +:104B980002EFBE8C035C03D1DF408E509C02715043 +:104BA80030028C04D1DF0E8C0270FDC435629C0586 +:104BB800CC0401EF328C044C02DF0671603002EF46 +:104BC80029CF34025A716030028C0270C18C057092 +:104BD800FD2635C0CF34024AEF108C035C01D1DDCD +:104BE8000671603002EF03ED594B1006C09EFC6061 +:104BF8009EFD34D4FE5206C0B9A5A592DFF961FC2A +:104C0800C1C3C5C7520C929269D4FEC1DFF88EFDAC +:104C1800708EFCC1710A9E31929E02EFFA8FDEFB04 +:104C28004F96FFDF198FDFFB4F97FFDF118FE0FBF8 +:104C38004F98FFDF095004C15011FDCA34C0710BF1 +:104C48009EC09EFC609EFD34D4FE5206C0B9A5A548 +:104C580092DFF9C6C4C2C061FCE46A61FCC1C3C585 +:104C6800C7520C929269D4FEC1DFF88EFD708EFC9B +:104C7800C1C1FBF8FF8D1F9C018E31318EE72406E0 +:104C880000DD0823DD0E23DD22EF38717AFA8C016E +:104C98009D62EF2F717AFA4007F901DF068C019DBA +:104CA80061EF2051FF2E019D61EF18717AFA8C0196 +:104CB8009D304004F903DD064004F904DF0530792E +:104CC8002561944031FF09DE05A031FFEF077158D7 +:104CD800F00071629C710BE3C0C09EFC609EFD34C5 +:104CE800D4FE5206C0B9A5A592DFF9C6C4C2C061F8 +:104CF800FC717BFAC7D46A61F831249D2771239D22 +:104D0800D46ADD05B46ACEABAC717AFA5600664C4B +:104D18000ADD1172F3311C79D8FCCEFC0061CA613E +:104D2800A486EFEA717AFAF2C6D7C7C1C1FBF8FFC9 +:104D3800CC01008C014C0ADE36717BFA8C01F03113 +:104D48007E0410FC14A96168DF09AC02B9717AFA13 +:104D5800F2EF1D8C01F0317E127910FC614902DFFF +:104D680006717AFAE2EF09717AFA615901EFC4E241 +:104D78001004C6D7C72004FBF8FFF64210FC61F800 +:104D8800ED5E4E717BFA9C038C034C0ADE3C8C036F +:104D9800F0317E0410FC14A96168DF05717AFAEF1E +:104DA80029717AFA8C0372F3311C7910FCCEFC005D +:104DB80061CA629C02D1DF0A8C03F0317E12E67868 +:104DC80010FC717BFA615903EFBECC0200CC0101E3 +:104DD8008C02F0317E0410FC14A96168DD788C0225 +:104DE800F0317E127910FCE743DF658C014C0ADE56 +:104DF8005F8C01F0317E127910FCE743DD4D717B49 +:104E0800FA8C01F0317E0410FC14A96168DF186186 +:104E180069018C01F0317E12F67810FC8C024E018B +:104E2800DCED717AFAEF2F8C01F0317E0410FC145E +:104E3800A9128C02F0317E337810FC8C01F0317E9F +:104E480012E67810FC615902717AFA615901EF9BF8 +:104E5800615902EDD84D00F21004C6D761FF520C1B +:104E6800929269D4FEC1DFF88EFD708EFCC1717A12 +:104E7800FA8FE4FB5C03D1DD114004F903DD064041 +:104E880004F904DF05308A386194C09EFC609EFDF9 +:104E980034D4FE5206C0B9A5A592DFF961FC61FCC5 +:044EA80061FC61FC4C +:0A4EAC0000060C12181E242A3036EE +:104EB600ACFB0000000066FE00000000DF39113682 +:104EC6008C226146332EE22E9D451B3BC008DC3CFE +:104ED60028FC36FE20FE02F903F929FC30FE2AFCE6 +:104EE6002BFC08F926FC6CFF1AFF6EFF6AFF64FFB5 +:0A4EF60027FC66FF2CFC55555555AE +:104F0000FF0000000000983AF82AFF000000470068 +:104F1000317503F7332312D714AEF8C716AC061257 +:104F2000C5AC0416F643DD078B99A7A5B3EFF5C210 +:024F3000C6D7E2 +:024FF400325435 +:0A4FF60031333A34333A3538000005 :00000001FF  \ No newline at end of file diff --git a/flower_toriaezu2/bsr.lmf b/flower_toriaezu2/bsr.lmf index 189d177..00143db 100644 Binary files a/flower_toriaezu2/bsr.lmf and b/flower_toriaezu2/bsr.lmf differ diff --git a/flower_toriaezu2/bsr_k0r.map b/flower_toriaezu2/bsr_k0r.map index 72442ab..a55a0e0 100644 --- a/flower_toriaezu2/bsr_k0r.map +++ b/flower_toriaezu2/bsr_k0r.map @@ -1,22 +1,22 @@ -78K0R Linker W1.33 Date: 1 Mar 2013 Page: 1 +78K0R Linker W1.33 Date:26 Mar 2013 Page: 1 Command: -yC:\Program Files (x86)\NEC Electronics Tools\DEV -_msgoff - obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C - C78K0R\W2.13\lib78k0r\s0rm.rel -go85h,0FC00h,1024 -gi1B339499 - E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -bC:\Program File - s (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib - -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -iC:\Program Files (x86 - )\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr - - s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.re - l i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_t - wl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel tas - k_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel - ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel - batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel - kanaria_c.rel get_ei.rel util_funcs.rel i2c_mcu-sub.rel + C78K0R\W2.13\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -pbsr + _k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Electro + nics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0r + m.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronics T + ools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w2 loader.rel pm + .rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_t + wl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel reng + e.rel accero.rel self_flash.rel sw.rel task_debug.rel task_mi + sc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_ + status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel vo + ltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_e + i.rel util_funcs.rel i2c_mcu-sub.rel Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map @@ -25,9 +25,9 @@ Direc-file:bsr_mcu.dr *** Link information *** - 75 output segment(s) - 3E91H byte(s) real data - 6519 symbol(s) defined + 73 output segment(s) + 3E76H byte(s) real data + 6515 symbol(s) defined *** Memory map *** @@ -64,8 +64,7 @@ Direc-file:bsr_mcu.dr LDR_CNSL 00002H 00000H CSEG PAGE64KP LDR_CNSL util_funcs 00002H 00000H - ??NMIROM 00002H 00002H CSEG -* gap * 00004H 0000CH +* gap * 00002H 0000EH @@VECT10 00010H 00004H CSEG AT @@VECT10 ini_VECT 00010H 00004H * gap * 00014H 00008H @@ -156,57 +155,56 @@ Direc-file:bsr_mcu.dr LDR_CODL util_funcs 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - ?OCDSTAD 000CEH 0000AH CSEG - LDR_CODE 000D8H 0096BH CSEG - LDR_CODE loader 000D8H 00190H - LDR_CODE WDT 00268H 00000H - LDR_CODE i2c_mcu 00268H 0029BH - LDR_CODE i2c_twl 00503H 0005BH + LDR_CODE 000CEH 00967H CSEG + LDR_CODE loader 000CEH 0018CH + LDR_CODE WDT 0025AH 00000H + LDR_CODE i2c_mcu 0025AH 0029BH + LDR_CODE i2c_twl 004F5H 0005BH LDR_CODE self_flash - 0055EH 00370H + 00550H 00370H LDR_CODE task_debug - 008CEH 00000H + 008C0H 00000H LDR_CODE task_status - 008CEH 00075H - LDR_CODE hal 00943H 000DCH + 008C0H 00075H + LDR_CODE hal 00935H 000DCH LDR_CODE util_funcs - 00A1FH 00024H - FSL_CODE 00A43H 00322H CSEG + 00A11H 00024H + FSL_CODE 00A35H 00322H CSEG FSL_CODE fsl_block_cmd - 00A43H 0002BH + 00A35H 0002BH FSL_CODE fsl_block_check - 00A6EH 00013H + 00A60H 00013H FSL_CODE fsl_common - 00A81H 0014FH + 00A73H 0014FH FSL_CODE fsl_reset - 00BD0H 00001H + 00BC2H 00001H FSL_CODE fsl_si_ibf - 00BD1H 00064H + 00BC3H 00064H FSL_CODE fsl_phySwap - 00C35H 0004DH + 00C27H 0004DH FSL_CODE fsl_si_common - 00C82H 00061H - FSL_CODE fsl_swap 00CE3H 00030H + 00C74H 00061H + FSL_CODE fsl_swap 00CD5H 00030H FSL_CODE fsl_write - 00D13H 00052H - @@LCODE 00D65H 00277H CSEG - @@LCODE @cstart 00D65H 0006DH - @@LCODE @imul 00DD2H 00011H - @@LCODE @lumul 00DE3H 0002BH - @@LCODE @isdiv 00E0EH 00022H - @@LCODE @iudiv 00E30H 0002DH - @@LCODE @isrem 00E5DH 00021H - @@LCODE @iurem 00E7EH 0002FH - @@LCODE @lsdiv 00EADH 00039H - @@LCODE @ludiv 00EE6H 0003FH - @@LCODE @divuw 00F25H 00034H - @@LCODE @ladd 00F59H 0000FH - @@LCODE @llsh 00F68H 0001BH - @@LCODE @lursh 00F83H 0001FH - @@LCODE @iscmp 00FA2H 0000CH - @@LCODE @lband 00FAEH 00014H - @@LCODE @bcdtob 00FC2H 0001AH -* gap * 00FDCH 0001AH + 00D05H 00052H + @@LCODE 00D57H 00277H CSEG + @@LCODE @cstart 00D57H 0006DH + @@LCODE @imul 00DC4H 00011H + @@LCODE @lumul 00DD5H 0002BH + @@LCODE @isdiv 00E00H 00022H + @@LCODE @iudiv 00E22H 0002DH + @@LCODE @isrem 00E4FH 00021H + @@LCODE @iurem 00E70H 0002FH + @@LCODE @lsdiv 00E9FH 00039H + @@LCODE @ludiv 00ED8H 0003FH + @@LCODE @divuw 00F17H 00034H + @@LCODE @ladd 00F4BH 0000FH + @@LCODE @llsh 00F5AH 0001BH + @@LCODE @lursh 00F75H 0001FH + @@LCODE @iscmp 00F94H 0000CH + @@LCODE @lband 00FA0H 00014H + @@LCODE @bcdtob 00FB4H 0001AH +* gap * 00FCEH 00028H MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -260,7 +258,7 @@ Direc-file:bsr_mcu.dr 0228CH 00000H @@CNST i2c_mcu-sub 0228CH 00000H - ROM_CODE 0228CH 02617H CSEG + ROM_CODE 0228CH 0260CH CSEG ROM_CODE pm 0228CH 009F4H ROM_CODE i2c_ctr 02C80H 0005CH ROM_CODE main 02CDCH 00055H @@ -274,285 +272,284 @@ Direc-file:bsr_mcu.dr ROM_CODE sw 039DFH 0013CH ROM_CODE task_misc 03B1BH 001C1H - ROM_CODE task_sys 03CDCH 003F8H + ROM_CODE task_sys 03CDCH 003EDH ROM_CODE pedo_alg_thre_det2 - 040D4H 004D4H - ROM_CODE led_cam 045A8H 000C4H - ROM_CODE led_pow 0466CH 0016FH - ROM_CODE voltable 047DBH 00000H + 040C9H 004D4H + ROM_CODE led_cam 0459DH 000C4H + ROM_CODE led_pow 04661H 0016FH + ROM_CODE voltable 047D0H 00000H ROM_CODE pedo_lpf_coeff - 047DBH 00000H + 047D0H 00000H ROM_CODE kanaria_c - 047DBH 00006H - ROM_CODE get_ei 047E1H 0000DH + 047D0H 00006H + ROM_CODE get_ei 047D6H 0000DH ROM_CODE i2c_mcu-sub - 047EEH 000B5H - @@BASE 048A3H 00614H CSEG BASE - @@BASE loader 048A3H 00000H - @@BASE pm 048A3H 0003EH - @@BASE i2c_ctr 048E1H 00170H - @@BASE main 04A51H 00000H - @@BASE magic 04A51H 00000H - @@BASE WDT 04A51H 00000H - @@BASE i2c_mcu 04A51H 000F2H - @@BASE i2c_twl 04B43H 000D0H - @@BASE led 04C13H 00000H - @@BASE rtc 04C13H 0005DH - @@BASE vreg_ctr 04C70H 00000H - @@BASE vreg_twl 04C70H 00000H - @@BASE adc 04C70H 00094H - @@BASE renge 04D04H 0016BH - @@BASE accero 04E6FH 00042H + 047E3H 000B5H + @@BASE 04898H 00614H CSEG BASE + @@BASE loader 04898H 00000H + @@BASE pm 04898H 0003EH + @@BASE i2c_ctr 048D6H 00170H + @@BASE main 04A46H 00000H + @@BASE magic 04A46H 00000H + @@BASE WDT 04A46H 00000H + @@BASE i2c_mcu 04A46H 000F2H + @@BASE i2c_twl 04B38H 000D0H + @@BASE led 04C08H 00000H + @@BASE rtc 04C08H 0005DH + @@BASE vreg_ctr 04C65H 00000H + @@BASE vreg_twl 04C65H 00000H + @@BASE adc 04C65H 00094H + @@BASE renge 04CF9H 0016BH + @@BASE accero 04E64H 00042H @@BASE self_flash - 04EB1H 00000H - @@BASE sw 04EB1H 00000H + 04EA6H 00000H + @@BASE sw 04EA6H 00000H @@BASE task_debug - 04EB1H 00000H + 04EA6H 00000H @@BASE task_misc - 04EB1H 00000H - @@BASE task_sys 04EB1H 00000H + 04EA6H 00000H + @@BASE task_sys 04EA6H 00000H @@BASE pedo_alg_thre_det2 - 04EB1H 00000H - @@BASE ini_VECT 04EB1H 00006H + 04EA6H 00000H + @@BASE ini_VECT 04EA6H 00006H @@BASE task_status - 04EB7H 00000H - @@BASE led_cam 04EB7H 00000H - @@BASE led_pow 04EB7H 00000H - @@BASE hal 04EB7H 00000H + 04EACH 00000H + @@BASE led_cam 04EACH 00000H + @@BASE led_pow 04EACH 00000H + @@BASE hal 04EACH 00000H @@BASE batt_params - 04EB7H 00000H - @@BASE voltable 04EB7H 00000H + 04EACH 00000H + @@BASE voltable 04EACH 00000H @@BASE pedo_lpf_coeff - 04EB7H 00000H + 04EACH 00000H @@BASE kanaria_c - 04EB7H 00000H + 04EACH 00000H @@BASE util_funcs - 04EB7H 00000H + 04EACH 00000H @@BASE i2c_mcu-sub - 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL @cstart 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL pm 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL main 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL led 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL rtc 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL adc 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL renge 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL accero 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL sw 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP + 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL @cstart 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL pm 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL main 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL led 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL rtc 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL adc 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL renge 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL accero 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL sw 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP @@CNSTL task_misc - 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL task_sys 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP + 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL task_sys 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL led_cam 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL led_pow 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP + 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL led_cam 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL led_pow 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP @@CNSTL batt_params - 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP - @@CNSTL voltable 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP + 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP + @@CNSTL voltable 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP @@CNSTL pedo_lpf_coeff - 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP + 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP @@CNSTL kanaria_c - 04EB7H 00000H - @@CNSTL 04EB7H 00000H CSEG PAGE64KP + 04EACH 00000H + @@CNSTL 04EACH 00000H CSEG PAGE64KP @@CNSTL i2c_mcu-sub - 04EB7H 00000H - @@RLINIT 04EB7H 00000H CSEG UNIT64KP - @@RLINIT loader 04EB7H 00000H - @@RLINIT pm 04EB7H 00000H - @@RLINIT i2c_ctr 04EB7H 00000H - @@RLINIT main 04EB7H 00000H - @@RLINIT magic 04EB7H 00000H - @@RLINIT WDT 04EB7H 00000H - @@RLINIT i2c_mcu 04EB7H 00000H - @@RLINIT i2c_twl 04EB7H 00000H - @@RLINIT led 04EB7H 00000H - @@RLINIT rtc 04EB7H 00000H - @@RLINIT vreg_ctr 04EB7H 00000H - @@RLINIT vreg_twl 04EB7H 00000H - @@RLINIT adc 04EB7H 00000H - @@RLINIT renge 04EB7H 00000H - @@RLINIT accero 04EB7H 00000H - @@RLINIT self_flash - 04EB7H 00000H - @@RLINIT sw 04EB7H 00000H - @@RLINIT task_debug - 04EB7H 00000H - @@RLINIT task_misc - 04EB7H 00000H - @@RLINIT task_sys 04EB7H 00000H - @@RLINIT pedo_alg_thre_det2 - 04EB7H 00000H - @@RLINIT ini_VECT 04EB7H 00000H - @@RLINIT task_status - 04EB7H 00000H - @@RLINIT led_cam 04EB7H 00000H - @@RLINIT led_pow 04EB7H 00000H - @@RLINIT hal 04EB7H 00000H - @@RLINIT batt_params - 04EB7H 00000H - @@RLINIT voltable 04EB7H 00000H - @@RLINIT pedo_lpf_coeff - 04EB7H 00000H - @@RLINIT kanaria_c - 04EB7H 00000H - @@RLINIT util_funcs - 04EB7H 00000H - @@RLINIT i2c_mcu-sub - 04EB7H 00000H - @@RLINIT @rom 04EB7H 00000H - @@CODEL 04EB7H 00000H CSEG - @@CODEL pm 04EB7H 00000H - @@CODEL i2c_ctr 04EB7H 00000H - @@CODEL main 04EB7H 00000H - @@CODEL magic 04EB7H 00000H - @@CODEL led 04EB7H 00000H - @@CODEL rtc 04EB7H 00000H - @@CODEL vreg_ctr 04EB7H 00000H - @@CODEL vreg_twl 04EB7H 00000H - @@CODEL adc 04EB7H 00000H - @@CODEL renge 04EB7H 00000H - @@CODEL accero 04EB7H 00000H - @@CODEL sw 04EB7H 00000H - @@CODEL task_misc - 04EB7H 00000H - @@CODEL task_sys 04EB7H 00000H - @@CODEL pedo_alg_thre_det2 - 04EB7H 00000H - @@CODEL ini_VECT 04EB7H 00000H - @@CODEL led_cam 04EB7H 00000H - @@CODEL led_pow 04EB7H 00000H - @@CODEL batt_params - 04EB7H 00000H - @@CODEL voltable 04EB7H 00000H - @@CODEL pedo_lpf_coeff - 04EB7H 00000H - @@CODEL kanaria_c - 04EB7H 00000H - @@CODEL i2c_mcu-sub - 04EB7H 00000H -* gap * 04EB7H 00001H - @@CNSTL 04EB8H 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04EB8H 0000AH - @@R_INIT 04EC2H 0004AH CSEG UNIT64KP - @@R_INIT @cstart 04EC2H 00000H - @@R_INIT loader 04EC2H 00000H - @@R_INIT pm 04EC2H 00000H - @@R_INIT i2c_ctr 04EC2H 00000H - @@R_INIT main 04EC2H 00000H - @@R_INIT magic 04EC2H 00000H - @@R_INIT WDT 04EC2H 00000H - @@R_INIT i2c_mcu 04EC2H 00000H - @@R_INIT i2c_twl 04EC2H 00000H - @@R_INIT led 04EC2H 00000H - @@R_INIT rtc 04EC2H 00000H - @@R_INIT vreg_ctr 04EC2H 00000H - @@R_INIT vreg_twl 04EC2H 00000H - @@R_INIT adc 04EC2H 0000CH - @@R_INIT renge 04ECEH 00014H - @@R_INIT accero 04EE2H 00000H + 04EACH 00000H + @@CNSTL 04EACH 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04EACH 0000AH + @@R_INIT 04EB6H 0004AH CSEG UNIT64KP + @@R_INIT @cstart 04EB6H 00000H + @@R_INIT loader 04EB6H 00000H + @@R_INIT pm 04EB6H 00000H + @@R_INIT i2c_ctr 04EB6H 00000H + @@R_INIT main 04EB6H 00000H + @@R_INIT magic 04EB6H 00000H + @@R_INIT WDT 04EB6H 00000H + @@R_INIT i2c_mcu 04EB6H 00000H + @@R_INIT i2c_twl 04EB6H 00000H + @@R_INIT led 04EB6H 00000H + @@R_INIT rtc 04EB6H 00000H + @@R_INIT vreg_ctr 04EB6H 00000H + @@R_INIT vreg_twl 04EB6H 00000H + @@R_INIT adc 04EB6H 0000CH + @@R_INIT renge 04EC2H 00014H + @@R_INIT accero 04ED6H 00000H @@R_INIT self_flash - 04EE2H 00000H - @@R_INIT sw 04EE2H 00000H + 04ED6H 00000H + @@R_INIT sw 04ED6H 00000H @@R_INIT task_debug - 04EE2H 00000H + 04ED6H 00000H @@R_INIT task_misc - 04EE2H 00026H - @@R_INIT task_sys 04F08H 00000H + 04ED6H 00026H + @@R_INIT task_sys 04EFCH 00000H @@R_INIT pedo_alg_thre_det2 - 04F08H 00000H - @@R_INIT ini_VECT 04F08H 00000H + 04EFCH 00000H + @@R_INIT ini_VECT 04EFCH 00000H @@R_INIT task_status - 04F08H 00000H - @@R_INIT led_cam 04F08H 00000H - @@R_INIT led_pow 04F08H 00004H - @@R_INIT hal 04F0CH 00000H + 04EFCH 00000H + @@R_INIT led_cam 04EFCH 00000H + @@R_INIT led_pow 04EFCH 00004H + @@R_INIT hal 04F00H 00000H @@R_INIT batt_params - 04F0CH 00000H - @@R_INIT voltable 04F0CH 00000H + 04F00H 00000H + @@R_INIT voltable 04F00H 00000H @@R_INIT pedo_lpf_coeff - 04F0CH 00000H + 04F00H 00000H @@R_INIT kanaria_c - 04F0CH 00000H + 04F00H 00000H @@R_INIT util_funcs - 04F0CH 00000H + 04F00H 00000H @@R_INIT i2c_mcu-sub - 04F0CH 00000H - @@R_INIT @rom 04F0CH 00000H - @@R_INIS 04F0CH 00010H CSEG UNIT64KP - @@R_INIS @cstart 04F0CH 00000H - @@R_INIS loader 04F0CH 00000H - @@R_INIS pm 04F0CH 00002H - @@R_INIS i2c_ctr 04F0EH 00002H - @@R_INIS main 04F10H 00000H - @@R_INIS magic 04F10H 00000H - @@R_INIS WDT 04F10H 00000H - @@R_INIS i2c_mcu 04F10H 00000H - @@R_INIS i2c_twl 04F10H 00000H - @@R_INIS led 04F10H 00000H - @@R_INIS rtc 04F10H 00000H - @@R_INIS vreg_ctr 04F10H 00000H - @@R_INIS vreg_twl 04F10H 00000H - @@R_INIS adc 04F10H 00000H - @@R_INIS renge 04F10H 00000H - @@R_INIS accero 04F10H 00000H + 04F00H 00000H + @@R_INIT @rom 04F00H 00000H + @@R_INIS 04F00H 00010H CSEG UNIT64KP + @@R_INIS @cstart 04F00H 00000H + @@R_INIS loader 04F00H 00000H + @@R_INIS pm 04F00H 00002H + @@R_INIS i2c_ctr 04F02H 00002H + @@R_INIS main 04F04H 00000H + @@R_INIS magic 04F04H 00000H + @@R_INIS WDT 04F04H 00000H + @@R_INIS i2c_mcu 04F04H 00000H + @@R_INIS i2c_twl 04F04H 00000H + @@R_INIS led 04F04H 00000H + @@R_INIS rtc 04F04H 00000H + @@R_INIS vreg_ctr 04F04H 00000H + @@R_INIS vreg_twl 04F04H 00000H + @@R_INIS adc 04F04H 00000H + @@R_INIS renge 04F04H 00000H + @@R_INIS accero 04F04H 00000H @@R_INIS self_flash - 04F10H 00000H - @@R_INIS sw 04F10H 00000H + 04F04H 00000H + @@R_INIS sw 04F04H 00000H @@R_INIS task_debug - 04F10H 00000H + 04F04H 00000H @@R_INIS task_misc - 04F10H 00000H - @@R_INIS task_sys 04F10H 00002H + 04F04H 00000H + @@R_INIS task_sys 04F04H 00002H @@R_INIS pedo_alg_thre_det2 - 04F12H 00006H - @@R_INIS ini_VECT 04F18H 00000H + 04F06H 00006H + @@R_INIS ini_VECT 04F0CH 00000H @@R_INIS task_status - 04F18H 00000H - @@R_INIS led_cam 04F18H 00002H - @@R_INIS led_pow 04F1AH 00002H - @@R_INIS hal 04F1CH 00000H + 04F0CH 00000H + @@R_INIS led_cam 04F0CH 00002H + @@R_INIS led_pow 04F0EH 00002H + @@R_INIS hal 04F10H 00000H @@R_INIS batt_params - 04F1CH 00000H - @@R_INIS voltable 04F1CH 00000H + 04F10H 00000H + @@R_INIS voltable 04F10H 00000H @@R_INIS pedo_lpf_coeff - 04F1CH 00000H + 04F10H 00000H @@R_INIS kanaria_c - 04F1CH 00000H + 04F10H 00000H @@R_INIS util_funcs - 04F1CH 00000H + 04F10H 00000H @@R_INIS i2c_mcu-sub - 04F1CH 00000H - @@R_INIS @rom 04F1CH 00000H - @@LCODEL 04F1CH 00022H CSEG - @@LCODEL abs 04F1CH 00008H - @@LCODEL memcpy_n 04F24H 0001AH -* gap * 04F3EH 000B6H + 04F10H 00000H + @@R_INIS @rom 04F10H 00000H + @@RLINIT 04F10H 00000H CSEG UNIT64KP + @@RLINIT loader 04F10H 00000H + @@RLINIT pm 04F10H 00000H + @@RLINIT i2c_ctr 04F10H 00000H + @@RLINIT main 04F10H 00000H + @@RLINIT magic 04F10H 00000H + @@RLINIT WDT 04F10H 00000H + @@RLINIT i2c_mcu 04F10H 00000H + @@RLINIT i2c_twl 04F10H 00000H + @@RLINIT led 04F10H 00000H + @@RLINIT rtc 04F10H 00000H + @@RLINIT vreg_ctr 04F10H 00000H + @@RLINIT vreg_twl 04F10H 00000H + @@RLINIT adc 04F10H 00000H + @@RLINIT renge 04F10H 00000H + @@RLINIT accero 04F10H 00000H + @@RLINIT self_flash + 04F10H 00000H + @@RLINIT sw 04F10H 00000H + @@RLINIT task_debug + 04F10H 00000H + @@RLINIT task_misc + 04F10H 00000H + @@RLINIT task_sys 04F10H 00000H + @@RLINIT pedo_alg_thre_det2 + 04F10H 00000H + @@RLINIT ini_VECT 04F10H 00000H + @@RLINIT task_status + 04F10H 00000H + @@RLINIT led_cam 04F10H 00000H + @@RLINIT led_pow 04F10H 00000H + @@RLINIT hal 04F10H 00000H + @@RLINIT batt_params + 04F10H 00000H + @@RLINIT voltable 04F10H 00000H + @@RLINIT pedo_lpf_coeff + 04F10H 00000H + @@RLINIT kanaria_c + 04F10H 00000H + @@RLINIT util_funcs + 04F10H 00000H + @@RLINIT i2c_mcu-sub + 04F10H 00000H + @@RLINIT @rom 04F10H 00000H + @@CODEL 04F10H 00000H CSEG + @@CODEL pm 04F10H 00000H + @@CODEL i2c_ctr 04F10H 00000H + @@CODEL main 04F10H 00000H + @@CODEL magic 04F10H 00000H + @@CODEL led 04F10H 00000H + @@CODEL rtc 04F10H 00000H + @@CODEL vreg_ctr 04F10H 00000H + @@CODEL vreg_twl 04F10H 00000H + @@CODEL adc 04F10H 00000H + @@CODEL renge 04F10H 00000H + @@CODEL accero 04F10H 00000H + @@CODEL sw 04F10H 00000H + @@CODEL task_misc + 04F10H 00000H + @@CODEL task_sys 04F10H 00000H + @@CODEL pedo_alg_thre_det2 + 04F10H 00000H + @@CODEL ini_VECT 04F10H 00000H + @@CODEL led_cam 04F10H 00000H + @@CODEL led_pow 04F10H 00000H + @@CODEL batt_params + 04F10H 00000H + @@CODEL voltable 04F10H 00000H + @@CODEL pedo_lpf_coeff + 04F10H 00000H + @@CODEL kanaria_c + 04F10H 00000H + @@CODEL i2c_mcu-sub + 04F10H 00000H + @@LCODEL 04F10H 00022H CSEG + @@LCODEL abs 04F10H 00008H + @@LCODEL memcpy_n 04F18H 0001AH +* gap * 04F32H 000C2H MGC_VER 04FF4H 00002H CSEG AT MGC_VER magic 04FF4H 00002H MGC_TAIL 04FF6H 0000AH CSEG AT diff --git a/flower_toriaezu2/config.h b/flower_toriaezu2/config.h index 520c6b9..da76f35 100644 --- a/flower_toriaezu2/config.h +++ b/flower_toriaezu2/config.h @@ -7,8 +7,11 @@ */ #define MCU_VER_MAJOR 0x02 -#define MCU_VER_MINOR 0x30 +#define MCU_VER_MINOR 0x24 +/* +内部バージョン 2.31 +*/ // ビルドスイッチ //#define _MCU_ARR // snake 系 diff --git a/flower_toriaezu2/hoge.bin b/flower_toriaezu2/hoge.bin index a252c7f..bccc98f 100644 Binary files a/flower_toriaezu2/hoge.bin and b/flower_toriaezu2/hoge.bin differ diff --git a/flower_toriaezu2/sw.c b/flower_toriaezu2/sw.c index 55aae5d..96683d0 100644 --- a/flower_toriaezu2/sw.c +++ b/flower_toriaezu2/sw.c @@ -138,7 +138,9 @@ void tsk_sw( ) { break; } - // else 節の時は fall through (蓋閉じならpwswチェックをスキップ)良くない気もする。 + // else 節の時は fall through (蓋閉じならpwswチェックをスキップ)。 + // 実装が良くない気もするが... + // HOME sw // chk_clicked( SW_HOME_n, SW_home_count, REG_BIT_SW_HOME_CLICK ); chk_clicked( !SW_HOME_n, SW_home_count_rel, REG_BIT_SW_HOME_RELEASE ); diff --git a/flower_toriaezu2/task_sys.c b/flower_toriaezu2/task_sys.c index efc4875..ae43e75 100644 --- a/flower_toriaezu2/task_sys.c +++ b/flower_toriaezu2/task_sys.c @@ -40,7 +40,7 @@ static void force_off_check(); static void send_getup_to_soc(); static void chk_sleep(); static void chk_awake(); -static err flower_direct_boot_sleep_check(); +static err direct_boot_sleep_check(); static err chk_pwsw_timeout(); static void go_stop(); @@ -173,20 +173,15 @@ void tsk_sys( ) wait_ms( 50 ); // プルアップ後電圧がちゃんと上がるのをまってhal_update() しないと期待したのが取れない /// 50ms は暫定値 - // FLOWER 対応 - // FLOWER時のみ、スリープなら、HOMEも押されてないと電源を入れない + // 蓋閉じなら、HOMEも押されてないと電源を入れない。しかも一秒押し続ける // (reset解除せずに電源断してしまう。ユーザーには気づくまい。) - if( system_status.family == FAMILY_FLOWER ) - { - system_status.pwr_state = DIRECT_BOOT_CHECK; - return; - } + system_status.pwr_state = DIRECT_BOOT_CHECK; - system_status.pwr_state = ON_TRIG; +// system_status.pwr_state = ON_TRIG; break; case DIRECT_BOOT_CHECK: //------------------------------------------------------- - switch( flower_direct_boot_sleep_check() ) + switch( direct_boot_sleep_check() ) { case ERR_ERR: // スリープが入っていて、必要なキーが足りないので起動させない system_status.pwr_state = OFF_TRIG; @@ -544,7 +539,7 @@ static void go_stop() ・sleep になってたら起動しない ・ただし、home が押されてたら起動させる ***********************************************/ -static err flower_direct_boot_sleep_check() +static err direct_boot_sleep_check() { static u16 sel_sw_count; diff --git a/flower_toriaezu2/yav_mcu_bsr.plg b/flower_toriaezu2/yav_mcu_bsr.plg index 3adaec0..1ff866e 100644 --- a/flower_toriaezu2/yav_mcu_bsr.plg +++ b/flower_toriaezu2/yav_mcu_bsr.plg @@ -1,16 +1,183 @@ C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no loader.c +loader.c(160) : CC78K0R warning W0401: Conversion may lose significant digits +loader.c(161) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\loader.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no pm.c +pm.c(545) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(856) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(860) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(888) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(902) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(988) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(997) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1068) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1217) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1219) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 10 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\pm.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_ctr.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_ctr.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no main.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\main.asm +Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no magic.c Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no WDT.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\WDT.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_mcu.c +i2c_mcu.c(188) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 1 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_mcu.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_twl.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_twl.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no led.c +led.c(90) : CC78K0R warning W0745: Expected function prototype +led.c(375) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\led.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no rtc.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\rtc.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2m -qvjl2w -sainter_asm -zpb -no vreg_ctr.c +vreg_ctr.c(159) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(160) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(162) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(165) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(248) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(248) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(253) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(253) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(257) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(257) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(261) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(261) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(265) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 14 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\vreg_ctr.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2m -qvjl2w -sainter_asm -zpb -no vreg_twl.c +vreg_twl.c(68) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_twl.c(72) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\vreg_twl.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no adc.c +adc.c(104) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(190) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(241) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(308) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(434) : CC78K0R warning W0745: Expected function prototype +adc.c(463) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(468) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 7 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\adc.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2m -qvjl2w -sainter_asm -zpb -no renge\renge.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\renge.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no accero.c +accero.c(121) : CC78K0R warning W0745: Expected function prototype +Compilation complete, 0 error(s) and 1 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\accero.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no self_flash.c +self_flash.c(289) : CC78K0R warning W0401: Conversion may lose significant digits +self_flash.c(290) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\self_flash.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no sw.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\sw.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_debug.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\task_debug.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_misc.c +task_misc.c(380) : CC78K0R warning W0401: Conversion may lose significant digits +task_misc.c(382) : CC78K0R warning W0401: Conversion may lose significant digits +task_misc.c(392) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 3 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\task_misc.asm +Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_sys.c -task_sys.c(498) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(710) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(728) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(493) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(705) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(723) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 3 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\task_sys.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -go85h,0FC00h,1024 -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.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.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel i2c_mcu-sub.rel +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c +pedo_alg_thre_det2.c(104) : CC78K0R warning W0745: Expected function prototype +pedo_alg_thre_det2.c(120) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\pedo_alg_thre_det2.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no ini_VECT.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\ini_VECT.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_status.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\task_status.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no led_cam.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\led_cam.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no led_pow.c +led_pow.c(120) : CC78K0R warning W0401: Conversion may lose significant digits +led_pow.c(125) : CC78K0R warning W0401: Conversion may lose significant digits +led_pow.c(178) : CC78K0R warning W0401: Conversion may lose significant digits +led_pow.c(240) : CC78K0R warning W0401: Conversion may lose significant digits +led_pow.c(271) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 5 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\led_pow.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no hal.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\hal.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no voltable.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\voltable.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no pedo_lpf_coeff.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\pedo_lpf_coeff.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no kanaria_c.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\kanaria_c.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no util_funcs.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\util_funcs.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_mcu-sub.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_mcu-sub.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.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.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel i2c_mcu-sub.rel RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K' Read Device File Directory : C:\PROGRAM FILES (X86)\NEC ELECTRONICS TOOLS\DEV\ RA78K0R warning W3420: File 'pm.rel' already has had error(s)/warning(s) by 'CC78K' @@ -32,6 +199,9 @@ Link complete, 0 error(s) and 14 warning(s) found. Object Conversion Complete, 0 error(s) and 0 warning(s) found. C:\Windows\system32\cmd.exe /c ruby nec_s_2_bsrbin2.rb bsr.hex nec_s_2_bsrbin2.rb:2: warning: variable $KCODE is no longer effective; ignored -133 -!E debug enable!! -Build Total error(s) : 0 Total warning(s) : 17 +4 +intel-HEX to bsr bin converter + file converted! + + +Build Total error(s) : 0 Total warning(s) : 68 diff --git a/flower_toriaezu2/yav_mcu_bsr.prj b/flower_toriaezu2/yav_mcu_bsr.prj index 2de4dde..5886046 100644 --- a/flower_toriaezu2/yav_mcu_bsr.prj +++ b/flower_toriaezu2/yav_mcu_bsr.prj @@ -1197,7 +1197,7 @@ G=1 E=0 E0=flash.elk E1=a.elk -GO=1 +GO=0 GOValue=85 GOStart=FC00 GOSizeValue=1024