diff --git a/branches/2.20_CE-ARM-sdk3.2.5/bsr.hex b/branches/2.20_CE-ARM-sdk3.2.5/bsr.hex index 6851980..f1effdb 100644 --- a/branches/2.20_CE-ARM-sdk3.2.5/bsr.hex +++ b/branches/2.20_CE-ARM-sdk3.2.5/bsr.hex @@ -1,13 +1,13 @@ :02000000DF0C13 -:040010000348054854 -:02001C00B149E8 -:02002400584A38 -:02002A00A34AE7 -:08003400D04B734BCC4B114E75 -:02004A00074865 -:02005A0041481B -:02006200CF4D80 -:06008000644C9D4CE74CAE +:040010002E483048FE +:02001C00DC49BD +:02002400834A0D +:02002A00CE4ABC +:08003400FB4B9E4BF74B3C4EC9 +:02004A0032483A +:02005A006C48F0 +:02006200FA4D55 +:060080008F4CC84C124D2C :0400C0007EFBFF04C0 :0A00C4001B339499E033F240BFAA09 :1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A @@ -206,10 +206,10 @@ :020CDD00C3FD55 :100CDF0061CF5100718C7109FECBF800FEFCC90188 :100CEF0000F6BF00F953C0F693935820FEDFF94189 -:100CFF000036224E34CCFCEF05118B99A7A5174473 -:100D0F006C4EDFF53602F930CCFCEF04CC0000A7B7 -:100D1F0047DFF94100366C4E3420FEEF05118B99F9 -:100D2F00A7A517447C4EDFF53630FE3092FEEF0458 +:100CFF0000364C4E34CCFCEF05118B99A7A5174449 +:100D0F00964EDFF53602F930CCFCEF04CC0000A78D +:100D1F0047DFF9410036964E3420FEEF05118B99CF +:100D2F00A7A51744A64EDFF53630FE3092FEEF042E :100D3F00CC0000A747DFF9FCCE0000EFFE61DD71AC :100D4F007BFABEF0ADD8BEF200AEF661CDD7C3616F :100D5F00DD717BFABEF0ADD8BEF200DBF6FFADDC85 @@ -242,10 +242,10 @@ :100F0F00F9B4DADFF4BDD813BDDAC2C0D746D8DDE5 :100F1F000771FF7177D971C0D75BDB9DDB605BDA3F :100F2F009DDAADDC5BD9085BD808BDD8D7C3C7F352 -:100F3F00728EFDC162314C410036184E1161A072A4 +:100F3F00728EFDC162314C410036424E1161A0727A :070F4F00C09EFD62C6C2D77F -:0A0FF60031373A32353A3139000044 -:0A20000031373A32353A3139000029 +:0A0FF60031353A32313A323800004A +:0A20000031353A32313A323800002F :10200A0005214F7B9EC5E9000104080D12171C1F0C :10201A00080100001F003B005A0078009700B50035 :10202A00D400F300110130014E01192634445362E1 @@ -418,11 +418,11 @@ :102A8C008C01D1DFF4716307716B278D315C40D100 :102A9C00DD095002C15012FD9C34C08D315C01D156 :102AAC00DD08E0C15012FD9C34C0717AFA8D315CA6 -:102ABC0041D1DD0C5A31BED831C15010FD5647C042 +:102ABC0041D1DD0C5A31BED831C15010FD7C47C01C :102ACC00F21004C6D7FD6727F2D7FDCE27F2D7C781 :102ADC008FC6FB7617FD6528664FC6FBDFF2F5C681 :102AEC00FBF2C6D75064FD9909FD212C6261FB7184 -:102AFC001192F171149261DC70C15012FD5647C0F5 +:102AFC001192F171149261DC70C15012FD7C47C0CF :102B0C00FD4A36CD5F03D7C7C1C1FBF8FFAC0ABB8A :102B1C0017C15002C18C0270C1506CFD35031006F8 :102B2C001004C6D7C7C1FBF8FFAC08C15002C18B5B @@ -438,7 +438,7 @@ :102BCC0004E504FCD7F504FCD7D504F9DF047173D4 :102BDC0092D7FD212C6261FB7101937114927107E4 :102BEC009361C83172921771729271049371119240 -:102BFC00F171049361DC70C15012FD5647C0D7C708 +:102BFC00F171049361DC70C15012FD7C47C0D7C7E2 :102C0C0016C75004FD302BC0C6D7C716C75002FDDF :102C1C00302BC0C6D740AFFB0BDE02E2D7F2D77128 :102C2C0000010571785005713AD5713BD18F1005B3 @@ -450,8 +450,8 @@ :102C8C0004717AFAFDAB23F504F98F06F931051BB3 :102C9C005003FD592B625C01D161E8CF04F902CFDE :102CAC00AFFB64710407714192EF10F67104076178 -:102CBC001012F6B1236061FB714192FD6D30FDFA8B -:102CCC0042712295712BE7618461A461EDEFF8D715 +:102CBC001012F6B1236061FB714192FD6D30FD2065 +:102CCC0043712295712BE7618461A461EDEFF8D714 :102CDC007140F00071783002713AE6713BE2713B61 :102CEC00EA713BEE8F10055CFC9F1005CF34024A55 :102CFC00E552FF711A52710A52714830027130302C @@ -460,7 +460,7 @@ :102D2C00FC9F110571603002D7717830027148F048 :102D3C0000D7C788061666614FDD0967614EDE0352 :102D4C0096EF01866672C6D7C7161714AA0412A985 -:102D5C0043DD29AA0412A923FD7C4EC3AC02FD7CE1 +:102D5C0043DD29AA0412A923FDA64EC3AC02FDA68D :102D6C004E13C2BDD813FD1C0FDE0C1714AA021291 :102D7C00AA0403BA04EF051714A9BA04AC0412315F :102D8C00FF319E03317F087208C6D77100F2003004 @@ -511,7 +511,7 @@ :10305C007B9E8FDCFB9E9A8FDDFB9E9B717A9EC6BE :10306C00D7CFA7FB5CCFA8FB5FCFC8FB5DCFFCFB2A :10307C0036CFFDFBC9E5D3FBD7C7CFA4FB12CFA539 -:10308C00FB1ECFCCFBFFF5CDFBF5CEFBF5CFFBF557 +:10308C00FB20CFCCFBFFF5CDFBF5CEFBF5CFFBF555 :10309C00D0FB5600664C64DE08723826FB0086EFC7 :1030AC00F3C6D7C788061617F1E73403002361E38C :1030BC00EDD4332361F8EDA031B12361E3EDAA31F6 @@ -530,7 +530,7 @@ :10318C00ED8E3324120061F8EDA8332361F8ED992C :10319C0033EDD63334A6FB89615F99EDE0333048CB :1031AC0029619466736718A4FBEDE03340A9FB6AB0 -:1031BC00DF1340AAFB68DF0D674C6CDF083037402B +:1031BC00DF1340AAFB68DF0D674C6CDF08305D4005 :1031CC006194713AD5679FABFBEDE03367D1DD0CB1 :1031DC0030683B619434C4FB89616F99EDE03367CF :1031EC005C02D1DD0730D12A6194EF0B675C01D111 @@ -559,7 +559,7 @@ :10335C0033675C3F9FDEFBEF7B675C1F9FDFFBEF00 :10336C00733028396194679FE4FBEF6830F538615E :10337C0094679FE5FBEF5D300E396194679FE8FB26 -:10338C00EF52675C01D1DD4CFDFA42EF474A58C859 +:10338C00EF52675C01D1DD4CFD2043EF474A58C832 :10339C00DE42E85867185AFAA458EF38679D58EF80 :1033AC0033675C01D1DD05711202EF037113026703 :1033BC005C02D1DD05712202EF03712302679FD3FA @@ -569,7 +569,7 @@ :1033FC00728F03FC5C03318E316D08616A08128F89 :10340C0003FC5C80312A6162EF56664C3DDF08AEEE :10341C0090BD5AF85AEF49664C3EDF04F85BEF401A -:10342C00664C4FDF05FD2243EF36664C61DF08E842 +:10342C00664C4FDF05FD4843EF36664C61DF08E81C :10343C0058095AFA72EF29664C7FDF05FDDE3BEF27 :10344C001F664C4EDF0B310496045210EF12F2EF54 :10345C000F664C5BDC0452FFEF06667309A4FB722B @@ -585,7 +585,7 @@ :1034FC0017F1E734020025DD3D23DD1725DD1C2304 :10350C00DD0523DD2BEF3B710295679F06FCCD5F3C :10351C0003EF2F675C839F03FCEF27675C039F051A -:10352C00FC675C034C0261F8712296FD1045EF12AA +:10352C00FC675C034C0261F8712296FD3645EF1284 :10353C00679F07FCEF0C6791DF08E0C15012FD9C00 :10354C0034C0C6D7C71617F1E7240000DD2A23DDE7 :10355C001E240300DD0724FB00DD24EF2531329609 @@ -609,7 +609,7 @@ :10367C00D506FCDF04F464EF0A8F06FC5002D6A1D9 :10368C00609D648D649D63EF0E311495068D649D71 :10369C0063EF048D619D638D639FADFBD863FDBCAF -:1036AC0036E863091C2270C15013FD5647C0F2D78F +:1036AC0036E863091C2270C15013FD7C47C0F2D769 :1036BC00C7C1C1FBF8FF8C02D1DF05F506FCEF1A80 :1036CC008C024C05DE06CF06FC02EF0E8C02318E0E :1036DC001231FE03311F609F06FC8D654F06FCDD29 @@ -624,7 +624,7 @@ :10376C0031318D128FFDFB2FFCFB70613133BDD8D5 :10377C0013FDAA0DBB440001DC03F690BB8B721049 :10378C0004C6D7C7C1FBF8FFAC0814A91489708B09 -:10379C006128706131FD7C4E1344030071FEDC2303 +:10379C006128706131FDA64E1344030071FEDC23D9 :1037AC00AC08148A04819A04AC08148A044C11DC09 :1037BC0010A9148B99AC0814CA0200AC0814CA03E3 :1037CC0010EF72AC0814CA0400AC0814A914894D8B @@ -640,12 +640,12 @@ :10386C00C15030FD8B021006D2DD1B4A6804DE0508 :10387C00A468E2EF7034E4FB895CFC99FD28397193 :10388C0010B2FBF2EF5F717BFA300600C117040631 -:10389C0000C130E9FBFD844E1004717AFAF4688F94 +:10389C0000C130E9FBFDAE4E1004717AFAF4688F6A :1038AC00E4FB5C01D1DD264004F903DF205010C19C :1038BC0080FD9C34C0C736100571D4C6DE0F17C10D :1038CC005006C150A8C15030FD8B0210064004F9BF :1038DC0003DD064004F904DF0B8FE4FB5C02D161CD -:1038EC00E8FD3C40F2100CC6D7D9E5FBC15030FDC9 +:1038EC00E8FD6240F2100CC6D7D9E5FBC15030FDA3 :1038FC006A02C0629FE8FB5008C15011FD9C34C0A5 :10390C00F2D7D9E8FBC1D9E7FBC15030FDFE02105C :10391C00045008C15011FD9C34C0F2D7C7200CFBD9 @@ -711,32 +711,32 @@ :103CDC003E2361F8ED653E2361F8ED393FED933EEF :103CEC00F6BD707113934005F901DF2C3134961B2E :103CFC00466ADD04F424EF02A4244A2465DC0FF6A2 -:103D0C00BD6AF504F9712295EDBA3FFDAB23AD6A9E -:103D1C00440A0061D8EDBA3F714295FD6A047163A3 +:103D0C00BD6AF504F9712295EDE03FFDAB23AD6A78 +:103D1C00440A0061D8EDE03F714295FD6A0471637D :103D2C0092FDAB234007F903DF09712295F504F9E5 -:103D3C00EDBA3FFD152640B1FB9BDE09712295F5CE -:103D4C0004F9EDBA3F714A27714011057130110524 +:103D3C00EDE03FFD152640B1FB9BDE09712295F5A8 +:103D4C0004F9EDE03F714A277140110571301105FE :103D5C00713A22715A2271501105FD4D29D2DD099B -:103D6C00712295F504F9EDBA3F71103500CF37008B +:103D6C00712295F504F9EDE03F71103500CF370065 :103D7C001D714012054005F901DD064005F903DF10 :103D8C0005F5CDFBEF04CFCDFB03CF04F902FD33DA -:103D9C0029EDBA3FFD2B2CFDDC2C714A9DFDEA343C +:103D9C0029EDE03FFD2B2CFDDC2C714A9DFDEA3416 :103DAC00FD8530F537FF712BE0F505F9712295CBC8 :103DBC00E43FEFCBE6F6F0FD6A04713BD4711202DE :103DCC007123028F06F93105285004FD592B625CD2 :103DDC0003318E315D34B3FB896168995002FD5912 :103DEC002BD2DD067170B3FBEF047178B3FBFDAB26 :103DFC0023FD972D710806F9CF04F9038FA6FB5C00 -:103E0C0002D1DD095080C15010FD9C34C0EDBA3F89 -:103E1C00FDBC3F3164952FA47AD47ADD0831A4E03F -:103E2C000A31020C06712BE0FD284031A4E0173159 +:103E0C0002D1DD095080C15010FD9C34C0EDE03F63 +:103E1C00FDE23F3164952FA47AD47ADD0831A4E019 +:103E2C000A31020C06712BE0FD4E4031A4E0173133 :103E3C00040C13712BE05027C15005FD482BC0CF4B -:103E4C0004F904712295FD1D408F06F931250731C7 -:103E5C00349603F504F9EDBA3FFDBC3F31020C1466 -:103E6C00F0C15005FD482BC05005FD9909FD2840B7 -:103E7C00CF04F903FD1D408F06F931250731349627 -:103E8C0003F504F9EDBA3FF504F9CFCDFB03F5CEFC -:103E9C00FBF5D0FB717293F6426CFF61E8EDBA3F13 +:103E4C0004F904712295FD43408F06F931250731A1 +:103E5C00349603F504F9EDE03FFDE23F31020C141A +:103E6C00F0C15005FD482BC05005FD9909FD4E4091 +:103E7C00CF04F903FD43408F06F931250731349601 +:103E8C0003F504F9EDE03FF504F9CFCDFB03F5CED6 +:103E9C00FBF5D0FB717293F6426CFF61E8EDE03FED :103EAC00F6BD70711393F5E4FBFD2839717AFAFDB8 :103EBC00F02DFD7E2CFD352D714B9D711302712360 :103ECC000231349302EFFACE3708CBE4BFFFCBE6D6 @@ -746,256 +746,259 @@ :103F0C007148110571381005713811057133027142 :103F1C003B22715302715B227158100571581105C7 :103F2C00CF04F905714295F6BD6AFD8609F505F9D0 -:103F3C00F42431349604D432DD20E505F9E504F996 -:103F4C008F06F9312568F5F8FBF5F6FB502EFD9937 -:103F5C0009CF05F903E504F9EF54FDBE04FD3E233A -:103F6C007173017132047143027103927162923167 -:103F7C00949E02EFFA712AE7CEA409F5F3003104FE -:103F8C00070261FDE5F300F466FDBD08CEA408311F -:103F9C00329606CF04F905EF09714395E505F9E56D -:103FAC0004F9712BE78F06F9312503F504F9C6D70F -:103FBC00D47BDF19310200585003FD592B625C0190 -:103FCC00D1DF07F504F9712295D7E47BD74A7BF052 -:103FDC00DF073104003AF47BD74A7BC8DF0AF504CB -:103FEC00F9712295CD7BF0D7310200084A7BFFDDB9 -:103FFC001FA47BD7F0C15004FD482BC08FB3FB5CD2 -:10400C009F9FB3FB7110C4FB30683B6194CD7BF078 -:10401C00D731149306F504F9712295D7716395F491 -:10402C007A717207FD4502717307D7FDD804F2D778 -:10403C00717BFAC7200CFBF8FF8FEAFBF0F9E9FB68 -:10404C00F303FD7C4E13BC048FECFBF0F9EBFBF39C -:10405C0003FD7C4E13BC028FEEFBF0F9EDFBF3037A -:10406C00FD7C4E13BB717AFAAC04BDD8F6BDDAAC4C -:10407C0004311EBDDCF6BDDEFD5D0DADD8BDDCAD85 -:10408C00DABDDEAC02BDD8F6BDDAAC02311EDADC2C -:10409C00C3DADEC3BDDCF6BDDEFD5D0DC0BDDEC02A -:1040AC00BDDCADDEFDD30EADD8BDDCADDABDDEAB17 -:1040BC00BDD8F6BDDAAB311EDADCC3DADEC3BDDC4B -:1040CC00F6BDDEFD5D0DC0BDDEC0BDDCADDEFDD3DD -:1040DC000EDADAADD8FD0B44C3C58D885C3FF031E8 -:1040EC007E0440FC14C2C0B9A488F6BC08BC0A9C6F -:1040FC00078C074C2EDD3D8D880E0770F161DC605E -:10410C005C3FF0317E127940FCBDD8F6BDDA8C07ED -:10411C0073095C22318FBDDC70BDDEFD5D0DAC081A -:10412C00BDDCAC0AFDD30EADDABC0AADD8BC08615F -:10413C005907EFBDAC08BDD8AC0ABDDAC9DC000428 -:10414C00F6FD270EC9DCFFFFF6FD280FADD8BD82AA -:10415C00AF3AFC4682DD11AF3CFCBF3EFCAF3AFCF3 -:10416C00BF3CFCAD82BF3AFCAF3CFC423EFCDC46A3 -:10417C00AF3AFC423CFCDE3EAD26423AFCDE374A0E -:10418C002A16DC1A4A2AA0DE138D844B2ADE0DAFC8 -:10419C003AFC268644691061C8FDF441F42AAF3A12 -:1041AC00FC445146DC0AAF3AFC241027BD28EF0D25 -:1041BC00C928F82AEF074A2AFF61E8A42AAF3EFC77 -:1041CC00423CFCDC18AF3CFC423AFCDE10AF3AFC43 -:1041DC004628DE09F484AF3AFCBD86EF074A84FF1B -:1041EC0061E8A484100CC6D7717BFAC7710A9E31A2 -:1041FC00929E02EFFA8E949F34FC8E969F35FC8E25 -:10420C00979F36FC8E989F37FC8E939F38FC8E922E -:10421C009F39FC710B9E717AFA8F37FCFD3C0F763F -:10422C00FD894313BD80D5EFFBDF0AD5F0FBDF051D -:10423C00D5F1FBDD25F6B14680DF11C9803722664A -:10424C005C0391DF060A80181A81009617FDAC44B6 -:10425C0013FDCC4231049602EF61520692926934FE -:10426C00FC682EFCDFF6AD80BD7EF87CF3311C794A -:10427C000AF944FEFFDD44D87CF101040AF914A9C3 -:10428C0044FFFFDF04E6B9EF0BD87CF101040AF917 -:10429C0014A9A1B9717BFAA0EFFBD5EFFBDF1CA031 -:1042AC00F0FBD5F0FBDF14A0F1FBD5F1FBDF0CCF5D -:1042BC00EFFBFFCFF0FBFFCFF1FBFFC6717AFAD714 -:1042CC00C716D87CF10744A800DC05710296EF1CD8 -:1042DC00F647DD18A47C4A7CA8DC05710296EF0C2D -:1042EC00F87CF3311CF6780AF9B7EFE4C6D7C75659 -:1042FC00A89666F0317E12F6B1780AF966D1DFF134 -:10430C00717BFAF5EFFBF5F0FBF5F1FBF47C710337 -:10431C0096C6717AFAD7C72004FBF8FFD446DF168D -:10432C008D7C9D89717BFA52069292692EFC68C035 -:10433C00FCDFF6717AFA4A4606DE0EE84609C0FC46 -:10434C009C03A4468C0372EF30F889F3311C790A74 -:10435C00F9BB311296058B9C03EF0F8C019C03D497 -:10436C0089DF05CD89A7EF02B48971807117966139 -:10437C00DC61FB7111968C03721004C6D7C7200840 -:10438C00FBF8FF8F37FCFD3C0F9C078F36FCFD3C88 -:10439C000F9C068F35FCFD3C0F9C058F34FCFD3CBF -:1043AC000F9C048F38FC9C038F39FC9C028C0631CB -:1043BC008E0112791A20BB8C075C03D1DF098C06A5 -:1043CC004C0361C86179008C05318EB1610900BB69 -:1043DC00313D120103BB8B0E04708C011C00BB8F92 -:1043EC00F4FB4E03DC0E8C034FF4FBDC0B8C024F06 -:1043FC00F5FBDC04AB12EF03ABB1121008C6D7C748 -:10440C00C3C12008FBF8FFF661490A61F86149084D -:10441C00DF07F7340000EDA844E6BC04F6BC06AC9C -:10442C000ABC02AC08BBAC06614902AC0461F86181 -:10443C004900DE28AC04BDD8AC06BDDAE1FDE20EC5 -:10444C00ADDABC06ADD8BC04ABBDD8AC02BDDAE16C -:10445C00FDFD0EADDABC02ADD8BBEFCAAC06BC029A -:10446C00AC04BBAC08BDD8AC0ABDDAAC04BDDCAC4A -:10447C0006FD600EAC04BDDCAC06FDD30EE1FDFD0B -:10448C000EADDABC06ADD8BC04AC06614902AC0476 -:10449C0061F8614900DCC5AC0214AB12100CC6D734 -:1044AC00C7C12004FBF8FF8F31FCFD3C0F9C034E71 -:1044BC0004DF1CAD7E4680DE07AD80267E12EF4009 -:1044CC00F64680DF07467EDD03E7EF34F7EF318CED -:1044DC0004318EB1128C03318E43DF183038222612 -:1044EC007E0680BB8C045C0391DF05AB041800BB1B -:1044FC00AB12EF0C8C034E04DE0532A900EF01F772 -:10450C001006C6D7717BFA3122960CF6468CDD0765 -:10451C00B68C717AFAEF7C712396717AFA4004F9B1 -:10452C0004DF07715307F42CEF69D9CFFBF1E724B3 -:10453C000000DD0F23DD1A23DD1023DD5323DD27DF -:10454C0023DD38715307F42CEF49715207F42CEF2B -:10455C0042D42CDF07715207E42CEF05715307F49A -:10456C002CC98CFA00EF2CD42CDF0B715207E42CE5 -:10457C00C98CFA00EF1DF5CFFBEF18D42CDF0B71B3 -:10458C005307E42CC98CFA00EF09CFCFFB02EF03E1 -:10459C00FDA045D7D905FCF1E7240000DD0923DD9A -:1045AC002123DD0923EF1B715307F42CD7D42CDF07 -:1045BC0007715207E42CEF05715307F42CC98C2DAD -:1045CC0001D7715207E42CD731629301D771039450 -:1045DC00D9CDFBF1E7240000DD1223DD1923DD1119 -:1045EC0023DD2623DD3423DD3923DD3FFD6046EF5B -:1045FC003DFD8146EF38D9CCFBC1AE6CFD3E2DC0E4 -:10460C00F313BE6C712304EF25F0C1AE6CFD3E2D8F -:10461C00C0F313BE6C712304EF14F6BE6C7122044C -:10462C00EF0CCB6CFF00712304EF03FDF546400447 -:10463C00F905DD064004F901DF06712304710394CA -:10464C003104940FF6BE64BE6A31220402EF02F606 -:10465C0090BE6ED7CD2E47F48EAE6C317DBFCAFCAA -:10466C00FDCA46D2DF0ED9CCFBC1AE6CFD3E2DC0CF -:10467C00F313BE6CD7FDCA46D2DD0DCD2E47F48E9A -:10468C00AE6C317DBFCAFCD7E88E0934205080D681 -:10469C00BFC6FC22CAFCBDD8304700FD880DBFC880 -:1046AC00FC30C6FCFD542DF313BE6CB42ED42EDF9F -:1046BC000CCD2E47A48E4A8E1F61C8F48ED740AF06 -:1046CC00FB0BDC05712304F2D740AFFB0661D8313C -:1046DC00229211F0C1AE6CFD3E2DC0F313BE6C7175 -:1046EC002204EF03FDF546E2D7710294F0C1AE6CE3 -:1046FC00FD3E2DC0F313BE6CA48F4A8F40DC37F403 -:10470C008FD890F1313F0412FD14D890F1BDD850E0 -:10471C0008FDD70D087208E6D2DD040192DFFC8992 -:10472C006158D1DD05712204EF03712304A4904A72 -:10473C00902061C8F490D7C73026FDC6D771807120 -:10474C007DFADE035201D75200D7C7C12004FBF813 -:10475C00FF17040300C1E0C15010C150A4FD8B022F -:10476C001006629C02D1DD058C0272EF4C8C0C7031 -:10477C00C18C0470FDC947C0629C02D1DD058C025E -:10478C0072EF368C0CD1DD3017A1C1E0C15010C1D5 -:10479C0050A4FD8B021006629C02D1DD058C0272C6 -:1047AC00EF178C015C7CD1DD03F2EF0D8C0370C133 -:1047BC005010FDC947C0EF01F21006C6D7C78806D6 -:1047CC0016710AE650A4FDB703D2DD07713393527C -:1047DC0002EF2217FDD3036770FDD303FD1E0450B7 -:1047EC00A4FDD3035020FDD30350AAFDD303FD47F2 -:0747FC0004713393F2C6D7EC -:1048030061FC61FCC1C3C5C7520C929269D4FEC15D -:10481300DFF88EFD708EFCC1717AFA4004F903DF74 -:104823000530032A6194C09EFC609EFD34D4FE5281 -:1048330006C0B9A5A592DFF9C6C4C2C061FC61DF99 -:10484300520C929269D4FEC1DFF88EFD708EFCC1CA -:104853008F4105775C04D1DD06675C01D1DD503102 -:104863005494367162077153948FB4FB5FBCFBD1D0 -:10487300DF1B8FB5FB5FBDFBD1DF128FB6FB5FBEC6 -:10488300FBD1DF098FB7FB5FBFFBD1DD0C316207C3 -:1048930002EFFA716307716B27711396FD2E30F4E3 -:1048A300227148500571605005717AFAED9D496790 -:1048B3005C02D1DD16D422DD124A2202DD0DF42280 -:1048C3007148500571605005717AFA717AFA8D2238 -:1048D300318FE7240000DD0823DD1423DD2CEF4AAC -:1048E300F4467140500571505005E422ED9D498F07 -:1048F30040059D47715050058D479D49D847FDE2BE -:1049030033629D48CD2202ED9D49675C02D1DD17DC -:10491300675C10D1DD05CD2203EF0F71485005719F -:10492300605005F422EF73CD22044A2203DF108D79 -:10493300489F4005D848C1D847FD6E34C0EF1F8F4C -:10494300400576717447DC054A4702DE0671605004 -:1049530005EF47C7D847FDAF30C071505005D84960 -:10496300F1242900DD27240400DD22242200DD1D9B -:10497300241100DD0C240100DD13241E00DD0EEFE5 -:104983000A4A4760DF07CD4761EF02A4474A220383 -:10499300DF08D847FDE233629D48C09EFC609EFD60 -:1049A30034D4FE5206C0B9A5A592DFF961FCC1C398 -:1049B300C5C7520C929269D4FEC1DFF88EFD708E8A -:1049C300FCC1717AFA51405F0401D1DD06F616A7E6 -:1049D30047DFF2300400BF2401F6BF2A01300B0B7E -:1049E300BF2801FD4502300B0FBF2801FD450230F2 -:1049F3000F0FBF2801710AE6F6420C01DD33AF0445 -:104A030001BF0C0131529329715293710BE2D84DBE -:104A1300FDB7033184BD02EFFACBB422FBD84FF1CB -:104A2300BEB8714BE1714BE5710ABD8D4E9E44EFEB -:104A33000C715393714AE5717BBD713393C09EFC36 -:104A4300609EFD34D4FE5206C0B9A5A592DFF9C617 -:104A5300C4C2C061FCC1C5717AFAD44CDD0BEA4A09 -:104A6300899E44A64AB44CEF33710AE6300400BF72 -:104A73002401F6BF2A01300B0BBF28010000000000 -:104A830000000000510FBF280100000000000000DB -:104A930000500FBF2801712393713393C4C061FC8D -:104AA30061EF520C929269D4FEC1DFF88EFD708ED5 -:104AB300FCC12006FBF8FF71503002CEABACCC0436 -:104AC30000F6BB31B2E210617900F6614900DFF311 -:104AD30071603002ED5D4B8E519C03713BE28C03A0 -:104AE3005C02D1DD1E8C035C08D1DF0971503002FA -:104AF300CC0400EFCC8C0570FD5035629E50CC0485 -:104B030002EFBE8C035C03D1DF408E509C027150D8 -:104B130030028C04D1DF0E8C0270FD9635629C0549 -:104B2300CC0401EF328C044C02DF0671603002EFDB -:104B330029CF34025A716030028C0270C18C057027 -:104B4300FDF834C0CF34024AEF108C035C01D1DD91 -:104B53000671603002EF03EDC44A1006C09EFC608C -:104B63009EFD34D4FE5206C0B9A5A592DFF961FCBF -:104B7300C1C3C5C7520C929269D4FEC1DFF88EFD42 -:104B8300708EFCC1710A9E31929E02EFFA8FDEFB9A -:104B93004F96FFDF198FDFFB4F97FFDF118FE0FB8E -:104BA3004F98FFDF095004C15011FD9C34C0710BB5 -:104BB3009EC09EFC609EFD34D4FE5206C0B9A5A5DE -:104BC30092DFF9C6C4C2C061FCE46661FCC1C3C51F -:104BD300C7520C929269D4FEC1DFF88EFD708EFC31 -:104BE300C1C1FBF8FF8D1F9C018E31318EE7240676 -:104BF30000DD0823DD0E23DD22EF38717AFA8C0104 -:104C03009D5EEF2F717AFA4007F901DF068C019D53 -:104C13005DEF2051FF2E019D5DEF18717AFA8C0133 -:104C23009D304004F903DD064004F904DF053073C9 -:104C33002561944031FF09DE05A031FFEF0771586C -:104C4300F000716294710BE3C0C09EFC609EFD3462 -:104C5300D4FE5206C0B9A5A592DFF9C6C4C2C0618D -:104C6300FC717BFAC7D46661F831249527712395CB -:104C7300D466DD05B466CEABAC717AFA5600664CE9 -:104C83000ADD1172F3311C79D8FCCEFC0061CA61D4 -:104C9300A486EFEA717AFAF2C6D7C7C1C1FBF8FF5F -:104CA300CC01008C014C0ADE36717BFA8C01F031A9 -:104CB3007E0410FC14A96168DF09AC02B9717AFAA9 -:104CC300F2EF1D8C01F0317E127910FC614902DF95 -:104CD30006717AFAE2EF09717AFA615901EFC4E2D7 -:104CE3001004C6D7C72004FBF8FFF64210FC61F896 -:104CF300EDC94D717BFA9C038C034C0ADE3C8C039B -:104D0300F0317E0410FC14A96168DF05717AFAEFB3 -:104D130029717AFA8C0372F3311C7910FCCEFC00F2 -:104D230061CA629C02D1DF0A8C03F0317E12E678FD -:104D330010FC717BFA615903EFBECC0200CC010178 -:104D43008C02F0317E0410FC14A96168DD788C02BA -:104D5300F0317E127910FCE743DF658C014C0ADEEB -:104D63005F8C01F0317E127910FCE743DD4D717BDE -:104D7300FA8C01F0317E0410FC14A96168DF18611C -:104D830069018C01F0317E12F67810FC8C024E0121 -:104D9300DCED717AFAEF2F8C01F0317E0410FC14F4 -:104DA300A9128C02F0317E337810FC8C01F0317E35 -:104DB30012E67810FC615902717AFA615901EF9B8E -:104DC300615902ED434D00F21004C6D761FF520C46 -:104DD300929269D4FEC1DFF88EFD708EFCC1717AA8 -:104DE300FA8FE4FB5C03D1DD114004F903DD0640D7 -:104DF30004F904DF05305C386194C09EFC609EFDBD -:104E030034D4FE5206C0B9A5A592DFF961FC61FC5A -:044E130061FC61FCE1 -:0A4E180000060C12181E242A303682 -:104E2200ACFB0000000062FE00000000B139E33577 -:104E32008C22D4451B2ECA2E1045D73A4808BC3CBA -:104E420028FC36FE20FE02F903F929FC30FE2AFC7A -:104E52002BFC08F926FC6CFF1AFF6EFF6AFF64FF49 -:0A4E620027FC66FF2CFC5555555542 -:104E6C00FF0000000000983AF82AFF0000004700FD -:104E7C00317503F7332312D714AEF8C716AC0612EC -:104E8C00C5AC0416F643DD078B99A7A5B3EFF5C2A5 -:024E9C00C6D777 -:024FF400324E3B -:0A4FF60031373A32353A3139000004 +:103F3C00F42431349604D432DD46E505F9E504F970 +:103F4C008F06F9312512F5F8FBF5F6FB502EFD998D +:103F5C0009CF05F903E504F9F5F8FBF5F6FB502E4E +:103F6C00FD990950FAFD990950FAFD990950FAFD8D +:103F7C00990950FAFD9909CF05F903E504F9EF54B5 +:103F8C00FDBE04FD3E237173017132047143027155 +:103F9C00039271629231949E02EFFA712AE7CEA4D9 +:103FAC0009F5F3003104070261FDE5F300F466FD49 +:103FBC00BD08CEA40831329606CF04F905EF09717D +:103FCC004395E505F9E504F9712BE78F06F93125E1 +:103FDC0003F504F9C6D7D47BDF193102005850031E +:103FEC00FD592B625C01D1DF07F504F9712295D7DD +:103FFC00E47BD74A7BF0DF073104003AF47BD74AE5 +:10400C007BC8DF0AF504F9712295CD7BF0D731021C +:10401C0000084A7BFFDD1FA47BD7F0C15004FD488C +:10402C002BC08FB3FB5C9F9FB3FB7110C4FB30683C +:10403C003B6194CD7BF0D731149306F504F97122D2 +:10404C0095D7716395F47A717207FD450271730708 +:10405C00D7FDD804F2D7717BFAC7200CFBF8FF8F81 +:10406C00EAFBF0F9E9FBF303FDA64E13BC048FEC5D +:10407C00FBF0F9EBFBF303FDA64E13BC028FEEFB3A +:10408C00F0F9EDFBF303FDA64E13BB717AFAAC0409 +:10409C00BDD8F6BDDAAC04311EBDDCF6BDDEFD5D6F +:1040AC000DADD8BDDCADDABDDEAC02BDD8F6BDDAE7 +:1040BC00AC02311EDADCC3DADEC3BDDCF6BDDEFDDC +:1040CC005D0DC0BDDEC0BDDCADDEFDD30EADD8BD1B +:1040DC00DCADDABDDEABBDD8F6BDDAAB311EDADC59 +:1040EC00C3DADEC3BDDCF6BDDEFD5D0DC0BDDEC0DA +:1040FC00BDDCADDEFDD30EDADAADD8FD3144C3C57F +:10410C008D885C3FF0317E0440FC14C2C0B9A48899 +:10411C00F6BC08BC0A9C078C074C2EDD3D8D880E26 +:10412C000770F161DC605C3FF0317E127940FCBDC0 +:10413C00D8F6BDDA8C0773095C22318FBDDC70BDFB +:10414C00DEFD5D0DAC08BDDCAC0AFDD30EADDABCFA +:10415C000AADD8BC08615907EFBDAC08BDD8AC0A94 +:10416C00BDDAC9DC0004F6FD270EC9DCFFFFF6FD45 +:10417C00280FADD8BD82AF3AFC4682DD11AF3CFCB6 +:10418C00BF3EFCAF3AFCBF3CFCAD82BF3AFCAF3C3F +:10419C00FC423EFCDC46AF3AFC423CFCDE3EAD262B +:1041AC00423AFCDE374A2A16DC1A4A2AA0DE138D64 +:1041BC00844B2ADE0DAF3AFC268644691061C8FD9B +:1041CC001A42F42AAF3AFC445146DC0AAF3AFC24BA +:1041DC001027BD28EF0DC928F82AEF074A2AFF61DE +:1041EC00E8A42AAF3EFC423CFCDC18AF3CFC423A53 +:1041FC00FCDE10AF3AFC4628DE09F484AF3AFCBD75 +:10420C0086EF074A84FF61E8A484100CC6D7717B43 +:10421C00FAC7710A9E31929E02EFFA8E949F34FC7B +:10422C008E969F35FC8E979F36FC8E989F37FC8E12 +:10423C00939F38FC8E929F39FC710B9E717AFA8F8A +:10424C0037FCFD3C0F76FDAF4313BD80D5EFFBDF94 +:10425C000AD5F0FBDF05D5F1FBDD25F6B14680DF95 +:10426C0011C9803722665C0391DF060A80181A8117 +:10427C00009617FDD24413FDF24231049602EF6111 +:10428C00520692926934FC682EFCDFF6AD80BD7E3E +:10429C00F87CF3311C790AF944FEFFDD44D87CF13B +:1042AC0001040AF914A944FFFFDF04E6B9EF0BD8A7 +:1042BC007CF101040AF914A9A1B9717BFAA0EFFBF6 +:1042CC00D5EFFBDF1CA0F0FBD5F0FBDF14A0F1FB5E +:1042DC00D5F1FBDF0CCFEFFBFFCFF0FBFFCFF1FBFA +:1042EC00FFC6717AFAD7C716D87CF10744A800DC50 +:1042FC0005710296EF1CF647DD18A47C4A7CA8DCFD +:10430C0005710296EF0CF87CF3311CF6780AF9B7BC +:10431C00EFE4C6D7C756A89666F0317E12F6B17890 +:10432C000AF966D1DFF1717BFAF5EFFBF5F0FBF5DD +:10433C00F1FBF47C710396C6717AFAD7C72004FBA3 +:10434C00F8FFD446DF168D7C9D89717BFA5206925C +:10435C0092692EFC68C0FCDFF6717AFA4A4606DEDA +:10436C000EE84609C0FC9C03A4468C0372EF30F89F +:10437C0089F3311C790AF9BB311296058B9C03EF3A +:10438C000F8C019C03D489DF05CD89A7EF02B4897A +:10439C00718071179661DC61FB7111968C03721040 +:1043AC0004C6D7C72008FBF8FF8F37FCFD3C0F9CD9 +:1043BC00078F36FCFD3C0F9C068F35FCFD3C0F9C9B +:1043CC00058F34FCFD3C0F9C048F38FC9C038F390B +:1043DC00FC9C028C06318E0112791A20BB8C075C76 +:1043EC0003D1DF098C064C0361C86179008C05315F +:1043FC008EB1610900BB313D120103BB8B0E047001 +:10440C008C011C00BB8FF4FB4E03DC0E8C034FF4B1 +:10441C00FBDC0B8C024FF5FBDC04AB12EF03ABB1F6 +:10442C00121008C6D7C7C3C12008FBF8FFF66149B4 +:10443C000A61F8614908DF07F7340000EDCE44E665 +:10444C00BC04F6BC06AC0ABC02AC08BBAC066149A9 +:10445C0002AC0461F8614900DE28AC04BDD8AC069E +:10446C00BDDAE1FDE20EADDABC06ADD8BC04ABBDE5 +:10447C00D8AC02BDDAE1FDFD0EADDABC02ADD8BBA5 +:10448C00EFCAAC06BC02AC04BBAC08BDD8AC0ABDD0 +:10449C00DAAC04BDDCAC06FD600EAC04BDDCAC06D5 +:1044AC00FDD30EE1FDFD0EADDABC06ADD8BC04ACFF +:1044BC0006614902AC0461F8614900DCC5AC021428 +:1044CC00AB12100CC6D7C7C12004FBF8FF8F31FC10 +:1044DC00FD3C0F9C034E04DF1CAD7E4680DE07AD19 +:1044EC0080267E12EF40F64680DF07467EDD03E72E +:1044FC00EF34F7EF318C04318EB1128C03318E43D3 +:10450C00DF18303822267E0680BB8C045C0391DFDA +:10451C0005AB041800BBAB12EF0C8C034E04DE058C +:10452C0032A900EF01F71006C6D7717BFA3122963B +:10453C000CF6468CDD07B68C717AFAEF7C712396FB +:10454C00717AFA4004F904DF07715307F42CEF6910 +:10455C00D9CFFBF1E7240000DD0F23DD1A23DD109A +:10456C0023DD5323DD2723DD38715307F42CEF496A +:10457C00715207F42CEF42D42CDF07715207E42C54 +:10458C00EF05715307F42CC98CFA00EF2CD42CDFF7 +:10459C000B715207E42CC98CFA00EF1DF5CFFBEF21 +:1045AC0018D42CDF0B715307E42CC98CFA00EF09DB +:1045BC00CFCFFB02EF03FDC645D7D905FCF1E724AD +:1045CC000000DD0923DD2123DD0923EF1B715307D7 +:1045DC00F42CD7D42CDF07715207E42CEF05715360 +:1045EC0007F42CC98C2D01D7715207E42CD73162FA +:1045FC009301D7710394D9CDFBF1E7240000DD12B0 +:10460C0023DD1923DD1123DD2623DD3423DD3923BE +:10461C00DD3FFD8646EF3DFDA746EF38D9CCFBC10B +:10462C00AE6CFD3E2DC0F313BE6C712304EF25F070 +:10463C00C1AE6CFD3E2DC0F313BE6C712304EF14A0 +:10464C00F6BE6C712204EF0CCB6CFF00712304EFEF +:10465C0003FD1B474004F905DD064004F901DF06A4 +:10466C007123047103943104940FF6BE64BE6A3155 +:10467C00220402EF02F690BE6ED7CD2E47F48EAE1A +:10468C006C317DBFCAFCFDF046D2DF0ED9CCFBC12C +:10469C00AE6CFD3E2DC0F313BE6CD7FDF046D2DDE3 +:1046AC000DCD2E47F48EAE6C317DBFCAFCD7E88E93 +:1046BC000934205080D6BFC6FC22CAFCBDD8304776 +:1046CC0000FD880DBFC8FC30C6FCFD542DF313BE95 +:1046DC006CB42ED42EDF0CCD2E47A48E4A8E1F61C7 +:1046EC00C8F48ED740AFFB0BDC05712304F2D74026 +:1046FC00AFFB0661D831229211F0C1AE6CFD3E2D9C +:10470C00C0F313BE6C712204EF03FD1B47E2D7719B +:10471C000294F0C1AE6CFD3E2DC0F313BE6CA48FA1 +:10472C004A8F40DC37F48FD890F1313F0412FD14DE +:10473C00D890F1BDD85008FDD70D087208E6D2DD2F +:10474C00040192DFFC896158D1DD05712204EF036D +:10475C00712304A4904A902061C8F490D7C73026E6 +:10476C00FDC6D77180717DFADE035201D75200D796 +:10477C00C7C12004FBF8FF17040300C1E0C15010AF +:10478C00C150A4FD8B021006629C02D1DD058C0287 +:10479C0072EF518C0C70C18C0470FDF447C0629C9C +:1047AC0002D1DD058C0272EF3B8C035C7DD1DF0303 +:1047BC00F2EF3117A1C1E0C15010C150A4FD8B0222 +:1047CC001006629C02D1DD058C0272EF178C015C25 +:1047DC007DD1DD03F2EF0D8C0370C15010FDF44759 +:1047EC00C0629C021006C6D7C7880616710AE6502E +:1047FC00A4FDB703D2DD077133935202EF2217FDEC +:10480C00D3036770FDD303FD1E0450A4FDD30350E6 +:10481C0020FDD30350AAFDD303FD4704713393F25B +:02482C00C6D7ED +:10482E0061FC61FCC1C3C5C7520C929269D4FEC132 +:10483E00DFF88EFD708EFCC1717AFA4004F903DF49 +:10484E000530032A6194C09EFC609EFD34D4FE5256 +:10485E0006C0B9A5A592DFF9C6C4C2C061FC61DF6E +:10486E00520C929269D4FEC1DFF88EFD708EFCC19F +:10487E008F4105775C04D1DD06675C01D1DD5031D7 +:10488E005494367162077153948FB4FB5FBCFBD1A5 +:10489E00DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE9B +:1048AE00FBD1DF098FB7FB5FBFFBD1DD0C31620798 +:1048BE0002EFFA716307716B27711396FD2E30F4B8 +:1048CE00227148500571605005717AFAEDC849673A +:1048DE005C02D1DD16D422DD124A2202DD0DF42255 +:1048EE007148500571605005717AFA717AFA8D220D +:1048FE00318FE7240000DD0823DD1423DD2CEF4A81 +:10490E00F4467140500571505005E422EDC8498FB0 +:10491E0040059D47715050058D479D49D847FDE292 +:10492E0033629D48CD2202EDC849675C02D1DD1786 +:10493E00675C10D1DD05CD2203EF0F714850057174 +:10494E00605005F422EF73CD22044A2203DF108D4E +:10495E00489F4005D848C1D847FD6E34C0EF1F8F21 +:10496E00400576717447DC054A4702DE06716050D9 +:10497E0005EF47C7D847FDAF30C071505005D84935 +:10498E00F1242900DD27240400DD22242200DD1D70 +:10499E00241100DD0C240100DD13241E00DD0EEFBA +:1049AE000A4A4760DF07CD4761EF02A4474A220358 +:1049BE00DF08D847FDE233629D48C09EFC609EFD35 +:1049CE0034D4FE5206C0B9A5A592DFF961FCC1C36D +:1049DE00C5C7520C929269D4FEC1DFF88EFD708E5F +:1049EE00FCC1717AFA51405F0401D1DD06F616A7BB +:1049FE0047DFF2300400BF2401F6BF2A01300B0B53 +:104A0E00BF2801FD4502300B0FBF2801FD450230C6 +:104A1E000F0FBF2801710AE6F6420C01DD33AF0419 +:104A2E0001BF0C0131529329715293710BE2D84D93 +:104A3E00FDB7033184BD02EFFACBB422FBD84FF1A0 +:104A4E00BEB8714BE1714BE5710ABD8D4E9E44EFC0 +:104A5E000C715393714AE5717BBD713393C09EFC0B +:104A6E00609EFD34D4FE5206C0B9A5A592DFF9C6EC +:104A7E00C4C2C061FCC1C5717AFAD44CDD0BEA4ADE +:104A8E00899E44A64AB44CEF33710AE6300400BF47 +:104A9E002401F6BF2A01300B0BBF280100000000D5 +:104AAE0000000000510FBF280100000000000000B0 +:104ABE0000500FBF2801712393713393C4C061FC62 +:104ACE0061EF520C929269D4FEC1DFF88EFD708EAA +:104ADE00FCC12006FBF8FF71503002CEABACCC040B +:104AEE0000F6BB31B2E210617900F6614900DFF3E6 +:104AFE0071603002ED884B8E519C03713BE28C034A +:104B0E005C02D1DD1E8C035C08D1DF0971503002CE +:104B1E00CC0400EFCC8C0570FD5035629E50CC0459 +:104B2E0002EFBE8C035C03D1DF408E509C027150AD +:104B3E0030028C04D1DF0E8C0270FD9635629C051E +:104B4E00CC0401EF328C044C02DF0671603002EFB0 +:104B5E0029CF34025A716030028C0270C18C0570FC +:104B6E00FDF834C0CF34024AEF108C035C01D1DD66 +:104B7E000671603002EF03EDEF4A1006C09EFC6036 +:104B8E009EFD34D4FE5206C0B9A5A592DFF961FC94 +:104B9E00C1C3C5C7520C929269D4FEC1DFF88EFD17 +:104BAE00708EFCC1710A9E31929E02EFFA8FDEFB6F +:104BBE004F96FFDF198FDFFB4F97FFDF118FE0FB63 +:104BCE004F98FFDF095004C15011FD9C34C0710B8A +:104BDE009EC09EFC609EFD34D4FE5206C0B9A5A5B3 +:104BEE0092DFF9C6C4C2C061FCE46661FCC1C3C5F4 +:104BFE00C7520C929269D4FEC1DFF88EFD708EFC06 +:104C0E00C1C1FBF8FF8D1F9C018E31318EE724064A +:104C1E0000DD0823DD0E23DD22EF38717AFA8C01D8 +:104C2E009D5EEF2F717AFA4007F901DF068C019D28 +:104C3E005DEF2051FF2E019D5DEF18717AFA8C0108 +:104C4E009D304004F903DD064004F904DF0530739E +:104C5E002561944031FF09DE05A031FFEF07715841 +:104C6E00F000716294710BE3C0C09EFC609EFD3437 +:104C7E00D4FE5206C0B9A5A592DFF9C6C4C2C06162 +:104C8E00FC717BFAC7D46661F831249527712395A0 +:104C9E00D466DD05B466CEABAC717AFA5600664CBE +:104CAE000ADD1172F3311C79D8FCCEFC0061CA61A9 +:104CBE00A486EFEA717AFAF2C6D7C7C1C1FBF8FF34 +:104CCE00CC01008C014C0ADE36717BFA8C01F0317E +:104CDE007E0410FC14A96168DF09AC02B9717AFA7E +:104CEE00F2EF1D8C01F0317E127910FC614902DF6A +:104CFE0006717AFAE2EF09717AFA615901EFC4E2AC +:104D0E001004C6D7C72004FBF8FFF64210FC61F86A +:104D1E00EDF44D717BFA9C038C034C0ADE3C8C0344 +:104D2E00F0317E0410FC14A96168DF05717AFAEF88 +:104D3E0029717AFA8C0372F3311C7910FCCEFC00C7 +:104D4E0061CA629C02D1DF0A8C03F0317E12E678D2 +:104D5E0010FC717BFA615903EFBECC0200CC01014D +:104D6E008C02F0317E0410FC14A96168DD788C028F +:104D7E00F0317E127910FCE743DF658C014C0ADEC0 +:104D8E005F8C01F0317E127910FCE743DD4D717BB3 +:104D9E00FA8C01F0317E0410FC14A96168DF1861F1 +:104DAE0069018C01F0317E12F67810FC8C024E01F6 +:104DBE00DCED717AFAEF2F8C01F0317E0410FC14C9 +:104DCE00A9128C02F0317E337810FC8C01F0317E0A +:104DDE0012E67810FC615902717AFA615901EF9B63 +:104DEE00615902ED6E4D00F21004C6D761FF520CF0 +:104DFE00929269D4FEC1DFF88EFD708EFCC1717A7D +:104E0E00FA8FE4FB5C03D1DD114004F903DD0640AB +:104E1E0004F904DF05305C386194C09EFC609EFD91 +:104E2E0034D4FE5206C0B9A5A592DFF961FC61FC2F +:044E3E0061FC61FCB6 +:0A4E420000060C12181E242A303658 +:104E4C00ACFB0000000062FE00000000B139E3354D +:104E5C008C22FA451B2ECA2E3645D73A4808BC3C44 +:104E6C0028FC36FE20FE02F903F929FC30FE2AFC50 +:104E7C002BFC08F926FC6CFF1AFF6EFF6AFF64FF1F +:0A4E8C0027FC66FF2CFC5555555518 +:104E9600FF0000000000983AF82AFF0000004700D3 +:104EA600317503F7332312D714AEF8C716AC0612C2 +:104EB600C5AC0416F643DD078B99A7A5B3EFF5C27B +:024EC600C6D74D +:024FF400325039 +:0A4FF60031353A32313A323800000A :00000001FF  \ No newline at end of file diff --git a/branches/2.20_CE-ARM-sdk3.2.5/bsr.lmf b/branches/2.20_CE-ARM-sdk3.2.5/bsr.lmf index 3265d6a..9360095 100644 Binary files a/branches/2.20_CE-ARM-sdk3.2.5/bsr.lmf and b/branches/2.20_CE-ARM-sdk3.2.5/bsr.lmf differ diff --git a/branches/2.20_CE-ARM-sdk3.2.5/bsr_k0r.map b/branches/2.20_CE-ARM-sdk3.2.5/bsr_k0r.map index dfa2f39..235f8f2 100644 --- a/branches/2.20_CE-ARM-sdk3.2.5/bsr_k0r.map +++ b/branches/2.20_CE-ARM-sdk3.2.5/bsr_k0r.map @@ -1,9 +1,9 @@ -78K0R Linker W1.33 Date:26 Jan 2012 Page: 1 +78K0R Linker W1.33 Date:13 Jul 2012 Page: 1 -Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - +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 @@ -26,8 +26,8 @@ Direc-file:bsr_mcu.dr *** Link information *** 73 output segment(s) - 3D69H byte(s) real data - 6215 symbol(s) defined + 3D94H byte(s) real data + 6220 symbol(s) defined *** Memory map *** @@ -254,7 +254,7 @@ Direc-file:bsr_mcu.dr 0228CH 00000H @@CNST i2c_mcu-sub 0228CH 00000H - ROM_CODE 0228CH 02577H CSEG + ROM_CODE 0228CH 025A2H CSEG ROM_CODE pm 0228CH 0099FH ROM_CODE i2c_ctr 02C2BH 0005CH ROM_CODE main 02C87H 00055H @@ -269,288 +269,287 @@ Direc-file:bsr_mcu.dr ROM_CODE sw 039B1H 00126H ROM_CODE task_misc 03AD7H 001E5H - ROM_CODE task_sys 03CBCH 00380H + ROM_CODE task_sys 03CBCH 003A6H ROM_CODE pedo_alg_thre_det2 - 0403CH 004D4H - ROM_CODE led_cam 04510H 000C4H - ROM_CODE led_pow 045D4H 0016FH - ROM_CODE voltable 04743H 00000H + 04062H 004D4H + ROM_CODE led_cam 04536H 000C4H + ROM_CODE led_pow 045FAH 0016FH + ROM_CODE voltable 04769H 00000H ROM_CODE pedo_lpf_coeff - 04743H 00000H + 04769H 00000H ROM_CODE kanaria_c - 04743H 00006H - ROM_CODE get_ei 04749H 0000DH + 04769H 00006H + ROM_CODE get_ei 0476FH 0000DH ROM_CODE i2c_mcu-sub - 04756H 000ADH - @@BASE 04803H 00614H CSEG BASE - @@BASE loader 04803H 00000H - @@BASE pm 04803H 0003EH - @@BASE i2c_ctr 04841H 00170H - @@BASE main 049B1H 00000H - @@BASE magic 049B1H 00000H - @@BASE WDT 049B1H 00000H - @@BASE i2c_mcu 049B1H 000F2H - @@BASE i2c_twl 04AA3H 000D0H - @@BASE led 04B73H 00000H - @@BASE rtc 04B73H 0005DH - @@BASE vreg_ctr 04BD0H 00000H - @@BASE vreg_twl 04BD0H 00000H - @@BASE adc 04BD0H 00094H - @@BASE renge 04C64H 0016BH - @@BASE accero 04DCFH 00042H + 0477CH 000B2H + @@BASE 0482EH 00614H CSEG BASE + @@BASE loader 0482EH 00000H + @@BASE pm 0482EH 0003EH + @@BASE i2c_ctr 0486CH 00170H + @@BASE main 049DCH 00000H + @@BASE magic 049DCH 00000H + @@BASE WDT 049DCH 00000H + @@BASE i2c_mcu 049DCH 000F2H + @@BASE i2c_twl 04ACEH 000D0H + @@BASE led 04B9EH 00000H + @@BASE rtc 04B9EH 0005DH + @@BASE vreg_ctr 04BFBH 00000H + @@BASE vreg_twl 04BFBH 00000H + @@BASE adc 04BFBH 00094H + @@BASE renge 04C8FH 0016BH + @@BASE accero 04DFAH 00042H @@BASE self_flash - 04E11H 00000H - @@BASE sw 04E11H 00000H + 04E3CH 00000H + @@BASE sw 04E3CH 00000H @@BASE task_debug - 04E11H 00000H + 04E3CH 00000H @@BASE task_misc - 04E11H 00000H - @@BASE task_sys 04E11H 00000H + 04E3CH 00000H + @@BASE task_sys 04E3CH 00000H @@BASE pedo_alg_thre_det2 - 04E11H 00000H - @@BASE ini_VECT 04E11H 00006H + 04E3CH 00000H + @@BASE ini_VECT 04E3CH 00006H @@BASE task_status - 04E17H 00000H - @@BASE led_cam 04E17H 00000H - @@BASE led_pow 04E17H 00000H - @@BASE hal 04E17H 00000H + 04E42H 00000H + @@BASE led_cam 04E42H 00000H + @@BASE led_pow 04E42H 00000H + @@BASE hal 04E42H 00000H @@BASE batt_params - 04E17H 00000H - @@BASE voltable 04E17H 00000H + 04E42H 00000H + @@BASE voltable 04E42H 00000H @@BASE pedo_lpf_coeff - 04E17H 00000H + 04E42H 00000H @@BASE kanaria_c - 04E17H 00000H + 04E42H 00000H @@BASE util_funcs - 04E17H 00000H + 04E42H 00000H @@BASE i2c_mcu-sub - 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL @cstart 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL pm 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL main 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL led 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL rtc 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL adc 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL renge 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL accero 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL sw 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP + 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL @cstart 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL pm 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL main 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL led 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL rtc 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL adc 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL renge 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL accero 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL sw 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP @@CNSTL task_misc - 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL task_sys 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP + 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL task_sys 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL led_cam 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL led_pow 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP + 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL led_cam 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL led_pow 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP @@CNSTL batt_params - 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP - @@CNSTL voltable 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP + 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP + @@CNSTL voltable 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP @@CNSTL pedo_lpf_coeff - 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP + 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP @@CNSTL kanaria_c - 04E17H 00000H - @@CNSTL 04E17H 00000H CSEG PAGE64KP + 04E42H 00000H + @@CNSTL 04E42H 00000H CSEG PAGE64KP @@CNSTL i2c_mcu-sub - 04E17H 00000H - @@RLINIT 04E17H 00000H CSEG UNIT64KP - @@RLINIT loader 04E17H 00000H - @@RLINIT pm 04E17H 00000H - @@RLINIT i2c_ctr 04E17H 00000H - @@RLINIT main 04E17H 00000H - @@RLINIT magic 04E17H 00000H - @@RLINIT WDT 04E17H 00000H - @@RLINIT i2c_mcu 04E17H 00000H - @@RLINIT i2c_twl 04E17H 00000H - @@RLINIT led 04E17H 00000H - @@RLINIT rtc 04E17H 00000H - @@RLINIT vreg_ctr 04E17H 00000H - @@RLINIT vreg_twl 04E17H 00000H - @@RLINIT adc 04E17H 00000H - @@RLINIT renge 04E17H 00000H - @@RLINIT accero 04E17H 00000H - @@RLINIT self_flash - 04E17H 00000H - @@RLINIT sw 04E17H 00000H - @@RLINIT task_debug - 04E17H 00000H - @@RLINIT task_misc - 04E17H 00000H - @@RLINIT task_sys 04E17H 00000H - @@RLINIT pedo_alg_thre_det2 - 04E17H 00000H - @@RLINIT ini_VECT 04E17H 00000H - @@RLINIT task_status - 04E17H 00000H - @@RLINIT led_cam 04E17H 00000H - @@RLINIT led_pow 04E17H 00000H - @@RLINIT hal 04E17H 00000H - @@RLINIT batt_params - 04E17H 00000H - @@RLINIT voltable 04E17H 00000H - @@RLINIT pedo_lpf_coeff - 04E17H 00000H - @@RLINIT kanaria_c - 04E17H 00000H - @@RLINIT util_funcs - 04E17H 00000H - @@RLINIT i2c_mcu-sub - 04E17H 00000H - @@RLINIT @rom 04E17H 00000H - @@CODEL 04E17H 00000H CSEG - @@CODEL pm 04E17H 00000H - @@CODEL i2c_ctr 04E17H 00000H - @@CODEL main 04E17H 00000H - @@CODEL magic 04E17H 00000H - @@CODEL i2c_twl 04E17H 00000H - @@CODEL led 04E17H 00000H - @@CODEL rtc 04E17H 00000H - @@CODEL vreg_ctr 04E17H 00000H - @@CODEL vreg_twl 04E17H 00000H - @@CODEL adc 04E17H 00000H - @@CODEL renge 04E17H 00000H - @@CODEL accero 04E17H 00000H - @@CODEL sw 04E17H 00000H - @@CODEL task_misc - 04E17H 00000H - @@CODEL task_sys 04E17H 00000H - @@CODEL pedo_alg_thre_det2 - 04E17H 00000H - @@CODEL ini_VECT 04E17H 00000H - @@CODEL led_cam 04E17H 00000H - @@CODEL led_pow 04E17H 00000H - @@CODEL batt_params - 04E17H 00000H - @@CODEL voltable 04E17H 00000H - @@CODEL pedo_lpf_coeff - 04E17H 00000H - @@CODEL kanaria_c - 04E17H 00000H - @@CODEL i2c_mcu-sub - 04E17H 00000H -* gap * 04E17H 00001H - @@CNSTL 04E18H 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04E18H 0000AH - @@R_INIT 04E22H 0004AH CSEG UNIT64KP - @@R_INIT @cstart 04E22H 00000H - @@R_INIT loader 04E22H 00000H - @@R_INIT pm 04E22H 00000H - @@R_INIT i2c_ctr 04E22H 00000H - @@R_INIT main 04E22H 00000H - @@R_INIT magic 04E22H 00000H - @@R_INIT WDT 04E22H 00000H - @@R_INIT i2c_mcu 04E22H 00000H - @@R_INIT i2c_twl 04E22H 00000H - @@R_INIT led 04E22H 00000H - @@R_INIT rtc 04E22H 00000H - @@R_INIT vreg_ctr 04E22H 00000H - @@R_INIT vreg_twl 04E22H 00000H - @@R_INIT adc 04E22H 0000CH - @@R_INIT renge 04E2EH 00014H - @@R_INIT accero 04E42H 00000H + 04E42H 00000H + @@CNSTL 04E42H 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04E42H 0000AH + @@R_INIT 04E4CH 0004AH CSEG UNIT64KP + @@R_INIT @cstart 04E4CH 00000H + @@R_INIT loader 04E4CH 00000H + @@R_INIT pm 04E4CH 00000H + @@R_INIT i2c_ctr 04E4CH 00000H + @@R_INIT main 04E4CH 00000H + @@R_INIT magic 04E4CH 00000H + @@R_INIT WDT 04E4CH 00000H + @@R_INIT i2c_mcu 04E4CH 00000H + @@R_INIT i2c_twl 04E4CH 00000H + @@R_INIT led 04E4CH 00000H + @@R_INIT rtc 04E4CH 00000H + @@R_INIT vreg_ctr 04E4CH 00000H + @@R_INIT vreg_twl 04E4CH 00000H + @@R_INIT adc 04E4CH 0000CH + @@R_INIT renge 04E58H 00014H + @@R_INIT accero 04E6CH 00000H @@R_INIT self_flash - 04E42H 00000H - @@R_INIT sw 04E42H 00000H + 04E6CH 00000H + @@R_INIT sw 04E6CH 00000H @@R_INIT task_debug - 04E42H 00000H + 04E6CH 00000H @@R_INIT task_misc - 04E42H 00026H - @@R_INIT task_sys 04E68H 00000H + 04E6CH 00026H + @@R_INIT task_sys 04E92H 00000H @@R_INIT pedo_alg_thre_det2 - 04E68H 00000H - @@R_INIT ini_VECT 04E68H 00000H + 04E92H 00000H + @@R_INIT ini_VECT 04E92H 00000H @@R_INIT task_status - 04E68H 00000H - @@R_INIT led_cam 04E68H 00000H - @@R_INIT led_pow 04E68H 00004H - @@R_INIT hal 04E6CH 00000H + 04E92H 00000H + @@R_INIT led_cam 04E92H 00000H + @@R_INIT led_pow 04E92H 00004H + @@R_INIT hal 04E96H 00000H @@R_INIT batt_params - 04E6CH 00000H - @@R_INIT voltable 04E6CH 00000H + 04E96H 00000H + @@R_INIT voltable 04E96H 00000H @@R_INIT pedo_lpf_coeff - 04E6CH 00000H + 04E96H 00000H @@R_INIT kanaria_c - 04E6CH 00000H + 04E96H 00000H @@R_INIT util_funcs - 04E6CH 00000H + 04E96H 00000H @@R_INIT i2c_mcu-sub - 04E6CH 00000H - @@R_INIT @rom 04E6CH 00000H - @@R_INIS 04E6CH 00010H CSEG UNIT64KP - @@R_INIS @cstart 04E6CH 00000H - @@R_INIS loader 04E6CH 00000H - @@R_INIS pm 04E6CH 00002H - @@R_INIS i2c_ctr 04E6EH 00002H - @@R_INIS main 04E70H 00000H - @@R_INIS magic 04E70H 00000H - @@R_INIS WDT 04E70H 00000H - @@R_INIS i2c_mcu 04E70H 00000H - @@R_INIS i2c_twl 04E70H 00000H - @@R_INIS led 04E70H 00000H - @@R_INIS rtc 04E70H 00000H - @@R_INIS vreg_ctr 04E70H 00000H - @@R_INIS vreg_twl 04E70H 00000H - @@R_INIS adc 04E70H 00000H - @@R_INIS renge 04E70H 00000H - @@R_INIS accero 04E70H 00000H + 04E96H 00000H + @@R_INIT @rom 04E96H 00000H + @@R_INIS 04E96H 00010H CSEG UNIT64KP + @@R_INIS @cstart 04E96H 00000H + @@R_INIS loader 04E96H 00000H + @@R_INIS pm 04E96H 00002H + @@R_INIS i2c_ctr 04E98H 00002H + @@R_INIS main 04E9AH 00000H + @@R_INIS magic 04E9AH 00000H + @@R_INIS WDT 04E9AH 00000H + @@R_INIS i2c_mcu 04E9AH 00000H + @@R_INIS i2c_twl 04E9AH 00000H + @@R_INIS led 04E9AH 00000H + @@R_INIS rtc 04E9AH 00000H + @@R_INIS vreg_ctr 04E9AH 00000H + @@R_INIS vreg_twl 04E9AH 00000H + @@R_INIS adc 04E9AH 00000H + @@R_INIS renge 04E9AH 00000H + @@R_INIS accero 04E9AH 00000H @@R_INIS self_flash - 04E70H 00000H - @@R_INIS sw 04E70H 00000H + 04E9AH 00000H + @@R_INIS sw 04E9AH 00000H @@R_INIS task_debug - 04E70H 00000H + 04E9AH 00000H @@R_INIS task_misc - 04E70H 00000H - @@R_INIS task_sys 04E70H 00002H + 04E9AH 00000H + @@R_INIS task_sys 04E9AH 00002H @@R_INIS pedo_alg_thre_det2 - 04E72H 00006H - @@R_INIS ini_VECT 04E78H 00000H + 04E9CH 00006H + @@R_INIS ini_VECT 04EA2H 00000H @@R_INIS task_status - 04E78H 00000H - @@R_INIS led_cam 04E78H 00002H - @@R_INIS led_pow 04E7AH 00002H - @@R_INIS hal 04E7CH 00000H + 04EA2H 00000H + @@R_INIS led_cam 04EA2H 00002H + @@R_INIS led_pow 04EA4H 00002H + @@R_INIS hal 04EA6H 00000H @@R_INIS batt_params - 04E7CH 00000H - @@R_INIS voltable 04E7CH 00000H + 04EA6H 00000H + @@R_INIS voltable 04EA6H 00000H @@R_INIS pedo_lpf_coeff - 04E7CH 00000H + 04EA6H 00000H @@R_INIS kanaria_c - 04E7CH 00000H + 04EA6H 00000H @@R_INIS util_funcs - 04E7CH 00000H + 04EA6H 00000H @@R_INIS i2c_mcu-sub - 04E7CH 00000H - @@R_INIS @rom 04E7CH 00000H - @@LCODEL 04E7CH 00022H CSEG - @@LCODEL abs 04E7CH 00008H - @@LCODEL memcpy_n 04E84H 0001AH -* gap * 04E9EH 00156H + 04EA6H 00000H + @@R_INIS @rom 04EA6H 00000H + @@RLINIT 04EA6H 00000H CSEG UNIT64KP + @@RLINIT loader 04EA6H 00000H + @@RLINIT pm 04EA6H 00000H + @@RLINIT i2c_ctr 04EA6H 00000H + @@RLINIT main 04EA6H 00000H + @@RLINIT magic 04EA6H 00000H + @@RLINIT WDT 04EA6H 00000H + @@RLINIT i2c_mcu 04EA6H 00000H + @@RLINIT i2c_twl 04EA6H 00000H + @@RLINIT led 04EA6H 00000H + @@RLINIT rtc 04EA6H 00000H + @@RLINIT vreg_ctr 04EA6H 00000H + @@RLINIT vreg_twl 04EA6H 00000H + @@RLINIT adc 04EA6H 00000H + @@RLINIT renge 04EA6H 00000H + @@RLINIT accero 04EA6H 00000H + @@RLINIT self_flash + 04EA6H 00000H + @@RLINIT sw 04EA6H 00000H + @@RLINIT task_debug + 04EA6H 00000H + @@RLINIT task_misc + 04EA6H 00000H + @@RLINIT task_sys 04EA6H 00000H + @@RLINIT pedo_alg_thre_det2 + 04EA6H 00000H + @@RLINIT ini_VECT 04EA6H 00000H + @@RLINIT task_status + 04EA6H 00000H + @@RLINIT led_cam 04EA6H 00000H + @@RLINIT led_pow 04EA6H 00000H + @@RLINIT hal 04EA6H 00000H + @@RLINIT batt_params + 04EA6H 00000H + @@RLINIT voltable 04EA6H 00000H + @@RLINIT pedo_lpf_coeff + 04EA6H 00000H + @@RLINIT kanaria_c + 04EA6H 00000H + @@RLINIT util_funcs + 04EA6H 00000H + @@RLINIT i2c_mcu-sub + 04EA6H 00000H + @@RLINIT @rom 04EA6H 00000H + @@CODEL 04EA6H 00000H CSEG + @@CODEL pm 04EA6H 00000H + @@CODEL i2c_ctr 04EA6H 00000H + @@CODEL main 04EA6H 00000H + @@CODEL magic 04EA6H 00000H + @@CODEL i2c_twl 04EA6H 00000H + @@CODEL led 04EA6H 00000H + @@CODEL rtc 04EA6H 00000H + @@CODEL vreg_ctr 04EA6H 00000H + @@CODEL vreg_twl 04EA6H 00000H + @@CODEL adc 04EA6H 00000H + @@CODEL renge 04EA6H 00000H + @@CODEL accero 04EA6H 00000H + @@CODEL sw 04EA6H 00000H + @@CODEL task_misc + 04EA6H 00000H + @@CODEL task_sys 04EA6H 00000H + @@CODEL pedo_alg_thre_det2 + 04EA6H 00000H + @@CODEL ini_VECT 04EA6H 00000H + @@CODEL led_cam 04EA6H 00000H + @@CODEL led_pow 04EA6H 00000H + @@CODEL batt_params + 04EA6H 00000H + @@CODEL voltable 04EA6H 00000H + @@CODEL pedo_lpf_coeff + 04EA6H 00000H + @@CODEL kanaria_c + 04EA6H 00000H + @@CODEL i2c_mcu-sub + 04EA6H 00000H + @@LCODEL 04EA6H 00022H CSEG + @@LCODEL abs 04EA6H 00008H + @@LCODEL memcpy_n 04EAEH 0001AH +* gap * 04EC8H 0012CH MGC_VER 04FF4H 00002H CSEG AT MGC_VER magic 04FF4H 00002H MGC_TAIL 04FF6H 0000AH CSEG AT diff --git a/branches/2.20_CE-ARM-sdk3.2.5/config.h b/branches/2.20_CE-ARM-sdk3.2.5/config.h index ff76f1d..8866011 100644 --- a/branches/2.20_CE-ARM-sdk3.2.5/config.h +++ b/branches/2.20_CE-ARM-sdk3.2.5/config.h @@ -7,9 +7,12 @@ */ #define MCU_VER_MAJOR 0x02 -#define MCU_VER_MINOR 0x1E +#define MCU_VER_MINOR 0x20 +// ビルドスイッチ +#define _SPECIAL_CARM_ + // デバッグ向けスイッチ //#define _debug_led_ // LED print デバッグをしたいとき diff --git a/branches/2.20_CE-ARM-sdk3.2.5/hoge.bin b/branches/2.20_CE-ARM-sdk3.2.5/hoge.bin index 2efe1bf..84796cc 100644 Binary files a/branches/2.20_CE-ARM-sdk3.2.5/hoge.bin and b/branches/2.20_CE-ARM-sdk3.2.5/hoge.bin differ diff --git a/branches/2.20_CE-ARM-sdk3.2.5/task_sys.c b/branches/2.20_CE-ARM-sdk3.2.5/task_sys.c index 35ab583..2e49e0e 100644 --- a/branches/2.20_CE-ARM-sdk3.2.5/task_sys.c +++ b/branches/2.20_CE-ARM-sdk3.2.5/task_sys.c @@ -63,7 +63,6 @@ extern bit i2c_mcu_time_out_error; #define PWSW_ON_CHECK_TIMEOUT 100 // 適当 電源onの為に電源スイッチが操作されたとき、この時間経過したらmcuを省電力に戻す - /********************************************//** 電源の立ち上げやスリープなどを管理 ***********************************************/ @@ -146,7 +145,7 @@ void tsk_sys( ) // 電池が少ないので起動させない(電圧チェックもされてる) renge_task_interval_run_force = true; system_status.pwr_state = OFF_TRIG; - return; + return; } // ポートの方向設定　電源入れる前に。 @@ -433,7 +432,19 @@ void tsk_sys( ) system_status.pwr_state = ON_CHECK; } #endif - } + +#ifdef _SPECIAL_CARM_ + // C-ARM向け。　アダプタが刺さってていたら勝手に電源on + vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] = vreg_ctr[ VREG_C_HAL_OVW_CONT1 ] = 0; + wait_ms(46); // pmicの電源再投入仕様のため + wait_ms(250); + wait_ms(250); + wait_ms(250); + wait_ms(250); + system_status.poweron_reason = RSN_TRIAL; + system_status.pwr_state = ON_CHECK; +#endif + } else { // アダプタなし /////////////////////////////// diff --git a/branches/2.20_CE-ARM-sdk3.2.5/util_funcs.c b/branches/2.20_CE-ARM-sdk3.2.5/util_funcs.c index 2edea63..fea86c2 100644 --- a/branches/2.20_CE-ARM-sdk3.2.5/util_funcs.c +++ b/branches/2.20_CE-ARM-sdk3.2.5/util_funcs.c @@ -31,7 +31,7 @@ 少し誤差あります。 ***********************************************/ void wait_ms( u8 ms ){ - u16 fine; + u16 fine; WDT_Restart(); while( ms != 0 ){ diff --git a/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.plg b/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.plg index 160a34a..b93ae44 100644 --- a/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.plg +++ b/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.plg @@ -1,14 +1,15 @@ C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no magic.c +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no magic.c Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\magic.asm +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_mcu.c -i2c_mcu.c(187) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_mcu.asm +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_sys.c +task_sys.c(233) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(583) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\task_sys.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -obsr.lmf "..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel i2c_mcu-sub.rel +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel i2c_mcu-sub.rel RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K' Read Device File Directory : C:\PROGRAM FILES (X86)\NEC ELECTRONICS TOOLS\DEV\ RA78K0R warning W3420: File 'pm.rel' already has had error(s)/warning(s) by 'CC78K' @@ -25,7 +26,7 @@ RA78K0R warning W3420: File 'pedo_alg_thre_det2.rel' already has had error(s)/wa RA78K0R warning W3420: File 'led_pow.rel' already has had error(s)/warning(s) by 'CC78K' Link complete, 0 error(s) and 13 warning(s) found. -"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 +"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 4 @@ -33,4 +34,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 14 +Build Total error(s) : 0 Total warning(s) : 15 diff --git a/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.pri b/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.pri index 023f915..f812839 100644 --- a/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.pri +++ b/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.pri @@ -14,15 +14,15 @@ Low-voltage Flash Rewriting=On Fail Safe Break=0x2000 Port=1 NMI=OFF -TRESET=OFF -IRESET=OFF +TRESET=ON +IRESET=ON WAIT=OFF SysClock=None SubClock=None [Mapping] Count=0 [Main] -Geometry=242, 242, 1200, 858 +Geometry=22, 22, 1188, 812 Window=Max MDI_MAX=OFF Button=ON @@ -33,7 +33,7 @@ Coverage=OFF Timer=OFF Tracer=OFF [Load File] -Dir=\\Tsclient\c\78k_data\yav-mcu-basara\trunk\ +Dir=\\tsclient\C\78k_data\yav-mcu-basara\branches\2.20_CE-ARM-sdk3.2.5\ SaveFilter=0 Start=0 End=0 @@ -45,7 +45,7 @@ Erase=OFF HighSpeed=OFF Symbol Reset=ON CPU Reset=ON -File1=\\Tsclient\c\78k_data\yav-mcu-basara\trunk\bsr.lmf +File1=\\tsclient\C\78k_data\yav-mcu-basara\branches\2.20_CE-ARM-sdk3.2.5\bsr.lmf LoadFilter1=5 Offset1=0 Object1=ON @@ -55,7 +55,7 @@ HighSpeed1=OFF CPU Reset1=ON Symbol Reset1=ON [View File] -Dir=\\Tsclient\c\78k_data\yav-mcu-basara\trunk\ +Dir=\\tsclient\C\78k_data\yav-mcu-basara\branches\2.20_CE-ARM-sdk3.2.5\ Filter=Source [Debugger Option] Source Path="" @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=0, 0, 600, 400 +Geometry=0, 0, 783, 998 Window=Normal -DispStart=457 -CaretPos=458,0 +DispStart=493 +CaretPos=494,0 Mode=Normal DispFile= Address1= @@ -140,10 +140,10 @@ SaveStart= SaveEnd= Accumulative=ON [Assemble] -Geometry=75, 75, 600, 400 -Window=Normal -DispStart=16170 -CaretPos=16170,27 +Geometry=100, 100, 600, 400 +Window=Hide +DispStart=847627264 +CaretPos=0,0 Address1= Address2= Address3= @@ -251,9 +251,9 @@ Destination=0 [I/O Port] Line=0 [Stack] -Geometry=0, 0, 0, 0 -Window=Hide -Boundary=0 +Geometry=1170, 711, 400, 300 +Window=Normal +Boundary=13762687 Mode=Proper [Sfr] Geometry=0, 0, 0, 0 @@ -957,16 +957,17 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=1145, 5, 440, 719 +Geometry=1139, 7, 440, 488 Window=Normal Boundary=13762700 -0=.flag_wifi_TX,P,N,A,+,1 -1=.PIF21,B,S,A,+,1 -Line=2 +0=.pwsw_timeout,P,N,A,+,1 +1=.SW_pow_count,P,N,A,+,1 +2=.system_status,.,N,A,+,1 +Line=3 [Quick Watch] -0=PIF21,B,A,1 -1=flag_wifi_TX,P,A,1 -2= +0=system_status,P,A,1 +1=SW_pow_count,P,A,1 +2=pwsw_timeout,P,A,1 3= 4= 5= @@ -985,18 +986,22 @@ Geometry=0, 0, 0, 0 Window=Hide Width=150 30 200 100 Name0=Swb00001 -Address0=led.c#_LED_init+0x62 +Address0=task_sys.c#_tsk_sys+0x1d6 Window0=ASM Status0=ON -Name1=Swb00002 -Address1=led.c#_tsk_led_wifi+0xb +Name1=Swb00003 +Address1=task_sys.c#_tsk_sys+0x2a8 Window1=ASM Status1=ON -Name2=Swb00003 -Address2=led.c#_tsk_led_wifi+0x10 +Name2=Swb00004 +Address2=task_sys.c#_tsk_sys+0x4f Window2=ASM Status2=ON -Count=3 +Name3=Swb00002 +Address3=task_sys.c#_tsk_sys+0x30 +Window3=ASM +Status3=ON +Count=4 [Reset] Debugger=ON Symbol=OFF diff --git a/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.prj b/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.prj index 04ec41a..b90f38b 100644 --- a/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.prj +++ b/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.prj @@ -1,6 +1,6 @@ [ProjectManager] Version=6.00 -Path=C:\78k_data\yav-mcu-basara\tags\2.1E_SPFL_PEE\ +Path=C:\78k_data\yav-mcu-basara\branches\2.20_CE-ARM-sdk3.2.5\ Title=yav-mcu Series=78K0R.PM Device=uPD79F0104 @@ -23,7 +23,7 @@ MuitiLoad=0 LoadPrjNum=0 CheckVersion=CC78K0R|W2.13;RA78K0R|W1.33 [Option.IDK0R32G] -File=\\Tsclient\c\78k_data\yav-mcu-basara\trunk\yav_mcu_bsr.pri +File=\\tsclient\C\78k_data\yav-mcu-basara\branches\2.20_CE-ARM-sdk3.2.5\yav_mcu_bsr.pri [BuildMode2] BuildModeName=K0R_dbg TargetFile=0 @@ -1041,6 +1041,78 @@ VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 VF78K0Rvs= +[SrcFile] +Source1=loader.c +Source2=pm.c +Source3=i2c_ctr.c +Source4=main.c +Source5=magic.c +Source6=WDT.c +Source7=i2c_mcu.c +Source8=i2c_twl.c +Source9=led.c +Source10=rtc.c +Source11=vreg_ctr.c +Source12=vreg_twl.c +Source13=adc.c +Source14=renge\renge.c +Source15=accero.c +Source16=self_flash.c +Source17=sw.c +Source18=task_debug.c +Source19=task_misc.c +Source20=task_sys.c +Source21=pedo_alg_thre_det2.c +Source22=ini_VECT.c +Source23=task_status.c +Source24=led_cam.c +Source25=led_pow.c +Source26=hal.c +Source27=batt_params.c +Source28=voltable.c +Source29=pedo_lpf_coeff.c +Source30=kanaria.asm +Source31=kanaria_c.c +Source32=get_ei.asm +Source33=util_funcs.c +Source34=i2c_mcu-sub.c +[IncFile] +Include1=incs_loader.h +Include2=config.h +Include3=jhl_defs.h +Include4=user_define.h +Include5=hal.h +Include6=bsr_system.h +Include7=renge\renge.h +Include8=renge\renge_defs.h +Include9=renge\renge_task_immediate.h +Include10=vreg_ctr.h +Include11=vreg_twl.h +Include12=loader.h +Include13=i2c_mcu.h +Include14=WDT.h +Include15=fsl_user.h +Include16=i2c_ctr.h +Include17=pm.h +Include18=rtc.h +Include19=reboot.h +Include20=magic.h +Include21=incs.h +Include22=i2c_twl.h +Include23=accero.h +Include24=pedometer.h +Include25=sw.h +Include26=adc.h +Include27=led.h +Include28=batt_params.h +Include29=pool.h +Include30=i2c_twl_defs.h +Include31=renge\renge_task_intval.h +Include32=self_flash.h +Include33=util_funcs.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 +Include36=i2c_mcu_sub.h [Options.LK78K0R 0] Version=100 O0=bsr_k0r.lmf @@ -1159,7 +1231,7 @@ ZB= Etcetera0= Etcetera1=boot.lmf CommandFile=0 -OFILE=C:\78k_data\yav-mcu-basara\tags\2.1E_SPFL_PEE\bsr.lmf +OFILE=C:\78k_data\yav-mcu-basara\branches\2.20_CE-ARM-sdk3.2.5\bsr.lmf [Options.LK78K0R 3] Version=100 O0=bsr_bsr.lmf @@ -1334,75 +1406,3 @@ DefaultMode2=1 DefaultMode3=1 DefaultMode4=1 DefaultMode5=1 -[SrcFile] -Source1=loader.c -Source2=pm.c -Source3=i2c_ctr.c -Source4=main.c -Source5=magic.c -Source6=WDT.c -Source7=i2c_mcu.c -Source8=i2c_twl.c -Source9=led.c -Source10=rtc.c -Source11=vreg_ctr.c -Source12=vreg_twl.c -Source13=adc.c -Source14=renge\renge.c -Source15=accero.c -Source16=self_flash.c -Source17=sw.c -Source18=task_debug.c -Source19=task_misc.c -Source20=task_sys.c -Source21=pedo_alg_thre_det2.c -Source22=ini_VECT.c -Source23=task_status.c -Source24=led_cam.c -Source25=led_pow.c -Source26=hal.c -Source27=batt_params.c -Source28=voltable.c -Source29=pedo_lpf_coeff.c -Source30=kanaria.asm -Source31=kanaria_c.c -Source32=get_ei.asm -Source33=util_funcs.c -Source34=i2c_mcu-sub.c -[IncFile] -Include1=incs_loader.h -Include2=config.h -Include3=jhl_defs.h -Include4=user_define.h -Include5=hal.h -Include6=bsr_system.h -Include7=renge\renge.h -Include8=renge\renge_defs.h -Include9=renge\renge_task_immediate.h -Include10=vreg_ctr.h -Include11=vreg_twl.h -Include12=loader.h -Include13=i2c_mcu.h -Include14=WDT.h -Include15=fsl_user.h -Include16=i2c_ctr.h -Include17=pm.h -Include18=rtc.h -Include19=reboot.h -Include20=magic.h -Include21=incs.h -Include22=i2c_twl.h -Include23=accero.h -Include24=pedometer.h -Include25=sw.h -Include26=adc.h -Include27=led.h -Include28=batt_params.h -Include29=pool.h -Include30=i2c_twl_defs.h -Include31=renge\renge_task_intval.h -Include32=self_flash.h -Include33=util_funcs.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 -Include36=i2c_mcu_sub.h diff --git a/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.prk b/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.prk index e80e99f..d977670 100644 --- a/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.prk +++ b/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.prk @@ -1,9 +1,9 @@ [ProjectManager] -FrameMax=1 -FrameX=4 -FrameY=0 -FrameCX=1022 -FrameCY=722 +FrameMax=0 +FrameX=178 +FrameY=74 +FrameCX=1447 +FrameCY=919 OpenFile1=i2c_ctr.c,0,655,120,1628,751,0,1,0,0 OpenFile2=kanaria_c.c,0,68,138,763,769,8,5,8,0 OpenFile3=pm.c,0,373,197,1346,828,35,374,32,0 @@ -14,11 +14,11 @@ OpenFile7=loader.c,0,250,250,1841,957,6,157,1,0 OpenFile8=main.c,0,402,105,1713,812,41,38,49,0 OpenFile9=task_status.c,0,225,225,1478,880,16,22,16,0 OpenFile10=batt_params.c,0,444,408,1697,1063,28,2,59,0 -OpenFile11=ProjectWindow +OpenFile11=config.h,0,458,11,1285,414,0,10,0,0 +OpenFile12=ProjectWindow PrjPos=0,0,706,0,291 -OpenFile12=OutputWindow -OutputPos=0,231,682,640,1903 -OpenFile13=config.h,0,458,11,1285,414,0,10,0,0 +OpenFile13=OutputWindow +OutputPos=0,28,606,298,966 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.sdb b/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.sdb index 8eb2594..83f2635 100644 --- a/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.sdb +++ b/branches/2.20_CE-ARM-sdk3.2.5/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4f210ca8 +T=4fd58ac9 1=incs_loader.h 2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 3=fsl_user.h @@ -13,7 +13,7 @@ T=4f210ca8 9=WDT.h 10=magic.h [pm.c] -T=4f210cab +T=4fd58ac8 1=incs.h 2=adc.h 3=led.h @@ -25,12 +25,12 @@ T=4f210cab 9=vreg_twl.h 10=i2c_mcu.h [i2c_ctr.c] -T=4f210caa +T=4fd58ac2 1=incs.h 2=rtc.h 3=pedometer.h [main.c] -T=4f210cab +T=4fd58ac2 1=incs.h 2=rtc.h 3=pm.h @@ -40,34 +40,35 @@ T=4f210cab 7=i2c_mcu.h 8=pool.h [magic.c] -T=4f210d5e +T=4ffce3ac 1=magic.h 2=config.h [WDT.c] -T=4f210ca9 +T=4fd58ac0 1=incs_loader.h [i2c_mcu.c] -T=4f210ca8 +T=4fd58ac9 1=incs_loader.h 2=i2c_mcu.h 3=loader.h 4=util_funcs.h +5=i2c_mcu_sub.h [i2c_twl.c] -T=4f210ca8 +T=4fd58ac8 1=incs.h 2=i2c_twl_defs.h 3=i2c_twl.h 4=vreg_twl.h 5=WDT.h [led.c] -T=4f210cab +T=4fd58ac7 1=incs.h 2=led.h [rtc.c] -T=4f210caa +T=4fd58ac2 1=incs.h [vreg_ctr.c] -T=4f210cab +T=4fd58ac0 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -81,14 +82,14 @@ T=4f210cab 11=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 12=fsl_user.h [vreg_twl.c] -T=4f210ca8 +T=4fd58ac8 1=incs.h 2=jhl_defs.h 3=led.h 4=vreg_twl.h 5=adc.h [adc.c] -T=4f210ca8 +T=4fd58ac0 1=incs.h 2=adc.h 3=pm.h @@ -96,7 +97,7 @@ T=4f210ca8 5=vreg_twl.h 6=i2c_mcu.h [renge\renge.c] -T=4f210ca9 +T=4fd58ac0 1=renge\renge.h 2=renge\renge_task_intval.h 3=renge\renge_task_immediate.h @@ -106,13 +107,13 @@ T=4f210ca9 7=util_funcs.h 8=bsr_system.h [accero.c] -T=4f210ca9 +T=4fd58ac2 1=incs.h 2=accero.h 3=i2c_mcu.h 4=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h [self_flash.c] -T=4f210ca8 +T=4fd58ac8 1=incs_loader.h 2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 3=fsl_user.h @@ -124,7 +125,7 @@ T=4f210ca8 9=WDT.h 10=util_funcs.h [sw.c] -T=4f210ca8 +T=4fd58ac0 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -133,13 +134,13 @@ T=4f210ca8 6=rtc.h 7=sw.h [task_debug.c] -T=4f210cab +T=4fd58ac8 1=incs_loader.h 2=renge\renge.h 3=pm.h 4=accero.h [task_misc.c] -T=4f210ca8 +T=4fd58ac0 1=incs.h 2=renge\renge.h 3=pm.h @@ -149,7 +150,7 @@ T=4f210ca8 7=led.h 8=vreg_twl.h [task_sys.c] -T=4f210ca8 +T=4ffd0150 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -163,17 +164,17 @@ T=4f210ca8 11=i2c_mcu.h 12=vreg_twl.h [pedo_alg_thre_det2.c] -T=4f210ca9 +T=4fd58ac7 1=incs.h 2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h 3=accero.h 4=pedometer.h 5=pool.h [ini_VECT.c] -T=4f210ca9 +T=4fd58ac8 1=config.h [task_status.c] -T=4f210cab +T=4fd58ac7 1=incs_loader.h 2=renge\renge.h 3=pm.h @@ -182,41 +183,41 @@ T=4f210cab 6=i2c_mcu.h 7=led.h [led_cam.c] -T=4f210cac +T=4fd58ac8 1=incs.h 2=led.h 3=vreg_twl.h [led_pow.c] -T=4f210caa +T=4fd58ac2 1=incs.h 2=led.h 3=pm.h [hal.c] -T=4f210cab +T=4fd58ac7 1=incs_loader.h [batt_params.c] -T=4f210caa +T=4fd58ac2 1=jhl_defs.h 2=batt_params.h [voltable.c] -T=4f210ca9 +T=4fd58ac9 1=incs.h [pedo_lpf_coeff.c] -T=4f210caa +T=4fd58ac8 1=incs.h [kanaria.asm] -T=4f210ca8 +T=4fd58ac0 [kanaria_c.c] -T=4f210ca8 +T=4fd58ac7 1=incs.h [get_ei.asm] -T=4f210cac +T=4fd58ac2 [util_funcs.c] -T=4f210ca8 +T=4ffd00ac 1=incs_loader.h 2=WDT.h [i2c_mcu-sub.c] -T=4f20dbd3 +T=4fd58ac9 1=incs.h 2=i2c_mcu.h 3=loader.h @@ -224,7 +225,7 @@ T=4f20dbd3 5=i2c_mcu_sub.h 6=pm.h [incs_loader.h] -T=4f210cac +T=4fd58ac8 1=jhl_defs.h 2=user_define.h 3=hal.h @@ -233,49 +234,49 @@ T=4f210cac 6=vreg_ctr.h 7=vreg_twl.h [config.h] -T=4f210ca8 +T=4fd58d40 [jhl_defs.h] -T=4f210ca8 +T=4fd58ac8 [user_define.h] -T=4f210cac +T=4fd58ac8 [hal.h] -T=4f210cab +T=4fd58ac7 [bsr_system.h] -T=4f210ca9 +T=4fd58ac3 [renge\renge.h] -T=4f210ca9 +T=4fd58ac0 1=renge\renge_defs.h 2=renge\renge_task_immediate.h [renge\renge_defs.h] -T=4f210ca9 +T=4fd58ac0 [renge\renge_task_immediate.h] -T=4f210ca9 +T=4fd58ac0 1=renge\renge_defs.h [vreg_ctr.h] -T=4f210cab +T=4fd58ac2 1=config.h [vreg_twl.h] -T=4f210ca8 +T=4fd58ac8 [loader.h] -T=4f210ca8 +T=4fd58ac9 [i2c_mcu.h] -T=4f210ca8 +T=4fd58ac9 [WDT.h] -T=4f210ca9 +T=4fd58ac0 [fsl_user.h] -T=4f210ca8 +T=4fd58ac8 [i2c_ctr.h] -T=4f210caa +T=4fd58ac2 [pm.h] -T=4f210cab +T=4fd58ac8 [rtc.h] -T=4f210caa +T=4fd58ac2 [reboot.h] -T=4f210ca9 +T=4fd58ac3 [magic.h] -T=4f210caa +T=4fd58ac8 [incs.h] -T=4f210ca8 +T=4fd58ac7 1=jhl_defs.h 2=user_define.h 3=hal.h @@ -284,39 +285,39 @@ T=4f210ca8 6=vreg_ctr.h 7=util_funcs.h [i2c_twl.h] -T=4f210ca8 +T=4fd58ac8 [accero.h] -T=4f210ca9 +T=4fd58ac7 1=jhl_defs.h 2=pedometer.h [pedometer.h] -T=4f210ca8 +T=4fd58ac2 [sw.h] -T=4f210ca8 +T=4fd58ac0 1=config.h [adc.h] -T=4f210ca9 +T=4fd58ac0 1=jhl_defs.h [led.h] -T=4f210cab +T=4fd58ac7 [batt_params.h] -T=4f210cab +T=4fd58ac7 1=jhl_defs.h [pool.h] -T=4f210ca8 +T=4fd58ac8 1=pedometer.h [i2c_twl_defs.h] -T=4f210ca9 +T=4fd58ac9 [renge\renge_task_intval.h] -T=4f210ca9 +T=4fd58ac0 1=renge\renge_defs.h [self_flash.h] -T=4f210ca8 +T=4fd58ac9 [util_funcs.h] -T=4f210ca8 +T=4fd58ac2 [..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h] T=49a3bd4e [..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h] T=45f12258 [i2c_mcu_sub.h] -T=4f17bb6c +T=4fd58ac8