diff --git a/flower_toriaezu2/VCProj/bsr_trunk.sdf b/flower_toriaezu2/VCProj/bsr_trunk.sdf index d36dfaa..dbc60cb 100644 Binary files a/flower_toriaezu2/VCProj/bsr_trunk.sdf and b/flower_toriaezu2/VCProj/bsr_trunk.sdf differ diff --git a/flower_toriaezu2/VCProj/bsr_trunk.suo b/flower_toriaezu2/VCProj/bsr_trunk.suo index 4de7601..f8d16a3 100644 Binary files a/flower_toriaezu2/VCProj/bsr_trunk.suo and b/flower_toriaezu2/VCProj/bsr_trunk.suo differ diff --git a/flower_toriaezu2/batt_params.c b/flower_toriaezu2/batt_params.c index b03e75a..a863711 100644 --- a/flower_toriaezu2/batt_params.c +++ b/flower_toriaezu2/batt_params.c @@ -7,7 +7,7 @@ #include "batt_params.h" -const bt_param_ bt_param[ _BT_PARAM_NUM_ ] = +const bt_param_ bt_param[ /*_BT_PARAM_NUM_*/ ] = // 同じ電池を使い回すので モデル×電池≠パラメータ数 { // ctr //////////////////////////////////////////////// // BT_PARAM_CTR_MAXELL diff --git a/flower_toriaezu2/bsr.hex b/flower_toriaezu2/bsr.hex index 554bc19..d5ad944 100644 --- a/flower_toriaezu2/bsr.hex +++ b/flower_toriaezu2/bsr.hex @@ -1,260 +1,259 @@ -:02000000650D8C -:0400100055495749AE -:02001C00034B94 -:02002400AA4BE5 -:02002A00F54B94 -:08003400224DC54C1E4D634F27 -:02004A00594912 -:02005A009349C8 -:02006200214F2C -:06008000B64DEF4D394EB4 +:02000000570D9A +:040010007C487E4862 +:02001C002A4A6E +:02002400D14ABF +:02002A001C4B6D +:08003400494CEC4B454C8A4E8F +:02004A008048EC +:02005A00BA48A2 +:02006200484E06 +:06008000DD4C164D604D41 :0400C0007EFBFF04C0 :0A00C4001B339499E033F240BFAA09 :1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A :1000DE00D8710006F98EA89C018C015C10D1DD0A46 :1000EE007110A6FB710006F9EF0B8C015C80D161DB :1000FE00E8710006F98F06F931030EF6B1BBF66111 -:10010E004900DD05618900EFF5FD0202FD3101FDBB -:10011E008901FD0C0AFD4309FDDD30FD142EEFA50E +:10010E004900DD05618900EFF5FDF401FD3101FDCA +:10011E008901FDFE09FD3509FDAE2FFDE52CEFA58C :10012E00C0C6D7C7360000674C09DE3F318E04F6D5 :10013E000FC1317B9EFDC411897267318E04F64F5B :10014E0014896142DF03F6EF01E660610667318EC6 :10015E00124900207267318E04F64F14896142DF16 :10016E0003F6EF01E660610687EFBC40F84F3A6197 -:10017E00E88666D161E8FDB006C6D751065B0C3144 -:10018E001A9F08F94008F901DF084008F904E661F2 -:10019E00E8F6D508F9DF06710009F9EF04710809D0 -:1001AE00F98F09F9310505CD3707EF03CD3705D99D -:1001BE0008F9FD912A8F06F95CE39F06F951035B5E -:1001CE0004318EE7240000DD1023DD0823DF0E71DD -:1001DE002006F9D7713006F9D7714006F9D7717B31 -:1001EE00FACEA010CEA180E5F300000000CEA40848 -:1001FE00F5AAFFD78F06F9310508CD0003CD030F01 -:10020E00EF08CD030EF690BFB401CD0408CD05085E -:10021E00F521FFCE22E9CE23F8CE24F3CE25FACE59 -:10022E0026FCCE275FCE2EFCCF1105F8CF1205117E -:10023E00CF350002CF370019CF530006CBEEFEFFAD -:10024E00CE3831CE3970CF38050A308700BF18014D -:10025E00BF1A01BF1C01BF1E01D7D7C7F616FD95E9 -:10026E0004717BFA31329708713297717AFAEF0C7A -:10027E00717AFAA7F647DFE95203EF01F2C6D7C744 -:10028E00C1C1FBF8FF17A1C1E0C18C0A70C18C027D -:10029E0070FDAE021006629D548C01721004C6D71A -:1002AE00C7C1FBF8FFFD6902D2DD045203EF698B73 -:1002BE0070FDE203D2DD077133975202EF5A8C08BC -:1002CE0070FDFE03FD49048B6C0170FDFE033004CE -:1002DE0000BF2401301740BF1C01300400BF2201B3 -:1002EE008C0A91DF04F6BF2A01710BE2CE44FF3176 -:1002FE0082E202EFFAAC0C148E449961790C6169BA -:10030E000A8C0AD1DFDA8B4CA461F8FD4349FD72E9 -:10031E0004710BE2713397F2C0C6D7C7C1FBF8FF69 -:10032E00FD6902D2DD045203EF25710AE68B70FDE2 -:10033E00E203D2DD077133975202EF138C0870FD82 -:10034E00FE038C0A70FDFE03FD7204713397F2C03A -:10035E00C6D7C7C1FBF8FFFD6902D2DD045203EF19 -:10036E0070710AE6710BE28B70FDE203D2DD07714C -:10037E0033975202EF5B710BE231229744C734225E -:10038E00FBAC0C1652048B99A5A792DFF9C68B9D78 -:10039E00518C089D528C0A9D533184BD02EFFA7127 -:1003AE007ABDCEB144CBB422FB8C0A318EBEB8CE10 -:1003BE00BB48714BE1714BE5710ABD8C089E44EF51 -:1003CE000F710BE68C089E448C0A9D50AC0CBD4EF2 -:1003DE00F2C0C6D7C716FD2104AF0401BF0C01172A -:1003EE00FDFE03D2DD07FD72045202EF01F2C6D705 -:1003FE00C716710AE6710BE2669E443182E202EF85 -:10040E00FAF6420401DD09AF0401BF0C01E2EF016F -:10041E00F2C6D7AF2801085CFB08BF2801FD6802B1 -:10042E00AF28015CFBBF2801300400BF2A01301742 -:10043E0080BF1C01300400BF2201D7AF2401086C1D -:10044E000408BF2401AF28016C0F086C0B08BF28ED -:10045E0001FD6802AF2A01085CFB08BF2A01FD6896 -:10046E0002ED2104300400BF2401F6BF2A01300B37 -:10047E000BBF2801FD6802300B0FBF2801FD68027B -:10048E00300F0FBF2801D731449701D77132976AC9 -:10049E000E03713B25713B23E0FD1F0A7120F00016 -:1004AE00FD6802F6BF26015024BF1401CB44001490 -:1004BE00300F0FBF2801712397710BE2710AE6FD11 -:1004CE002104CE44FF3182E202EFFAFD7204AF0442 -:1004DE0001BF0C01713397714297D731349702EFF8 -:1004EE00FAFD4904713A25713A235A0EFC7128F02F -:1004FE0000714397D77140F00071783002713AE67F -:10050E00713BE2713BEA713BEE5A06FCCF34024A74 -:10051E00E552FF711A52710A527148300271303031 -:10052E000271203002CF330209CF32020B7130310B -:10053E000271203102713BE6717030028E265CFC36 -:10054E009E2671603002D7717830027148F000D764 -:10055E00C72008FBF8FFFDAB085014C15008FDDDA5 -:10056E0007C0CC07048C074C14DE0C8C07318EFDB3 -:10057E00470A615907EFEECC07048C074C1461C88B -:10058E00ED4C06CC06008C064C0461C8ED2B0630F3 -:10059E000AF9BC02F6BBCEABAC31B2D109C73641BB -:1005AE00057184C6DEF3F1C73641057184C661DC80 -:1005BE009C05713BD1AC02148F40059971505005CA -:1005CE00617902617900F0E1614900DD09C73641C8 -:1005DE00057184C6DEC3F1C73641057184C661DC80 -:1005EE000E059C055040C18C07318E31AD128C0624 -:1005FE00318E318D03BDD831FFBDDADADAADD8FDDB -:10060E00130DC0D2DD0C5008C15014FDDD07C0FD26 -:10061E00D00B8C05D1DF06615906ED94058C0731A0 -:10062E008EFD4B0AD2DD0C5008C15014FDDD07C003 -:10063E00FDD00B8C05D1DF06615907ED8805716081 -:10064E005005CC0400CC05008C054C09DE2B8C0526 -:10065E00318E04F61FC1317B9EFDC41189728C054B -:10066E00318E04F64F14896142DF03F6EF01E66026 -:10067E000E049C04615905EFCF41001140F81F3A5A -:10068E0061E86159048C04D1DF08FDD10BFDE30C48 -:10069E00EF0C5008C15014FDDD07C0FDD00B100843 -:1006AE00C6D7C72004FBF8FF712B24CC0100F6BC83 -:1006BE0002AC02440900DE3EAC0204F60F14410007 -:1006CE00118972AC020C5014896142DF03F6EF01FE -:1006DE00E6600E019C01AC021249005072AC02049D -:1006EE00F67F14896142DF03F6EF01E6600E019C8E -:1006FE0001617902EFBB40F67FFF61F86159018C11 -:10070E0001D161F8EDA907CC0100717AFAFD9504CB -:10071E00711300711B20710303710205E0C15003B8 -:10072E00FDAA2CC05013FD1F0AD83BC1E0FDAA2C18 -:10073E00C0CEABAC6159018C0191DD068C014C032E -:10074E00DF03E6EF01F66061FB7121048C014C08BA -:10075E0061F8CC010031320705A024FCEF03F5242B -:10076E00FC4024FC11DC22F524FCF0C15003FDAA50 -:10077E002CC0CE3708CBE4FFFFCBE6FFF7CED4FF7D -:10078E00CF370008F5120561FDE6BC02F66149029D -:10079E00DD9F00000000617902EFF1FDAB08D2DFB2 -:1007AE00FA5008C15014FDDD07C0D2FDD00B100465 -:1007BE00C6D73184BD02EFFA717BBDCBE4FFFFCB10 -:1007CE00E6FFFFCBD4FFFF717ABED7717BBED7C7D2 -:1007DE00C1200CFBF8FF8C0C318E31ADC1317B9DED -:1007EE00D4C0BC068DD49C088C149C0B8C14318EFA -:1007FE00040C00128C0B318EBDD813FDA20F61C8F4 -:10080E00EDA608CEABACCC05068C0B318EFD430AA3 -:10081E00D2DD158C0B318EFD470A6169058C05D131 -:10082E00DFE7FDD907E2EF71CC0A008C0A4C04DE3B -:10083E0054F6BC02300AF9BBAC06148C089EFD11AE -:10084E008972AB146299AC06A1BC0661790061791C -:10085E0002F0E1614902DFE05040C18C0B318E3174 -:10086E00AD128C0A318E318D03BDD831FFBDDADA6F -:10087E00DAADD8FD130DC0D2DD06FDD907E2EF19B2 -:10088E0061590AEFA68C0B318EFD4B0AD2DD03E2C5 -:10089E00EF0761590BEDFA07F2100EC6D7C7717B41 -:1008AE009D717BFAFDC007300AF9FDF60AFD810A3B -:1008BE00C6D7FDAB08FDD00BFDD907F5ABFFF2D7C0 -:1008CE00C731049B067110B3FBEF047118B3FB8F95 -:1008DE00B3FB7B8E76D1DD5B8FB3FB9D8E4004F92F -:1008EE0003DF22665C10D1DD1C8FB3FB5C10D1DD03 -:1008FE000B5080C15011FD0236C0EF095040C1505F -:10090E0011FD0236C04004F903DD064004F904DF90 -:10091E0022665C02D1DD1C8FB3FB5C02D1DD0B5075 -:10092E0040C15010FD0236C0EF095020C15010FDDD -:10093E000236C0C6D7C7360000665C80D1DD1067B0 -:10094E005C80D1DF0571339AEF0B71329AEF06712D -:10095E00040771319A665C40D1DD10675C40D1DFCF -:10096E000571439AEF0B71429AEF067114057141AE -:10097E009A665C01D1DD10675C01D1DF0571539A77 -:10098E00EF0B71529AEF0671340771519A665C0241 -:10099E00D1DD10675C02D1DF0571639AEF1D7162C4 -:1009AE009AEF184007F901DF0871040271619AEF9E -:1009BE000AC736100571C4C671619A665C04D1DD32 -:1009CE0010675C04D1DF0571739AEF0B71729AEFA9 -:1009DE000671440771719A665C08D1DD10675C0878 -:1009EE00D1DF0571039BEF0B71029BEF06711407AC -:1009FE0071019B665C10D161E8715AD1C6D7F5F6CC -:100A0E00FBF5F8FBCFFEFBFFCFFAFBFFCFFBFBFFA7 -:100A1E00D7C7C1C1FBF8FFCEABAC8C02D1DD1261E2 -:100A2E006902305C03BBF6614900DDEE618900EFBF -:050A3E00F51004C6D70D -:100A43005208EF065203EF025206FEE600FE1B00B9 -:100A5300DC16089F03088F0408089F040862FE241D -:100A630000089F0408EEBF00EEBA00C1C514410E92 -:100A730011D9D0FF118FD1FF312E45C4C0D7F23128 -:100A8300A2C401E2D79DE261DD4C09DF12717BFA5A -:100A9300C18F06089F25FDC0CF060800EE27003151 -:100AA300F2FA04CF0608004C00DF05D50008DD1676 -:100AB30061DD717BFAD50608DD0ACDE31F61CD61E7 -:100AC300CDEE160061CDFED40061FFFE9A00FCF866 -:100AD300FF0EFEB20061CDFED5004C09DF0EC18FC3 -:100AE30006086F25FD9F0608C0EE0400CF06080028 -:100AF300F8E3D75200EF025202FE3700CF24FD0085 -:100B0300CF060800BF0408C716629F000841001102 -:100B13008F1A209B4100118F1B209F0108C6510093 -:100B2300FE62FFEF025205CF060800C1510CFE0A18 -:100B330000C0D7C1511DFE0200C0D761DD717BFA31 -:100B430070CEC0A59EC47CFF9EC4609EC461CDD7F9 -:100B530061DD717BFAC18EC45C1BFED6FFCF060834 -:100B630001FED7FFC061CDD731F2FA1AC1AEE4BF9F -:100B730016FDAEE6BF18FDAED4BF1AFD30FFFFBEB3 -:100B8300E4BEE6BED4C0D731F2FA11C1AF16FDBE42 -:100B9300E4AF18FDBEE6AF1AFDBED4C0D7C1BF1C7B -:100BA300FD13BF1EFD15BF20FD17BF22FDC0D7AF2C -:100BB3001CFDDB1EFDEB20FDFB22FDD7534B30520A -:100BC3005430324E323030475631323000FFC1504C -:100BD300FEFEAB0061DD717BFACF060800FE0A0062 -:100BE300FEA4FF61CDF8E3EECF00C7FB0408BF16F8 -:100BF300FD8FC0009C05C5C337040600BF18FD3533 -:100C030036350C300000522BFE6600C2C4C630E3FA -:100C13000BB800300000B8022004AF18FDB8003054 -:100C23000F00B802AF16FD61FF520AFE3AFFECF85F -:100C3300FF0E717BFAC1C7FB04088C05C65C80FEFE -:100C43000200C0D761DD717BFA70CFC0FFA59FC0E2 -:100C5300007CFF9FC000609FC00061CDD7618BFE09 -:100C6300E2FF717BBE410011FB000017CEFC006167 -:100C7300CB089EFDF31161C999A58392DFF7D7FED7 -:100C8300B1FED524FDDF23C1CF0308035109FEF4D0 -:100C9300FDC0D2DF37FE3800A20408CF0308075196 -:100CA30009FEE1FDD2B20408DF22C7FB0408318349 -:100CB30002C6D7C6510AFECCFD624C1FDF06CF2405 -:100CC300FD01EF04CF24FD00C0EE5BFEC0EE55FE38 -:100CD300C7C1FB04088B31196C0161589BC0C6D78F -:100CE300717BFAFE4DFEAF0408040600C1143647BB -:100CF3000C300000522DF3FE77FF8FC000FE2BFE59 -:100D030061CF5C807C8073C0041900CEFC0F61CB83 -:100D1300C55404EF03C55417FE18FEC7360008BBBD -:100D2300629C0288089C03D1DD334C41DE2F70F1B5 -:100D3300312DB161090033081C000851FF612A41BC -:100D43000E118FD0FF613B118FD1FF6138DC0E8B09 -:100D53005C03DF0964C6C4FE2BFDEECAFDC6C4EE08 -:020D6300C3FDCE -:100D650061CF5100718C7109FECBF800FEFCEC01DE -:100D750000F6BF00F953C0F693935820FEDFF94102 -:100D85000036744F34CCFCEF05118B99A7A5174499 -:100D9500BE4FDFF53602F930CCFCEF04CC0000A7DE -:100DA50047DFF9410036BE4F3420FEEF05118B9920 -:100DB500A7A51744CE4FDFF53630FE3096FEEF047B -:100DC500CC0000A747DFF9FCCE0000EFFE61DD7126 -:100DD5007BFABEF0ADD8BEF200AEF661CDD7C361E9 -:100DE500DD717BFABEF0ADD8BEF200DBF6FFADDCFF -:100DF500BEF000AEF6BDD8AEF40312ADDABEF20019 -:100E0500AEF661CD03BDDAC2D7C3F33174D9088319 -:100E1500C1F626D8BDD8C031750683C312F623C2E4 -:100E2500FD300E93DF0312F623C2D7440000DD2602 -:100E350061DD717BFACFE80080BEF6F6BEF4BEF246 -:100E4500ADD8BEF0CFE800818FE8003103FAAEF0EF -:100E5500F5E80061CDD7B1D7C3F33174D90883C1A3 -:100E6500F626D8BDD8C0317505C312F623C2FD7E5E -:100E75000E93DF0312F623C2D7440000DD2761DDA0 -:100E8500717BFACFE80080BEF6F6BEF4BEF2ADD8AF -:100E9500BEF0CFE800818FE8003103FAAFE000F53E -:100EA500E80061CDD7ADD8D7C3F33174DB0F83C16B -:100EB500F626D8BDD861317026DABDDAC031750D98 -:100EC50083C312F626DCBDDC61317023C2FDE60E5C -:100ED50093DF0CF626D8BDD861317026DABDDAC2AB -:100EE500D7C161686BDC6BDDC0DD2F61DD717BFA1D -:100EF500CFE80080BEF4ADDCBEF6ADD8BEF0ADDA0D -:100F0500BEF2CFE800818FE8003103FAAEF0BDD81C -:100F1500AEF2BDDAF5E80061CDD7F6BDD8BDDAD7BA -:100F25008292DD2B61DD717BFACFE80080BEF0F6A1 -:100F3500BEF2BEF46208BEF6CFE800818FE800314C -:100F450003FAAFE0006072AEF0F5E80061CDD7605E -:100F550072F6B1D706DABDDAADDC06D8BDD861D8F0 -:100F6500A6DAD7D1DD17C1C3DAD89DD8ADDA311CE1 -:100F750061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD74 -:100F85001BC1C3DADA9DDAADD8311E33311E337198 -:100F9500F9B4DADFF4BDD813BDDAC2C0D746D8DD5F -:100FA5000771FF7177D971C0D75BDB9DDB605BDAB9 -:100FB5009DDAADDC5BD9085BD808BDD8D7C3C7F3CC -:100FC500728EFDC162314C4100366A4F1161A072CB -:070FD500C09EFD62C6C2D7F9 -:0A0FF60031383A30333A303600004B -:0A20000031383A30333A3036000030 +:10017E00E88666D161E8FDA206C6D751065B0C3152 +:10018E001A9F08F9D508F9DF06710009F9EF047115 +:10019E000809F98F09F9310505CD3707EF03CD377A +:1001AE0005D908F9FD61298F06F95CE39F06F9511F +:1001BE00035B04318EE7240000DD1023DD0823DF0E +:1001CE000E712006F9D7713006F9D7714006F9D7AE +:1001DE00717BFACEA010CEA180E5F300000000CE18 +:1001EE00A408F5AAFFD78F06F9310508CD0003CD77 +:1001FE00030FEF08CD030EF690BFB401CD0408CD6A +:10020E000508F521FFCE22E9CE23F8CE24F3CE2524 +:10021E00FACE26FCCE275FCE2EFCCF1105F8CF12DC +:10022E000511CF350002CF370019CF530006CBEEA4 +:10023E00FEFFCE3831CE3970CF38050A308700BF79 +:10024E001801BF1A01BF1C01BF1E01D7D7C7F61672 +:10025E00FD8704717BFA31329708713297717AFA01 +:10026E00EF0C717AFAA7F647DFE95203EF01F2C6F7 +:10027E00D7C7C1C1FBF8FF17A1C1E0C18C0A70C17D +:10028E008C0270FDA0021006629D548C0172100447 +:10029E00C6D7C7C1FBF8FFFD5B02D2DD045203EFE8 +:1002AE00698B70FDD403D2DD077133975202EF5A7A +:1002BE008C0870FDF003FD3B048B6C0170FDF003A8 +:1002CE00300400BF2401301740BF1C01300400BFB2 +:1002DE0022018C0A91DF04F6BF2A01710BE2CE4493 +:1002EE00FF3182E202EFFAAC0C148E449961790C64 +:1002FE0061690A8C0AD1DFDA8B4CA461F8FD6A4879 +:10030E00FD6404710BE2713397F2C0C6D7C7C1FB0F +:10031E00F8FFFD5B02D2DD045203EF25710AE68B76 +:10032E0070FDD403D2DD077133975202EF138C08A0 +:10033E0070FDF0038C0A70FDF003FD6404713397B9 +:10034E00F2C0C6D7C7C1FBF8FFFD5B02D2DD045277 +:10035E0003EF70710AE6710BE28B70FDD403D2DDF0 +:10036E00077133975202EF5B710BE231229744C74C +:10037E003422FBAC0C1652048B99A5A792DFF9C65A +:10038E008B9D518C089D528C0A9D533184BD02EF7A +:10039E00FA717ABDCEB144CBB422FB8C0A318EBE3B +:1003AE00B8CEBB48714BE1714BE5710ABD8C089E0E +:1003BE0044EF0F710BE68C089E448C0A9D50AC0CDA +:1003CE00BD4EF2C0C6D7C716FD1304AF0401BF0C55 +:1003DE000117FDF003D2DD07FD64045202EF01F2B6 +:1003EE00C6D7C716710AE6710BE2669E443182E2E9 +:1003FE0002EFFAF6420401DD09AF0401BF0C01E27F +:10040E00EF01F2C6D7AF2801085CFB08BF2801FD3B +:10041E005A02AF28015CFBBF2801300400BF2A013D +:10042E00301780BF1C01300400BF2201D7AF24015A +:10043E00086C0408BF2401AF28016C0F086C0B0870 +:10044E00BF2801FD5A02AF2A01085CFB08BF2A0132 +:10045E00FD5A02ED1304300400BF2401F6BF2A0139 +:10046E00300B0BBF2801FD5A02300B0FBF2801FDC8 +:10047E005A02300F0FBF2801D731449701D771327E +:10048E00976A0E03713B25713B23E0FD110A712023 +:10049E00F000FD5A02F6BF26015024BF1401CB44D2 +:1004AE000014300F0FBF2801712397710BE2710AF0 +:1004BE00E6FD1304CE44FF3182E202EFFAFD64043E +:1004CE00AF0401BF0C01713397714297D731349746 +:1004DE0002EFFAFD3B04713A25713A235A0EFC7174 +:1004EE0028F000714397D77140F000717830027197 +:1004FE003AE6713BE2713BEA713BEE5A06FCCF34B1 +:10050E00024AE552FF711A52710A52714830027155 +:10051E0030300271203002CF330209CF32020B711C +:10052E0030310271203102713BE6717030028E263D +:10053E005CFC9E2671603002D7717830027148F0F3 +:10054E0000D7C72008FBF8FFFD9D085014C15008C6 +:10055E00FDCF07C0CC07048C074C14DE0C8C073182 +:10056E008EFD390A615907EFEECC07048C074C1447 +:10057E0061C8ED3E06CC06008C064C0461C8ED1D2C +:10058E0006300AF9BC02F6BBCEABAC31B2D109C70C +:10059E003641057184C6DEF3F1C73641057184C656 +:1005AE0061DC9C05713BD1AC02148F4005997150F2 +:1005BE005005617902617900F0E1614900DD09C7FA +:1005CE003641057184C6DEC3F1C73641057184C656 +:1005DE0061DC0E059C055040C18C07318E31AD1289 +:1005EE008C06318E318D03BDD831FFBDDADADAAD2E +:1005FE00D8FD050DC0D2DD0C5008C15014FDCF073B +:10060E00C0FDC20B8C05D1DF06615906ED86058C47 +:10061E0007318EFD3D0AD2DD0C5008C15014FDCFBE +:10062E0007C0FDC20B8C05D1DF06615907ED7A05B7 +:10063E0071605005CC0400CC05008C054C09DE2BF6 +:10064E008C05318E04F61FC1317B9EFDC41189725B +:10065E008C05318E04F64F14896142DF03F6EF01EB +:10066E00E6600E049C04615905EFCF41001140F87D +:10067E001F3A61E86159048C04D1DF08FDC30BFDFC +:10068E00D50CEF0C5008C15014FDCF07C0FDC20BA6 +:10069E001008C6D7C72004FBF8FF712B24CC01002D +:1006AE00F6BC02AC02440900DE3EAC0204F60F14A6 +:1006BE004100118972AC020C5014896142DF03F6BD +:1006CE00EF01E6600E019C01AC021249005072ACC3 +:1006DE000204F67F14896142DF03F6EF01E6600E35 +:1006EE00019C01617902EFBB40F67FFF61F8615911 +:1006FE00018C01D161F8ED9B07CC0100717AFAFDF6 +:10070E008704711300711B20710303710205E0C190 +:10071E005003FD7B2BC05013FD110AD83BC1E0FDE9 +:10072E007B2BC0CEABAC6159018C0191DD068C01E7 +:10073E004C03DF03E6EF01F66061FB7121048C01CF +:10074E004C0861F8CC010031320705A024FCEF0300 +:10075E00F524FC4024FC11DC22F524FCF0C15003EE +:10076E00FD7B2BC0CE3708CBE4FFFFCBE6FFF7CEE9 +:10077E00D4FFCF370008F5120561FDE6BC02F66125 +:10078E004902DD9F00000000617902EFF1FD9D0836 +:10079E00D2DFFA5008C15014FDCF07C0D2FDC20BF4 +:1007AE001004C6D73184BD02EFFA717BBDCBE4FFD6 +:1007BE00FFCBE6FFFFCBD4FFFF717ABED7717BBEB6 +:1007CE00D7C7C1200CFBF8FF8C0C318E31ADC13177 +:1007DE007B9DD4C0BC068DD49C088C149C0B8C14B1 +:1007EE00318E040C00128C0B318EBDD813FD940F7C +:1007FE0061C8ED9808CEABACCC05068C0B318EFDE6 +:10080E00350AD2DD158C0B318EFD390A6169058CE6 +:10081E0005D1DFE7FDCB07E2EF71CC0A008C0A4C65 +:10082E0004DE54F6BC02300AF9BBAC06148C089EEA +:10083E00FD118972AB146299AC06A1BC06617900F8 +:10084E00617902F0E1614902DFE05040C18C0B3169 +:10085E008E31AD128C0A318E318D03BDD831FFBD74 +:10086E00DADADAADD8FD050DC0D2DD06FDCB07E232 +:10087E00EF1961590AEFA68C0B318EFD3D0AD2DDC0 +:10088E0003E2EF0761590BEDEC07F2100EC6D7C766 +:10089E00717B9D717BFAFDB207300AF9FDE80AFD06 +:1008AE00730AC6D7FD9D08FDC20BFDCB07F5ABFF46 +:1008BE00F2D7C731049B067110B3FBEF047118B366 +:1008CE00FB8FB3FB7B8E76D1DD5B8FB3FB9D8E40B2 +:1008DE0004F903DF22665C10D1DD1C8FB3FB5C10C4 +:1008EE00D1DD0B5080C15011FDD334C0EF09504003 +:1008FE00C15011FDD334C04004F903DD064004F9A4 +:10090E0004DF22665C02D1DD1C8FB3FB5C02D1DDFD +:10091E000B5040C15010FDD334C0EF095020C150D0 +:10092E0010FDD334C0C6D7C7360000665C80D1DD5B +:10093E0010675C80D1DF0571339AEF0B71329AEF3D +:10094E000671040771319A665C40D1DD10675C4018 +:10095E00D1DF0571439AEF0B71429AEF06711405C0 +:10096E0071419A665C01D1DD10675C01D1DF0571C2 +:10097E00539AEF0B71529AEF0671340771519A66C2 +:10098E005C02D1DD10675C02D1DF0571639AEF1D49 +:10099E0071629AEF184007F901DF08710402716164 +:1009AE009AEF0AC736100571C4C671619A665C0467 +:1009BE00D1DD10675C04D1DF0571739AEF0B717294 +:1009CE009AEF0671440771719A665C08D1DD106763 +:1009DE005C08D1DF0571039BEF0B71029BEF067173 +:1009EE00140771019B665C10D161E8715AD1C6D7AC +:1009FE00F5F6FBF5F8FBCFFEFBFFCFFAFBFFCFFBC7 +:100A0E00FBFFD7C7C1C1FBF8FFCEABAC8C02D1DD6B +:100A1E0012616902305C03BBF6614900DDEE61894B +:070A2E0000EFF51004C6D72C +:100A35005208EF065203EF025206FEE600FE1B00C7 +:100A4500DC16089F03088F0408089F040862FE242B +:100A550000089F0408EEBF00EEBA00C1C514410EA0 +:100A650011D9D0FF118FD1FF312E45C4C0D7F23136 +:100A7500A2C401E2D79DE261DD4C09DF12717BFA68 +:100A8500C18F06089F25FDC0CF060800EE2700315F +:100A9500F2FA04CF0608004C00DF05D50008DD1684 +:100AA50061DD717BFAD50608DD0ACDE31F61CD61F5 +:100AB500CDEE160061CDFED40061FFFE9A00FCF874 +:100AC500FF0EFEB20061CDFED5004C09DF0EC18FD1 +:100AD50006086F25FD9F0608C0EE0400CF06080036 +:100AE500F8E3D75200EF025202FE3700CF24FD0093 +:100AF500CF060800BF0408C716629F000841001111 +:100B05008F1A209B4100118F1B209F0108C65100A1 +:100B1500FE62FFEF025205CF060800C1510CFE0A26 +:100B250000C0D7C1511DFE0200C0D761DD717BFA3F +:100B350070CEC0A59EC47CFF9EC4609EC461CDD707 +:100B450061DD717BFAC18EC45C1BFED6FFCF060842 +:100B550001FED7FFC061CDD731F2FA1AC1AEE4BFAD +:100B650016FDAEE6BF18FDAED4BF1AFD30FFFFBEC1 +:100B7500E4BEE6BED4C0D731F2FA11C1AF16FDBE50 +:100B8500E4AF18FDBEE6AF1AFDBED4C0D7C1BF1C89 +:100B9500FD13BF1EFD15BF20FD17BF22FDC0D7AF3A +:100BA5001CFDDB1EFDEB20FDFB22FDD7534B305218 +:100BB5005430324E323030475631323000FFC1505A +:100BC500FEFEAB0061DD717BFACF060800FE0A0070 +:100BD500FEA4FF61CDF8E3EECF00C7FB0408BF1606 +:100BE500FD8FC0009C05C5C337040600BF18FD3541 +:100BF50036270C300000522BFE6600C2C4C630D525 +:100C05000BB800300000B8022004AF18FDB8003062 +:100C15000F00B802AF16FD61FF520AFE3AFFECF86D +:100C2500FF0E717BFAC1C7FB04088C05C65C80FE0C +:100C35000200C0D761DD717BFA70CFC0FFA59FC0F0 +:100C4500007CFF9FC000609FC00061CDD7618BFE17 +:100C5500E2FF717BBE410011FB000017CEFC006175 +:100C6500CB089EFDF31161C999A58392DFF7D7FEE5 +:100C7500B1FED524FDDF23C1CF0308035109FEF4DE +:100C8500FDC0D2DF37FE3800A20408CF03080751A4 +:100C950009FEE1FDD2B20408DF22C7FB0408318357 +:100CA50002C6D7C6510AFECCFD624C1FDF06CF2413 +:100CB500FD01EF04CF24FD00C0EE5BFEC0EE55FE46 +:100CC500C7C1FB04088B31196C0161589BC0C6D79D +:100CD500717BFAFE4DFEAF0408040600C1143639D7 +:100CE5000C300000522DF3FE77FF8FC000FE2BFE67 +:100CF50061CF5C807C8073C0041900CEFC0F61CB92 +:100D0500C55404EF03C55417FE18FEC7360008BBCB +:100D1500629C0288089C03D1DD334C41DE2F70F1C3 +:100D2500312DB161090033081C000851FF612A41CA +:100D35000E118FD0FF613B118FD1FF6138DC0E8B17 +:100D45005C03DF0964C6C4FE2BFDEECAFDC6C4EE16 +:020D5500C3FDDC +:100D570061CF5100718C7109FECBF800FEFCDE01FA +:100D670000F6BF00F953C0F693935820FEDFF94110 +:100D770000369A4E34CCFCEF05118B99A7A5174482 +:100D8700E44EDFF53602F930CCFCEF04CC0000A7C7 +:100D970047DFF9410036E44E3420FEEF05118B9909 +:100DA700A7A51744F44EDFF53630FE3096FEEF0464 +:100DB700CC0000A747DFF9FCCE0000EFFE61DD7134 +:100DC7007BFABEF0ADD8BEF200AEF661CDD7C361F7 +:100DD700DD717BFABEF0ADD8BEF200DBF6FFADDC0D +:100DE700BEF000AEF6BDD8AEF40312ADDABEF20027 +:100DF700AEF661CD03BDDAC2D7C3F33174D9088328 +:100E0700C1F626D8BDD8C031750683C312F623C2F2 +:100E1700FD220E93DF0312F623C2D7440000DD261E +:100E270061DD717BFACFE80080BEF6F6BEF4BEF254 +:100E3700ADD8BEF0CFE800818FE8003103FAAEF0FD +:100E4700F5E80061CDD7B1D7C3F33174D90883C1B1 +:100E5700F626D8BDD8C0317505C312F623C2FD707A +:100E67000E93DF0312F623C2D7440000DD2761DDAE +:100E7700717BFACFE80080BEF6F6BEF4BEF2ADD8BD +:100E8700BEF0CFE800818FE8003103FAAFE000F54C +:100E9700E80061CDD7ADD8D7C3F33174DB0F83C179 +:100EA700F626D8BDD861317026DABDDAC031750DA6 +:100EB70083C312F626DCBDDC61317023C2FDD80E78 +:100EC70093DF0CF626D8BDD861317026DABDDAC2B9 +:100ED700D7C161686BDC6BDDC0DD2F61DD717BFA2B +:100EE700CFE80080BEF4ADDCBEF6ADD8BEF0ADDA1B +:100EF700BEF2CFE800818FE8003103FAAEF0BDD82B +:100F0700AEF2BDDAF5E80061CDD7F6BDD8BDDAD7C8 +:100F17008292DD2B61DD717BFACFE80080BEF0F6AF +:100F2700BEF2BEF46208BEF6CFE800818FE800315A +:100F370003FAAFE0006072AEF0F5E80061CDD7606C +:100F470072F6B1D706DABDDAADDC06D8BDD861D8FE +:100F5700A6DAD7D1DD17C1C3DAD89DD8ADDA311CEF +:100F670061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD82 +:100F77001BC1C3DADA9DDAADD8311E33311E3371A6 +:100F8700F9B4DADFF4BDD813BDDAC2C0D746D8DD6D +:100F97000771FF7177D971C0D75BDB9DDB605BDAC7 +:100FA7009DDAADDC5BD9085BD808BDD8D7C3C7F3DA +:100FB700728EFDC162314C410036904E1161A072B4 +:070FC700C09EFD62C6C2D707 +:0A0FF60031353A31313A323700004C +:0A20000031353A31313A3237000031 :10200A0005214F7B9EC5E9000104080D12171C1F0C :10201A00080100001F003B005A0078009700B50035 :10202A00D400F300110130014E01192634445362E1 @@ -288,744 +287,730 @@ :1021EA00C420C9A0D030011006002C200DA0370051 :1021FA00373047F028F025F0373010F014F00F7020 :10220A000D000D000D0002006A0014FFB4FD30DA63 -:10221A00E9E70000000000000000000000000000E4 -:10222A0000000000000000000000000000000000A4 -:10223A000000000000000000000000000000000094 -:10224A000000000000000000000000000000000084 -:10225A000000000000000000000000000000000074 -:10226A000000000000000000000000000000000064 -:10227A000000000000000000000000000000000054 -:10228A000000000000000000000000000000000044 -:10229A000000000000000000000000000000000034 -:1022AA000000000000000000000000000000000024 -:1022BA000000000000000000000000000000000014 -:1022CA000000000000000000000000000000000004 -:1022DA0000000000000000000000000000000000F4 -:1022EA0000000000000000000000000000000000E4 -:1022FA0000000000000000000000000000000000D4 -:10230A0000000000000000000000000000000000C3 -:10231A0000000000000000000000000000000000B3 -:10232A0000000000000000000000000000000000A3 -:10233A000000000000000000000000000000000093 -:10234A0000007F7E7D7C7A797877767574727170F9 -:10235A006F6E6D6C6A6968676665646261605F5E0C -:10236A005D5C5A5958575655535251504F4E4D4B22 -:10237A004A494948474645434241403F3E3D3B3A28 -:10238A00393801020203030200FEFBF7F3F0F0F30F -:10239A00FA041225384D5F6E777A776E5F4D3825CD -:1023AA001204FAF3F0F0F3F7FBFE00020303020251 -:0223BA00010020 -:1023BC008D3EB43ED1DF26CD3E1EFD7424FD15248A -:1023CC003132960D3104960931329A05713304EF8E -:1023DC0003713204FD4824FDEA23FD4B27D77153CA -:1023EC0096D432DD05B432715296312296073132D1 -:1023FC009A037152967154967141023144020571DF -:10240C0040B3FBD77148B3FBD78D304B3CDC114A42 -:10241C0030B9DE0C4A3F28DE03A43FD7713396D780 -:10242C008D3D4B30DE054A30BDDC0C4A4028DE03C6 -:10243C00A440D7713296D7F43FF440D731429A0C6E -:10244C004A4102DE03A441D7712396D731320412DC -:10245C0040AFFB3CDE0C8FB2FB5C01D1DF0471237F -:10246C0096D7712296F441D7C7C1FBF8FF31329A47 -:10247C00067130B3FBEF047138B3FB7144967137BE -:10248C009ADE4F71349A71419631329A0E5002C1D4 -:10249C005011FD0236C0CD3229EF37E0C15011FD8D -:1024AC000236C0F43217C15002FD922CC0D2DF0D9F -:1024BC008B318E318D080E01081C00BD34AD3444B7 -:1024CC00009BDC05D5AFFBDF095020C15011FD028C -:1024DC0036C0C0C6D78D209D42FD2325FDC62CD508 -:1024EC0007F9DD04710396D78D424B2061F83164F6 -:1024FC00961C716396FD95044A4207DD054A42FF1E -:10250C00DF098F06F9310303FDB225FDC6257102E3 -:10251C009630A9266194D7C771620171720150037C -:10252C00FD1F0A5008FD7F38629D305009FD7F3831 -:10253C006276716301711806F94A30F1DC0BE5071C -:10254C00F9F508F9CD3707EF224A3004DE1ACF0728 -:10255C00F9025008C1506CFD8D02C092DF0DD454AD -:10256C00DF09711006F9EF03F507F94007F901DFF0 -:10257C0005710A22EF06710B22710302CD20075759 -:10258C0000674C08DE1073090A20614EDC05679D5C -:10259C0020EF0387EFEB4A2007DF09D507F961F835 -:1025AC00CF07F903C6D7500AFD1F0A304000C150AF -:1025BC0006FD752CC05096ED1F0AC72006FBF8FFD0 -:1025CC00D507F961E8EDA526304A57C1503EFD7597 -:1025DC002CC0D2DD077100B2FBEDA5267108B2FB51 -:1025EC0017040200C15004C1500CC1506CFDAE0266 -:1025FC001006EA38AA48318D12AA48318E616B0850 -:10260C00616A08C1500EFD752CC0F690C1500CFDCE -:10261C00752CC0CC01008C014C04DE28313497029F -:10262C00EFFA712297EA388C015010D605C1501080 -:10263C00C18C01D6044000C1506CFD6003100661D2 -:10264C005901EFD250A5FD1F0AEA38AA48318D1264 -:10265C00AA48318E616B08616A08C1500EFD752C59 -:10266C00C050A5FD1F0A5004C1506CFD8D02C06204 -:10267C009C01EA388A4B4E0161C3048A4A4E011709 -:10268C00040200C15004C1500CC1506CFD60031019 -:10269C0006F6C1503EFD752CC01006C6D7C78D433B -:1026AC004B3061F8ED48274A4528DE05A445ED4836 -:1026BC0027F4458D309D438D305070D612307351B8 -:1026CC00230480001231FF318E039D449FAEFBF634 -:1026DC008D447C804C95DC1B8D44318F241400EA96 -:1026EC0038BDD8AA44FDD20D1231FF318E03318F83 -:1026FC0016EF198D44318F241400EA38BDD8AA4640 -:10270C00FDD20D1231FF318E03318F16EA388A4219 -:10271C007217F3031644000171FE61C836FF0017EF -:10272C0001DE02F61617BD7CC7500CFD752CC0D20D -:10273C00DF068D309D43EF047100B2FBF2C6D7C7A4 -:10274C002008FBF8FF4007F901DD064007F902DF1E -:10275C001C17040600FD982DD2DF0A8C069C058CF4 -:10276C00079C04EF4ECC0563CC0400EF461704061F -:10277C0000FD982DD2DD0F7100B2FB710396CC05D4 -:10278C0000711297EF2D7108B2FB8C06318E318DD2 -:10279C00080E07081C00BBEA388A4072ABFD250FF7 -:1027AC00BB8C019C05D1DF08CC0501CC0400EF03E8 -:1027BC008B9C0417040600FDA32DD2DD06CC06C8A5 -:1027CC00CC07008C069FB1FB8C06318E318D080E28 -:1027DC0007081C00BD34AD344401A5DC08CC0364EF -:1027EC00F6BD46EF48AD3426464401A0DC08CC03C8 -:1027FC001EF6BD46EF37AD3444819DDC09CC030A8F -:10280C00C946F401EF27AD3444019BDC09CC030528 -:10281C00C946F401EF17AD34440191DC09CC030037 -:10282C00C946F401EF07711297C946F4013132041D -:10283C000C31249608CC0564CC0400EF0D8C034EAF -:10284C0005DE078C039C05CC04008C059FAFFB8C2C -:10285C00049FB0FBFD252D8D484E05DD2840AFFBB8 -:10286C000BDE054A480BDE1440AFFB06DE054A487A -:10287C0006DE09D5AFFBDF0DD448DD095020C15071 -:10288C0011FD0236C08FAFFB9D48FD622D1008C6AE -:10289C00D7C75601D837C15002FDAA2CC08F09F9F1 -:1028AC003105075012FD1F0AEF0E500AFD1F0A7169 -:1028BC002010055008FD1F0A8D376C0870C150029E -:1028CC00FDAA2CC05003FD1F0A8D376C1870C15027 -:1028DC0002FDAA2CC05016FD1F0A5003FDBB2C6232 -:1028EC005C01D1DD0F7170B3FB5002C15013FD02BE -:1028FC0036C056006672C6D7C75004FDBB2C625C4E -:10290C0003D1DD405014FD9B2934B3FB895C9F99A6 -:10291C008A0C7CFF50FF5C14D1DD228A0C7CFF5C9E -:10292C00147234B7FB89616A99716207560031627F -:10293C0007058666D1DFF7716307716B2734C6FB19 -:10294C00895CEB995002FDBB2CD2DD398D376C10B4 -:10295C0070C15002FDAA2CC0E0FD1F0AD837C1502F -:10296C0002FDAA2CC05033FD1F0A8F09F93103094F -:10297C0071281005500AFD1F0AF0C15002FDAA2C47 -:10298C00C07178B3FBE0C15013FD0236C0C6D7C787 -:10299C00C12004FBF8FFCC02005004FDBB2C629C50 -:1029AC00038C045C20D1DD0E8C036C019C038C0227 -:1029BC006C209C02EF138C045C10D1DD0C8C035C3E -:1029CC00FE9C038C026C109C028C045C08D1DD0E06 -:1029DC008C036C029C038C026C089C02EF138C041D -:1029EC005C04D1DD0C8C035CFD9C038C026C049CA0 -:1029FC00024008F903DF088C03D161E8CC03028C98 -:102A0C0003D1DD05501AFD1F0A8C0370C15004FD63 -:102A1C00AA2CC08FB3FB5C9F728C03318E316D146A -:102A2C008C03318E314D616D08616C5C606162624A -:102A3C009FB3FB8FBFFB7CFF50FF5E02D1DD278F66 -:102A4C00BFFB7CFF5E027234B7FB89616A997162CD -:102A5C0007CC0100316207086159018C01D1DFF408 -:102A6C00716307716B27F21006C6D7D9A7FBC1504B -:102A7C0006FDAA2CC0D9A8FBC15007FDAA2CC0D7B3 -:102A8C00FD772AF2D7C716664C02DD044C04DF082A -:102A9C00CD3A10CD3B0BEF05F43ACD3B0FC6D7C763 -:102AAC00711300711B20710303710205E0C1500307 -:102ABC00FDAA2CC05013FD1F0AD83AC15005FDAA1F -:102ACC002CC0D83BC1E0FDAA2CC0500AFD1F0A71D6 -:102ADC0003055008FD1F0A8D3B6C1070C1E0FDAA68 -:102AEC002CC05012FD1F0A5003FDBB2C625C01D19F -:102AFC00DF03E2EF24F0FDBB2C629D363602F9C7F2 -:102B0C005008FD922CC05003C1FDAA2CC0710203C9 -:102B1C00711A20FD522CF431F2C6D75003FDBB2C98 -:102B2C00625C01D1DD155014FD9B29FD0429501464 -:102B3C00FD1F0AE0C15003FDAA2CC0711300711BCC -:102B4C00207103035014FD1F0AF0C1E0FDAA2CC034 -:102B5C00F0C15003FDAA2CC0D7C72004FBF8FFCC52 -:102B6C0002008D319C035010C150A4FD8D02C06237 -:102B7C009D31D454DD04F2ED2F2C8C037B315C0899 -:102B8C00D1DD0F8D315C08D1DF05CC0210EF03CC09 -:102B9C0002208C037B315C04D1DD158D315C04D1BA -:102BAC00DF088C026C049C02EF068C026C089C0201 -:102BBC008FB2FB5CF3728D315C0C6162629FB2FB75 -:102BCC008FBEFB7CFF50FF5E029C02D1DD1F34B632 -:102BDC00FB896E0299716207CC01003162070861B2 -:102BEC0059018C01D1DFF4716307716B278D315C56 -:102BFC0040D1DD095002C15012FD0236C08D315C4E -:102C0C0001D1DD08E0C15012FD0236C0717AFA8D97 -:102C1C00315C41D1DD0C5A31BED831C15010FDA010 -:102C2C0048C0F21004C6D7FD9D28F2D7FD0429F246 -:102C3C00D7C78FC6FB7617FD9B29664FC6FBDFF205 -:102C4C00F5C6FBF2C6D75064FD1F0AFDAE2D6261BE -:102C5C00FB711196F171149661DC70C15012FDA0DC -:102C6C0048C0FDB037CD6303D7C7C1C1FBF8FFAC7B -:102C7C000ABB17C15002C18C0270C1506CFD6003BD -:102C8C0010061004C6D7C7C1FBF8FFAC08C1500230 -:102C9C00C18B70C1506CFDAE021006C0C6D7C78880 -:102CAC0006166770C1C75084FD29031004C6D7C728 -:102CBC0016C75084FD8D02C0C6D7C74A2004DE0457 -:102CCC005600EF0256018F08F9318FE7240000DD22 -:102CDC001A23DD0B23DD0C23DD1123DD0CEF0C8619 -:102CEC0086EF0851046106EF02868666318F12501A -:102CFC004CD633514CD6610A045420BD384008F9E7 -:102D0C0002DD064008F904DF08CD3C54CD3D44EF0C -:102D1C0006CD3C4BCD3D3DC6D740AFFB3DDC05CF92 -:102D2C0004FC0FD740AFFB1FDC05CF04FC0BD740D6 -:102D3C00AFFB0BDC05CF04FC07D740AFFB0661D81B -:102D4C0031320405CF04FC03D7D5AFFBDD04E50419 -:102D5C00FCD7F504FCD7D504F9DF04717396D7FDC5 -:102D6C00AE2D6261FB71019771149671079761C862 -:102D7C0031729617717296710497711196F17104F4 -:102D8C009761DC70C15012FDA048C0D7C716C75060 -:102D9C0004FD922CC0C6D7C716C75002FD922CC09A -:102DAC00C6D740AFFB0BDE02E2D7F2D771000105AC -:102DBC0071785005713AD5713BD18F10055CFC9F31 -:102DCC001005CF54054AE5420571104205710042C9 -:102DDC0005714850057130500571205005CF5305D1 -:102DEC0009CF52050B7130510571205105713BD53E -:102DFC00717050058F11055CFC9F1105F422D77181 -:102E0C0078500571080105D7FDAA39FD9504717A32 -:102E1C00FAFDE124F504F98F06F931051B5003FD89 -:102E2C00BB2C625C01D161E8CF04F902CFAFFB642B -:102E3C00710407714196EF10F6710407611012F6D8 -:102E4C00B1236061FB714196FDBD31FD444471229B -:102E5C0099712BE7618461A461EDEFF8D7C78806FF -:102E6C001666614FDD0967614EDE0396EF018666DB -:102E7C0072C6D7C7161714AA0412A943DD29AA04CF -:102E8C0012A923FDCE4FC3AC02FDCE4F13C2BDD849 -:102E9C0013FDA20FDE0C1714AA0212AA0403BA0423 -:102EAC00EF051714A9BA04AC041231FF319E03319B -:102EBC007F087208C6D77100F200304400BFB6011B -:102ECC00300188BF9001300984BF9E01BF9C01BFB7 -:102EDC009A01BF9801BF9601BF9401BF9201F53CC6 -:102EEC00FF30FE00BFBE01F6BFBC01BFB80150EE03 -:102EFC00BFBA01A1BFB201C918FE008F06F9310596 -:102F0C0007F5CDFBCB6CFF00717397716297D7C738 -:102F1C002004FBF8FF3026FBBC02F6BBAB4464007C -:102F2C00DE0EAC0214CA0000617902617900EFEC8C -:102F3C001004C6D730EF00BFB401F6BFBA01710858 -:102F4C00F200712304715307BE6EBE64BE6A712316 -:102F5C0004715307715BD1F457F456716397D78D95 -:102F6C0058B458D1DF6931D4D105715BD1E457D451 -:102F7C0057DD2E7140B2FBD856F1E734020023DD49 -:102F8C000625DD0325DF05F6BE66EF06D9CCFBF181 -:102F9C00BE66A4564A5620DF04F456F457CD581991 -:102FAC00D7CD581E7148B2FBD5CEFBDF04F6BE66FA -:102FBC00D7D9CCFBF14266FFDD15D9CCFBF112AEB3 -:102FCC006643DE05A266FFEF03B266FFCD5803D75A -:102FDC00C7161714F6B9AA0412F6231231FF31AE34 -:102FEC0003316FBA02C6D7C7C1FBF8FF8C085080FB -:102FFC00D612AB1413B9AB14AA0412A92312D927F5 -:10300C00FBF133BDD813FD0E0EBA02C0C6D7310486 -:10301C009801D74004F902DF10F6BE64BE6EBE6A9A -:10302C00BF8EFBBF94FBBF9AFB31749714308AFBA5 -:10303C00FDDC2F3090FBFDDC2F3096FBFDDC2FEF01 -:10304C00713114980D7113987108D2FBF45AF4591C -:10305C00EF60D459DF5A8F26FB9D594A5A1FDC1753 -:10306C007100D2FB4028FBFFDD1CA45B8F28FB4BBF -:10307C005BDE13F45AEF0FD85AF1A1605C1F9D5A16 -:10308C007108D2FBF45BE85A092AFB70C1308AFB49 -:10309C00FDF32FC0E85A094AFB70C13090FBFDF3D9 -:1030AC002FC0E85A096AFB70C13096FBFDF32FC0A4 -:1030BC00B459308AFBFD7F2EF313BE6E3090FBFDAE -:1030CC007F2EF313BE6A3096FBFD7F2EF313BE6486 -:1030DC00D7C736F00071F4DC297170F000CE9D0872 -:1030EC00CE9EC0CE9F80F594FFF593FFF592FFE541 -:1030FC0097FFE596FFE595FFE598FFCE9C7F710065 -:10310C00A6FB711BE3712BE3711AE7712BE7717A44 -:10311C009D710A9E31929E02EFFA710B9E7123985B -:10312C00713398714398C6D7C73122981E71229873 -:10313C00710A9E31929E02EFFA34D4FB3692FF5202 -:10314C00078B99A5A792DFF9710B9EC6D7C7880686 -:10315C001631329815713298C7349CFB3092FF1699 -:10316C0052078B99A5A792DFF9C6667367189CFB6B -:10317C00C6D7C77123983134981E713398710A9E43 -:10318C0031929E02EFFA3492FF369CFB52078B99D8 -:10319C00A5A792DFF9710B9E314498137143987176 -:1031AC007B9E8FDCFB9E9A8FDDFB9E9B717A9EC66D -:1031BC00D7CFA7FB5CCFA8FB5FCFC8FB5DCFFCFBD9 -:1031CC0036CFFDFBC9D7C7CFA4FB12CFA5FB2ECFA3 -:1031DC00CCFBFFF5CDFBF5CEFBF5CFFBF5D0FB56CD -:1031EC0000664C64DE08723826FB0086EFF3F5E3CC -:1031FC00FB714A9D712B21710A20711A20710203F7 -:10320C00C6D7C788061617F1E73403002361E3ED30 -:10321C003A352361F8ED1134B12361E3ED1B34250C -:10322C0061F8ED2934B1240D0061D8ED3A35240B49 -:10323C000061F8ED03332361F8ED46332361F8EDBB -:10324C0016332361F8ED333524060061F8EDC533F0 -:10325C00B12561D8EDE13324000061F8EDEE3323A4 -:10326C0061F8ED3A352361F8ED3835B12361E3EDC2 -:10327C0049342361F8ED5A342361F8ED6B34236142 -:10328C00F8ED5A342361F8ED7C342361F8ED8D347C -:10329C002361F8ED9C342361F8EDBE342361F8ED25 -:1032AC00C9342361F8EDD4342361F8EDDC34240205 -:1032BC00002361E3ED3A352361F8ED10352361F815 -:1032CC00EDE4342361F8EDEF342561F8EDFA34B117 -:1032DC0024060061D8ED3A3524000061F8ED3C3548 -:1032EC002561F8ED053524120061F8EDBF3323613B -:1032FC00F8EDAF33ED3C3567D1DD0C30D93C619442 -:10330C0034C4FB89616F99ED4635675C02D1DD07EA -:10331C0030332C6194EF0B675C01D1DD0530382C18 -:10332C006194675C3CD1DD0F303D2C6194675C3C53 -:10333C007266736218A4FBED463567D1DD625C01E1 -:10334C00D1DD05300800EF01F6609F01FC675C02DF -:10335C00D1DD03E6EF01F63401FC89616899675C05 -:10336C0004D1DD04E6A1EF01F63401FC8961689912 -:10337C00675C08D1DD05302000EF01F63401FC89D3 -:10338C00616899675C10D1DD05301000EF01F634EF -:10339C0001FC89616899675C20D161E8716001FC6E -:1033AC00ED46354A5CC8DE08E85C67185AFAA45C3E -:1033BC00ED4635679D5CED4635D44ADF08679FCDF9 -:1033CC00FBA44AEF0D4A4A05DE08E84A671811FDCE -:1033DC00A44AED4635675C0F7266736218A4FBED68 -:1033EC0046354A4A64DE1B4A4A01DF0667D161F85A -:1033FC005701E84A671826FBA44A4A4A0561C87176 -:10340C001298ED463534A6FB89615F99ED4635304F -:10341C008C2A619466736718A4FBED463540A9FBB2 -:10342C006ADF1340AAFB68DF0D674C6CDF08308144 -:10343C00416194713AD5679FABFBED4635675C7F74 -:10344C0070C117F1243000FD5931C0ED4635675C71 -:10345C003F70C117F1243000FD5931C0ED4635677E -:10346C005C0770C117F1243000FD5931C0ED4635B1 -:10347C00675C1F70C117F1243000FD5931C0ED4657 -:10348C00356770C117F1243000FD5931C0ED463558 -:10349C00CEABAC710A9E31929E02EFFAD592FFDF51 -:1034AC0005710B9EEFED679E99710B9E9FDBFBEDFB -:1034BC004635714298675C7F9FDCFBEF7D714298CB -:1034CC00675C3F9FDDFBEF72675C3F9FDEFBEF6A43 -:1034DC00675C1F9FDFFBEF62308E3A6194679FE45D -:1034EC00FBEF57305B3A6194679FE5FBEF4C307410 -:1034FC003A6194679FE8FBEF41675C01D1DD3BFDCE -:10350C004444EF36675C02D1DD05712A21EF067168 -:10351C004A9D712B21675C01D1DD06710300710B93 -:10352C0020679FE3FBEF1367318EEF0EEF0CEF0A72 -:10353C00664C5BDE05736718A4FBC6D7C716664CD2 -:10354C0030DC094C37DE05FD3431EF6B664C02DFA5 -:10355C001F8FA6FB5C03728F03FC5C03318E316DF5 -:10356C0008616A08128F03FC5C80312A6162EF5695 -:10357C00664C3DDF08AE90BD5EF85EEF49664C3E92 -:10358C00DF04F85FEF40664C4FDF05FD6C44EF360F -:10359C00664C61DF08E85C095AFA72EF29664C7FC9 -:1035AC00DF05FD4F3DEF1F664C4EDF0B31049A04D7 -:1035BC005210EF12F2EF0F664C5BDC0452FFEF0679 -:1035CC00667309A4FB72C6D7C788061617F12410B8 -:1035DC0000240500DC07244C00DD17EF17717BFA83 -:1035EC0017F104A4FB1489617F99717AFA715298CE -:1035FC00EF02A45CC6D7C7C1C1FBF8FF4004F903B6 -:10360C00DD064004F904DF38717BFA8C027309ACD7 -:10361C00FB5E0AD1DF278C02318E04A4FB14896E69 -:10362C000A99716207717AFACC010031620708615C -:10363C0059018C01D1DFF4716307716B27717AFA30 -:10364C001004C6D7CF03FC03F501FCF505FCF50708 -:10365C00FCD7C788061617F1E734020025DD3D2399 -:10366C00DD1725DD1C23DD0523DD2BEF3B710299D6 -:10367C00679F06FCCD6303EF2F675C839F03FCEF12 -:10368C0027675C039F05FC675C034C0261F87122A1 -:10369C009AFD5A46EF12679F07FCEF0C6791DF0803 -:1036AC00E0C15012FD0236C0C6D7C71617F1E72489 -:1036BC000000DD2A23DD1E240300DD0724FB00DDD2 -:1036CC0024EF2531329A05308000EF01F6086F04A3 -:1036DC00FC7208EF198F01FCF501FC72EF107152AE -:1036EC00995235EF09F2EF0666730900FC72C6D7E2 -:1036FC00C71617F1E7240000DD38241000DD1C2369 -:10370C00DD1C23DD30240E00DD18241100DD1B240C -:10371C000F00DD12243000DD15EF1EE2EF1D52020A -:10372C00EF195204EF155206EF115205EF0D520727 -:10373C00EF09F2EF065203EF0252FFC6D7C731640E -:10374C0098377163988D629FACFB8D619FCBFB3674 -:10375C00D2FCC7D861FDB038618A70618AFDF5383A -:10376C00C0D866F1312F609D658D604B65DD0A71A7 -:10377C0072988D659D60CD63034A6305DE0830BA8F -:10378C00376194CD636BB4637150F000CE300BCFC6 -:10379C00170006CE3106FD6802717A30710BE371A9 -:1037AC000BE7C6D78D659D608D659FADFBD740043B -:1037BC00F903DF064004F904DF02F2D73174980CE8 -:1037CC007173987113998D659D67EF313104991F51 -:1037DC00710399711299D506FCDF04F468EF0A8F16 -:1037EC0006FC5002D6A1609D688D689D67EF0E3176 -:1037FC001499068D689D67EF048D659D678D679F95 -:10380C00ADFBD867FD2238E867094C2370C1501313 -:10381C00FDA048C0F2D7C7C1C1FBF8FF8C02D1DFB5 -:10382C0005F506FCEF1A8C024C05DE06CF06FC02F1 -:10383C00EF0E8C02318E1231FE03311F609F06FC9D -:10384C008D694F06FCDD28CC011F8F06FC9D69CCD1 -:10385C0000008B4C08DE148B730912204F06FCDC25 -:10386C00058B9C01EF05615900EFE78C019D6410FD -:10387C0004C6D7C716710AE7710BE37150F000CE7E -:10388C00300BCF170006669E31FD6802717A3071DD -:10389C000BE33182E302EFFA8D1F7158F000710BCC -:1038AC00E772C6D7C7C1C1FBF8FF8FFCFB4E02DC29 -:1038BC0003F2EF318C024FFDFBDC0452FFEF268C40 -:1038CC00022FFCFB706131318D128FFDFB2FFCFB45 -:1038DC0070613133BDD813FD300EBB440001DC03E5 -:1038EC00F690BB8B721004C6D7C7C1FBF8FFAC08AF -:1038FC0014A91489708B6128706131FDCE4F13446B -:10390C00030071FEDC23AC08148A04819A04AC0811 -:10391C00148A044C11DC10A9148B99AC0814CA023B -:10392C0000AC0814CA0310EF72AC0814CA0400AC43 -:10393C000814A914894DDE0AAC08148A02819A0273 -:10394C00EF12AC0814A914894D61D308AC08148A81 -:10395C0002919A02AC08148A03919A03D1DF3CAC11 -:10396C0008148A024C10DF10A91489318EA112ACF4 -:10397C000814A9146299EF17AC08148A024CF0DFF2 -:10398C000EA91489318EB112AC0814A9146299AC29 -:10399C000814CA0200AC0814CA0310C0C6D7EDAD97 -:1039AC0039C75600664C0ADE0BF0317E12F67810E1 -:1039BC00FC86EFF0C6D7C7200CFBF8FF17040600F7 -:1039CC00C15006C150A8C15030FDAE021006D2DD68 -:1039DC001B4A6C04DE05A46CE2EF7034E4FB895CDA -:1039EC00FC99FD8E3A7110B2FBF2EF5F717BFA30ED -:1039FC000600C117040600C130E9FBFDD64F1004C8 -:103A0C00717AFAF46C8FE4FB5C01D1DD264004F989 -:103A1C0003DF205010C180FD0236C0C7361005717F -:103A2C00D4C6DE0F17C15006C150A8C15030FDAE30 -:103A3C000210064004F903DD064004F904DF0B8F85 -:103A4C00E4FB5C02D161E8FD8641F2100CC6D7D9CB -:103A5C00E5FBC15030FD8D02C0629FE8FB5008C1F0 -:103A6C005011FD0236C0F2D7D9E8FBC1D9E7FBC132 -:103A7C005030FD290310045008C15011FD0236C00E -:103A8C00F2D7C7200CFBF8FFCC09004007F901DF87 -:103A9C0005CC0A02EF03CC0A10CC0B808FE4FB5C44 -:103AAC00039C07D1DF08717AD5CC0807EF06717B30 -:103ABC00D5CC082F17040800C15004C150A0C15028 -:103ACC0030FD60031006624C02DF077110B2FBF28E -:103ADC00EF357118B2FBF46CC736100571D4C6DE25 -:103AEC00164004F903DF1017A1C15006C150A8C13C -:103AFC005030FDAE021006717BFA8FE4FB5C034E76 -:103B0C0007DD03E2EF01F2100CC6D7D504F9DF0391 -:103B1C00F6BD6E4004F901DD0AD478DD03B478D724 -:103B2C00CD78038F04F9318FE723DD0B24020024B9 -:103B3C00030061C8ED473C8F06F9312349301B0067 -:103B4C00466EDF158FE3FB5C01D161E8F504F9E00B -:103B5C00C15010FD0236C0EF1D307701466EDF16E6 -:103B6C005002C15010FD0236C0F64674DF088FC8F3 -:103B7C00FB5010D6BD74F64674DD36B6744674DF51 -:103B8C0030711297EF2B301B00466EDF13F6467622 -:103B9C00DF18E0C15010FD0236C0C9765307EF0A9A -:103BAC00307701466E61F8711297F6467661E8B689 -:103BBC007631549A08714399F6BD6EEF14314499DD -:103BCC0005F6BD6EEF0BA66EF6466E61F8C96EFF7C -:103BDC00FF31629A194A7005DE16A4704A7005DF2F -:103BEC000FA4705004C15010FD0236C0EF02F470E7 -:103BFC0031649A194A7205DE16A4724A7205DF0FF7 -:103C0C00A4725008C15010FD0236C0EF02F472D4F9 -:103C1C0073DD03B473D731729A174A7105DE14A49D -:103C2C00714A7105DF0DA4715010C1FD0236C0EF51 -:103C3C0002F4714A710661F8CD7325D7C7361005A9 -:103C4C0071D4DE0E8FB2FB5C02D1DF0630C239615B -:103C5C0094D24004F903DF1C3122070530652B6137 -:103C6C00943154990C7153995080C15012FD023605 -:103C7C00C0FD853CFDAB3CC6D78F03FC5C01D1DDA0 -:103C8C001DD47BDD03B47BD7CD7B098D644B7ADDF2 -:103C9C000D8D649D7A5040C15012FD0236C0D74044 -:103CAC0004F903DD04F6BD1AD7D5D0FBDF08F646C0 -:103CBC001ADD19B61AD7D9CCFBF1461ADD0ED9CCC0 -:103CCC00FB12AD1A43DE03A61AD7B61AD7717BFACC -:103CDC00C78FC4FB76F5C4FB717AFA5C10D161E82E -:103CEC00716299665C0FD1DD57665C01D1DD05F51B -:103CFC0004F9EF4C665C02D1DD11E0C15003FDAA62 -:103D0C002CC0711300711B20710303665C04D1DDA0 -:103D1C0011711300711B20D503FC61F8710303FDB5 -:103D2C005036665C08D161E87103035005FD1F0A2B -:103D3C007102035003C1FDAA2CC0711A20FD522C34 -:103D4C00F2C6D7C756FF4A4A1361C8ED053E8F0627 -:103D5C00F9311505300400EF0F8F06F931450530A8 -:103D6C000500EF04D907F9F1609F28FC8D7C9F2991 -:103D7C00FC713496E661301271049661DC31196184 -:103D8C0062629F2AFCE52BFC31449A05304000EF1F -:103D9C0001F6C131340405302000EF01F6C2616B2D -:103DAC0008616A08C131749A05300400EF01F6C24B -:103DBC00616B08616A08C131649A04E6A1EF01F6EF -:103DCC00C2616B08616A08C131549A03E6EF01F6CF -:103DDC00C2616B08616A9F2CFCF171240461DC9F49 -:103DEC0026FCF171540761DC9F27FCD84AF10104D1 -:103DFC00ECFC14A9148976A44A6672C6D7C7FD4395 -:103E0C00098F04F9318FE724000061F8EDDB3F23C3 -:103E1C00DD1B2361F8EDED3E2361F8ED603F23617E -:103E2C00F8EDA93F2361F8ED7B40EDD83FF6BD746A -:103E3C007113974005F901DF2C31349A1B466EDD66 -:103E4C0004F424EF02A4244A2465DC0FF6BD6EF5BD -:103E5C0004F9712299EDFC40FDE124AD6E440A0099 -:103E6C0061D8EDFC40714299FD9504716396FDE1BA -:103E7C00244007F903DF09712299F504F9EDFC40A0 -:103E8C00FD4B2740B1FB9BDE09712299F504F9ED3E -:103E9C00FC40714A277140110571301105713A22AD -:103EAC00715A2271501105FDAB2AD2DD097122998C -:103EBC00F504F9EDFC4071103500CF37001D714051 -:103ECC0012054005F901DD064005F903DF05F5CDC6 -:103EDC00FBEF04CFCDFB03CF04F902FD772AEDFCF9 -:103EEC0040FDB82DFD0305FD5036FDD231F537FFF1 -:103EFC00712BE0F505F9712299CBE43FEFCBE6F697 -:103F0C00F0FD9504713BD48F06F93105285004FD62 -:103F1C00BB2C625C03318E315D34B3FB89616899D3 -:103F2C005002FDBB2CD2DD067170B3FBEF0471782F -:103F3C00B3FBFDE124FDC22E710806F9CF04F90391 -:103F4C008FA6FB5C02D1DD095080C15010FD0236FA -:103F5C00C0EDFC40FDFE403164992FA47ED47EDD83 -:103F6C000831A4E00A31020C06712BE0FD724131DC -:103F7C00A4E01731040C13712BE05027C15005FD40 -:103F8C00AA2CC0CF04F904712299FD67418F06F960 -:103F9C0031250731349A03F504F9EDFC40FDFE4060 -:103FAC0031020C15D83AC15005FDAA2CC05005FDA4 -:103FBC001F0AFD7241CF04F903FD67418F06F931E9 -:103FCC00250731349A03F504F9EDFC40F504F9CFDB -:103FDC00CDFB03F5CEFBF5D0FB717297F6426CFF6F -:103FEC0061E8EDFC40F6BD74711397F5E4FBFD8EB2 -:103FFC003A717AFAFD402FFD0B2EFD5505712B21E0 -:10400C00714B9D31349702EFFACE3708CBE4BFFFEA -:10401C00CBE6FFF3CED4FFF5B4FBF5B5FBF5B6FB61 -:10402C00F5B7FBCF37000971481205F6BEE0BEE2CA -:10403C00BED0716A27FD272B714307714B2771483E -:10404C00100571481105713810057138110571335F -:10405C0002713B22715302715B2271581005715829 -:10406C001105CF04F905714299F6BD6EFD0C0AF5E8 -:10407C0005F9F42431349A04D432DD20E505F9E550 -:10408C0004F98F06F9312568F5F8FBF5F6FB502E8F -:10409C00FD1F0ACF05F903E504F9EF54FDE904FD12 -:1040AC00742471730171320471430271039671624D -:1040BC009631949E02EFFA712AE7CEA409F5F3002B -:1040CC003104070261FDE5F300F46AFD4309CEA457 -:1040DC000831329A06CF04F905EF09714399E505C9 -:1040EC00F9E504F9712BE78F06F9312503F504F98D -:1040FC00C6D78FE3FB5C01D1DF60D47FDF193102BF -:10410C0000585003FDBB2C625C01D1DF07F504F9AC -:10411C00712299D7E47FD74A7FF0DF073104003A48 -:10412C00F47FD74A7FC8DF0AF504F9712299CD7F55 -:10413C00F0D7310200084A7FFFDD1FA47FD7F0C102 -:10414C005004FDAA2CC08FB3FB5C9F9FB3FB711076 -:10415C00C4FB30D93C6194CD7FF0D731149706F570 -:10416C0004F9712299D7716399F47E717207FD6815 -:10417C0002717307D7FD5E05F2D7717BFAC7200C6D -:10418C00FBF8FF8FEAFBF0F9E9FBF303FDCE4F13CD -:10419C00BC048FECFBF0F9EBFBF303FDCE4F13BC2F -:1041AC00028FEEFBF0F9EDFBF303FDCE4F13BB7169 -:1041BC007AFAAC04BDD8F6BDDAAC04311EBDDCF61F -:1041CC00BDDEFDE30DADD8BDDCADDABDDEAC02BDB0 -:1041DC00D8F6BDDAAC02311EDADCC3DADEC3BDDCE4 -:1041EC00F6BDDEFDE30DC0BDDEC0BDDCADDEFD59B0 -:1041FC000FADD8BDDCADDABDDEABBDD8F6BDDAABEC -:10420C00311EDADCC3DADEC3BDDCF6BDDEFDE30D48 -:10421C00C0BDDEC0BDDCADDEFD590FDADAADD8FDB8 -:10422C005545C3C58D8C5C3FF0317E0440FC14C2F7 -:10423C00C0B9A48CF6BC08BC0A9C078C074C2EDDBC -:10424C003D8D8C0E0770F161DC605C3FF0317E12AD -:10425C007940FCBDD8F6BDDA8C0773098C23318FFD -:10426C00BDDC70BDDEFDE30DAC08BDDCAC0AFD5958 -:10427C000FADDABC0AADD8BC08615907EFBDAC086C -:10428C00BDD8AC0ABDDAC9DC0004F6FDAD0EC9DC44 -:10429C00FFFFF6FDAE0FADD8BD86AF3AFC4686DD0E -:1042AC0011AF3CFCBF3EFCAF3AFCBF3CFCAD86BF43 -:1042BC003AFCAF3CFC423EFCDC46AF3AFC423CFCD8 -:1042CC00DE3EAD26423AFCDE374A2A16DC1A4A2A72 -:1042DC00A0DE138D884B2ADE0DAF3AFC268A44698A -:1042EC001061C8FD3E43F42AAF3AFC445146DC0A47 -:1042FC00AF3AFC241027BD28EF0DC928F82AEF0788 -:10430C004A2AFF61E8A42AAF3EFC423CFCDC18AF11 -:10431C003CFC423AFCDE10AF3AFC4628DE09F4883D -:10432C00AF3AFCBD8AEF074A88FF61E8A488100CFD -:10433C00C6D7717BFAC7710A9E31929E02EFFA8E34 -:10434C00949F34FC8E969F35FC8E979F36FC8E98EE -:10435C009F37FC8E939F38FC8E929F39FC710B9E7D -:10436C00717AFA8F37FCFDC20F76FDD34413BD84EE -:10437C00D5EFFBDF0AD5F0FBDF05D5F1FBDD25F62C -:10438C00B14684DF11C9843722665C0391DF060ACB -:10439C0084181A85009617FDF64513FD1644310452 -:1043AC009A02EF61520692926934FC682EFCDFF699 -:1043BC00AD84BD82F880F3311C790AF944FEFFDD2F -:1043CC0044D880F101040AF914A944FFFFDF04E684 -:1043DC00B9EF0BD880F101040AF914A9A1B9717BCA -:1043EC00FAA0EFFBD5EFFBDF1CA0F0FBD5F0FBDF59 -:1043FC0014A0F1FBD5F1FBDF0CCFEFFBFFCFF0FBF3 -:10440C00FFCFF1FBFFC6717AFAD7C716D880F10738 -:10441C0044A800DC0571029AEF1CF647DD18A48055 -:10442C004A80A8DC0571029AEF0CF880F3311CF677 -:10443C00780AF9B7EFE4C6D7C756A89666F0317E6E -:10444C0012F6B1780AF966D1DFF1717BFAF5EFFB60 -:10445C00F5F0FBF5F1FBF48071039AC6717AFAD78B -:10446C00C72004FBF8FFD44ADF168D809D8D717B2D -:10447C00FA52069292692EFC68C0FCDFF6717AFA49 -:10448C004A4A06DE0EE84A09C0FC9C03A44A8C0387 -:10449C0072EF30F88DF3311C790AF9BB31129A05A1 -:1044AC008B9C03EF0F8C019C03D48DDF05CD8DA766 -:1044BC00EF02B48D718071179A61DC61FB71119AF6 -:1044CC008C03721004C6D7C72008FBF8FF8F37FC8B -:1044DC00FDC20F9C078F36FCFDC20F9C068F35FC6E -:1044EC00FDC20F9C058F34FCFDC20F9C048F38FC61 -:1044FC009C038F39FC9C028C06318E0112791A2098 -:10450C00BB8C075C03D1DF098C064C0361C8617955 -:10451C00008C05318EB1610900BB313D120103BB2A -:10452C008B0E04708C011C00BB8FF4FB4E03DC0E55 -:10453C008C034FF4FBDC0B8C024FF5FBDC04AB1251 -:10454C00EF03ABB1121008C6D7C7C3C12008FBF8E4 -:10455C00FFF661490A61F8614908DF07F73400008A -:10456C00EDF245E6BC04F6BC06AC0ABC02AC08BBDA -:10457C00AC06614902AC0461F8614900DE28AC0468 -:10458C00BDD8AC06BDDAE1FD680FADDABC06ADD81E -:10459C00BC04ABBDD8AC02BDDAE1FD830FADDABC17 -:1045AC0002ADD8BBEFCAAC06BC02AC04BBAC08BDB8 -:1045BC00D8AC0ABDDAAC04BDDCAC06FDE60EAC042E -:1045CC00BDDCAC06FD590FE1FD830FADDABC06ADC9 -:1045DC00D8BC04AC06614902AC0461F8614900DC4A -:1045EC00C5AC0214AB12100CC6D7C7C12004FBF823 -:1045FC00FF8F31FCFDC20F9C034E04DF1CAD8246C5 -:10460C0084DE07AD84268212EF40F64684DF07462F -:10461C0082DD03E7EF34F7EF318C04318EB1128C6D -:10462C0003318E43DF1830382226820684BB8C047B -:10463C005C0391DF05AB041800BBAB12EF0C8C03D1 -:10464C004E04DE0532A900EF01F71006C6D7717BC8 -:10465C00FA31229A0CF64690DD07B690717AFAEF91 -:10466C007C71239A717AFA4004F904DF07715307BD -:10467C00F42CEF69D9CFFBF1E7240000DD0F23DD2B -:10468C001A23DD1023DD5323DD2723DD3871530777 -:10469C00F42CEF49715207F42CEF42D42CDF077144 -:1046AC005207E42CEF05715307F42CC990FA00EF74 -:1046BC002CD42CDF0B715207E42CC990FA00EF1D9F -:1046CC00F5CFFBEF18D42CDF0B715307E42CC990FA -:1046DC00FA00EF09CFCFFB02EF03FDEA46D7D9056D -:1046EC00FCF1E7240000DD0923DD2123DD0923EFA4 -:1046FC001B715307F42CD7D42CDF07715207E42C11 -:10470C00EF05715307F42CC9902D01D7715207E4B2 -:10471C002CD731629701D7710398D9CDFBF1E724DF -:10472C000000DD1223DD1923DD1123DD2623DD340A -:10473C0023DD3923DD3FFDAA47EF3DFDCB47EF38A5 -:10474C00D9CCFBC1AE6CFD692EC0F313BE6C7123CA -:10475C0004EF25F0C1AE6CFD692EC0F313BE6C7175 -:10476C002304EF14F6BE6C712204EF0CCB6CFF002B -:10477C00712304EF03FD3F484004F905DD064004B6 -:10478C00F901DF067123047103983104980FF6BE0A -:10479C0064BE6A31220402EF02F690BE6ED7CD2EB3 -:1047AC0047F492AE6C317DBFCAFCFD1448D2DF0ECB -:1047BC00D9CCFBC1AE6CFD692EC0F313BE6CD7FD1A -:1047CC001448D2DD0DCD2E47F492AE6C317DBFCAAC -:1047DC00FCD7E8920934205080D6BFC6FC22CAFC14 -:1047EC00BDD8304700FD0E0EBFC8FC30C6FCFD7FA7 -:1047FC002EF313BE6CB42ED42EDF0CCD2E47A49208 -:10480C004A921F61C8F492D740AFFB0BDC057123B1 -:10481C0004F2D740AFFB0661D831229611F0C1AE3D -:10482C006CFD692EC0F313BE6C712204EF03FD3FC7 -:10483C0048E2D7710298F0C1AE6CFD692EC0F3133B -:10484C00BE6CA4934A9340DC37F493D894F1313F77 -:10485C000412FD14D894F1BDD85008FD5D0E0872F9 -:10486C0008E6D2DD040192DFFC896158D1DD0571C7 -:10487C002204EF03712304A4944A942061C8F49495 -:10488C00D7C73026FDC6D77180717DFADE03520181 -:10489C00D75200D7C7C12004FBF8FF17040300C18F -:1048AC00E0C15010C150A4FDAE021006629C02D1B2 -:1048BC00DD058C0272EF518C0C70C18C0470FD18EC -:1048CC0049C0629C02D1DD058C0272EF3B8C035C0B -:1048DC007DD1DF03F2EF3117A1C1E0C15010C150FF -:1048EC00A4FDAE021006629C02D1DD058C0272EFB3 -:1048FC00178C015C7DD1DD03F2EF0D8C0370C15080 -:10490C0010FD1849C0629C021006C6D7C78806164F -:10491C00710AE650A4FDE203D2DD0771339752020F -:10492C00EF1317FDFE036770FDFE03FD4349FD7297 -:10493C0004713397F2C6D7FD490450A4FDFE035011 -:09494C0020FDFE0350AAEDFE035C -:1049550061FC61FCC1C3C5C7520C929269D4FEC10A -:10496500DFF88EFD708EFCC1717AFA4004F903DF21 -:104975000530652B6194C09EFC609EFD34D4FE52CB -:1049850006C0B9A5A592DFF9C6C4C2C061FC61DF46 -:10499500520C929269D4FEC1DFF88EFD708EFCC177 -:1049A5008F4105775C04D1DD06675C01D1DD5031AF -:1049B5005498367162077153988FB4FB5FBCFBD175 -:1049C500DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE73 -:1049D500FBD1DF098FB7FB5FBFFBD1DD0C31620770 -:1049E50002EFFA716307716B2771139AFD7E31F43B -:1049F500227148500571605005717AFAEDEF4A67EA -:104A05005C02D1DD16D422DD124A2202DD0DF4222C -:104A15007148500571605005717AFA717AFA8D22E4 -:104A2500318FE7240000DD0823DD1423DD2CEF4A58 -:104A3500F44A7140500571505005E422EDEF4A8F5C -:104A450040059D4B715050058D4B9D4DD84BFD48F4 -:104A550035629D4CCD2202EDEF4A675C02D1DD1730 -:104A6500675C10D1DD05CD2203EF0F71485005714C -:104A7500605005F422EF73CD22044A2203DF108D26 -:104A85004C9F4005D84CC1D84BFDD435C0EF1F8F86 -:104A950040057671744BDC054A4B02DE06716050A9 -:104AA50005EF47C7D84BFD0E32C071505005D84DA4 -:104AB500F1242900DD27240400DD22242200DD1D48 -:104AC500241100DD0C240100DD13241E00DD0EEF92 -:104AD5000A4A4B60DF07CD4B61EF02A44B4A220324 -:104AE500DF08D84BFD4835629D4CC09EFC609EFD9D -:104AF50034D4FE5206C0B9A5A592DFF961FCC1C345 -:104B0500C5C7520C929269D4FEC1DFF88EFD708E36 -:104B1500FCC1717AFA51405F0401D1DD06F616A792 -:104B250047DFF2300400BF2401F6BF2A01300B0B2A -:104B3500BF2801FD6802300B0FBF2801FD68023058 -:104B45000F0FBF2801710AE6F6420C01DD33AF04F1 -:104B550001BF0C0131529729715297710BE2D8515F -:104B6500FDE2033184BD02EFFACBB422FBD853F149 -:104B7500BEB8714BE1714BE5710ABD8D529E44EF94 -:104B85000C715397714AE5717BBD713397C09EFCDB -:104B9500609EFD34D4FE5206C0B9A5A592DFF9C6C4 -:104BA500C4C2C061FCC1C5717AFAD450DD0BEA4EAE -:104BB500899E44A64EB450EF33710AE6300400BF17 -:104BC5002401F6BF2A01300B0BBF280100000000AD -:104BD50000000000510FBF28010000000000000088 -:104BE50000500FBF2801712397713397C4C061FC32 -:104BF50061EF520C929269D4FEC1DFF88EFD708E82 -:104C0500FCC12006FBF8FF71503002CEABACCC04E2 -:104C150000F6BB31B2E210617900F6614900DFF3BD -:104C250071603002EDAF4C8E519C03713BE28C03F9 -:104C35005C02D1DD1E8C035C08D1DF0971503002A6 -:104C4500CC0400EFCC8C0570FDB636629E50CC04CA -:104C550002EFBE8C035C03D1DF408E509C02715085 -:104C650030028C04D1DF0E8C0270FDFC36629C058F -:104C7500CC0401EF328C044C02DF0671603002EF88 -:104C850029CF34025A716030028C0270C18C0570D4 -:104C9500FD5E36C0CF34024AEF108C035C01D1DDD6 -:104CA5000671603002EF03ED164C1006C09EFC60E5 -:104CB5009EFD34D4FE5206C0B9A5A592DFF961FC6C -:104CC500C1C3C5C7520C929269D4FEC1DFF88EFDEF -:104CD500708EFCC1710A9E31929E02EFFA8FDEFB47 -:104CE5004F96FFDF198FDFFB4F97FFDF118FE0FB3B -:104CF5004F98FFDF095004C15011FD0236C0710BFA -:104D05009EC09EFC609EFD34D4FE5206C0B9A5A58A -:104D150092DFF9C6C4C2C061FCE46A61FCC1C3C5C7 -:104D2500C7520C929269D4FEC1DFF88EFD708EFCDD -:104D3500C1C1FBF8FF8D1F9C018E31318EE7240622 -:104D450000DD0823DD0E23DD22EF38717AFA8C01B0 -:104D55009D62EF2F717AFA4007F901DF068C019DFC -:104D650061EF2051FF2E019D61EF18717AFA8C01D8 -:104D75009D304004F903DD064004F904DF0530A940 -:104D85002661944031FF09DE05A031FFEF07715818 -:104D9500F000716298710BE3C0C09EFC609EFD340B -:104DA500D4FE5206C0B9A5A592DFF9C6C4C2C0613A -:104DB500FC717BFAC7D46A61F8312499277123996C -:104DC500D46ADD05B46ACEABAC717AFA5600664C8E -:104DD5000ADD1172F3311C79D8FCCEFC0061CA6181 -:104DE500A486EFEA717AFAF2C6D7C7C1C1FBF8FF0C -:104DF500CC01008C014C0ADE36717BFA8C01F03156 -:104E05007E0410FC14A96168DF09AC02B9717AFA55 -:104E1500F2EF1D8C01F0317E127910FC614902DF41 -:104E250006717AFAE2EF09717AFA615901EFC4E283 -:104E35001004C6D7C72004FBF8FFF64210FC61F842 -:104E4500ED1B4F717BFA9C038C034C0ADE3C8C03F3 -:104E5500F0317E0410FC14A96168DF05717AFAEF60 -:104E650029717AFA8C0372F3311C7910FCCEFC009F -:104E750061CA629C02D1DF0A8C03F0317E12E678AA -:104E850010FC717BFA615903EFBECC0200CC010125 -:104E95008C02F0317E0410FC14A96168DD788C0267 -:104EA500F0317E127910FCE743DF658C014C0ADE98 -:104EB5005F8C01F0317E127910FCE743DD4D717B8B -:104EC500FA8C01F0317E0410FC14A96168DF1861C9 -:104ED50069018C01F0317E12F67810FC8C024E01CE -:104EE500DCED717AFAEF2F8C01F0317E0410FC14A1 -:104EF500A9128C02F0317E337810FC8C01F0317EE2 -:104F050012E67810FC615902717AFA615901EF9B3A -:104F1500615902ED954E00F21004C6D761FF520C9F -:104F2500929269D4FEC1DFF88EFD708EFCC1717A54 -:104F3500FA8FE4FB5C03D1DD114004F903DD064083 -:104F450004F904DF0530C2396194C09EFC609EFD02 -:104F550034D4FE5206C0B9A5A592DFF961FC61FC07 -:044F650061FC61FC8E -:0A4F6A0000060C12181E242A30362F -:104F7400ACFB0000000066FE00000000173B493750 -:104F8400BC231E476B2F1A305A46483CCE08093EB4 -:104F940028FC36FE20FE02F903F929FC30FE2AFC27 -:104FA4002BFC08F926FC6CFF1AFF6EFF6AFF64FFF6 -:0A4FB40027FC66FF2CFC55555555EF -:104FBE00FF0000000000983AF82AFF0000004700AA -:104FCE00317503F7332312D714AEF8C716AC061299 -:104FDE00C5AC0416F643DD078B99A7A5B3EFF5C252 -:024FEE00C6D724 -:024FF400325E2B -:0A4FF60031383A30333A303600000B +:10221A00E9E77F7E7D7C7A7978777675747271705A +:10222A006F6E6D6C6A6968676665646261605F5E3D +:10223A005D5C5A5958575655535251504F4E4D4B53 +:10224A004A494948474645434241403F3E3D3B3A59 +:10225A00393801020203030200FEFBF7F3F0F0F340 +:10226A00FA041225384D5F6E777A776E5F4D3825FE +:10227A001204FAF3F0F0F3F7FBFE00020303020282 +:02228A00010051 +:10228C008D3EB43ED1DF26CD3E1EFD4423FDE5221E +:10229C003132960D3104960931329A05713304EFBF +:1022AC0003713204FD1823FDBA22FD1B26D771538E +:1022BC0096D432DD05B43271529631229607313202 +:1022CC009A03715296715496714102314402057110 +:1022DC0040B3FBD77148B3FBD78D304B3CDC114A74 +:1022EC0030B9DE0C4A3F28DE03A43FD7713396D7B2 +:1022FC008D3D4B30DE054A30BDDC0C4A4028DE03F8 +:10230C00A440D7713296D7F43FF440D731429A0C9F +:10231C004A4102DE03A441D7712396D7313204120D +:10232C0040AFFB3CDE0C8FB2FB5C01D1DF047123B0 +:10233C0096D7712296F441D7C7C1FBF8FF31329A78 +:10234C00067130B3FBEF047138B3FB7144967137EF +:10235C009ADE4F71349A71419631329A0E5002C105 +:10236C005011FDD334C0CD3229EF37E0C15011FDEF +:10237C00D334C0F43217C15002FD632BC0D2DF0D31 +:10238C008B318E318D080E01081C00BD34AD3444E8 +:10239C00009BDC05D5AFFBDF095020C15011FDD3EC +:1023AC0034C0C0C6D78D209D42FDF323FD972BD59D +:1023BC0007F9DD04710396D78D424B2061F8316427 +:1023CC00961C716396FD87044A4207DD054A42FF5D +:1023DC00DF098F06F9310303FD8224FD9624710277 +:1023EC00963079256194D7C77162017172015003DF +:1023FC00FD110A5008FD5037629D305009FD5037D1 +:10240C006276716301711806F94A30F1DC0BE5074D +:10241C00F9F508F9CD3707EF224A3004DE1ACF0759 +:10242C00F9025008C1506CFD7F02C092DF0DD454EC +:10243C00DF09711006F9EF03F507F94007F901DF21 +:10244C0005710A22EF06710B22710302CD2007578A +:10245C0000674C08DE1073090A20614EDC05679D8D +:10246C0020EF0387EFEB4A2007DF09D507F961F866 +:10247C00CF07F903C6D7500AFD110A304000C150EE +:10248C0006FD462BC05096ED110AC72006FBF8FF3F +:10249C00D507F961E8ED7525304A57C1503EFD4628 +:1024AC002BC0D2DD077100B2FBED75257108B2FBB4 +:1024BC0017040200C15004C1500CC1506CFDA002A5 +:1024CC001006EA38AA48318D12AA48318E616B0881 +:1024DC00616A08C1500EFD462BC0F690C1500CFD30 +:1024EC00462BC0CC01008C014C04DE283134970201 +:1024FC00EFFA712297EA388C015010D605C15010B2 +:10250C00C18C01D6044000C1506CFD520310066111 +:10251C005901EFD250A5FD110AEA38AA48318D12A3 +:10252C00AA48318E616B08616A08C1500EFD462BBA +:10253C00C050A5FD110A5004C1506CFD7F02C06251 +:10254C009C01EA388A4B4E0161C3048A4A4E01173A +:10255C00040200C15004C1500CC1506CFD52031058 +:10256C0006F6C1503EFD462BC01006C6D7C78D439C +:10257C004B3061F8ED18264A4528DE05A445ED18C8 +:10258C0026F4458D309D438D305070D612307351EA +:10259C00230480001231FF318E039D449FAEFBF665 +:1025AC008D447C804C95DC1B8D44318F241400EAC7 +:1025BC0038BDD8AA44FDC40D1231FF318E03318FC2 +:1025CC0016EF198D44318F241400EA38BDD8AA4671 +:1025DC00FDC40D1231FF318E03318F16EA388A4259 +:1025EC007217F3031644000171FE61C836FF001721 +:1025FC0001DE02F61617BD7CC7500CFD462BC0D26F +:10260C00DF068D309D43EF047100B2FBF2C6D7C7D5 +:10261C002008FBF8FF4007F901DD064007F902DF4F +:10262C001C17040600FD692CD2DF0A8C069C058C55 +:10263C00079C04EF4ECC0563CC0400EF4617040650 +:10264C0000FD692CD2DD0F7100B2FB710396CC0535 +:10265C0000711297EF2D7108B2FB8C06318E318D03 +:10266C00080E07081C00BBEA388A4072ABFD170F36 +:10267C00BB8C019C05D1DF08CC0501CC0400EF0319 +:10268C008B9C0417040600FD742CD2DD06CC06C806 +:10269C00CC07008C069FB1FB8C06318E318D080E59 +:1026AC0007081C00BD34AD344401A5DC08CC036420 +:1026BC00F6BD46EF48AD3426464401A0DC08CC03F9 +:1026CC001EF6BD46EF37AD3444819DDC09CC030AC0 +:1026DC00C946F401EF27AD3444019BDC09CC03055A +:1026EC00C946F401EF17AD34440191DC09CC030069 +:1026FC00C946F401EF07711297C946F4013132044F +:10270C000C31249608CC0564CC0400EF0D8C034EE0 +:10271C0005DE078C039C05CC04008C059FAFFB8C5D +:10272C00049FB0FBFDF62B8D484E05DD2840AFFB1A +:10273C000BDE054A480BDE1440AFFB06DE054A48AB +:10274C0006DE09D5AFFBDF0DD448DD095020C150A2 +:10275C0011FDD334C08FAFFB9D48FD332C1008C640 +:10276C00D7C75601D837C15002FD7B2BC08F09F952 +:10277C003105075012FD110AEF0E500AFD110A71B6 +:10278C002010055008FD110A8D376C0870C15002DD +:10279C00FD7B2BC05003FD110A8D376C1870C15096 +:1027AC0002FD7B2BC05016FD110A5003FD8C2B62D1 +:1027BC005C01D1DD0F7170B3FB5002C15013FDD31E +:1027CC0034C056006672C6D7C75004FD8C2B625CB1 +:1027DC0003D1DD405014FD6B2834B3FB895C9F9909 +:1027EC008A0C7CFF50FF5C14D1DD228A0C7CFF5CD0 +:1027FC00147234B7FB89616A9971620756003162B1 +:10280C0007058666D1DFF7716307716B2734C6FB4A +:10281C00895CEB995002FD8C2BD2DD398D376C1015 +:10282C0070C15002FD7B2BC0E0FD110AD837C1509E +:10283C0002FD7B2BC05033FD110A8F09F9310309BE +:10284C0071281005500AFD110AF0C15002FD7B2BB6 +:10285C00C07178B3FBE0C15013FDD334C0C6D7C7E9 +:10286C00C12004FBF8FFCC02005004FD8C2B629CB1 +:10287C00038C045C20D1DD0E8C036C019C038C0258 +:10288C006C209C02EF138C045C10D1DD0C8C035C6F +:10289C00FE9C038C026C109C028C045C08D1DD0E37 +:1028AC008C036C029C038C026C089C02EF138C044E +:1028BC005C04D1DD0C8C035CFD9C038C026C049CD1 +:1028CC00024008F903DF088C03D161E8CC03028CC9 +:1028DC0003D1DD05501AFD110A8C0370C15004FDA3 +:1028EC007B2BC08FB3FB5C9F728C03318E316D14CC +:1028FC008C03318E314D616D08616C5C606162627C +:10290C009FB3FB8FBFFB7CFF50FF5E02D1DD278F97 +:10291C00BFFB7CFF5E027234B7FB89616A997162FE +:10292C0007CC0100316207086159018C01D1DFF439 +:10293C00716307716B27F21006C6D7D9A7FBC1507C +:10294C0006FD7B2BC0D9A8FBC15007FD7B2BC0D744 +:10295C00FD4729F2D7C716664C02DD044C04DF088C +:10296C00CD3A10CD3B0BEF05F43ACD3B0FC6D7C794 +:10297C00711300711B20710303710205E0C1500338 +:10298C00FD7B2BC05013FD110AD83AC15005FD7BBD +:10299C002BC0D83BC1E0FD7B2BC0500AFD110A7146 +:1029AC0003055008FD110A8D3B6C1070C1E0FD7BD6 +:1029BC002BC05012FD110A5003FD8C2B625C01D10F +:1029CC00DF03E2EF12F0FD8C2B629D363602F9C765 +:1029DC005008FD632BC0F2C6D75003C1FD7B2BC042 +:1029EC00710203711A20FD232BF431D75003FD8C97 +:1029FC002B625C01D1DD155014FD6B28FDD42750E2 +:102A0C0014FD110AE0C15003FD7B2BC07113007142 +:102A1C001B207103035014FD110AF0C1E0FD7B2B48 +:102A2C00C0F0C15003FD7B2BC0D7C72004FBF8FFBF +:102A3C00CC02008D319C035010C150A4FD7F02C00C +:102A4C00629D31D454DD04F2ED002B8C037B315CA0 +:102A5C0008D1DD0F8D315C08D1DF05CC0210EF03FE +:102A6C00CC02208C037B315C04D1DD158D315C04F0 +:102A7C00D1DF088C026C049C02EF068C026C089C63 +:102A8C00028FB2FB5CF3728D315C0C6162629FB29F +:102A9C00FB8FBEFB7CFF50FF5E029C02D1DD1F341E +:102AAC00B6FB896E0299716207CC0100316207088E +:102ABC006159018C01D1DFF4716307716B278D3182 +:102ACC005C40D1DD095002C15012FDD334C08D31B0 +:102ADC005C01D1DD08E0C15012FDD334C0717AFA2B +:102AEC008D315C41D1DD0C5A31BED831C15010FD55 +:102AFC00C747C0F21004C6D7FD6D27F2D7FDD42707 +:102B0C00F2D7C78FC6FB7617FD6B28664FC6FBDF67 +:102B1C00F2F5C6FBF2C6D75064FD110AFD7F2C629C +:102B2C0061FB711196F171149661DC70C15012FD4C +:102B3C00C747C0FD8136CD6303D7C7C1C1FBF8FFC2 +:102B4C00AC0ABB17C15002C18C0270C1506CFD5253 +:102B5C000310061004C6D7C7C1FBF8FFAC08C15060 +:102B6C0002C18B70C1506CFDA0021006C0C6D7C745 +:102B7C008806166770C1C75084FD1B031004C6D7A6 +:102B8C00C716C75084FD7F02C0C6D7C74A2004DED3 +:102B9C00045600EF0256018F08F9318FE72400002C +:102BAC00DD1A23DD0B23DD0C23DD1123DD0CEF0CF3 +:102BBC008686EF0851046106EF02868666318F1215 +:102BCC00504CD633514CD6610A045420BD384008C1 +:102BDC00F902DD064008F904DF08CD3C54CD3D4434 +:102BEC00EF06CD3C4BCD3D3DC6D740AFFB3DDC05A4 +:102BFC00CF04FC0FD740AFFB1FDC05CF04FC0BD779 +:102C0C0040AFFB0BDC05CF04FC07D740AFFB0661E4 +:102C1C00D831320405CF04FC03D7D5AFFBDD04E576 +:102C2C0004FCD7F504FCD7D504F9DF04717396D7EF +:102C3C00FD7F2C6261FB710197711496710797618E +:102C4C00C831729617717296710497711196F17161 +:102C5C00049761DC70C15012FDC747C0D7C716C7B7 +:102C6C005004FD632BC0C6D7C716C75002FD632B9B +:102C7C00C0C6D740AFFB0BDE02E2D7F2D771000122 +:102C8C000571785005713AD5713BD18F10055CFCFC +:102C9C009F1005CF54054AE542057110420571009D +:102CAC004205714850057130500571205005CF53C5 +:102CBC000509CF52050B7130510571205105713B3F +:102CCC00D5717050058F11055CFC9F1105F422D74E +:102CDC007178500571080105D7FD7B38FD870471AB +:102CEC007AFAFDB123F504F98F06F931051B50036F +:102CFC00FD8C2B625C01D161E8CF04F902CFAFFBF4 +:102D0C0064710407714196EF10F67104076110129B +:102D1C00F6B1236061FB714196FD8E30FD6B437102 +:102D2C002299712BE7618461A461EDEFF8D7C78814 +:102D3C00061666614FDD0967614EDE0396EF01866C +:102D4C006672C6D7C7161714AA0412A943DD29AA9E +:102D5C000412A923FDF44EC3AC02FDF44E13C2BD04 +:102D6C00D813FD940FDE0C1714AA0212AA0403BA8E +:102D7C0004EF051714A9BA04AC041231FF319E03F9 +:102D8C00317F087208C6D77100F200304400BFB61C +:102D9C0001300188BF9001300984BF9E01BF9C01A6 +:102DAC00BF9A01BF9801BF9601BF9401BF9201F574 +:102DBC003CFF30FE00BFBE01F6BFBC01BFB80150E6 +:102DCC00EEBFBA01A1BFB201C918FE008F06F931DE +:102DDC000507F5CDFBCB6CFF00717397716297D72C +:102DEC00C72004FBF8FF3026FBBC02F6BBAB4464E7 +:102DFC0000DE0EAC0214CA0000617902617900EFAA +:102E0C00EC1004C6D730EF00BFB401F6BFBA0171A5 +:102E1C0008F200712304715307BE6EBE64BE6A7162 +:102E2C002304715307715BD1F457F456716397D730 +:102E3C008D58B458D1DF6931D4D105715BD1E457C9 +:102E4C00D457DD2E7140B2FBD856F1E73402002383 +:102E5C00DD0625DD0325DF05F6BE66EF06D9CCFBC6 +:102E6C00F1BE66A4564A5620DF04F456F457CD58EA +:102E7C0019D7CD581E7148B2FBD5CEFBDF04F6BE78 +:102E8C0066D7D9CCFBF14266FFDD15D9CCFBF1122C +:102E9C00AE6643DE05A266FFEF03B266FFCD5803B4 +:102EAC00D7C7161714F6B9AA0412F6231231FF313C +:102EBC00AE03316FBA02C6D7C7C1FBF8FF8C0850FE +:102ECC0080D612AB1413B9AB14AA0412A92312D9CD +:102EDC0027FBF133BDD813FD000EBA02C0C6D731A3 +:102EEC00049801D74004F902DF10F6BE64BE6EBE32 +:102EFC006ABF8EFBBF94FBBF9AFB31749714308A68 +:102F0C00FBFDAD2E3090FBFDAD2E3096FBFDAD2EB6 +:102F1C00EF713114980D7113987108D2FBF45AF4B7 +:102F2C0059EF60D459DF5A8F26FB9D594A5A1FDC42 +:102F3C00177100D2FB4028FBFFDD1CA45B8F28FB24 +:102F4C004B5BDE13F45AEF0FD85AF1A1605C1F9D56 +:102F5C005A7108D2FBF45BE85A092AFB70C1308A1B +:102F6C00FBFDC42EC0E85A094AFB70C13090FBFD32 +:102F7C00C42EC0E85A096AFB70C13096FBFDC42E02 +:102F8C00C0B459308AFBFD502DF313BE6E3090FB4C +:102F9C00FD502DF313BE6A3096FBFD502DF313BE7E +:102FAC0064D7C736F00071F4DC297170F000CE9D47 +:102FBC0008CE9EC0CE9F80F594FFF593FFF592FF4F +:102FCC00E597FFE596FFE595FFE598FFCE9C7F71B1 +:102FDC0000A6FB711BE3712BE3711AE7712BE771F0 +:102FEC007A9D710A9E31929E02EFFA710B9E7123AB +:102FFC0098713398714398C6D7C73122981E7122A5 +:10300C0098710A9E31929E02EFFA34D4FB3692FFED +:10301C0052078B99A5A792DFF9710B9EC6D7C7886B +:10302C00061631329815713298C7349CFB3092FFDA +:10303C001652078B99A5A792DFF9C6667367189C81 +:10304C00FBC6D7C77123983134981E713398710A17 +:10305C009E31929E02EFFA3492FF369CFB52078B04 +:10306C0099A5A792DFF9710B9E314498137143987F +:10307C00717B9E8FDCFB9E9A8FDDFB9E9B717A9EF3 +:10308C00C6D7CFA7FB5CCFA8FB5FCFC8FB5DCFFC3F +:10309C00FB36CFFDFBC9D7C7CFA4FB12CFA5FB30A6 +:1030AC00CFCCFBFFF5CDFBF5CEFBF5CFFBF5D0FB85 +:1030BC005600664C64DE08723826FB0086EFF3F58A +:1030CC00E3FB714A9D712B21710A20711A20710248 +:1030DC0003C6D7C788061617F1E73403002361E34C +:1030EC00ED0B342361F8EDE232B12361E3EDEC3208 +:1030FC002561F8EDFA32B1240D0061D8ED0B3424C2 +:10310C000B0061F8EDD4312361F8ED17322361F82F +:10311C00EDE7312361F8ED043424060061F8ED96F7 +:10312C0032B12561D8EDB23224000061F8EDBF3226 +:10313C002361F8ED0B342361F8ED0934B12361E31D +:10314C00ED1A332361F8ED2B332361F8ED3C332377 +:10315C0061F8ED2B332361F8ED4D332361F8ED5E0F +:10316C00332361F8ED6D332361F8ED8F332361F870 +:10317C00ED9A332361F8EDA5332361F8EDAD3324DB +:10318C0002002361E3ED0B342361F8EDE13323619D +:10319C00F8EDB5332361F8EDC0332561F8EDCB3391 +:1031AC00B124060061D8ED0B3424000061F8ED0D5C +:1031BC00342561F8EDD63324120061F8ED903223FA +:1031CC0061F8ED8032ED0D3467D1DD0C30B53B612B +:1031DC009434C4FB89616F99ED1734675C02D1DDBF +:1031EC000730042B6194EF0B675C01D1DD053009CE +:1031FC002B6194675C3CD1DD0F300E2B6194675CC6 +:10320C003C7266736218A4FBED173467D1DD625C07 +:10321C0001D1DD05300800EF01F6609F01FC675C11 +:10322C0002D1DD03E6EF01F63401FC896168996790 +:10323C005C04D1DD04E6A1EF01F63401FC89616880 +:10324C0099675C08D1DD05302000EF01F63401FCF4 +:10325C0089616899675C10D1DD05301000EF01F6CB +:10326C003401FC89616899675C20D161E871600167 +:10327C00FCED17344A5CC8DE08E85C67185AFAA4FF +:10328C005CED1734679D5CED1734D44ADF08679FFB +:10329C00CDFBA44AEF0D4A4A05DE08E84A6718112F +:1032AC00FDA44AED1734675C0F7266736218A4FBB9 +:1032BC00ED17344A4A64DE1B4A4A01DF0667D161C6 +:1032CC00F85701E84A671826FBA44A4A4A0561C820 +:1032DC00711298ED173434A6FB89615F99ED1734A0 +:1032EC00305C29619466736718A4FBED173440A910 +:1032FC00FB6ADF1340AAFB68DF0D674C6CDF0830FC +:10330C00A8406194713AD5679FABFBED1734675CAD +:10331C007F70C117F1243000FD2A30C0ED173467DF +:10332C005C3F70C117F1243000FD2A30C0ED17341A +:10333C00675C0770C117F1243000FD2A30C0ED170F +:10334C0034675C1F70C117F1243000FD2A30C0EDCA +:10335C0017346770C117F1243000FD2A30C0ED1707 +:10336C0034CEABAC710A9E31929E02EFFAD592FF2D +:10337C00DF05710B9EEFED679E99710B9E9FDBFB3A +:10338C00ED1734714298675C7F9FDCFBEF7D7142D7 +:10339C0098675C3F9FDDFBEF72675C3F9FDEFBEF46 +:1033AC006A675C1F9FDFFBEF62305F396194679F38 +:1033BC00E4FBEF57302C396194679FE5FBEF4C3001 +:1033CC0045396194679FE8FBEF41675C01D1DD3BB8 +:1033DC00FD6B43EF36675C02D1DD05712A21EF06E8 +:1033EC00714A9D712B21675C01D1DD06710300715F +:1033FC000B20679FE3FBEF1367318EEF0EEF0CEFA3 +:10340C000A664C5BDE05736718A4FBC6D7C7166645 +:10341C004C30DC094C37DE05FD0530EF6B664C0299 +:10342C00DF1F8FA6FB5C03728F03FC5C03318E31B4 +:10343C006D08616A08128F03FC5C80312A6162EFAF +:10344C0056664C3DDF08AE90BD5EF85EEF49664CAB +:10345C003EDF04F85FEF40664C4FDF05FD9343EF12 +:10346C0036664C61DF08E85C095AFA72EF29664C43 +:10347C007FDF05FD2B3CEF1F664C4EDF0B31049AB2 +:10348C00045210EF12F2EF0F664C5BDC0452FFEFAC +:10349C0006667309A4FB72C6D7C788061617F124F3 +:1034AC001000240500DC07244C00DD17EF17717B9E +:1034BC00FA17F104A4FB1489617F99717AFA71529D +:1034CC0098EF02A45CC6D7C7C1C1FBF8FF4004F952 +:1034DC0003DD064004F904DF38717BFA8C027309B2 +:1034EC00ACFB5E0AD1DF278C02318E04A4FB14895D +:1034FC006E0A99716207717AFACC01003162070881 +:10350C006159018C01D1DFF4716307716B27717AFA +:10351C00FA1004C6D7CF03FC03F501FCF505FCF546 +:10352C0007FCD7C788061617F1E734020025DD3DE6 +:10353C0023DD1725DD1C23DD0523DD2BEF3B71027D +:10354C0099679F06FCCD6303EF2F675C839F03FC99 +:10355C00EF27675C039F05FC675C034C0261F87105 +:10356C00229AFD8145EF12679F07FCEF0C6791DFF4 +:10357C0008E0C15012FDD334C0C6D7C71617F1E707 +:10358C00240000DD2A23DD1E240300DD0724FB00BC +:10359C00DD24EF2531329A05308000EF01F6086FFB +:1035AC0004FC7208EF198F01FCF501FC72EF10712D +:1035BC0052995235EF09F2EF0666730900FC72C698 +:1035CC00D7C71617F1E7240000DD38241000DD1CE6 +:1035DC0023DD1C23DD30240E00DD18241100DD1B3F +:1035EC00240F00DD12243000DD15EF1EE2EF1D521A +:1035FC0002EF195204EF155206EF115205EF0D525E +:10360C0007EF09F2EF065203EF0252FFC6D7C7319C +:10361C006498377163988D629FACFB8D619FCBFB77 +:10362C0036D2FCC7D861FD8137618A70618AFDC6CC +:10363C0037C0D866F1312F609D658D604B65DD0A12 +:10364C007172988D659D60CD63034A6305DE083009 +:10365C008B366194CD636BB4637150F000CE300B3C +:10366C00CF170006CE3106FD5A02717A30710BE38A +:10367C00710BE7C6D78D659D608D659FADFBD740FF +:10368C0004F903DF064004F904DF02F2D731749821 +:10369C000C7173987113998D659D67EF3131049995 +:1036AC001F710399711299D506FCDF04F468EF0AB7 +:1036BC008F06FC5002D6A1609D688D689D67EF0E49 +:1036CC00311499068D689D67EF048D659D678D6734 +:1036DC009FADFBD867FDF336E867091C2270C1501B +:1036EC0013FDC747C0F2D7C7C1C1FBF8FF8C02D18D +:1036FC00DF05F506FCEF1A8C024C05DE06CF06FC46 +:10370C0002EF0E8C02318E1231FE03311F609F06C8 +:10371C00FC8D694F06FCDD28CC011F8F06FC9D69D2 +:10372C00CC00008B4C08DE148B730912204F06FC66 +:10373C00DC058B9C01EF05615900EFE78C019D6462 +:10374C001004C6D7C716710AE7710BE37150F0006D +:10375C00CE300BCF170006669E31FD5A02717A30BF +:10376C00710BE33182E302EFFA8D1F7158F0007197 +:10377C000BE772C6D7C7C1C1FBF8FF8FFCFB4E022B +:10378C00DC03F2EF318C024FFDFBDC0452FFEF2621 +:10379C008C022FFCFB706131318D128FFDFB2FFCE5 +:1037AC00FB70613133BDD813FD220EBB440001DC2C +:1037BC0003F690BB8B721004C6D7C7C1FBF8FFACE5 +:1037CC000814A91489708B6128706131FDF44E13B3 +:1037DC0044030071FEDC23AC08148A04819A04AC07 +:1037EC0008148A044C11DC10A9148B99AC0814CA67 +:1037FC000200AC0814CA0310EF72AC0814CA04001F +:10380C00AC0814A914894DDE0AAC08148A02819AFA +:10381C0002EF12AC0814A914894D61D308AC08143A +:10382C008A02919A02AC08148A03919A03D1DF3C64 +:10383C00AC08148A024C10DF10A91489318EA11225 +:10384C00AC0814A9146299EF17AC08148A024CF056 +:10385C00DF0EA91489318EB112AC0814A914629927 +:10386C00AC0814CA0200AC0814CA0310C0C6D7EDC9 +:10387C007E38C75600664C0ADE0BF0317E12F678A5 +:10388C0010FC86EFF0C6D7C7200CFBF8FF17040618 +:10389C0000C15006C150A8C15030FDA0021006D284 +:1038AC00DD1B4A6C04DE05A46CE2EF7034E4FB898A +:1038BC005CFC99FD5F397110B2FBF2EF5F717BFA22 +:1038CC00300600C117040600C130E9FBFDFC4E10A8 +:1038DC0004717AFAF46C8FE4FB5C01D1DD264004B0 +:1038EC00F903DF205010C180FDD334C0C73610055A +:1038FC0071D4C6DE0F17C15006C150A8C15030FD9F +:10390C00A00210064004F903DD064004F904DF0BA5 +:10391C008FE4FB5C02D161E8FDAD40F2100CC6D720 +:10392C00D9E5FBC15030FD7F02C0629FE8FB500817 +:10393C00C15011FDD334C0F2D7D9E8FBC1D9E7FB94 +:10394C00C15030FD1B0310045008C15011FDD3347D +:10395C00C0F2D7C7200CFBF8FFCC09004007F901D7 +:10396C00DF05CC0A02EF03CC0A10CC0B808FE4FBF2 +:10397C005C039C07D1DF08717AD5CC0807EF067180 +:10398C007BD5CC082F17040800C15004C150A0C12E +:10399C005030FD52031006624C02DF077110B2FB6F +:1039AC00F2EF357118B2FBF46CC736100571D4C642 +:1039BC00DE164004F903DF1017A1C15006C150A850 +:1039CC00C15030FDA0021006717BFA8FE4FB5C0342 +:1039DC004E07DD03E2EF01F2100CC6D7D504F9DF78 +:1039EC0003F6BD6E4004F901DD0AD478DD03B4782A +:1039FC00D7CD78038F04F9318FE723DD51240200F2 +:103A0C002361D30423DD47D7FDF73A31029B01D75D +:103A1C0031629A194A7005DE16A4704A7005DF0FE0 +:103A2C00A4705004C15010FDD334C0EF02F47031B7 +:103A3C00649A194A7205DE16A4724A7205DF0FA445 +:103A4C00725008C15010FDD334C0EF02F472FD5E09 +:103A5C003AD78F06F9312349301B00466EDF158F9C +:103A6C00E3FB5C01D161E8F504F9E0C15010FDD332 +:103A7C0034C0EF1D307701466EDF165002C1501076 +:103A8C00FDD334C0F64674DF088FC8FB5010D6BD8A +:103A9C0074F64674DD36B6744674DF30711297EFE7 +:103AAC002B301B00466EDF13F64676DF18E0C15054 +:103ABC0010FDD334C0C9765307EF0A307701466E38 +:103ACC0061F8711297F6467661E8B67631549A072A +:103ADC00714399F6BD6ED731449904F6BD6ED7A6E5 +:103AEC006EF6466E61F8C96EFFFFD7D473DD03B472 +:103AFC0073D731729A174A7105DE14A4714A710595 +:103B0C00DF0DA4715010C1FDD334C0EF02F4714A23 +:103B1C00710661F8CD7325D7C736100571D4DE0E4A +:103B2C008FB2FB5C02D1DF063093386194D2400433 +:103B3C00F903DF1C3122070530362A619431549980 +:103B4C000C7153995080C15012FDD334C0FD613BB0 +:103B5C00FD873BC6D78F03FC5C01D1DD1DD47BDD1B +:103B6C0003B47BD7CD7B098D644B7ADD0D8D649DC1 +:103B7C007A5040C15012FDD334C0D74004F903DD54 +:103B8C0004F6BD1AD7D5D0FBDF08F6461ADD19B6F8 +:103B9C001AD7D9CCFBF1461ADD0ED9CCFB12AD1AD3 +:103BAC0043DE03A61AD7B61AD7717BFAC78FC4FBAC +:103BBC0076F5C4FB717AFA5C10D161E87162996692 +:103BCC005C0FD1DD57665C01D1DD05F504F9EF4CD6 +:103BDC00665C02D1DD11E0C15003FD7B2BC071137B +:103BEC0000711B20710303665C04D1DD117113009D +:103BFC00711B20D503FC61F8710303FD2135665C54 +:103C0C0008D161E87103035005FD110A71020350DC +:103C1C0003C1FD7B2BC0711A20FD232BF2C6D7C725 +:103C2C0056FF4A4A1361C8EDE13C8F06F931150580 +:103C3C00300400EF0F8F06F9314505300500EF0415 +:103C4C00D907F9F1609F28FC8D7C9F29FC71349673 +:103C5C00E661301271049661DC31196162629F2A4F +:103C6C00FCE52BFC31449A05304000EF01F6C131E4 +:103C7C00340405302000EF01F6C2616B08616A085C +:103C8C00C131749A05300400EF01F6C2616B086112 +:103C9C006A08C131649A04E6A1EF01F6C2616B08AF +:103CAC00616A08C131549A03E6EF01F6C2616B08F0 +:103CBC00616A9F2CFCF171240461DC9F26FCF1717C +:103CCC00540761DC9F27FCD84AF10104ECFC14A9D1 +:103CDC00148976A44A6672C6D7FD35098F04F9316A +:103CEC008FE724000061F8ED433E23DD1B2361F8D0 +:103CFC00EDC63D2361F8ED123E2361F8ED293E231C +:103D0C0061F8ED893EED403EF6BD747113974005A8 +:103D1C00F901DF1831349A07FDF03E92DF04D7FD2C +:103D2C00B123AD6E440A0061D8EDEF3E714299FDAE +:103D3C008704716396FDB1234007F903DF077122F5 +:103D4C0099F504F9D7FD1B2640B1FB9BDE077122C8 +:103D5C0099F504F9D7714A27714011057130110595 +:103D6C00713A22715A2271501105FD7B29D2DD075F +:103D7C00712299F504F9D7FDE52971103500CF377B +:103D8C00001D714012055032FD110AFD3509400825 +:103D9C00F903DF09FD7C3F9261F8EDEF3E4005F938 +:103DAC0001DD064005F903DF05F5CDFBEF04CFCDB2 +:103DBC00FB03CF04F902FD4729D7FD892CFDF5043F +:103DCC00FD2135FDA330F537FF712BE0F505F971B9 +:103DDC002299CBE43FEFCBE6F6F0FD8704713BD4A0 +:103DEC008F06F9310503FD6340FD932D710806F92B +:103DFC00CF04F9038FA6FB5C02D1DD095080C150C2 +:103E0C0010FDD334C0D7FDFA3FFD0F3FFD8E408F20 +:103E1C0006F931250731349A03F504F9D7FDFA3F39 +:103E2C00FD433FFD8E408F06F931250731349A034F +:103E3C00F504F9D7F504F9FDE33FD261E8EDEF3E67 +:103E4C00F6BD74711397F5E4FBFD5F39717AFAFDD9 +:103E5C00112EFDDC2CFD4705712B21714B9D31344E +:103E6C009702EFFAFDC13F716A27FDF829FD8E3FDD +:103E7C00CF04F905714299F6BD6EFDFE09F505F901 +:103E8C0031349A04D432DD1FE505F9E504F98F06C7 +:103E9C00F931254FF5F8FBF5F6FB502EFD110ACF45 +:103EAC0005F903E504F9D7FDDB04FD442371730127 +:103EBC00713204714302710396FD5D3FFD3509F4C7 +:103ECC006A71629631329A06CF04F905EF09714393 +:103EDC0099E505F9E504F9712BE78F06F93125030E +:103EEC00F504F9D7F6466EDD04F424EF02A4244A57 +:103EFC002465DC0BF6BD6EF504F9712299E2D7F45A +:103F0C0024F2D73164992FA47ED47EDD0831A4E04D +:103F1C000A31020C06712BE0FD994031A4E01731F7 +:103F2C00040C13712BE05027C15005FD7B2BC0CF27 +:103F3C0004F904712299D731020C15D83AC15005F5 +:103F4C00FD7B2BC05005FD110AFD9940CF04F903F0 +:103F5C00D731949E02EFFA712AE7CEA409F5F3004B +:103F6C003104070261FDE5F300FD5A02CEA408D727 +:103F7C0031029B0C31649A08712299F504F9E2D74D +:103F8C00F2D7714307714B27714810057148110521 +:103F9C007138100571381105713302713B22715360 +:103FAC0002715B227158100571581105CF37000949 +:103FBC0071481205D7CE3708CBE4BFFFCBE6FFF331 +:103FCC00CED4FFF5B4FBF5B5FBF5B6FBF5B7FBF6B8 +:103FDC00BEE0BEE2BED0D7CFCDFB03F5CEFBF5D015 +:103FEC00FB717297F6426CFFDD02E2D7F2D78FE3DA +:103FFC00FB5C01D1DF60D47FDF1931020058500324 +:10400C00FD8C2B625C01D1DF07F504F9712299D785 +:10401C00E47FD74A7FF0DF073104003AF47FD74AB8 +:10402C007FC8DF0AF504F9712299CD7FF0D73102F0 +:10403C0000084A7FFFDD1FA47FD7F0C15004FD7B31 +:10404C002BC08FB3FB5C9F9FB3FB7110C4FB30B5CF +:10405C003B6194CD7FF0D7C75004FD8C2B625C0381 +:10406C00318E315D34B3FB896168995002FD8C2B24 +:10407C00D2DD067170B3FBEF047178B3FBFDB12395 +:10408C00C6D731149706F504F9712299D771639943 +:10409C00F47E717207FD5A02717307D7FD5005F259 +:1040AC00D7717BFAC7200CFBF8FF8FEAFBF0F9E91C +:1040BC00FBF303FDF44E13BC048FECFBF0F9EBFBAC +:1040CC00F303FDF44E13BC028FEEFBF0F9EDFBF3A2 +:1040DC0003FDF44E13BB717AFAAC04BDD8F6BDDA0D +:1040EC00AC04311EBDDCF6BDDEFDD50DADD8BDDC9E +:1040FC00ADDABDDEAC02BDD8F6BDDAAC02311EDAEB +:10410C00DCC3DADEC3BDDCF6BDDEFDD50DC0BDDE25 +:10411C00C0BDDCADDEFD4B0FADD8BDDCADDABDDE18 +:10412C00ABBDD8F6BDDAAB311EDADCC3DADEC3BD0B +:10413C00DCF6BDDEFDD50DC0BDDEC0BDDCADDEFDEB +:10414C004B0FDADAADD8FD7C44C3C58D8C5C3FF0E7 +:10415C00317E0440FC14C2C0B9A48CF6BC08BC0A65 +:10416C009C078C074C2EDD3D8D8C0E0770F161DCAD +:10417C00605C3FF0317E127940FCBDD8F6BDDA8C24 +:10418C000773095C22318FBDDC70BDDEFDD50DAC33 +:10419C0008BDDCAC0AFD4B0FADDABC0AADD8BC08CF +:1041AC00615907EFBDAC08BDD8AC0ABDDAC9DC005B +:1041BC0004F6FD9F0EC9DCFFFFF6FDA00FADD8BDC8 +:1041CC0086AF3AFC4686DD11AF3CFCBF3EFCAF3AF5 +:1041DC00FCBF3CFCAD86BF3AFCAF3CFC423EFCDC79 +:1041EC0046AF3AFC423CFCDE3EAD26423AFCDE37A2 +:1041FC004A2A16DC1A4A2AA0DE138D884B2ADE0DB9 +:10420C00AF3AFC268A44691061C8FD6542F42AAFB6 +:10421C003AFC445146DC0AAF3AFC241027BD28EF87 +:10422C000DC928F82AEF074A2AFF61E8A42AAF3EF5 +:10423C00FC423CFCDC18AF3CFC423AFCDE10AF3AD2 +:10424C00FC4628DE09F488AF3AFCBD8AEF074A88A1 +:10425C00FF61E8A488100CC6D7717BFAC7710A9E5F +:10426C0031929E02EFFA8E949F34FC8E969F35FC11 +:10427C008E979F36FC8E989F37FC8E939F38FC8EC2 +:10428C00929F39FC710B9E717AFA8F37FCFDB40F3B +:10429C0076FDFA4313BD84D5EFFBDF0AD5F0FBDFC7 +:1042AC0005D5F1FBDD25F6B14684DF11C984372233 +:1042BC00665C0391DF060A84181A85009617FD1DAB +:1042CC004513FD3D4331049A02EF61520692926907 +:1042DC0034FC682EFCDFF6AD84BD82F880F3311C13 +:1042EC00790AF944FEFFDD44D880F101040AF9147F +:1042FC00A944FFFFDF04E6B9EF0BD880F101040AF3 +:10430C00F914A9A1B9717BFAA0EFFBD5EFFBDF1C67 +:10431C00A0F0FBD5F0FBDF14A0F1FBD5F1FBDF0C1B +:10432C00CFEFFBFFCFF0FBFFCFF1FBFFC6717AFAAB +:10433C00D7C716D880F10744A800DC0571029AEFA4 +:10434C001CF647DD18A4804A80A8DC0571029AEFA0 +:10435C000CF880F3311CF6780AF9B7EFE4C6D7C72E +:10436C0056A89666F0317E12F6B1780AF966D1DF5E +:10437C00F1717BFAF5EFFBF5F0FBF5F1FBF48071D5 +:10438C00039AC6717AFAD7C72004FBF8FFD44ADF28 +:10439C00168D809D8D717BFA52069292692EFC6867 +:1043AC00C0FCDFF6717AFA4A4A06DE0EE84A09C00A +:1043BC00FC9C03A44A8C0372EF30F88DF3311C790A +:1043CC000AF9BB31129A058B9C03EF0F8C019C03ED +:1043DC00D48DDF05CD8DA7EF02B48D718071179A46 +:1043EC0061DC61FB71119A8C03721004C6D7C72073 +:1043FC0008FBF8FF8F37FCFDB40F9C078F36FCFDD4 +:10440C00B40F9C068F35FCFDB40F9C058F34FCFD5E +:10441C00B40F9C048F38FC9C038F39FC9C028C06D7 +:10442C00318E0112791A20BB8C075C03D1DF098C09 +:10443C00064C0361C86179008C05318EB1610900AD +:10444C00BB313D120103BB8B0E04708C011C00BBF5 +:10445C008FF4FB4E03DC0E8C034FF4FBDC0B8C0255 +:10446C004FF5FBDC04AB12EF03ABB1121008C6D74F +:10447C00C7C3C12008FBF8FFF661490A61F861491E +:10448C0008DF07F7340000ED1945E6BC04F6BC065E +:10449C00AC0ABC02AC08BBAC06614902AC0461F8C6 +:1044AC00614900DE28AC04BDD8AC06BDDAE1FD5A8A +:1044BC000FADDABC06ADD8BC04ABBDD8AC02BDDACE +:1044CC00E1FD750FADDABC02ADD8BBEFCAAC06BCD2 +:1044DC0002AC04BBAC08BDD8AC0ABDDAAC04BDDC84 +:1044EC00AC06FDD80EAC04BDDCAC06FD4B0FE1FDFB +:1044FC00750FADDABC06ADD8BC04AC06614902AC94 +:10450C000461F8614900DCC5AC0214AB12100CC696 +:10451C00D7C7C12004FBF8FF8F31FCFDB40F9C03FF +:10452C004E04DF1CAD824684DE07AD84268212EF7A +:10453C0040F64684DF074682DD03E7EF34F7EF31C0 +:10454C008C04318EB1128C03318E43DF183038223B +:10455C0026820684BB8C045C0391DF05AB04180037 +:10456C00BBAB12EF0C8C034E04DE0532A900EF013D +:10457C00F71006C6D7717BFA31229A0CF64690DDFD +:10458C0007B690717AFAEF7C71239A717AFA40042B +:10459C00F904DF07715307F42CEF69D9CFFBF1E76E +:1045AC00240000DD0F23DD1A23DD1023DD5323DD72 +:1045BC002723DD38715307F42CEF49715207F42C83 +:1045CC00EF42D42CDF07715207E42CEF057153072F +:1045DC00F42CC990FA00EF2CD42CDF0B715207E4A9 +:1045EC002CC990FA00EF1DF5CFFBEF18D42CDF0B84 +:1045FC00715307E42CC990FA00EF09CFCFFB02EFFF +:10460C0003FD1146D7D905FCF1E7240000DD092391 +:10461C00DD2123DD0923EF1B715307F42CD7D42C98 +:10462C00DF07715207E42CEF05715307F42CC99086 +:10463C002D01D7715207E42CD731629701D7710342 +:10464C0098D9CDFBF1E7240000DD1223DD1923DD21 +:10465C001123DD2623DD3423DD3923DD3FFDD14657 +:10466C00EF3DFDF246EF38D9CCFBC1AE6CFD3A2DD7 +:10467C00C0F313BE6C712304EF25F0C1AE6CFD3A90 +:10468C002DC0F313BE6C712304EF14F6BE6C7122B3 +:10469C0004EF0CCB6CFF00712304EF03FD66474065 +:1046AC0004F905DD064004F901DF067123047103EA +:1046BC00983104980FF6BE64BE6A31220402EF02F0 +:1046CC00F690BE6ED7CD2E47F492AE6C317DBFCA3C +:1046DC00FCFD3B47D2DF0ED9CCFBC1AE6CFD3A2DB5 +:1046EC00C0F313BE6CD7FD3B47D2DD0DCD2E47F486 +:1046FC0092AE6C317DBFCAFCD7E892093420508051 +:10470C00D6BFC6FC22CAFCBDD8304700FD000EBF88 +:10471C00C8FC30C6FCFD502DF313BE6CB42ED42E49 +:10472C00DF0CCD2E47A4924A921F61C8F492D74059 +:10473C00AFFB0BDC05712304F2D740AFFB0661D84D +:10474C0031229611F0C1AE6CFD3A2DC0F313BE6C44 +:10475C00712204EF03FD6647E2D7710298F0C1AEF7 +:10476C006CFD3A2DC0F313BE6CA4934A9340DC3716 +:10477C00F493D894F1313F0412FD14D894F1BDD8C0 +:10478C005008FD4F0E087208E6D2DD040192DFFCE2 +:10479C00896158D1DD05712204EF03712304A494BF +:1047AC004A942061C8F494D7C73026FDC6D77180CF +:1047BC00717DFADE035201D75200D7C7C12004FB2A +:1047CC00F8FF17040300C1E0C15010C150A4FDA0B4 +:1047DC00021006629C02D1DD058C0272EF518C0C2A +:1047EC0070C18C0470FD3F48C0629C02D1DD058C09 +:1047FC000272EF3B8C035C7DD1DF03F2EF3117A12A +:10480C00C1E0C15010C150A4FDA0021006629C0270 +:10481C00D1DD058C0272EF178C015C7DD1DD03F2CA +:10482C00EF0D8C0370C15010FD3F48C0629C02100C +:10483C0006C6D7C7880616710AE650A4FDD403D263 +:10484C00DD077133975202EF1317FDF0036770FD0C +:10485C00F003FD6A48FD6404713397F2C6D7FD3B43 +:10486C000450A4FDF0035020FDF00350AAEDF0031A +:10487C0061FC61FCC1C3C5C7520C929269D4FEC1E4 +:10488C00DFF88EFD708EFCC1717AFA4004F903DFFB +:10489C000530362A6194C09EFC609EFD34D4FE52D5 +:1048AC0006C0B9A5A592DFF9C6C4C2C061FC61DF20 +:1048BC00520C929269D4FEC1DFF88EFD708EFCC151 +:1048CC008F4105775C04D1DD06675C01D1DD503189 +:1048DC005498367162077153988FB4FB5FBCFBD14F +:1048EC00DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE4D +:1048FC00FBD1DF098FB7FB5FBFFBD1DD0C3162074A +:10490C0002EFFA716307716B2771139AFD4F30F444 +:10491C00227148500571605005717AFAED164A679C +:10492C005C02D1DD16D422DD124A2202DD0DF42206 +:10493C007148500571605005717AFA717AFA8D22BE +:10494C00318FE7240000DD0823DD1423DD2CEF4A32 +:10495C00F44A7140500571505005E422ED164A8F0F +:10496C0040059D4B715050058D4B9D4DD84BFD19FD +:10497C0034629D4CCD2202ED164A675C02D1DD17E4 +:10498C00675C10D1DD05CD2203EF0F714850057126 +:10499C00605005F422EF73CD22044A2203DF108D00 +:1049AC004C9F4005D84CC1D84BFDA534C0EF1F8F90 +:1049BC0040057671744BDC054A4B02DE0671605083 +:1049CC0005EF47C7D84BFDDF30C071505005D84DAF +:1049DC00F1242900DD27240400DD22242200DD1D22 +:1049EC00241100DD0C240100DD13241E00DD0EEF6C +:1049FC000A4A4B60DF07CD4B61EF02A44B4A2203FE +:104A0C00DF08D84BFD1934629D4CC09EFC609EFDA6 +:104A1C0034D4FE5206C0B9A5A592DFF961FCC1C31E +:104A2C00C5C7520C929269D4FEC1DFF88EFD708E10 +:104A3C00FCC1717AFA51405F0401D1DD06F616A76C +:104A4C0047DFF2300400BF2401F6BF2A01300B0B04 +:104A5C00BF2801FD5A02300B0FBF2801FD5A02304E +:104A6C000F0FBF2801710AE6F6420C01DD33AF04CB +:104A7C0001BF0C0131529729715297710BE2D85139 +:104A8C00FDD4033184BD02EFFACBB422FBD853F131 +:104A9C00BEB8714BE1714BE5710ABD8D529E44EF6E +:104AAC000C715397714AE5717BBD713397C09EFCB5 +:104ABC00609EFD34D4FE5206C0B9A5A592DFF9C69E +:104ACC00C4C2C061FCC1C5717AFAD450DD0BEA4E88 +:104ADC00899E44A64EB450EF33710AE6300400BFF1 +:104AEC002401F6BF2A01300B0BBF28010000000087 +:104AFC0000000000510FBF28010000000000000062 +:104B0C0000500FBF2801712397713397C4C061FC0B +:104B1C0061EF520C929269D4FEC1DFF88EFD708E5B +:104B2C00FCC12006FBF8FF71503002CEABACCC04BC +:104B3C0000F6BB31B2E210617900F6614900DFF397 +:104B4C0071603002EDD64B8E519C03713BE28C03AD +:104B5C005C02D1DD1E8C035C08D1DF097150300280 +:104B6C00CC0400EFCC8C0570FD8735629E50CC04D4 +:104B7C0002EFBE8C035C03D1DF408E509C0271505F +:104B8C0030028C04D1DF0E8C0270FDCD35629C0599 +:104B9C00CC0401EF328C044C02DF0671603002EF62 +:104BAC0029CF34025A716030028C0270C18C0570AE +:104BBC00FD2F35C0CF34024AEF108C035C01D1DDE0 +:104BCC000671603002EF03ED3D4B1006C09EFC6099 +:104BDC009EFD34D4FE5206C0B9A5A592DFF961FC46 +:104BEC00C1C3C5C7520C929269D4FEC1DFF88EFDC9 +:104BFC00708EFCC1710A9E31929E02EFFA8FDEFB21 +:104C0C004F96FFDF198FDFFB4F97FFDF118FE0FB14 +:104C1C004F98FFDF095004C15011FDD334C0710B04 +:104C2C009EC09EFC609EFD34D4FE5206C0B9A5A564 +:104C3C0092DFF9C6C4C2C061FCE46A61FCC1C3C5A1 +:104C4C00C7520C929269D4FEC1DFF88EFD708EFCB7 +:104C5C00C1C1FBF8FF8D1F9C018E31318EE72406FC +:104C6C0000DD0823DD0E23DD22EF38717AFA8C018A +:104C7C009D62EF2F717AFA4007F901DF068C019DD6 +:104C8C0061EF2051FF2E019D61EF18717AFA8C01B2 +:104C9C009D304004F903DD064004F904DF0530794A +:104CAC002561944031FF09DE05A031FFEF077158F3 +:104CBC00F000716298710BE3C0C09EFC609EFD34E5 +:104CCC00D4FE5206C0B9A5A592DFF9C6C4C2C06114 +:104CDC00FC717BFAC7D46A61F83124992771239946 +:104CEC00D46ADD05B46ACEABAC717AFA5600664C68 +:104CFC000ADD1172F3311C79D8FCCEFC0061CA615B +:104D0C00A486EFEA717AFAF2C6D7C7C1C1FBF8FFE5 +:104D1C00CC01008C014C0ADE36717BFA8C01F0312F +:104D2C007E0410FC14A96168DF09AC02B9717AFA2F +:104D3C00F2EF1D8C01F0317E127910FC614902DF1B +:104D4C0006717AFAE2EF09717AFA615901EFC4E25D +:104D5C001004C6D7C72004FBF8FFF64210FC61F81C +:104D6C00ED424E717BFA9C038C034C0ADE3C8C03A7 +:104D7C00F0317E0410FC14A96168DF05717AFAEF3A +:104D8C0029717AFA8C0372F3311C7910FCCEFC0079 +:104D9C0061CA629C02D1DF0A8C03F0317E12E67884 +:104DAC0010FC717BFA615903EFBECC0200CC0101FF +:104DBC008C02F0317E0410FC14A96168DD788C0241 +:104DCC00F0317E127910FCE743DF658C014C0ADE72 +:104DDC005F8C01F0317E127910FCE743DD4D717B65 +:104DEC00FA8C01F0317E0410FC14A96168DF1861A3 +:104DFC0069018C01F0317E12F67810FC8C024E01A8 +:104E0C00DCED717AFAEF2F8C01F0317E0410FC147A +:104E1C00A9128C02F0317E337810FC8C01F0317EBB +:104E2C0012E67810FC615902717AFA615901EF9B14 +:104E3C00615902EDBC4D00F21004C6D761FF520C53 +:104E4C00929269D4FEC1DFF88EFD708EFCC1717A2E +:104E5C00FA8FE4FB5C03D1DD114004F903DD06405D +:104E6C0004F904DF053093386194C09EFC609EFD0C +:104E7C0034D4FE5206C0B9A5A592DFF961FC61FCE1 +:044E8C0061FC61FC68 +:0A4E900000060C12181E242A30360A +:104E9A00ACFB0000000066FE00000000E8391A368C +:104EAA008C2245463C2EEB2E8145243BC008E53C2E +:104EBA0028FC36FE20FE02F903F929FC30FE2AFC02 +:104ECA002BFC08F926FC6CFF1AFF6EFF6AFF64FFD1 +:0A4EDA0027FC66FF2CFC55555555CA +:104EE400FF0000000000983AF82AFF000000470085 +:104EF400317503F7332312D714AEF8C716AC061274 +:104F0400C5AC0416F643DD078B99A7A5B3EFF5C22C +:024F1400C6D7FE +:024FF400326029 +:0A4FF60031353A31313A323700000C :00000001FF  \ No newline at end of file diff --git a/flower_toriaezu2/bsr.lmf b/flower_toriaezu2/bsr.lmf index 5fa63d9..832ced5 100644 Binary files a/flower_toriaezu2/bsr.lmf and b/flower_toriaezu2/bsr.lmf differ diff --git a/flower_toriaezu2/bsr_k0r.map b/flower_toriaezu2/bsr_k0r.map index 9c9f763..64a5dcc 100644 --- a/flower_toriaezu2/bsr_k0r.map +++ b/flower_toriaezu2/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.33 Date:18 Feb 2013 Page: 1 +78K0R Linker W1.33 Date:22 Feb 2013 Page: 1 Command: -yC:\Program Files (x86)\NEC Electronics Tools\DEV -_msgoff - obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C @@ -26,8 +26,8 @@ Direc-file:bsr_mcu.dr *** Link information *** 73 output segment(s) - 3F41H byte(s) real data - 6393 symbol(s) defined + 3E5AH byte(s) real data + 6488 symbol(s) defined *** Memory map *** @@ -155,56 +155,56 @@ Direc-file:bsr_mcu.dr LDR_CODL util_funcs 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - LDR_CODE 000CEH 00975H CSEG - LDR_CODE loader 000CEH 0019AH - LDR_CODE WDT 00268H 00000H - LDR_CODE i2c_mcu 00268H 0029BH - LDR_CODE i2c_twl 00503H 0005BH + LDR_CODE 000CEH 00967H CSEG + LDR_CODE loader 000CEH 0018CH + LDR_CODE WDT 0025AH 00000H + LDR_CODE i2c_mcu 0025AH 0029BH + LDR_CODE i2c_twl 004F5H 0005BH LDR_CODE self_flash - 0055EH 00370H + 00550H 00370H LDR_CODE task_debug - 008CEH 00000H + 008C0H 00000H LDR_CODE task_status - 008CEH 00075H - LDR_CODE hal 00943H 000DCH + 008C0H 00075H + LDR_CODE hal 00935H 000DCH LDR_CODE util_funcs - 00A1FH 00024H - FSL_CODE 00A43H 00322H CSEG + 00A11H 00024H + FSL_CODE 00A35H 00322H CSEG FSL_CODE fsl_block_cmd - 00A43H 0002BH + 00A35H 0002BH FSL_CODE fsl_block_check - 00A6EH 00013H + 00A60H 00013H FSL_CODE fsl_common - 00A81H 0014FH + 00A73H 0014FH FSL_CODE fsl_reset - 00BD0H 00001H + 00BC2H 00001H FSL_CODE fsl_si_ibf - 00BD1H 00064H + 00BC3H 00064H FSL_CODE fsl_phySwap - 00C35H 0004DH + 00C27H 0004DH FSL_CODE fsl_si_common - 00C82H 00061H - FSL_CODE fsl_swap 00CE3H 00030H + 00C74H 00061H + FSL_CODE fsl_swap 00CD5H 00030H FSL_CODE fsl_write - 00D13H 00052H - @@LCODE 00D65H 00277H CSEG - @@LCODE @cstart 00D65H 0006DH - @@LCODE @imul 00DD2H 00011H - @@LCODE @lumul 00DE3H 0002BH - @@LCODE @isdiv 00E0EH 00022H - @@LCODE @iudiv 00E30H 0002DH - @@LCODE @isrem 00E5DH 00021H - @@LCODE @iurem 00E7EH 0002FH - @@LCODE @lsdiv 00EADH 00039H - @@LCODE @ludiv 00EE6H 0003FH - @@LCODE @divuw 00F25H 00034H - @@LCODE @ladd 00F59H 0000FH - @@LCODE @llsh 00F68H 0001BH - @@LCODE @lursh 00F83H 0001FH - @@LCODE @iscmp 00FA2H 0000CH - @@LCODE @lband 00FAEH 00014H - @@LCODE @bcdtob 00FC2H 0001AH -* gap * 00FDCH 0001AH + 00D05H 00052H + @@LCODE 00D57H 00277H CSEG + @@LCODE @cstart 00D57H 0006DH + @@LCODE @imul 00DC4H 00011H + @@LCODE @lumul 00DD5H 0002BH + @@LCODE @isdiv 00E00H 00022H + @@LCODE @iudiv 00E22H 0002DH + @@LCODE @isrem 00E4FH 00021H + @@LCODE @iurem 00E70H 0002FH + @@LCODE @lsdiv 00E9FH 00039H + @@LCODE @ludiv 00ED8H 0003FH + @@LCODE @divuw 00F17H 00034H + @@LCODE @ladd 00F4BH 0000FH + @@LCODE @llsh 00F5AH 0001BH + @@LCODE @lursh 00F75H 0001FH + @@LCODE @iscmp 00F94H 0000CH + @@LCODE @lband 00FA0H 00014H + @@LCODE @bcdtob 00FB4H 0001AH +* gap * 00FCEH 00028H MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -214,7 +214,7 @@ Direc-file:bsr_mcu.dr SEGMENT SEGMENT MODULE ADDRESS MGC_MIMI 02000H 0000AH CSEG AT MGC_MIMI magic 02000H 0000AH - @@CNST 0200AH 003B2H CSEG + @@CNST 0200AH 00282H CSEG @@CNST @cstart 0200AH 00000H @@CNST loader 0200AH 00000H @@CNST pm 0200AH 00008H @@ -248,309 +248,308 @@ Direc-file:bsr_mcu.dr @@CNST led_pow 02034H 00020H @@CNST hal 02054H 00000H @@CNST batt_params - 02054H 002F8H - @@CNST voltable 0234CH 00040H + 02054H 001C8H + @@CNST voltable 0221CH 00040H @@CNST pedo_lpf_coeff - 0238CH 00030H + 0225CH 00030H @@CNST kanaria_c - 023BCH 00000H + 0228CH 00000H @@CNST util_funcs - 023BCH 00000H + 0228CH 00000H @@CNST i2c_mcu-sub - 023BCH 00000H - ROM_CODE 023BCH 02599H CSEG - ROM_CODE pm 023BCH 009FCH - ROM_CODE i2c_ctr 02DB8H 0005CH - ROM_CODE main 02E14H 00055H - ROM_CODE led 02E69H 00274H - ROM_CODE rtc 030DDH 000E0H - ROM_CODE vreg_ctr 031BDH 00493H - ROM_CODE vreg_twl 03650H 000F9H - ROM_CODE adc 03749H 00261H - ROM_CODE renge 039AAH 00018H - ROM_CODE accero 039C2H 00155H - ROM_CODE sw 03B17H 00131H + 0228CH 00000H + ROM_CODE 0228CH 025F0H CSEG + ROM_CODE pm 0228CH 009FDH + ROM_CODE i2c_ctr 02C89H 0005CH + ROM_CODE main 02CE5H 00055H + ROM_CODE led 02D3AH 00274H + ROM_CODE rtc 02FAEH 000E0H + ROM_CODE vreg_ctr 0308EH 00493H + ROM_CODE vreg_twl 03521H 000F9H + ROM_CODE adc 0361AH 00261H + ROM_CODE renge 0387BH 00018H + ROM_CODE accero 03893H 00155H + ROM_CODE sw 039E8H 0013CH ROM_CODE task_misc - 03C48H 001C1H - ROM_CODE task_sys 03E09H 0037DH + 03B24H 001C1H + ROM_CODE task_sys 03CE5H 003C8H ROM_CODE pedo_alg_thre_det2 - 04186H 004D4H - ROM_CODE led_cam 0465AH 000C4H - ROM_CODE led_pow 0471EH 0016FH - ROM_CODE voltable 0488DH 00000H + 040ADH 004D4H + ROM_CODE led_cam 04581H 000C4H + ROM_CODE led_pow 04645H 0016FH + ROM_CODE voltable 047B4H 00000H ROM_CODE pedo_lpf_coeff - 0488DH 00000H + 047B4H 00000H ROM_CODE kanaria_c - 0488DH 00006H - ROM_CODE get_ei 04893H 0000DH + 047B4H 00006H + ROM_CODE get_ei 047BAH 0000DH ROM_CODE i2c_mcu-sub - 048A0H 000B5H - @@BASE 04955H 00614H CSEG BASE - @@BASE loader 04955H 00000H - @@BASE pm 04955H 0003EH - @@BASE i2c_ctr 04993H 00170H - @@BASE main 04B03H 00000H - @@BASE magic 04B03H 00000H - @@BASE WDT 04B03H 00000H - @@BASE i2c_mcu 04B03H 000F2H - @@BASE i2c_twl 04BF5H 000D0H - @@BASE led 04CC5H 00000H - @@BASE rtc 04CC5H 0005DH - @@BASE vreg_ctr 04D22H 00000H - @@BASE vreg_twl 04D22H 00000H - @@BASE adc 04D22H 00094H - @@BASE renge 04DB6H 0016BH - @@BASE accero 04F21H 00042H + 047C7H 000B5H + @@BASE 0487CH 00614H CSEG BASE + @@BASE loader 0487CH 00000H + @@BASE pm 0487CH 0003EH + @@BASE i2c_ctr 048BAH 00170H + @@BASE main 04A2AH 00000H + @@BASE magic 04A2AH 00000H + @@BASE WDT 04A2AH 00000H + @@BASE i2c_mcu 04A2AH 000F2H + @@BASE i2c_twl 04B1CH 000D0H + @@BASE led 04BECH 00000H + @@BASE rtc 04BECH 0005DH + @@BASE vreg_ctr 04C49H 00000H + @@BASE vreg_twl 04C49H 00000H + @@BASE adc 04C49H 00094H + @@BASE renge 04CDDH 0016BH + @@BASE accero 04E48H 00042H @@BASE self_flash - 04F63H 00000H - @@BASE sw 04F63H 00000H + 04E8AH 00000H + @@BASE sw 04E8AH 00000H @@BASE task_debug - 04F63H 00000H + 04E8AH 00000H @@BASE task_misc - 04F63H 00000H - @@BASE task_sys 04F63H 00000H + 04E8AH 00000H + @@BASE task_sys 04E8AH 00000H @@BASE pedo_alg_thre_det2 - 04F63H 00000H - @@BASE ini_VECT 04F63H 00006H + 04E8AH 00000H + @@BASE ini_VECT 04E8AH 00006H @@BASE task_status - 04F69H 00000H - @@BASE led_cam 04F69H 00000H - @@BASE led_pow 04F69H 00000H - @@BASE hal 04F69H 00000H + 04E90H 00000H + @@BASE led_cam 04E90H 00000H + @@BASE led_pow 04E90H 00000H + @@BASE hal 04E90H 00000H @@BASE batt_params - 04F69H 00000H - @@BASE voltable 04F69H 00000H + 04E90H 00000H + @@BASE voltable 04E90H 00000H @@BASE pedo_lpf_coeff - 04F69H 00000H + 04E90H 00000H @@BASE kanaria_c - 04F69H 00000H + 04E90H 00000H @@BASE util_funcs - 04F69H 00000H + 04E90H 00000H @@BASE i2c_mcu-sub - 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL @cstart 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL pm 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL main 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL led 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL rtc 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL adc 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL renge 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL accero 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL sw 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP + 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL @cstart 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL pm 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL main 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL led 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL rtc 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL adc 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL renge 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL accero 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL sw 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP @@CNSTL task_misc - 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL task_sys 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP + 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL task_sys 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL led_cam 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL led_pow 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP + 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL led_cam 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL led_pow 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP @@CNSTL batt_params - 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP - @@CNSTL voltable 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP + 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP + @@CNSTL voltable 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP @@CNSTL pedo_lpf_coeff - 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP + 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP @@CNSTL kanaria_c - 04F69H 00000H - @@CNSTL 04F69H 00000H CSEG PAGE64KP + 04E90H 00000H + @@CNSTL 04E90H 00000H CSEG PAGE64KP @@CNSTL i2c_mcu-sub - 04F69H 00000H - @@RLINIT 04F69H 00000H CSEG UNIT64KP - @@RLINIT loader 04F69H 00000H - @@RLINIT pm 04F69H 00000H - @@RLINIT i2c_ctr 04F69H 00000H - @@RLINIT main 04F69H 00000H - @@RLINIT magic 04F69H 00000H - @@RLINIT WDT 04F69H 00000H - @@RLINIT i2c_mcu 04F69H 00000H - @@RLINIT i2c_twl 04F69H 00000H - @@RLINIT led 04F69H 00000H - @@RLINIT rtc 04F69H 00000H - @@RLINIT vreg_ctr 04F69H 00000H - @@RLINIT vreg_twl 04F69H 00000H - @@RLINIT adc 04F69H 00000H - @@RLINIT renge 04F69H 00000H - @@RLINIT accero 04F69H 00000H - @@RLINIT self_flash - 04F69H 00000H - @@RLINIT sw 04F69H 00000H - @@RLINIT task_debug - 04F69H 00000H - @@RLINIT task_misc - 04F69H 00000H - @@RLINIT task_sys 04F69H 00000H - @@RLINIT pedo_alg_thre_det2 - 04F69H 00000H - @@RLINIT ini_VECT 04F69H 00000H - @@RLINIT task_status - 04F69H 00000H - @@RLINIT led_cam 04F69H 00000H - @@RLINIT led_pow 04F69H 00000H - @@RLINIT hal 04F69H 00000H - @@RLINIT batt_params - 04F69H 00000H - @@RLINIT voltable 04F69H 00000H - @@RLINIT pedo_lpf_coeff - 04F69H 00000H - @@RLINIT kanaria_c - 04F69H 00000H - @@RLINIT util_funcs - 04F69H 00000H - @@RLINIT i2c_mcu-sub - 04F69H 00000H - @@RLINIT @rom 04F69H 00000H - @@CODEL 04F69H 00000H CSEG - @@CODEL pm 04F69H 00000H - @@CODEL i2c_ctr 04F69H 00000H - @@CODEL main 04F69H 00000H - @@CODEL magic 04F69H 00000H - @@CODEL led 04F69H 00000H - @@CODEL rtc 04F69H 00000H - @@CODEL vreg_ctr 04F69H 00000H - @@CODEL vreg_twl 04F69H 00000H - @@CODEL adc 04F69H 00000H - @@CODEL renge 04F69H 00000H - @@CODEL accero 04F69H 00000H - @@CODEL sw 04F69H 00000H - @@CODEL task_misc - 04F69H 00000H - @@CODEL task_sys 04F69H 00000H - @@CODEL pedo_alg_thre_det2 - 04F69H 00000H - @@CODEL ini_VECT 04F69H 00000H - @@CODEL led_cam 04F69H 00000H - @@CODEL led_pow 04F69H 00000H - @@CODEL batt_params - 04F69H 00000H - @@CODEL voltable 04F69H 00000H - @@CODEL pedo_lpf_coeff - 04F69H 00000H - @@CODEL kanaria_c - 04F69H 00000H - @@CODEL i2c_mcu-sub - 04F69H 00000H -* gap * 04F69H 00001H - @@CNSTL 04F6AH 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04F6AH 0000AH - @@R_INIT 04F74H 0004AH CSEG UNIT64KP - @@R_INIT @cstart 04F74H 00000H - @@R_INIT loader 04F74H 00000H - @@R_INIT pm 04F74H 00000H - @@R_INIT i2c_ctr 04F74H 00000H - @@R_INIT main 04F74H 00000H - @@R_INIT magic 04F74H 00000H - @@R_INIT WDT 04F74H 00000H - @@R_INIT i2c_mcu 04F74H 00000H - @@R_INIT i2c_twl 04F74H 00000H - @@R_INIT led 04F74H 00000H - @@R_INIT rtc 04F74H 00000H - @@R_INIT vreg_ctr 04F74H 00000H - @@R_INIT vreg_twl 04F74H 00000H - @@R_INIT adc 04F74H 0000CH - @@R_INIT renge 04F80H 00014H - @@R_INIT accero 04F94H 00000H + 04E90H 00000H + @@CNSTL 04E90H 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04E90H 0000AH + @@R_INIT 04E9AH 0004AH CSEG UNIT64KP + @@R_INIT @cstart 04E9AH 00000H + @@R_INIT loader 04E9AH 00000H + @@R_INIT pm 04E9AH 00000H + @@R_INIT i2c_ctr 04E9AH 00000H + @@R_INIT main 04E9AH 00000H + @@R_INIT magic 04E9AH 00000H + @@R_INIT WDT 04E9AH 00000H + @@R_INIT i2c_mcu 04E9AH 00000H + @@R_INIT i2c_twl 04E9AH 00000H + @@R_INIT led 04E9AH 00000H + @@R_INIT rtc 04E9AH 00000H + @@R_INIT vreg_ctr 04E9AH 00000H + @@R_INIT vreg_twl 04E9AH 00000H + @@R_INIT adc 04E9AH 0000CH + @@R_INIT renge 04EA6H 00014H + @@R_INIT accero 04EBAH 00000H @@R_INIT self_flash - 04F94H 00000H - @@R_INIT sw 04F94H 00000H + 04EBAH 00000H + @@R_INIT sw 04EBAH 00000H @@R_INIT task_debug - 04F94H 00000H + 04EBAH 00000H @@R_INIT task_misc - 04F94H 00026H - @@R_INIT task_sys 04FBAH 00000H + 04EBAH 00026H + @@R_INIT task_sys 04EE0H 00000H @@R_INIT pedo_alg_thre_det2 - 04FBAH 00000H - @@R_INIT ini_VECT 04FBAH 00000H + 04EE0H 00000H + @@R_INIT ini_VECT 04EE0H 00000H @@R_INIT task_status - 04FBAH 00000H - @@R_INIT led_cam 04FBAH 00000H - @@R_INIT led_pow 04FBAH 00004H - @@R_INIT hal 04FBEH 00000H + 04EE0H 00000H + @@R_INIT led_cam 04EE0H 00000H + @@R_INIT led_pow 04EE0H 00004H + @@R_INIT hal 04EE4H 00000H @@R_INIT batt_params - 04FBEH 00000H - @@R_INIT voltable 04FBEH 00000H + 04EE4H 00000H + @@R_INIT voltable 04EE4H 00000H @@R_INIT pedo_lpf_coeff - 04FBEH 00000H + 04EE4H 00000H @@R_INIT kanaria_c - 04FBEH 00000H + 04EE4H 00000H @@R_INIT util_funcs - 04FBEH 00000H + 04EE4H 00000H @@R_INIT i2c_mcu-sub - 04FBEH 00000H - @@R_INIT @rom 04FBEH 00000H - @@R_INIS 04FBEH 00010H CSEG UNIT64KP - @@R_INIS @cstart 04FBEH 00000H - @@R_INIS loader 04FBEH 00000H - @@R_INIS pm 04FBEH 00002H - @@R_INIS i2c_ctr 04FC0H 00002H - @@R_INIS main 04FC2H 00000H - @@R_INIS magic 04FC2H 00000H - @@R_INIS WDT 04FC2H 00000H - @@R_INIS i2c_mcu 04FC2H 00000H - @@R_INIS i2c_twl 04FC2H 00000H - @@R_INIS led 04FC2H 00000H - @@R_INIS rtc 04FC2H 00000H - @@R_INIS vreg_ctr 04FC2H 00000H - @@R_INIS vreg_twl 04FC2H 00000H - @@R_INIS adc 04FC2H 00000H - @@R_INIS renge 04FC2H 00000H - @@R_INIS accero 04FC2H 00000H + 04EE4H 00000H + @@R_INIT @rom 04EE4H 00000H + @@R_INIS 04EE4H 00010H CSEG UNIT64KP + @@R_INIS @cstart 04EE4H 00000H + @@R_INIS loader 04EE4H 00000H + @@R_INIS pm 04EE4H 00002H + @@R_INIS i2c_ctr 04EE6H 00002H + @@R_INIS main 04EE8H 00000H + @@R_INIS magic 04EE8H 00000H + @@R_INIS WDT 04EE8H 00000H + @@R_INIS i2c_mcu 04EE8H 00000H + @@R_INIS i2c_twl 04EE8H 00000H + @@R_INIS led 04EE8H 00000H + @@R_INIS rtc 04EE8H 00000H + @@R_INIS vreg_ctr 04EE8H 00000H + @@R_INIS vreg_twl 04EE8H 00000H + @@R_INIS adc 04EE8H 00000H + @@R_INIS renge 04EE8H 00000H + @@R_INIS accero 04EE8H 00000H @@R_INIS self_flash - 04FC2H 00000H - @@R_INIS sw 04FC2H 00000H + 04EE8H 00000H + @@R_INIS sw 04EE8H 00000H @@R_INIS task_debug - 04FC2H 00000H + 04EE8H 00000H @@R_INIS task_misc - 04FC2H 00000H - @@R_INIS task_sys 04FC2H 00002H + 04EE8H 00000H + @@R_INIS task_sys 04EE8H 00002H @@R_INIS pedo_alg_thre_det2 - 04FC4H 00006H - @@R_INIS ini_VECT 04FCAH 00000H + 04EEAH 00006H + @@R_INIS ini_VECT 04EF0H 00000H @@R_INIS task_status - 04FCAH 00000H - @@R_INIS led_cam 04FCAH 00002H - @@R_INIS led_pow 04FCCH 00002H - @@R_INIS hal 04FCEH 00000H + 04EF0H 00000H + @@R_INIS led_cam 04EF0H 00002H + @@R_INIS led_pow 04EF2H 00002H + @@R_INIS hal 04EF4H 00000H @@R_INIS batt_params - 04FCEH 00000H - @@R_INIS voltable 04FCEH 00000H + 04EF4H 00000H + @@R_INIS voltable 04EF4H 00000H @@R_INIS pedo_lpf_coeff - 04FCEH 00000H + 04EF4H 00000H @@R_INIS kanaria_c - 04FCEH 00000H + 04EF4H 00000H @@R_INIS util_funcs - 04FCEH 00000H + 04EF4H 00000H @@R_INIS i2c_mcu-sub - 04FCEH 00000H - @@R_INIS @rom 04FCEH 00000H - @@LCODEL 04FCEH 00022H CSEG - @@LCODEL abs 04FCEH 00008H - @@LCODEL memcpy_n 04FD6H 0001AH -* gap * 04FF0H 00004H + 04EF4H 00000H + @@R_INIS @rom 04EF4H 00000H + @@RLINIT 04EF4H 00000H CSEG UNIT64KP + @@RLINIT loader 04EF4H 00000H + @@RLINIT pm 04EF4H 00000H + @@RLINIT i2c_ctr 04EF4H 00000H + @@RLINIT main 04EF4H 00000H + @@RLINIT magic 04EF4H 00000H + @@RLINIT WDT 04EF4H 00000H + @@RLINIT i2c_mcu 04EF4H 00000H + @@RLINIT i2c_twl 04EF4H 00000H + @@RLINIT led 04EF4H 00000H + @@RLINIT rtc 04EF4H 00000H + @@RLINIT vreg_ctr 04EF4H 00000H + @@RLINIT vreg_twl 04EF4H 00000H + @@RLINIT adc 04EF4H 00000H + @@RLINIT renge 04EF4H 00000H + @@RLINIT accero 04EF4H 00000H + @@RLINIT self_flash + 04EF4H 00000H + @@RLINIT sw 04EF4H 00000H + @@RLINIT task_debug + 04EF4H 00000H + @@RLINIT task_misc + 04EF4H 00000H + @@RLINIT task_sys 04EF4H 00000H + @@RLINIT pedo_alg_thre_det2 + 04EF4H 00000H + @@RLINIT ini_VECT 04EF4H 00000H + @@RLINIT task_status + 04EF4H 00000H + @@RLINIT led_cam 04EF4H 00000H + @@RLINIT led_pow 04EF4H 00000H + @@RLINIT hal 04EF4H 00000H + @@RLINIT batt_params + 04EF4H 00000H + @@RLINIT voltable 04EF4H 00000H + @@RLINIT pedo_lpf_coeff + 04EF4H 00000H + @@RLINIT kanaria_c + 04EF4H 00000H + @@RLINIT util_funcs + 04EF4H 00000H + @@RLINIT i2c_mcu-sub + 04EF4H 00000H + @@RLINIT @rom 04EF4H 00000H + @@CODEL 04EF4H 00000H CSEG + @@CODEL pm 04EF4H 00000H + @@CODEL i2c_ctr 04EF4H 00000H + @@CODEL main 04EF4H 00000H + @@CODEL magic 04EF4H 00000H + @@CODEL led 04EF4H 00000H + @@CODEL rtc 04EF4H 00000H + @@CODEL vreg_ctr 04EF4H 00000H + @@CODEL vreg_twl 04EF4H 00000H + @@CODEL adc 04EF4H 00000H + @@CODEL renge 04EF4H 00000H + @@CODEL accero 04EF4H 00000H + @@CODEL sw 04EF4H 00000H + @@CODEL task_misc + 04EF4H 00000H + @@CODEL task_sys 04EF4H 00000H + @@CODEL pedo_alg_thre_det2 + 04EF4H 00000H + @@CODEL ini_VECT 04EF4H 00000H + @@CODEL led_cam 04EF4H 00000H + @@CODEL led_pow 04EF4H 00000H + @@CODEL batt_params + 04EF4H 00000H + @@CODEL voltable 04EF4H 00000H + @@CODEL pedo_lpf_coeff + 04EF4H 00000H + @@CODEL kanaria_c + 04EF4H 00000H + @@CODEL i2c_mcu-sub + 04EF4H 00000H + @@LCODEL 04EF4H 00022H CSEG + @@LCODEL abs 04EF4H 00008H + @@LCODEL memcpy_n 04EFCH 0001AH +* gap * 04F16H 000DEH MGC_VER 04FF4H 00002H CSEG AT MGC_VER magic 04FF4H 00002H MGC_TAIL 04FF6H 0000AH CSEG AT diff --git a/flower_toriaezu2/config.h b/flower_toriaezu2/config.h index fdb91aa..520c6b9 100644 --- a/flower_toriaezu2/config.h +++ b/flower_toriaezu2/config.h @@ -7,7 +7,11 @@ */ #define MCU_VER_MAJOR 0x02 -#define MCU_VER_MINOR 0x2E +#define MCU_VER_MINOR 0x30 + + +// ビルドスイッチ +//#define _MCU_ARR // snake 系 // デバッグ向けスイッチ diff --git a/flower_toriaezu2/hoge.bin b/flower_toriaezu2/hoge.bin index 150866c..deb8d8b 100644 Binary files a/flower_toriaezu2/hoge.bin and b/flower_toriaezu2/hoge.bin differ diff --git a/flower_toriaezu2/loader.c b/flower_toriaezu2/loader.c index 89e4638..19059cb 100644 --- a/flower_toriaezu2/loader.c +++ b/flower_toriaezu2/loader.c @@ -200,15 +200,17 @@ void chk_platform_type() // ●CTRファミリ // system_status.family = (enum family_)( DEV_DET >> 1 ); /// あぁ... -#ifdef _DBG_FORCE_xxx +#ifdef _DBG_FORCE_FLOWER // 強制的に機種設定をしてデバッグしたいとき -// system_status.family = FAMILY_FLOWER; + system_status.family = FAMILY_FLOWER; #endif +#ifdef _MCU_ARR if( system_status.family == FAMILY_SPFL ) { system_status.family == FAMILY_CLOSER; } +#endif if( system_status.family == FAMILY_CTR ) { diff --git a/flower_toriaezu2/pm.c b/flower_toriaezu2/pm.c index 014c1de..34dae5e 100644 --- a/flower_toriaezu2/pm.c +++ b/flower_toriaezu2/pm.c @@ -1089,6 +1089,13 @@ err PM_sys_pow_on( ) pmic_version = read_pmic( PM_REG_ADRS_VER ); read_mgic_2B( BT_GAUGE_REG_VERSION, mgic_version ); + return ( ERR_SUCCESS ); +} + + + +void reset_release() +{ // リセット解除など。システム起動! PM_reset_neg(); FCRAM_RST_neg; @@ -1096,13 +1103,9 @@ err PM_sys_pow_on( ) codec_reg_init(); // CODEC 不定レジスタ初期化(reset2の後でないといけないので) ntr_pm_reg_shadow = 0; //  〃 こんなところで... - - return ( ERR_SUCCESS ); } - - /********************************************//** 電源OFFシーケンス ***********************************************/ diff --git a/flower_toriaezu2/pm.h b/flower_toriaezu2/pm.h index 673c036..76fa9c7 100644 --- a/flower_toriaezu2/pm.h +++ b/flower_toriaezu2/pm.h @@ -151,6 +151,7 @@ extern u8 pmreg_v_vdd; // SNAKE err PM_sys_pow_on( ); void PM_sys_pow_off( ); //err PM_bt_auth( ); +void reset_release( ); void PM_LCD_vcom_set( ); err PM_LCD_on( ); diff --git a/flower_toriaezu2/sw.c b/flower_toriaezu2/sw.c index d0cd54f..55aae5d 100644 --- a/flower_toriaezu2/sw.c +++ b/flower_toriaezu2/sw.c @@ -50,6 +50,11 @@ u16 off_timeout_timer; static u16 sw_pwsw_mukan_time; +//========================================================= +static void chk_pow_sw(); +static void chk_wifi_sw(); + + /********************************************//** 押した時間を数える。押しっぱなしでも0に戻らない @@ -98,7 +103,7 @@ static u16 sw_pwsw_mukan_time; /********************************************//** スイッチの監視 -  チャタリングをはねたり、長押しや、押したトリガなどの検出を行う + チャタリングをはねたり、長押しや、押したトリガなどの検出を行う ***********************************************/ void tsk_sw( ) { @@ -124,86 +129,115 @@ void tsk_sw( ) } // 8ms 毎にきます - switch ( system_status.pwr_state ) + switch( system_status.pwr_state ) { - case ( ON ): - case ( SLEEP ): - case ( OFF ): - case ( ON_CHECK ): - // 実機の場合 - if( ! system_status.taikendai ) + case( ON ): + case( SLEEP ): + chk_wifi_sw(); + if( !SHELL_OPEN ) { - - // 電源スイッチの監視 // - 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 ) ) // 長押しに到達 - { - set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_HOLD ); - if( off_timeout_timer == 0 ) // 強制電源断カウントダウン開始、何度も発動しないように。 - { - off_timeout_timer = vreg_ctr[ VREG_C_OFF_DELAY ] * 16; - } - } - - if( off_timeout_timer != 0 ) // 長押し割り込み後、タイムアウトで強制オフ。 - { - off_timeout_timer --; - if( off_timeout_timer == 0 ) - { - force_off = true; - } - } - - }else{ - // スタンドアロン試遊台 - // 電源スイッチの監視 // - if( SW_pow_count == ( TIME_PWSW_CLICK ) ) - { - if( sw_pwsw_mukan_time == 0 ) - { - set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); - // いやなタイミングでPWSWを押すとHOMEメニューに入れてしまうのを回避するためのマスクタイマー - sw_pwsw_mukan_time = TIME_MUKAN_PWSW_RED_TRIAL; - } - } - else if( SW_pow_count == ( HOLD_THREASHOLD ) ) - { - force_off = true; - } - - if( sw_pwsw_mukan_time != 0 ) - { - sw_pwsw_mukan_time--; - } + break; } - - count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask ); // ボタン押し時間のカウント - + // else 節の時は fall through (蓋閉じならpwswチェックをスキップ)良くない気もする。 // HOME sw // chk_clicked( SW_HOME_n, SW_home_count, REG_BIT_SW_HOME_CLICK ); chk_clicked( !SW_HOME_n, SW_home_count_rel, REG_BIT_SW_HOME_RELEASE ); - - // wifi sw // - /// 最悪な実装なのはわかっているが、市場に出てしまった不良スイッチを救うため - if( sw_wifi_mukan_time != 0 ) - { - sw_wifi_mukan_time--; - } - else - { - chk_clicked( SW_WIFI_n, SW_wifi_count, REG_BIT_SW_WIFI_CLICK ); - if( SW_wifi_count == CLICK_THRESHOLD +1 ) // 押した判定発生! - { - sw_wifi_mukan_time = TIME_MUKAN; - } - } + + case( OFF ): + case( ON_CHECK ): + chk_pow_sw(); + + break; + + default: + break; } } + + +/********************************************//** + 電源スイッチの監視 + 試遊台、ホームメニューには入れないようにしたくて、自動起動にしてあるそうだが + mmen の不具合でホームメニューにいけてしまう事がある(市場クレーム有り) + なのでマイコンでその操作をマスクする。 + ***********************************************/ +static void chk_pow_sw() +{ + // 実機の場合 + if( ! system_status.taikendai ) + { + 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 ) ) // 長押しに到達 + { + set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_HOLD ); + if( off_timeout_timer == 0 ) // 強制電源断カウントダウン開始、何度も発動しないように。 + { + off_timeout_timer = vreg_ctr[ VREG_C_OFF_DELAY ] * 16; + } + } + + if( off_timeout_timer != 0 ) // 長押し割り込み後、タイムアウトで強制オフ。 + { + off_timeout_timer --; + if( off_timeout_timer == 0 ) + { + force_off = true; + } + } + + }else{ + // スタンドアロン試遊台 + if( SW_pow_count == ( TIME_PWSW_CLICK ) ) + { + if( sw_pwsw_mukan_time == 0 ) + { + set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); + // いやなタイミングでPWSWを押すとHOMEメニューに入れてしまうのを回避するためのマスクタイマー + sw_pwsw_mukan_time = TIME_MUKAN_PWSW_RED_TRIAL; + } + } + else if( SW_pow_count == ( HOLD_THREASHOLD ) ) + { + force_off = true; + } + + if( sw_pwsw_mukan_time != 0 ) + { + sw_pwsw_mukan_time--; + } + } + count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask ); // ボタン押し時間のカウント +} + + + +/********************************************//** + wifi スイッチの監視 + 最悪な実装なのはわかっているが、市場に出てしまった不良スイッチを救うため + …そもそも他のスイッチも全部こうするのがいいんだろうけど + ***********************************************/ +static void chk_wifi_sw() +{ + // wifi sw // + if( sw_wifi_mukan_time != 0 ) + { + sw_wifi_mukan_time--; + } + else + { + chk_clicked( SW_WIFI_n, SW_wifi_count, REG_BIT_SW_WIFI_CLICK ); + if( SW_wifi_count == CLICK_THRESHOLD +1 ) // 押した判定発生! + { + sw_wifi_mukan_time = TIME_MUKAN; + } + } +} diff --git a/flower_toriaezu2/task_sys.c b/flower_toriaezu2/task_sys.c index 5267452..6e59052 100644 --- a/flower_toriaezu2/task_sys.c +++ b/flower_toriaezu2/task_sys.c @@ -35,15 +35,27 @@ //========================================================= extern void nop8(); - static void chk_emergencyExit(); static void force_off_check(); static void send_getup_to_soc(); +static void chk_sleep(); +static void chk_awake(); +static err flower_direct_boot_sleep_check(); +static err chk_pwsw_timeout(); +static void go_stop(); + +static void ports_finalize(); +static void irqs_finalize(); +static void restore_status_regs(); +static err leds_closed(); + #ifdef _DBG_CHK_OFF_LEAK_ static void leak_check(); #endif - +#ifdef i2c_timeout_test +void i2c_timeout_test_init(); +#endif //========================================================= extern bit info_led_off; @@ -69,7 +81,6 @@ extern bit i2c_mcu_time_out_error; ***********************************************/ void tsk_sys( ) { - static u8 pwsw_timeout = 0; // 電源ボタンチャタリング回避。 タイムアウトするまでに電源投入確定しないとoffに戻る hal_update(); @@ -84,39 +95,27 @@ void tsk_sys( ) // 電源スイッチでHALT解除 // if( system_status.poweron_reason == RSN_PWSW ) { - if( PM_EXTDC_n ) - { - // アダプタなし - if( SW_pow_count != 0 ) - { - pwsw_timeout = 0; - } - else - { - pwsw_timeout ++; - } + if( PM_EXTDC_n ) + { + // アダプタなし + if( chk_pwsw_timeout() == ERR_ERR ) + { + // タイムアウト。スリープに入れる + return; + } + } + else + { + BT_chk(); // バッテリ外されたら充電停止などするため + } - if( pwsw_timeout > PWSW_ON_CHECK_TIMEOUT ) - { - SW_pow_count = 0; - system_status.pwr_state = OFF_TRIG; // スイッチはノイズだった。寝る。 - renge_task_interval_run_force = true; - return; - } - } - else - { - BT_chk(); - } - - - if( SW_pow_count < PWSW_POWON_TIME ) - { - // 押し時間が短くて電源onに到達していない - return; - } + if( SW_pow_count < PWSW_POWON_TIME ) + { + // 押し時間が短くて電源onに到達していない + return; + } } - // else { if( system_status.poweron_reason == RSN_TRIAL、… ) 電源投入 } + // else { if( system_status.poweron_reason == RSN_TRIAL、… ) 電源投入 } SW_pow_mask = true; // pwsw押しっぱなしで電源入/切 を繰り返さないように @@ -155,9 +154,9 @@ void tsk_sys( ) PM_WL_TX = 1; PM_SW_SEL_n = 1; PM_ACCEL_INT1 = 1; - PM_ACC_VALID = 1; + PM_ACC_VALID = 1; - if( PM_sys_pow_on( ) != ERR_SUCCESS ) // リセット解除もしてきます + if( PM_sys_pow_on( ) != ERR_SUCCESS ) { // 電源起動不可エラー renge_task_interval_run_force = true; system_status.pwr_state = OFF_TRIG; @@ -165,10 +164,27 @@ void tsk_sys( ) } // ここまで来ると、電源投入確定 // - // プルアップon + reset_release(); + + // プルアップon // PU_BT_IN_CHG_n = 1; - PU7 = bits8(0,0,0,1, 1,1,0,1); // 4:SW_WIFI 3:SW_PWSW 2:PM_IRQ 0:PM_EXTDC_n - PU_SW_HOME_n_JIKKI = 1; // SW_HOME + PU7 = bits8(0,0,0,1, 1,1,0,1); // 4:SW_WIFI 3:SW_PWSW 2:PM_IRQ 0:PM_EXTDC_n + PU_SW_HOME_n_JIKKI = 1; // SW_HOME + wait_ms( 50 ); // プルアップ後電圧がちゃんと上がるのをまってhal_update() しないと期待したのが取れない + /// 50ms は暫定値 + + hal_update(); + + // FLOWER 対応 + // FLOWER時のみ、スリープなら、HOMEも押されてないと電源を入れない + // (reset解除せずに電源断してしまう。ユーザーには気づくまい。) + if( system_status.family == FAMILY_FLOWER ) + { + if( flower_direct_boot_sleep_check() == ERR_ERR ) + { + return; + } + } if( system_status.poweron_reason == RSN_PWSW || system_status.poweron_reason == RSN_TRIAL ) @@ -190,14 +206,7 @@ void tsk_sys( ) case ON_TRIG: //------------------------------------------------------- #ifdef i2c_timeout_test - LED_duty_pow_blu = 0; // debug - LED_duty_3d = 0; - LED_duty_notify_red = 0; - LED_duty_notify_grn = 0; - LED_duty_notify_blu = 0; - LED_pow_red = 0; - LED_CAM = 0; - i2c_mcu_time_out_error = false; + i2c_timeout_test_init(); #endif IIC_ctr_Init( ); IIC_twl_Init( ); @@ -205,12 +214,13 @@ void tsk_sys( ) vreg_twl_init( ); vreg_ctr_reset( ); - KRM = bits8(0,0,0,0, 0,0,0,0); - PIF0 = 0; - system_status.poweron_reason = NONE; renge_task_interval_run_force = true; + // 割り込み関係 + KRM = bits8(0,0,0,0, 0,0,0,0); + PIF0 = 0; + MK0 = INT_MSK0_RSV; MK1 = INT_MSK1_RSV; @@ -223,13 +233,7 @@ void tsk_sys( ) // リブート時、ステータスを何となく更新 if( system_status.reboot ) { - u8 bl_status_temp; - - bl_status_temp = read_pmic( PM_REG_ADRS_BL ); - vreg_ctr[ VREG_C_STATUS ] |= (( bl_status_temp & 0x03 ) << 5 ); - set_bit( ( read_pmic( PM_REG_ADRS_VDD_LCD ) != 0 ), - vreg_ctr[ VREG_C_STATUS ], REG_BIT_LCD_POW ); - BT_chk(); + restore_status_regs(); } LED_init( ); // reboot時の↑BT_Chk,BT_chk後に行いたい @@ -247,30 +251,12 @@ void tsk_sys( ) break; case ON: //--------------------------------------------- - // PMICによる強制電源断チェック - // デバッガがreset1をアサートすることもある。そのときは全部リセット - chk_emergencyExit(); + chk_emergencyExit(); // PMICによる強制電源断チェック + // デバッガがreset1をアサートすることもある。そのときは全部リセット - // SLP監視 - if( going_to_sleep ) // 絶対に SLP_REQ の前に予告が来る - { - timeout_sleep ++; - if( timeout_sleep == 0 || // オーバーフローを期待。sleepするって言ったけど一瞬で起きて気がつかなかった - ( PIF0 && !SLP_REQ )) // slp割り込みが入った気がしたが、もう起きてしまった - { - PIF0 = 0; - send_getup_to_soc(); - } - if( PIF0 && SLP_REQ ){ - PIF0 = 0; - PM_VDD_ecoMode(); - system_status.pwr_state = SLEEP; - renge_task_interval_run_force = true; - } - } + chk_sleep(); // SLP監視。system_status.pwr_state いじります。行儀悪い - // 強制offカウント - force_off_check(); + force_off_check(); // 強制offカウント #ifndef _TAIKENDAI_SEISAN_SPECIAL_ if( system_status.taikendai ) // アダプタが抜けたら自動で電源off @@ -281,18 +267,12 @@ void tsk_sys( ) } } #endif - break; case SLEEP: //------------------------------------------ chk_emergencyExit(); - // スリープから復帰 - if( !SLP_REQ ){ - PM_VDD_normMode(); - wait_ms( 5 ); // tdly_sw - send_getup_to_soc(); - system_status.pwr_state = ON; - } + + chk_awake(); // スリープから復帰 force_off_check(); // leak_check(); @@ -317,24 +297,20 @@ void tsk_sys( ) case OFF_TRIG: //--------------------------------------- // LED消灯を待つ - vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ILM_OFF; - vreg_ctr[ VREG_C_LED_WIFI ] = WIFI_LED_OFF; - vreg_ctr[ VREG_C_LED_3D ] = LED_3D_ILM_OFF; - info_led_off = true; - if( LED_duty_pow_blu != 0 ) + if( leds_closed() != ERR_SUCCESS ) { return; } - // 強制電源断カウントダウンタイマクリア - clear_pow_off_countdown(); + // 強制電源断カウントダウンタイマクリア + clear_pow_off_countdown(); - // 加速度センサ停止 + // 加速度センサ停止 vreg_ctr[ VREG_C_ACC_CONFIG ] = 0x00; tski_acc_setup(); - EI(); // DI状態でかえって来るので、I2C_mcu 完了させるのに必要を + EI(); // DI状態でかえって来るので、I2C_mcu 完了させるのに必要 - // その他ペリフェラル停止 + // その他ペリフェラル停止 LED_stop( ); IIC_ctr_Stop( ); IIC_twl_Stop( ); @@ -349,61 +325,25 @@ void tsk_sys( ) while( iic_mcu_busy ) {;} - // irqマスク設定 - KRM = ( KR_SW_POW ); // Mask ではなく、Modeなのだそうだ。紛らわしい - MK0 = ~( INT_MSK0_EXTDC | INT_MSK0_WDTI ); - MK1 = ~( INT_MSK1_KR | INT_MSK1_RTCINTVAL ); // INT_MSK1_RTCALARM | RTCアラーム封印中 - MK2L = 0xFF; + irqs_finalize(); + IRQ0_disable; // 対 SoC のピン - // irqフラグクリア - vreg_ctr[VREG_C_IRQ0] = 0; - vreg_ctr[VREG_C_IRQ1] = 0; - vreg_ctr[VREG_C_IRQ2] = 0; - vreg_ctr[VREG_C_IRQ3] = 0; + PM_sys_pow_off( ); // 電源カットオフ - // PU5 そのまま - PU7 = bits8(0,0,0,0, 1,0,0,1); // PWSWI,PM_EXTTDC,( IRQ0_deactive(), PM_IRQ_deactive ) - PU_SW_HOME_n_JIKKI = 0; // SW_HOME 停止 - - IF0 = 0; - IF1 = 0; - IF2 = 0; - - IRQ0_disable; - - PM_sys_pow_off( ); // 電源カットオフ - - // ポート類を停止モードに。こういう回路でも、L出力にしなきゃだめだそうな。 - SW_WIFI_n_RAW = 0; - PM_SW_WIFI_n = 0; - - SW_HOME_n_JIKKI_RAW = 0; - PM_SW_HOME_n_JIKKI = 0; - - WL_TX = 0; - PM_WL_TX = 0; - - SW_SEL_n = 0; - PM_SW_SEL_n = 0; - - ACCEL_INT1 = 0; - PM_ACCEL_INT1 = 0; - ACC_VALID = 0; - PM_ACC_VALID = 0; + ports_finalize(); system_status.pwr_state = OFF; SW_pow_mask = true; SW_pow_count = 0; - // HALデバッグリセット 忘れると電源on出来なくなることが… - hal_reset(); - /* FALLTHROUGH */ + // HALデバッグリセット 忘れると電源on出来なくなることが… + hal_reset(); + /* FALLTHROUGH */ case OFF: // 注:現状では電源ボタンしか電源投入はありません。 system_status.poweron_reason = NONE; - pwsw_timeout = 0; if( !PM_EXTDC_n || chg_led_override != 0 ) // これがゼロになるまで待つ @@ -434,42 +374,18 @@ void tsk_sys( ) pm_chk_adapter(); PM_Chg_Stop(); + go_stop(); // 割り込み待ちで stop モードへ。 + + hal_update(); + renge_flg_interval = 0; bt_force_update = true; - while( RWST ) - {;} - - // 割り込み待ちで寝る // - RTCIMK = 1; // systick用インターバルタイマー割り込みマスク - -#ifdef _DBG_CHK_OFF_LEAK_ - leak_check(); -#endif - CKC = bits8(0,0,0,0, 1,0,0,1); // 4MHzに落として(bit0)からSTOPしなくてはならない - OSMC = bits8(0,0,0,0, 0,0,0,0); // 5MHz以下モードへ。 - - if( PM_EXTDC_n_RAW ) // きわどいタイミングで挿抜が起きることがある。HAL通さないべき(off中ですし) - { - STOP(); - } - - // 起きる // - // 起きる条件は - // ・KeyReturn割り込み(電源ボタン) - // ・RTCアラーム(現在封印) - - // クロック復帰 - OSMC = bits8(0,0,0,0, 0,0,0,1); // 8MHz動作準備 - renge_flg_interval = 0; - hal_update(); - - CKC = bits8(0,0,0,0, 1,0,0,0); // OSMC.FSEL = 1 後3clk以上開ける - - // 起きた理由は? - if( !PM_EXTDC_n ){ - system_status.pwr_state = OFF; // 一回回ってきて、ON_CHECKに行く - } -/* // RTCアラーム。封印中 + // 起きた理由は? + if( !PM_EXTDC_n ){ + system_status.pwr_state = OFF; // 一回回ってきて、ON_CHECKに行く + } +/* 封印中 + // RTCアラーム。 else if( vreg_ctr[ VREG_C_IRQ1 ] & REG_BIT_RTC_ALARM ) { system_status.poweron_reason = RSN_RTC_ALARM; @@ -479,11 +395,11 @@ void tsk_sys( ) // 現状他の要因では起きない // } */ - else // if( !SW_POW_n ) // (それ以外なら)電源ボタンで起きた + else // if( !SW_POW_n ) // (それ以外なら)電源ボタンで起きた { SW_pow_mask = false; - system_status.poweron_reason = RSN_PWSW; - system_status.pwr_state = ON_CHECK; + system_status.poweron_reason = RSN_PWSW; + system_status.pwr_state = ON_CHECK; } RTCIMK = 0; // sys tick タイマー有効 @@ -500,6 +416,201 @@ void tsk_sys( ) +/********************************************//** + 電源ボタンチャタリング回避。 + タイムアウトするまでに電源投入確定しないとoffに戻る + ***********************************************/ +static err chk_pwsw_timeout() +{ + static u8 pwsw_timeout = 0; + + if( SW_pow_count != 0 ) + { + pwsw_timeout = 0; + } + else + { + pwsw_timeout ++; + } + + if( pwsw_timeout > PWSW_ON_CHECK_TIMEOUT ) + { + SW_pow_count = 0; + system_status.pwr_state = OFF_TRIG; // スイッチはノイズだった。寝る。 + renge_task_interval_run_force = true; + return ERR_ERR; + } + + pwsw_timeout = 0; + return ERR_SUCCESS; +} + + + +/********************************************//** + スリープに入れるか? + SoC から通知がある + ***********************************************/ +static void chk_sleep() +{ + if( going_to_sleep ) // 絶対に SLP_REQ の前に予告が来る + { + timeout_sleep ++; + if( timeout_sleep == 0 || // オーバーフローを期待。sleepするって言ったけど一瞬で起きて気がつかなかった + ( PIF0 && !SLP_REQ )) // slp割り込みが入った気がしたが、もう起きてしまった + { + PIF0 = 0; + send_getup_to_soc(); + } + if( PIF0 && SLP_REQ ){ + PIF0 = 0; + PM_VDD_ecoMode(); + system_status.pwr_state = SLEEP; + renge_task_interval_run_force = true; + } + } +} + + +/********************************************//** + 起床させるか? + ***********************************************/ +static void chk_awake() +{ + if( !SLP_REQ ){ + PM_VDD_normMode(); + wait_ms( 5 ); // tdly_sw + send_getup_to_soc(); + system_status.pwr_state = ON; + } +} + + + +/********************************************//** + STOP モードへ移行 + 諸々のレジスタ設定があります + ***********************************************/ +static void go_stop() +{ + while( RWST ) + {;} + + RTCIMK = 1; // systick用インターバルタイマー割り込みマスク + +#ifdef _DBG_CHK_OFF_LEAK_ + leak_check(); +#endif + CKC = bits8(0,0,0,0, 1,0,0,1); // 4MHzに落として(bit0)からSTOPしなくてはならない + OSMC = bits8(0,0,0,0, 0,0,0,0); // 5MHz以下モードへ。 + + if( PM_EXTDC_n_RAW ) // きわどいタイミングで挿抜が起きることがある。HAL通さないべき(off中ですし) + { + STOP(); + } + + // 起きる // + // 起きる条件は + // ・KeyReturn割り込み(電源ボタン) + // ・RTCアラーム(現在封印) + + // クロック復帰 + OSMC = bits8(0,0,0,0, 0,0,0,1); // 8MHz動作準備 + nop8(); + CKC = bits8(0,0,0,0, 1,0,0,0); // OSMC.FSEL = 1 後3clk以上開ける +} + +/********************************************//** + FLOWER direct boot チェック + sleep がスライドスイッチになった都合でチェックを強化(なってるのかなぁ) + MCU 側でやること。 + ・sleep になってたら起動しない + ・ただし、home が押されてたら起動させる + ***********************************************/ +static err flower_direct_boot_sleep_check() +{ + if( !SHELL_OPEN ) + { + if( SW_HOME_n ) + { + renge_task_interval_run_force = true; + system_status.pwr_state = OFF_TRIG; + return ERR_ERR; + } + } + return ERR_SUCCESS; +} + + + +/********************************************//** + ポート類を停止モードに。 + こういう回路でも、L出力にしなきゃだめだそうな。 + ***********************************************/ +static void ports_finalize() +{ + SW_WIFI_n_RAW = 0; + PM_SW_WIFI_n = 0; + + SW_HOME_n_JIKKI_RAW = 0; + PM_SW_HOME_n_JIKKI = 0; + + WL_TX = 0; + PM_WL_TX = 0; + + SW_SEL_n = 0; + PM_SW_SEL_n = 0; + + ACCEL_INT1 = 0; + PM_ACCEL_INT1 = 0; + ACC_VALID = 0; + PM_ACC_VALID = 0; + + // PU5 そのまま + PU7 = bits8(0,0,0,0, 1,0,0,1); // PWSWI,PM_EXTTDC,( IRQ0_deactive(), PM_IRQ_deactive ) + PU_SW_HOME_n_JIKKI = 0; // SW_HOME 停止 +} + + + +/********************************************//** + MCU 内部 IRQ の停止 + ***********************************************/ +static void irqs_finalize() +{ + // irqマスク設定 + KRM = ( KR_SW_POW ); // Mask ではなく、Modeなのだそうだ。紛らわしい + MK0 = ~( INT_MSK0_EXTDC | INT_MSK0_WDTI ); + MK1 = ~( INT_MSK1_KR | INT_MSK1_RTCINTVAL ); // INT_MSK1_RTCALARM | RTCアラーム封印中 + MK2L = 0xFF; + + // irqフラグクリア + vreg_ctr[VREG_C_IRQ0] = 0; + vreg_ctr[VREG_C_IRQ1] = 0; + vreg_ctr[VREG_C_IRQ2] = 0; + vreg_ctr[VREG_C_IRQ3] = 0; + + IF0 = 0; + IF1 = 0; + IF2 = 0; +} + + + +static err leds_closed() +{ + vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ILM_OFF; + vreg_ctr[ VREG_C_LED_WIFI ] = WIFI_LED_OFF; + vreg_ctr[ VREG_C_LED_3D ] = LED_3D_ILM_OFF; + info_led_off = true; + + if( LED_duty_pow_blu != 0 ) + { + return ERR_ERR; + } + return ERR_SUCCESS; +} + /********************************************//** PMICが電源異常で止めたか確認 @@ -576,6 +687,21 @@ static void chk_emergencyExit(){ } +/********************************************//** +リブート時、ステータスを何となく更新 + ***********************************************/ +static void restore_status_regs() +{ + u8 bl_status_temp; + + bl_status_temp = read_pmic( PM_REG_ADRS_BL ); + vreg_ctr[ VREG_C_STATUS ] |= (( bl_status_temp & 0x03 ) << 5 ); + set_bit( ( read_pmic( PM_REG_ADRS_VDD_LCD ) != 0 ), + vreg_ctr[ VREG_C_STATUS ], REG_BIT_LCD_POW ); + BT_chk(); +} + + /********************************************//** - 電源ボタン長押し @@ -635,7 +761,8 @@ static void leak_check() volatile u8 ports_i[12]; volatile u8 ports_o[12]; - ports_i[0] = ( PM0 & PU0 & ~P0 ); // プルアップ切り忘れ? + // プルアップ切り忘れ? + ports_i[0] = ( PM0 & PU0 & ~P0 ); ports_i[1] = ( PM1 & PU1 & ~P1 ); ports_i[2] = 0; ports_i[3] = ( PM3 & PU3 & ~P3 ); @@ -648,7 +775,8 @@ static void leak_check() ports_i[10] = 0; ports_i[11] = ( PM20 & PU20 & ~P20 ); - ports_o[0] = ( ~PM0 & P0 ); // H 出力しちゃってるかも + // H 出力しちゃってるかも + ports_o[0] = ( ~PM0 & P0 ); ports_o[1] = ( ~PM1 & P1 ); ports_o[2] = ( ~PM2 & P2 ); ports_o[3] = ( ~PM3 & P3 & ~POM3 ); @@ -663,3 +791,20 @@ static void leak_check() NOP(); // ←ブレーク置くため } #endif _DBG_CHK_OFF_LEAK_ + + + +#ifdef i2c_timeout_test +// for debug +void i2c_timeout_test_init() +{ + LED_duty_pow_blu = 0; + LED_duty_3d = 0; + LED_duty_notify_red = 0; + LED_duty_notify_grn = 0; + LED_duty_notify_blu = 0; + LED_pow_red = 0; + LED_CAM = 0; + i2c_mcu_time_out_error = false; +} +#endif diff --git a/flower_toriaezu2/yav_mcu_bsr.plg b/flower_toriaezu2/yav_mcu_bsr.plg index 96a2427..52ab097 100644 --- a/flower_toriaezu2/yav_mcu_bsr.plg +++ b/flower_toriaezu2/yav_mcu_bsr.plg @@ -1,199 +1,15 @@ C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no loader.c -loader.c(160) : CC78K0R warning W0401: Conversion may lose significant digits -loader.c(161) : CC78K0R warning W0401: Conversion may lose significant digits -loader.c(210) : CC78K0R warning W0505: Operator '==' has no effect -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\loader.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no pm.c -pm.c(546) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(857) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(861) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(889) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(903) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(989) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(998) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1071) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1078) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1217) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1219) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 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 -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_ctr.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no main.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\main.asm -Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no magic.c Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no WDT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\WDT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_mcu.c -i2c_mcu.c(188) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_mcu.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_twl.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no led.c -led.c(90) : CC78K0R warning W0745: Expected function prototype -led.c(375) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\led.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no rtc.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\rtc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2m -qvjl2w -sainter_asm -zpb -no vreg_ctr.c -vreg_ctr.c(159) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(160) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(162) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(165) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(248) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(248) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(253) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(253) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(257) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(257) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(261) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(261) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(265) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 14 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\vreg_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2m -qvjl2w -sainter_asm -zpb -no vreg_twl.c -vreg_twl.c(68) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_twl.c(72) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\vreg_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no adc.c -adc.c(104) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(190) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(241) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(308) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(434) : CC78K0R warning W0745: Expected function prototype -adc.c(463) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(468) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 7 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\adc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2m -qvjl2w -sainter_asm -zpb -no renge\renge.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\renge.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no accero.c -accero.c(121) : CC78K0R warning W0745: Expected function prototype -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\accero.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no self_flash.c -self_flash.c(289) : CC78K0R warning W0401: Conversion may lose significant digits -self_flash.c(290) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\self_flash.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no sw.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\sw.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_debug.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\task_debug.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_misc.c -task_misc.c(380) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(382) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(392) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 3 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\task_misc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_sys.c -task_sys.c(229) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(291) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(569) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(481) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(673) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(691) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 3 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\task_sys.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c -pedo_alg_thre_det2.c(104) : CC78K0R warning W0745: Expected function prototype -pedo_alg_thre_det2.c(120) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\pedo_alg_thre_det2.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no ini_VECT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\ini_VECT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_status.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\task_status.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no led_cam.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\led_cam.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no led_pow.c -led_pow.c(120) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(125) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(178) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(240) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(271) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 5 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\led_pow.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no hal.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\hal.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no batt_params.c -batt_params.c(63) : CC78K0R warning W0401: Conversion may lose significant digits -batt_params.c(63) : CC78K0R warning W0401: Conversion may lose significant digits -batt_params.c(81) : CC78K0R warning W0401: Conversion may lose significant digits -batt_params.c(100) : CC78K0R warning W0401: Conversion may lose significant digits -batt_params.c(100) : CC78K0R warning W0401: Conversion may lose significant digits -batt_params.c(118) : CC78K0R warning W0401: Conversion may lose significant digits -batt_params.c(118) : 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\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\ @@ -221,4 +37,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 77 +Build Total error(s) : 0 Total warning(s) : 17 diff --git a/flower_toriaezu2/yav_mcu_bsr.prj b/flower_toriaezu2/yav_mcu_bsr.prj index 13f655f..5886046 100644 --- a/flower_toriaezu2/yav_mcu_bsr.prj +++ b/flower_toriaezu2/yav_mcu_bsr.prj @@ -1,6 +1,6 @@ [ProjectManager] Version=6.00 -Path=C:\78k_data\yav-mcu-basara\snake_trunk\ +Path=C:\78k_data\yav-mcu-basara\flower_toriaezu2\ Title=yav-mcu Series=78K0R.PM Device=uPD79F0104 @@ -1076,6 +1076,43 @@ VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 VF78K0Rvs= +[IncFile] +Include1=incs_loader.h +Include2=config.h +Include3=jhl_defs.h +Include4=user_define.h +Include5=hal.h +Include6=bsr_system.h +Include7=renge\renge.h +Include8=renge\renge_defs.h +Include9=renge\renge_task_immediate.h +Include10=vreg_ctr.h +Include11=vreg_twl.h +Include12=loader.h +Include13=i2c_mcu.h +Include14=WDT.h +Include15=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +Include16=fsl_user.h +Include17=i2c_ctr.h +Include18=pm.h +Include19=rtc.h +Include20=reboot.h +Include21=magic.h +Include22=incs.h +Include23=i2c_twl.h +Include24=accero.h +Include25=pedometer.h +Include26=sw.h +Include27=adc.h +Include28=led.h +Include29=batt_params.h +Include30=pool.h +Include31=i2c_twl_defs.h +Include32=renge\renge_task_intval.h +Include33=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h +Include34=self_flash.h +Include35=util_funcs.h +Include36=i2c_mcu_sub.h [Options.LK78K0R 0] Version=100 O0=bsr_k0r.lmf @@ -1194,7 +1231,7 @@ ZB= Etcetera0= Etcetera1=boot.lmf CommandFile=0 -OFILE=C:\78k_data\yav-mcu-basara\snake_trunk\bsr.lmf +OFILE=C:\78k_data\yav-mcu-basara\flower_toriaezu2\bsr.lmf [Options.LK78K0R 3] Version=100 O0=bsr_bsr.lmf @@ -1369,40 +1406,3 @@ DefaultMode2=1 DefaultMode3=1 DefaultMode4=1 DefaultMode5=1 -[IncFile] -Include1=incs_loader.h -Include2=config.h -Include3=jhl_defs.h -Include4=user_define.h -Include5=hal.h -Include6=bsr_system.h -Include7=renge\renge.h -Include8=renge\renge_defs.h -Include9=renge\renge_task_immediate.h -Include10=vreg_ctr.h -Include11=vreg_twl.h -Include12=loader.h -Include13=i2c_mcu.h -Include14=WDT.h -Include15=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h -Include16=fsl_user.h -Include17=i2c_ctr.h -Include18=pm.h -Include19=rtc.h -Include20=reboot.h -Include21=magic.h -Include22=incs.h -Include23=i2c_twl.h -Include24=accero.h -Include25=pedometer.h -Include26=sw.h -Include27=adc.h -Include28=led.h -Include29=batt_params.h -Include30=pool.h -Include31=i2c_twl_defs.h -Include32=renge\renge_task_intval.h -Include33=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h -Include34=self_flash.h -Include35=util_funcs.h -Include36=i2c_mcu_sub.h diff --git a/flower_toriaezu2/yav_mcu_bsr.prk b/flower_toriaezu2/yav_mcu_bsr.prk index c34cfc9..1d3d4f7 100644 --- a/flower_toriaezu2/yav_mcu_bsr.prk +++ b/flower_toriaezu2/yav_mcu_bsr.prk @@ -1,15 +1,17 @@ [ProjectManager] -FrameMax=1 -FrameX=150 -FrameY=150 +FrameMax=0 +FrameX=149 +FrameY=179 FrameCX=1200 -FrameCY=850 +FrameCY=959 OpenFile1=ProjectWindow PrjPos=0,0,706,0,291 OpenFile2=loader.c,0,215,59,1446,717,65,88,65,0 -OpenFile3=config.h,0,323,22,1500,759,2,7,2,0 -OpenFile4=OutputWindow -OutputPos=0,106,756,74,1030 +OpenFile3=config.h,0,323,22,1500,759,19,51,19,0 +OpenFile4=sw.c,0,50,50,980,615,0,146,0,0 +OpenFile5=task_sys.c,0,75,75,1005,640,23,588,22,0 +OpenFile6=OutputWindow +OutputPos=0,96,746,129,1085 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/flower_toriaezu2/yav_mcu_bsr.sdb b/flower_toriaezu2/yav_mcu_bsr.sdb index 06d706c..5a82123 100644 --- a/flower_toriaezu2/yav_mcu_bsr.sdb +++ b/flower_toriaezu2/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=511c420e +T=5126c7d7 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=511c420e 9=WDT.h 10=magic.h [pm.c] -T=511c424b +T=51258c8f 1=incs.h 2=adc.h 3=led.h @@ -25,12 +25,12 @@ T=511c424b 9=vreg_twl.h 10=i2c_mcu.h [i2c_ctr.c] -T=511c3fe5 +T=51256880 1=incs.h 2=rtc.h 3=pedometer.h [main.c] -T=511c3fe3 +T=5125687e 1=incs.h 2=rtc.h 3=pm.h @@ -40,35 +40,35 @@ T=511c3fe3 7=i2c_mcu.h 8=pool.h [magic.c] -T=511c3fe4 +T=51270999 1=magic.h 2=config.h [WDT.c] -T=511c3fe3 +T=5125687f 1=incs_loader.h [i2c_mcu.c] -T=511c3fe3 +T=5125687e 1=incs_loader.h 2=i2c_mcu.h 3=loader.h 4=util_funcs.h 5=i2c_mcu_sub.h [i2c_twl.c] -T=511c3fe7 +T=51256883 1=incs_loader.h 2=i2c_twl_defs.h 3=i2c_twl.h 4=vreg_twl.h 5=WDT.h [led.c] -T=511c3fe7 +T=51256882 1=incs.h 2=led.h [rtc.c] -T=511c3fe5 +T=51256880 1=incs.h [vreg_ctr.c] -T=511c3fe2 +T=5125687e 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -82,14 +82,14 @@ T=511c3fe2 11=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 12=fsl_user.h [vreg_twl.c] -T=511c3fe5 +T=51256880 1=incs.h 2=jhl_defs.h 3=led.h 4=vreg_twl.h 5=adc.h [adc.c] -T=511c3fe3 +T=5125687f 1=incs.h 2=adc.h 3=pm.h @@ -97,7 +97,7 @@ T=511c3fe3 5=vreg_twl.h 6=i2c_mcu.h [renge\renge.c] -T=511c3fe3 +T=5125687f 1=renge\renge.h 2=renge\renge_task_intval.h 3=renge\renge_task_immediate.h @@ -107,13 +107,13 @@ T=511c3fe3 7=util_funcs.h 8=bsr_system.h [accero.c] -T=511c3fe7 +T=51256883 1=incs.h 2=accero.h 3=i2c_mcu.h 4=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h [self_flash.c] -T=511c3fe3 +T=5125687f 1=incs_loader.h 2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 3=fsl_user.h @@ -125,7 +125,7 @@ T=511c3fe3 9=WDT.h 10=util_funcs.h [sw.c] -T=511c3fe5 +T=5126faa2 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -134,13 +134,13 @@ T=511c3fe5 6=rtc.h 7=sw.h [task_debug.c] -T=511c3fe2 +T=5125687e 1=incs_loader.h 2=renge\renge.h 3=pm.h 4=accero.h [task_misc.c] -T=511c3fde +T=51256879 1=incs.h 2=renge\renge.h 3=pm.h @@ -150,7 +150,7 @@ T=511c3fde 7=led.h 8=vreg_twl.h [task_sys.c] -T=511c3fe5 +T=51270c08 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -164,17 +164,17 @@ T=511c3fe5 11=i2c_mcu.h 12=vreg_twl.h [pedo_alg_thre_det2.c] -T=511c3fe7 +T=51256883 1=incs.h 2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h 3=accero.h 4=pedometer.h 5=pool.h [ini_VECT.c] -T=511c3fe7 +T=51256883 1=config.h [task_status.c] -T=511c3fe7 +T=51256882 1=incs_loader.h 2=renge\renge.h 3=pm.h @@ -183,41 +183,41 @@ T=511c3fe7 6=i2c_mcu.h 7=led.h [led_cam.c] -T=511c3fe7 +T=51256883 1=incs.h 2=led.h 3=vreg_twl.h [led_pow.c] -T=511c3fe5 +T=51256880 1=incs.h 2=led.h 3=pm.h [hal.c] -T=511c3fe7 +T=51256882 1=incs_loader.h [batt_params.c] -T=511c3fe5 +T=51257c79 1=jhl_defs.h 2=batt_params.h [voltable.c] -T=511c3fe7 +T=51256883 1=incs.h [pedo_lpf_coeff.c] -T=511c3fe2 +T=5125687e 1=incs.h [kanaria.asm] -T=511c3fe7 +T=51256883 [kanaria_c.c] -T=511c3fe2 +T=5125687e 1=incs.h [get_ei.asm] -T=511c3fe3 +T=5125687f [util_funcs.c] -T=511c3fe7 +T=51256883 1=incs_loader.h 2=WDT.h [i2c_mcu-sub.c] -T=511c3fe2 +T=5125687e 1=incs.h 2=i2c_mcu.h 3=loader.h @@ -225,7 +225,7 @@ T=511c3fe2 5=i2c_mcu_sub.h 6=pm.h [incs_loader.h] -T=511c3fe7 +T=51256883 1=jhl_defs.h 2=config.h 3=user_define.h @@ -235,51 +235,51 @@ T=511c3fe7 7=vreg_ctr.h 8=vreg_twl.h [config.h] -T=511c3fe3 +T=51270630 [jhl_defs.h] -T=511c3fe4 +T=51256880 [user_define.h] -T=511c3fe7 +T=51256883 [hal.h] -T=511c3fe7 +T=51256882 [bsr_system.h] -T=511c3fe7 +T=51256883 [renge\renge.h] -T=511c3fe3 +T=5125687f 1=renge\renge_defs.h 2=renge\renge_task_immediate.h [renge\renge_defs.h] -T=511c3fe3 +T=5125687f [renge\renge_task_immediate.h] -T=511c3fe3 +T=5125687f 1=renge\renge_defs.h [vreg_ctr.h] -T=511c3fe2 +T=5125687e 1=config.h [vreg_twl.h] -T=511c3fe5 +T=51256880 [loader.h] -T=511c3fe3 +T=5125687f [i2c_mcu.h] -T=511c3fe3 +T=5125687e [WDT.h] -T=511c3fe3 +T=5125687f [..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h] T=49a3bd4e [fsl_user.h] -T=511c3fe7 +T=51256883 [i2c_ctr.h] -T=511c3fe5 +T=51256880 [pm.h] -T=511c3fe3 +T=51258c8f [rtc.h] -T=511c3fe5 +T=51256880 [reboot.h] -T=511c3fe7 +T=51256883 [magic.h] -T=511c3fe5 +T=51256880 [incs.h] -T=511c3fe3 +T=5125687f 1=jhl_defs.h 2=config.h 3=user_define.h @@ -289,37 +289,37 @@ T=511c3fe3 7=vreg_ctr.h 8=util_funcs.h [i2c_twl.h] -T=511c3fe7 +T=51256883 [accero.h] -T=511c3fe7 +T=51256883 1=jhl_defs.h 2=pedometer.h [pedometer.h] -T=511c3fe2 +T=5125687e [sw.h] -T=511c3fe5 +T=51256880 1=config.h [adc.h] -T=511c3fe3 +T=5125687f 1=jhl_defs.h [led.h] -T=511c3fe7 +T=51256882 [batt_params.h] -T=511c3fe7 +T=51256882 1=jhl_defs.h [pool.h] -T=511c3fe7 +T=51256883 1=pedometer.h [i2c_twl_defs.h] -T=511c3fe7 +T=51256883 [renge\renge_task_intval.h] -T=511c3fe3 +T=5125687f 1=renge\renge_defs.h [..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h] T=45f12258 [self_flash.h] -T=511c3fe3 +T=5125687f [util_funcs.h] -T=511c3fe7 +T=51256883 [i2c_mcu_sub.h] -T=511c3fe2 +T=5125687e