diff --git a/trunk/VCProj/bsr_trunk.sdf b/trunk/VCProj/bsr_trunk.sdf index dadac3c..b20a3e0 100644 Binary files a/trunk/VCProj/bsr_trunk.sdf and b/trunk/VCProj/bsr_trunk.sdf differ diff --git a/trunk/VCProj/bsr_trunk.suo b/trunk/VCProj/bsr_trunk.suo index 55615c4..6c18540 100644 Binary files a/trunk/VCProj/bsr_trunk.suo and b/trunk/VCProj/bsr_trunk.suo differ diff --git a/trunk/bsr.hex b/trunk/bsr.hex index 6d423d1..b996098 100644 --- a/trunk/bsr.hex +++ b/trunk/bsr.hex @@ -1,13 +1,13 @@ :02000000EB0C07 -:040010001548174830 -:02001C00C349D6 -:020024006A4A26 -:02002A00B54AD5 -:08003400E24B854BDE4B234E2D -:02004A00194853 -:02005A00534809 -:02006200E14D6E -:06008000764CAF4CF94C78 +:0400100034483648F2 +:02001C00E249B7 +:02002400894A07 +:02002A00D44AB6 +:08003400014CA44BFD4B424EB0 +:02004A00384834 +:02005A007248EA +:02006200004E4E +:06008000954CCE4C184D1A :0400C0007EFBFF04C0 :0A00C4001B339499E033F240BFAA09 :1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A @@ -133,11 +133,11 @@ :10084E0007F5ABFFF2D7C7310499067110B3FBEF72 :10085E00047118B3FB8FB3FB7B8C76D1DD5B8FB34A :10086E00FB9D8C4004F903DF22665C10D1DD1C8FEA -:10087E00B3FB5C10D1DD0B5080C15011FDCA34C0EA -:10088E00EF095040C15011FDCA34C04004F903DDD8 +:10087E00B3FB5C10D1DD0B5080C15011FDDE34C0D6 +:10088E00EF095040C15011FDDE34C04004F903DDC4 :10089E00064004F904DF22665C02D1DD1C8FB3FB37 -:1008AE005C02D1DD0B5040C15010FDCA34C0EF09BF -:1008BE005020C15010FDCA34C0C6D7C736000066DE +:1008AE005C02D1DD0B5040C15010FDDE34C0EF09AB +:1008BE005020C15010FDDE34C0C6D7C736000066CA :1008CE005C80D1DD10675C80D1DF05713398EF0B52 :1008DE00713298EF06710407713198665C40D1DD74 :1008EE0010675C40D1DF05714398EF0B714298EFB2 @@ -207,10 +207,10 @@ :020CE900C3FD49 :100CEB0061CF5100718C7109FECBF800FEFCD50170 :100CFB0000F6BF00F953C0F693935820FEDFF9417D -:100D0B000036344E34CCFCEF05118B99A7A5174454 -:100D1B007E4EDFF53602F930CCFCEF04CC0000A799 -:100D2B0047DFF94100367E4E3420FEEF05118B99DB -:100D3B00A7A517448E4EDFF53630FE3094FEEF0438 +:100D0B000036524E34CCFCEF05118B99A7A5174436 +:100D1B009C4EDFF53602F930CCFCEF04CC0000A77B +:100D2B0047DFF94100369C4E3420FEEF05118B99BD +:100D3B00A7A51744AC4EDFF53630FE3094FEEF041A :100D4B00CC0000A747DFF9FCCE0000EFFE61DD71A0 :100D5B007BFABEF0ADD8BEF200AEF661CDD7C36163 :100D6B00DD717BFABEF0ADD8BEF200DBF6FFADDC79 @@ -243,10 +243,10 @@ :100F1B00F9B4DADFF4BDD813BDDAC2C0D746D8DDD9 :100F2B000771FF7177D971C0D75BDB9DDB605BDA33 :100F3B009DDAADDC5BD9085BD808BDD8D7C3C7F346 -:100F4B00728EFDC162314C4100362A4E1161A07286 +:100F4B00728EFDC162314C410036484E1161A07268 :070F5B00C09EFD62C6C2D773 -:0A0FF60031373A33323A3334000049 -:0A20000031373A33323A333400002E +:0A0FF60031363A30313A3030000055 +:0A20000031363A30313A303000003A :10200A0005214F7B9EC5E9000104080D12171C1F0C :10201A00080100001F003B005A0078009700B50035 :10202A00D400F300110130014E01192634445362E1 @@ -301,17 +301,17 @@ :10232C008FB2FB5C01D1DF04712394D7712294F43A :10233C003FD7C7C1FBF8FF313298067130B3FBEFC2 :10234C00047138B3FB714494713798DE4F71349833 -:10235C007141943132980E5002C15011FDCA34C0F3 -:10236C00CD3229EF37E0C15011FDCA34C0F4321719 +:10235C007141943132980E5002C15011FDDE34C0DF +:10236C00CD3229EF37E0C15011FDDE34C0F4321705 :10237C00C15002FD4A2BC0D2DF0D8B318E318D083E :10238C000E01081C00BD34AD3444009BDC05D5AFF8 -:10239C00FBDF095020C15011FDCA34C0C0C6D78D17 +:10239C00FBDF095020C15011FDDE34C0C0C6D78D03 :1023AC00209D40FDED23FD7E2BD507F9DD04710347 :1023BC0094D78D404B2061F83164941C716394FD6B :1023CC0076044A4007DD054A40FFDF098F06F931E4 :1023DC000303FD7C24FD90247102943073256194D9 :1023EC00D7C77162017172015003FDA5095008FD38 -:1023FC004737629D305009FD473762767163017132 +:1023FC005B37629D305009FD5B376276716301710A :10240C001806F94A30F1DC0BE507F9F508F9CD3778 :10241C0007EF224A3004DE1ACF07F9025008C150E8 :10242C006CFD7602C092DF0DD452DF09711006F9F3 @@ -364,14 +364,14 @@ :10271C0005CC04008C059FAFFB8C049FB0FBFDB275 :10272C002B8D464E05DD2840AFFB0BDE054A460BD4 :10273C00DE1440AFFB06DE054A4606DE09D5AFFBCC -:10274C00DF0DD446DD095020C15011FDCA34C08FB5 +:10274C00DF0DD446DD095020C15011FDDE34C08FA1 :10275C00AFFB9D46FDEF2B1008C6D7C75601D837E7 :10276C00C15002FD622BC04008F901DF10500AFD78 :10277C00A509712010055008FDA509EF055012FDA3 :10278C00A5098D376C0870C15002FD622BC0500337 :10279C00FDA5098D376C1870C15002FD622BC0501D :1027AC0016FDA5095003FD732B625C01D1DD0F7181 -:1027BC0070B3FB5002C15013FDCA34C05600667290 +:1027BC0070B3FB5002C15013FDDE34C0560066727C :1027CC00C6D7C75004FD732B625C03D1DD40501497 :1027DC00FD652834B3FB895C9F998A0C7CFF50FF04 :1027EC005C14D1DD228A0C7CFF5C147234B7FB893B @@ -381,7 +381,7 @@ :10282C002BC0E0FDA509D837C15002FD622BC0506A :10283C0033FDA5094008F901DF0971281005500A7C :10284C00FDA509F0C15002FD622BC07178B3FBE00D -:10285C00C15013FDCA34C0C6D7C7C12004FBF8FF52 +:10285C00C15013FDDE34C0C6D7C7C12004FBF8FF3E :10286C00CC02005004FD732B629C038C045C20D1C1 :10287C00DD0E8C036C019C038C026C209C02EF130C :10288C008C045C10D1DD0C8C035CFE9C038C026C04 @@ -419,13 +419,13 @@ :102A8C00029C02D1DD1F34B6FB896E02997162077C :102A9C00CC0100316207086159018C01D1DFF4715E :102AAC006307716B278D315C40D1DD095002C15039 -:102ABC0012FDCA34C08D315C01D1DD08E0C1501269 -:102ACC00FDCA34C0717AFA8D315C41D1DD0C5A31BA -:102ADC00BED831C15010FD6347C0F21004C6D7FDFB +:102ABC0012FDDE34C08D315C01D1DD08E0C1501255 +:102ACC00FDDE34C0717AFA8D315C41D1DD0C5A31A6 +:102ADC00BED831C15010FD8247C0F21004C6D7FDDC :102AEC006727F2D7FDCE27F2D7C78FC6FB7617FD27 :102AFC006528664FC6FBDFF2F5C6FBF2C6D75064FD :102B0C00FDA509FD3B2C6261FB711194F1711494CC -:102B1C0061DC70C15012FD6347C0FD7836CD610396 +:102B1C0061DC70C15012FD8247C0FD8C36CD610363 :102B2C00D7C7C1C1FBF8FFAC0ABB17C15002C18C9F :102B3C000270C1506CFD410310061004C6D7C7C10A :102B4C00FBF8FFAC08C15002C18B70C1506CFD97F3 @@ -441,7 +441,7 @@ :102BEC0004FCD7D504F9DF04717394D7FD3B2C6238 :102BFC0061FB71019571149471079561C8317294E0 :102C0C0017717294710495711194F171049561DCD2 -:102C1C0070C15012FD6347C0D7C716C75004FD4A98 +:102C1C0070C15012FD8247C0D7C716C75004FD4A79 :102C2C002BC0C6D7C716C75002FD4A2BC0C6D7400B :102C3C00AFFB0BDE02E2D7F2D771000105717850C1 :102C4C0005713AD5713BD18F10055CFC9F1005CFF7 @@ -449,12 +449,12 @@ :102C6C0050057130500571205005CF530509CF52D6 :102C7C00050B7130510571205105713BD5717050A8 :102C8C00058F11055CFC9F11058F10055CFC9F10D6 -:102C9C0005F422D77178500571080105D7FD7238FB +:102C9C0005F422D77178500571080105D7FD8638E7 :102CAC00FD7604717AFAFDAB23F504F98F06F93140 :102CBC00051B5003FD732B625C01D161E8CF04F955 :102CCC0002CFAFFB64710407714194EF10F67104ED :102CDC0007611012F6B1236061FB714194FD9030D5 -:102CEC00FD0743712297712BE7618461A461EDEFBD +:102CEC00FD2643712297712BE7618461A461EDEF9E :102CFC00F8D77140F00071783002713AE6713BE21E :102D0C00713BEA713BEE8F10055CFC9F1005CF34D4 :102D1C00024AE552FF711A52710A5271483002711F @@ -463,8 +463,8 @@ :102D4C005CFC9E265A06FC71603002D7717830020A :102D5C007148F000D7C788061666614FDD096761B8 :102D6C004EDE0396EF01866672C6D7C7161714AAF5 -:102D7C000412A943DD29AA0412A923FD8E4EC3AC6B -:102D8C0002FD8E4E13C2BDD813FD280FDE0C171496 +:102D7C000412A943DD29AA0412A923FDAC4EC3AC4D +:102D8C0002FDAC4E13C2BDD813FD280FDE0C171478 :102D9C00AA0212AA0403BA04EF051714A9BA04ACC8 :102DAC00041231FF319E03317F087208C6D77100BF :102DBC00F200304400BFB601300188BF90013009E9 @@ -513,491 +513,493 @@ :10306C00078B99A5A792DFF9710B9E3144961371CA :10307C004396717B9E8FDCFB9E9A8FDDFB9E9B7132 :10308C007A9EC6D7CFA7FB5CCFA8FB5FCFC8FB5DF2 -:10309C00CFFCFB36CFFDFBC9F5E3FBD7C7CFA4FBB9 -:1030AC0012CFA5FB22CFCCFBFFF5CDFBF5CEFBF56C -:1030BC00CFFBF5D0FB5600664C64DE08723826FB5D -:1030CC000086EFF3C6D7C788061617F1E73403005E -:1030DC002361E3ED02342361F8EDD532B12361E3D2 -:1030EC00EDDF322561F8EDED32B1240D0061D8ED44 -:1030FC000234240B0061F8EDC7312361F8ED0A327C -:10310C002361F8EDDA312361F8EDF7332406006121 -:10311C00F8ED8932B12561D8EDA53224000061F8B3 -:10312C00EDB2322361F8ED02342361F8EDFC33B1DA -:10313C002361E3ED0D332361F8ED1E332361F8EDCC -:10314C002F332361F8ED1E332361F8ED40332361F7 -:10315C00F8ED51332361F8ED60332361F8ED8233E0 -:10316C002361F8ED8E332361F8ED99332361F8ED8B -:10317C00A1332402002361E3ED02342361F8EDD581 -:10318C00332361F8EDA9332361F8EDB4332561F8ED -:10319C00EDBF33B124060061D8ED02342400006188 -:1031AC00F8ED04342561F8EDCA3324120061F8ED12 -:1031BC0083322361F8ED7332ED043467D1DD0C30CA -:1031CC00963B619434C4FB89616F99ED0E34675C56 -:1031DC0002D1DD0730EB2A6194EF0B675C01D1DD86 -:1031EC000530F02A6194675C3CD1DD0F30F52A6123 -:1031FC0094675C3C7266736218A4FBED0E3467D165 -:10320C00DD625C01D1DD05300800EF01F6609F0145 -:10321C00FC675C02D1DD03E6EF01F63401FC896149 -:10322C006899675C04D1DD04E6A1EF01F63401FC7A -:10323C0089616899675C08D1DD05302000EF01F6E3 -:10324C003401FC89616899675C10D1DD0530100090 -:10325C00EF01F63401FC89616899675C20D161E863 -:10326C00716001FCED0E344A5AC8DE08E85A671842 -:10327C005AFAA45AED0E34679D5AED0E34D448DF39 -:10328C0008679FCDFBA448EF0D4A4805DE08E848C7 -:10329C00671811FDA448ED0E34675C0F72667362FB -:1032AC0018A4FBED0E344A4864DE1B4A4801DF06C5 -:1032BC0067D161F85701E848671826FBA4484A48CB -:1032CC000561C8711296ED0E3434A6FB89615F99C5 -:1032DC00ED0E34304829619466736718A4FBED0E2B -:1032EC003440A9FB6ADF1340AAFB68DF0D674C6C06 -:1032FC00DF083044406194713AD5679FABFBED0E0B -:10330C0034675C7F70C117F1243000FD2C30C0EDA8 -:10331C000E34675C3F70C117F1243000FD2C30C0B7 -:10332C00ED0E34675C0770C117F1243000FD2C30B2 -:10333C00C0ED0E34675C1F70C117F1243000FD2CFA -:10334C0030C0ED0E346770C117F1243000FD2C3005 -:10335C00C0ED0E34CEABAC710A9E31929E02EFFAE8 -:10336C00D592FFDF05710B9EEFED679E99710B9E59 -:10337C009FDBFBED0E34714296675C7F9FDCFBEDAF -:10338C000E34714296675C3F9FDDFBEF75675C3FC7 -:10339C009FDEFBEF6D675C1F9FDFFBEF65305639DF -:1033AC006194679FE4FBEF5A3023396194679FE582 -:1033BC00FBEF4F303C396194679FE8FBEF44675C4F -:1033CC0001D1DD3EFD0743EF39675C02D1DD0571AC -:1033DC002A21EF06714A9D712B21675C01D1DD0812 -:1033EC00710300710B20EF03710A2067318EEF120D -:1033FC00679FD3FBEF0CEF0A664C5BDE0573671817 -:10340C00A4FBC6D7C716664C30DC094C37DE05FD6D -:10341C000730EF6B664C02DF1F8FA6FB5C03728FCD -:10342C0003FC5C03318E316D08616A08128F03FC5A -:10343C005C80312A6162EF56664C3DDF08AE90BD70 -:10344C005CF85CEF49664C3EDF04F85DEF40664C7F -:10345C004FDF05FD2F43EF36664C61DF08E85A0954 -:10346C005AFA72EF29664C7FDF05FD0C3CEF1F66A4 -:10347C004C4EDF0B310498045210EF12F2EF0F6632 -:10348C004C5BDC0452FFEF06667309A4FB72C6D7D3 -:10349C00C788061617F1241000240500DC07244CFD -:1034AC0000DD17EF17717BFA17F104A4FB14896187 -:1034BC007F99717AFA715296EF02A45AC6D7C7C196 -:1034CC00C1FBF8FF4004F903DD064004F904DF38C2 -:1034DC00717BFA8C027309ACFB5E0AD1DF278C027C -:1034EC00318E04A4FB14896E0A99716207717AFA01 -:1034FC00CC0100316207086159018C01D1DFF471F4 -:10350C006307716B27717AFA1004C6D7CF03FC03DB -:10351C00F501FCF505FCF507FCD7C788061617F175 -:10352C00E734020025DD3D23DD1725DD1C23DD05F9 -:10353C0023DD2BEF3B710297679F06FCCD6103EFF8 -:10354C002F675C839F03FCEF27675C039F05FC6779 -:10355C005C034C0261F8712298FD1D45EF12679FC8 -:10356C0007FCEF0C6791DF08E0C15012FDCA34C0B4 -:10357C00C6D7C71617F1E7240000DD2A23DD1E2469 -:10358C000300DD0724FB00DD24EF253132980530E4 -:10359C008000EF01F6086F04FC7208EF198F01FC34 -:1035AC00F501FC72EF107152975235EF09F2EF06EC -:1035BC0066730900FC72C6D7C71617F1E724000022 -:1035CC00DD38241000DD1C23DD1C23DD30240E002F -:1035DC00DD18241100DD1B240F00DD12243000DD6A -:1035EC0015EF1EE2EF1D5202EF195204EF155206B1 -:1035FC00EF115205EF0D5207EF09F2EF065203EFF0 -:10360C000252FFC6D7C7316496377163968D609F9F -:10361C00ACFB8D5F9FCBFB36D2FCC7D85FFD7837F8 -:10362C00618A70618AFDBD37C0D864F1312F609D0D -:10363C00638D5E4B63DD0A7172968D639D5ECD6109 -:10364C00034A6105DE083082366194CD616BB4614A -:10365C007150F000CE300BCF170006CE3106FD5165 -:10366C0002717A30710BE3710BE7C6D78D639D5EE7 -:10367C008D639FADFBD74004F903DF064004F904CA -:10368C00DF02F2D73174960C7173967113978D63B8 -:10369C009D65EF313104971F710397711297D50611 -:1036AC00FCDF04F466EF0A8F06FC5002D6A1609D85 -:1036BC00668D669D65EF0E311497068D669D65EFE0 -:1036CC00048D639D658D659FADFBD865FDEA36E87D -:1036DC0065091C2270C15013FD6347C0F2D7C7C1E6 -:1036EC00C1FBF8FF8C02D1DF05F506FCEF1A8C024A -:1036FC004C05DE06CF06FC02EF0E8C02318E123129 -:10370C00FE03311F609F06FC8D674F06FCDD28CC45 -:10371C00011F8F06FC9D67CC00008B4C08DE148BC0 -:10372C00730912204F06FCDC058B9C01EF056159D7 -:10373C0000EFE78C019D621004C6D7C716710AE72B -:10374C00710BE37150F000CE300BCF170006669E64 -:10375C0031FD5102717A30710BE33182E302EFFAE1 -:10376C008D1F7158F000710BE772C6D7C7C1C1FB32 -:10377C00F8FF8FFCFB4E02DC03F2EF318C024FFDA5 -:10378C00FBDC0452FFEF268C022FFCFB7061313105 -:10379C008D128FFDFB2FFCFB70613133BDD813FDF7 -:1037AC00B60DBB440001DC03F690BB8B721004C653 -:1037BC00D7C7C1FBF8FFAC0814A91489708B61281A -:1037CC00706131FD8E4E1344030071FEDC23AC0896 -:1037DC00148A04819A04AC08148A044C11DC10A9D4 -:1037EC00148B99AC0814CA0200AC0814CA0310EF6D -:1037FC0072AC0814CA0400AC0814A914894DDE0A72 -:10380C00AC08148A02819A02EF12AC0814A914892C -:10381C004D61D308AC08148A02919A02AC08148A40 -:10382C0003919A03D1DF3CAC08148A024C10DF10D0 -:10383C00A91489318EA112AC0814A9146299EF173E -:10384C00AC08148A024CF0DF0EA91489318EB11227 -:10385C00AC0814A9146299AC0814CA0200AC081480 -:10386C00CA0310C0C6D7ED7538C75600664C0ADEC1 -:10387C000BF0317E12F67810FC86EFF0C6D7C7201D -:10388C000CFBF8FF17040600C15006C150A8C1502C -:10389C0030FD97021006D2DD1B4A6A04DE05A46ACD -:1038AC00E2EF7034E4FB895CFC99FD56397110B27F -:1038BC00FBF2EF5F717BFA300600C117040600C102 -:1038CC0030E9FBFD964E1004717AFAF46A8FE4FB32 -:1038DC005C01D1DD264004F903DF205010C180FDCE -:1038EC00CA34C0C736100571D4C6DE0F17C15006D6 -:1038FC00C150A8C15030FD970210064004F903DDF9 -:10390C00064004F904DF0B8FE4FB5C02D161E8FD97 -:10391C004940F2100CC6D7D9E5FBC15030FD7602F8 -:10392C00C0629FE8FB5008C15011FDCA34C0F2D7E9 -:10393C00D9E8FBC1D9E7FBC15030FD0A0310045094 -:10394C0008C15011FDCA34C0F2D7C7200CFBF8FFD8 -:10395C00CC09004007F901DF05CC0A02EF03CC0AC1 -:10396C0010CC0B808FE4FB5C039C07D1DF08717AD1 -:10397C00D5CC0807EF06717BD5CC082F17040800AF -:10398C00C15004C150A0C15030FD41031006624C1F -:10399C0002DF077110B2FBF2EF357118B2FBF46A5B -:1039AC00C736100571D4C6DE164004F903DF1017B4 -:1039BC00A1C15006C150A8C15030FD97021006712C -:1039CC007BFA8FE4FB5C034E07DD03E2EF01F210A0 -:1039DC000CC6D7D504F9DF03F6BD6C4004F901DD44 -:1039EC000AD476DD03B476D7CD76038F04F9318F04 -:1039FC00E723DD0B24020024030061C8ED043B8F98 -:103A0C0006F931233E301B00466CDF0AE0C1501032 -:103A1C00FDCA34C0EF1D307701466CDF165002C171 -:103A2C005010FDCA34C0F64672DF088FC8FB501028 -:103A3C00D6BD72F64672DD36B6724672DF30711242 -:103A4C0095EF2B301B00466CDF13F64674DF18E045 -:103A5C00C15010FDCA34C0C9745307EF0A30770146 -:103A6C00466C61F8711295F6467461E8B67431547F -:103A7C009808714397F6BD6CEF1431449705F6BD69 -:103A8C006CEF0BA66CF6466C61F8C96CFFFF3162EB -:103A9C0098194A6E05DE16A46E4A6E05DF0FA46EE9 -:103AAC005004C15010FDCA34C0EF02F46E3164985A -:103ABC00194A7005DE16A4704A7005DF0FA4705009 -:103ACC0008C15010FDCA34C0EF02F470D471DD038C -:103ADC00B471D7317298174A6F05DE14A46F4A6F10 -:103AEC0005DF0DA46F5010C1FDCA34C0EF02F46F96 -:103AFC004A6F0661F8CD7125D7C736100571D4DE33 -:103B0C000E8FB2FB5C02D1DF06308A386194D24052 -:103B1C0004F903DF1C31220705301D2A619431544E -:103B2C00970C7153975080C15012FDCA34C0FD429E -:103B3C003BFD683BC6D78F03FC5C01D1DD1DD479FE -:103B4C00DD03B479D7CD79098D624B78DD0D8D62AB -:103B5C009D785040C15012FDCA34C0D74004F903BF -:103B6C00DD04F6BD1AD7D5D0FBDF08F6461ADD19F1 -:103B7C00B61AD7D9CCFBF1461ADD0ED9CCFB12AD57 -:103B8C001A43DE03A61AD7B61AD7717BFAC78FC4AD -:103B9C00FB76F5C4FB717AFA5C10D161E87162971F -:103BAC00665C0FD1DD57665C01D1DD05F504F9EFDC -:103BBC004C665C02D1DD11E0C15003FD622BC0717B -:103BCC001300711B20710303665C04D1DD117113AA -:103BDC0000711B20D503FC61F8710303FD183566D9 -:103BEC005C08D161E87103035005FDA5097102035E -:103BFC005003C1FD622BC0711A20FD0A2BF2C6D7EF -:103C0C00C756FF4A481361C8EDC23C8F06F93115FF -:103C1C0005300400EF0F8F06F9314505300500EF34 -:103C2C0004D907F9F1609F28FC8D7A9F29FC713427 -:103C3C0094E661301271049461DC31196162629F07 -:103C4C002AFCE52BFC31449805304000EF01F6C10D -:103C5C0031340405302000EF01F6C2616B08616A53 -:103C6C0008C131749805300400EF01F6C2616B088D -:103C7C00616A08C131649804E6A1EF01F6C2616B78 -:103C8C0008616A08C131549803E6EF01F6C2616B12 -:103C9C0008616A9F2CFCF171240461DC9F26FCF105 -:103CAC0071540761DC9F27FCD848F10104ECFC142B -:103CBC00A9148976A4486672C6D7C7FDC9088F04B3 -:103CCC00F9318FE724000061F8ED9E3E23DD1B23C4 -:103CDC0061F8EDAA3D2361F8ED233E2361F8ED6C0C -:103CEC003E2361F8ED3E3FED9B3EF6BD72711395A0 -:103CFC004005F901DF2C3134981B466CDD04F424AB -:103D0C00EF02A4244A2465DC0FF6BD6CF504F971AE -:103D1C002297EDBF3FFDAB23AD6C440A0061D8ED9B -:103D2C00BF3F714297FD7604716394FDAB2340074E -:103D3C00F903DF09712297F504F9EDBF3FFD152654 -:103D4C0040B1FB9BDE09712297F504F9EDBF3F7181 -:103D5C004A277140110571301105713A22715A22AE -:103D6C0071501105FD6329D2DD09712297F504F913 -:103D7C00EDBF3F71103500CF37001D71401205406B -:103D8C0005F901DD064005F903DF05F5CDFBEF0470 -:103D9C00CFCDFB03CF04F902FD3329EDBF3FFD4529 -:103DAC002CFDFE2C714A9D712B21FD1835FDA83080 -:103DBC00F537FF712BE0F505F9712297CBE43FEF56 -:103DCC00CBE6F6F0FD7604713BD48F06F93105286D -:103DDC005004FD732B625C03318E315D34B3FB896F -:103DEC006168995002FD732BD2DD067170B3FBEF45 -:103DFC00047178B3FBFDAB23FDBA2D710806F9CF26 -:103E0C0004F9038FA6FB5C02D1DD095080C1501070 -:103E1C00FDCA34C0EDBF3FFDC13F3164972FA47C78 -:103E2C00D47CDD0831A4E00A31020C06712BE0FDD4 -:103E3C00354031A4E01731040C13712BE05027C12D -:103E4C005005FD622BC0CF04F904712297FD2A4066 -:103E5C008F06F931250731349803F504F9EDBF3F8E -:103E6C00FDC13F31020C15D83AC15005FD622BC083 -:103E7C005005FDA509FD3540CF04F903FD2A408FFF -:103E8C0006F931250731349803F504F9EDBF3FF5F8 -:103E9C0004F9CFCDFB03F5CEFBF5D0FB717295F693 -:103EAC00426CFF61E8EDBF3FF6BD72711395F5E40E -:103EBC00FBFD5639717AFAFD132EFDA02CFD582D01 -:103ECC00712B21714B9D31349502EFFACE3708CB13 -:103EDC00E4BFFFCBE6FFF3CED4FFF5B4FBF5B5FBA7 -:103EEC00F5B6FBF5B7FBCF37000971481205F6BEE6 -:103EFC00E0BEE2BED0716A27FDDF29714307714B2A -:103F0C002771481005714811057138100571381169 -:103F1C0005713302713B22715302715B227158108F -:103F2C000571581105CF04F905714297F6BD6CFD6A -:103F3C009209F505F9F42431349804D432DD20E5E6 -:103F4C0005F9E504F98F06F9312568F5F8FBF5F666 -:103F5C00FB502EFDA509CF05F903E504F9EF54FD3F -:103F6C00CA04FD3E23717301713204714302710363 -:103F7C009471629431949E02EFFA712AE7CEA409EF -:103F8C00F5F3003104070261FDE5F300F468FDC9A7 -:103F9C0008CEA40831329806CF04F905EF09714315 -:103FAC0097E505F9E504F9712BE78F06F93125033F -:103FBC00F504F9C6D78FE3FB5C01D1DF60D47DDF5C -:103FCC0019310200585003FD732B625C01D1DF07DD -:103FDC00F504F9712297D7E47DD74A7DF0DF0731DC -:103FEC0004003AF47DD74A7DC8DF0AF504F9712242 -:103FFC0097CD7DF0D7310200084A7DFFDD1FA47DEF -:10400C00D7F0C15004FD622BC08FB3FB5C9F9FB3F4 -:10401C00FB7110C4FB30963B6194CD7DF0D731140D -:10402C009506F504F9712297D7716397F47C717238 -:10403C0007FD5102717307D7FDE404F2D7717BFAC7 -:10404C00C7200CFBF8FF8FEAFBF0F9E9FBF303FD4B -:10405C008E4E13BC048FECFBF0F9EBFBF303FD8EDF -:10406C004E13BC028FEEFBF0F9EDFBF303FD8E4E0D -:10407C0013BB717AFAAC04BDD8F6BDDAAC04311EB0 -:10408C00BDDCF6BDDEFD690DADD8BDDCADDABDDE47 -:10409C00AC02BDD8F6BDDAAC02311EDADCC3DADE16 -:1040AC00C3BDDCF6BDDEFD690DC0BDDEC0BDDCAD43 -:1040BC00DEFDDF0EADD8BDDCADDABDDEABBDD8F6B6 -:1040CC00BDDAAB311EDADCC3DADEC3BDDCF6BDDE35 -:1040DC00FD690DC0BDDEC0BDDCADDEFDDF0EDADA84 -:1040EC00ADD8FD1844C3C58D8A5C3FF0317E0440C9 -:1040FC00FC14C2C0B9A48AF6BC08BC0A9C078C0785 -:10410C004C2EDD3D8D8A0E0770F161DC605C3FF05A -:10411C00317E127940FCBDD8F6BDDA8C0773095C90 -:10412C0022318FBDDC70BDDEFD690DAC08BDDCAC91 -:10413C000AFDDF0EADDABC0AADD8BC08615907EF39 -:10414C00BDAC08BDD8AC0ABDDAC9DC0004F6FD3341 -:10415C000EC9DCFFFFF6FD340FADD8BD84AF3AFCC1 -:10416C004684DD11AF3CFCBF3EFCAF3AFCBF3CFCCF -:10417C00AD84BF3AFCAF3CFC423EFCDC46AF3AFCA3 -:10418C00423CFCDE3EAD26423AFCDE374A2A16DCC7 -:10419C001A4A2AA0DE138D864B2ADE0DAF3AFC2676 -:1041AC008844691061C8FD0142F42AAF3AFC4451BD -:1041BC0046DC0AAF3AFC241027BD28EF0DC928F8BD -:1041CC002AEF074A2AFF61E8A42AAF3EFC423CFCD6 -:1041DC00DC18AF3CFC423AFCDE10AF3AFC4628DE61 -:1041EC0009F486AF3AFCBD88EF074A86FF61E8A464 -:1041FC0086100CC6D7717BFAC7710A9E31929E024B -:10420C00EFFA8E949F34FC8E969F35FC8E979F36DA -:10421C00FC8E989F37FC8E939F38FC8E929F39FCB6 -:10422C00710B9E717AFA8F37FCFD480F76FD964321 -:10423C0013BD82D5EFFBDF0AD5F0FBDF05D5F1FB13 -:10424C00DD25F6B14682DF11C9823722665C039107 -:10425C00DF060A82181A83009617FDB94413FDD99C -:10426C004231049802EF61520692926934FC682E36 -:10427C00FCDFF6AD82BD80F87EF3311C790AF9447F -:10428C00FEFFDD44D87EF101040AF914A944FFFFB6 -:10429C00DF04E6B9EF0BD87EF101040AF914A9A1E9 -:1042AC00B9717BFAA0EFFBD5EFFBDF1CA0F0FBD5BF -:1042BC00F0FBDF14A0F1FBD5F1FBDF0CCFEFFBFF24 -:1042CC00CFF0FBFFCFF1FBFFC6717AFAD7C716D838 -:1042DC007EF10744A800DC05710298EF1CF647DD5F -:1042EC0018A47E4A7EA8DC05710298EF0CF87EF3C8 -:1042FC00311CF6780AF9B7EFE4C6D7C756A896660C -:10430C00F0317E12F6B1780AF966D1DFF1717BFAE1 -:10431C00F5EFFBF5F0FBF5F1FBF47E710398C6713C -:10432C007AFAD7C72004FBF8FFD448DF168D7E9DA0 -:10433C008B717BFA52069292692EFC68C0FCDFF6F8 -:10434C00717AFA4A4806DE0EE84809C0FC9C03A4C0 -:10435C00488C0372EF30F88BF3311C790AF9BB31BE -:10436C001298058B9C03EF0F8C019C03D48BDF05FB -:10437C00CD8BA7EF02B48B718071179861DC61FB58 -:10438C007111988C03721004C6D7C72008FBF8FF74 -:10439C008F37FCFD480F9C078F36FCFD480F9C06A1 -:1043AC008F35FCFD480F9C058F34FCFD480F9C0499 -:1043BC008F38FC9C038F39FC9C028C06318E0112C9 -:1043CC00791A20BB8C075C03D1DF098C064C036186 -:1043DC00C86179008C05318EB1610900BB313D1289 -:1043EC000103BB8B0E04708C011C00BB8FF4FB4EC5 -:1043FC0003DC0E8C034FF4FBDC0B8C024FF5FBDC67 -:10440C0004AB12EF03ABB1121008C6D7C7C3C1205F -:10441C0008FBF8FFF661490A61F8614908DF07F704 -:10442C00340000EDB544E6BC04F6BC06AC0ABC0294 -:10443C00AC08BBAC06614902AC0461F8614900DE12 -:10444C0028AC04BDD8AC06BDDAE1FDEE0EADDABC8D -:10445C0006ADD8BC04ABBDD8AC02BDDAE1FD090F8A -:10446C00ADDABC02ADD8BBEFCAAC06BC02AC04BB27 -:10447C00AC08BDD8AC0ABDDAAC04BDDCAC06FD6C36 -:10448C000EAC04BDDCAC06FDDF0EE1FD090FADDAB0 -:10449C00BC06ADD8BC04AC06614902AC0461F86141 -:1044AC004900DCC5AC0214AB12100CC6D7C7C12036 -:1044BC0004FBF8FF8F31FCFD480F9C034E04DF1CFE -:1044CC00AD804682DE07AD82268012EF40F6468232 -:1044DC00DF074680DD03E7EF34F7EF318C04318ED4 -:1044EC00B1128C03318E43DF1830382226800682BD -:1044FC00BB8C045C0391DF05AB041800BBAB12EF63 -:10450C000C8C034E04DE0532A900EF01F71006C631 -:10451C00D7717BFA3122980CF6468EDD07B68E7178 -:10452C007AFAEF7C712398717AFA4004F904DF0768 -:10453C00715307F42CEF69D9CFFBF1E7240000DDB0 -:10454C000F23DD1A23DD1023DD5323DD2723DD3874 -:10455C00715307F42CEF49715207F42CEF42D42C11 -:10456C00DF07715207E42CEF05715307F42CC98E49 -:10457C00FA00EF2CD42CDF0B715207E42CC98EFA05 -:10458C0000EF1DF5CFFBEF18D42CDF0B715307E4B4 -:10459C002CC98EFA00EF09CFCFFB02EF03FDAD451E -:1045AC00D7D905FCF1E7240000DD0923DD2123DD4B -:1045BC000923EF1B715307F42CD7D42CDF0771524E -:1045CC0007E42CEF05715307F42CC98E2D01D7711C -:1045DC005207E42CD731629501D7710396D9CDFBE4 -:1045EC00F1E7240000DD1223DD1923DD1123DD2684 -:1045FC0023DD3423DD3923DD3FFD6D46EF3DFD8E9C -:10460C0046EF38D9CCFBC1AE6CFD612DC0F313BEA7 -:10461C006C712304EF25F0C1AE6CFD612DC0F3135A -:10462C00BE6C712304EF14F6BE6C712204EF0CCB3C -:10463C006CFF00712304EF03FD02474004F905DD14 -:10464C00064004F901DF06712304710396310496C8 -:10465C000FF6BE64BE6A31220402EF02F690BE6E03 -:10466C00D7CD2E47F490AE6C317DBFCAFCFDD7463A -:10467C00D2DF0ED9CCFBC1AE6CFD612DC0F313BEE5 -:10468C006CD7FDD746D2DD0DCD2E47F490AE6C31F4 -:10469C007DBFCAFCD7E8900934205080D6BFC6FC39 -:1046AC0022CAFCBDD8304700FD940DBFC8FC30C6F3 -:1046BC00FCFD772DF313BE6CB42ED42EDF0CCD2E57 -:1046CC0047A4904A901F61C8F490D740AFFB0BDC15 -:1046DC0005712304F2D740AFFB0661D83122941147 -:1046EC00F0C1AE6CFD612DC0F313BE6C712204EFF2 -:1046FC0003FD0247E2D7710296F0C1AE6CFD612D4D -:10470C00C0F313BE6CA4914A9140DC37F491D8925B -:10471C00F1313F0412FD14D892F1BDD85008FDE3DD -:10472C000D087208E6D2DD040192DFFC896158D1D4 -:10473C00DD05712204EF03712304A4924A922061D7 -:10474C00C8F492D7C73026FDC6D77180717DFADECA -:10475C00035201D75200D7C7C12004FBF8FF17043E -:10476C000300C1E0C15010C150A4FD9702100662B5 -:10477C009C02D1DD058C0272EF518C0C70C18C0443 -:10478C0070FDDB47C0629C02D1DD058C0272EF3BF1 -:10479C008C035C7DD1DF03F2EF3117A1C1E0C15076 -:1047AC0010C150A4FD97021006629C02D1DD058C4D -:1047BC000272EF178C015C7DD1DD03F2EF0D8C03DF -:1047CC0070C15010FDDB47C0629C021006C6D7C7F3 -:1047DC00880616710AE650A4FDC303D2DD077133B7 -:1047EC00955202EF2217FDDF036770FDDF03FD2AF0 -:1047FC000450A4FDDF035020FDDF0350AAFDDF03AE -:09480C00FD5304713395F2C6D787 -:1048150061FC61FCC1C3C5C7520C929269D4FEC14B -:10482500DFF88EFD708EFCC1717AFA4004F903DF62 -:1048350005301D2A6194C09EFC609EFD34D4FE5255 -:1048450006C0B9A5A592DFF9C6C4C2C061FC61DF87 -:10485500520C929269D4FEC1DFF88EFD708EFCC1B8 -:104865008F4105775C04D1DD06675C01D1DD5031F0 -:104875005496367162077153968FB4FB5FBCFBD1BA -:10488500DF1B8FB5FB5FBDFBD1DF128FB6FB5FBEB4 -:10489500FBD1DF098FB7FB5FBFFBD1DD0C316207B1 -:1048A50002EFFA716307716B27711398FD5130F4AC -:1048B500227148500571605005717AFAEDAF49676C -:1048C5005C02D1DD16D422DD124A2202DD0DF4226E -:1048D5007148500571605005717AFA717AFA8D2226 -:1048E500318FE7240000DD0823DD1423DD2CEF4A9A -:1048F500F4487140500571505005E422EDAF498FE1 -:1049050040059D49715050058D499D4BD849FD1075 -:1049150034629D4ACD2202EDAF49675C02D1DD17B5 -:10492500675C10D1DD05CD2203EF0F71485005718D -:10493500605005F422EF73CD22044A2203DF108D67 -:104945004A9F4005D84AC1D849FD9C34C0EF1F8F06 -:10495500400576717449DC054A4902DE06716050EE -:1049650005EF47C7D849FDD230C071505005D84B27 -:10497500F1242900DD27240400DD22242200DD1D89 -:10498500241100DD0C240100DD13241E00DD0EEFD3 -:104995000A4A4960DF07CD4961EF02A4494A22036B -:1049A500DF08D849FD1034629D4AC09EFC609EFD1B -:1049B50034D4FE5206C0B9A5A592DFF961FCC1C386 -:1049C500C5C7520C929269D4FEC1DFF88EFD708E78 -:1049D500FCC1717AFA51405F0401D1DD06F616A7D4 -:1049E50047DFF2300400BF2401F6BF2A01300B0B6C -:1049F500BF2801FD5102300B0FBF2801FD510230C8 -:104A05000F0FBF2801710AE6F6420C01DD33AF0432 -:104A150001BF0C0131529529715295710BE2D84FA6 -:104A2500FDC3033184BD02EFFACBB422FBD851F1AB -:104A3500BEB8714BE1714BE5710ABD8D509E44EFD7 -:104A45000C715395714AE5717BBD713395C09EFC20 -:104A5500609EFD34D4FE5206C0B9A5A592DFF9C605 -:104A6500C4C2C061FCC1C5717AFAD44EDD0BEA4CF3 -:104A7500899E44A64CB44EEF33710AE6300400BF5C -:104A85002401F6BF2A01300B0BBF280100000000EE -:104A950000000000510FBF280100000000000000C9 -:104AA50000500FBF2801712395713395C4C061FC77 -:104AB50061EF520C929269D4FEC1DFF88EFD708EC3 -:104AC500FCC12006FBF8FF71503002CEABACCC0424 -:104AD50000F6BB31B2E210617900F6614900DFF3FF -:104AE50071603002ED6F4B8E519C03713BE28C037C -:104AF5005C02D1DD1E8C035C08D1DF0971503002E8 -:104B0500CC0400EFCC8C0570FD7E35629E50CC0444 -:104B150002EFBE8C035C03D1DF408E509C027150C6 -:104B250030028C04D1DF0E8C0270FDC435629C0509 -:104B3500CC0401EF328C044C02DF0671603002EFC9 -:104B450029CF34025A716030028C0270C18C057015 -:104B5500FD2635C0CF34024AEF108C035C01D1DD50 -:104B65000671603002EF03EDD64A1006C09EFC6068 -:104B75009EFD34D4FE5206C0B9A5A592DFF961FCAD -:104B8500C1C3C5C7520C929269D4FEC1DFF88EFD30 -:104B9500708EFCC1710A9E31929E02EFFA8FDEFB88 -:104BA5004F96FFDF198FDFFB4F97FFDF118FE0FB7C -:104BB5004F98FFDF095004C15011FDCA34C0710B75 -:104BC5009EC09EFC609EFD34D4FE5206C0B9A5A5CC -:104BD50092DFF9C6C4C2C061FCE46861FCC1C3C50B -:104BE500C7520C929269D4FEC1DFF88EFD708EFC1F -:104BF500C1C1FBF8FF8D1F9C018E31318EE7240664 -:104C050000DD0823DD0E23DD22EF38717AFA8C01F1 -:104C15009D60EF2F717AFA4007F901DF068C019D3F -:104C25005FEF2051FF2E019D5FEF18717AFA8C011D -:104C35009D304004F903DD064004F904DF053073B7 -:104C45002561944031FF09DE05A031FFEF0771585A -:104C5500F000716296710BE3C0C09EFC609EFD344E -:104C6500D4FE5206C0B9A5A592DFF9C6C4C2C0617B -:104C7500FC717BFAC7D46861F831249727712397B3 -:104C8500D468DD05B468CEABAC717AFA5600664CD3 -:104C95000ADD1172F3311C79D8FCCEFC0061CA61C2 -:104CA500A486EFEA717AFAF2C6D7C7C1C1FBF8FF4D -:104CB500CC01008C014C0ADE36717BFA8C01F03197 -:104CC5007E0410FC14A96168DF09AC02B9717AFA97 -:104CD500F2EF1D8C01F0317E127910FC614902DF83 -:104CE50006717AFAE2EF09717AFA615901EFC4E2C5 -:104CF5001004C6D7C72004FBF8FFF64210FC61F884 -:104D0500EDDB4D717BFA9C038C034C0ADE3C8C0376 -:104D1500F0317E0410FC14A96168DF05717AFAEFA1 -:104D250029717AFA8C0372F3311C7910FCCEFC00E0 -:104D350061CA629C02D1DF0A8C03F0317E12E678EB -:104D450010FC717BFA615903EFBECC0200CC010166 -:104D55008C02F0317E0410FC14A96168DD788C02A8 -:104D6500F0317E127910FCE743DF658C014C0ADED9 -:104D75005F8C01F0317E127910FCE743DD4D717BCC -:104D8500FA8C01F0317E0410FC14A96168DF18610A -:104D950069018C01F0317E12F67810FC8C024E010F -:104DA500DCED717AFAEF2F8C01F0317E0410FC14E2 -:104DB500A9128C02F0317E337810FC8C01F0317E23 -:104DC50012E67810FC615902717AFA615901EF9B7C -:104DD500615902ED554D00F21004C6D761FF520C22 -:104DE500929269D4FEC1DFF88EFD708EFCC1717A96 -:104DF500FA8FE4FB5C03D1DD114004F903DD0640C5 -:104E050004F904DF05308A386194C09EFC609EFD7C -:104E150034D4FE5206C0B9A5A592DFF961FC61FC48 -:044E250061FC61FCCF -:0A4E2A0000060C12181E242A303670 -:104E3400ACFB0000000064FE00000000DF39113606 -:104E44008C22E1453E2EED2E1D45053B5408C63C03 -:104E540028FC36FE20FE02F903F929FC30FE2AFC68 -:104E64002BFC08F926FC6CFF1AFF6EFF6AFF64FF37 -:0A4E740027FC66FF2CFC5555555530 -:104E7E00FF0000000000983AF82AFF0000004700EB -:104E8E00317503F7332312D714AEF8C716AC0612DA -:104E9E00C5AC0416F643DD078B99A7A5B3EFF5C293 -:024EAE00C6D765 -:024FF400325237 -:0A4FF60031373A33323A3334000009 +:10309C00CFFCFB36CFFDFBC9D7C7CFA4FB12CFA506 +:1030AC00FB25CFCCFBFFF5CDFBF5CEFBF5CFFBF530 +:1030BC00D0FB5600664C64DE08723826FB0086EFA7 +:1030CC00F3F5E3FB710A20711A20710203C6D7C70E +:1030DC0088061617F1E73403002361E3ED16342359 +:1030EC0061F8EDDE32B12361E3EDE8322561F8EDF4 +:1030FC00F632B1240D0061D8ED1634240B0061F8C2 +:10310C00EDD0312361F8ED13322361F8EDE3312377 +:10311C0061F8ED0B3424060061F8ED9232B12561B3 +:10312C00D8EDAE3224000061F8EDBB322361F8ED2E +:10313C0016342361F8ED1034B12361E3ED1633231B +:10314C0061F8ED27332361F8ED38332361F8ED276F +:10315C00332361F8ED49332361F8ED5A332361F8D9 +:10316C00ED69332361F8ED8B332361F8ED9733234D +:10317C0061F8EDA3332361F8EDAB33240200236136 +:10318C00E3ED16342361F8EDDF332361F8EDB3334F +:10319C002361F8EDBE332561F8EDC933B124060087 +:1031AC0061D8ED163424000061F8ED18342561F86F +:1031BC00EDD43324120061F8ED8C322361F8ED7CF0 +:1031CC0032ED183467D1DD0C30B53B619434C4FB5F +:1031DC0089616F99ED2234675C02D1DD0730EB2AEF +:1031EC006194EF0B675C01D1DD0530F02A619467C7 +:1031FC005C3CD1DD0F30F52A6194675C3C726673E0 +:10320C006218A4FBED223467D1DD625C01D1DD05CF +:10321C00300800EF01F6609F01FC675C02D1DD0312 +:10322C00E6EF01F63401FC89616899675C04D1DD35 +:10323C0004E6A1EF01F63401FC89616899675C082A +:10324C00D1DD05302000EF01F63401FC896168996D +:10325C00675C10D1DD05301000EF01F63401FC89FC +:10326C00616899675C20D161E8716001FCED2234E2 +:10327C004A5AC8DE08E85A67185AFAA45AED22349A +:10328C00679D5AED2234D448DF08679FCDFBA448D4 +:10329C00EF0D4A4805DE08E848671811FDA448ED13 +:1032AC002234675C0F7266736218A4FBED22344AF9 +:1032BC004864DE1B4A4801DF0667D161F85701E814 +:1032CC0048671826FBA4484A480561C8711296ED58 +:1032DC00223434A6FB89615F99ED22343048296190 +:1032EC009466736718A4FBED223440A9FB6ADF13C4 +:1032FC0040AAFB68DF0D674C6CDF083063406194BB +:10330C00713AD5679FABFBED2234675C7F70C117B8 +:10331C00F1243000FD2C30C0ED2234675C3F70C1CD +:10332C0017F1243000FD2C30C0ED2234675C07709F +:10333C00C117F1243000FD2C30C0ED2234675C1F26 +:10334C0070C117F1243000FD2C30C0ED22346770B1 +:10335C00C117F1243000FD2C30C0ED2234CEABACC3 +:10336C00710A9E31929E02EFFAD592FFDF05710B26 +:10337C009EEFED679E99710B9E9FDBFBED223471E6 +:10338C004296675C7F9FDCFBED2234714296675C52 +:10339C003F9FDDFBED2234675C3F9FDEFBEF7767E1 +:1033AC005C1F9FDFFBEF6F306A396194679FE4FB12 +:1033BC00EF643037396194679FE5FBEF5930503932 +:1033CC006194679FE8FBEF4E675C01D1DD48FD26F9 +:1033DC0043EF43675C02D1DD05712A21EF06714A88 +:1033EC009D712B21675C01D1DD0F710300710B20E6 +:1033FC00711300711B20710303679FE3FBEF1767C9 +:10340C00318EEF12679FD3FBEF0CEF0A664C5BDE3D +:10341C0005736718A4FBC6D7C716664C30DC094C7D +:10342C0037DE05FD0730EF6B664C02DF1F8FA6FB06 +:10343C005C03728F03FC5C03318E316D08616A088A +:10344C00128F03FC5C80312A6162EF56664C3DDFC3 +:10345C0008AE90BD5CF85CEF49664C3EDF04F85D4D +:10346C00EF40664C4FDF05FD4E43EF36664C61DF97 +:10347C0008E85A095AFA72EF29664C7FDF05FD2BD2 +:10348C003CEF1F664C4EDF0B310498045210EF12C8 +:10349C00F2EF0F664C5BDC0452FFEF06667309A477 +:1034AC00FB72C6D7C788061617F124100024050036 +:1034BC00DC07244C00DD17EF17717BFA17F104A41D +:1034CC00FB1489617F99717AFA715296EF02A45AB2 +:1034DC00C6D7C7C1C1FBF8FF4004F903DD064004A1 +:1034EC00F904DF38717BFA8C027309ACFB5E0AD1EC +:1034FC00DF278C02318E04A4FB14896E0A99716249 +:10350C0007717AFACC0100316207086159018C010C +:10351C00D1DFF4716307716B27717AFA1004C6D787 +:10352C00CF03FC03F501FCF505FCF507FCD7C788B8 +:10353C00061617F1E734020025DD3D23DD1725DDE6 +:10354C001C23DD0523DD2BEF3B710297679F06FCE7 +:10355C00CD6103EF2F675C839F03FCEF27675C0350 +:10356C009F05FC675C034C0261F8712298FD3C4599 +:10357C00EF12679F07FCEF0C6791DF08E0C1501258 +:10358C00FDDE34C0C6D7C71617F1E7240000DD2ACC +:10359C0023DD1E240300DD0724FB00DD24EF253191 +:1035AC00329805308000EF01F6086F04FC7208EFCA +:1035BC00198F01FCF501FC72EF107152975235EF27 +:1035CC0009F2EF0666730900FC72C6D7C71617F12D +:1035DC00E7240000DD38241000DD1C23DD1C23DD76 +:1035EC0030240E00DD18241100DD1B240F00DD1229 +:1035FC00243000DD15EF1EE2EF1D5202EF195204CC +:10360C00EF155206EF115205EF0D5207EF09F2EFCD +:10361C00065203EF0252FFC6D7C731649637716367 +:10362C00968D609FACFB8D5F9FCBFB36D2FCC7D8D1 +:10363C005FFD8C37618A70618AFDD137C0D864F127 +:10364C00312F609D638D5E4B63DD0A7172968D63C5 +:10365C009D5ECD61034A6105DE083096366194CDDE +:10366C00616BB4617150F000CE300BCF170006CEF9 +:10367C003106FD5102717A30710BE3710BE7C6D73D +:10368C008D639D5E8D639FADFBD74004F903DF0610 +:10369C004004F904DF02F2D73174960C7173967101 +:1036AC0013978D639D65EF313104971F71039771EB +:1036BC001297D506FCDF04F466EF0A8F06FC500265 +:1036CC00D6A1609D668D669D65EF0E311497068DB3 +:1036DC00669D65EF048D639D658D659FADFBD8651B +:1036EC00FDFE36E865091C2270C15013FD8247C0EF +:1036FC00F2D7C7C1C1FBF8FF8C02D1DF05F506FC80 +:10370C00EF1A8C024C05DE06CF06FC02EF0E8C0283 +:10371C00318E1231FE03311F609F06FC8D674F0600 +:10372C00FCDD28CC011F8F06FC9D67CC00008B4C68 +:10373C0008DE148B730912204F06FCDC058B9C01F0 +:10374C00EF05615900EFE78C019D621004C6D7C7E5 +:10375C0016710AE7710BE37150F000CE300BCF17E6 +:10376C000006669E31FD5102717A30710BE3318295 +:10377C00E302EFFA8D1F7158F000710BE772C6D798 +:10378C00C7C1C1FBF8FF8FFCFB4E02DC03F2EF312B +:10379C008C024FFDFBDC0452FFEF268C022FFCFB4E +:1037AC00706131318D128FFDFB2FFCFB7061313359 +:1037BC00BDD813FDB60DBB440001DC03F690BB8BEA +:1037CC00721004C6D7C7C1FBF8FFAC0814A9148942 +:1037DC00708B6128706131FDAC4E1344030071FE97 +:1037EC00DC23AC08148A04819A04AC08148A044CB7 +:1037FC0011DC10A9148B99AC0814CA0200AC081483 +:10380C00CA0310EF72AC0814CA0400AC0814A91453 +:10381C00894DDE0AAC08148A02819A02EF12AC08B8 +:10382C0014A914894D61D308AC08148A02919A0228 +:10383C00AC08148A03919A03D1DF3CAC08148A02B9 +:10384C004C10DF10A91489318EA112AC0814A914E4 +:10385C006299EF17AC08148A024CF0DF0EA9148998 +:10386C00318EB112AC0814A9146299AC0814CA02B6 +:10387C0000AC0814CA0310C0C6D7ED8938C756006F +:10388C00664C0ADE0BF0317E12F67810FC86EFF0F7 +:10389C00C6D7C7200CFBF8FF17040600C15006C1A1 +:1038AC0050A8C15030FD97021006D2DD1B4A6A04A5 +:1038BC00DE05A46AE2EF7034E4FB895CFC99FD6AD6 +:1038CC00397110B2FBF2EF5F717BFA300600C11751 +:1038DC00040600C130E9FBFDB44E1004717AFAF411 +:1038EC006A8FE4FB5C01D1DD264004F903DF205034 +:1038FC0010C180FDDE34C0C736100571D4C6DE0F92 +:10390C0017C15006C150A8C15030FD970210064097 +:10391C0004F903DD064004F904DF0B8FE4FB5C02C1 +:10392C00D161E8FD6840F2100CC6D7D9E5FBC15057 +:10393C0030FD7602C0629FE8FB5008C15011FDDEDD +:10394C0034C0F2D7D9E8FBC1D9E7FBC15030FD0A2E +:10395C000310045008C15011FDDE34C0F2D7C7204B +:10396C000CFBF8FFCC09004007F901DF05CC0A027B +:10397C00EF03CC0A10CC0B808FE4FB5C039C07D1CB +:10398C00DF08717AD5CC0807EF06717BD5CC082FF0 +:10399C0017040800C15004C150A0C15030FD4103B0 +:1039AC001006624C02DF077110B2FBF2EF35711892 +:1039BC00B2FBF46AC736100571D4C6DE164004F9A2 +:1039CC0003DF1017A1C15006C150A8C15030FD979C +:1039DC00021006717BFA8FE4FB5C034E07DD03E2F9 +:1039EC00EF01F2100CC6D7D504F9DF03F6BD6C401D +:1039FC0004F901DD0AD476DD03B476D7CD76038FD6 +:103A0C0004F9318FE723DD0B24020024030061C885 +:103A1C00ED233B8F06F9312349301B00466CDF1533 +:103A2C008FE3FB5C01D161E8F504F9E0C15010FDB6 +:103A3C00DE34C0EF1D307701466CDF165002C150EA +:103A4C0010FDDE34C0F64672DF088FC8FB5010D66E +:103A5C00BD72F64672DD36B6724672DF3071129563 +:103A6C00EF2B301B00466CDF13F64674DF18E0C1F9 +:103A7C005010FDDE34C0C9745307EF0A307701468D +:103A8C006C61F8711295F6467461E8B6743154980D +:103A9C0008714397F6BD6CEF1431449705F6BD6C75 +:103AAC00EF0BA66CF6466C61F8C96CFFFF3162989F +:103ABC00194A6E05DE16A46E4A6E05DF0FA46E5011 +:103ACC0004C15010FDDE34C0EF02F46E316498195D +:103ADC004A7005DE16A4704A7005DF0FA4705008FA +:103AEC00C15010FDDE34C0EF02F470D471DD03B4AC +:103AFC0071D7317298174A6F05DE14A46F4A6F059F +:103B0C00DF0DA46F5010C1FDDE34C0EF02F46F4A1C +:103B1C006F0661F8CD7125D7C736100571D4DE0E4E +:103B2C008FB2FB5C02D1DF06309E386194D2400428 +:103B3C00F903DF1C31220705301D2A61943154979B +:103B4C000C7153975080C15012FDDE34C0FD613BA7 +:103B5C00FD873BC6D78F03FC5C01D1DD1DD479DD1D +:103B6C0003B479D7CD79098D624B78DD0D8D629DCB +:103B7C00785040C15012FDDE34C0D74004F903DD4B +:103B8C0004F6BD1AD7D5D0FBDF08F6461ADD19B6F8 +:103B9C001AD7D9CCFBF1461ADD0ED9CCFB12AD1AD3 +:103BAC0043DE03A61AD7B61AD7717BFAC78FC4FBAC +:103BBC0076F5C4FB717AFA5C10D161E87162976694 +:103BCC005C0FD1DD57665C01D1DD05F504F9EF4CD6 +:103BDC00665C02D1DD11E0C15003FD622BC0711394 +:103BEC0000711B20710303665C04D1DD117113009D +:103BFC00711B20D503FC61F8710303FD2C35665C49 +:103C0C0008D161E87103035005FDA5097102035049 +:103C1C0003C1FD622BC0711A20FD0A2BF2C6D7C757 +:103C2C0056FF4A481361C8EDE13C8F06F931150582 +:103C3C00300400EF0F8F06F9314505300500EF0415 +:103C4C00D907F9F1609F28FC8D7A9F29FC71349477 +:103C5C00E661301271049461DC31196162629F2A51 +:103C6C00FCE52BFC31449805304000EF01F6C131E6 +:103C7C00340405302000EF01F6C2616B08616A085C +:103C8C00C131749805300400EF01F6C2616B086114 +:103C9C006A08C131649804E6A1EF01F6C2616B08B1 +:103CAC00616A08C131549803E6EF01F6C2616B08F2 +:103CBC00616A9F2CFCF171240461DC9F26FCF1717C +:103CCC00540761DC9F27FCD848F10104ECFC14A9D3 +:103CDC00148976A4486672C6D7C7FDC9088F04F943 +:103CEC00318FE724000061F8EDBD3E23DD1B23611D +:103CFC00F8EDC93D2361F8ED423E2361F8ED8B3EB2 +:103D0C002361F8ED5D3FEDBA3EF6BD72711395403F +:103D1C0005F901DF2C3134981B466CDD04F424EFDB +:103D2C0002A4244A2465DC0FF6BD6CF504F971225B +:103D3C0097EDDE3FFDAB23AD6C440A0061D8EDDEA0 +:103D4C003F714297FD7604716394FDAB234007F9F4 +:103D5C0003DF09712297F504F9EDDE3FFD152640CE +:103D6C00B1FB9BDE09712297F504F9EDDE3F714A38 +:103D7C00277140110571301105713A22715A227167 +:103D8C00501105FD6329D2DD09712297F504F9ED77 +:103D9C00DE3F71103500CF37001D71401205400514 +:103DAC00F901DD064005F903DF05F5CDFBEF04CF86 +:103DBC00CDFB03CF04F902FD3329EDDE3FFD452C8D +:103DCC00FDFE2C714A9D712B21FD2C35FDA530F586 +:103DDC0037FF712BE0F505F9712297CBE43FEFCB60 +:103DEC00E6F6F0FD7604713BD48F06F931052850C8 +:103DFC0004FD732B625C03318E315D34B3FB89613E +:103E0C0068995002FD732BD2DD067170B3FBEF0481 +:103E1C007178B3FBFDAB23FDBA2D710806F9CF0405 +:103E2C00F9038FA6FB5C02D1DD095080C15010FD57 +:103E3C00DE34C0EDDE3FFDE03F3164972FA47CD42F +:103E4C007CDD0831A4E00A31020C06712BE0FD5434 +:103E5C004031A4E01731040C13712BE05027C150F2 +:103E6C0005FD622BC0CF04F904712297FD49408FE8 +:103E7C0006F931250731349803F504F9EDDE3FFDE1 +:103E8C00E03F31020C15D83AC15005FD622BC050F1 +:103E9C0005FDA509FD5440CF04F903FD49408F06EB +:103EAC00F931250731349803F504F9EDDE3FF504BB +:103EBC00F9CFCDFB03F5CEFBF5D0FB717295F64235 +:103ECC006CFF61E8EDDE3FF6BD72711395F5E4FB16 +:103EDC00FD6A39717AFAFD132EFDA02CFD582D7157 +:103EEC002B21714B9D31349502EFFACE3708CBE480 +:103EFC00BFFFCBE6FFF3CED4FFF5B4FBF5B5FBF576 +:103F0C00B6FBF5B7FBCF37000971481205F6BEE0DA +:103F1C00BEE2BED0716A27FDDF29714307714B27C2 +:103F2C00714810057148110571381005713811056B +:103F3C00713302713B22715302715B22715810056F +:103F4C0071581105CF04F905714297F6BD6CFD92BD +:103F5C0009F505F9F42431349804D432DD20E50553 +:103F6C00F9E504F98F06F9312568F5F8FBF5F6FB50 +:103F7C00502EFDA509CF05F903E504F9EF54FDCA50 +:103F8C0004FD3E2371730171320471430271039479 +:103F9C0071629431949E02EFFA712AE7CEA409F56E +:103FAC00F3003104070261FDE5F300F468FDC90874 +:103FBC00CEA40831329806CF04F905EF0971439766 +:103FCC00E505F9E504F9712BE78F06F9312503F5C1 +:103FDC0004F9C6D78FE3FB5C01D1DF60D47DDF1918 +:103FEC00310200585003FD732B625C01D1DF07F5E1 +:103FFC0004F9712297D7E47DD74A7DF0DF073104AD +:10400C00003AF47DD74A7DC8DF0AF504F97122978E +:10401C00CD7DF0D7310200084A7DFFDD1FA47DD78E +:10402C00F0C15004FD622BC08FB3FB5C9F9FB3FBB0 +:10403C007110C4FB30B53B6194CD7DF0D731149534 +:10404C0006F504F9712297D7716397F47C717207A6 +:10405C00FD5102717307D7FDE404F2D7717BFAC7E7 +:10406C00200CFBF8FF8FEAFBF0F9E9FBF303FDAC46 +:10407C004E13BC048FECFBF0F9EBFBF303FDAC4EE1 +:10408C0013BC028FEEFBF0F9EDFBF303FDAC4E130A +:10409C00BB717AFAAC04BDD8F6BDDAAC04311EBDE6 +:1040AC00DCF6BDDEFD690DADD8BDDCADDABDDEAC38 +:1040BC0002BDD8F6BDDAAC02311EDADCC3DADEC3DF +:1040CC00BDDCF6BDDEFD690DC0BDDEC0BDDCADDE08 +:1040DC00FDDF0EADD8BDDCADDABDDEABBDD8F6BDB7 +:1040EC00DAAB311EDADCC3DADEC3BDDCF6BDDEFDD5 +:1040FC00690DC0BDDEC0BDDCADDEFDDF0EDADAADB4 +:10410C00D8FD3744C3C58D8A5C3FF0317E0440FC3A +:10411C0014C2C0B9A48AF6BC08BC0A9C078C074C14 +:10412C002EDD3D8D8A0E0770F161DC605C3FF03155 +:10413C007E127940FCBDD8F6BDDA8C0773095C227F +:10414C00318FBDDC70BDDEFD690DAC08BDDCAC0A89 +:10415C00FDDF0EADDABC0AADD8BC08615907EFBD66 +:10416C00AC08BDD8AC0ABDDAC9DC0004F6FD330ED0 +:10417C00C9DCFFFFF6FD340FADD8BD84AF3AFC4669 +:10418C0084DD11AF3CFCBF3EFCAF3AFCBF3CFCAD48 +:10419C0084BF3AFCAF3CFC423EFCDC46AF3AFC42EE +:1041AC003CFCDE3EAD26423AFCDE374A2A16DC1ACF +:1041BC004A2AA0DE138D864B2ADE0DAF3AFC2688E8 +:1041CC0044691061C8FD2042F42AAF3AFC445146C0 +:1041DC00DC0AAF3AFC241027BD28EF0DC928F82AB9 +:1041EC00EF074A2AFF61E8A42AAF3EFC423CFCDC04 +:1041FC0018AF3CFC423AFCDE10AF3AFC4628DE0914 +:10420C00F486AF3AFCBD88EF074A86FF61E8A486C6 +:10421C00100CC6D7717BFAC7710A9E31929E02EFC1 +:10422C00FA8E949F34FC8E969F35FC8E979F36FCAD +:10423C008E989F37FC8E939F38FC8E929F39FC7121 +:10424C000B9E717AFA8F37FCFD480F76FDB5431340 +:10425C00BD82D5EFFBDF0AD5F0FBDF05D5F1FBDD29 +:10426C0025F6B14682DF11C9823722665C0391DFE5 +:10427C00060A82181A83009617FDD84413FDF842DB +:10428C0031049802EF61520692926934FC682EFC5C +:10429C00DFF6AD82BD80F87EF3311C790AF944FE5D +:1042AC00FFDD44D87EF101040AF914A944FFFFDFB5 +:1042BC0004E6B9EF0BD87EF101040AF914A9A1B9EF +:1042CC00717BFAA0EFFBD5EFFBDF1CA0F0FBD5F068 +:1042DC00FBDF14A0F1FBD5F1FBDF0CCFEFFBFFCF25 +:1042EC00F0FBFFCFF1FBFFC6717AFAD7C716D87E69 +:1042FC00F10744A800DC05710298EF1CF647DD18A5 +:10430C00A47E4A7EA8DC05710298EF0CF87EF3318E +:10431C001CF6780AF9B7EFE4C6D7C756A89666F02C +:10432C00317E12F6B1780AF966D1DFF1717BFAF5BC +:10433C00EFFBF5F0FBF5F1FBF47E710398C6717A97 +:10434C00FAD7C72004FBF8FFD448DF168D7E9D8B6F +:10435C00717BFA52069292692EFC68C0FCDFF671F2 +:10436C007AFA4A4806DE0EE84809C0FC9C03A448C9 +:10437C008C0372EF30F88BF3311C790AF9BB3112D4 +:10438C0098058B9C03EF0F8C019C03D48BDF05CD20 +:10439C008BA7EF02B48B718071179861DC61FB7194 +:1043AC0011988C03721004C6D7C72008FBF8FF8F36 +:1043BC0037FCFD480F9C078F36FCFD480F9C068F81 +:1043CC0035FCFD480F9C058F34FCFD480F9C048F79 +:1043DC0038FC9C038F39FC9C028C06318E011279BF +:1043EC001A20BB8C075C03D1DF098C064C0361C817 +:1043FC006179008C05318EB1610900BB313D120130 +:10440C0003BB8B0E04708C011C00BB8FF4FB4E03A2 +:10441C00DC0E8C034FF4FBDC0B8C024FF5FBDC0445 +:10442C00AB12EF03ABB1121008C6D7C7C3C120083B +:10443C00FBF8FFF661490A61F8614908DF07F734B8 +:10444C000000EDD444E6BC04F6BC06AC0ABC02ACDD +:10445C0008BBAC06614902AC0461F8614900DE2876 +:10446C00AC04BDD8AC06BDDAE1FDEE0EADDABC068F +:10447C00ADD8BC04ABBDD8AC02BDDAE1FD090FADC3 +:10448C00DABC02ADD8BBEFCAAC06BC02AC04BBAC08 +:10449C0008BDD8AC0ABDDAAC04BDDCAC06FD6C0EB4 +:1044AC00AC04BDDCAC06FDDF0EE1FD090FADDABCE2 +:1044BC0006ADD8BC04AC06614902AC0461F8614994 +:1044CC0000DCC5AC0214AB12100CC6D7C7C120045B +:1044DC00FBF8FF8F31FCFD480F9C034E04DF1CAD35 +:1044EC00804682DE07AD82268012EF40F64682DFE0 +:1044FC00074680DD03E7EF34F7EF318C04318EB1E2 +:10450C00128C03318E43DF1830382226800682BB92 +:10451C008C045C0391DF05AB041800BBAB12EF0CF1 +:10452C008C034E04DE0532A900EF01F71006C6D746 +:10453C00717BFA3122980CF6468EDD07B68E717AB5 +:10454C00FAEF7C712398717AFA4004F904DF077151 +:10455C005307F42CEF69D9CFFBF1E7240000DD0FF2 +:10456C0023DD1A23DD1023DD5323DD2723DD3871F2 +:10457C005307F42CEF49715207F42CEF42D42CDF83 +:10458C0007715207E42CEF05715307F42CC98EFA0E +:10459C0000EF2CD42CDF0B715207E42CC98EFA00DF +:1045AC00EF1DF5CFFBEF18D42CDF0B715307E42C68 +:1045BC00C98EFA00EF09CFCFFB02EF03FDCC45D734 +:1045CC00D905FCF1E7240000DD0923DD2123DD09F9 +:1045DC0023EF1B715307F42CD7D42CDF0771520730 +:1045EC00E42CEF05715307F42CC98E2D01D77152B1 +:1045FC0007E42CD731629501D7710396D9CDFBF125 +:10460C00E7240000DD1223DD1923DD1123DD262331 +:10461C00DD3423DD3923DD3FFD8C46EF3DFDAD461A +:10462C00EF38D9CCFBC1AE6CFD612DC0F313BE6C61 +:10463C00712304EF25F0C1AE6CFD612DC0F313BEE8 +:10464C006C712304EF14F6BE6C712204EF0CCB6C6E +:10465C00FF00712304EF03FD21474004F905DD063B +:10466C004004F901DF067123047103963104960F9F +:10467C00F6BE64BE6A31220402EF02F690BE6ED71B +:10468C00CD2E47F490AE6C317DBFCAFCFDF646D200 +:10469C00DF0ED9CCFBC1AE6CFD612DC0F313BE6C2B +:1046AC00D7FDF646D2DD0DCD2E47F490AE6C317DA4 +:1046BC00BFCAFCD7E8900934205080D6BFC6FC2274 +:1046CC00CAFCBDD8304700FD940DBFC8FC30C6FCF9 +:1046DC00FD772DF313BE6CB42ED42EDF0CCD2E47EC +:1046EC00A4904A901F61C8F490D740AFFB0BDC0537 +:1046FC00712304F2D740AFFB0661D831229411F03C +:10470C00C1AE6CFD612DC0F313BE6C712204EF03BE +:10471C00FD2147E2D7710296F0C1AE6CFD612DC050 +:10472C00F313BE6CA4914A9140DC37F491D892F10A +:10473C00313F0412FD14D892F1BDD85008FDE30DA1 +:10474C00087208E6D2DD040192DFFC896158D1DDE4 +:10475C0005712204EF03712304A4924A922061C8CC +:10476C00F492D7C73026FDC6D77180717DFADE036F +:10477C005201D75200D7C7C12004FBF8FF1704031E +:10478C0000C1E0C15010C150A4FD97021006629CFC +:10479C0002D1DD058C0272EF518C0C70C18C04704F +:1047AC00FDFA47C0629C02D1DD058C0272EF3B8C96 +:1047BC00035C7DD1DF03F2EF3117A1C1E0C15010D2 +:1047CC00C150A4FD97021006629C02D1DD058C023B +:1047DC0072EF178C015C7DD1DD03F2EF0D8C037051 +:1047EC00C15010FDFA47C0629C021006C6D7C7889C +:1047FC000616710AE650A4FDC303D2DD077133958A +:10480C005202EF2217FDDF036770FDDF03FD2A0460 +:10481C0050A4FDDF035020FDDF0350AAFDDF03FD94 +:08482C005304713395F2C6D765 +:1048340061FC61FCC1C3C5C7520C929269D4FEC12C +:10484400DFF88EFD708EFCC1717AFA4004F903DF43 +:1048540005301D2A6194C09EFC609EFD34D4FE5236 +:1048640006C0B9A5A592DFF9C6C4C2C061FC61DF68 +:10487400520C929269D4FEC1DFF88EFD708EFCC199 +:104884008F4105775C04D1DD06675C01D1DD5031D1 +:104894005496367162077153968FB4FB5FBCFBD19B +:1048A400DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE95 +:1048B400FBD1DF098FB7FB5FBFFBD1DD0C31620792 +:1048C40002EFFA716307716B27711398FD5130F48D +:1048D400227148500571605005717AFAEDCE49672E +:1048E4005C02D1DD16D422DD124A2202DD0DF4224F +:1048F4007148500571605005717AFA717AFA8D2207 +:10490400318FE7240000DD0823DD1423DD2CEF4A7A +:10491400F4487140500571505005E422EDCE498FA2 +:1049240040059D49715050058D499D4BD849FD2442 +:1049340034629D4ACD2202EDCE49675C02D1DD1777 +:10494400675C10D1DD05CD2203EF0F71485005716E +:10495400605005F422EF73CD22044A2203DF108D48 +:104964004A9F4005D84AC1D849FDB034C0EF1F8FD3 +:10497400400576717449DC054A4902DE06716050CF +:1049840005EF47C7D849FDDB30C071505005D84BFF +:10499400F1242900DD27240400DD22242200DD1D6A +:1049A400241100DD0C240100DD13241E00DD0EEFB4 +:1049B4000A4A4960DF07CD4961EF02A4494A22034C +:1049C400DF08D849FD2434629D4AC09EFC609EFDE8 +:1049D40034D4FE5206C0B9A5A592DFF961FCC1C367 +:1049E400C5C7520C929269D4FEC1DFF88EFD708E59 +:1049F400FCC1717AFA51405F0401D1DD06F616A7B5 +:104A040047DFF2300400BF2401F6BF2A01300B0B4C +:104A1400BF2801FD5102300B0FBF2801FD510230A8 +:104A24000F0FBF2801710AE6F6420C01DD33AF0413 +:104A340001BF0C0131529529715295710BE2D84F87 +:104A4400FDC3033184BD02EFFACBB422FBD851F18C +:104A5400BEB8714BE1714BE5710ABD8D509E44EFB8 +:104A64000C715395714AE5717BBD713395C09EFC01 +:104A7400609EFD34D4FE5206C0B9A5A592DFF9C6E6 +:104A8400C4C2C061FCC1C5717AFAD44EDD0BEA4CD4 +:104A9400899E44A64CB44EEF33710AE6300400BF3D +:104AA4002401F6BF2A01300B0BBF280100000000CF +:104AB40000000000510FBF280100000000000000AA +:104AC40000500FBF2801712395713395C4C061FC58 +:104AD40061EF520C929269D4FEC1DFF88EFD708EA4 +:104AE400FCC12006FBF8FF71503002CEABACCC0405 +:104AF40000F6BB31B2E210617900F6614900DFF3E0 +:104B040071603002ED8E4B8E519C03713BE28C033D +:104B14005C02D1DD1E8C035C08D1DF0971503002C8 +:104B2400CC0400EFCC8C0570FD9235629E50CC0411 +:104B340002EFBE8C035C03D1DF408E509C027150A7 +:104B440030028C04D1DF0E8C0270FDD835629C05D6 +:104B5400CC0401EF328C044C02DF0671603002EFAA +:104B640029CF34025A716030028C0270C18C0570F6 +:104B7400FD3A35C0CF34024AEF108C035C01D1DD1D +:104B84000671603002EF03EDF54A1006C09EFC602A +:104B94009EFD34D4FE5206C0B9A5A592DFF961FC8E +:104BA400C1C3C5C7520C929269D4FEC1DFF88EFD11 +:104BB400708EFCC1710A9E31929E02EFFA8FDEFB69 +:104BC4004F96FFDF198FDFFB4F97FFDF118FE0FB5D +:104BD4004F98FFDF095004C15011FDDE34C0710B42 +:104BE4009EC09EFC609EFD34D4FE5206C0B9A5A5AD +:104BF40092DFF9C6C4C2C061FCE46861FCC1C3C5EC +:104C0400C7520C929269D4FEC1DFF88EFD708EFCFF +:104C1400C1C1FBF8FF8D1F9C018E31318EE7240644 +:104C240000DD0823DD0E23DD22EF38717AFA8C01D2 +:104C34009D60EF2F717AFA4007F901DF068C019D20 +:104C44005FEF2051FF2E019D5FEF18717AFA8C01FE +:104C54009D304004F903DD064004F904DF05307398 +:104C64002561944031FF09DE05A031FFEF0771583B +:104C7400F000716296710BE3C0C09EFC609EFD342F +:104C8400D4FE5206C0B9A5A592DFF9C6C4C2C0615C +:104C9400FC717BFAC7D46861F83124972771239794 +:104CA400D468DD05B468CEABAC717AFA5600664CB4 +:104CB4000ADD1172F3311C79D8FCCEFC0061CA61A3 +:104CC400A486EFEA717AFAF2C6D7C7C1C1FBF8FF2E +:104CD400CC01008C014C0ADE36717BFA8C01F03178 +:104CE4007E0410FC14A96168DF09AC02B9717AFA78 +:104CF400F2EF1D8C01F0317E127910FC614902DF64 +:104D040006717AFAE2EF09717AFA615901EFC4E2A5 +:104D14001004C6D7C72004FBF8FFF64210FC61F864 +:104D2400EDFA4D717BFA9C038C034C0ADE3C8C0338 +:104D3400F0317E0410FC14A96168DF05717AFAEF82 +:104D440029717AFA8C0372F3311C7910FCCEFC00C1 +:104D540061CA629C02D1DF0A8C03F0317E12E678CC +:104D640010FC717BFA615903EFBECC0200CC010147 +:104D74008C02F0317E0410FC14A96168DD788C0289 +:104D8400F0317E127910FCE743DF658C014C0ADEBA +:104D94005F8C01F0317E127910FCE743DD4D717BAD +:104DA400FA8C01F0317E0410FC14A96168DF1861EB +:104DB40069018C01F0317E12F67810FC8C024E01F0 +:104DC400DCED717AFAEF2F8C01F0317E0410FC14C3 +:104DD400A9128C02F0317E337810FC8C01F0317E04 +:104DE40012E67810FC615902717AFA615901EF9B5D +:104DF400615902ED744D00F21004C6D761FF520CE4 +:104E0400929269D4FEC1DFF88EFD708EFCC1717A76 +:104E1400FA8FE4FB5C03D1DD114004F903DD0640A5 +:104E240004F904DF05309E386194C09EFC609EFD49 +:104E340034D4FE5206C0B9A5A592DFF961FC61FC29 +:044E440061FC61FCB0 +:0A4E480000060C12181E242A303652 +:104E5200ACFB0000000064FE00000000F3392536C0 +:104E62008C2200463E2EED2E3C45243B5408E53C68 +:104E720028FC36FE20FE02F903F929FC30FE2AFC4A +:104E82002BFC08F926FC6CFF1AFF6EFF6AFF64FF19 +:0A4E920027FC66FF2CFC5555555512 +:104E9C00FF0000000000983AF82AFF0000004700CD +:104EAC00317503F7332312D714AEF8C716AC0612BC +:104EBC00C5AC0416F643DD078B99A7A5B3EFF5C275 +:024ECC00C6D747 +:024FF400325534 +:0A4FF60031363A30313A3030000015 :00000001FF  \ No newline at end of file diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index 5a5f3ff..16ef155 100644 Binary files a/trunk/bsr.lmf and b/trunk/bsr.lmf differ diff --git a/trunk/bsr_k0r.map b/trunk/bsr_k0r.map index b4bf199..6de1cbb 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,9 +1,9 @@ -78K0R Linker W1.33 Date:13 Jun 2012 Page: 1 +78K0R Linker W1.33 Date: 9 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 Tools\C C78K0R\W2.13\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -pbsr _k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Electro @@ -26,8 +26,8 @@ Direc-file:bsr_mcu.dr *** Link information *** 73 output segment(s) - 3D87H byte(s) real data - 6272 symbol(s) defined + 3DA6H byte(s) real data + 6292 symbol(s) defined *** Memory map *** @@ -254,303 +254,302 @@ Direc-file:bsr_mcu.dr 0228CH 00000H @@CNST i2c_mcu-sub 0228CH 00000H - ROM_CODE 0228CH 02589H CSEG + ROM_CODE 0228CH 025A8H CSEG ROM_CODE pm 0228CH 009B9H ROM_CODE i2c_ctr 02C45H 00064H ROM_CODE main 02CA9H 00055H ROM_CODE i2c_twl 02CFEH 00063H ROM_CODE led 02D61H 0024FH ROM_CODE rtc 02FB0H 000E0H - ROM_CODE vreg_ctr 03090H 00488H - ROM_CODE vreg_twl 03518H 000F9H - ROM_CODE adc 03611H 00261H - ROM_CODE renge 03872H 00018H - ROM_CODE accero 0388AH 00155H - ROM_CODE sw 039DFH 00126H + ROM_CODE vreg_ctr 03090H 0049CH + ROM_CODE vreg_twl 0352CH 000F9H + ROM_CODE adc 03625H 00261H + ROM_CODE renge 03886H 00018H + ROM_CODE accero 0389EH 00155H + ROM_CODE sw 039F3H 00131H ROM_CODE task_misc - 03B05H 001C1H - ROM_CODE task_sys 03CC6H 00383H + 03B24H 001C1H + ROM_CODE task_sys 03CE5H 00383H ROM_CODE pedo_alg_thre_det2 - 04049H 004D4H - ROM_CODE led_cam 0451DH 000C4H - ROM_CODE led_pow 045E1H 0016FH - ROM_CODE voltable 04750H 00000H + 04068H 004D4H + ROM_CODE led_cam 0453CH 000C4H + ROM_CODE led_pow 04600H 0016FH + ROM_CODE voltable 0476FH 00000H ROM_CODE pedo_lpf_coeff - 04750H 00000H + 0476FH 00000H ROM_CODE kanaria_c - 04750H 00006H - ROM_CODE get_ei 04756H 0000DH + 0476FH 00006H + ROM_CODE get_ei 04775H 0000DH ROM_CODE i2c_mcu-sub - 04763H 000B2H - @@BASE 04815H 00614H CSEG BASE - @@BASE loader 04815H 00000H - @@BASE pm 04815H 0003EH - @@BASE i2c_ctr 04853H 00170H - @@BASE main 049C3H 00000H - @@BASE magic 049C3H 00000H - @@BASE WDT 049C3H 00000H - @@BASE i2c_mcu 049C3H 000F2H - @@BASE i2c_twl 04AB5H 000D0H - @@BASE led 04B85H 00000H - @@BASE rtc 04B85H 0005DH - @@BASE vreg_ctr 04BE2H 00000H - @@BASE vreg_twl 04BE2H 00000H - @@BASE adc 04BE2H 00094H - @@BASE renge 04C76H 0016BH - @@BASE accero 04DE1H 00042H + 04782H 000B2H + @@BASE 04834H 00614H CSEG BASE + @@BASE loader 04834H 00000H + @@BASE pm 04834H 0003EH + @@BASE i2c_ctr 04872H 00170H + @@BASE main 049E2H 00000H + @@BASE magic 049E2H 00000H + @@BASE WDT 049E2H 00000H + @@BASE i2c_mcu 049E2H 000F2H + @@BASE i2c_twl 04AD4H 000D0H + @@BASE led 04BA4H 00000H + @@BASE rtc 04BA4H 0005DH + @@BASE vreg_ctr 04C01H 00000H + @@BASE vreg_twl 04C01H 00000H + @@BASE adc 04C01H 00094H + @@BASE renge 04C95H 0016BH + @@BASE accero 04E00H 00042H @@BASE self_flash - 04E23H 00000H - @@BASE sw 04E23H 00000H + 04E42H 00000H + @@BASE sw 04E42H 00000H @@BASE task_debug - 04E23H 00000H + 04E42H 00000H @@BASE task_misc - 04E23H 00000H - @@BASE task_sys 04E23H 00000H + 04E42H 00000H + @@BASE task_sys 04E42H 00000H @@BASE pedo_alg_thre_det2 - 04E23H 00000H - @@BASE ini_VECT 04E23H 00006H + 04E42H 00000H + @@BASE ini_VECT 04E42H 00006H @@BASE task_status - 04E29H 00000H - @@BASE led_cam 04E29H 00000H - @@BASE led_pow 04E29H 00000H - @@BASE hal 04E29H 00000H + 04E48H 00000H + @@BASE led_cam 04E48H 00000H + @@BASE led_pow 04E48H 00000H + @@BASE hal 04E48H 00000H @@BASE batt_params - 04E29H 00000H - @@BASE voltable 04E29H 00000H + 04E48H 00000H + @@BASE voltable 04E48H 00000H @@BASE pedo_lpf_coeff - 04E29H 00000H + 04E48H 00000H @@BASE kanaria_c - 04E29H 00000H + 04E48H 00000H @@BASE util_funcs - 04E29H 00000H + 04E48H 00000H @@BASE i2c_mcu-sub - 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL @cstart 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL pm 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL main 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL led 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL rtc 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL adc 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL renge 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL accero 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL sw 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP + 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL @cstart 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL pm 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL main 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL led 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL rtc 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL adc 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL renge 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL accero 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL sw 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP @@CNSTL task_misc - 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL task_sys 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP + 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL task_sys 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL led_cam 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL led_pow 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP + 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL led_cam 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL led_pow 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP @@CNSTL batt_params - 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP - @@CNSTL voltable 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP + 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP + @@CNSTL voltable 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP @@CNSTL pedo_lpf_coeff - 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP + 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP @@CNSTL kanaria_c - 04E29H 00000H - @@CNSTL 04E29H 00000H CSEG PAGE64KP + 04E48H 00000H + @@CNSTL 04E48H 00000H CSEG PAGE64KP @@CNSTL i2c_mcu-sub - 04E29H 00000H - @@RLINIT 04E29H 00000H CSEG UNIT64KP - @@RLINIT loader 04E29H 00000H - @@RLINIT pm 04E29H 00000H - @@RLINIT i2c_ctr 04E29H 00000H - @@RLINIT main 04E29H 00000H - @@RLINIT magic 04E29H 00000H - @@RLINIT WDT 04E29H 00000H - @@RLINIT i2c_mcu 04E29H 00000H - @@RLINIT i2c_twl 04E29H 00000H - @@RLINIT led 04E29H 00000H - @@RLINIT rtc 04E29H 00000H - @@RLINIT vreg_ctr 04E29H 00000H - @@RLINIT vreg_twl 04E29H 00000H - @@RLINIT adc 04E29H 00000H - @@RLINIT renge 04E29H 00000H - @@RLINIT accero 04E29H 00000H - @@RLINIT self_flash - 04E29H 00000H - @@RLINIT sw 04E29H 00000H - @@RLINIT task_debug - 04E29H 00000H - @@RLINIT task_misc - 04E29H 00000H - @@RLINIT task_sys 04E29H 00000H - @@RLINIT pedo_alg_thre_det2 - 04E29H 00000H - @@RLINIT ini_VECT 04E29H 00000H - @@RLINIT task_status - 04E29H 00000H - @@RLINIT led_cam 04E29H 00000H - @@RLINIT led_pow 04E29H 00000H - @@RLINIT hal 04E29H 00000H - @@RLINIT batt_params - 04E29H 00000H - @@RLINIT voltable 04E29H 00000H - @@RLINIT pedo_lpf_coeff - 04E29H 00000H - @@RLINIT kanaria_c - 04E29H 00000H - @@RLINIT util_funcs - 04E29H 00000H - @@RLINIT i2c_mcu-sub - 04E29H 00000H - @@RLINIT @rom 04E29H 00000H - @@CODEL 04E29H 00000H CSEG - @@CODEL pm 04E29H 00000H - @@CODEL i2c_ctr 04E29H 00000H - @@CODEL main 04E29H 00000H - @@CODEL magic 04E29H 00000H - @@CODEL i2c_twl 04E29H 00000H - @@CODEL led 04E29H 00000H - @@CODEL rtc 04E29H 00000H - @@CODEL vreg_ctr 04E29H 00000H - @@CODEL vreg_twl 04E29H 00000H - @@CODEL adc 04E29H 00000H - @@CODEL renge 04E29H 00000H - @@CODEL accero 04E29H 00000H - @@CODEL sw 04E29H 00000H - @@CODEL task_misc - 04E29H 00000H - @@CODEL task_sys 04E29H 00000H - @@CODEL pedo_alg_thre_det2 - 04E29H 00000H - @@CODEL ini_VECT 04E29H 00000H - @@CODEL led_cam 04E29H 00000H - @@CODEL led_pow 04E29H 00000H - @@CODEL batt_params - 04E29H 00000H - @@CODEL voltable 04E29H 00000H - @@CODEL pedo_lpf_coeff - 04E29H 00000H - @@CODEL kanaria_c - 04E29H 00000H - @@CODEL i2c_mcu-sub - 04E29H 00000H -* gap * 04E29H 00001H - @@CNSTL 04E2AH 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04E2AH 0000AH - @@R_INIT 04E34H 0004AH CSEG UNIT64KP - @@R_INIT @cstart 04E34H 00000H - @@R_INIT loader 04E34H 00000H - @@R_INIT pm 04E34H 00000H - @@R_INIT i2c_ctr 04E34H 00000H - @@R_INIT main 04E34H 00000H - @@R_INIT magic 04E34H 00000H - @@R_INIT WDT 04E34H 00000H - @@R_INIT i2c_mcu 04E34H 00000H - @@R_INIT i2c_twl 04E34H 00000H - @@R_INIT led 04E34H 00000H - @@R_INIT rtc 04E34H 00000H - @@R_INIT vreg_ctr 04E34H 00000H - @@R_INIT vreg_twl 04E34H 00000H - @@R_INIT adc 04E34H 0000CH - @@R_INIT renge 04E40H 00014H - @@R_INIT accero 04E54H 00000H + 04E48H 00000H + @@CNSTL 04E48H 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04E48H 0000AH + @@R_INIT 04E52H 0004AH CSEG UNIT64KP + @@R_INIT @cstart 04E52H 00000H + @@R_INIT loader 04E52H 00000H + @@R_INIT pm 04E52H 00000H + @@R_INIT i2c_ctr 04E52H 00000H + @@R_INIT main 04E52H 00000H + @@R_INIT magic 04E52H 00000H + @@R_INIT WDT 04E52H 00000H + @@R_INIT i2c_mcu 04E52H 00000H + @@R_INIT i2c_twl 04E52H 00000H + @@R_INIT led 04E52H 00000H + @@R_INIT rtc 04E52H 00000H + @@R_INIT vreg_ctr 04E52H 00000H + @@R_INIT vreg_twl 04E52H 00000H + @@R_INIT adc 04E52H 0000CH + @@R_INIT renge 04E5EH 00014H + @@R_INIT accero 04E72H 00000H @@R_INIT self_flash - 04E54H 00000H - @@R_INIT sw 04E54H 00000H + 04E72H 00000H + @@R_INIT sw 04E72H 00000H @@R_INIT task_debug - 04E54H 00000H + 04E72H 00000H @@R_INIT task_misc - 04E54H 00026H - @@R_INIT task_sys 04E7AH 00000H + 04E72H 00026H + @@R_INIT task_sys 04E98H 00000H @@R_INIT pedo_alg_thre_det2 - 04E7AH 00000H - @@R_INIT ini_VECT 04E7AH 00000H + 04E98H 00000H + @@R_INIT ini_VECT 04E98H 00000H @@R_INIT task_status - 04E7AH 00000H - @@R_INIT led_cam 04E7AH 00000H - @@R_INIT led_pow 04E7AH 00004H - @@R_INIT hal 04E7EH 00000H + 04E98H 00000H + @@R_INIT led_cam 04E98H 00000H + @@R_INIT led_pow 04E98H 00004H + @@R_INIT hal 04E9CH 00000H @@R_INIT batt_params - 04E7EH 00000H - @@R_INIT voltable 04E7EH 00000H + 04E9CH 00000H + @@R_INIT voltable 04E9CH 00000H @@R_INIT pedo_lpf_coeff - 04E7EH 00000H + 04E9CH 00000H @@R_INIT kanaria_c - 04E7EH 00000H + 04E9CH 00000H @@R_INIT util_funcs - 04E7EH 00000H + 04E9CH 00000H @@R_INIT i2c_mcu-sub - 04E7EH 00000H - @@R_INIT @rom 04E7EH 00000H - @@R_INIS 04E7EH 00010H CSEG UNIT64KP - @@R_INIS @cstart 04E7EH 00000H - @@R_INIS loader 04E7EH 00000H - @@R_INIS pm 04E7EH 00002H - @@R_INIS i2c_ctr 04E80H 00002H - @@R_INIS main 04E82H 00000H - @@R_INIS magic 04E82H 00000H - @@R_INIS WDT 04E82H 00000H - @@R_INIS i2c_mcu 04E82H 00000H - @@R_INIS i2c_twl 04E82H 00000H - @@R_INIS led 04E82H 00000H - @@R_INIS rtc 04E82H 00000H - @@R_INIS vreg_ctr 04E82H 00000H - @@R_INIS vreg_twl 04E82H 00000H - @@R_INIS adc 04E82H 00000H - @@R_INIS renge 04E82H 00000H - @@R_INIS accero 04E82H 00000H + 04E9CH 00000H + @@R_INIT @rom 04E9CH 00000H + @@R_INIS 04E9CH 00010H CSEG UNIT64KP + @@R_INIS @cstart 04E9CH 00000H + @@R_INIS loader 04E9CH 00000H + @@R_INIS pm 04E9CH 00002H + @@R_INIS i2c_ctr 04E9EH 00002H + @@R_INIS main 04EA0H 00000H + @@R_INIS magic 04EA0H 00000H + @@R_INIS WDT 04EA0H 00000H + @@R_INIS i2c_mcu 04EA0H 00000H + @@R_INIS i2c_twl 04EA0H 00000H + @@R_INIS led 04EA0H 00000H + @@R_INIS rtc 04EA0H 00000H + @@R_INIS vreg_ctr 04EA0H 00000H + @@R_INIS vreg_twl 04EA0H 00000H + @@R_INIS adc 04EA0H 00000H + @@R_INIS renge 04EA0H 00000H + @@R_INIS accero 04EA0H 00000H @@R_INIS self_flash - 04E82H 00000H - @@R_INIS sw 04E82H 00000H + 04EA0H 00000H + @@R_INIS sw 04EA0H 00000H @@R_INIS task_debug - 04E82H 00000H + 04EA0H 00000H @@R_INIS task_misc - 04E82H 00000H - @@R_INIS task_sys 04E82H 00002H + 04EA0H 00000H + @@R_INIS task_sys 04EA0H 00002H @@R_INIS pedo_alg_thre_det2 - 04E84H 00006H - @@R_INIS ini_VECT 04E8AH 00000H + 04EA2H 00006H + @@R_INIS ini_VECT 04EA8H 00000H @@R_INIS task_status - 04E8AH 00000H - @@R_INIS led_cam 04E8AH 00002H - @@R_INIS led_pow 04E8CH 00002H - @@R_INIS hal 04E8EH 00000H + 04EA8H 00000H + @@R_INIS led_cam 04EA8H 00002H + @@R_INIS led_pow 04EAAH 00002H + @@R_INIS hal 04EACH 00000H @@R_INIS batt_params - 04E8EH 00000H - @@R_INIS voltable 04E8EH 00000H + 04EACH 00000H + @@R_INIS voltable 04EACH 00000H @@R_INIS pedo_lpf_coeff - 04E8EH 00000H + 04EACH 00000H @@R_INIS kanaria_c - 04E8EH 00000H + 04EACH 00000H @@R_INIS util_funcs - 04E8EH 00000H + 04EACH 00000H @@R_INIS i2c_mcu-sub - 04E8EH 00000H - @@R_INIS @rom 04E8EH 00000H - @@LCODEL 04E8EH 00022H CSEG - @@LCODEL abs 04E8EH 00008H - @@LCODEL memcpy_n 04E96H 0001AH -* gap * 04EB0H 00144H + 04EACH 00000H + @@R_INIS @rom 04EACH 00000H + @@RLINIT 04EACH 00000H CSEG UNIT64KP + @@RLINIT loader 04EACH 00000H + @@RLINIT pm 04EACH 00000H + @@RLINIT i2c_ctr 04EACH 00000H + @@RLINIT main 04EACH 00000H + @@RLINIT magic 04EACH 00000H + @@RLINIT WDT 04EACH 00000H + @@RLINIT i2c_mcu 04EACH 00000H + @@RLINIT i2c_twl 04EACH 00000H + @@RLINIT led 04EACH 00000H + @@RLINIT rtc 04EACH 00000H + @@RLINIT vreg_ctr 04EACH 00000H + @@RLINIT vreg_twl 04EACH 00000H + @@RLINIT adc 04EACH 00000H + @@RLINIT renge 04EACH 00000H + @@RLINIT accero 04EACH 00000H + @@RLINIT self_flash + 04EACH 00000H + @@RLINIT sw 04EACH 00000H + @@RLINIT task_debug + 04EACH 00000H + @@RLINIT task_misc + 04EACH 00000H + @@RLINIT task_sys 04EACH 00000H + @@RLINIT pedo_alg_thre_det2 + 04EACH 00000H + @@RLINIT ini_VECT 04EACH 00000H + @@RLINIT task_status + 04EACH 00000H + @@RLINIT led_cam 04EACH 00000H + @@RLINIT led_pow 04EACH 00000H + @@RLINIT hal 04EACH 00000H + @@RLINIT batt_params + 04EACH 00000H + @@RLINIT voltable 04EACH 00000H + @@RLINIT pedo_lpf_coeff + 04EACH 00000H + @@RLINIT kanaria_c + 04EACH 00000H + @@RLINIT util_funcs + 04EACH 00000H + @@RLINIT i2c_mcu-sub + 04EACH 00000H + @@RLINIT @rom 04EACH 00000H + @@CODEL 04EACH 00000H CSEG + @@CODEL pm 04EACH 00000H + @@CODEL i2c_ctr 04EACH 00000H + @@CODEL main 04EACH 00000H + @@CODEL magic 04EACH 00000H + @@CODEL i2c_twl 04EACH 00000H + @@CODEL led 04EACH 00000H + @@CODEL rtc 04EACH 00000H + @@CODEL vreg_ctr 04EACH 00000H + @@CODEL vreg_twl 04EACH 00000H + @@CODEL adc 04EACH 00000H + @@CODEL renge 04EACH 00000H + @@CODEL accero 04EACH 00000H + @@CODEL sw 04EACH 00000H + @@CODEL task_misc + 04EACH 00000H + @@CODEL task_sys 04EACH 00000H + @@CODEL pedo_alg_thre_det2 + 04EACH 00000H + @@CODEL ini_VECT 04EACH 00000H + @@CODEL led_cam 04EACH 00000H + @@CODEL led_pow 04EACH 00000H + @@CODEL batt_params + 04EACH 00000H + @@CODEL voltable 04EACH 00000H + @@CODEL pedo_lpf_coeff + 04EACH 00000H + @@CODEL kanaria_c + 04EACH 00000H + @@CODEL i2c_mcu-sub + 04EACH 00000H + @@LCODEL 04EACH 00022H CSEG + @@LCODEL abs 04EACH 00008H + @@LCODEL memcpy_n 04EB4H 0001AH +* gap * 04ECEH 00126H MGC_VER 04FF4H 00002H CSEG AT MGC_VER magic 04FF4H 00002H MGC_TAIL 04FF6H 0000AH CSEG AT diff --git a/trunk/config.h b/trunk/config.h index 54ecfcd..24ac446 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -7,7 +7,7 @@ */ #define MCU_VER_MAJOR 0x02 -#define MCU_VER_MINOR 0x22 +#define MCU_VER_MINOR 0x25 // デバッグ向けスイッチ diff --git a/trunk/hoge.bin b/trunk/hoge.bin index f68d7de..29d173d 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/loader.c b/trunk/loader.c index 8f21b30..76affbb 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -199,7 +199,7 @@ void chk_platform_type() { // ●CTRファミリ // system_status.family = (enum family_)( DEV_DET >> 1 ); /// あぁ... - if(( system_status.family == FAMILY_SPFL ) // アモルファスしか生産しない + if(( system_status.family == FAMILY_SPFL ) // アモルファスしか生産しない || ( system_status.family == FAMILY_SNAKE )) // 〃 { pm_reg_bit_vddlcd = PM_REG_BIT_VDDLCD_AMO; diff --git a/trunk/sw.c b/trunk/sw.c index 4cc3142..d0cd54f 100644 --- a/trunk/sw.c +++ b/trunk/sw.c @@ -5,7 +5,7 @@ ・WiFi の監視タスク -$Id$ + $Id$ ======================================================== */ #ifndef _WIN32 @@ -137,6 +137,10 @@ void tsk_sw( ) // 電源スイッチの監視 // if( SW_pow_count == ( TIME_PWSW_CLICK ) ) // クリック時間に到達 { + if( is_wifi_calib_resets_ast ) // wifi キャリブレーション時なら、SoCに通知せずにoffに遷移 + { + system_status.pwr_state = OFF_TRIG; + } set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); } else if( SW_pow_count == ( HOLD_THREASHOLD ) ) // 長押しに到達 diff --git a/trunk/task_sys.c b/trunk/task_sys.c index 17e8010..5a99cba 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -2,7 +2,7 @@ task_sys 電源周りを司るのタスク - $Id$ + $Id$ ======================================================== */ #ifndef _WIN32 @@ -509,7 +509,7 @@ static void chk_emergencyExit(){ static u8 shirobako_power_control_count; // wifi モジュールキャリブレーションモードでreset1を自分から下げてるときはチェックをパス - if( is_wifi_calib_reset1_ast ) + if( is_wifi_calib_resets_ast ) { return; } diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index 3aa32da..0521110 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -2,7 +2,7 @@ CTR MCU I2Cレジスタ - $Id$ + $Id$ ====================================================== */ #include "incs.h" #include "vreg_ctr.h" @@ -68,8 +68,6 @@ void vreg_ctr_init( ) vreg_ctr[ VREG_C_VOL_CAL_MIN ] = 0x36; vreg_ctr[ VREG_C_VOL_CAL_MAX ] = 0xFF - 0x36; - - vreg_ctr[ VREG_C_WIFI_CALIB ] = 0; } @@ -95,6 +93,11 @@ void vreg_ctr_reset( ) info_LED.bindata[ i ] = 0; } } + + vreg_ctr[ VREG_C_WIFI_CALIB ] = 0; + RESET1_neg; + RESET2_neg; + FCRAM_RST_neg; } @@ -114,7 +117,7 @@ void vreg_ctr_write( u8 adrs, u8 data ) switch ( adrs ) { - case ( VREG_C_COMMAND0 ): + case VREG_C_COMMAND0: if( data != 0 ) { renge_task_immed_add( tski_do_command0 ); @@ -122,7 +125,7 @@ void vreg_ctr_write( u8 adrs, u8 data ) } break; - case ( VREG_C_COMMAND2 ): + case VREG_C_COMMAND2: // こちらからの完了割り込みを待ってくれないそうです。 #-ω-) 何のための割り込みだ // 液晶電源 if(( data & REG_BIT_CMD_LCD_ON ) != 0 ) @@ -143,7 +146,7 @@ void vreg_ctr_write( u8 adrs, u8 data ) } break; - case ( VREG_C_COMMAND1 ): + case VREG_C_COMMAND1: if( data != 0 ) { // u8 temp; 中間変数使ったらばかでかくなった... @@ -165,7 +168,7 @@ void vreg_ctr_write( u8 adrs, u8 data ) } break; - case ( VREG_CX_FREE_DATA ): + case VREG_CX_FREE_DATA: if( vreg_free_adrs < VREG_C_FREE_SIZE ) { pool.vreg_c_ext.vreg_c_free[ vreg_free_adrs ] = data; @@ -173,11 +176,11 @@ void vreg_ctr_write( u8 adrs, u8 data ) } break; - case ( VREG_CX_FREE_ADRS ): + case VREG_CX_FREE_ADRS: vreg_free_adrs = data; break; - case ( VREG_C_LED_POW ): + case VREG_C_LED_POW: if( iic_burst_state == 0 ) { vreg_ctr[ VREG_C_LED_POW ] = data; @@ -190,13 +193,13 @@ void vreg_ctr_write( u8 adrs, u8 data ) } break; - case ( VREG_C_LED_WIFI ): - case ( VREG_C_LED_CAM ): - case ( VREG_C_LED_3D ): + case VREG_C_LED_WIFI: + case VREG_C_LED_CAM: + case VREG_C_LED_3D: vreg_ctr[adrs] = (u8)( data & 0x0F ); break; - case ( VREG_C_LED_NOTIFY_DATA ): + case VREG_C_LED_NOTIFY_DATA: if( iic_burst_state < sizeof( uni_info_LED ) ) { if(( iic_burst_state == 1 ) && ( data == 0 )) // fade_time == 0 禁止 @@ -212,19 +215,19 @@ void vreg_ctr_write( u8 adrs, u8 data ) } break; - case ( VREG_C_MCU_STATUS ): + case VREG_C_MCU_STATUS: // vreg_twl[ REG_TWL_INT_ADRS_MODE ] = (u8)( ( data >> 6 ) & 0x03 ); Rでよい。その代わりリセットでクリア vreg_ctr[ VREG_C_MCU_STATUS ] &= data; // bitクリアはするがセットはしない。 // 上の方のtwlレジスタミラーは読み出され時に合成 break; - case ( VREG_C_VCOM_T ): - case ( VREG_C_VCOM_B ): + case VREG_C_VCOM_T: + case VREG_C_VCOM_B: renge_task_immed_add( tski_vcom_set ); vreg_ctr[adrs] = data; break; - case ( VREG_C_DBG03 ): + case VREG_C_DBG03: if( ( vreg_ctr[VREG_C_DBG01] == 'j' ) && ( vreg_ctr[VREG_C_DBG02] == 'h' ) && ( data == 'l' ) ) @@ -237,29 +240,29 @@ void vreg_ctr_write( u8 adrs, u8 data ) /// 非同期で動いているためここでは書かない。 // 予約するだけでstopで書く - case ( VREG_C_RTC_SEC ): - case ( VREG_C_RTC_MIN ): + case VREG_C_RTC_SEC: + case VREG_C_RTC_MIN: set_rtc( adrs - VREG_C_RTC_SEC, data & 0x7F ); break; - case ( VREG_C_RTC_DAY ): - case ( VREG_C_RTC_HOUR ): + case VREG_C_RTC_DAY: + case VREG_C_RTC_HOUR: set_rtc( adrs - VREG_C_RTC_SEC, data & 0x3F ); break; - case ( VREG_C_RTC_YOBI ): + case VREG_C_RTC_YOBI: set_rtc( adrs - VREG_C_RTC_SEC, data & 0x07 ); break; - case ( VREG_C_RTC_MONTH ): + case VREG_C_RTC_MONTH: set_rtc( adrs - VREG_C_RTC_SEC, data & 0x1F ); break; - case ( VREG_C_RTC_YEAR ): + case VREG_C_RTC_YEAR: set_rtc( adrs - VREG_C_RTC_SEC, data ); break; - case ( VREG_C_RTC_COMP ): + case VREG_C_RTC_COMP: WDT_Restart(); while(1) { @@ -276,41 +279,41 @@ void vreg_ctr_write( u8 adrs, u8 data ) vreg_ctr[ VREG_C_RTC_COMP ] = data; break; - case ( VREG_C_RTC_ALARM_MIN ): + case VREG_C_RTC_ALARM_MIN: rtc_alarm_dirty = true; vreg_ctr[ VREG_C_RTC_ALARM_MIN ] = (u8)( data & 0x7F ); break; - case ( VREG_C_RTC_ALARM_HOUR ): + case VREG_C_RTC_ALARM_HOUR: rtc_alarm_dirty = true; vreg_ctr[ VREG_C_RTC_ALARM_HOUR ] = (u8)( data & 0x3F ); break; // 書くだけでよい - case ( VREG_C_RTC_ALARM_DAY ): + case VREG_C_RTC_ALARM_DAY: vreg_ctr[ VREG_C_RTC_ALARM_DAY ] = (u8)( data & 0x3F ); break; - case ( VREG_C_RTC_ALARM_MONTH ): + case VREG_C_RTC_ALARM_MONTH: vreg_ctr[ VREG_C_RTC_ALARM_MONTH ] = (u8)( data & 0x1F ); break; - case ( VREG_C_ACC_CONFIG ): + case VREG_C_ACC_CONFIG: renge_task_immed_add( tski_acc_setup ); vreg_ctr[ VREG_C_ACC_CONFIG ] = data; break; - case ( VREG_C_ACC_R_ADRS ): + case VREG_C_ACC_R_ADRS: renge_task_immed_add( tski_acc_read ); vreg_ctr[ VREG_C_ACC_R_ADRS ] = data; break; - case ( VREG_C_ACC_W_BUF ): + case VREG_C_ACC_W_BUF: renge_task_immed_add( tski_acc_write ); vreg_ctr[ VREG_C_ACC_W_BUF ] = data; break; - case ( VREG_C_ACC_HOSU_SETTING ): + case VREG_C_ACC_HOSU_SETTING: if( ( data & 0x01 ) != 0 ) { clear_hosu_hist(); // 履歴クリア @@ -325,25 +328,34 @@ void vreg_ctr_write( u8 adrs, u8 data ) else{ RTC_32k_on(); } - if( data & REG_BIT_WIFI_CALIB_RST1_AST ) + if( data & REG_BIT_WIFI_CALIB_RSTS_AST ) { RESET1_ast; + RESET2_ast; + FCRAM_RST_ast; } else{ - RESET1_neg; +/* + SoC が止まってしまうのでここに来ない + RESET1_neg; + RESET2_neg; + FCRAM_RST_neg; +*/ } + vreg_ctr[ VREG_C_WIFI_CALIB ] = data; + break; - case ( VREG_C_COMMAND3 ): + case VREG_C_COMMAND3: switch ( data ) { #ifdef _ENABLE_COMMAND3_ - case ( 'r' ): + case 'r': // 割り込みルーチンからFSLライブラリを呼ぶのは禁止 // マイコンを再起動。　レジスタ類も初期化される。 renge_task_immed_add( tski_mcu_reset ); break; - case ( 'w' ): + case 'w': // WDTで再起動（テスト向け） // mcu_wdt_reset; // このコマンド使ったら意味ないでしょ！ while(1) @@ -354,7 +366,7 @@ void vreg_ctr_write( u8 adrs, u8 data ) #endif //_ENABLE_COMMAND3_ #ifdef _ENABLE_HAL_ - case( 'p' ): + case 'p': reserve_pedo_increnent = 1; // ここで増やすにはスタックが足りない。↑で予約のみ、task_misc内で処理 // hosu_increment_if_necessary(); // 今、一歩増えた @@ -365,7 +377,7 @@ void vreg_ctr_write( u8 adrs, u8 data ) // vreg_ctr[ VREG_C_COMMAND3 ] = data; // 書く必要なし break; - case ( VREG_C_RBR_CONTROL ): + case VREG_C_RBR_CONTROL: vreg_ctr[ VREG_C_RBR_CONTROL ] = data; // todo debug ブレークポイントを置くため。現状、フリーレジスタ break; diff --git a/trunk/vreg_ctr.h b/trunk/vreg_ctr.h index 07f91c5..00c2140 100644 --- a/trunk/vreg_ctr.h +++ b/trunk/vreg_ctr.h @@ -1,7 +1,11 @@ #ifndef __vreg_ctr__ #define __vreg_ctr__ +/* + $Id$ +*/ + #include "config.h" // VREG_C_MCU_STATUS @@ -155,7 +159,7 @@ // VREG_C_WIFI_CALIB #define REG_BIT_WIFI_CALIB_32K_HI_Z ( 1 << 1 ) -#define REG_BIT_WIFI_CALIB_RST1_AST ( 1 << 0 ) +#define REG_BIT_WIFI_CALIB_RSTS_AST ( 1 << 0 ) /* @@ -308,7 +312,7 @@ void vreg_ctr_after_read( u8 adrs, u8 data ); void set_irq( u8 irqreg, u8 irq_flg ); -#define is_wifi_calib_reset1_ast ( vreg_ctr[ VREG_C_WIFI_CALIB ] & REG_BIT_WIFI_CALIB_RST1_AST ) +#define is_wifi_calib_resets_ast ( vreg_ctr[ VREG_C_WIFI_CALIB ] & REG_BIT_WIFI_CALIB_RSTS_AST ) #define vreg_stop_acc ( vreg_ctr[ VREG_C_ACC_CONFIG ] &= ~( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ ) ) #define vreg_set_acc_error ( vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_ACCERO_ERR ) #define is_acc_on ( vreg_ctr[VREG_C_ACC_CONFIG] & VREG_BITMASK_ACC_CONF_ACQ ) diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index ddd7eb4..3ce453f 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,11 +1,11 @@ C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no loader.c +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no loader.c loader.c(160) : CC78K0R warning W0401: Conversion may lose significant digits loader.c(161) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\loader.asm +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\loader.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no pm.c +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no pm.c pm.c(536) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(842) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(846) : CC78K0R warning W0401: Conversion may lose significant digits @@ -18,35 +18,69 @@ pm.c(1049) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(1188) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(1190) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 11 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\pm.asm +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\pm.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no 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 -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_ctr.c +i2c_ctr.c(49) : CC78K0R warning W0816: Redefined macro name 'IICS' +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_ctr.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no main.c Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\main.asm +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\main.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no magic.c +"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 -rd2s2m -qvjl2w -sainter_asm -zpb -no vreg_ctr.c -vreg_ctr.c(153) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(154) : CC78K0R warning W0401: Conversion may lose significant digits +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no WDT.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\WDT.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_mcu.c +i2c_mcu.c(188) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 1 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_mcu.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_twl.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_twl.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no led.c +led.c(90) : CC78K0R warning W0745: Expected function prototype +led.c(356) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\led.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no rtc.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\rtc.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2m -qvjl2w -sainter_asm -zpb -no vreg_ctr.c vreg_ctr.c(156) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(158) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(157) : CC78K0R warning W0401: Conversion may lose significant digits vreg_ctr.c(159) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(242) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(242) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(247) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(247) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(251) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(251) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(255) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(255) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(259) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(161) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(162) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(245) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(245) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(250) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(250) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(254) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(254) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(258) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(258) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(262) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 14 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\vreg_ctr.asm +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\vreg_ctr.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no adc.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 -rd2s2m -qvjl2w -sainter_asm -zpb -no vreg_twl.c +vreg_twl.c(68) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_twl.c(72) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\vreg_twl.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no adc.c adc.c(104) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(190) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(241) : CC78K0R warning W0401: Conversion may lose significant digits @@ -55,54 +89,114 @@ adc.c(434) : CC78K0R warning W0745: Expected function prototype adc.c(463) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(468) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 7 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\adc.asm +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\adc.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no self_flash.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 -rd2s2m -qvjl2w -sainter_asm -zpb -no renge\renge.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\renge.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no accero.c +accero.c(121) : CC78K0R warning W0745: Expected function prototype +Compilation complete, 0 error(s) and 1 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\accero.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no self_flash.c self_flash.c(289) : CC78K0R warning W0401: Conversion may lose significant digits self_flash.c(290) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\self_flash.asm +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\self_flash.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no sw.c +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no sw.c Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\sw.asm +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\sw.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_debug.c +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_debug.c Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\task_debug.asm +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\task_debug.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_misc.c +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_misc.c task_misc.c(382) : CC78K0R warning W0401: Conversion may lose significant digits task_misc.c(384) : CC78K0R warning W0401: Conversion may lose significant digits task_misc.c(394) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 3 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\task_misc.asm +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\task_misc.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_sys.c +"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(230) : CC78K0R warning W0401: Conversion may lose significant digits task_sys.c(292) : CC78K0R warning W0401: Conversion may lose significant digits task_sys.c(570) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 3 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\task_sys.asm +"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\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_status.c +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c +pedo_alg_thre_det2.c(104) : CC78K0R warning W0745: Expected function prototype +pedo_alg_thre_det2.c(120) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\pedo_alg_thre_det2.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no ini_VECT.c Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\task_status.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\ini_VECT.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no led_pow.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 task_status.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\task_status.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no led_cam.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\led_cam.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no led_pow.c led_pow.c(119) : CC78K0R warning W0401: Conversion may lose significant digits led_pow.c(124) : CC78K0R warning W0401: Conversion may lose significant digits led_pow.c(177) : CC78K0R warning W0401: Conversion may lose significant digits led_pow.c(240) : CC78K0R warning W0401: Conversion may lose significant digits led_pow.c(271) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 5 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\led_pow.asm +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\led_pow.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_mcu-sub.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 hal.c Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_mcu-sub.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\hal.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\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 batt_params.c +batt_params.c(27) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(27) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(45) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(64) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(64) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(82) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(101) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(101) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(119) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 9 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\batt_params.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no voltable.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\voltable.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no pedo_lpf_coeff.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\pedo_lpf_coeff.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx kanaria.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no kanaria_c.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\kanaria_c.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx get_ei.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no util_funcs.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\util_funcs.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_mcu-sub.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_mcu-sub.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel i2c_mcu-sub.rel RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K' Read Device File Directory : C:\PROGRAM FILES (X86)\NEC ELECTRONICS TOOLS\DEV\ RA78K0R warning W3420: File 'pm.rel' already has had error(s)/warning(s) by 'CC78K' @@ -121,7 +215,7 @@ RA78K0R warning W3420: File 'led_pow.rel' already has had error(s)/warning(s) by RA78K0R warning W3420: File 'batt_params.rel' already has had error(s)/warning(s) by 'CC78K' Link complete, 0 error(s) and 15 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 @@ -129,4 +223,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 62 +Build Total error(s) : 0 Total warning(s) : 80 diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 1de53fb..b00ea84 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -1041,6 +1041,81 @@ 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=sim\simOnWin.h +Include3=sim\sfrAlias.h +Include4=config.h +Include5=jhl_defs.h +Include6=user_define.h +Include7=hal.h +Include8=bsr_system.h +Include9=renge\renge.h +Include10=renge\renge_defs.h +Include11=renge\renge_task_immediate.h +Include12=vreg_ctr.h +Include13=vreg_twl.h +Include14=loader.h +Include15=i2c_mcu.h +Include16=WDT.h +Include17=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +Include18=fsl_user.h +Include19=i2c_ctr.h +Include20=pm.h +Include21=rtc.h +Include22=reboot.h +Include23=magic.h +Include24=incs.h +Include25=i2c_twl.h +Include26=accero.h +Include27=pedometer.h +Include28=sw.h +Include29=adc.h +Include30=led.h +Include31=batt_params.h +Include32=pool.h +Include33=i2c_twl_defs.h +Include34=renge\renge_task_intval.h +Include35=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h +Include36=self_flash.h +Include37=sim\sim_interrupt_decrare.c +Include38=util_funcs.h +Include39=i2c_mcu_sub.h [Options.LK78K0R 0] Version=100 O0=bsr_k0r.lmf @@ -1334,78 +1409,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=sim\simOnWin.h -Include3=sim\sfrAlias.h -Include4=config.h -Include5=jhl_defs.h -Include6=user_define.h -Include7=hal.h -Include8=bsr_system.h -Include9=renge\renge.h -Include10=renge\renge_defs.h -Include11=renge\renge_task_immediate.h -Include12=vreg_ctr.h -Include13=vreg_twl.h -Include14=loader.h -Include15=i2c_mcu.h -Include16=WDT.h -Include17=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h -Include18=fsl_user.h -Include19=i2c_ctr.h -Include20=pm.h -Include21=rtc.h -Include22=reboot.h -Include23=magic.h -Include24=incs.h -Include25=i2c_twl.h -Include26=accero.h -Include27=pedometer.h -Include28=sw.h -Include29=adc.h -Include30=led.h -Include31=batt_params.h -Include32=pool.h -Include33=i2c_twl_defs.h -Include34=renge\renge_task_intval.h -Include35=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h -Include36=self_flash.h -Include37=sim\sim_interrupt_decrare.c -Include38=util_funcs.h -Include39=i2c_mcu_sub.h diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 0d79e2c..d2410c3 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,19 +1,16 @@ [ProjectManager] -FrameMax=1 -FrameX=4 -FrameY=0 -FrameCX=1022 -FrameCY=722 +FrameMax=0 +FrameX=405 +FrameY=135 +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=i2c_mcu.h,0,671,375,1487,993,16,7,16,0 -OpenFile4=config.h,0,974,359,2565,1066,29,10,48,0 -OpenFile5=ProjectWindow +OpenFile2=ProjectWindow PrjPos=0,0,706,0,291 -OpenFile6=pm.c,0,150,150,1741,857,0,1309,0,0 -OpenFile7=batt_params.c,0,175,175,1766,882,6,85,5,0 -OpenFile8=OutputWindow -OutputPos=0,231,682,640,1903 +OpenFile3=config.h,0,974,359,2565,1066,29,10,29,0 +OpenFile4=kanaria_c.c,0,87,284,782,915,0,19,0,0 +OpenFile5=OutputWindow +OutputPos=0,28,606,298,966 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 2d6cd69..24d1030 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4fb9ca6b +T=4fd84fcc 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=4fb9ca6b 9=WDT.h 10=magic.h [pm.c] -T=4fb9cbc1 +T=4fd84fcc 1=incs.h 2=adc.h 3=led.h @@ -25,7 +25,7 @@ T=4fb9cbc1 9=vreg_twl.h 10=i2c_mcu.h [i2c_ctr.c] -T=4f14d104 +T=4fcefcb0 1=incs.h 2=rtc.h 3=pedometer.h @@ -40,7 +40,7 @@ T=4e647b08 7=i2c_mcu.h 8=pool.h [magic.c] -T=4fb9cb96 +T=4ffa80fd 1=magic.h 2=config.h [WDT.c] @@ -54,7 +54,7 @@ T=4eeed909 4=util_funcs.h 5=i2c_mcu_sub.h [i2c_twl.c] -T=4f14db40 +T=4fcefcb2 1=incs.h 2=i2c_twl_defs.h 3=i2c_twl.h @@ -68,7 +68,7 @@ T=4f13d418 T=4e647eec 1=incs.h [vreg_ctr.c] -T=4e687272 +T=4ffa80f4 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -89,7 +89,7 @@ T=4e6491f4 4=vreg_twl.h 5=adc.h [adc.c] -T=4f2109f1 +T=4fcdd1ab 1=incs.h 2=adc.h 3=pm.h @@ -97,7 +97,7 @@ T=4f2109f1 5=vreg_twl.h 6=i2c_mcu.h [renge\renge.c] -T=4e77e344 +T=4fcdd1ab 1=renge\renge.h 2=renge\renge_task_intval.h 3=renge\renge_task_immediate.h @@ -108,7 +108,7 @@ T=4e77e344 8=sim\simOnWin.h 9=bsr_system.h [accero.c] -T=4f210a45 +T=4fd8263b 1=incs.h 2=accero.h 3=i2c_mcu.h @@ -126,7 +126,7 @@ T=4e686baa 9=WDT.h 10=util_funcs.h [sw.c] -T=4e6480e9 +T=4ffa7be1 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -135,13 +135,13 @@ T=4e6480e9 6=rtc.h 7=sw.h [task_debug.c] -T=4e647e9c +T=4fcdd1ab 1=incs_loader.h 2=renge\renge.h 3=pm.h 4=accero.h [task_misc.c] -T=4f13d472 +T=4fd7f6fa 1=incs.h 2=renge\renge.h 3=pm.h @@ -151,7 +151,7 @@ T=4f13d472 7=led.h 8=vreg_twl.h [task_sys.c] -T=4fb9ca6b +T=4ffa7be2 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -176,7 +176,7 @@ T=4e6864d2 1=config.h 2=sim\sim_interrupt_decrare.c [task_status.c] -T=4f176d1b +T=4fd828b4 1=incs_loader.h 2=renge\renge.h 3=pm.h @@ -240,29 +240,29 @@ T=4e646cef T=4e559884 1=sim\sfrAlias.h [sim\sfrAlias.h] -T=4fb9cb80 +T=4fd7f6f9 1=config.h [config.h] -T=4f4591ec +T=4ffa819e [jhl_defs.h] T=4e647343 [user_define.h] -T=4fb9a776 +T=4fd8204b [hal.h] T=4e5229fb [bsr_system.h] -T=4fb9a6fb +T=4fd84cac [renge\renge.h] T=4e5e108a 1=renge\renge_defs.h 2=renge\renge_task_immediate.h [renge\renge_defs.h] -T=4c073c5a +T=4fcdd1ab [renge\renge_task_immediate.h] T=4e54ab05 1=renge\renge_defs.h [vreg_ctr.h] -T=4e5f0c2e +T=4ffa7be2 1=config.h [vreg_twl.h] T=4d42202e @@ -279,9 +279,9 @@ T=4e409e62 [i2c_ctr.h] T=4bf0d1e1 [pm.h] -T=4fb9ca6b +T=4fd8501f [rtc.h] -T=4e409e1c +T=4fd8204b [reboot.h] T=4bf0d1e1 [magic.h]