diff --git a/branches/1.11(sdk_0_14)/bsr.hex b/branches/1.11(sdk_0_14)/bsr.hex index c3f45fb..40f6086 100644 --- a/branches/1.11(sdk_0_14)/bsr.hex +++ b/branches/1.11(sdk_0_14)/bsr.hex @@ -1,12 +1,12 @@ :020000001B0DD6 -:04001000294A2B4A04 -:02001C00004C96 -:020024006C4C22 -:02002A00D94CAF -:08003400024EA44DFD4D314FB9 -:02004A002D4A3D -:02005A00684AF2 -:02006200B54E99 +:040010002F4A314AF8 +:02001C00064C90 +:02002400724C1C +:02002A00DF4CA9 +:08003400084EAA4D034E374FA0 +:02004A00334A37 +:02005A006E4AEC +:02006200BB4E93 :0400C0007EFBFF04C0 :0A00C4001B339499E033F240BFAA09 :1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A @@ -40,11 +40,11 @@ :10028E000271080105F55005F5BCFFF5BDFFF5A59A :10029E00FFF5A6FFD7C7C1C1FBF8FFCEABAC8C02F2 :1002AE00D1DD12616902305C03BBF6614900DDEEFF -:1002BE00618900EFF51004C6D7FDCA32FD253CFD5D +:1002BE00618900EFF51004C6D7FDCA32FD223CFD60 :1002CE002805717AFAFDC023F51EF98F20F9310544 :1002DE00175003C15084FD3103C0625C01D161E847 -:1002EE00CF1EF902CFDFFB64FDAA33FD3A487172CF -:1002FE0022712BE7FD283CFDCA3C61EDEFF6D7D706 +:1002EE00CF1EF902CFDFFB64FDAA33FD40487172C9 +:1002FE0022712BE7FD253CFDC73C61EDEFF6D7D70C :10030E00C7F616FD2805717BFA310221057102210F :10031E00EF0B717AFAA7F647DFECE2EF04717AFA87 :10032E00F2C6D7C7C1C1FBF8FF17A1C1E0C18C0A45 @@ -147,27 +147,27 @@ :10093E00DD03E2EF07615909EDA908F2100CC6D7E5 :10094E00C7717B9D717BFAFD6F083022F9FDAC0AF1 :10095E00FD370AC6D7FD4E09FD860BFD8808F5AB9F -:10096E00FFF2D7C7D568FDDD05B068FDEF7BCF6818 +:10096E00FFF2D7C7D56AFDDD05B06AFDEF7BCF6A12 :10097E00FD02311407067110E3FBEF047118E3FB5F -:10098E008FE3FB7F2EFD76D1DD5F8FE3FB9F2EFD88 +:10098E008FE3FB7F30FD76D1DD5F8FE3FB9F30FD84 :10099E00401EF903DF25665C10D1DD1F7122208F0A -:1009AE00E3FB5C10D1DD0B5080C15011FDDA37C076 -:1009BE00EF095040C15011FDDA37C0401EF903DD7A +:1009AE00E3FB5C10D1DD0B5080C15011FDD737C079 +:1009BE00EF095040C15011FDD737C0401EF903DD7D :1009CE0006401EF904DF22665C02D1DD1C8FE3FBBC -:1009DE005C02D1DD0B5040C15010FDDA37C0EF097B -:0B09EE005020C15010FDDA37C0C6D702 +:1009DE005C02D1DD0B5040C15010FDD737C0EF097E +:0B09EE005020C15010FDD737C0C6D705 :1009F9005208EF065203EF025206FEE600FE1B0004 :100A0900DC16089F03088F0408089F040862FE2467 :100A190000089F0408EEBF00EEBA00C1C514410EDC :100A290011D9D0FF118FD1FF312E45C4C0D7F23172 :100A3900A2C401E2D79DE261DD4C09DF12717BFAA4 -:100A4900C18F06089F79FDC0CF060800EE27003147 +:100A4900C18F06089F7BFDC0CF060800EE27003145 :100A5900F2FA04CF0608004C00DF05D50008DD16C0 :100A690061DD717BFAD50608DD0ACDE31F61CD6131 :100A7900CDEE160061CDFED40061FFFE9A00FCF8B0 :100A8900FF0EFEB20061CDFED5004C09DF0EC18F0D -:100A990006086F79FD9F0608C0EE0400CF0608001E -:100AA900F8E3D75200EF025202FE3700CF78FD007B +:100A990006086F7BFD9F0608C0EE0400CF0608001C +:100AA900F8E3D75200EF025202FE3700CF7AFD0079 :100AB900CF060800BF0408C716629F00084100114D :100AC9008F8C229B4100118F8D229F0108C65100F6 :100AD900FE62FFEF025205CF060800C1510CFE0A63 @@ -175,28 +175,28 @@ :100AF90070CEC0A59EC47CFF9EC4609EC461CDD744 :100B090061DD717BFAC18EC45C1BFED6FFCF06087E :100B190001FED7FFC061CDD731F2FA1AC1AEE4BFE9 -:100B29006AFDAEE6BF6CFDAED4BF6EFD30FFFFBE01 -:100B3900E4BEE6BED4C0D731F2FA11C1AF6AFDBE38 -:100B4900E4AF6CFDBEE6AF6EFDBED4C0D7C1BF70C9 -:100B5900FD13BF72FD15BF74FD17BF76FDC0D7AF7A -:100B690070FDDB72FDEB74FDFB76FDD7534B305204 +:100B29006CFDAEE6BF6EFDAED4BF70FD30FFFFBEFB +:100B3900E4BEE6BED4C0D731F2FA11C1AF6CFDBE36 +:100B4900E4AF6EFDBEE6AF70FDBED4C0D7C1BF72C3 +:100B5900FD13BF74FD15BF76FD17BF78FDC0D7AF74 +:100B690072FDDB74FDEB76FDFB78FDD7534B3052FC :100B79005430324E323030475631323000FFC15096 :100B8900FEFEAB0061DD717BFACF060800FE0A00AC -:100B9900FEA4FF61CDF8E3EECF00C7FB0408BF6AEE -:100BA900FD8FC0009C05C5C337040600BF6CFD3529 +:100B9900FEA4FF61CDF8E3EECF00C7FB0408BF6CEC +:100BA900FD8FC0009C05C5C337040600BF6EFD3527 :100BB90036EB0B300000522BFE6600C2C4C63099DA -:100BC9000BB800300000B8022004AF6CFDB800304B -:100BD9000F00B802AF6AFD61FF520AFE3AFFECF856 +:100BC9000BB800300000B8022004AF6EFDB8003049 +:100BD9000F00B802AF6CFD61FF520AFE3AFFECF854 :100BE900FF0E717BFAC1C7FB04088C05C65C80FE49 :100BF9000200C0D761DD717BFA70CFC0FFA59FC02D :100C0900007CFF9FC000609FC00061CDD7618BFE53 :100C1900E2FF717BBE410011FB000017CEFC0061B1 :100C2900CB089EFDF31161C999A58392DFF7D7FE21 -:100C3900B1FED578FDDF23C1CF0308035109FEF4C6 +:100C3900B1FED57AFDDF23C1CF0308035109FEF4C4 :100C4900FDC0D2DF37FE3800A20408CF03080751E0 :100C590009FEE1FDD2B20408DF22C7FB0408318393 -:100C690002C6D7C6510AFECCFD624C1FDF06CF78FB -:100C7900FD01EF04CF78FD00C0EE5BFEC0EE55FE2E +:100C690002C6D7C6510AFECCFD624C1FDF06CF7AF9 +:100C7900FD01EF04CF7AFD00C0EE5BFEC0EE55FE2C :100C8900C7C1FB04088B31196C0161589BC0C6D7D9 :100C9900717BFAFE4DFEAF0408040600C11436FD4F :100CA9000B300000522DF3FE77FF8FC000FE2BFEA4 @@ -209,10 +209,10 @@ :020D1900C3FD18 :100D1B0061CF5100718C7109FECBF800FEFC940180 :100D2B0000F6BF00F953C0F693935820FEDFF9414C -:100D3B000036524F3430FDEF05118B99A7A51744A0 -:100D4B008C4FDFF53602F93030FDEF04CC0000A7F5 -:100D5B0047DFF9410036374F346AFDEF05118B99A8 -:100D6B00A7A51744374FDFF5366AFD306AFDEF0450 +:100D3B000036584F3432FDEF05118B99A7A5174498 +:100D4B00924FDFF53602F93032FDEF04CC0000A7ED +:100D5B0047DFF94100363D4F346CFDEF05118B99A0 +:100D6B00A7A517443D4FDFF5366CFD306CFDEF0446 :100D7B00CC0000A747DFF9FCCE0000EFFE61DD7170 :100D8B007BFABEF0ADD8BEF200AEF661CDD7C36133 :100D9B00DD717BFABEF0ADD8BEF200DBF6FFADDC49 @@ -246,12 +246,12 @@ :100F5B000771FF7177D971C0D746DADF08C1ADDCF5 :100F6B0046D8C0DD077177DB71FF71C0D75BDB9DA6 :100F7B00DB605BDA9DDAADDC5BD9085BD808BDD8EA -:100F8B00D7C3C7F3728EFDC162314C410036384F67 +:100F8B00D7C3C7F3728EFDC162314C4100363E4F61 :100F9B001161A072C09EFD62C6C2D7C3C7F3728E29 -:100FAB00FDC1625C0F0C000FFE00314C410036425C +:100FAB00FDC1625C0F0C000FFE00314C4100364856 :0F0FBB004F1161800FFE0073C09EFD63C6C2D749 -:0A0FF60031333A31333A323600004D -:0A20000031333A31333A3236000032 +:0A0FF60032313A32393A3534000046 +:0A20000032313A32393A353400002B :10200A00AEF0B430B740BA30BB50BBB0BC50BD1014 :10201A00BD60BDB0BFE0C2B0C420C7B0CAE0CE1038 :10202A0001F0141014200630639049006E00777096 @@ -297,8 +297,8 @@ :1022AA0038251204FAF3F0F0F3F7FBFE00020303F9 :1022BA0002020100000000001F003B005A007800E3 :0E22CA009700B500D400F300110130014E0161 -:1022D800D51EF9DD108F31FDB031FDD161E8ED84F7 -:1022E80023CF31FD33FD85234002F94BDC16400234 +:1022D800D51EF9DD108F33FDB033FDD161E8ED84F3 +:1022E80023CF33FD33FD85234002F94BDC16400232 :1022F800F9B9DE10400CF928DE05A00CF9EF2771BA :102308003320EF224002F93EDC064002F9BDDC1022 :10231800400DF928DE05A00DF9EF0B713220EF060C @@ -309,45 +309,45 @@ :102368004402067140E3FBEF047148E3FB401EF9A9 :1023780001DD09401EF90561E8FDE726D7C77104AC :1023880007E6613060768F0FF9614EDD29669F0F91 -:10239800F9D1DD137130E3FB5002C15011FDDA377A +:10239800F9D1DD137130E3FB5002C15011FDD7377D :1023A800C0CF0BF91EEF0F7138E3FBE0C15011FDF0 -:1023B800DA37C0F50BF9C6D7C78F30FD76FD012493 -:1023C800D521F9DD05710320EF2D664F30FD61F849 +:1023B800D737C0F50BF9C6D7C78F32FD76FD012494 +:1023C800D521F9DD05710320EF2D664F32FD61F847 :1023D8003144201A714320FD2805664C07DD03812E :1023E800DF098F20F9310303FD7F24FDA424710246 -:1023F80020302926FD803CC6D7C771620171720161 -:10240800E0FDA3025008FDF43A629F02F95009FD6D -:10241800F43A6276716301713820F94002F9F1DC0F +:1023F80020302926FD7D3CC6D7C771620171720164 +:10240800E0FDA3025008FDF13A629F02F95009FD70 +:10241800F13A6276716301713820F94002F9F1DC12 :1024280005E521F9EF244002F904DE1BCF21F9026A :102438005008C1506CFD3103C092DF0ED541FBDF5F -:1024480009713020F9EF03F521F9CF30FD07570066 -:10245800674C08DE1173091722614EDC06679F304E -:10246800FDEF0387EFEA4030FD07DF09D521F96169 +:1024480009713020F9EF03F521F9CF32FD07570064 +:10245800674C08DE1173091722614EDC06679F324C +:10246800FDEF0387EFEA4032FD07DF09D521F96167 :10247800F8CF21F903C6D7C7C1FBF8FF500AFDA35F :1024880002304000BB17C15002C15006C1506CFD5C :10249800030410065096FDA302C0C6D7C72008FB48 -:1024A800F8FF8F30FD5006D604CA2114F75006896C +:1024A800F8FF8F32FD5006D604CA2114F75006896A :1024B800A54804F9A390DFF7D521F961E8ED2526B1 :1024C800304A57BB17C15002C1503EC1506CFD0382 :1024D800041006D2DD077100E2FBED25267108E243 :1024E800FB17040300C15004C1500CC1506CFD5BC4 -:1024F800031006D930FDF10104F42114A9318D121D +:1024F800031006D932FDF10104F42114A9318D121B :10250800A9318E616B08616A08BB17C15002C150BE :102518000EC1506CFD03041006F690BB17C15002A3 :10252800C1500CC1506CFD0304100631042102EFA8 -:10253800FA7172208F30FDF0312E040A20C150103C +:10253800FA7172208F32FDF0312E040A20C150103A :10254800C15040C1506CFD0304100631042102EF54 -:10255800FA7172208F30FDF0312E041A20C150100C +:10255800FA7172208F32FDF0312E041A20C150100A :10256800C15050C1506CFD0304100631042102EF24 -:10257800FA7172208F30FDF0312E042A20C15010DC +:10257800FA7172208F32FDF0312E042A20C15010DA :10258800C15060C1506CFD0304100631042102EFF4 -:10259800FA7172208F30FDF0312E043A20C15010AC +:10259800FA7172208F32FDF0312E043A20C15010AA :1025A800C15070C1506CFD0304100650A5FDA30274 -:1025B800D930FDF10104F42114A9318D12A9318E0D +:1025B800D932FDF10104F42114A9318D12A9318E0B :1025C800616B08616A08BB17C15002C1500EC15047 :1025D8006CFD0304100650A5FDA3025004C1506C05 -:1025E800FD3103C0629C07E930FD0909224E0761ED -:1025F800C308E930FD0902224E0717040300C15041 +:1025E800FD3103C0629C07E932FD0909224E0761EB +:1025F800C308E932FD0902224E0717040300C1503F :1026080004C1500CC1506CFD03041006F6BB17C181 :102618005002C1503EC1506CFD030410061008C69C :10262800D7C7C1FBF8FF8F10F94F02F961F8EDE346 @@ -359,7 +359,7 @@ :1026880003318FBBEF198F11F9318F241400BDD896 :10269800AF08F9FD880D1231FF318E03318FBBD998 :1026A80004F9F1610900BB44000171FEDC03F690F6 -:1026B800BB8C0101DE02F6BBABABBF8AFC17C15075 +:1026B800BB8C0101DE02F6BBABABBF8CFC17C15073 :1026C80002C1500CC1506CFD03041006D2DF088F04 :1026D80002F99F10F9EF047100E2FBF2C0C6D7C7F8 :1026E8002008FBF8FF4021F901DF0BCFDFFB63CFA8 @@ -369,7 +369,7 @@ :10272800FBCFE1FBC8ED5A2817040600C15002C1CF :102738005004C1506CFD5B031006D2DD117100E23C :10274800FB710320F5DFFB712020F9ED2F288C06A3 -:10275800318E318D080E07081C00BBD930FDF104FD +:10275800318E318D080E07081C00BBD932FDF104FB :102768001022148972ABFDDB0EBB8C019C068B9C7E :102778000717040400C15002C1C1506CFD5B03106F :1027880006D261E8ED2F288C049FE1FB8C04318E82 @@ -392,7 +392,7 @@ :102898008C046C039C048C049F36FC40DFFB0BDE2D :1028A800064016F90BDE1640DFFB06DE064016F979 :1028B80006DE0AD5DFFBDF0ED516F9DD095020C18B -:1028C8005011FDDA37C08FDFFB9F16F9D51EF9DFEF +:1028C8005011FDD737C08FDFFB9F16F9D51EF9DFF2 :1028D80005715320EF3340DFFB0BDE03E6EF01F613 :1028E8006061FB71612071142071672061C83152E9 :1028F8002017715220716420711120F171642061D8 @@ -401,7 +401,7 @@ :10292800500FC15002C15084FDCD0310045003FD67 :10293800A302501FC15002C15084FDCD03100450A2 :1029480016FDA3025003C15084FD3103C0625C012F -:10295800D1DD107170E3FB5002C15013FDDA37C0AE +:10295800D1DD107170E3FB5002C15013FDD737C0B1 :10296800F2EF01E2C6D7C75004C15084FD3103C05D :10297800625C03D1DD405014FD072A34E3FB895C17 :102988009F998A0C7CFF50FF5C14D1DD228A0C7C55 @@ -411,7 +411,7 @@ :1029C800DD335017C15002C15084FDCD031004E01F :1029D800FDA3025007C15002C15084FDCD0310046D :1029E8005033FDA302F0C15002C15084FDCD031045 -:1029F800047178E3FBE0C15013FDDA37C0C6D7C7CE +:1029F800047178E3FBE0C15013FDD737C0C6D7C7D1 :102A0800C12004FBF8FFCC02005004C15084FD3102 :102A180003C0629C038C045C20D1DD0E8C036C0126 :102A28009C038C026C209C02EF138C045C10D1DD9B @@ -450,15 +450,15 @@ :102C3800FB8FEEFB7CFF50FF5E029C02D1DD1F3450 :102C4800E6FB896E0299716207CC010031620708C0 :102C58006159018C01D1DFF4716307716B278F0A09 -:102C6800F95C40D1DD095002C15012FDDA37C08F3E -:102C78000AF95C01D1DD08E0C15012FDDA37C071F4 +:102C6800F95C40D1DD095002C15012FDD737C08F41 +:102C78000AF95C01D1DD08E0C15012FDD737C071F7 :102C88007AFA8F0AF95C41D1DD11340AF9895CBE00 :102C980099D90AF9C15010FDB705C0F21004C6D77A :102CA800FD1529F2D7FD6E29F2D7C78FF6FB7617E7 :102CB800FD072A664FF6FBDFF2F5F6FBF2C6D750A2 :102CC80064FDA30240DFFB0BDE03E6EF01F6606163 :102CD800FB711120F171142061DC70C15012FDB735 -:102CE80005C0FD9E39CF47FC03D7710001057178F7 +:102CE80005C0FD9B39CF47FC03D7710001057178FA :102CF8005005713AD5713BD1713ADD713BD98F10CE :102D0800055CFC9F1005CF54054AE5420571104249 :102D18000571004205714850057130500571205009 @@ -472,8 +472,8 @@ :102D980030028F11055CFC9F110571603002D771FC :102DA8007830027148F000D7C788061666614FDD93 :102DB8000967614EDE0396EF01866672C6D7C716AD -:102DC8001714AA0412A943DD29AA0412A923FD8C09 -:102DD8004FC3AC02FD8C4F13C2BDD813FD580FDE94 +:102DC8001714AA0412A943DD29AA0412A923FD9203 +:102DD8004FC3AC02FD924F13C2BDD813FD580FDE8E :102DE8000C1714AA0212AA0403BA04EF051714A9AF :102DF800BA04AC041231FF319E03317F087208C651 :102E0800D7C771201205712011057100F2003044F6 @@ -496,19 +496,19 @@ :102F1800712421712104EF0671242171510131447A :102F280021218F20F9311510F6BE64BE6A312421A3 :102F38000390EF01F6BE6ED731242104F690EF011D -:102F4800F6BE6AD7CF38FD47F5A8FBAE6C317DBF1A +:102F4800F6BE6AD7CF3AFD47F5A8FBAE6C317DBF18 :102F5800AEFBFDC12FD2DF0ED9FCFBC1AE6CFDB0BC -:102F68002DC0F313BE6CD7FDC12FD2DD0FCF38FDB6 +:102F68002DC0F313BE6CD7FDC12FD2DD0FCF3AFDB4 :102F780047F5A8FBAE6C317DBFAEFBD7E9A8FB09CE :102F880024225080D6BFAAFB22AEFBBDD830470012 :102F9800FDC40DBFACFB30AAFBFDC62DF313BE6C00 -:102FA800B038FDD538FDDF10CF38FD47A0A8FB406D +:102FA800B03AFDD53AFDDF10CF3AFD47A0A8FB4067 :102FB800A8FB1F61C8F5A8FBD740DFFB0BDC057138 :102FC8002321F2D740DFFB0661D831120511F0C189 :102FD800AE6CFDB02DC0F313BE6C712221EF03FD62 :102FE800EC2FE2D7714221F0C1AE6CFDB02DC0F3D9 :102FF80013BE6CA0B0FB40B0FB40DC3DF5B0FBD984 -:10300800B1FBF1313F0434FD14D9B1FBF1BDD85007 +:10300800B1FBF1313F0436FD14D9B1FBF1BDD85005 :1030180008FD130E087208E6D2DD040192DFFC8970 :103028006158D1DD05712221EF03712321A0B1FB85 :1030380040B1FB2061C8F5B1FBD78FB2FBB0B2FB42 @@ -542,15 +542,15 @@ :1031F800FBFDC62DF313BE6AD7C73152210BD5CAC2 :10320800FBDD06B0CAFBEDC832715321D9FFFBF1D3 :10321800E7240000DD0F23DD1B23DD1123DD572309 -:10322800DD2923DD3B5600F539FDEDB4325601F5B5 -:1032380039FDEF78D539FDDF075601E539FDEF0592 -:103248005600F539FDCFCAFBFAEF61D539FDDF0B22 -:103258005601E539FDCFCAFBFAEF51F5FFFBEF4CFC -:10326800D539FDDF0B5600E539FDCFCAFBFAEF3C37 +:10322800DD2923DD3B5600F53BFDEDB4325601F5B3 +:103238003BFDEF78D53BFDDF075601E53BFDEF058C +:103248005600F53BFDCFCAFBFAEF61D53BFDDF0B1E +:103258005601E53BFDCFCAFBFAEF51F5FFFBEF4CFA +:10326800D53BFDDF0B5600E53BFDCFCAFBFAEF3C33 :10327800CFFFFB02EF36D937FCF1E7240000DD0968 -:1032880023DD2423DD0A23EF1E5600F539FDEF1C4C -:10329800D539FDDF075601E539FDEF055600F5394B -:1032A800FDCFCAFBFAEF055601E539FD8F20F9314C +:1032880023DD2423DD0A23EF1E5600F53BFDEF1C4A +:10329800D53BFDDF075601E53BFDEF055600F53B45 +:1032A800FDCFCAFBFAEF055601E53BFD8F20F9314A :1032B80015086661FB715107EF066661FB71010134 :1032C800C6D7C736F00071F4DC297170F000CE9DC6 :1032D80008CE9EC0CE9F80F594FFF593FFF592FF30 @@ -566,455 +566,455 @@ :103378009E31929E02EFFA3492FF36CCFB52078BB5 :1033880099A5A792DFF9710B9E31142213711322AC :10339800717B9E8F0CFC9E9A8F0DFC9E9B717A9E72 -:1033A800C6D7CFD7FB5CCFD8FB5FCFF8FB20CF2C9D -:1033B800FC36CF2DFCC9D7C7CFD4FB11CFD5FB0B1B +:1033A800C6D7CFD7FB5CCFD8FB5FCFF8FB5DCF2C60 +:1033B800FC36CF2DFCC9D7C7CFD4FB11CFD5FB0C1A :1033C800CFFCFBFFF5FDFBF5FEFBF5FFFBF500FC75 :1033D800CFF9FB20F5FAFB5600664C64DE0872381C :1033E80044FB0086EFF3C6D7C788061617F1E73403 -:1033F80003002361E3ED1E372361F8EDD434B123D4 +:1033F80003002361E3ED1B372361F8EDD434B123D7 :1034080061E3EDDB342561F8EDEA34240700240795 -:103418000061D8ED1E37240B0061F8ED0B352361F0 -:10342800F8ED52352361F8ED1F352361F8EDF636D6 -:103438002561F8ED0A372561F8EDBB35B12561D86E -:10344800EDDF3524000061F8EDEC352361F8ED1E61 -:10345800372402002361E3ED11362361F8ED2236AB -:103468002361F8ED33362361F8ED22362361F8ED58 -:1034780044362361F8ED55362361F8ED643623614F -:10348800F8ED86362361F8ED92362361F8ED9E3625 -:103498002361F8EDA7362402002361E3ED1E3724EB -:1034A800020061F8EDAF362361F8EDBB362561F80F -:1034B800EDC736240A0061F8EDD33624120061F80E -:1034C800EDF0362361F8EDDE36ED2037679FD6FB49 -:1034D800ED2A3730FA2AFD803C66736718D4FBED75 -:1034E8002A3740D9FB6ADF1440DAFB68DF0E674CE5 -:1034F8006CDF09303245FD803C713AD5679FDBFBB4 -:10350800ED2A3767D1DD06308C40FD803C34F4FB72 -:1035180089616F99ED2A37675C02D1DD0830A82CE4 -:10352800FD803CEF0C675C01D1DD0630AD2CFD80E1 -:103538003C675C3CD1DD1030B22CFD803C675C3CC4 -:103548007266736218D4FBED2A3767D1DD625C01BD +:103418000061D8ED1B37240B0061F8ED0B352361F3 +:10342800F8ED52352361F8ED1F352361F8EDF336D9 +:103438002561F8ED07372561F8EDBB35B12561D871 +:10344800EDDC3524000061F8EDE9352361F8ED1B6A +:10345800372402002361E3ED0E362361F8ED1F36B1 +:103468002361F8ED30362361F8ED1F362361F8ED5E +:1034780041362361F8ED52362361F8ED6136236158 +:10348800F8ED83362361F8ED8F362361F8ED9B362E +:103498002361F8EDA4362402002361E3ED1B3724F1 +:1034A800020061F8EDAC362361F8EDB8362561F815 +:1034B800EDC436240A0061F8EDD03624120061F814 +:1034C800EDED362361F8EDDB36ED1D37679FD6FB52 +:1034D800ED273730FA2AFD7D3C66736718D4FBED7B +:1034E800273740D9FB6ADF1440DAFB68DF0E674CE8 +:1034F8006CDF09303845FD7D3C713AD5679FDBFBB1 +:10350800ED273767D1DD06309440FD7D3C34F4FB70 +:1035180089616F99ED2737675C02D1DD0830A82CE7 +:10352800FD7D3CEF0C675C01D1DD0630AD2CFD7DE7 +:103538003C675C3CD1DD1030B22CFD7D3C675C3CC7 +:103548007266736218D4FBED273767D1DD625C01C0 :10355800D1DD05300800EF01F6609F33FC675C029F :10356800D1DD03E6EF01F63433FC89616899675CC5 :1035780004D1DD04E6A1EF01F63433FC89616899D2 :10358800675C08D1DD05302000EF01F63433FC8993 :10359800616899675C10D1DD05301000EF01F634E1 :1035A80033FC89616899675C20D161E8716033FCFC -:1035B800ED2A37D518F9DF09679FFDFBA018F9EF49 -:1035C800134018F905DE0DD918F9F1B1126748341E -:1035D800FDA018F9ED2A37675C0F7266736218D47C -:1035E800FBED2A374018F964DE1F4018F901DF06A1 -:1035F80067D161F85701E918F9671844FBA018F971 -:103608004018F90561C8716221675C7F70C117F1C4 -:10361800243000FD4633C0ED2A37675C3F70C11780 -:10362800F1243000FD4633C0ED2A37675C0770C1CE -:1036380017F1243000FD4633C0ED2A37675C1F7050 -:10364800C117F1243000FD4633C0ED2A376770C139 -:1036580017F1243000FD4633C0ED2A37CEABAC71EC -:103668000A9E31929E02EFFAD592FFDF05710B9EFA -:10367800EFED679E99710B9E9F0BFCED2A37711237 -:1036880022675C7F9F0CFCED2A37711222675C3F32 -:103698009F0DFCED2A37675C3F9F0EFCED2A3767CC -:1036A8005C1F9F0FFCEF7B307E3EFD803C679F14C4 -:1036B800FCEF6F30393EFD803C679F15FCEF6330AF -:1036C8005B3EFD803C679F18FCEF57675C01D1DDCE -:1036D80051FD3A48EF4C402EFCC8DE46E92EFC6707 -:1036E8001872FAA02EFCEF3A679F2EFCEF34673170 -:1036F8008E247200DF06306309FD803C679FF7FB6C -:10370800EF208FFAFB617F5C10D161E8CF47FC03A3 -:10371800679FFAFBEF0CEF0A664C5ADE05736718D1 -:10372800D4FBC6D7C716664C30DC094C37DE05FD1E -:103738002133EF67664C02DF1F8FD6FB5C03728F65 -:1037480035FC5C03318E316D08616A08128F35FCD7 -:103758005C80312A6162EF49664C3DDF0AAE90BF5A -:1037680030FCF930FCEF3A664C3EDF05F931FCEFEE -:1037780030664C4FDF05FD5E48EF26664C61DF0979 -:10378800E92EFC0972FA72EF18664C7FDF0D3006DD -:1037980041FD803C713AD5524AEF06667309D4FB65 -:1037A80072C6D7C788061617F1241000240500DC56 -:1037B80007244C00DD17EF18717BFA17F104D4FBCE -:1037C8001489617F99717AFA712222EF03A02EFC85 -:1037D800C6D7C7C1C1FBF8FF401EF903DD06401E6E -:1037E800F904DF2F8C027309DCFB5E0AD1DF248C1D -:1037F80002318E04D4FB14896E0A99716207CC01D8 -:1038080000316207086159018C01D1DFF471630747 -:10381800716B271004C6D7CF35FC03F533FCF53799 -:10382800FCF539FCD7C788061617F1E734020025DE -:10383800DD3E23DD1825DD1D23DD0523DD2CEF3CD2 -:10384800715222679F38FCCF47FC03EF2F675C83D8 -:103858009F35FCEF27675C039F37FC675C034C02CE -:1038680061F8715221FD0132EF12679F39FCEF0CAC -:103878006791DF08E0C15012FDDA37C0C6D7C71616 -:1038880017F1E7240000DD3A23DD23240300DD0CD3 -:10389800240200DD2224F900DD2FEF303102070574 -:1038A800308000EF01F6086F36FC7208EF248F3382 -:1038B800FCF533FC72EF1B8F41FC9F42FCF938FC8E -:1038C800EF107142235235EF09F2EF0666730932A1 -:1038D800FC72C6D7C71617F1E7240000DD3824109C -:1038E80000DD1C23DD1C23DD30240E00DD1824112F -:1038F80000DD1B240F00DD12243000DD15EF1EE271 -:10390800EF1D5202EF195204EF155206EF1152053E -:10391800EF0D5207EF09F2EF065203EF0252FFC60E -:10392800D7C7313422417133228F46FC9FDCFB8F8D -:1039380045FC9FFBFB3640FDC7D945FCFD253B6197 -:103948008A70618AFD6A3BC0D949FCF1312F609FBA -:1039580048FC8F44FC4F48FCDD0D7142228F48FC27 -:103968009F44FCCF47FC034047FC05DE0A30AB39D7 -:10397800FD803CCF47FC6BB047FC7150F000CE3067 -:103988000BCF170006CE3106FD0D03717A30710B8F -:10399800E3710BE7C6D78F48FC9F44FC8F48FC9F18 -:1039A800DDFBD7C7401EF903DF06401EF904DF041C -:1039B800F2EDA03A8FFAFB5C10D1DD0C8F48FC9F2A -:1039C8004DFC7148FAFBEF613144222471432271A6 -:1039D80063228FFAFB5C04D1DD088FF9FB9F4EFC54 -:1039E800EF068F48FC9F4EFC8F4EFC9F4DFCEF3935 -:1039F80031542223715322716222D538FCDF05F538 -:103A08004FFCEF0B8F38FC5002D6A1609F4FFC8F04 -:103A18004FFC9F4DFCEF12316422088F4FFC9F4DE5 -:103A2800FCEF068F4EFC9F4DFC8F4DFC9FDDFBD5B8 -:103A38004DFCDF05F538FCEF1A404DFC05DE06CFDE -:103A480038FC02EF0ED94DFCF11231FE03311F6034 -:103A58009F38FC8F51FC4F38FCDD23571F8F38FCF3 -:103A68009F51FC5600664C08DE10730984224F38BB -:103A7800FCDC046677EF0386EFEB679F41FC8FFA67 -:103A8800FB5C01D1DD03F2EF0FE94DFC0944227024 -:103A9800C15013FDB705C0F2C6D7C7168B728C018B -:103AA800614ADE248B728C02614ADE188C01728CAA -:103AB80002614ADE068C01318EEF048C02318E08D9 -:103AC8007208EF268B72EF228B728C02614ADE0439 -:103AD8008B72EF168C01728C026142DE068C01310A -:103AE8008EEF048C02318E087208C6D7C716710A89 -:103AF800E7710BE37150F000CE300BCF170006666C -:103B08009E31FD0D03717A30710BE33182E302EFD0 -:103B1800FA8D1F7158F000710BE772C6D7C7C1C183 -:103B2800FBF8FF8F2CFC4E02DC03F2EF318C024FC6 -:103B38002DFCDC0452FFEF268C022F2CFC70613127 -:103B4800318D128F2DFC2F2CFC70613133BDD813B1 -:103B5800FDE60DBB440001DC03F690BB8B7210043C -:103B6800C6D7C7C1C1FBF8FFAC0A14A91489708C69 -:103B7800026128706131FD8C4F1344030071FEDC33 -:103B880024AC0A148A04819A04AC0A148A044C11DD -:103B9800DC11A9148C0299AC0A14CA0200AC0A14EC -:103BA800CA0310EF74AC0A14CA0400AC0A14A914AE -:103BB800894E02DE0AAC0A148A02819A02EF13AC1B -:103BC8000A14A914894E0261D308AC0A148A029116 -:103BD8009A02AC0A148A03919A03D1DF3CAC0A1406 -:103BE8008A024C10DF10A91489318EA112AC0A1474 -:103BF800A9146299EF17AC0A148A024CF0DF0EA9D7 -:103C08001489318EB112AC0A14A9146299AC0A1441 -:103C1800CA0200AC0A14CA03101004C6D7ED6B3CE4 -:103C2800717BFAC7D55CFC61F8317422307174225B -:103C3800711123717322CEABACD55CFC61E8B05C2A -:103C4800FC717AFA5600664C0ADD1272F3311C795F -:103C580046FDCEFC0061CAFDCA3C86EFE9717AFADE -:103C6800F2C6D7C75600664C10DE0BF0317E12F64E -:103C7800785EFC86EFF0C6D7C7C1C1FBF8FFCC0160 -:103C8800008C014C10DE36717BFA8C01F0317E0419 -:103C98005EFC14A96168DF09AC02B9717AFAF2EF27 -:103CA8001D8C01F0317E12795EFC614902DF0671DC -:103CB8007AFAE2EF09717AFA615901EFC4E2100465 -:103CC800C6D7C72004FBF8FFF6425EFC61F8EDAFEB -:103CD8003D717BFA9C038C034C10DE3C8C03F03165 -:103CE8007E045EFC14A96168DF05717AFAEF297118 -:103CF8007AFA8C0372F3311C795EFCCEFC0061CA3F -:103D0800629C02D1DF0A8C03F0317E12E6785EFCF9 -:103D1800717BFA615903EFBECC0200CC01018C0221 -:103D2800F0317E045EFC14A96168DD7B8C02F03101 -:103D38007E12795EFCE743DF688C014C10DE628CF2 -:103D480001F0317E12795EFCE743DD50717BFA8C1D -:103D580001F0317E045EFC14A96168DF1B61690112 -:103D6800717BFA8C01F0317E12F6785EFC717AFA7A -:103D78008C024E01DCE7EF2F8C01F0317E045EFCF3 -:103D880014A9128C02F0317E33785EFC8C01F0317C -:103D98007E12E6785EFC615902717AFA615901EF88 -:103DA80098615902ED263D00F21004C6D7C72006D7 -:103DB800FBF8FF3419FCC55006C150A8C15030FDAE -:103DC8005B031006D2DD1DA07EFC407EFC08DE03EE -:103DD800E2EF5A3414FC895CFC99FD7E3E7110E2D6 -:103DE800FBF2EF49F57EFC8F14FC5C01D1DD264027 -:103DF8001EF903DF205010C180FDDA37C0C7361026 -:103E08000571D4C6DE0F17C15006C150A8C1503085 -:103E1800FD5B031006401EF901DD11401EF905DDAA -:103E28000B8F14FC5C02D161E8FD3745F21006C621 -:103E3800D7D915FCC15030FD3103C0629F18FC7101 -:103E480030E5FB8FEDFB5C08D1DF06716307716B12 -:103E580027F2D7D918FCC1D917FCC15030FDCD03C2 -:103E680010047130E5FB8FEDFB5C08D1DF06716350 -:103E780007716B27F2D7C7200AFBF8FF500FC15014 -:103E880030FD3103C04041FB02DF077110E2FBF255 -:103E9800EF547118E2FBCC0700CC0812CC09808FD4 -:103EA80014FC5C03D1DF08717AD5CC0607EF0671E4 -:103EB8007BD5CC062F17040600C15004C150A0C101 -:103EC8005030FD03041006C736100571D4C6DE1540 -:103ED800401EF903DF0F17C15006C150A8C150306A -:103EE800FD5B031006F2100AC6D7C7401EF902DFB1 -:103EF80004F6BF82FCB05AFDD55AFD61E8ED0240D8 -:103F0800CF5AFD048F1EF9318FE723DD0B24020001 -:103F180024030061C8ED02403028004282FCDF0A19 -:103F2800E0C15010FDDA37C0EF2530FA004282FCBC -:103F3800DF0B5002C15010FDDA37C0EF128FF8FBCB -:103F48005010D604FA004282FC61D8712020F93161 -:103F5800340709712323F6BF82FCEF1731242306A7 -:103F6800F6BF82FCEF0DA282FCF64282FCDF04B1B0 -:103F7800BF82FC8F21F9318FE7240000DD0623DDA5 -:103F88000D23DF1236100571C4713123EF0B710454 -:103F980002713123EF037132233132231A4084FC3A -:103FA8000361D8A084FC4084FC02DF0E5004C15099 -:103FB80010FDDA37C0EF03F584FC3134231A40864C -:103FC800FC0361D8A086FC4086FC02DF0E5008C1C5 -:103FD8005010FDDA37C0EF03F586FC314207184070 -:103FE80085FC0361D8A085FC4085FC02DF0C5010DD -:103FF800C1FDDA37C0EF03F585FCC6D7C736100513 -:1040080071D4DE0730B53DFD803CD2401EF903DF98 -:10401800413122070630CA2BFD803C3144230C7104 -:1040280043235080C15012FDDA37C0D588FCDD0526 -:10403800B088FCEF1DCF88FC068F35FC5C01D1DD14 -:10404800118F41FC4F42FCDD095040C15012FDDA8E -:1040580037C0401EF903DD05F6BD1AEF25D500FC73 -:10406800DF09F6461ADD1BB61AEF17D9FCFBF14635 -:104078001ADD0FD9FCFB12AD1A43DE04A61AEF02B3 -:10408800B61AC6D7C78FF4FB76F5F4FB5C10D1617E -:10409800E8715223665C0FD1DD61665C01D1DD05F4 -:1040A800F51EF9EF56665C02D1DD15E0C15003C17B -:1040B8005084FDCD031004711300711B207103039C -:1040C800665C08D1DD05710303EF17665C04D1DD7A -:1040D80011711300711B20D535FC61F8710303F5CC -:1040E80035FC5005FDA3027102035003C1C1508481 -:1040F800FDCD031004711A20FDC72CF2C6D7C736B0 -:104108004105718461D8EDAA413641057194DE07F5 -:1041180071405005CEABAC31B2D104E2EDB941717A -:104128003BD1CEABAC4018F909DE77D518F9DF6181 -:104138008F20F93133088F21F99F4005EF04CF40D4 -:104148000504F0C15084FD3103C0629F8CFC8F30A0 -:10415800FD9F8DFC368EFCC75002C15008C1506CC3 -:10416800FD5B0310068F8AFC9F90FC8F02F99F91DC -:10417800FC713420E661301271042061DC31196170 -:1041880062629F92FC8F20F93169317A9F93FCEF2C -:104198000BD918F9F112498BFC9F4005A018F9E2D8 -:1041A800EF0F7160500571485005713BD5F518F94E -:1041B800F2C6D7C78F1EF9318FE724000061F8EDEA -:1041C8008C4323DD1B2361F8ED93422361F8ED1145 -:1041D800432361F8ED5A432361F8ED2644ED8C43FF -:1041E800D51FF9DF2BF64282FCDD05F55CFDEF03F8 -:1041F800A05CFD405CFD65DC09F51EF9717222EDDD -:10420800A644AF82FC440A0061D8EDA644E51FF934 -:10421800712223F55CFDF5F7FBFD2805714320FDB0 -:10422800C0234021F903DF09717222F51EF9EDA6BA -:1042380044FDE72640E1FB9BDE09717222F51EF979 -:10424800EDA644714A277140110571301105713A84 -:1042580022715A22711A2EFDFF2AD2DD09717222AB -:10426800F51EF9EDA64471103500CF37001D7140D9 -:104278001205401FF901DF05F5FDFBEF04CFFDFB3B -:1042880003CF1EF902FDDD2AEDA644FDF22CFD52F6 -:104298002D714A9DFD1F38FDBF33F537FF712BE0A7 -:1042A800F51FF9717222CBE43FEFCBE6F6F0FD285B -:1042B80005713BD48F20F93105305004C15084FD7D -:1042C8003103C0625C03318E315D34E3FB89616880 -:1042D800995002C15084FD3103C0D2DD067170E3EC -:1042E800FBEF047178E3FBFDC023FD092E71082064 -:1042F800F9CF1EF9038FD6FB5C02D1DD095080C1CE -:104308005010FDDA37C0EDA644FDA84431A4E020E2 -:10431800712BE031020C05FD2245EF145027C150E6 -:1043280005C15084FDCD031004CF1EF9047172221B -:104338003154230BA096FCD596FC61F8FD2245FD6F -:1043480015458F20F931450731040703F51EF9EDAE -:10435800A644FDA84431020C18F0C15005C1508490 -:10436800FDCD0310045005FDA302FD2245CF1EF923 -:1043780003FD15458F20F931450731040703F51E64 -:10438800F9EDA644CFFDFB03F5FEFBF500FC713209 -:1043980021F6426CFF61E8EDA644712820F9F51476 -:1043A800FCFD7E3EFD992EFD492DFDA72D714B9DEF -:1043B800F5E4FBF5E5FBF5E6FBF5E7FB3104210247 -:1043C800EFFACE3708CBE4BFFFCBE6FFF1CED4FF40 -:1043D800CF37000971481205F6BEE0BEE2BED071C3 -:1043E8006A27FD7C2B714307714B277148100571B3 -:1043F8004811057138100571381105713302713B88 -:1044080022715302715B2271130E711B2EFD9105EF -:10441800F55CFDCF1EF905712223F6BF82FC31023F -:10442800072CFDC023AF82FC440A00DC06E51FF917 -:10443800E51EF9D521F961E8FD91058F20F931458F -:104448005D502EFDA302E51FF9E51EF9EF50D50BCF -:10445800F9DF4BF51FF9FD9105FD85237173017196 -:10446800320431120502EFFA7143027103207142DE -:104478002031949E02EFFA712AE7CEA409F5F300E1 -:1044880061FD31040703712323E5F300CEA408710D -:104498002BE7E51EF98F20F9314503F51EF9C6D73C -:1044A800D597FCDF1E310200195003C15084FD313D -:1044B80003C0625C01D1DF07F51EF9717222D7E5EE -:1044C80097FCD74097FCF0DF083104003FF597FCD4 -:1044D800D74097FCC8DF0BF51EF9717222CF97FC05 -:1044E800F0D731020004A097FCD7F0C15004C150A6 -:1044F80084FDCD0310048FE3FB5C9F9FE3FB7110E9 -:10450800F4FB308C40FD803CCF97FCF0D78F20F92E -:10451800312506F51EF9717222D7715323F596FCE1 -:10452800717207FD0D03717307D7FDFE05F2D7C73A -:10453800200CFBF8FF8F1AFCF0F919FCF303FD8C33 -:104548004F13BC048F1CFCF0F91BFCF303FD8C4FCC -:1045580013BC028F1EFCF0F91DFCF303FD8C4F13F6 -:10456800BBAC04BDD8F6BDDAAC04311EBDDCF6BD6B -:10457800DEFD990DADD8BDDCADDABDDEAC02BDD82F -:10458800F6BDDAAC02311EDADCC3DADEC3BDDCF616 -:10459800BDDEFD990DC0BDDEC0BDDCADDEFD0F0F7B -:1045A800ADD8BDDCADDABDDEABBDD8F6BDDAAB311A -:1045B8001EDADCC3DADEC3BDDCF6BDDEFD990DC054 -:1045C800BDDEC0BDDCADDEFD0F0FDADAADD8FD888B -:1045D80049C3C58F24FD5C3FF0317E04A4FC14C29E -:1045E800C0B9A024FDF6BC08BC0A9C078C074C2E59 -:1045F800DD3E8F24FD0E0770F161DC605C3FF03119 -:104608007E1279A4FCBDD8F6BDDA8C0773098E2218 -:10461800318FBDDC70BDDEFD990DAC08BDDCAC0A88 -:10462800FD0F0FADDABC0AADD8BC08615907EFBC65 -:10463800AC08BDD8AC0ABDDAC9DC0004F6FD630ECF -:10464800C9DCFFFFF6FD780FADD8BF9EFCAF98FC24 -:10465800429EFCDD12AF9AFCBF9CFCAF98FCBF9A4F -:10466800FCAF9EFCBF98FCAF9AFC429CFCDC50AFB0 -:1046780098FC429AFCDE48AF5EFD4298FCDE404062 -:1046880062FD16DC1F4062FDA0DE168FA0FC4F62A3 -:10469800FDDE0EAF98FC22A2FC44691061C8FD1033 -:1046A80047F562FDAF98FC445146DC0BAF98FC24FB -:1046B8001027BF60FDEF1930F82ABF60FDEF1140E9 -:1046C80062FDFFDD03E6EF01F63462FD89610899BA -:1046D800AF9CFC429AFCDC1BAF9AFC4298FCDE13B0 -:1046E800AF98FC4260FDDE0BF5A0FCAF98FCBFA2C2 -:1046F800FCEF1140A0FCFFDD03E6EF01F634A0FC5F -:1047080089610899100CC6D7C72006FBF8FFA01FBF -:10471800FCD51FFCDF1CA020FCD520FCDF14A02149 -:10472800FCD521FCDF0CCF1FFCFFCF20FCFFCF21E5 -:10473800FCFF717BFA710A9E31929E02EFFA8E9805 -:10474800FD8C0F9C039F28FD8E949F63FD8E969F82 -:1047580064FD8E979F65FD8E939F26FD8E929F2701 -:10476800FDFDF14813BC04BDD8F6BDDA46DADF0317 -:10477800B146D8DF198C035C0391DF03E6EF01F63D -:10478800046D01313D120103B1BC046169038F66F8 -:10479800FD4E03DF12AF2AFD614904DE40AC04225E -:1047A8002AFDFD1248EF368C03318EB112D966FD11 -:1047B800F143DF1E8C035C0391DF03E6EF01F6048F -:1047C8006D01313D120103222AFD610904FD1248E1 -:1047D800EF0B8F66FD4E03DE04F6FD12488C039F37 -:1047E80066FDAC04BF2AFDD925FDF1010422F9BB01 -:1047F80014A944FFFFDF04E6B9EF0BAB14A944FE8C -:10480800FFDD03A9A1B91006C6D7C7161744A9002A -:1048180061C836A800A025FD4025FDA861C8F5257A -:10482800FDF925FDF3311CF67822F9B7F647DFE5E7 -:10483800C6D7C756A89666F0317E12F6B17822F927 -:1048480066D1DFF1F51FFCF520FCF521FCF525FD0F -:10485800C6D7716323D7C72004FBF8FFD918F9F12D -:10486800E7240000DD1123DD1C23DD2123DD2623C1 -:10487800DD2F23DD34EF3A8F25FD9F2CFDA018F99D -:10488800F963FDEF60A018F9F964FDEF58A018F975 -:10489800F965FDEF50A018F98F28FDFDA60F72EFFE -:1048A80044A018F9F926FDEF3CA018F9F927FDEF07 -:1048B80034F92CFDF3311C7922F9BB316223058BC5 -:1048C8009C03EF128C019C03D52CFDDF06CF2CFD39 -:1048D800A7EF03B02CFD718071672361DC61FB7168 -:1048E80061238C03721004C6D7C72008FBF8FF8E1B -:1048F800989C058E979C048E969C038E949C028EA1 -:10490800939C018E929B710B9E717AFA8C05FD8C9B -:104918000F9C058C04FD8C0F9C048C03FD8C0F9C54 -:10492800038C02FD8C0F9C028C04F0317E1279BE40 -:1049380022BC068C055C03D1DF098C044C0361C8DA -:104948006179068C03318EB1610906BC06313D12CE -:104958000103BC068C060E02708C071C00BC068F77 -:1049680024FC4E01DC0D8C014F24FCDC0B8F25FC54 -:104978004DDE05AC0612EF04AC06B1121008C6D71E -:10498800C7C3C12008FBF8FFF661490A61F861490D -:1049980008DF07F7340000ED254AE6BC04F6BC063C -:1049A800AC0ABC02AC08BBAC06614902AC0461F8B5 -:1049B800614900DE28AC04BDD8AC06BDDAE1FD1EB5 -:1049C8000FADDABC06ADD8BC04ABBDD8AC02BDDABD -:1049D800E1FD390FADDABC02ADD8BBEFCAAC06BCFD -:1049E80002AC04BBAC08BDD8AC0ABDDAAC04BDDC73 -:1049F800AC06FD9C0EAC04BDDCAC06FD0F0FE1FD62 -:104A0800390FADDABC06ADD8BC04AC06614902ACBE -:104A18000461F8614900DCC5AC0214AB12100CC685 -:014A2800D7B6 -:104A290061FC61FCC1C3C5C7520C929269D4FEC135 -:104A3900DFF88EFD708EFCC1717AFA401EF903DF32 -:104A49000630CA2BFD803CC09EFC609EFD34D4FE1E -:104A59005206C0B9A5A592DFF9C6C4C2C061FC61FE -:104A6900DF520C929269D4FEC1DFF88EFD708EFC84 -:104A7900C1717AFAC736410571A4C6DC51F532FD18 -:104A890071485005716050053124223671620771F1 -:104A990023228FE4FB5FECFBD1DF1B8FE5FB5FED8E -:104AA900FBD1DF128FE6FB5FEEFBD1DF098FE7FB5E -:104AB9005FEFFBD1DD0C31620702EFFA7163077119 -:104AC9006B27FD5A48FD6B33F518F9EDEC4BC736EA -:104AD90041057184C6DE0DF532FD71485005FD6B47 -:104AE90033EDEC4BC73641057194C6DE154032FDF6 -:104AF90003DD0C4032FD04DD064032FD0161F8F5AD -:104B090032FDD932FDF1E7240000DD0823DD13234E -:104B1900DD39EF6071405005E532FD71505005ED0A -:104B2900EC4B8F40059F19F99F1CF9D919F9FD2CF8 -:104B390037629F1BF94019F97FDD06CF32FD02EF7D -:104B490003F532FD71505005EDEC4BC73641057147 -:104B590094C6DE1CC736410571C4C6DE06CF32FDD8 -:104B690003EF11F532FD7148500571605005EF737F -:104B7900CF32FD044032FD03DF138F1BF99F40053F -:104B8900D91BF9C1D919F9FDAB37C0EF108F400511 -:104B990076C7D919F9FDF033C071505005D91CF900 -:104BA900F1242900DD2D240400DD28242200DD2341 -:104BB900241100DD0C240100DD19241E00DD14EF91 -:104BC9000C4019F960DF0CCF19F961EF06F518F9F6 -:104BD900A019F94032FD03DF0AD919F9FD2C376212 -:104BE9009F1BF9C09EFC609EFD34D4FE5206C0B9DD -:104BF900A5A592DFF961FCC1C3C5C7520C929269A0 -:104C0900D4FEC1DFF88EFD708EFCC1F616717AFAFA -:104C1900714AE5717BBD51405F0401D1DD05A7F6FD -:104C290047DFF3300400BF2401F6BF2A01300B0B24 -:104C3900BF2801FD0D03300B0FBF2801FD0D033007 -:104C49000F0FBF2801710AE6710321C09EFC609E07 -:104C5900FD34D4FE5206C0B9A5A592DFF9C6C4C277 -:104C6900C061FCC1C3C5C7520C929269D4FEC1DFB1 -:104C7900F88EFD708EFCC1717AFAD540FBDD0EEB22 -:104C89003EFB899E44A23EFBB040FBEF2B710AE636 -:104C9900300400BF2401F6BF2A01300B0BBF2801E5 -:104CA900FD0D03300B0FBF2801FD0D03300F0FBFA2 -:104CB9002801717320710321C09EFC609EFD34D4CC -:104CC900FE5206C0B9A5A592DFF9C6C4C2C061FCEF -:104CD90061EF520C929269D4FEC1DFF88EFD708E9D -:104CE900FCC12008FBF8FF71503002CEABACCC01FF -:104CF90000F6BC0231B2E20F617902F6614902DFC6 -:104D0900F371603002EF7E8E519B713BE28B5C0246 -:104D1900D1DD1D8B5C08D1DF0971503002CC010057 -:104D2900EFCF8C0770FD8638629E50CC0102EFC12F -:104D39008B5C03D1DF408E509C05715030028C0191 -:104D4900D1DF0E8C0570FDDC38629C07CC0101EFC8 -:104D5900318C014C02DF0671603002EF28CF34023A -:104D69005A716030028C0570C18C0770FD2D38C0F6 -:104D7900CF34024AEF0F8B5C01D1DD06716030023E -:104D8900EF03EDFA4C1008C09EFC609EFD34D4FE82 -:104D99005206C0B9A5A592DFF961FCC1C3C5C752C6 -:104DA9000C929269D4FEC1DFF88EFD708EFCC17140 -:104DB9000A9E31929E02EFFA8F0EFC4F96FFDF1981 -:104DC9008F0FFC4F97FFDF118F10FC4F98FFDF0902 -:104DD9005004C15011FDDA37C0710B9EC09EFC60B2 -:104DE9009EFD34D4FE5206C0B9A5A592DFF9C6C40A -:104DF900C2C061FCA05CFC61FCC1C3C5C7520C9276 -:104E09009269D4FEC1DFF88EFD708EFCC1C1FBF83A -:104E1900FF8D1F9C018E31318EE7240600DD0823AA -:104E2900DD0F23DD25EF45717AFA8C019F46FCEFF2 -:104E39003B717AFA4021F901DF078C019F45FCEFAC -:104E49002B51FF2E019F45FCEF22717AFA8C019FAD -:104E590002F98FE2FB5C01D1DF12401EF903DD0686 -:104E6900401EF904DF06302926FD803C4031FF0948 -:104E7900DE05A031FFEF197158F000713222405B55 -:104E8900FC02DF03F6EF05D95BFCF1A1609F5BFC37 -:104E9900710BE3C0C09EFC609EFD34D4FE5206C077 -:104EA900B9A5A592DFF9C6C4C2C061FC61FF520C65 -:104EB900929269D4FEC1DFF88EFD708EFCC1717AC1 -:104EC900FA8F14FC5C03D1DD19401EF903DD06409D -:104ED9001EF904DF0D36100571D4DE0630B53DFD2F -:104EE900803CC09EFC609EFD34D4FE5206C0B9A52C -:104EF900A592DFF961FC61FC61FC61FC61FC61FC6C -:104F090061FC61FC61FC61FC61FC61FC61FC61FCB0 -:104F190061FC61FC61FC61FC61FC61FC61FC61FCA0 -:0E4F290061FC61FC61FC61FC61FC61FC61FCEF -:0A4F380000060C12181E242A303661 -:104F42000016324864809612284460769208244003 -:104F5200FF000000555555554700DCFB00000000DE -:104F620049FC00000000F23E2939D822B12E42301D -:104F7200BF30013204407109BB4101000000983A80 -:0A4F8200F82AFF2330129900000006 -:084F8C00317503F7332312D73E -:0A4FF60031333A31333A323600000D +:1035B800ED2737D518F9DF09679FFDFBA018F9EF4C +:1035C800104018F905DE0AE918F9671835FDA01842 +:1035D800F9ED2737675C0F7266736218D4FBED2725 +:1035E800374018F964DE1F4018F901DF0667D1611A +:1035F800F85701E918F9671844FBA018F94018F9B9 +:103608000561C8716221675C7F70C117F1243000C1 +:10361800FD4633C0ED2737675C3F70C117F1243092 +:1036280000FD4633C0ED2737675C0770C117F124EA +:103638003000FD4633C0ED2737675C1F70C117F1B6 +:10364800243000FD4633C0ED27376770C117F124D9 +:103658003000FD4633C0ED2737CEABAC710A9E3142 +:10366800929E02EFFAD592FFDF05710B9EEFED6790 +:103678009E99710B9E9F0BFCED2737711222675C98 +:103688007F9F0CFCED2737711222675C3F9F0DFC72 +:10369800ED2737675C3F9F0EFCED2737675C1F9F60 +:1036A8000FFCEF7B307B3EFD7D3C679F14FCEF6F8A +:1036B80030363EFD7D3C679F15FCEF6330583EFD7C +:1036C8007D3C679F18FCEF57675C01D1DD51FD40D9 +:1036D80048EF4C402EFCC8DE46E92EFC671872FA0B +:1036E800A02EFCEF3A679F2EFCEF3467318E2472D0 +:1036F80000DF06306309FD7D3C679FF7FBEF208FF5 +:10370800FAFB617F5C10D161E8CF47FC03679FFA41 +:10371800FBEF0CEF0A664C5ADE05736718D4FBC63C +:10372800D7C716664C30DC094C37DE05FD2133EF70 +:1037380067664C02DF1F8FD6FB5C03728F35FC5C1B +:1037480003318E316D08616A08128F35FC5C803157 +:103758002A6162EF49664C3DDF0AAE90BF30FCF942 +:1037680030FCEF3A664C3EDF05F931FCEF30664C31 +:103778004FDF05FD6448EF26664C61DF09E92EFC42 +:103788000972FA72EF18664C7FDF0D300E41FD7D2D +:103798003C713AD5524AEF06667309D4FB72C6D714 +:1037A800C788061617F1241000240500DC07244CEE +:1037B80000DD17EF18717BFA17F104D4FB14896147 +:1037C8007F99717AFA712222EF03A02EFCC6D7C71F +:1037D800C1C1FBF8FF401EF903DD06401EF904DFF6 +:1037E8002F8C027309DCFB5E0AD1DF248C02318E38 +:1037F80004D4FB14896E0A99716207CC0100316206 +:1038080007086159018C01D1DFF4716307716B27D7 +:103818001004C6D7CF35FC03F533FCF537FCF53972 +:10382800FCD7C788061617F1E734020025DD3E23CA +:10383800DD1825DD1D23DD0523DD2CEF3C7152222B +:10384800679F38FCCF47FC03EF2F675C839F35FCED +:10385800EF27675C039F37FC675C034C0261F871D4 +:103868005221FD0132EF12679F39FCEF0C6791DF9F +:1038780008E0C15012FDD737C0C6D7C71617F1E701 +:10388800240000DD3A23DD23240300DD0C2402009C +:10389800DD2224F900DD2FEF3031020705308000EA +:1038A800EF01F6086F36FC7208EF248F33FCF5330E +:1038B800FC72EF1B8F41FC9F42FCF938FCEF107142 +:1038C80042235235EF09F2EF0666730932FC72C6DD +:1038D800D7C71617F1E7240000DD38241000DD1CD7 +:1038E80023DD1C23DD30240E00DD18241100DD1B30 +:1038F800240F00DD12243000DD15EF1EE2EF1D520B +:1039080002EF195204EF155206EF115205EF0D524E +:1039180007EF09F2EF065203EF0252FFC6D7C7318D +:103928003422417133228F46FC9FDCFB8F45FC9F7C +:10393800FBFB3642FDC7D945FCFD223B618A70611D +:103948008AFD673BC0D949FCF1312F609F48FC8F45 +:1039580044FC4F48FCDD0D7142228F48FC9F44FC1B +:10396800CF47FC034047FC05DE0A30A839FD7D3C03 +:10397800CF47FC6BB047FC7150F000CE300BCF172F +:103988000006CE3106FD0D03717A30710BE3710B21 +:10399800E7C6D78F48FC9F44FC8F48FC9FDDFBD7C8 +:1039A800C7401EF903DF06401EF904DF04F2ED9D4F +:1039B8003A8FFAFB5C10D1DD0C8F48FC9F4DFC71EF +:1039C80048FAFBEF61314422247143227163228F4C +:1039D800FAFB5C04D1DD088FF9FB9F4EFCEF068FE4 +:1039E80048FC9F4EFC8F4EFC9F4DFCEF3931542212 +:1039F80023715322716222D538FCDF05F54FFCEFA5 +:103A08000B8F38FC5002D6A1609F4FFC8F4FFC9F54 +:103A18004DFCEF12316422088F4FFC9F4DFCEF06DE +:103A28008F4EFC9F4DFC8F4DFC9FDDFBD54DFCDF81 +:103A380005F538FCEF1A404DFC05DE06CF38FC02D0 +:103A4800EF0ED94DFCF11231FE03311F609F38FC97 +:103A58008F51FC4F38FCDD23571F8F38FC9F51FCDA +:103A68005600664C08DE10730984224F38FCDC04CB +:103A78006677EF0386EFEB679F41FC8FFAFB5C01EB +:103A8800D1DD03F2EF0FE94DFC09442270C1501358 +:103A9800FDB705C0F2C6D7C7168B728C01614ADE26 +:103AA800248B728C02614ADE188C01728C02614A86 +:103AB800DE068C01318EEF048C02318E087208EF1D +:103AC800268B72EF228B728C02614ADE048B72EFB6 +:103AD800168C01728C026142DE068C01318EEF0475 +:103AE8008C02318E087208C6D7C716710AE7710BA7 +:103AF800E37150F000CE300BCF170006669E31FD03 +:103B08000D03717A30710BE33182E302EFFA8D1FF6 +:103B18007158F000710BE772C6D7C7C1C1FBF8FF37 +:103B28008F2CFC4E02DC03F2EF318C024F2DFCDCB3 +:103B38000452FFEF268C022F2CFC706131318D125C +:103B48008F2DFC2F2CFC70613133BDD813FDE60D91 +:103B5800BB440001DC03F690BB8B721004C6D7C7C8 +:103B6800C1C1FBF8FFAC0A14A91489708C02612842 +:103B7800706131FD924F1344030071FEDC24AC0ADE +:103B8800148A04819A04AC0A148A044C11DC11A921 +:103B9800148C0299AC0A14CA0200AC0A14CA0310A5 +:103BA800EF74AC0A14CA0400AC0A14A914894E02B2 +:103BB800DE0AAC0A148A02819A02EF13AC0A14A92D +:103BC80014894E0261D308AC0A148A02919A02AC95 +:103BD8000A148A03919A03D1DF3CAC0A148A024C76 +:103BE80010DF10A91489318EA112AC0A14A914622D +:103BF80099EF17AC0A148A024CF0DF0EA914893128 +:103C08008EB112AC0A14A9146299AC0A14CA020043 +:103C1800AC0A14CA03101004C6D7ED683C717BFACD +:103C2800C7D55CFC61F8317422307174227111239C +:103C3800717322CEABACD55CFC61E8B05CFC717AE8 +:103C4800FA5600664C0ADD1272F3311C7948FDCE33 +:103C5800FC0061CAFDC73C86EFE9717AFAF2C6D763 +:103C6800C75600664C10DE0BF0317E12F6785EFC0B +:103C780086EFF0C6D7C7C1C1FBF8FFCC01008C01A5 +:103C88004C10DE36717BFA8C01F0317E045EFC1438 +:103C9800A96168DF09AC02B9717AFAF2EF1D8C01EB +:103CA800F0317E12795EFC614902DF06717AFAE230 +:103CB800EF09717AFA615901EFC4E21004C6D7C757 +:103CC8002004FBF8FFF6425EFC61F8EDAC3D717B29 +:103CD800FA9C038C034C10DE3C8C03F0317E045EAE +:103CE800FC14A96168DF05717AFAEF29717AFA8CF8 +:103CF8000372F3311C795EFCCEFC0061CA629C023F +:103D0800D1DF0A8C03F0317E12E6785EFC717BFA13 +:103D1800615903EFBECC0200CC01018C02F0317E68 +:103D2800045EFC14A96168DD7B8C02F0317E127997 +:103D38005EFCE743DF688C014C10DE628C01F031D9 +:103D48007E12795EFCE743DD50717BFA8C01F0311D +:103D58007E045EFC14A96168DF1B616901717BFA4E +:103D68008C01F0317E12F6785EFC717AFA8C024E84 +:103D780001DCE7EF2F8C01F0317E045EFC14A91200 +:103D88008C02F0317E33785EFC8C01F0317E12E6D5 +:103D9800785EFC615902717AFA615901EF986159AC +:103DA80002ED233D00F21004C6D7C72006FBF8FF3A +:103DB8003419FCC55006C150A8C15030FD5B031032 +:103DC80006D2DD1DA07EFC407EFC08DE03E2EF5A31 +:103DD8003414FC895CFC99FD7B3E7110E2FBF2EF28 +:103DE80049F57EFC8F14FC5C01D1DD26401EF903E9 +:103DF800DF205010C180FDD737C0C736100571D4F9 +:103E0800C6DE0F17C15006C150A8C15030FD5B0374 +:103E18001006401EF901DD11401EF905DD0B8F1457 +:103E2800FC5C02D161E8FD3D45F21006C6D7D91504 +:103E3800FCC15030FD3103C0629F18FC7130E5FBB6 +:103E48008FEDFB5C08D1DF06716307716B27F2D732 +:103E5800D918FCC1D917FCC15030FDCD031004712D +:103E680030E5FB8FEDFB5C08D1DF06716307716BF2 +:103E780027F2D7C7200AFBF8FF500FC15030FD3199 +:103E880003C04041FB02DF077110E2FBF2EF5471FF +:103E980018E2FBCC0700CC0812CC09808F14FC5C1C +:103EA80003D1DF08717AD5CC0607EF06717BD5CC34 +:103EB800062F17040600C15004C150A0C15030FDA0 +:103EC80003041006C736100571D4C6DE15401EF966 +:103ED80003DF0F17C15006C150A8C15030FD5B0366 +:103EE8001006F2100AC6D7C7401EF902DF07F6BF50 +:103EF80082FCBF88FCB05CFDD55CFD61E8ED0A4042 +:103F0800CF5CFD048F1EF9318FE723DD0B240200FF +:103F180024030061C8ED0A403014004282FCDF0A25 +:103F2800E0C15010FDD737C0EF1A3077014282FC4C +:103F3800DF125002C15010FDD737C08FF8FB501068 +:103F4800D6BF88FCF64288FCDD0DB288FCE64288C4 +:103F5800FC61F8712020F931340709712323F6BF79 +:103F680082FCEF1731242306F6BF82FCEF0DA282F4 +:103F7800FCF64282FCDF04B1BF82FC8F21F9318F4D +:103F8800E7240000DD0623DD0D23DF12361005715E +:103F9800C4713123EF0B710402713123EF037132C5 +:103FA800233132231A4084FC0361D8A084FC408466 +:103FB800FC02DF0E5004C15010FDD737C0EF03F5E7 +:103FC80084FC3134231A4086FC0361D8A086FC4067 +:103FD80086FC02DF0E5008C15010FDD737C0EF0332 +:103FE800F586FC314207184085FC0361D8A085FCA2 +:103FF8004085FC02DF0C5010C1FDD737C0EF03F538 +:1040080085FCC6D7C736100571D4DE0730B23DFD32 +:104018007D3CD2401EF903DF413122070630CA2B0E +:10402800FD7D3C3144230C7143235080C15012FD67 +:10403800D737C0D58AFCDD05B08AFCEF1DCF8AFCD6 +:10404800068F35FC5C01D1DD118F41FC4F42FCDD50 +:10405800095040C15012FDD737C0401EF903DD0595 +:10406800F6BD1AEF25D500FCDF09F6461ADD1BB6AA +:104078001AEF17D9FCFBF1461ADD0FD9FCFB12AD7C +:104088001A43DE04A61AEF02B61AC6D7C78FF4FB86 +:1040980076F5F4FB5C10D161E8715223665C0FD1B0 +:1040A800DD61665C01D1DD05F51EF9EF56665C023F +:1040B800D1DD15E0C15003C15084FDCD031004715A +:1040C8001300711B20710303665C08D1DD057103C1 +:1040D80003EF17665C04D1DD11711300711B20D545 +:1040E80035FC61F8710303F535FC5005FDA3027139 +:1040F80002035003C1C15084FDCD031004711A207E +:10410800FDC72CF2C6D7C7364105718461D8EDB01A +:10411800413641057194DE0771405005CEABAC3194 +:10412800B2D104E2EDBF41713BD1CEABAC4018F93E +:1041380009DE75D518F9DF618F20F93133088F2131 +:10414800F99F4005EF04CF400504F0C15084FD31CC +:1041580003C0629F8EFC8F32FD9F8FFC3690FCC798 +:104168005002C15008C1506CFD5B0310068F8CFCD7 +:104178009F92FC8F02F99F93FC713420E661301204 +:1041880071042061DC31196162629F94FC8F20F90F +:104198003169317A9F95FCEF09E918F9098DFC9F7F +:1041A8004005A018F9E2EF0F7160500571485005FD +:1041B800713BD5F518F9F2C6D7C78F1EF9318FE7CD +:1041C80024000061F8ED924323DD1B2361F8ED998B +:1041D800422361F8ED17432361F8ED60432361F84A +:1041E800ED2C44ED9243D51FF9DF2BF64282FCDD1E +:1041F80005F55EFDEF03A05EFD405EFD65DC09F59B +:104208001EF9717222EDAC44AF82FC440A0061D8F9 +:10421800EDAC44E51FF9712223F55EFDF5F7FBFDD2 +:104228002805714320FDC0234021F903DF0971727D +:1042380022F51EF9EDAC44FDE72640E1FB9BDE09C3 +:10424800717222F51EF9EDAC44714A2771401105CF +:1042580071301105713A22715A22711A2EFDFF2A06 +:10426800D2DD09717222F51EF9EDAC4471103500EA +:10427800CF37001D71401205401FF901DF05F5FD1C +:10428800FBEF04CFFDFB03CF1EF902FDDD2AEDACE9 +:1042980044FDF22CFD522D714A9DFD1C38FDBF33A3 +:1042A800F537FF712BE0F51FF9717222CBE43FEF70 +:1042B800CBE6F6F0FD2805713BD48F20F9310530A7 +:1042C8005004C15084FD3103C0625C03318E315DFE +:1042D80034E3FB896168995002C15084FD3103C001 +:1042E800D2DD067170E3FBEF047178E3FBFDC023B8 +:1042F800FD092E710820F9CF1EF9038FD6FB5C0249 +:10430800D1DD095080C15010FDD737C0EDAC44FD58 +:10431800AE4431A4E020712BE031020C05FD2845A4 +:10432800EF145027C15005C15084FDCD031004CFB0 +:104338001EF9047172223154230BA098FCD598FC05 +:1043480061F8FD2845FD1B458F20F93145073104EB +:104358000703F51EF9EDAC44FDAE4431020C18F02C +:10436800C15005C15084FDCD0310045005FDA302C2 +:10437800FD2845CF1EF903FD1B458F20F931450760 +:1043880031040703F51EF9EDAC44CFFDFB03F5FE40 +:10439800FBF500FC713221F6426CFF61E8EDAC449C +:1043A800712820F9F514FCFD7B3EFD992EFD492D61 +:1043B800FDA72D714B9DF5E4FBF5E5FBF5E6FBF557 +:1043C800E7FB31042102EFFACE3708CBE4BFFFCB7D +:1043D800E6FFF1CED4FFCF37000971481205F6BECB +:1043E800E0BEE2BED0716A27FD7C2B714307714B9A +:1043F8002771481005714811057138100571381179 +:1044080005713302713B22715302715B2271130EE5 +:10441800711B2EFD9105F55EFDCF1EF90571222356 +:10442800F6BF82FC3102072CFDC023AF82FC440A90 +:1044380000DC06E51FF9E51EF9D521F961E8FD91D3 +:10444800058F20F931455D502EFDA302E51FF9E5E2 +:104458001EF9EF50D50BF9DF4BF51FF9FD9105FD5E +:10446800852371730171320431120502EFFA714329 +:104478000271032071422031949E02EFFA712AE7FB +:10448800CEA409F5F30061FD31040703712323E588 +:10449800F300CEA408712BE7E51EF98F20F931450A +:1044A80003F51EF9C6D7D599FCDF1E310200195055 +:1044B80003C15084FD3103C0625C01D1DF07F51EE2 +:1044C800F9717222D7E599FCD74099FCF0DF0831E1 +:1044D80004003FF599FCD74099FCC8DF0BF51EF99D +:1044E800717222CF99FCF0D731020004A099FCD751 +:1044F800F0C15004C15084FDCD0310048FE3FB5C70 +:104508009F9FE3FB7110F4FB309440FD7D3CCF99F5 +:10451800FCF0D78F20F9312506F51EF9717222D7E4 +:10452800715323F598FC717207FD0D03717307D75A +:10453800FDFE05F2D7C7200CFBF8FF8F1AFCF0F937 +:1045480019FCF303FD924F13BC048F1CFCF0F91BFC +:10455800FCF303FD924F13BC028F1EFCF0F91DFC07 +:10456800F303FD924F13BBAC04BDD8F6BDDAAC041F +:10457800311EBDDCF6BDDEFD990DADD8BDDCADDA72 +:10458800BDDEAC02BDD8F6BDDAAC02311EDADCC342 +:10459800DADEC3BDDCF6BDDEFD990DC0BDDEC0BDF3 +:1045A800DCADDEFD0F0FADD8BDDCADDABDDEABBDD9 +:1045B800D8F6BDDAAB311EDADCC3DADEC3BDDCF611 +:1045C800BDDEFD990DC0BDDEC0BDDCADDEFD0F0F4B +:1045D800DADAADD8FD8E49C3C58F26FD5C3FF031D0 +:1045E8007E04A6FC14C2C0B9A026FDF6BC08BC0A0D +:1045F8009C078C074C2EDD3E8F26FD0E0770F1615F +:10460800DC605C3FF0317E1279A6FCBDD8F6BDDADD +:104618008C0773098E22318FBDDC70BDDEFD990DCC +:10462800AC08BDDCAC0AFD0F0FADDABC0AADD8BCD6 +:1046380008615907EFBCAC08BDD8AC0ABDDAC9DCC3 +:104648000004F6FD630EC9DCFFFFF6FD780FADD858 +:10465800BFA0FCAF9AFC42A0FCDD12AF9CFCBF9E41 +:10466800FCAF9AFCBF9CFCAFA0FCBF9AFCAF9CFCC3 +:10467800429EFCDC50AF9AFC429CFCDE48AF60FDD9 +:10468800429AFCDE404064FD16DC1F4064FDA0DE5B +:10469800168FA2FC4F64FDDE0EAF9AFC22A4FC44E8 +:1046A800691061C8FD1647F564FDAF9AFC44514690 +:1046B800DC0BAF9AFC241027BF62FDEF1930F82AF3 +:1046C800BF62FDEF114064FDFFDD03E6EF01F63444 +:1046D80064FD89610899AF9EFC429CFCDC1BAF9C81 +:1046E800FC429AFCDE13AF9AFC4262FDDE0BF5A297 +:1046F800FCAF9AFCBFA4FCEF1140A2FCFFDD03E66F +:10470800EF01F634A2FC89610899100CC6D7C720BE +:1047180006FBF8FFA01FFCD51FFCDF1CA020FCD562 +:1047280020FCDF14A021FCD521FCDF0CCF1FFCFFEF +:10473800CF20FCFFCF21FCFF717BFA710A9E3192DA +:104748009E02EFFA8E98FD8C0F9C039F2AFD8E9493 +:104758009F65FD8E969F66FD8E979F67FD8E939F42 +:1047680028FD8E929F29FDFDF74813BC04BDD8F69D +:10477800BDDA46DADF03B146D8DF198C035C039152 +:10478800DF03E6EF01F6046D01313D120103B1BC10 +:10479800046169038F68FD4E03DF12AF2CFD614988 +:1047A80004DE40AC04222CFDFD1848EF368C0331A2 +:1047B8008EB112D968FDF143DF1E8C035C0391DFD3 +:1047C80003E6EF01F6046D01313D120103222CFDD1 +:1047D800610904FD1848EF0B8F68FD4E03DE04F6EF +:1047E800FD18488C039F68FDAC04BF2CFDD927FD3C +:1047F800F1010422F9BB14A944FFFFDF04E6B9EF75 +:104808000BAB14A944FEFFDD03A9A1B91006C6D756 +:10481800C7161744A90061C836A800A027FD40277D +:10482800FDA861C8F527FDF927FDF3311CF67822AC +:10483800F9B7F647DFE5C6D7C756A89666F0317EC2 +:1048480012F6B17822F966D1DFF1F51FFCF520FCEC +:10485800F521FCF527FDC6D7716323D7C72004FBD4 +:10486800F8FFD918F9F1E7240000DD1123DD1C2336 +:10487800DD2123DD2623DD2F23DD34EF3A8F27FDCD +:104888009F2EFDA018F9F965FDEF60A018F9F966EB +:10489800FDEF58A018F9F967FDEF50A018F98F2A15 +:1048A800FDFDA60F72EF44A018F9F928FDEF3CA012 +:1048B80018F9F929FDEF34F92EFDF3311C7922F9A5 +:1048C800BB316223058B9C03EF128C019C03D52E10 +:1048D800FDDF06CF2EFDA7EF03B02EFD71807167B7 +:1048E8002361DC61FB7161238C03721004C6D7C796 +:1048F8002008FBF8FF8E989C058E979C048E969C4A +:10490800038E949C028E939C018E929B710B9E71D8 +:104918007AFA8C05FD8C0F9C058C04FD8C0F9C0489 +:104928008C03FD8C0F9C038C02FD8C0F9C028C0465 +:10493800F0317E1279BE22BC068C055C03D1DF09FA +:104948008C044C0361C86179068C03318EB161090E +:1049580006BC06313D120103BC068C060E02708CA3 +:10496800071C00BC068F24FC4E01DC0D8C014F2473 +:10497800FCDC0B8F25FC4DDE05AC0612EF04AC0603 +:10498800B1121008C6D7C7C3C12008FBF8FFF661EB +:10499800490A61F8614908DF07F7340000ED2B4A3E +:1049A800E6BC04F6BC06AC0ABC02AC08BBAC0661AB +:1049B8004902AC0461F8614900DE28AC04BDD8ACFA +:1049C80006BDDAE1FD1E0FADDABC06ADD8BC04ABFE +:1049D800BDD8AC02BDDAE1FD390FADDABC02ADD805 +:1049E800BBEFCAAC06BC02AC04BBAC08BDD8AC0A71 +:1049F800BDDAAC04BDDCAC06FD9C0EAC04BDDCAC81 +:104A080006FD0F0FE1FD390FADDABC06ADD8BC04C9 +:104A1800AC06614902AC0461F8614900DCC5AC022E +:074A280014AB12100CC6D7FD +:104A2F0061FC61FCC1C3C5C7520C929269D4FEC12F +:104A3F00DFF88EFD708EFCC1717AFA401EF903DF2C +:104A4F000630CA2BFD7D3CC09EFC609EFD34D4FE1B +:104A5F005206C0B9A5A592DFF9C6C4C2C061FC61F8 +:104A6F00DF520C929269D4FEC1DFF88EFD708EFC7E +:104A7F00C1717AFAC736410571A4C6DC51F534FD10 +:104A8F0071485005716050053124223671620771EB +:104A9F0023228FE4FB5FECFBD1DF1B8FE5FB5FED88 +:104AAF00FBD1DF128FE6FB5FEEFBD1DF098FE7FB58 +:104ABF005FEFFBD1DD0C31620702EFFA7163077113 +:104ACF006B27FD6048FD6B33F518F9EDF24BC736D8 +:104ADF0041057184C6DE0DF534FD71485005FD6B3F +:104AEF0033EDF24BC73641057194C6DE154034FDE8 +:104AFF0003DD0C4034FD04DD064034FD0161F8F5A3 +:104B0F0034FDD934FDF1E7240000DD0823DD132344 +:104B1F00DD39EF6071405005E534FD71505005ED02 +:104B2F00F24B8F40059F19F99F1CF9D919F9FD29EF +:104B3F0037629F1BF94019F97FDD06CF34FD02EF75 +:104B4F0003F534FD71505005EDF24BC73641057139 +:104B5F0094C6DE1CC736410571C4C6DE06CF34FDD0 +:104B6F0003EF11F534FD7148500571605005EF7377 +:104B7F00CF34FD044034FD03DF138F1BF99F400535 +:104B8F00D91BF9C1D919F9FDA837C0EF108F40050E +:104B9F0076C7D919F9FDF033C071505005D91CF9FA +:104BAF00F1242900DD2D240400DD28242200DD233B +:104BBF00241100DD0C240100DD19241E00DD14EF8B +:104BCF000C4019F960DF0CCF19F961EF06F518F9F0 +:104BDF00A019F94034FD03DF0AD919F9FD2937620D +:104BEF009F1BF9C09EFC609EFD34D4FE5206C0B9D7 +:104BFF00A5A592DFF961FCC1C3C5C7520C9292699A +:104C0F00D4FEC1DFF88EFD708EFCC1F616717AFAF4 +:104C1F00714AE5717BBD51405F0401D1DD05A7F6F7 +:104C2F0047DFF3300400BF2401F6BF2A01300B0B1E +:104C3F00BF2801FD0D03300B0FBF2801FD0D033001 +:104C4F000F0FBF2801710AE6710321C09EFC609E01 +:104C5F00FD34D4FE5206C0B9A5A592DFF9C6C4C271 +:104C6F00C061FCC1C3C5C7520C929269D4FEC1DFAB +:104C7F00F88EFD708EFCC1717AFAD540FBDD0EEB1C +:104C8F003EFB899E44A23EFBB040FBEF2B710AE630 +:104C9F00300400BF2401F6BF2A01300B0BBF2801DF +:104CAF00FD0D03300B0FBF2801FD0D03300F0FBF9C +:104CBF002801717320710321C09EFC609EFD34D4C6 +:104CCF00FE5206C0B9A5A592DFF9C6C4C2C061FCE9 +:104CDF0061EF520C929269D4FEC1DFF88EFD708E97 +:104CEF00FCC12008FBF8FF71503002CEABACCC01F9 +:104CFF0000F6BC0231B2E20F617902F6614902DFC0 +:104D0F00F371603002EF7E8E519B713BE28B5C0240 +:104D1F00D1DD1D8B5C08D1DF0971503002CC010051 +:104D2F00EFCF8C0770FD8338629E50CC0102EFC12C +:104D3F008B5C03D1DF408E509C05715030028C018B +:104D4F00D1DF0E8C0570FDD938629C07CC0101EFC5 +:104D5F00318C014C02DF0671603002EF28CF340234 +:104D6F005A716030028C0570C18C0770FD2A38C0F3 +:104D7F00CF34024AEF0F8B5C01D1DD067160300238 +:104D8F00EF03ED004D1008C09EFC609EFD34D4FE75 +:104D9F005206C0B9A5A592DFF961FCC1C3C5C752C0 +:104DAF000C929269D4FEC1DFF88EFD708EFCC1713A +:104DBF000A9E31929E02EFFA8F0EFC4F96FFDF197B +:104DCF008F0FFC4F97FFDF118F10FC4F98FFDF09FC +:104DDF005004C15011FDD737C0710B9EC09EFC60AF +:104DEF009EFD34D4FE5206C0B9A5A592DFF9C6C404 +:104DFF00C2C061FCA05CFC61FCC1C3C5C7520C9270 +:104E0F009269D4FEC1DFF88EFD708EFCC1C1FBF834 +:104E1F00FF8D1F9C018E31318EE7240600DD0823A4 +:104E2F00DD0F23DD25EF45717AFA8C019F46FCEFEC +:104E3F003B717AFA4021F901DF078C019F45FCEFA6 +:104E4F002B51FF2E019F45FCEF22717AFA8C019FA7 +:104E5F0002F98FE2FB5C01D1DF12401EF903DD0680 +:104E6F00401EF904DF06302926FD7D3C4031FF0945 +:104E7F00DE05A031FFEF197158F000713222405B4F +:104E8F00FC02DF03F6EF05D95BFCF1A1609F5BFC31 +:104E9F00710BE3C0C09EFC609EFD34D4FE5206C071 +:104EAF00B9A5A592DFF9C6C4C2C061FC61FF520C5F +:104EBF00929269D4FEC1DFF88EFD708EFCC1717ABB +:104ECF00FA8F14FC5C03D1DD19401EF903DD064097 +:104EDF001EF904DF0D36100571D4DE0630B23DFD2C +:104EEF007D3CC09EFC609EFD34D4FE5206C0B9A529 +:104EFF00A592DFF961FC61FC61FC61FC61FC61FC66 +:104F0F0061FC61FC61FC61FC61FC61FC61FC61FCAA +:104F1F0061FC61FC61FC61FC61FC61FC61FC61FC9A +:0E4F2F0061FC61FC61FC61FC61FC61FC61FCE9 +:0A4F3E0000060C12181E242A30365B +:104F480000163248648096122844607692082440FD +:104F5800FF000000555555554700DCFB00000000D8 +:104F680049FC00000000EF3E2639D822B12E42301D +:104F7800BF3001320C407109C14101000000983A6C +:0A4F8800F82AFF2330129900000000 +:084F9200317503F7332312D738 +:0A4FF60032313A32393A3534000006 :00000001FF  \ No newline at end of file diff --git a/branches/1.11(sdk_0_14)/bsr.lmf b/branches/1.11(sdk_0_14)/bsr.lmf index 47cb30e..efe93e0 100644 Binary files a/branches/1.11(sdk_0_14)/bsr.lmf and b/branches/1.11(sdk_0_14)/bsr.lmf differ diff --git a/branches/1.11(sdk_0_14)/bsr_k0r.map b/branches/1.11(sdk_0_14)/bsr_k0r.map index c569adb..82179a0 100644 --- a/branches/1.11(sdk_0_14)/bsr_k0r.map +++ b/branches/1.11(sdk_0_14)/bsr_k0r.map @@ -1,20 +1,20 @@ -78K0R Linker W1.33 Date:29 Oct 2010 Page: 1 +78K0R Linker W1.33 Date: 7 Dec 2010 Page: 1 -Command: -yd:\program files\nec electronics tools\dev -_msgoff -obsr.l - mf ..\..\..\..\..\Program Files\NEC Electronics Tools\CC78K0R - \W2.12\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -pbsr_k0r.m - ap -nkd -gb7EFBFFh -bC:\Program Files\NEC Electronics Tools\F - SL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0rm. - lib -bcl0rmf.lib -iD:\Program Files\NEC Electronics Tools\CC7 - 8K0R\W2.12\lib78k0r -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c - _ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel l - ed.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel ac - cero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel t - ask_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.r - el +Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - + obsr.lmf ..\..\..\..\Program Files (x86)\NEC Electronics Tool + s\CC78K0R\W2.13\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -p + bsr_k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Elec + tronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bc + l0rm.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronic + s Tools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w0 loader.rel + pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2 + c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel r + enge.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 ta + sk_status.rel Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map @@ -24,8 +24,8 @@ Direc-file:bsr_mcu.dr *** Link information *** 64 output segment(s) - 3ECBH byte(s) real data - 5409 symbol(s) defined + 3ED1H byte(s) real data + 5414 symbol(s) defined *** Memory map *** @@ -186,235 +186,235 @@ Direc-file:bsr_mcu.dr @@CNST ini_VECT 022D8H 00000H @@CNST task_status 022D8H 00000H - ROM_CODE 022D8H 02751H CSEG + ROM_CODE 022D8H 02757H CSEG ROM_CODE pm 022D8H 00A1AH ROM_CODE i2c_ctr 02CF2H 00060H ROM_CODE i2c_twl 02D52H 0005EH ROM_CODE led 02DB0H 0051AH ROM_CODE rtc 032CAH 000E0H - ROM_CODE vreg_ctr 033AAH 00475H - ROM_CODE vreg_twl 0381FH 0010AH - ROM_CODE adc 03929H 002FCH - ROM_CODE renge 03C25H 00190H - ROM_CODE accero 03DB5H 0013DH - ROM_CODE sw 03EF2H 00112H + ROM_CODE vreg_ctr 033AAH 00472H + ROM_CODE vreg_twl 0381CH 0010AH + ROM_CODE adc 03926H 002FCH + ROM_CODE renge 03C22H 00190H + ROM_CODE accero 03DB2H 0013DH + ROM_CODE sw 03EEFH 0011DH ROM_CODE task_misc - 04004H 001B7H - ROM_CODE task_sys 041BBH 0037CH + 0400CH 001B5H + ROM_CODE task_sys 041C1H 0037CH ROM_CODE pedo_alg_thre_det2 - 04537H 004F2H - @@BASE 04A29H 0050EH CSEG BASE - @@BASE loader 04A29H 00000H - @@BASE pm 04A29H 0003FH - @@BASE i2c_ctr 04A68H 00198H - @@BASE main 04C00H 00000H - @@BASE magic 04C00H 00000H - @@BASE WDT 04C00H 00000H - @@BASE i2c_mcu 04C00H 000D9H - @@BASE i2c_twl 04CD9H 000CBH - @@BASE led 04DA4H 00000H - @@BASE rtc 04DA4H 0005EH - @@BASE vreg_ctr 04E02H 00000H - @@BASE vreg_twl 04E02H 00000H - @@BASE adc 04E02H 000B3H - @@BASE renge 04EB5H 00000H - @@BASE accero 04EB5H 0004AH + 0453DH 004F2H + @@BASE 04A2FH 0050EH CSEG BASE + @@BASE loader 04A2FH 00000H + @@BASE pm 04A2FH 0003FH + @@BASE i2c_ctr 04A6EH 00198H + @@BASE main 04C06H 00000H + @@BASE magic 04C06H 00000H + @@BASE WDT 04C06H 00000H + @@BASE i2c_mcu 04C06H 000D9H + @@BASE i2c_twl 04CDFH 000CBH + @@BASE led 04DAAH 00000H + @@BASE rtc 04DAAH 0005EH + @@BASE vreg_ctr 04E08H 00000H + @@BASE vreg_twl 04E08H 00000H + @@BASE adc 04E08H 000B3H + @@BASE renge 04EBBH 00000H + @@BASE accero 04EBBH 0004AH @@BASE self_flash - 04EFFH 00000H - @@BASE sw 04EFFH 00000H + 04F05H 00000H + @@BASE sw 04F05H 00000H @@BASE task_debug - 04EFFH 00000H + 04F05H 00000H @@BASE task_misc - 04EFFH 00000H - @@BASE task_sys 04EFFH 00000H + 04F05H 00000H + @@BASE task_sys 04F05H 00000H @@BASE pedo_alg_thre_det2 - 04EFFH 00000H - @@BASE ini_VECT 04EFFH 00038H + 04F05H 00000H + @@BASE ini_VECT 04F05H 00038H @@BASE task_status - 04F37H 00000H - @@CNSTL 04F37H 00000H CSEG PAGE64KP - @@CNSTL @cstart 04F37H 00000H - @@CNSTL 04F37H 00000H CSEG PAGE64KP - @@CNSTL pm 04F37H 00000H - @@CNSTL 04F37H 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04F37H 00000H - @@CNSTL 04F37H 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04F37H 00000H - @@CNSTL 04F37H 00000H CSEG PAGE64KP - @@CNSTL led 04F37H 00000H - @@CNSTL 04F37H 00000H CSEG PAGE64KP - @@CNSTL rtc 04F37H 00000H - @@CNSTL 04F37H 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04F37H 00000H - @@CNSTL 04F37H 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04F37H 00000H - @@CNSTL 04F37H 00000H CSEG PAGE64KP - @@CNSTL adc 04F37H 00000H - @@CNSTL 04F37H 00000H CSEG PAGE64KP - @@CNSTL renge 04F37H 00000H - @@CNSTL 04F37H 00000H CSEG PAGE64KP - @@CNSTL accero 04F37H 00000H - @@CNSTL 04F37H 00000H CSEG PAGE64KP - @@CNSTL sw 04F37H 00000H - @@CNSTL 04F37H 00000H CSEG PAGE64KP + 04F3DH 00000H + @@CNSTL 04F3DH 00000H CSEG PAGE64KP + @@CNSTL @cstart 04F3DH 00000H + @@CNSTL 04F3DH 00000H CSEG PAGE64KP + @@CNSTL pm 04F3DH 00000H + @@CNSTL 04F3DH 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04F3DH 00000H + @@CNSTL 04F3DH 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04F3DH 00000H + @@CNSTL 04F3DH 00000H CSEG PAGE64KP + @@CNSTL led 04F3DH 00000H + @@CNSTL 04F3DH 00000H CSEG PAGE64KP + @@CNSTL rtc 04F3DH 00000H + @@CNSTL 04F3DH 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04F3DH 00000H + @@CNSTL 04F3DH 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04F3DH 00000H + @@CNSTL 04F3DH 00000H CSEG PAGE64KP + @@CNSTL adc 04F3DH 00000H + @@CNSTL 04F3DH 00000H CSEG PAGE64KP + @@CNSTL renge 04F3DH 00000H + @@CNSTL 04F3DH 00000H CSEG PAGE64KP + @@CNSTL accero 04F3DH 00000H + @@CNSTL 04F3DH 00000H CSEG PAGE64KP + @@CNSTL sw 04F3DH 00000H + @@CNSTL 04F3DH 00000H CSEG PAGE64KP @@CNSTL task_misc - 04F37H 00000H - @@CNSTL 04F37H 00000H CSEG PAGE64KP - @@CNSTL task_sys 04F37H 00000H - @@CNSTL 04F37H 00000H CSEG PAGE64KP + 04F3DH 00000H + @@CNSTL 04F3DH 00000H CSEG PAGE64KP + @@CNSTL task_sys 04F3DH 00000H + @@CNSTL 04F3DH 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04F37H 00000H - @@CNSTL 04F37H 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04F37H 00000H - @@R_INIS 04F37H 00000H CSEG UNIT64KP - @@R_INIS @cstart 04F37H 00000H - @@R_INIS loader 04F37H 00000H - @@R_INIS pm 04F37H 00000H - @@R_INIS i2c_ctr 04F37H 00000H - @@R_INIS main 04F37H 00000H - @@R_INIS magic 04F37H 00000H - @@R_INIS WDT 04F37H 00000H - @@R_INIS i2c_mcu 04F37H 00000H - @@R_INIS i2c_twl 04F37H 00000H - @@R_INIS led 04F37H 00000H - @@R_INIS rtc 04F37H 00000H - @@R_INIS vreg_ctr 04F37H 00000H - @@R_INIS vreg_twl 04F37H 00000H - @@R_INIS adc 04F37H 00000H - @@R_INIS renge 04F37H 00000H - @@R_INIS accero 04F37H 00000H + 04F3DH 00000H + @@CNSTL 04F3DH 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04F3DH 00000H + @@R_INIS 04F3DH 00000H CSEG UNIT64KP + @@R_INIS @cstart 04F3DH 00000H + @@R_INIS loader 04F3DH 00000H + @@R_INIS pm 04F3DH 00000H + @@R_INIS i2c_ctr 04F3DH 00000H + @@R_INIS main 04F3DH 00000H + @@R_INIS magic 04F3DH 00000H + @@R_INIS WDT 04F3DH 00000H + @@R_INIS i2c_mcu 04F3DH 00000H + @@R_INIS i2c_twl 04F3DH 00000H + @@R_INIS led 04F3DH 00000H + @@R_INIS rtc 04F3DH 00000H + @@R_INIS vreg_ctr 04F3DH 00000H + @@R_INIS vreg_twl 04F3DH 00000H + @@R_INIS adc 04F3DH 00000H + @@R_INIS renge 04F3DH 00000H + @@R_INIS accero 04F3DH 00000H @@R_INIS self_flash - 04F37H 00000H - @@R_INIS sw 04F37H 00000H + 04F3DH 00000H + @@R_INIS sw 04F3DH 00000H @@R_INIS task_debug - 04F37H 00000H + 04F3DH 00000H @@R_INIS task_misc - 04F37H 00000H - @@R_INIS task_sys 04F37H 00000H + 04F3DH 00000H + @@R_INIS task_sys 04F3DH 00000H @@R_INIS pedo_alg_thre_det2 - 04F37H 00000H - @@R_INIS ini_VECT 04F37H 00000H + 04F3DH 00000H + @@R_INIS ini_VECT 04F3DH 00000H @@R_INIS task_status - 04F37H 00000H - @@R_INIS @rom 04F37H 00000H - @@CALT 04F37H 00000H CSEG - @@CALT @cstart 04F37H 00000H - @@CALT loader 04F37H 00000H - @@CALT pm 04F37H 00000H - @@CALT i2c_ctr 04F37H 00000H - @@CALT main 04F37H 00000H - @@CALT magic 04F37H 00000H - @@CALT WDT 04F37H 00000H - @@CALT i2c_mcu 04F37H 00000H - @@CALT i2c_twl 04F37H 00000H - @@CALT led 04F37H 00000H - @@CALT rtc 04F37H 00000H - @@CALT vreg_ctr 04F37H 00000H - @@CALT vreg_twl 04F37H 00000H - @@CALT adc 04F37H 00000H - @@CALT renge 04F37H 00000H - @@CALT accero 04F37H 00000H + 04F3DH 00000H + @@R_INIS @rom 04F3DH 00000H + @@CALT 04F3DH 00000H CSEG + @@CALT @cstart 04F3DH 00000H + @@CALT loader 04F3DH 00000H + @@CALT pm 04F3DH 00000H + @@CALT i2c_ctr 04F3DH 00000H + @@CALT main 04F3DH 00000H + @@CALT magic 04F3DH 00000H + @@CALT WDT 04F3DH 00000H + @@CALT i2c_mcu 04F3DH 00000H + @@CALT i2c_twl 04F3DH 00000H + @@CALT led 04F3DH 00000H + @@CALT rtc 04F3DH 00000H + @@CALT vreg_ctr 04F3DH 00000H + @@CALT vreg_twl 04F3DH 00000H + @@CALT adc 04F3DH 00000H + @@CALT renge 04F3DH 00000H + @@CALT accero 04F3DH 00000H @@CALT self_flash - 04F37H 00000H - @@CALT sw 04F37H 00000H + 04F3DH 00000H + @@CALT sw 04F3DH 00000H @@CALT task_debug - 04F37H 00000H + 04F3DH 00000H @@CALT task_misc - 04F37H 00000H - @@CALT task_sys 04F37H 00000H + 04F3DH 00000H + @@CALT task_sys 04F3DH 00000H @@CALT pedo_alg_thre_det2 - 04F37H 00000H - @@CALT ini_VECT 04F37H 00000H + 04F3DH 00000H + @@CALT ini_VECT 04F3DH 00000H @@CALT task_status - 04F37H 00000H - @@RLINIT 04F37H 00000H CSEG UNIT64KP - @@RLINIT loader 04F37H 00000H - @@RLINIT pm 04F37H 00000H - @@RLINIT i2c_ctr 04F37H 00000H - @@RLINIT main 04F37H 00000H - @@RLINIT magic 04F37H 00000H - @@RLINIT WDT 04F37H 00000H - @@RLINIT i2c_mcu 04F37H 00000H - @@RLINIT i2c_twl 04F37H 00000H - @@RLINIT led 04F37H 00000H - @@RLINIT rtc 04F37H 00000H - @@RLINIT vreg_ctr 04F37H 00000H - @@RLINIT vreg_twl 04F37H 00000H - @@RLINIT adc 04F37H 00000H - @@RLINIT renge 04F37H 00000H - @@RLINIT accero 04F37H 00000H + 04F3DH 00000H + @@RLINIT 04F3DH 00000H CSEG UNIT64KP + @@RLINIT loader 04F3DH 00000H + @@RLINIT pm 04F3DH 00000H + @@RLINIT i2c_ctr 04F3DH 00000H + @@RLINIT main 04F3DH 00000H + @@RLINIT magic 04F3DH 00000H + @@RLINIT WDT 04F3DH 00000H + @@RLINIT i2c_mcu 04F3DH 00000H + @@RLINIT i2c_twl 04F3DH 00000H + @@RLINIT led 04F3DH 00000H + @@RLINIT rtc 04F3DH 00000H + @@RLINIT vreg_ctr 04F3DH 00000H + @@RLINIT vreg_twl 04F3DH 00000H + @@RLINIT adc 04F3DH 00000H + @@RLINIT renge 04F3DH 00000H + @@RLINIT accero 04F3DH 00000H @@RLINIT self_flash - 04F37H 00000H - @@RLINIT sw 04F37H 00000H + 04F3DH 00000H + @@RLINIT sw 04F3DH 00000H @@RLINIT task_debug - 04F37H 00000H + 04F3DH 00000H @@RLINIT task_misc - 04F37H 00000H - @@RLINIT task_sys 04F37H 00000H + 04F3DH 00000H + @@RLINIT task_sys 04F3DH 00000H @@RLINIT pedo_alg_thre_det2 - 04F37H 00000H - @@RLINIT ini_VECT 04F37H 00000H + 04F3DH 00000H + @@RLINIT ini_VECT 04F3DH 00000H @@RLINIT task_status - 04F37H 00000H - @@RLINIT @rom 04F37H 00000H - @@CODEL 04F37H 00000H CSEG - @@CODEL pm 04F37H 00000H - @@CODEL i2c_ctr 04F37H 00000H - @@CODEL magic 04F37H 00000H - @@CODEL i2c_twl 04F37H 00000H - @@CODEL led 04F37H 00000H - @@CODEL rtc 04F37H 00000H - @@CODEL vreg_ctr 04F37H 00000H - @@CODEL vreg_twl 04F37H 00000H - @@CODEL adc 04F37H 00000H - @@CODEL renge 04F37H 00000H - @@CODEL accero 04F37H 00000H - @@CODEL sw 04F37H 00000H + 04F3DH 00000H + @@RLINIT @rom 04F3DH 00000H + @@CODEL 04F3DH 00000H CSEG + @@CODEL pm 04F3DH 00000H + @@CODEL i2c_ctr 04F3DH 00000H + @@CODEL magic 04F3DH 00000H + @@CODEL i2c_twl 04F3DH 00000H + @@CODEL led 04F3DH 00000H + @@CODEL rtc 04F3DH 00000H + @@CODEL vreg_ctr 04F3DH 00000H + @@CODEL vreg_twl 04F3DH 00000H + @@CODEL adc 04F3DH 00000H + @@CODEL renge 04F3DH 00000H + @@CODEL accero 04F3DH 00000H + @@CODEL sw 04F3DH 00000H @@CODEL task_misc - 04F37H 00000H - @@CODEL task_sys 04F37H 00000H + 04F3DH 00000H + @@CODEL task_sys 04F3DH 00000H @@CODEL pedo_alg_thre_det2 - 04F37H 00000H - @@CODEL ini_VECT 04F37H 00000H -* gap * 04F37H 00001H - @@CNSTL 04F38H 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04F38H 0000AH - @@CNSTL 04F42H 00010H CSEG PAGE64KP - @@CNSTL @bbcd 04F42H 00010H - @@R_INIT 04F52H 0003AH CSEG UNIT64KP - @@R_INIT @cstart 04F52H 00000H - @@R_INIT loader 04F52H 00000H - @@R_INIT pm 04F52H 00002H - @@R_INIT i2c_ctr 04F54H 00002H - @@R_INIT main 04F56H 00000H - @@R_INIT magic 04F56H 00000H - @@R_INIT WDT 04F56H 00000H - @@R_INIT i2c_mcu 04F56H 00000H - @@R_INIT i2c_twl 04F56H 00000H - @@R_INIT led 04F56H 00006H - @@R_INIT rtc 04F5CH 00000H - @@R_INIT vreg_ctr 04F5CH 00000H - @@R_INIT vreg_twl 04F5CH 00000H - @@R_INIT adc 04F5CH 0000CH - @@R_INIT renge 04F68H 00014H - @@R_INIT accero 04F7CH 00000H + 04F3DH 00000H + @@CODEL ini_VECT 04F3DH 00000H +* gap * 04F3DH 00001H + @@CNSTL 04F3EH 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04F3EH 0000AH + @@CNSTL 04F48H 00010H CSEG PAGE64KP + @@CNSTL @bbcd 04F48H 00010H + @@R_INIT 04F58H 0003AH CSEG UNIT64KP + @@R_INIT @cstart 04F58H 00000H + @@R_INIT loader 04F58H 00000H + @@R_INIT pm 04F58H 00002H + @@R_INIT i2c_ctr 04F5AH 00002H + @@R_INIT main 04F5CH 00000H + @@R_INIT magic 04F5CH 00000H + @@R_INIT WDT 04F5CH 00000H + @@R_INIT i2c_mcu 04F5CH 00000H + @@R_INIT i2c_twl 04F5CH 00000H + @@R_INIT led 04F5CH 00006H + @@R_INIT rtc 04F62H 00000H + @@R_INIT vreg_ctr 04F62H 00000H + @@R_INIT vreg_twl 04F62H 00000H + @@R_INIT adc 04F62H 0000CH + @@R_INIT renge 04F6EH 00014H + @@R_INIT accero 04F82H 00000H @@R_INIT self_flash - 04F7CH 00000H - @@R_INIT sw 04F7CH 00002H + 04F82H 00000H + @@R_INIT sw 04F82H 00002H @@R_INIT task_debug - 04F7EH 00000H + 04F84H 00000H @@R_INIT task_misc - 04F7EH 00000H - @@R_INIT task_sys 04F7EH 00002H + 04F84H 00000H + @@R_INIT task_sys 04F84H 00002H @@R_INIT pedo_alg_thre_det2 - 04F80H 0000AH - @@R_INIT ini_VECT 04F8AH 00000H + 04F86H 0000AH + @@R_INIT ini_VECT 04F90H 00000H @@R_INIT task_status - 04F8AH 00002H - @@R_INIT @rom 04F8CH 00000H - @@LCODEL 04F8CH 00008H CSEG - @@LCODEL abs 04F8CH 00008H -* gap * 04F94H 00062H + 04F90H 00002H + @@R_INIT @rom 04F92H 00000H + @@LCODEL 04F92H 00008H CSEG + @@LCODEL abs 04F92H 00008H +* gap * 04F9AH 0005CH MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL magic 04FF6H 0000AH @@ -422,7 +422,7 @@ Direc-file:bsr_mcu.dr BASE ADDRESS=FF900H SIZE=00500H OUTPUT INPUT INPUT BASE SIZE SEGMENT SEGMENT MODULE ADDRESS - @@DATA FF900H 00430H DSEG BASEP + @@DATA FF900H 00432H DSEG BASEP @@DATA @cstart FF900H 00002H @@DATA loader FF902H 00000H @@DATA pm FF902H 00016H @@ -441,175 +441,175 @@ Direc-file:bsr_mcu.dr @@DATA accero FFC7EH 00002H @@DATA self_flash FFC80H 00002H - @@DATA sw FFC82H 00006H + @@DATA sw FFC82H 00008H @@DATA task_debug - FFC88H 00000H + FFC8AH 00000H @@DATA task_misc - FFC88H 0000EH - @@DATA task_sys FFC96H 00002H + FFC8AH 0000EH + @@DATA task_sys FFC98H 00002H @@DATA pedo_alg_thre_det2 - FFC98H 00096H - @@DATA ini_VECT FFD2EH 00000H + FFC9AH 00096H + @@DATA ini_VECT FFD30H 00000H @@DATA task_status - FFD2EH 00002H - @@DATA @rom FFD30H 00000H - @@INIT FFD30H 0003AH DSEG BASEP - @@INIT @cstart FFD30H 00000H - @@INIT loader FFD30H 00000H - @@INIT pm FFD30H 00002H - @@INIT i2c_ctr FFD32H 00002H - @@INIT main FFD34H 00000H - @@INIT magic FFD34H 00000H - @@INIT WDT FFD34H 00000H - @@INIT i2c_mcu FFD34H 00000H - @@INIT i2c_twl FFD34H 00000H - @@INIT led FFD34H 00006H - @@INIT rtc FFD3AH 00000H - @@INIT vreg_ctr FFD3AH 00000H - @@INIT vreg_twl FFD3AH 00000H - @@INIT adc FFD3AH 0000CH - @@INIT renge FFD46H 00014H - @@INIT accero FFD5AH 00000H + FFD30H 00002H + @@DATA @rom FFD32H 00000H + @@INIT FFD32H 0003AH DSEG BASEP + @@INIT @cstart FFD32H 00000H + @@INIT loader FFD32H 00000H + @@INIT pm FFD32H 00002H + @@INIT i2c_ctr FFD34H 00002H + @@INIT main FFD36H 00000H + @@INIT magic FFD36H 00000H + @@INIT WDT FFD36H 00000H + @@INIT i2c_mcu FFD36H 00000H + @@INIT i2c_twl FFD36H 00000H + @@INIT led FFD36H 00006H + @@INIT rtc FFD3CH 00000H + @@INIT vreg_ctr FFD3CH 00000H + @@INIT vreg_twl FFD3CH 00000H + @@INIT adc FFD3CH 0000CH + @@INIT renge FFD48H 00014H + @@INIT accero FFD5CH 00000H @@INIT self_flash - FFD5AH 00000H - @@INIT sw FFD5AH 00002H + FFD5CH 00000H + @@INIT sw FFD5CH 00002H @@INIT task_debug - FFD5CH 00000H + FFD5EH 00000H @@INIT task_misc - FFD5CH 00000H - @@INIT task_sys FFD5CH 00002H + FFD5EH 00000H + @@INIT task_sys FFD5EH 00002H @@INIT pedo_alg_thre_det2 - FFD5EH 0000AH - @@INIT ini_VECT FFD68H 00000H + FFD60H 0000AH + @@INIT ini_VECT FFD6AH 00000H @@INIT task_status - FFD68H 00002H - @@INIT @rom FFD6AH 00000H - @@INIS FFD6AH 00000H DSEG UNITP - @@INIS @cstart FFD6AH 00000H - @@INIS loader FFD6AH 00000H - @@INIS pm FFD6AH 00000H - @@INIS i2c_ctr FFD6AH 00000H - @@INIS main FFD6AH 00000H - @@INIS magic FFD6AH 00000H - @@INIS WDT FFD6AH 00000H - @@INIS i2c_mcu FFD6AH 00000H - @@INIS i2c_twl FFD6AH 00000H - @@INIS led FFD6AH 00000H - @@INIS rtc FFD6AH 00000H - @@INIS vreg_ctr FFD6AH 00000H - @@INIS vreg_twl FFD6AH 00000H - @@INIS adc FFD6AH 00000H - @@INIS renge FFD6AH 00000H - @@INIS accero FFD6AH 00000H + FFD6AH 00002H + @@INIT @rom FFD6CH 00000H + @@INIS FFD6CH 00000H DSEG UNITP + @@INIS @cstart FFD6CH 00000H + @@INIS loader FFD6CH 00000H + @@INIS pm FFD6CH 00000H + @@INIS i2c_ctr FFD6CH 00000H + @@INIS main FFD6CH 00000H + @@INIS magic FFD6CH 00000H + @@INIS WDT FFD6CH 00000H + @@INIS i2c_mcu FFD6CH 00000H + @@INIS i2c_twl FFD6CH 00000H + @@INIS led FFD6CH 00000H + @@INIS rtc FFD6CH 00000H + @@INIS vreg_ctr FFD6CH 00000H + @@INIS vreg_twl FFD6CH 00000H + @@INIS adc FFD6CH 00000H + @@INIS renge FFD6CH 00000H + @@INIS accero FFD6CH 00000H @@INIS self_flash - FFD6AH 00000H - @@INIS sw FFD6AH 00000H + FFD6CH 00000H + @@INIS sw FFD6CH 00000H @@INIS task_debug - FFD6AH 00000H + FFD6CH 00000H @@INIS task_misc - FFD6AH 00000H - @@INIS task_sys FFD6AH 00000H + FFD6CH 00000H + @@INIS task_sys FFD6CH 00000H @@INIS pedo_alg_thre_det2 - FFD6AH 00000H - @@INIS ini_VECT FFD6AH 00000H + FFD6CH 00000H + @@INIS ini_VECT FFD6CH 00000H @@INIS task_status - FFD6AH 00000H - @@INIS @rom FFD6AH 00000H - @@DATS FFD6AH 00000H DSEG UNITP - @@DATS @cstart FFD6AH 00000H - @@DATS loader FFD6AH 00000H - @@DATS pm FFD6AH 00000H - @@DATS i2c_ctr FFD6AH 00000H - @@DATS main FFD6AH 00000H - @@DATS magic FFD6AH 00000H - @@DATS WDT FFD6AH 00000H - @@DATS i2c_mcu FFD6AH 00000H - @@DATS i2c_twl FFD6AH 00000H - @@DATS led FFD6AH 00000H - @@DATS rtc FFD6AH 00000H - @@DATS vreg_ctr FFD6AH 00000H - @@DATS vreg_twl FFD6AH 00000H - @@DATS adc FFD6AH 00000H - @@DATS renge FFD6AH 00000H - @@DATS accero FFD6AH 00000H + FFD6CH 00000H + @@INIS @rom FFD6CH 00000H + @@DATS FFD6CH 00000H DSEG UNITP + @@DATS @cstart FFD6CH 00000H + @@DATS loader FFD6CH 00000H + @@DATS pm FFD6CH 00000H + @@DATS i2c_ctr FFD6CH 00000H + @@DATS main FFD6CH 00000H + @@DATS magic FFD6CH 00000H + @@DATS WDT FFD6CH 00000H + @@DATS i2c_mcu FFD6CH 00000H + @@DATS i2c_twl FFD6CH 00000H + @@DATS led FFD6CH 00000H + @@DATS rtc FFD6CH 00000H + @@DATS vreg_ctr FFD6CH 00000H + @@DATS vreg_twl FFD6CH 00000H + @@DATS adc FFD6CH 00000H + @@DATS renge FFD6CH 00000H + @@DATS accero FFD6CH 00000H @@DATS self_flash - FFD6AH 00000H - @@DATS sw FFD6AH 00000H + FFD6CH 00000H + @@DATS sw FFD6CH 00000H @@DATS task_debug - FFD6AH 00000H + FFD6CH 00000H @@DATS task_misc - FFD6AH 00000H - @@DATS task_sys FFD6AH 00000H + FFD6CH 00000H + @@DATS task_sys FFD6CH 00000H @@DATS pedo_alg_thre_det2 - FFD6AH 00000H - @@DATS ini_VECT FFD6AH 00000H + FFD6CH 00000H + @@DATS ini_VECT FFD6CH 00000H @@DATS task_status - FFD6AH 00000H - @@DATS @rom FFD6AH 00000H - FSL_DATA FFD6AH 00010H DSEG UNITP + FFD6CH 00000H + @@DATS @rom FFD6CH 00000H + FSL_DATA FFD6CH 00010H DSEG UNITP FSL_DATA fsl_common - FFD6AH 00010H - @@INITL FFD7AH 00000H DSEG UNIT64KP - @@INITL loader FFD7AH 00000H - @@INITL pm FFD7AH 00000H - @@INITL i2c_ctr FFD7AH 00000H - @@INITL main FFD7AH 00000H - @@INITL magic FFD7AH 00000H - @@INITL WDT FFD7AH 00000H - @@INITL i2c_mcu FFD7AH 00000H - @@INITL i2c_twl FFD7AH 00000H - @@INITL led FFD7AH 00000H - @@INITL rtc FFD7AH 00000H - @@INITL vreg_ctr FFD7AH 00000H - @@INITL vreg_twl FFD7AH 00000H - @@INITL adc FFD7AH 00000H - @@INITL renge FFD7AH 00000H - @@INITL accero FFD7AH 00000H + FFD6CH 00010H + @@INITL FFD7CH 00000H DSEG UNIT64KP + @@INITL loader FFD7CH 00000H + @@INITL pm FFD7CH 00000H + @@INITL i2c_ctr FFD7CH 00000H + @@INITL main FFD7CH 00000H + @@INITL magic FFD7CH 00000H + @@INITL WDT FFD7CH 00000H + @@INITL i2c_mcu FFD7CH 00000H + @@INITL i2c_twl FFD7CH 00000H + @@INITL led FFD7CH 00000H + @@INITL rtc FFD7CH 00000H + @@INITL vreg_ctr FFD7CH 00000H + @@INITL vreg_twl FFD7CH 00000H + @@INITL adc FFD7CH 00000H + @@INITL renge FFD7CH 00000H + @@INITL accero FFD7CH 00000H @@INITL self_flash - FFD7AH 00000H - @@INITL sw FFD7AH 00000H + FFD7CH 00000H + @@INITL sw FFD7CH 00000H @@INITL task_debug - FFD7AH 00000H + FFD7CH 00000H @@INITL task_misc - FFD7AH 00000H - @@INITL task_sys FFD7AH 00000H + FFD7CH 00000H + @@INITL task_sys FFD7CH 00000H @@INITL pedo_alg_thre_det2 - FFD7AH 00000H - @@INITL ini_VECT FFD7AH 00000H + FFD7CH 00000H + @@INITL ini_VECT FFD7CH 00000H @@INITL task_status - FFD7AH 00000H - @@INITL @rom FFD7AH 00000H - @@DATAL FFD7AH 00000H DSEG UNIT64KP - @@DATAL loader FFD7AH 00000H - @@DATAL pm FFD7AH 00000H - @@DATAL i2c_ctr FFD7AH 00000H - @@DATAL main FFD7AH 00000H - @@DATAL magic FFD7AH 00000H - @@DATAL WDT FFD7AH 00000H - @@DATAL i2c_mcu FFD7AH 00000H - @@DATAL i2c_twl FFD7AH 00000H - @@DATAL led FFD7AH 00000H - @@DATAL rtc FFD7AH 00000H - @@DATAL vreg_ctr FFD7AH 00000H - @@DATAL vreg_twl FFD7AH 00000H - @@DATAL adc FFD7AH 00000H - @@DATAL renge FFD7AH 00000H - @@DATAL accero FFD7AH 00000H + FFD7CH 00000H + @@INITL @rom FFD7CH 00000H + @@DATAL FFD7CH 00000H DSEG UNIT64KP + @@DATAL loader FFD7CH 00000H + @@DATAL pm FFD7CH 00000H + @@DATAL i2c_ctr FFD7CH 00000H + @@DATAL main FFD7CH 00000H + @@DATAL magic FFD7CH 00000H + @@DATAL WDT FFD7CH 00000H + @@DATAL i2c_mcu FFD7CH 00000H + @@DATAL i2c_twl FFD7CH 00000H + @@DATAL led FFD7CH 00000H + @@DATAL rtc FFD7CH 00000H + @@DATAL vreg_ctr FFD7CH 00000H + @@DATAL vreg_twl FFD7CH 00000H + @@DATAL adc FFD7CH 00000H + @@DATAL renge FFD7CH 00000H + @@DATAL accero FFD7CH 00000H @@DATAL self_flash - FFD7AH 00000H - @@DATAL sw FFD7AH 00000H + FFD7CH 00000H + @@DATAL sw FFD7CH 00000H @@DATAL task_debug - FFD7AH 00000H + FFD7CH 00000H @@DATAL task_misc - FFD7AH 00000H - @@DATAL task_sys FFD7AH 00000H + FFD7CH 00000H + @@DATAL task_sys FFD7CH 00000H @@DATAL pedo_alg_thre_det2 - FFD7AH 00000H - @@DATAL ini_VECT FFD7AH 00000H + FFD7CH 00000H + @@DATAL ini_VECT FFD7CH 00000H @@DATAL task_status - FFD7AH 00000H - @@DATAL @rom FFD7AH 00000H -* gap * FFD7AH 00086H + FFD7CH 00000H + @@DATAL @rom FFD7CH 00000H +* gap * FFD7CH 00084H MEMORY=RAM2 BASE ADDRESS=FFE20H SIZE=000C0H diff --git a/branches/1.11(sdk_0_14)/config.h b/branches/1.11(sdk_0_14)/config.h index fa980c4..5335b3e 100644 --- a/branches/1.11(sdk_0_14)/config.h +++ b/branches/1.11(sdk_0_14)/config.h @@ -13,7 +13,7 @@ //#define _FORCE_TAIKENDAI_ #define MCU_VER_MAJOR 0x01 -#define MCU_VER_MINOR 11 +#define MCU_VER_MINOR 12 #define _firm_format_v3_ diff --git a/branches/1.11(sdk_0_14)/hoge.bin b/branches/1.11(sdk_0_14)/hoge.bin index ebfd543..202dc66 100644 Binary files a/branches/1.11(sdk_0_14)/hoge.bin and b/branches/1.11(sdk_0_14)/hoge.bin differ diff --git a/branches/1.11(sdk_0_14)/sw.c b/branches/1.11(sdk_0_14)/sw.c index 71d4490..4df1528 100644 --- a/branches/1.11(sdk_0_14)/sw.c +++ b/branches/1.11(sdk_0_14)/sw.c @@ -31,6 +31,8 @@ u8 SW_home_count, SW_wifi_count, SW_home_count_rel; bit SW_HOME_n; +u16 off_timeout_timer; + //========================================================= // 押した時間を数える。押しっぱなしでも0に戻らない // maskが非0の時は、一度離すまで無視する @@ -80,6 +82,7 @@ void tsk_sw( ) if( system_status.pwr_state == ON_TRIG ) { SW_pow_count = 0; // カウントクリア + off_timeout_timer = 0; } if( --task_interval != 0 ) @@ -91,6 +94,7 @@ void tsk_sw( ) task_interval = (u8)( INTERVAL_TSK_SW / SYS_INTERVAL_TICK ); } + // 8ms 毎にきます switch ( system_status.pwr_state ) { case ( ON ): @@ -98,18 +102,29 @@ void tsk_sw( ) case ( BT_CHARGE ): case ( OFF ): // 電源スイッチの監視 // - if( SW_pow_count == (u8)( 320/ INTERVAL_TSK_SW ) ) + if( SW_pow_count == ( TIME_PWSW_CLICK ) ) { set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); } else if( SW_pow_count == ( HOLD_THREASHOLD ) ) { set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_HOLD ); + off_timeout_timer = vreg_ctr[ VREG_C_OFF_DELAY ] * 16; } - else if( SW_pow_count > ( HOLD_THREASHOLD + vreg_ctr[ VREG_C_OFF_DELAY ] *16 )) // およそ 100/SYSTEM_TICK +/* + else if( SW_pow_count > ( HOLD_THREASHOLD + vreg_ctr[ VREG_C_OFF_DELAY ] )) // およそ 100/SYSTEM_TICK { system_status.force_off = 1; } +*/ + if( off_timeout_timer != 0 ) + { + off_timeout_timer -= 1; + if( off_timeout_timer == 1 ) + { + system_status.force_off = true; + } + } count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask ); // ボタン押し時間のカウント diff --git a/branches/1.11(sdk_0_14)/sw.h b/branches/1.11(sdk_0_14)/sw.h index a63938d..01f47bf 100644 --- a/branches/1.11(sdk_0_14)/sw.h +++ b/branches/1.11(sdk_0_14)/sw.h @@ -9,7 +9,8 @@ extern bit SW_pow_mask; #define INTERVAL_TSK_SW 8 #define CLICK_THRESHOLD 2 -#define HOLD_THREASHOLD (u8)( 2000 /INTERVAL_TSK_SW ) -#define FORCEOFF_THREASHOLD 32 +#define HOLD_THREASHOLD (u16)( 3000 /INTERVAL_TSK_SW ) +#define TIME_PWSW_CLICK (u8)( 160 /INTERVAL_TSK_SW ) +#define FORCEOFF_THREASHOLD (u8)( 12000 /INTERVAL_TSK_SW /16 ) #endif diff --git a/branches/1.11(sdk_0_14)/yav_mcu_bsr.plg b/branches/1.11(sdk_0_14)/yav_mcu_bsr.plg index cea341f..9e26404 100644 --- a/branches/1.11(sdk_0_14)/yav_mcu_bsr.plg +++ b/branches/1.11(sdk_0_14)/yav_mcu_bsr.plg @@ -1,152 +1,20 @@ -C:\WINDOWS\system32\cmd.exe /c touch magic.c -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no loader.c -loader.c(121) : CC78K0R warning W0401: Conversion may lose significant digits -loader.c(122) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\loader.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no pm.c -pm.c(772) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(849) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(857) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1072) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1075) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 5 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\pm.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_ctr.c +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 -ms -qvjl2w -sainter_asm -zpb -no magic.c Compilation complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\i2c_ctr.asm +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no main.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 -ms -qvjl2w -sainter_asm -zpb -no sw.c Compilation complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\main.asm +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\sw.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no magic.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\magic.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no WDT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\WDT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_mcu.c -i2c_mcu.c(205) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\i2c_mcu.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_twl.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\i2c_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no led.c -led.c(109) : CC78K0R warning W0745: Expected function prototype -led.c(251) : CC78K0R warning W0401: Conversion may lose significant digits -led.c(256) : CC78K0R warning W0401: Conversion may lose significant digits -led.c(318) : CC78K0R warning W0401: Conversion may lose significant digits -led.c(377) : CC78K0R warning W0401: Conversion may lose significant digits -led.c(403) : CC78K0R warning W0401: Conversion may lose significant digits -led.c(579) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 7 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\led.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no rtc.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\rtc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no vreg_ctr.c -vreg_ctr.c(163) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(166) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(168) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(169) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(216) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(216) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(221) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(221) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(225) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(225) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(229) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(229) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(233) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 14 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\vreg_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no vreg_twl.c -vreg_twl.c(57) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_twl.c(61) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\vreg_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no adc.c -adc.c(103) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(200) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(232) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(344) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(384) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(462) : CC78K0R warning W0745: Expected function prototype -adc.c(491) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(496) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(122) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 9 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\adc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no renge\renge.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\renge.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no accero.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\accero.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no self_flash.c -self_flash.c(271) : CC78K0R warning W0401: Conversion may lose significant digits -self_flash.c(272) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\self_flash.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no sw.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\sw.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_debug.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\task_debug.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_misc.c -task_misc.c(300) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\task_misc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_sys.c -task_sys.c(194) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(510) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\task_sys.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c -pedo_alg_thre_det2.c(58) : CC78K0R warning W0745: Expected function prototype -pedo_alg_thre_det2.c(73) : CC78K0R warning W0401: Conversion may lose significant digits -pedo_alg_thre_det2.c(140) : CC78K0R warning W0401: Conversion may lose significant digits -pedo_alg_thre_det2.c(153) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 4 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\pedo_alg_thre_det2.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no ini_VECT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\ini_VECT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\bin\cc78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_status.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"d:\program files\nec electronics tools\dev" -_msgoff inter_asm\task_status.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"d:\program files\nec electronics tools\dev" -_msgoff -obsr.lmf "..\..\..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.12\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"D:\Program Files\NEC Electronics Tools\CC78K0R\W2.12\lib78k0r" -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel 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 +"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 -w0 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 Link complete, 0 error(s) and 0 warning(s) found. -"D:\Program Files\NEC Electronics Tools\RA78K0R\W1.33\bin\oc78k0r.exe" -y"d:\program files\nec electronics tools\dev" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\oc78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf 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 -intel-HEX to bsr bin converter - file converted! +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 +intel-HEX to bsr bin converter + file converted! + - -Build Total error(s) : 0 Total warning(s) : 49 +Build Total error(s) : 0 Total warning(s) : 0 diff --git a/branches/1.11(sdk_0_14)/yav_mcu_bsr.prj b/branches/1.11(sdk_0_14)/yav_mcu_bsr.prj index a77c238..ebfb227 100644 --- a/branches/1.11(sdk_0_14)/yav_mcu_bsr.prj +++ b/branches/1.11(sdk_0_14)/yav_mcu_bsr.prj @@ -1,12 +1,12 @@ [ProjectManager] Version=6.00 -Path=D:\MyDocuments\workspace\mcufirm_RED\branches\1.11(sdk_0_14)\ +Path=C:\78k_data\yav-mcu-basara\branches\1.11(sdk_0_14)\ Title=yav-mcu Series=78K0R.PM Device=uPD79F0104 DeviceVer=E1.00b DebugMode=1 -Target=D:\MyDocuments\workspace\mcufirm_RED\branches\1.11(sdk_0_14)\bsr.lmf +Target=C:\78k_data\yav-mcu-basara\branches\1.11(sdk_0_14)\bsr.lmf [BuildMode0] BuildModeName=Debug Build TargetFile=0 @@ -15,13 +15,13 @@ BuildModeName=Release Build TargetFile=0 [Tools] MakeFile=yav_mcu_bsr.mak -Debugger=D:\Program Files\NEC Electronics Tools\ID78K0R-QB\E3.60f\BIN\IDK0R32G.EXE +Debugger=C:\Program Files (x86)\NEC Electronics Tools\ID78K0R-QB\V3.61\BIN\IDK0R32G.EXE DebOption= DebCpuReset=1 DebSymReset=1 MuitiLoad=0 LoadPrjNum=0 -CheckVersion=CC78K0R|W2.12;RA78K0R|W1.33 +CheckVersion=CC78K0R|W2.13;RA78K0R|W1.33 [Option.IDK0R32G] File=yav_mcu_bsr.pri [BuildMode2] @@ -245,7 +245,7 @@ Source21=pedo_alg_thre_det2.c Source22=ini_VECT.c Source23=task_status.c [BuildBefore-AfterCmd] -Before1=touch magic.c +Before1=c:\cygwin\bin\touch magic.c After1=ruby nec_s_2_bsrbin2.rb bsr.hex [Options.CC78K0R 0] Version=210 @@ -393,87 +393,6 @@ Library2=cl0rm.lib Library3=cl0rmf.lib VF78K0Rchk=0 VF78K0Rvs= -[Options.CC78K0R 2] -Version=210 -Define0= -Define1=_debug_,_TEG_,proc_is_ke3 -Define2=_debug_,_TEG_,proc_is_ke3,%time% -Define3=_TEG_,proc_is_ke3 -Define4=proc_is_ke3 -Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r -Include1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r -Memorymodel=1 -Flashobj=0 -FlashStartadr= -FlashBranchStartadr= -Mirror=0 -Saddrglobalchk=0 -Saddrglobal=1066 -Saddrstaticchk=0 -Saddrstatic=1072 -Bitfieldmsb=0 -Onebytechk=0 -Pacstructchk=0 -AssignROMchk=0 -AssignROM=0 -Maxoptimizechk=0 -Maxoptimize=1104 -Charunexpandchk=0 -Unsignedchar=0 -Usesaddrchk=0 -Autoallocationchk=1 -Jumpoptimize=1 -Librarycallchk=1 -Librarycall=1129 -Aggressivechk=1 -Relativebranchchk=0 -Debugoptchk=0 -Outdebugchk=1 -Outdebug=1153 -Outasmsrccmb0=inter_asm -Outasmsrccmb1=bsr.asm -Outasmsrcchk=1 -Outasmsrc=1158 -Outasmoptall=1 -Common=0 -Outerrlistchk=0 -Outerrlist=1174 -Xreference=0 -Preprocess=0 -Prenocomment=0 -Predefine=0 -Preifdef=1 -Preinclude=1 -Preline=1 -Prenumber=1 -Formfeed=0 -Columns=132 -Lines=0 -Tablength=8 -Ansi=0 -Cpraspras=1 -Commentnest=0 -Intunexpand=1 -Kanjicode=1210 -Verbose=0 -CommandFile=0 -Warninglevel=1 -Startupchk=1 -Fixation=0 -FarROMization=0 -Objectsel=1305 -Librarychk=1 -Floatingpoint=0 -Muldivunit=1 -Mulunit=1 -Startup=s0rm.rel -Library1=cl0rdm.lib -Library2=cl0rm.lib -Library3=cl0rmf.lib -VfiFileBoot0= -VfiFileBoot1=boot.vfi -VF78K0Rchk=0 -VF78K0Rvs= [Options.CC78K0R 3] Version=210 Define0=_debug_,proc_is_bsr,_TEG_ @@ -713,6 +632,161 @@ VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 VF78K0Rvs= +[Options.LCNV78K0R 0] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 1] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 2] +Version=100 +LCNV_GO=0 +O0=inter_asm +E=0 +CommandFile=0 +[Options.LCNV78K0R 3] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 4] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 5] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[ToolSet] +ToolSetName=(変更)(選択01)(変更)78K0R Software Package V1.10 +Tool1=CC78K0R|W2.13 +Tool2=RA78K0R|W1.33 +Tool3=SK78K0R|V3.10 +Tool4=ID78K0R-QB|V3.61 +[Options.CC78K0R 2] +Version=210 +Define0= +Define1=_debug_,_TEG_,proc_is_ke3 +Define2=_debug_,_TEG_,proc_is_ke3,%time% +Define3=_TEG_,proc_is_ke3 +Define4=proc_is_ke3 +Include0=renge +Include1=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r +Include2=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r +Memorymodel=1 +Flashobj=0 +FlashStartadr= +FlashBranchStartadr= +Mirror=0 +Saddrglobalchk=0 +Saddrglobal=1066 +Saddrstaticchk=0 +Saddrstatic=1072 +Bitfieldmsb=0 +Onebytechk=0 +Pacstructchk=0 +AssignROMchk=0 +AssignROM=0 +Maxoptimizechk=0 +Maxoptimize=1104 +Charunexpandchk=0 +Unsignedchar=0 +Usesaddrchk=0 +Autoallocationchk=1 +Jumpoptimize=1 +Librarycallchk=1 +Librarycall=1129 +Aggressivechk=1 +Relativebranchchk=0 +Debugoptchk=0 +Outdebugchk=1 +Outdebug=1153 +Outasmsrccmb0=inter_asm +Outasmsrccmb1=bsr.asm +Outasmsrcchk=1 +Outasmsrc=1158 +Outasmoptall=1 +Common=0 +Outerrlistchk=0 +Outerrlist=1174 +Xreference=0 +Preprocess=0 +Prenocomment=0 +Predefine=0 +Preifdef=1 +Preinclude=1 +Preline=1 +Prenumber=1 +Formfeed=0 +Columns=132 +Lines=0 +Tablength=8 +Ansi=0 +Cpraspras=1 +Commentnest=0 +Intunexpand=1 +Kanjicode=1210 +Verbose=0 +CommandFile=0 +Warninglevel=1 +Startupchk=1 +Fixation=0 +FarROMization=0 +Objectsel=1305 +Librarychk=1 +Floatingpoint=0 +Muldivunit=1 +Mulunit=1 +Startup=s0rm.rel +Library1=cl0rdm.lib +Library2=cl0rm.lib +Library3=cl0rmf.lib +VfiFileBoot0= +VfiFileBoot1=boot.vfi +VF78K0Rchk=0 +VF78K0Rvs= +[IncFile] +Include1=incs_loader.h +Include2=jhl_defs.h +Include3=config.h +Include4=user_define.h +Include5=bsr_system.h +Include6=renge\renge.h +Include7=renge\renge_defs.h +Include8=renge\renge_task_immediate.h +Include9=vreg_ctr.h +Include10=vreg_twl.h +Include11=loader.h +Include12=i2c_mcu.h +Include13=WDT.h +Include14=fsl_user.h +Include15=i2c_ctr.h +Include16=pm.h +Include17=rtc.h +Include18=reboot.h +Include19=incs.h +Include20=accero.h +Include21=pedometer.h +Include22=adc.h +Include23=led.h +Include24=batt_params.h +Include25=i2c_twl_defs.h +Include26=renge\renge_task_intval.h +Include27=i2c_twl.h +Include28=sw.h +Include29=self_flash.h +Include30=pool.h +Include31=pedo_lpf_coeff.h +Include32=voltable.h +Include33=magic.h +Include34=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +Include35=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h [Options.LK78K0R 0] Version=100 O0=bsr_k0r.lmf @@ -819,7 +893,8 @@ KP=0 KL=0 LF=0 LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +B0=C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib +B1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib D0=bsr_mcu.dr D1=user_area.dr S=1 @@ -830,7 +905,7 @@ ZB= Etcetera0= Etcetera1=boot.lmf CommandFile=0 -OFILE=D:\MyDocuments\workspace\mcufirm_RED\branches\1.11(sdk_0_14)\bsr.lmf +OFILE=C:\78k_data\yav-mcu-basara\branches\1.11(sdk_0_14)\bsr.lmf [Options.LK78K0R 3] Version=100 O0=bsr_bsr.lmf @@ -964,37 +1039,6 @@ ZB= Etcetera0= Etcetera1=boot.lmf CommandFile=0 -[Options.LCNV78K0R 0] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 1] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 2] -Version=100 -LCNV_GO=0 -O0=inter_asm -E=0 -CommandFile=0 -[Options.LCNV78K0R 3] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 4] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 5] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 [Options.78K0R] BuildMode=2 BuildMode2=K0R_dbg @@ -1005,45 +1049,3 @@ DefaultMode2=1 DefaultMode3=1 DefaultMode4=1 DefaultMode5=1 -[ToolSet] -ToolSetName=(変更)(選択01)(変更)78K0R Software Package V1.10 -Tool1=CC78K0R|W2.12 -Tool2=RA78K0R|W1.33 -Tool3=SK78K0R|V3.10 -Tool4=ID78K0R-QB|E3.60f -[IncFile] -Include1=incs_loader.h -Include2=jhl_defs.h -Include3=config.h -Include4=user_define.h -Include5=bsr_system.h -Include6=renge\renge.h -Include7=renge\renge_defs.h -Include8=renge\renge_task_immediate.h -Include9=vreg_ctr.h -Include10=vreg_twl.h -Include11=loader.h -Include12=i2c_mcu.h -Include13=WDT.h -Include14=fsl_user.h -Include15=i2c_ctr.h -Include16=pm.h -Include17=rtc.h -Include18=reboot.h -Include19=incs.h -Include20=accero.h -Include21=pedometer.h -Include22=adc.h -Include23=led.h -Include24=batt_params.h -Include25=i2c_twl_defs.h -Include26=renge\renge_task_intval.h -Include27=i2c_twl.h -Include28=sw.h -Include29=self_flash.h -Include30=pool.h -Include31=pedo_lpf_coeff.h -Include32=voltable.h -Include33=magic.h -Include34=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h -Include35=..\..\..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.12\inc78k0r\math.h