diff --git a/branches/sim/batt_params.h b/branches/sim/batt_params.h index eaa2dfb..3807441 100644 --- a/branches/sim/batt_params.h +++ b/branches/sim/batt_params.h @@ -53,6 +53,7 @@ typedef struct ======================================================== */ const bt_param_ bt_param[ _BT_PARAM_NUM_ ] = { + // ctr //////////////////////////////////////////////// // BT_PARAM_CTR_MAXELL { { @@ -89,22 +90,23 @@ const bt_param_ bt_param[ _BT_PARAM_NUM_ ] = { 0x69, 0x67 }, }, - // BT_PARAM_SPFL_MAXELL !!dummy!! + // spfl /////////////////////////////////////////////// + // BT_PARAM_SPFL_MAXELL { { - 0xAE, 0xF0, 0xB4, 0x30, 0xB7, 0x40, 0xBA, 0x30, - 0xBB, 0x50, 0xBB, 0xB0, 0xBC, 0x50, 0xBD, 0x10, - 0xBD, 0x60, 0xBD, 0xB0, 0xBF, 0xE0, 0xC2, 0xB0, - 0xC4, 0x20, 0xC7, 0xB0, 0xCA, 0xE0, 0xCE, 0x10, - 0x01, 0xF0, 0x14, 0x10, 0x14, 0x20, 0x06, 0x30, - 0x63, 0x90, 0x49, 0x00, 0x6E, 0x00, 0x77, 0x70, - 0x7B, 0x00, 0x19, 0x00, 0x19, 0x00, 0x17, 0xF0, - 0x1C, 0x60, 0x12, 0x00, 0x12, 0x00, 0x12, 0x00 + 0xA1, 0x20, 0xB7, 0x50, 0xB9, 0xD0, 0xBB, 0x00, + 0xBC, 0x30, 0xBC, 0x60, 0xBC, 0xA0, 0xBD, 0x10, + 0xBD, 0xC0, 0xBE, 0x70, 0xBF, 0xD0, 0xC2, 0xA0, + 0xC4, 0x00, 0xC8, 0x50, 0xCC, 0x80, 0xD0, 0xB0, + 0x01, 0xA0, 0x25, 0x10, 0x18, 0xB0, 0x17, 0xC0, + 0x95, 0x20, 0x6F, 0xE0, 0x7C, 0x60, 0x35, 0x10, + 0x35, 0x00, 0x37, 0xF0, 0x16, 0xF0, 0x1C, 0xA0, + 0x17, 0x30, 0x11, 0xD0, 0x11, 0xF0, 0x11, 0xF0 }, 2, - { 92, (u8)(-256* 0.79), (u8)(-256* 4.35) }, - 0xD800, - { 0xEA, 0xE8 } + { 94, (u8)(-256* 0.35), (u8)(-256* 3.85) }, + 0xDAB0, + { 0xF5, 0xF3 } }, // BT_PARAM_SPFL_PANA !!dummy!! diff --git a/branches/sim/bsr.hex b/branches/sim/bsr.hex index 15491b7..5c19a3c 100644 --- a/branches/sim/bsr.hex +++ b/branches/sim/bsr.hex @@ -1,13 +1,13 @@ -:02000000730D7E +:02000000700D81 :02000200FFFFFE -:040010004D494F49BE -:02001C00FC4A9C -:02002400494B46 -:02002A00944BF5 -:08003400BC4C5F4CB84CEE4DD2 -:02004A0051491A -:02005A008C49CF -:02006200724DDD +:040010008249844954 +:02001C00314B66 +:020024007E4B11 +:02002A00C94BC0 +:08003400F14C944CED4C234EFD +:02004A008649E5 +:02005A00C1499A +:02006200A74DA8 :0400C0007EFBFF853F :0A00C4001B339499E033F240BFAA09 :0A00CE00FFFFFFFFFFFFFFFFFFFF32 @@ -16,246 +16,246 @@ :1000F8007110BCFB710014F9EF0B8C015C80D161AD :10010800E8710014F98F14F931030EF6B1BBF661EA :100118004900DD05618900EFF5FDDE01FD3201FDD5 -:100128008A01FD6B02EFAEC0C6D7C7360000674C28 +:100128008A01FD6E02EFAEC0C6D7C7360000674C25 :1001380009DE3F318E04F60FC1317B9EFDC4118963 :100148007267318E04F64F14896142DF03F6EF01BE :10015800E660610667318E124900207267318E04AD :10016800F64F14896142DF03F6EF01E66061068706 -:10017800EFBC40F84F3A61E88666D161E8FDEB06CE +:10017800EFBC40F84F3A61E88666D161E8FDE806D1 :10018800C6D751105B0C319E609F16F94016F901D5 :10019800DF05CD3205EF03CD32078F14F95CE39FFD :1001A80014F951035B04318EE7240000DD1023DDD0 :1001B8000823DF0E712014F9D7713014F9D7714074 :1001C80014F9D7717BFACEA010CEA180E5F300CE4A :1001D800A408F5AAFFD78F14F9310508CD0003CD7F -:1001E8000307EF03CD0306CE23F88F14F931030874 -:1001F800CD0408F690BFB401CF1105F8F521FFCE64 -:1002080022E9CE24F3CE25F2CE26FCCE275FCE2ED1 -:10021800FCCF120511CF350002CF370019CF53009C -:1002280006CBEEFEFFCE3831CE3970CF38050A3016 -:100238008700BF1801BF1A01BF1C01BF1E01D7C725 -:10024800C1C1FBF8FFCEABAC8C02D1DD12616902F3 -:10025800305C03BBF6614900DDEE618900EFF51003 -:1002680004C6D7FD892FFDB338FDC304717AFAFDA2 -:10027800AD23F512F98F14F93105135003FD732BD3 -:10028800625C01D161E8CF12F902CFC5FB64FD6958 -:1002980030FD0045710261712BE7FDB638FD553917 -:1002A80061EDEFF6D7D7C7F616FDC304717BFA31B7 -:1002B800225F0871225F717AFAEF0B717AFAA7F65A -:1002C80047DFE9E2EF01F2C6D7C7C1C1FBF8FF1764 -:1002D800A1C1E0C18C0A70C18C0270FDF902100640 -:1002E800D2DF04F439EF03CD39028C01721004C651 -:1002F800D7C7C1FBF8FFFDAE02D2DD03E2EF618B89 -:1003080070FD1704D2DD0771235F5202EF528C088B -:1003180070FD2C04FD77048B6C0170FD2C043004F7 -:1003280000BF2401301740BF1C01300400BF220168 -:100338008C0A91DF04F6BF2A01710BE2CE44FF312B -:1003480082E202EFFAAC0C148E449961790C61696F -:100358000A8C0AD1DFDAFDA004710BE271235FF287 -:10036800C0C6D7C7C1FBF8FFFDAE02D2DD03E2EF7E -:1003780025710AE68B70FD1704D2DD0771235F52E1 -:1003880002EF138C0870FD2C048C0A70FD2C04FD00 -:10039800A00471235FF2C0C6D7C7C1FBF8FFFDAE4A -:1003A80002D2DD03E2EF65710AE6710BE28B70FDA4 -:1003B8001704D2DD0771235F5202EF50710BE2314F -:1003C800125F39C73430FBAC0C1652048B99A5A7C1 -:1003D80092DFF9C63184BD02EFFA717ABDCEB1441D -:1003E800CBB430FB8C0A318EBEB8CEBB48714BE122 -:1003F800714BE5710ABD8C089E44EF0F710BE68CBA -:10040800089E448C0A9D38AC0CBD36F2C0C6D7C7CE -:1004180016FD4F0417FD2C04D2DD06FDA004E2EF03 -:1004280001F2C6D7C716710AE6710BE2669E44311F -:1004380082E202EFFAF6420401DD09AF0401BF0CC3 -:1004480001E2EF01F2C6D7AF2801085CFB08BF281C -:1004580001FDAD02AF28015CFBBF2801300400BFDD -:100468002A01301780BF1C01300400BF2201D7AF1A -:100478002401086C0408BF2401AF28016C0F086C24 -:100488000B08BF2801FDAD02AF2A01085CFB08BFBD -:100498002A01FDAD02ED4F04300400BF2401F6BF70 -:1004A8002A01300B0BBF2801FDAD02300B0FBF280E -:1004B80001FDAD02300F0FBF2801D731345F01D7DE -:1004C80071225F710BBD0000717BBD713A25713AD5 -:1004D800236A0E03713205713B25713203713B2388 -:1004E800500AFD47027120F000FDAD02F6BF26015B -:1004F8005024BF1401CB440014300F0FBF280171E2 -:10050800135F710BE2710AE6FD4F04CE44FF31829E -:10051800E202EFFAFDA004AF0401BF0C0171235FF2 -:1005280071325FD731245F02EFFAFD7704713A2503 -:10053800713A235A0EFC713305713B2571330371EF -:100548003B237128F00071335FD7C7880616FDAECC -:1005580002D2DD03E2EF38710AE650A4FD1704D297 -:10056800DD0771235F5202EF2617FD2C046770FD2B -:100578002C04FD770450A4FD2C045020FD2C04D934 -:1005880034FBFD2C04A034FBFDA00471235FF2C6EC -:10059800D7C72008FBF8FFFDE9085014C15008FD33 -:1005A8001B08C0CC07048C074C14DE0C8C07318E5A -:1005B800FD550A615907EFEECC07048C074C14610E -:1005C800C8ED8706CC06008C064C0461C8ED6606AB -:1005D8003018F9BC02F6BBCEABAC31B2D109C73684 -:1005E80041057184C6DEF3F1C73641057184C661E1 -:1005F800DC9C05713BD1AC02148F400599715050B9 -:1006080005617902617900F0E1614900DD09C736C9 -:1006180041057184C6DEC3F1C73641057184C661E0 -:10062800DC0E059C055040C18C07318E31AD128C13 -:1006380006318E318D03BDD831FFBDDADADAADD897 -:10064800FD210DC0D2DD0C5008C15014FD1B08C09F -:10065800FDDE0B8C05D1DF06615906EDCF058C0751 -:10066800318EFD590AD2DD0C5008C15014FD1B080B -:10067800C0FDDE0B8C05D1DF06615907EDC305719E -:10068800605005CC0400CC05008C054C09DE2B8C91 -:1006980005318E04F61FC1317B9EFDC41189728C11 -:1006A80005318E04F64F14896142DF03F6EF01E647 -:1006B800600E049C04615905EFCF41001140F81FFA -:1006C8003A61E86159048C04D1DF08FDDF0BFDF1C4 -:1006D8000CEF0C5008C15014FD1B08C0FDDE0B10B8 -:1006E80008C6D7C72004FBF8FF715B21CC0100F6D0 -:1006F800BC02AC02440900DE3EAC0204F60F144111 -:1007080000118972AC020C5014896142DF03F6EFC4 -:1007180001E6600E019C01AC021249005072AC0265 -:1007280004F67F14896142DF03F6EF01E6600E01EB -:100738009C01617902EFBB40F67FFF61F8615901C6 -:100748008C01D161F8EDE907CC0100717AFAFDC39B -:1007580004711300711B20710303710205E0C1507D -:1007680003FD622BC05013FD4702500FC1E0FD622C -:100778002BC0CEABAC6159018C0191DD068C014CCC -:1007880003DF03E6EF01F66061FB7151018C014C58 -:100798000861F8CC010031320705A042FCEF03F5EF -:1007A80042FC4042FC11DC0DF542FCF0C15003FD57 -:1007B800622BC0EF12E6BC02F6614902DDB400000C -:1007C8000000617902EFF1CE3708CBE4FFFFCBE6FA -:1007D800FFF7CED4FFCF370008F5120561FDF5AB62 -:1007E800FFFDE908D25008C15014FD1B08C0D2FD16 -:1007F800DE0B1004C6D73184BD02EFFA717BBDCB86 -:10080800E4FFFFCBE6FFFFCBD4FFFF717ABED771C1 -:100818007BBED7C7C1200CFBF8FF8C0C318E31ADE5 -:10082800C1317B9DD4C0BC068DD49C088C149C0B14 -:100838008C14318E040C00128C0B318EBDD813FD34 -:10084800B00F61C8EDE408CEABACCC05068C0B311B -:100858008EFD510AD2DD158C0B318EFD550A61696A -:10086800058C05D1DFE7FD1708E2EF71CC0A008C93 -:100878000A4C04DE54F6BC023018F9BBAC06148CE2 -:10088800089EFD118972AB146299AC06A1BC066181 -:100898007900617902F0E1614902DFE05040C18CE2 -:1008A8000B318E31AD128C0A318E318D03BDD831AA -:1008B800FFBDDADADAADD8FD210DC0D2DD06FD17AD -:1008C80008E2EF1961590AEFA68C0B318EFD590A1F -:1008D800D2DD03E2EF0761590BED3808F2100EC6BE -:1008E800D7C7717B9D717BFAFDFE073018F9FD04AF -:1008F8000BFD8F0AC6D7FDE908FDDE0BFD1708F5CD -:10090800ABFFF2D7C7316462067110C9FBEF0471FF -:1009180018C9FB8FC9FB7FE8FC76D1DD5C8FC9FB6A -:100928009FE8FC4012F903DF22665C10D1DD1C8FC2 -:10093800C9FB5C10D1DD0B5080C15011FDBE34C025 -:10094800EF095040C15011FDBE34C04012F903DD1B -:10095800064012F904DF22665C02D1DD1C8FC9FB58 -:100968005C02D1DD0B5040C15010FDBE34C0EF0910 -:100978005020C15010FDBE34C0C6D7C78F0CFC76BE -:100988008F0DFC77665C80D1DD10675C80D1DF0558 -:10099800711362EF0B711262EF0671040771116235 -:1009A800665C40D1DD10675C40D1DF05712362EFE2 -:1009B8000B712262EF06711405712162665C01D128 -:1009C800DD10675C01D1DF05713362EF0B713262B4 -:1009D800EF06713407713162665C02D1DD10675C25 -:1009E80002D1DF05714362EF1D714262EF184015B5 -:1009F800F901DF08710402714162EF0AC736100578 -:100A080071C4C6714162665C04D1DD10675C04D1B3 -:100A1800DF05715362EF0B715262EF067144077183 -:100A28005162665C08D1DD10675C08D1DF0571632F -:100A380062EF0B716262EF06711407716162665CA6 -:090A480010D161E8715AD1C6D742 -:100A51005208EF065203EF025206FEE600FE1B00AB -:100A6100DC16089F03088F0408089F040862FE240F -:100A710000089F0408EEBF00EEBA00C1C514410E84 -:100A810011D9D0FF118FD1FF312E45C4C0D7F2311A -:100A9100A2C401E2D79DE261DD4C09DF12717BFA4C -:100AA100C18F06089F31FDC0CF060800EE27003137 -:100AB100F2FA04CF0608004C00DF05D50008DD1668 -:100AC10061DD717BFAD50608DD0ACDE31F61CD61D9 -:100AD100CDEE160061CDFED40061FFFE9A00FCF858 -:100AE100FF0EFEB20061CDFED5004C09DF0EC18FB5 -:100AF10006086F31FD9F0608C0EE0400CF0608000E -:100B0100F8E3D75200EF025202FE3700CF30FD006A -:100B1100CF060800BF0408C716629F0008410011F4 -:100B21008F22229B4100118F23229F0108C6510071 -:100B3100FE62FFEF025205CF060800C1510CFE0A0A -:100B410000C0D7C1511DFE0200C0D761DD717BFA23 -:100B510070CEC0A59EC47CFF9EC4609EC461CDD7EB -:100B610061DD717BFAC18EC45C1BFED6FFCF060826 -:100B710001FED7FFC061CDD731F2FA1AC1AEE4BF91 -:100B810022FDAEE6BF24FDAED4BF26FD30FFFFBE81 -:100B9100E4BEE6BED4C0D731F2FA11C1AF22FDBE28 -:100BA100E4AF24FDBEE6AF26FDBED4C0D7C1BF2849 -:100BB100FD13BF2AFD15BF2CFD17BF2EFDC0D7AFFA -:100BC10028FDDB2AFDEB2CFDFB2EFDD7534B3052CC -:100BD1005430324E323030475631323000FFC1503E -:100BE100FEFEAB0061DD717BFACF060800FE0A0054 -:100BF100FEA4FF61CDF8E3EECF00C7FB0408BF22DE -:100C0100FD8FC0009C05C5C337040600BF24FD3518 -:100C110036430C300000522BFE6600C2C4C630F1D0 -:100C21000BB800300000B8022004AF24FDB800303A -:100C31000F00B802AF22FD61FF520AFE3AFFECF845 -:100C4100FF0E717BFAC1C7FB04088C05C65C80FEF0 -:100C51000200C0D761DD717BFA70CFC0FFA59FC0D4 -:100C6100007CFF9FC000609FC00061CDD7618BFEFB -:100C7100E2FF717BBE410011FB000017CEFC006159 -:100C8100CB089EFDF31161C999A58392DFF7D7FEC9 -:100C9100B1FED530FDDF23C1CF0308035109FEF4B6 -:100CA100FDC0D2DF37FE3800A20408CF0308075188 -:100CB10009FEE1FDD2B20408DF22C7FB040831833B -:100CC10002C6D7C6510AFECCFD624C1FDF06CF30EB -:100CD100FD01EF04CF30FD00C0EE5BFEC0EE55FE1E -:100CE100C7C1FB04088B31196C0161589BC0C6D781 -:100CF100717BFAFE4DFEAF0408040600C11436559F -:100D01000C300000522DF3FE77FF8FC000FE2BFE4A -:100D110061CF5C807C8073C0041900CEFC0F61CB75 -:100D2100C55404EF03C55417FE18FEC7360008BBAF -:100D3100629C0288089C03D1DD334C41DE2F70F1A7 -:100D4100312DB161090033081C000851FF612A41AE -:100D51000E118FD0FF613B118FD1FF6138DC0E8BFB -:100D61005C03DF0964C6C4FE2BFDEECAFDC6C4EEFA -:020D7100C3FDC0 -:100D730061CF5100718C7109FECBF800FEFCCB01F1 -:100D830000F6BF00F953C0F693935820FEDFF941F4 -:100D93000036FE4D34F2FCEF05118B99A7A51744DD -:100DA3002E4EDFF53602F930F2FCEF04CC0000A73B -:100DB30047DFF94100362E4E3420FEEF05118B99A3 -:100DC300A7A51744364EDFF53628FE305EFEEF0446 -:100DD300CC0000A747DFF9FCD80000EFFE61DD710E -:100DE3007BFABEF0ADD8BEF200AEF661CDD7C361DB -:100DF300DD717BFABEF0ADD8BEF200DBF6FFADDCF1 -:100E0300BEF000AEF6BDD8AEF40312ADDABEF2000A -:100E1300AEF661CD03BDDAC2D7C3F33174D908830B -:100E2300C1F626D8BDD8C031750683C312F623C2D6 -:100E3300FD3E0E93DF0312F623C2D7440000DD26E6 -:100E430061DD717BFACFE80080BEF6F6BEF4BEF238 -:100E5300ADD8BEF0CFE800818FE8003103FAAEF0E1 -:100E6300F5E80061CDD7B1D7C3F33174D90883C195 -:100E7300F626D8BDD8C0317505C312F623C2FD8C42 -:100E83000E93DF0312F623C2D7440000DD2761DD92 -:100E9300717BFACFE80080BEF6F6BEF4BEF2ADD8A1 -:100EA300BEF0CFE800818FE8003103FAAFE000F530 -:100EB300E80061CDD7ADD8D7C3F33174DB0F83C15D -:100EC300F626D8BDD861317026DABDDAC031750D8A -:100ED30083C312F626DCBDDC61317023C2FDF40E40 -:100EE30093DF0CF626D8BDD861317026DABDDAC29D -:100EF300D7C161686BDC6BDDC0DD2F61DD717BFA0F -:100F0300CFE80080BEF4ADDCBEF6ADD8BEF0ADDAFE -:100F1300BEF2CFE800818FE8003103FAAEF0BDD80E -:100F2300AEF2BDDAF5E80061CDD7F6BDD8BDDAD7AC -:100F33008292DD2B61DD717BFACFE80080BEF0F693 -:100F4300BEF2BEF46208BEF6CFE800818FE800313E -:100F530003FAAFE0006072AEF0F5E80061CDD76050 -:100F630072F6B1D706DABDDAADDC06D8BDD861D8E2 -:100F7300A6DAD7D1DD17C1C3DAD89DD8ADDA311CD3 -:100F830061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD66 -:100F93001BC1C3DADA9DDAADD8311E33311E33718A -:100FA300F9B4DADFF4BDD813BDDAC2C0D746D8DD51 -:100FB3000771FF7177D971C0D75BDB9DDB605BDAAB -:100FC3009DDAADDC5BD9085BD808BDD8D7C3C7F3BE -:100FD300728EFDC162314C410036F44D1161A07235 -:070FE300C09EFD62C6C2D7EB -:0A0FF60031383A31353A323100004B -:0A20000031383A31353A3231000030 +:1001E8000307EF03CD030ECE23F88F14F931030B69 +:1001F800CD0408CD0508F690BFB401CF1105F8F578 +:1002080021FFCE22E9CE24F3CE25FACE26FCCE2736 +:100218005FCE2EFCCF120511CF350002CF37001963 +:10022800CF530006CBEEFEFFCE3831CE3970CF3833 +:10023800050A308700BF1801BF1A01BF1C01BF1E85 +:1002480001D7C7C1C1FBF8FFCEABAC8C02D1DD1220 +:10025800616902305C03BBF6614900DDEE6189002B +:10026800EFF51004C6D7F50CFCF50EFCCF14FCFF17 +:10027800CF10FCFFCF11FCFFFD8D2FFDB738FDD847 +:1002880004717AFAFDB123F512F98F14F9310513C7 +:100298005003FD772B625C01D161E8CF12F902CFE0 +:1002A800C5FB64FD6D30FD3545710261712BE7FDBD +:1002B800BA38FD593961EDEFF6D7D7C7F616FDD82C +:1002C80004717BFA31225F0871225F717AFAEF0BB1 +:1002D800717AFAA7F647DFE9E2EF01F2C6D7C7C19C +:1002E800C1FBF8FF17A1C1E0C18C0A70C18C027074 +:1002F800FD0E031006D2DF04F439EF03CD39028C6A +:1003080001721004C6D7C7C1FBF8FFFDC302D2DDD6 +:1003180003E2EF618B70FD2C04D2DD0771235F527D +:1003280002EF528C0870FD4104FD8C048B6C017047 +:10033800FD4104300400BF2401301740BF1C0130C8 +:100348000400BF22018C0A91DF04F6BF2A01710B59 +:10035800E2CE44FF3182E202EFFAAC0C148E4499EB +:1003680061790C61690A8C0AD1DFDAFDB504710B79 +:10037800E271235FF2C0C6D7C7C1FBF8FFFDC30215 +:10038800D2DD03E2EF25710AE68B70FD2C04D2DD85 +:100398000771235F5202EF138C0870FD41048C0A29 +:1003A80070FD4104FDB50471235FF2C0C6D7C7C113 +:1003B800FBF8FFFDC302D2DD03E2EF65710AE671C7 +:1003C8000BE28B70FD2C04D2DD0771235F5202EF24 +:1003D80050710BE231125F39C73430FBAC0C165246 +:1003E800048B99A5A792DFF9C63184BD02EFFA7193 +:1003F8007ABDCEB144CBB430FB8C0A318EBEB8CEB8 +:10040800BB48714BE1714BE5710ABD8C089E44EF06 +:100418000F710BE68C089E448C0A9D38AC0CBD36D7 +:10042800F2C0C6D7C716FD640417FD4104D2DD0625 +:10043800FDB504E2EF01F2C6D7C716710AE6710BE3 +:10044800E2669E443182E202EFFAF6420401DD09D7 +:10045800AF0401BF0C01E2EF01F2C6D7AF280108D3 +:100468005CFB08BF2801FDC202AF28015CFBBF2866 +:1004780001300400BF2A01301780BF1C013004007E +:10048800BF2201D7AF2401086C0408BF2401AF289C +:10049800016C0F086C0B08BF2801FDC202AF2A01CE +:1004A800085CFB08BF2A01FDC202ED6404300400A9 +:1004B800BF2401F6BF2A01300B0BBF2801FDC20281 +:1004C800300B0FBF2801FDC202300F0FBF2801D724 +:1004D80031345F01D771225F710BBD0000717BBDA4 +:1004E8006A0E03713B25713B23500AFD4A027120B5 +:1004F800F000FDC202F6BF26015024BF1401CB4410 +:100508000014300F0FBF280171135F710BE2710ADD +:10051800E6FD6404CE44FF3182E202EFFAFDB50441 +:10052800AF0401BF0C0171235F71325FD731245FC3 +:1005380002EFFAFD8C04713A25713A235A0EFC71C8 +:1005480028F00071335FD7C7880616FDC302D2DDD5 +:1005580003E2EF38710AE650A4FD2C04D2DD0771DE +:10056800235F5202EF2617FD41046770FD4104FD29 +:100578008C0450A4FD41045020FD4104D934FBFDF6 +:100588004104A034FBFDB50471235FF2C6D7C72030 +:1005980008FBF8FFFDE6085014C15008FD1808C014 +:1005A800CC07048C074C14DE0C8C07318EFD520AE4 +:1005B800615907EFEECC07048C074C1461C8ED8431 +:1005C80006CC06008C064C0461C8ED63063018F9A9 +:1005D800BC02F6BBCEABAC31B2D109C7364105710E +:1005E80084C6DEF3F1C73641057184C661DC9C051B +:1005F800713BD1AC02148F40059971505005617957 +:1006080002617900F0E1614900DD09C736410571F1 +:1006180084C6DEC3F1C73641057184C661DC0E05A8 +:100628009C055040C18C07318E31AD128C06318E3D +:10063800318D03BDD831FFBDDADADAADD8FD1E0D34 +:10064800C0D2DD0C5008C15014FD1808C0FDDB0BEA +:100658008C05D1DF06615906EDCC058C07318EFD7E +:10066800560AD2DD0C5008C15014FD1808C0FDDB35 +:100678000B8C05D1DF06615907EDC0057160500587 +:10068800CC0400CC05008C054C09DE2B8C05318E82 +:1006980004F61FC1317B9EFDC41189728C05318E11 +:1006A80004F64F14896142DF03F6EF01E6600E0499 +:1006B8009C04615905EFCF41001140F81F3A61E8E9 +:1006C8006159048C04D1DF08FDDC0BFDEE0CEF0C46 +:1006D8005008C15014FD1808C0FDDB0B1008C6D720 +:1006E800C72004FBF8FF715B21CC0100F6BC02AC0B +:1006F80002440900DE3EAC0204F60F1441001189E1 +:1007080072AC020C5014896142DF03F6EF01E66017 +:100718000E019C01AC021249005072AC0204F67F33 +:1007280014896142DF03F6EF01E6600E019C016166 +:100738007902EFBB40F67FFF61F86159018C01D166 +:1007480061F8EDE607CC0100717AFAFDD80471135F +:1007580000711B20710303710205E0C15003FD669F +:100768002BC05013FD4A02500FC1E0FD662BC0CECE +:10077800ABAC6159018C0191DD068C014C03DF03A0 +:10078800E6EF01F66061FB7151018C014C0861F8DC +:10079800CC010031320705A042FCEF03F542FC40D2 +:1007A80042FC11DC0DF542FCF0C15003FD662BC084 +:1007B800EF12E6BC02F6614902DDB40000000061F8 +:1007C8007902EFF1CE3708CBE4FFFFCBE6FFF7CE97 +:1007D800D4FFCF370008F5120561FDF5ABFFFDE644 +:1007E80008D25008C15014FD1808C0D2FDDB0B1008 +:1007F80004C6D73184BD02EFFA717BBDCBE4FFFF9D +:10080800CBE6FFFFCBD4FFFF717ABED7717BBED793 +:10081800C7C1200CFBF8FF8C0C318E31ADC1317B88 +:100828009DD4C0BC068DD49C088C149C0B8C1431B0 +:100838008E040C00128C0B318EBDD813FDAD0F61E8 +:10084800C8EDE108CEABACCC05068C0B318EFD4E65 +:100858000AD2DD158C0B318EFD520A6169058C05B3 +:10086800D1DFE7FD1408E2EF71CC0A008C0A4C04D2 +:10087800DE54F6BC023018F9BBAC06148C089EFD99 +:10088800118972AB146299AC06A1BC06617900614A +:100898007902F0E1614902DFE05040C18C0B318EF2 +:1008A80031AD128C0A318E318D03BDD831FFBDDADE +:1008B800DADAADD8FD1E0DC0D2DD06FD1408E2EF70 +:1008C8001961590AEFA68C0B318EFD560AD2DD0349 +:1008D800E2EF0761590BED3508F2100EC6D7C77164 +:1008E8007B9D717BFAFDFB073018F9FD010BFD8C30 +:1008F8000AC6D7FDE608FDDB0BFD1408F5ABFFF2D1 +:10090800D7C7316462067110C9FBEF047118C9FBBF +:100918008FC9FB7FEAFC76D1DD5C8FC9FB9FEAFCBF +:100928004012F903DF22665C10D1DD1C8FC9FB5C25 +:1009380010D1DD0B5080C15011FDC234C0EF0950F9 +:1009480040C15011FDC234C04012F903DD06401207 +:10095800F904DF22665C02D1DD1C8FC9FB5C02D181 +:10096800DD0B5040C15010FDC234C0EF095020C10A +:100978005010FDC234C0C6D7C78F0CFC768F0DFC53 +:1009880077665C80D1DD10675C80D1DF057113620A +:10099800EF0B711262EF06710407711162665C4019 +:1009A800D1DD10675C40D1DF05712362EF0B712246 +:1009B80062EF06711405712162665C01D1DD106772 +:1009C8005C01D1DF05713362EF0B713262EF0671A2 +:1009D8003407713162665C02D1DD10675C02D1DFD9 +:1009E80005714362EF1D714262EF184015F901DF8E +:1009F80008710402714162EF0AC736100571C4C656 +:100A0800714162665C04D1DD10675C04D1DF057159 +:100A18005362EF0B715262EF0671440771516266BF +:100A28005C08D1DD10675C08D1DF05716362EF0BEC +:100A3800716262EF06711407716162665C10D161C0 +:060A4800E8715AD1C6D787 +:100A4E005208EF065203EF025206FEE600FE1B00AE +:100A5E00DC16089F03088F0408089F040862FE2412 +:100A6E0000089F0408EEBF00EEBA00C1C514410E87 +:100A7E0011D9D0FF118FD1FF312E45C4C0D7F2311D +:100A8E00A2C401E2D79DE261DD4C09DF12717BFA4F +:100A9E00C18F06089F31FDC0CF060800EE2700313A +:100AAE00F2FA04CF0608004C00DF05D50008DD166B +:100ABE0061DD717BFAD50608DD0ACDE31F61CD61DC +:100ACE00CDEE160061CDFED40061FFFE9A00FCF85B +:100ADE00FF0EFEB20061CDFED5004C09DF0EC18FB8 +:100AEE0006086F31FD9F0608C0EE0400CF06080011 +:100AFE00F8E3D75200EF025202FE3700CF30FD006E +:100B0E00CF060800BF0408C716629F0008410011F7 +:100B1E008F22229B4100118F23229F0108C6510074 +:100B2E00FE62FFEF025205CF060800C1510CFE0A0D +:100B3E0000C0D7C1511DFE0200C0D761DD717BFA26 +:100B4E0070CEC0A59EC47CFF9EC4609EC461CDD7EE +:100B5E0061DD717BFAC18EC45C1BFED6FFCF060829 +:100B6E0001FED7FFC061CDD731F2FA1AC1AEE4BF94 +:100B7E0022FDAEE6BF24FDAED4BF26FD30FFFFBE84 +:100B8E00E4BEE6BED4C0D731F2FA11C1AF22FDBE2B +:100B9E00E4AF24FDBEE6AF26FDBED4C0D7C1BF284C +:100BAE00FD13BF2AFD15BF2CFD17BF2EFDC0D7AFFD +:100BBE0028FDDB2AFDEB2CFDFB2EFDD7534B3052CF +:100BCE005430324E323030475631323000FFC15041 +:100BDE00FEFEAB0061DD717BFACF060800FE0A0057 +:100BEE00FEA4FF61CDF8E3EECF00C7FB0408BF22E1 +:100BFE00FD8FC0009C05C5C337040600BF24FD351C +:100C0E0036400C300000522BFE6600C2C4C630EED9 +:100C1E000BB800300000B8022004AF24FDB800303D +:100C2E000F00B802AF22FD61FF520AFE3AFFECF848 +:100C3E00FF0E717BFAC1C7FB04088C05C65C80FEF3 +:100C4E000200C0D761DD717BFA70CFC0FFA59FC0D7 +:100C5E00007CFF9FC000609FC00061CDD7618BFEFE +:100C6E00E2FF717BBE410011FB000017CEFC00615C +:100C7E00CB089EFDF31161C999A58392DFF7D7FECC +:100C8E00B1FED530FDDF23C1CF0308035109FEF4B9 +:100C9E00FDC0D2DF37FE3800A20408CF030807518B +:100CAE0009FEE1FDD2B20408DF22C7FB040831833E +:100CBE0002C6D7C6510AFECCFD624C1FDF06CF30EE +:100CCE00FD01EF04CF30FD00C0EE5BFEC0EE55FE21 +:100CDE00C7C1FB04088B31196C0161589BC0C6D784 +:100CEE00717BFAFE4DFEAF0408040600C1143652A5 +:100CFE000C300000522DF3FE77FF8FC000FE2BFE4E +:100D0E0061CF5C807C8073C0041900CEFC0F61CB78 +:100D1E00C55404EF03C55417FE18FEC7360008BBB2 +:100D2E00629C0288089C03D1DD334C41DE2F70F1AA +:100D3E00312DB161090033081C000851FF612A41B1 +:100D4E000E118FD0FF613B118FD1FF6138DC0E8BFE +:100D5E005C03DF0964C6C4FE2BFDEECAFDC6C4EEFD +:020D6E00C3FDC3 +:100D700061CF5100718C7109FECBF800FEFCCB01F4 +:100D800000F6BF00F953C0F693935820FEDFF941F7 +:100D90000036344E34F4FCEF05118B99A7A51744A7 +:100DA000624EDFF53602F930F4FCEF04CC0000A708 +:100DB00047DFF9410036624E3420FEEF05118B9972 +:100DC000A7A517446A4EDFF53628FE305EFEEF0415 +:100DD000CC0000A747DFF9FCD80000EFFE61DD7111 +:100DE0007BFABEF0ADD8BEF200AEF661CDD7C361DE +:100DF000DD717BFABEF0ADD8BEF200DBF6FFADDCF4 +:100E0000BEF000AEF6BDD8AEF40312ADDABEF2000D +:100E1000AEF661CD03BDDAC2D7C3F33174D908830E +:100E2000C1F626D8BDD8C031750683C312F623C2D9 +:100E3000FD3B0E93DF0312F623C2D7440000DD26EC +:100E400061DD717BFACFE80080BEF6F6BEF4BEF23B +:100E5000ADD8BEF0CFE800818FE8003103FAAEF0E4 +:100E6000F5E80061CDD7B1D7C3F33174D90883C198 +:100E7000F626D8BDD8C0317505C312F623C2FD8948 +:100E80000E93DF0312F623C2D7440000DD2761DD95 +:100E9000717BFACFE80080BEF6F6BEF4BEF2ADD8A4 +:100EA000BEF0CFE800818FE8003103FAAFE000F533 +:100EB000E80061CDD7ADD8D7C3F33174DB0F83C160 +:100EC000F626D8BDD861317026DABDDAC031750D8D +:100ED00083C312F626DCBDDC61317023C2FDF10E46 +:100EE00093DF0CF626D8BDD861317026DABDDAC2A0 +:100EF000D7C161686BDC6BDDC0DD2F61DD717BFA12 +:100F0000CFE80080BEF4ADDCBEF6ADD8BEF0ADDA01 +:100F1000BEF2CFE800818FE8003103FAAEF0BDD811 +:100F2000AEF2BDDAF5E80061CDD7F6BDD8BDDAD7AF +:100F30008292DD2B61DD717BFACFE80080BEF0F696 +:100F4000BEF2BEF46208BEF6CFE800818FE8003141 +:100F500003FAAFE0006072AEF0F5E80061CDD76053 +:100F600072F6B1D706DABDDAADDC06D8BDD861D8E5 +:100F7000A6DAD7D1DD17C1C3DAD89DD8ADDA311CD6 +:100F800061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD69 +:100F90001BC1C3DADA9DDAADD8311E33311E33718D +:100FA000F9B4DADFF4BDD813BDDAC2C0D746D8DD54 +:100FB0000771FF7177D971C0D75BDB9DDB605BDAAE +:100FC0009DDAADDC5BD9085BD808BDD8D7C3C7F3C1 +:100FD000728EFDC162314C4100362A4E1161A07201 +:070FE000C09EFD62C6C2D7EE +:0A0FF60031383A30383A3237000043 +:0A20000031383A30383A3237000028 :10200A00AEF0B430B740BA30BB50BBB0BC50BD1014 :10201A00BD60BDB0BFE0C2B0C420C7B0CAE0CE1038 :10202A0001F0141014200630639049006E00777096 @@ -265,12 +265,12 @@ :10206A00B860BA50BFA0C6B0CE90D02000200020E1 :10207A00002000207B30686020001700173012F023 :10208A000DE007F00700093001C001C00100AB00F4 -:10209A000000670020DA6967AEF0B430B740BA30A2 -:1020AA00BB50BBB0BC50BD10BD60BDB0BFE0C2B03C -:1020BA00C420C7B0CAE0CE1001F0141014200630B4 -:1020CA00639049006E0077707B001900190017F0C1 -:1020DA001C6012001200120002005C003600A70009 -:1020EA0000D8EAE88C309C10A5E0B040B1C0B2003C +:10209A000000670020DA6967A120B750B9D0BB00F9 +:1020AA00BC30BC60BCA0BD10BDC0BE70BFD0C2A059 +:1020BA00C400C850CC80D0B001A0251018B017C0F9 +:1020CA0095206FE07C603510350037F016F01CA0C3 +:1020DA00173011D011F011F002005E00A70027009E +:1020EA00B0DAF5F38C309C10A5E0B040B1C0B20074 :1020FA00B250B310B490B620B860BA50BFA0C6B000 :10210A00CE90D02000200020002000207B30686084 :10211A0020001700173012F00DE007F00700093011 @@ -297,709 +297,714 @@ :10226A004E011926344453626E777D80807D776EE5 :10227A00625344342619100A08080808080808088E :02228A000A1038 -:10228C00D512F9DD0D8FF2FCB0F2FCD1DF4DCFF29F -:10229C00FC1EFD4623FDE82231325E0D31045E0941 -:1022AC0031126205713304EF03713204FD1F2331C7 -:1022BC00225E05714202EF03714302D42ADD05B49C -:1022CC002A714202314402067140C9FBEF04714885 -:1022DC00C9FB4012F90161E8FD1426D74A284BDCF2 -:1022EC00134A28B9DE0E4004F928DE04A004F9D7FD -:1022FC0071335ED74A283EDC054A28BDDC0E40050A -:10230C00F928DE04A005F9D771325ED7F504F9F58A -:10231C0005F9D73122620E4006F902DE04A006F957 -:10232C00D771235ED73132040A40C5FB3CDE047101 -:10233C00235ED771225EF506F9D7C7C1FBF8FF7192 -:10234C00445E711762DE5771146271415E31146222 -:10235C00127130C9FB5002C15011FDBE34C0CD2AE0 -:10236C0032EF3B7138C9FBE0C15011FDBE34C0F4F3 -:10237C002A17C15002FD4A2BC0D2DF0D8B318E3192 -:10238C008D080E01081C00BD2CAD2C44009BDC05F7 -:10239C00D5C5FBDF095020C15011FDBE34C0C0C6ED -:1023AC00D7C78D2076FDEF23D515F9DD0571035EBA -:1023BC00EF2FFD7E2B664B2061F831545E1A715362 -:1023CC005EFDC304664C07DD0381DF098F14F93110 -:1023DC000303FD7824FD8C2471025E306825FD0B0F -:1023EC0039C6D7C77162017172015005FD470250A1 -:1023FC0008FD8837629D285009FD88376276716325 -:10240C0001711814F94A28F1DC05E515F9EF224A97 -:10241C002804DE1ACF15F9025008C1506CFDD10208 -:10242C00C092DF0DD439DF09711014F9EF03F515E3 -:10243C00F94015F901DF05710A22EF06710B2271C3 -:10244C000302CD20075700674C08DE107309D22118 -:10245C00614EDC05679D20EF0387EFEB4A2007DF19 -:10246C0009D515F961F8CF15F903C6D7500AFD4700 -:10247C0002304000C15006FD2D2BC05096ED470296 -:10248C00C72006FBF8FFD515F961E8ED6425304A45 -:10249C0057C1503EFD2D2BC0D2DD077100C8FBED9E -:1024AC0064257108C8FB17A1C15004C1500CC15060 -:1024BC006CFDF9021006EA30AA48318D12AA483197 -:1024CC008E616B08616A08C1500EFD2D2BC0F69011 -:1024DC00C1500CFD2D2BC0CC00008B4C04DE2631E2 -:1024EC00245F02EFFA71125FEA308B5010D605C1EF -:1024FC005010C18BD6044000C1506CFDA1031006D6 -:10250C00615900EFD550A5FD4702EA30AA48318D3C -:10251C0012AA48318E616B08616A08C1500EFD2DFC -:10252C002BC050A5FD47025004C1506CFDD102C018 -:10253C00629C05EA308A4B4E0561C3048A4A4E05FB -:10254C0017A1C15004C1500CC1506CFDA103100661 -:10255C00F6C1503EFD2D2BC01006C6D7C78F07F90C -:10256C004B2861F8ED11264009F928DE06A009F97F -:10257C00ED1126F509F98D289F07F98D285070D695 -:10258C0012307351230480001231FF318E039F08E7 -:10259C00F99FC4FBF68F08F97C804C95DC1C8F08E6 -:1025AC00F9318F241400EA30BDD8AA44FDE00D1295 -:1025BC0031FF318E03318F16EF1A8F08F9318F24CA -:1025CC001400EA30BDD8AA46FDE00D1231FF318E61 -:1025DC0003318F16EA308A427217F3031644000156 -:1025EC0071FE61C836FF001701DE02F61617BD50EA -:1025FC00C7500CFD2D2BC0D2DF078D289F07F9EF9C -:10260C00047100C8FBF2C6D7C72008FBF8FF4015C1 -:10261C00F901DD064015F902DF3217040600FD252D -:10262C002CD2DF0A8C069C058C079C04EF06CC058B -:10263C0063CC040017040600FD422CD2DF078C0685 -:10264C009FC7FBEF04CFC7FBC8ED43271704060059 -:10265C00FD252CD2DD107100C8FB71035ECC05008A -:10266C0071025FED1C278C06318E318D080E070828 -:10267C001C00BD2CEA308A4072AD2CFD330FBD2CF2 -:10268C008D2D9C06D1DF08CC0601CC0700EF048D04 -:10269C002C9C0717040200FD422CD2DF738C029F86 -:1026AC00C7FB8C02318E318D080E03081C00BD2C2B -:1026BC004401A5DC09CC0164F6BF0AF9EF52AD2C3C -:1026CC00220AF94401A0DC09CC011EF6BF0AF9EF7D -:1026DC003FAD2C44819DDC0BCC010A30F401BF0AC8 -:1026EC00F9EF2DAD2C44019BDC0BCC010530F40132 -:1026FC00BF0AF9EF1BAD2C440191DC0BCC0100306F -:10270C00F401BF0AF9EF0971025F30F401BF0AF955 -:10271C003132040C31245E08CC0564CC0400EF1774 -:10272C008C064E01DE0A8C069C058C079C04EF0778 -:10273C008C019C05CC04008C059FC5FB8C049FC6AA -:10274C00FBFDB22B8F0CF94E05DD2B40C5FB0BDED0 -:10275C0006400CF90BDE1640C5FB06DE06400CF9F4 -:10276C0006DE0AD5C5FBDF0ED50CF9DD095020C1FC -:10277C005011FDBE34C08FC5FB9F0CF9FDEF2B1023 -:10278C0008C6D7C7D832C15002FD622BC04016F91B -:10279C000161F8712010055012FD47028D326C0852 -:1027AC0070C15002FD622BC05003FD47028D326C8C -:1027BC001870C15002FD622BC05016FD4702500329 -:1027CC00FD732B625C01D1DD107170C9FB5002C12D -:1027DC005013FDBE34C0F2EF01E2C6D7C75004FD62 -:1027EC00732B625C03D1DD405014FD7F2834C9FB90 -:1027FC00895C9F998A0C7CFF50FF5C14D1DD228A86 -:10280C000C7CFF5C147234CDFB89616A9971620790 -:10281C005600316207058666D1DFF7716307716B6D -:10282C002734DCFB895CEB99712810055002FD7391 -:10283C002BD2DD354016F901DF05500AFD47028D1C -:10284C00326C1070C15002FD622BC0E0FD4702D803 -:10285C0032C15002FD622BC05033FD4702F0C15013 -:10286C0002FD622BC07178C9FBE0C15013FDBE3470 -:10287C00C0C6D7C7C12004FBF8FFCC02005004FD32 -:10288C00732B629C038C045C20D1DD0E8C036C01D9 -:10289C009C038C026C209C02EF138C045C10D1DD29 -:1028AC000C8C035CFE9C038C026C109C028C045CF4 -:1028BC0008D1DD0E8C036C029C038C026C089C020C -:1028CC00EF138C045C04D1DD0C8C035CFD9C038C3D -:1028DC00026C049C028C03D1DD05501AFD47028C5E -:1028EC000370C15004FD622BC08FC9FB5C9F728CBE -:1028FC0003318E316D148C03318E314D616D086155 -:10290C006C5C606162629FC9FB8FD5FB7CFF50FFE2 -:10291C005E02D1DD278FD5FB7CFF5E027234CDFBCE -:10292C0089616A99716207CC0100316207086159AB -:10293C00018C01D1DFF4716307716B27F21006C6AD -:10294C00D7D9BDFBC15006FD622BC0D9BEFBC1500F -:10295C0007FD622BC0D7FD4D29F2D7C7711300714B -:10296C001B20710303710205E0C15003FD622BC0F3 -:10297C005013FD4702F0C15005FD622BC0500FC132 -:10298C00E0FD622BC0500AFD47027103055008FDA3 -:10299C004702501FC1E0FD622BC05012FD47025090 -:1029AC0003FD732B625C01D1DF03E2EF24F0FD73B6 -:1029BC002B629D2E3602F9C75008FD4A2BC05003DE -:1029CC00C1FD622BC0710203711A20FD0A2BF42980 -:1029DC00F2C6D75003FD732B625C01D1DD15501488 -:1029EC00FD7F28FDE8275014FD4702E0C15003FD90 -:1029FC00622BC0711300711B207103035014FD472F -:102A0C0002F0C1E0FD622BC0F0C15003FD622BC08F -:102A1C00D7C72004FBF8FFCC02008D299C03501073 -:102A2C00C150A4FDD102C0629D29D439DD04F2ED60 -:102A3C00E72A8C037B295C08D1DD0F8D295C08D13A -:102A4C00DF05CC0210EF03CC02208C037B295C0445 -:102A5C00D1DD158D295C04D1DF088C026C049C023D -:102A6C00EF068C026C089C028FC8FB5CF3728D29FC -:102A7C005C0C6162629FC8FB8FD4FB7CFF50FF5ED5 -:102A8C00029C02D1DD1F34CCFB896E029971620766 -:102A9C00CC0100316207086159018C01D1DFF4715E -:102AAC006307716B278D295C40D1DD095002C15041 -:102ABC0012FDBE34C08D295C01D1DD08E0C150127D -:102ACC00FDBE34C0717AFA8D295C41D1DD0C5A29D6 -:102ADC00BED829C15010FD5205C0F21004C6D7FD56 -:102AEC008F27F2D7FDE827F2D7C78FDCFB7617FDCF -:102AFC007F28664FDCFBDFF2F5DCFBF2C6D75064B7 -:102B0C00FD4702FD5A2C6261FB71115EF171145E7E -:102B1C0061DC70C15012FD5205C0FD6436CD3F031F -:102B2C00D7C7C1C1FBF8FFAC0ABB17C15002C18C9F -:102B3C000270C1506CFDA10310061004C6D7C7C1AA -:102B4C00FBF8FFAC08C15002C18B70C1506CFDF991 -:102B5C00021006C0C6D7C78806166770C1C7508456 -:102B6C00FD6B031004C6D7C716C75084FDD102C035 -:102B7C00C6D7C74A2004DE045600EF0256014016A1 -:102B8C00F901DF048686EF0A4016F902DF045104CE -:102B9C00610666318F12504CD633514CD6610A0403 -:102BAC000A20BD30C6D740C5FB51DC05CF1CFC0F3D -:102BBC00D740C5FB33DC05CF1CFC0BD740C5FB0B4A -:102BCC00DC05CF1CFC07D740C5FB0661D8313204AD -:102BDC0005CF1CFC03D7D5C5FBDD04E51CFCD7F5E4 -:102BEC001CFCD7D512F9DF0471635ED7FD5A2C6239 -:102BFC0061FB71715E71145E71775E61C831625EEA -:102C0C001771625E71745E71115EF171745E61DCDC -:102C1C0070C15012FD5205C0D7C7164010FCFFDD25 -:102C2C000C8F10FC9B1714CA0100F2EF07C750045D -:102C3C00FD4A2BC0C6D7C7164011FCFFDD078F110C -:102C4C00FC9BF2EF07C75002FD4A2BC0C6D740C50C -:102C5C00FB0BDE02E2D7F2D771000105717850054B -:102C6C00713AD5713BD1713ADD713BD98F10055C4E -:102C7C00FC9F1005CF54054AE542057110420571C1 -:102C8C00004205714850057130500571205005CF38 -:102C9C00530505CF52050A7130510571205105714C -:102CAC003BD5717050058F11055CFC9F1105F4220A -:102CBC00D77178500571080105D77140F000717813 -:102CCC003002713AE6713BE2713BEA713BEE8F10D8 -:102CDC00055CFC9F1005CF34024AE552FF711A5275 -:102CEC00710A52714830027130300271203002CFBB -:102CFC00330205CF32020A71303102713BE671703A -:102D0C0030028F11055CFC9F110571603002D77188 -:102D1C007830027148F000D7C788061666614FDD1F -:102D2C000967614EDE0396EF01866672C6D7C71639 -:102D3C001714AA0412A943DD29AA0412A923FD36EB -:102D4C004EC3AC02FD364E13C2BDD813FDB00FDE20 -:102D5C000C1714AA0212AA0403BA04EF051714A93B -:102D6C00BA04AC041231FF319E03317F087208C6DD -:102D7C00D77100F200304400BFB601300188BF901B -:102D8C0001300984BF9E01BF9C01BF9A01BF98010D -:102D9C00BF9601BF9401BF9201F53CFF30FE00BF0E -:102DAC00BE01F6BFBC01BFB80150EEBFBA01A1BF56 -:102DBC00B201C918FE00F6BE6EBE64BE6A71230471 -:102DCC007153078F14F9310507F5E3FBCB6CFF004A -:102DDC0071535F71425FD730EF00BFB401F6BFBAD9 -:102DEC00017108F20071230471530771435FD78F8F -:102DFC009AFBB09AFBD1DF7331D4D106715BD1E56C -:102E0C009CFBD59CFBDD347140C8FBD99BFBF1E7E7 -:102E1C0034020023DD0625DD0325DF05F6BE66EF53 -:102E2C0006D9E2FBF1BE66A09BFB409BFB20DF06B4 -:102E3C00F59BFBB09CFBCF9AFB19D7CF9AFB1E716D -:102E4C0048C8FBD5E4FBDF04F6BE66D7D9E2FBF13C -:102E5C004266FFDD16D9E2FBF112AE6643DE05A237 -:102E6C0066FFEF03B266FFCF9AFB03D7C7161714A2 -:102E7C00F6B9AA0412F6231231FF31AE03316FBA40 -:102E8C0002C6D7C7C1FBF8FF8C085080D612AB1412 -:102E9C0013B9AB14AA0412A92312D937FBF133BD11 -:102EAC00D813FD1C0EBA02C0C6D731645F01D740DF -:102EBC0012F902DF10F6BE64BE6EBE6ABFA4FBBF81 -:102ECC00AAFBBFB0FB31545F1530A0FBFD782E3050 -:102EDC00A6FBFD782E30ACFBFD782EED6A2F3174FD -:102EEC005F0F71735F7108E8FBF59EFBF59DFBEFBF -:102EFC006DD59DFBDF658F36FB9F9DFB409EFB1FB9 -:102F0C00DC1A7100E8FB4038FBFFDD22A09FFB8F31 -:102F1C0038FB4F9FFBDE17F59EFBEF12D99EFBF1A2 -:102F2C00A1605C1F9F9EFB7108E8FBF59FFBE99E6F -:102F3C00FB093AFB70C130A0FBFD8F2EC0E99EFB54 -:102F4C00095AFB70C130A6FBFD8F2EC0E99EFB0910 -:102F5C007AFB70C130ACFBFD8F2EC0B09DFB30A056 -:102F6C00FBFD3A2DF313BE6E30A6FBFD3A2DF31389 -:102F7C00BE6A30ACFBFD3A2DF313BE64D7C736F0F6 -:102F8C000071F4DC297170F000CE9D08CE9EC0CE8D -:102F9C009F80F594FFF593FFF592FFE597FFE5967B -:102FAC00FFE595FFE598FFCE9C7F7100BCFB711B84 -:102FBC00E3712BE3711AE7712BE7717A9D710A9E0D -:102FCC0031929E02EFFA710B9E7103607113607166 -:102FDC002360C6D7C73102601E710260710A9E3130 -:102FEC00929E02EFFA34EAFB3692FF52078B99A5B8 -:102FFC00A792DFF9710B9EC6D7C7880616311260EF -:10300C0015711260C734B2FB3092FF1652078B99C0 -:10301C00A5A792DFF9C666736718B2FBC6D7C7714E -:10302C0003603114601E711360710A9E31929E020E -:10303C00EFFA3492FF36B2FB52078B99A5A792DFB9 -:10304C00F9710B9E31246013712360717B9E8FF29A -:10305C00FB9E9A8FF3FB9E9B717A9EC6D7CFBDFBCE -:10306C005CCFBEFB5FCFDEFB5DCF12FC36CF13FC1B -:10307C00C9E5E9FBD7C7CFBAFB11CFBBFB37CFE212 -:10308C00FBFFF5E3FBF5E4FBF5E5FBF5E6FB560092 -:10309C00664C64DE08723836FB0086EFF3C6D7C781 -:1030AC0088061617F1E73403002361E3EDEE3323B2 -:1030BC0061F8ED9C31B12361E3EDA3312561F8EDAD -:1030CC00B231B1240D0061D8EDEE33240B0061F860 -:1030DC00EDD3312361F8ED1A322361F8EDE731239A -:1030EC0061F8EDB23324060061F8ED8332B125614D -:1030FC00D8ED9F3224000061F8EDAC322361F8ED7D -:10310C00EE332361F8EDCC33B12361E3EDCF322301 -:10311C0061F8EDE0322361F8EDF1322361F8EDE076 -:10312C00322361F8ED02332361F8ED13332361F898 -:10313C00ED22332361F8ED44332361F8ED50332352 -:10314C0061F8ED5C332361F8ED65332402002361F3 -:10315C00E3EDEE3324020061F8ED6E332361F8EDFC -:10316C007B332561F8ED8733B124060061D8EDEE91 -:10317C003324000061F8EDF1332561F8ED9333242D -:10318C00120061F8EDAD332361F8ED9E33EDF233AF -:10319C00679FBCFBEDFF33306229FD0B396673670B -:1031AC0018BAFBEDFF3340BFFB6ADF1440C0FB686D -:1031BC00DF0E674C6CDF09303242FD0B39713AD5AA -:1031CC00679FC1FBEDFF3367D1DD06303E3DFD0B44 -:1031DC003934DAFB89616F99EDFF33675C02D1DD1D -:1031EC000830EB2AFD0B39EF0C675C01D1DD0630A2 -:1031FC00F02AFD0B39675C3CD1DD1030F52AFD0B54 -:10320C0039675C3C7266736218BAFBEDFF3367D1A9 -:10321C00DD625C01D1DD05300800EF01F6609F191D -:10322C00FC675C02D1DD03E6EF01F63419FC896121 -:10323C006899675C04D1DD04E6A1EF01F63419FC52 -:10324C0089616899675C08D1DD05302000EF01F6D3 -:10325C003419FC89616899675C10D1DD0530100068 -:10326C00EF01F63419FC89616899675C20D161E83B -:10327C00716019FCEDFF33D434DF08679FE3FBA4C6 -:10328C0034EF0D4A3405DE08E83467181DFDA4340C -:10329C00EDFF33675C0F7266736218BAFBEDFF3398 -:1032AC004A3464DE1B4A3401DF0667D161F85701EA -:1032BC00E834671836FBA4344A340561C871725F70 -:1032CC00EDFF33675C7F70C117F1243000FD0530D2 -:1032DC00C0EDFF33675C3F70C117F1243000FD0572 -:1032EC0030C0EDFF33675C0770C117F1243000FD6F -:1032FC000530C0EDFF33675C1F70C117F12430003F -:10330C00FD0530C0EDFF336770C117F1243000FDAF -:10331C000530C0EDFF33CEABAC710A9E31929E02EC -:10332C00EFFAD592FFDF05710B9EEFED679E997159 -:10333C000B9E9FF1FBEDFF33712260675C7F9FF268 -:10334C00FBEDFF33712260675C3F9FF3FBEDFF33B6 -:10335C00675C3F9FF4FBEDFF33675C1F9FF5FBED54 -:10336C00FF3330093BFD0B39679FFAFBEDFF333020 -:10337C00C43AFD0B39679FFBFBEF7830E63AFD0B47 -:10338C0039679FFEFBEF6C675C01D161E8FD00457E -:10339C00EF614A3AC8DE08E83A671868FAA43AEFCF -:1033AC0052679D3AEF4D67318E247000DD0D24027B -:1033BC0000DF4030FE08FD0B39EF38FD0044EF33E1 -:1033CC00675C01D1DD05711202EF03711302675CBA -:1033DC0002D1DD05712202EF03712302679FE9FB25 -:1033EC00EF1100EF0E00664C5BDE07736718BAFB3B -:1033FC00EF0100C6D7C716664C30DC094C37DE052A -:10340C00FDE02FEF6E664C02DF1F8FBCFB5C03727E -:10341C008F1BFC5C03318E316D08616A08128F1BA7 -:10342C00FC5C80312A6162EF59664C3DDF0AAE903C -:10343C00BF16FCF916FCEF4A664C3EDF05F917FC8B -:10344C00EF40664C4FDF05FD2245EF36664C61DFE1 -:10345C0008E83A0968FA72EF29664C7FDF05FDAE81 -:10346C003DEF1F664C4EDF0B316461045210EF12BE -:10347C00F2EF0F664C5BDC0452FFEF06667309BA81 -:10348C00FB72C6D7C788061617F124100024050056 -:10349C00DC07244C00DD17EF17717BFA17F104BA27 -:1034AC00FB1489617F99717AFA713260EF02A43A48 -:1034BC00C6D7C7C1C1FBF8FF4012F903DD064012A5 -:1034CC00F904DF2F8C027309C2FB5E0AD1DF248C56 -:1034DC0002318E04BAFB14896E0A99716207CC0111 -:1034EC0000316207086159018C01D1DFF471630767 -:1034FC00716B271004C6D7CF1BFC03F519FCF51D07 -:10350C00FCF51FFCD7C788061617F1E73402002517 -:10351C00DD3D23DD1725DD1C23DD0523DD2BEF3BF6 -:10352C00716260679F1EFCCD3F03EF2F675C839F2A -:10353C001BFCEF27675C039F1DFC675C034C02615F -:10354C00F8710262FD1547EF12679F1FFCEF0C67C5 -:10355C0091DF08E0C15012FDBE34C0C6D7C71617A4 -:10356C00F1E7240000DD2A23DD1E240300DD0724FF -:10357C00FB00DD24EF2531126205308000EF01F6EF -:10358C00086F1CFC7208EF198F19FCF519FC72EF0F -:10359C00107142615235EF09F2EF0666730918FC9F -:1035AC0072C6D7C71617F1E7240000DD38241000C7 -:1035BC00DD1C23DD1C23DD30240E00DD182411005E -:1035CC00DD1B240F00DD12243000DD15EF1EE2EFB1 -:1035DC001D5202EF195204EF155206EF115205EF6E -:1035EC000D5207EF09F2EF065203EF0252FFC6D756 -:1035FC00C7314460377143608D3E9FC2FB8D3D9F48 -:10360C00E1FB36FAFCC7D83DFDB937618A70618A97 -:10361C00FDFE37C0D842F1312F609D418D3C4B41AE -:10362C00DD0A7152608D419D3CCD3F034A3F05DE62 -:10363C0009306E36FD0B39CD3F6BB43F7150F00045 -:10364C00CE300BCF170006CE3106FDAD02717A30AD -:10365C00710BE3710BE7C6D78D419D3C8D419FC328 -:10366C00FBD74012F903DF064012F904DF02F2D750 -:10367C003154600D7153607173608D419F28FCEF64 -:10368C003831646023716360717260D51EFCDF0594 -:10369C00F529FCEF0B8F1EFC5002D6A1609F29FC74 -:1036AC008F29FC9F28FCEF11317460088F29FC9F37 -:1036BC0028FCEF058D419F28FC8F28FC9FC3FBD96C -:1036CC0028FCFDE136E928FC09DA2170C15013FD14 -:1036DC005205C0F2D7C7C1C1FBF8FF8C02D1DF0580 -:1036EC00F51EFCEF1A8C024C05DE06CF1EFC02EF19 -:1036FC000E8C02318E1231FE03311F609F1EFC8F27 -:10370C002AFC4F1EFCDD29CC011F8F1EFC9F2AFCBE -:10371C00CC00008B4C08DE148B73091A224F1EFC54 -:10372C00DC058B9C01EF05615900EFE78C019D4096 -:10373C001004C6D7C7168B728C01614ADE1F8B72C0 -:10374C008C02614ADE138C01728C02614ADE058C9C -:10375C000172EF268C0272EF218B72EF1D8B728C33 -:10376C0002614ADE048B72EF118C01728C02614291 -:10377C00DE058C0172EF038C0272C6D7C716710A74 -:10378C00E7710BE37150F000CE300BCF17000666DB -:10379C009E31FDAD02717A30710BE33182E302EFA1 -:1037AC00FA8D1F7158F000710BE772C6D7C7C1C1F3 -:1037BC00FBF8FF8F12FC4E02DC03F2EF318C024F50 -:1037CC0013FCDC0452FFEF268C022F12FC706131CB -:1037DC00318D128F13FC2F12FC70613133BDD81355 -:1037EC00FD3E0EBB440001DC03F690BB8B72100453 -:1037FC00C6D7C7C1FBF8FFAC0814A91489708B613C -:10380C0028706131FD364E1344030071FEDC23AC8D -:10381C0008148A04819A04AC08148A044C11DC1034 -:10382C00A9148B99AC0814CA0200AC0814CA031072 -:10383C00EF72AC0814CA0400AC0814A914894DDE4C -:10384C000AAC08148A02819A02EF12AC0814A9146B -:10385C00894D61D308AC08148A02919A02AC081401 -:10386C008A03919A03D1DF3CAC08148A024C10DF16 -:10387C0010A91489318EA112AC0814A9146299EF05 -:10388C0017AC08148A024CF0DF0EA91489318EB1E2 -:10389C0012AC0814A9146299AC0814CA0200AC0842 -:1038AC0014CA0310C0C6D7EDF638717BFAC7D444DE -:1038BC0061F83104612E710461712161710361D46D -:1038CC0044DD05B444CEABAC717AFA5600664C0AB2 -:1038DC00DD1272F3311C7900FDCEFC0061CAFD557E -:1038EC003986EFE9717AFAF2C6D7C75600664C0AE8 -:1038FC00DE0BF0317E12F6782CFC86EFF0C6D7C7C3 -:10390C00C1C1FBF8FFCC01008C014C0ADE36717B87 -:10391C00FA8C01F0317E042CFC14A96168DF09AC2F -:10392C0002B9717AFAF2EF1D8C01F0317E12792C0A -:10393C00FC614902DF06717AFAE2EF09717AFA61E9 -:10394C005901EFC4E21004C6D7C72004FBF8FFF6F8 -:10395C00422CFC61F8ED3A3A717BFA9C038C034CD7 -:10396C000ADE3C8C03F0317E042CFC14A96168DF68 -:10397C0005717AFAEF29717AFA8C0372F3311C799A -:10398C002CFCCEFC0061CA629C02D1DF0A8C03F0D5 -:10399C00317E12E6782CFC717BFA615903EFBECCB8 -:1039AC000200CC01018C02F0317E042CFC14A961C4 -:1039BC0068DD7B8C02F0317E12792CFCE743DF68EA -:1039CC008C014C0ADE628C01F0317E12792CFCE702 -:1039DC0043DD50717BFA8C01F0317E042CFC14A970 -:1039EC006168DF1B616901717BFA8C01F0317E1219 -:1039FC00F6782CFC717AFA8C024E01DCE7EF2F8CF6 -:103A0C0001F0317E042CFC14A9128C02F0317E33AF -:103A1C00782CFC8C01F0317E12E6782CFC6159027A -:103A2C00717AFA615901EF98615902EDB13900F2DE -:103A3C001004C6D7C72006FBF8FF34FFFBC55006A1 -:103A4C00C150A8C15030FDF9021006D2DD1DA040B6 -:103A5C00FC4040FC08DE03E2EF5A34FAFB895CFCC4 -:103A6C0099FD093B7110C8FBF2EF49F540FC8FFA48 -:103A7C00FB5C01D1DD264012F903DF205010C18020 -:103A8C00FDBE34C0C736100571D4C6DE0F17C15049 -:103A9C0006C150A8C15030FDF90210064012F901C0 -:103AAC00DD114012F905DD0B8FFAFB5C02D161E8E8 -:103ABC00FD3742F21006C6D7D9FBFBC15030FDD101 -:103ACC0002C0629FFEFB7130CBFB8FD3FB5C08D135 -:103ADC00DF06716307716B27F2D7D9FEFBC1D9FDE5 -:103AEC00FBC15030FD6B0310047130CBFB8FD3FB4B -:103AFC005C08D1DF06716307716B27F2D7C7200A08 -:103B0C00FBF8FF500FC15030FDD102C04A3902DF23 -:103B1C00077110C8FBF2EF5F7118C8FBCC070040AF -:103B2C0015F901DF05CC0802EF03CC0810CC098095 -:103B3C008FFAFB5C03D1DF08717AD5CC0607EF0650 -:103B4C00717BD5CC062F17040600C15004C150A0C0 -:103B5C00C15030FDA1031006C736100571D4C6DE66 -:103B6C00154012F903DF0F17C15006C150A8C15000 -:103B7C0030FDF9021006F2100AC6D74012F902DF26 -:103B8C0003F6BD46B014FDD514FD61E8EDAD3CCF98 -:103B9C0014FD048F12F9318FE723DD0B240200246E -:103BAC00030061C8EDAD3C8F14F931233F301B008D -:103BBC004646DF0AE0C15010FDBE34C0EF1D307721 -:103BCC00014646DF165002C15010FDBE34C0F64609 -:103BDC004CDF088FDEFB5010D6BD4CF6464CDD3763 -:103BEC00B64CE6464CDF3071025FEF2B301B0046C3 -:103BFC0046DF13F6464EDF18E0C15010FDBE34C050 -:103C0C00C94EE803EF0A307701464661F871025F4E -:103C1C00F6464E61E8B64E31346208713361F6BD3A -:103C2C0046EF1431346105F6BD46EF0BA646F64659 -:103C3C004661F8C946FFFF314262194A4805DE1653 -:103C4C00A4484A4805DF0FA4485004C15010FDBEDB -:103C5C0034C0EF02F448314462194A4A05DE16A416 -:103C6C004A4A4A05DF0FA44A5008C15010FDBE3421 -:103C7C00C0EF02F44AD44BDD03B44BD73152621778 -:103C8C004A4905DE14A4494A4905DF0DA4495010E0 -:103C9C00C1FDBE34C0EF02F4494A490661F8CD4B70 -:103CAC0025D7C736100571D4DE0730403AFD0B39E5 -:103CBC00D24012F903DF1D31220706301D2AFD0BFD -:103CCC00393144610C7143615080C15012FDBE34D6 -:103CDC00C0FDE53CFD103DC6D78F1BFC5C01D1DD62 -:103CEC0022D545FCDD04B045FCD7CF45FC098D4001 -:103CFC004F44FCDD0E8D409F44FC5040C15012FDE2 -:103D0C00BE34C0D74012F903DD04F6BD1AD7D5E690 -:103D1C00FBDF08F6461ADD19B61AD7D9E2FBF146D5 -:103D2C001ADD0ED9E2FB12AD1A43DE03A61AD7B682 -:103D3C001AD7C78FDAFB76F5DAFB5C10D161E87124 -:103D4C005261665C0FD1DD57665C01D1DD05F51261 -:103D5C00F9EF4C665C02D1DD11E0C15003FD622B22 -:103D6C00C0711300711B20710303665C04D1DD115B -:103D7C00711300711B20D51BFC61F8710303FD034B -:103D8C0035665C08D161E87103035005FD4702718B -:103D9C0002035003C1FD622BC0711A20FD0A2BF2E5 -:103DAC00C6D7C72014FBF8FF4A3413DC0552FFEDCD -:103DBC00993E8F14F9311505300400EF0F8F14F96B -:103DCC00314505300500EF04D915F9F1609C018DE2 -:103DDC002E9C028D209C038F02F99C048F03F99C6E -:103DEC00058D509C068D289C0771345EE66130125F -:103DFC0071045E61DC31196162629C08CC09018F2F -:103E0C0016F99C0AF171240461DC9C0BAE6C609C6D -:103E1C000CAD1A609C0DAE6E609C0EAE6A609C0F71 -:103E2C00AE64609C10F171540761DC9C11AE66604D -:103E3C009C1231246205304000EF01F6C13134048C -:103E4C0005302000EF01F6C2616B08616A08C131D0 -:103E5C00546205300400EF01F6C2616B08616A0818 -:103E6C00C131446204E6A1EF01F6C2616B08616ADC -:103E7C0008C131346203E6EF01F6C2616B08616A76 -:103E8C009C13A434D834F1B107A11489721014C650 -:103E9C00D7C7FD83098F12F9318FE724000061F831 -:103EAC00ED6B4023DD1B2361F8ED753F2361F8EDCD -:103EBC00F13F2361F8ED3A402361F8ED1D41ED68C7 -:103ECC0040D513F9DF2AF64646DD05F516FDEF035E -:103EDC00A016FD4016FD65DC0ACF12F905710261D2 -:103EEC00EDAB41AD46440A0061D8EDAB41E513F9A9 -:103EFC00713261F5DDFBFDC30471535EFDAD2340F2 -:103F0C0015F903DF09710261F512F9EDAB41FD14EE -:103F1C002640C7FB9BDE09710261F512F9EDAB413E -:103F2C00714A277140110571301105713A22715A8D -:103F3C002271501105FD6729D2DD09710261F5125C -:103F4C00F9EDAB4171103500CF37001D71401205F2 -:103F5C004013F901DF05F5E3FBEF04CFE3FB03CFDF -:103F6C0012F902FD4D29EDAB41FD642CFDC62C71FF -:103F7C004A9DFD0335FD8130F537FF712BE0F513BC -:103F8C00F9710261CBE43FEFCBE6F6F0FDC30471AF -:103F9C003BD47112027123028F14F931052850049D -:103FAC00FD732B625C03318E315D34C9FB89616812 -:103FBC00995002FD732BD2DD067170C9FBEF0471B1 -:103FCC0078C9FBFDAD23FD7D2D710814F9CF12F9D5 -:103FDC00038FBCFB5C02D1DD095080C15010FDBECB -:103FEC0034C0EDAB41FDAD413154612FA452D452DC -:103FFC00DD0831A4E00A31020C06712BE0FD2342EE -:10400C0031A4E01731040C13712BE05027C150057B -:10401C00FD622BC0CF12F904710261FD18428F149E -:10402C00F931250731146203F512F9EDAB41FDAD01 -:10403C004131020C14F0C15005FD622BC05005FD3E -:10404C004702FD2342CF12F903FD18428F14F931B8 -:10405C00250731146203F512F9EDAB41F512F9CFD6 -:10406C00E3FB03F5E4FBF5E6FB71525FF6426CFFF4 -:10407C0061E8EDAB41F6BD4C71035FF5FAFBFD0950 -:10408C003BFDE32DFDBD2CFD1B2D714B9D711302D2 -:10409C00712302F5CAFBF5CBFBF5CCFBF5CDFB315F -:1040AC00245F02EFFACE3708CBE4BFFFCBE6FFF17B -:1040BC00CED4FFCF37000971481205F6BEE0BEE240 -:1040CC00BED0716A27FDDF29714307714B277148F8 -:1040DC0010057148110571381005713811057133CF -:1040EC0002713B22715302715B2271581005715899 -:1040FC001105FD2C05CF12F905713261F6BD46F59F -:10410C000CFCF50EFCCF14FCFFCF10FCFFCF11FC08 -:10411C00FFF513F9F516FD3112622EFDAD23AD46F8 -:10412C00440B0061C8E512F9D515F961E8FD2C05C1 -:10413C008F14F9312511F50EFCF50CFC502EFD47B2 -:10414C0002E513F9E512F9EF56D42ADF52FD2C05DE -:10415C00FD462371730171320471430271035E7168 -:10416C00525E31949E02EFFA712AE7CEA409F5F360 -:10417C00003114620ED50CFCDF064010FCFF61F818 -:10418C000061FDE5F300CEA40831146206713361C1 -:10419C00E512F9712BE78F14F9312503F512F9C6E5 -:1041AC00D7D546FCDF1A310200155003FD732B6284 -:1041BC005C01D1DF07F512F9710261D7E546FCD736 -:1041CC004046FCF0DF0831040041F546FCD7404680 -:1041DC00FCC8DF0BF512F9710261CF46FCF0D73148 -:1041EC0002000A4046FCFFDD22A046FCD7F0C1507D -:1041FC0004FD622BC08FC9FB5C9F9FC9FB7110DA59 -:10420C00FB303E3DFD0B39CF46FCF0D731045F0649 -:10421C00F512F9710261D7715361F452717207FD95 -:10422C00AD02717307D7FD9905F2D7C7200CFBF8C7 -:10423C00FF8F00FCF0F9FFFBF303FD364E13BC04BB -:10424C008F02FCF0F901FCF303FD364E13BC028F18 -:10425C0004FCF0F903FCF303FD364E13BBAC04BDB8 -:10426C00D8F6BDDAAC04311EBDDCF6BDDEFDF10DB9 -:10427C00ADD8BDDCADDABDDEAC02BDD8F6BDDAAC76 -:10428C0002311EDADCC3DADEC3BDDCF6BDDEFDF1C5 -:10429C000DC0BDDEC0BDDCADDEFD670FADD8BDDC35 -:1042AC00ADDABDDEABBDD8F6BDDAAB311EDADCC3A0 -:1042BC00DADEC3BDDCF6BDDEFDF10DC0BDDEC0BD7A -:1042CC00DCADDEFD670FDADAADD8FD1046C3C58F65 -:1042DC00E0FC5C3FF0317E0460FC14C2C0B9A0E08D -:1042EC00FCF6BC08BC0A9C078C074C2EDD3E8FE00C -:1042FC00FC0E0770F161DC605C3FF0317E1279607E -:10430C00FCBDD8F6BDDA8C0773092422318FBDDCD5 -:10431C0070BDDEFDF10DAC08BDDCAC0AFD670FAD68 -:10432C00DABC0AADD8BC08615907EFBCAC08BDD8E3 -:10433C00AC0ABDDAC9DC0004F6FDBB0EC9DCFFFF1C -:10434C00F6FDBC0FADD8BF5AFCAF54FC425AFCDD95 -:10435C0012AF56FCBF58FCAF54FCBF56FCAF5AFC16 -:10436C00BF54FCAF56FC4258FCDC50AF54FC4256D8 -:10437C00FCDE48AF18FD4254FCDE40401CFD16DC50 -:10438C001F401CFDA0DE168F5CFC4F1CFDDE0EAF2B -:10439C0054FC225EFC44691061C8FD0044F51CFD10 -:1043AC00AF54FC445146DC0BAF54FC241027BF1A0D -:1043BC00FDEF1130F82ABF1AFDEF09401CFDFF611B -:1043CC00E8A01CFDAF58FC4256FCDC1BAF56FC426F -:1043DC0054FCDE13AF54FC421AFDDE0BF55CFCAF53 -:1043EC0054FCBF5EFCEF09405CFCFF61E8A05CFC88 -:1043FC00100CC6D7717BFAC7710A9E31929E02EFE0 -:10440C00FA8E949F4EFC8E969F4FFC8E979F50FC7D -:10441C008E989F51FC8E939F52FC8E929F53FC71F1 -:10442C000B9E717AFA8F51FCFDD00F76FD8E4513E1 -:10443C00BD58D505FCDF0AD506FCDF05D507FCDD2C -:10444C0025F6B14658DF11C9583722665C0391DF57 -:10445C00060A58181A59009617FDB14613FDD24496 -:10446C0031646102EF5E52069292694EFC6848FC20 -:10447C00DFF6AD58BD56F854F3311C7918F944FEEB -:10448C00FFDD41D854F1010418F914A944FFFFDFF2 -:10449C0004E6B9EF0BD854F1010418F914A9A1B929 -:1044AC00A005FCD505FCDF1CA006FCD506FCDF1422 -:1044BC00A007FCD507FCDF0CCF05FCFFCF06FCFFEB -:1044CC00CF07FCFFC6D7C716D854F10744A800DCA9 -:1044DC0005716261EF1CF647DD18A4544A54A8DC40 -:1044EC0005716261EF0CF854F3311CF67818F9B7CA -:1044FC00EFE4C6D7C756A89666F0317E12F6B178AF -:10450C0018F966D1DFF1F505FCF506FCF507FCF4AE -:10451C0054716361C6D7C72004FBF8FFD434DF178E -:10452C008D549FE1FC717BFA520692926948FC68AB -:10453C00E2FCDFF6717AFA4A3406DE0EE83409E260 -:10454C00FC9C03A4348C0372EF34F9E1FCF3311CB2 -:10455C007918F9BB317261058B9C03EF128C019CAD -:10456C0003D5E1FCDF06CFE1FCA7EF03B0E1FC7162 -:10457C008071776161DC61FB7171618C0372100475 -:10458C00C6D7C72008FBF8FF8F51FCFDD00F9C0746 -:10459C008F50FCFDD00F9C068F4FFCFDD00F9C055F -:1045AC008F4EFCFDD00F9C048F52FC9C038F53FC50 -:1045BC009C028C06318E0112795222BB8C075C0353 -:1045CC00D1DF098C064C0361C86179008C05318EF2 -:1045DC00B1610900BB313D120103BB8B0E04708C21 -:1045EC00011C00BB8F0AFC4E03DC0E8C034F0AFC33 -:1045FC00DC0B8C024F0BFCDC04AB12EF03ABB112E7 -:10460C001008C6D7C7C3C12008FBF8FFF661490ADA -:10461C0061F8614908DF07F7340000EDAD46E6BCF0 -:10462C0004F6BC06AC0ABC02AC08BBAC0661490281 -:10463C00AC0461F8614900DE28AC04BDD8AC06BD01 -:10464C00DAE1FD760FADDABC06ADD8BC04ABBDD853 -:10465C00AC02BDDAE1FD910FADDABC02ADD8BBEF17 -:10466C00CAAC06BC02AC04BBAC08BDD8AC0ABDDA03 -:10467C00AC04BDDCAC06FDF40EAC04BDDCAC06FD3C -:10468C00670FE1FD910FADDABC06ADD8BC04AC06EA -:10469C00614902AC0461F8614900DCC5AC0214ABA1 -:1046AC0012100CC6D7C7C12004FBF8FF8F4BFCFDC2 -:1046BC00D00F9C034E04DF1CAD564658DE07AD5898 -:1046CC00265612EF40F64658DF074656DD03E7EF55 -:1046DC0034F7EF318C04318EB1128C03318E43DF01 -:1046EC001830382226560658BB8C045C0391DF0523 -:1046FC00AB041800BBAB12EF0C8C034E04DE05327E -:10470C00A900EF01F71006C6D7717BFA31026209D6 -:10471C00F6465ADD04B65AEF7C710362717AFA40A0 -:10472C0012F904DF07715307F424EF69D9E5FBF1A3 -:10473C00E7240000DD0F23DD1A23DD1023DD5323D6 -:10474C00DD2723DD38715307F424EF49715207F448 -:10475C0024EF42D424DF07715207E424EF05715390 -:10476C0007F424C95AFA00EF2CD424DF0B7152073A -:10477C00E424C95AFA00EF1DF5E5FBEF18D424DF49 -:10478C000B715307E424C95AFA00EF09CFE5FB0279 -:10479C00EF03FDA247D7D91DFCF1E7240000DD098A -:1047AC0023DD2123DD0923EF1B715307F424D7D418 -:1047BC0024DF07715207E424EF05715307F424C971 -:1047CC005A2D01D7715207E424D731425F01D771BA -:1047DC00635FD9E3FBF1E7240000DD1223DD19232D -:1047EC00DD1123DD2623DD3423DD3923DD3FFD629E -:1047FC0048EF3DFD8348EF38D9E2FBC1AE6CFD2498 -:10480C002DC0F313BE6C712304EF25F0C1AE6CFD0B -:10481C00242DC0F313BE6C712304EF14F6BE6C711F -:10482C002204EF0CCB6CFF00712304EF03FDF7485F -:10483C004012F905DD064012F901DF0671230471FF -:10484C00635F31645F0FF6BE64BE6A31220402EF0F -:10485C0002F690BE6ED7CD2647F45CAE6C317DBFB0 -:10486C00EEFCFDCC48D2DF0ED9E2FBC1AE6CFD24D0 -:10487C002DC0F313BE6CD7FDCC48D2DD0DCD264731 -:10488C00F45CAE6C317DBFEEFCD7E85C096C225059 -:10489C0080D6BFEAFC22EEFCBDD8304700FD1C0ED2 -:1048AC00BFECFC30EAFCFD3A2DF313BE6CB426D4FD -:1048BC0026DF0CCD2647A45C4A5C1F61C8F45CD78C -:1048CC0040C5FB0BDC05712304F2D740C5FB066128 -:1048DC00D831225E11F0C1AE6CFD242DC0F313BE95 -:1048EC006C712204EF03FDF748E2D771625FF0C1EF -:1048FC00AE6CFD242DC0F313BE6CA0F0FC40F0FC9C -:10490C0040DC3DF5F0FCD9F1FCF1313F041EFD1407 -:10491C00D9F1FCF1BDD85008FD6B0E087208E6D237 -:10492C00DD040192DFFC896158D1DD05712204EFB1 -:10493C0003712304A0F1FC40F1FC2061C8F5F1FCEB -:01494C00D793 -:10494D0061FC61FCC1C3C5C7520C929269D4FEC112 -:10495D00DFF88EFD708EFCC1717AFA4012F903DF1B -:10496D0006301D2AFD0B39C09EFC609EFD34D4FE21 -:10497D005206C0B9A5A592DFF9C6C4C2C061FC61DB -:10498D00DF520C929269D4FEC1DFF88EFD708EFC61 -:10499D00C18F4105775C04D1DD06675C01D1DD5027 -:1049AD00313460367162077133608FCAFB5FD2FBA1 -:1049BD00D1DF1B8FCBFB5FD3FBD1DF128FCCFB5F26 -:1049CD00D4FBD1DF098FCDFB5FD5FBD1DD0C31627F -:1049DD000702EFFA716307716B27717361FD2A305E -:1049ED00F4227148500571605005717AFAEDE84A6C -:1049FD00675C02D1DD17D422DD134A2202DD0E00E1 -:104A0D00F4227148500571605005717AFA717AFA85 -:104A1D008D22318FE7240000DD0823DD1423DD31E5 -:104A2D00EF4FF4347140500571505005E422EDE81C -:104A3D004A8F40059F0EF9715050058F0EF99F104A -:104A4D00F9D90EF9FD0134629F0FF9CD2202EDE87F -:104A5D004A675C02D1DD17675C10D1DD05CD2203FD -:104A6D00EF0F7148500571605005F422EF6DCD22A6 -:104A7D00044A2203DF138F0FF99F4005D90FF9C1A7 -:104A8D00D90EF9FD9034C0EF108F400576C7D90EC1 -:104A9D00F9FDAB30C071505005D910F9F124290042 -:104AAD00DD2A240400DD25242200DD20241100DD73 -:104ABD000C240100DD16241E00DD11EF0C400EF953 -:104ACD0060DF09CF0EF961EF03A00EF94A2203DF73 -:104ADD000AD90EF9FD0134629F0FF9C09EFC609E4C -:104AED00FD34D4FE5206C0B9A5A592DFF961FCC113 -:104AFD00C7717AFA714AE5717BBD51405F0401D1EE -:104B0D00DD06F616A747DFF2300400BF2401F6BF1D -:104B1D002A01300B0BBF280100000000000000002F -:104B2D00510FBF28010000000000000000500FBF12 -:104B3D002801710AE671235FC6C061FCC1C5717A97 -:104B4D00FAD438DD0BEA36899E44A636B438EF33F5 -:104B5D00710AE6300400BF2401F6BF2A01300B0BA9 -:104B6D00BF28010000000000000000510FBF280108 -:104B7D000000000000000000500FBF280171135FFE -:104B8D0071235FC4C061FC61EF520C929269D4FE37 -:104B9D00C1DFF88EFD708EFCC12006FBF8FF715051 -:104BAD003002CEABACCC0100F6BC0231B2E20F61EB -:104BBD007902F6614902DFF371603002EF7E8E51AA -:104BCD009B713BE28B5C02D1DD1D8B5C08D1DF0953 -:104BDD0071503002CC0100EFCF8C0570FD6935624C -:104BED009E50CC0102EFC18B5C03D1DF408E509CF7 -:104BFD0004715030028C01D1DF0E8C0470FDAF3585 -:104C0D00629C05CC0101EF318C014C02DF06716015 -:104C1D003002EF28CF34025A716030028C0470C11B -:104C2D008C0570FD1135C0CF34024AEF0F8B5C013E -:104C3D00D1DD0671603002EF03EDB54B1006C09E5D -:104C4D00FC609EFD34D4FE5206C0B9A5A592DFF9D5 -:104C5D0061FCC1C3C5C7520C929269D4FEC1DFF885 -:104C6D008EFD708EFCC1710A9E31929E02EFFA8FFD -:104C7D00F4FB4F96FFDF198FF5FB4F97FFDF118F79 -:104C8D00F6FB4F98FFDF095004C15011FDBE34C033 -:104C9D00710B9EC09EFC609EFD34D4FE5206C0B9C1 -:104CAD00A5A592DFF9C6C4C2C061FCA44461FCC1D4 -:104CBD00C3C5C7520C929269D4FEC1DFF88EFD7048 -:104CCD008EFCC1C1FBF8FF8D1F9C018E31318EE72B -:104CDD00240600DD0823DD0E23DD22EF4E717AFA66 -:104CED008C019D3EEF45717AFA4015F901DF068C76 -:104CFD00019D3DEF3651FF2E019D3DEF2E717AFA4C -:104D0D004014FCFFDF068C019D28EF058F14FC9DE0 -:104D1D00288FC8FB5C01D1DF124012F903DD06407C -:104D2D0012F904DF06306825FD0B394031FF09DE2D -:104D3D0005A031FFEF137158F000714260A02BFCFC -:104D4D00402BFC0361C8F52BFC710BE3C0C09EFC2E -:104D5D00609EFD34D4FE5206C0B9A5A592DFF9C6FA -:104D6D00C4C2C061FC61FF520C929269D4FEC1DFD6 -:104D7D00F88EFD708EFCC1717AFA8FFAFB5C03D14F -:104D8D00DD194012F903DD064012F904DF0D36106E -:104D9D000571D4DE0630403AFD0B39C09EFC609E95 -:104DAD00FD34D4FE5206C0B9A5A592DFF961FC61B0 -:104DBD00FC61FC61FC61FC61FC61FC61FC61FC61FE -:104DCD00FC61FC61FC61FC61FC61FC61FC61FC61EE -:104DDD00FC61FC61FC61FC61FC61FC61FC61FC61DE -:074DED00FC61FC61FC61FCAC -:0A4DF40000060C12181E242A3036A7 -:104DFE000000C2FB0000000042FE00000000873BE6 -:104E0E00FC358C22D647FB2DB62E1547AE3C0C0931 -:104E1E009D3E01000000983AF82AFF005555555561 -:084E2E00FF0000000000470036 -:084E3600317503F7332312D795 -:024FF400013783 -:0A4FF60031383A31353A323100000B +:10228C00D512F9DF04F42AEF0D8FF4FCB0F4FCD175 +:10229C00DF4DCFF4FC1EFD4A23FDEC2231325E0DE6 +:1022AC0031045E0931126205713304EF037132049B +:1022BC00FD232331225E05714202EF03714302D4E8 +:1022CC002ADD05B42A714202314402067140C9FB71 +:1022DC00EF047148C9FB4012F90161E8FD1826D7DB +:1022EC004A284BDC134A28B9DE0E4004F928DE04D8 +:1022FC00A004F9D771335ED74A283EDC054A28BDC5 +:10230C00DC0E4005F928DE04A005F9D771325ED742 +:10231C00F504F9F505F9D73122620E4006F902DE13 +:10232C0004A006F9D771235ED73132040A40C5FBED +:10233C003CDE0471235ED771225EF506F9D7C7C166 +:10234C00FBF8FF71445E711762DE577114627141C4 +:10235C005E311262127130C9FB5002C15011FDC2C4 +:10236C0034C0CD2A32EF3B7138C9FBE0C15011FDAE +:10237C00C234C0F42A17C15002FD4E2BC0D2DF0D5F +:10238C008B318E318D080E01081C00BD2CAD2C44F8 +:10239C00009BDC05D5C5FBDF095020C15011FDC2E7 +:1023AC0034C0C0C6D7C78D2076FDF323D515F9DD13 +:1023BC000571035EEF2FFD822B664B2061F83154C3 +:1023CC005E1A71535EFDD804664C07DD0381DF098C +:1023DC008F14F9310303FD7C24FD902471025E30CF +:1023EC006C25FD0F39C6D7C771620171720150059A +:1023FC00FD4A025008FD8C37629D285009FD8C3730 +:10240C006276716301711814F94A28F1DC05E5153F +:10241C00F9EF224A2804DE1ACF15F9025008C150F0 +:10242C006CFDE602C092DF0DD439DF09711014F98E +:10243C00EF03F515F94015F901DF05710A22EF06D6 +:10244C00710B22710302CD20075700674C08DE1078 +:10245C007309D221614EDC05679D20EF0387EFEBFA +:10246C004A2007DF09D515F961F8CF15F903C6D74E +:10247C00500AFD4A02304000C15006FD312BC050BD +:10248C0096ED4A02C72006FBF8FFD515F961E8ED79 +:10249C006825304A57C1503EFD312BC0D2DD077143 +:1024AC0000C8FBED68257108C8FB17A1C15004C119 +:1024BC00500CC1506CFD0E031006EA30AA48318D49 +:1024CC0012AA48318E616B08616A08C1500EFD3149 +:1024DC002BC0F690C1500CFD312BC0CC00008B4CA6 +:1024EC0004DE2631245F02EFFA71125FEA308B5062 +:1024FC0010D605C15010C18BD6044000C1506CFDE4 +:10250C00B6031006615900EFD550A5FD4A02EA301A +:10251C00AA48318D12AA48318E616B08616A08C1D4 +:10252C00500EFD312BC050A5FD4A025004C1506C19 +:10253C00FDE602C0629C05EA308A4B4E0561C3047D +:10254C008A4A4E0517A1C15004C1500CC1506CFDF4 +:10255C00B6031006F6C1503EFD312BC01006C6D78F +:10256C00C78F07F94B2861F8ED15264009F928DECD +:10257C0006A009F9ED1526F509F98D289F07F98DA7 +:10258C00285070D612307351230480001231FF3161 +:10259C008E039F08F99FC4FBF68F08F97C804C953D +:1025AC00DC1C8F08F9318F241400EA30BDD8AA4402 +:1025BC00FDDD0D1231FF318E03318F16EF1A8F08AE +:1025CC00F9318F241400EA30BDD8AA46FDDD0D1276 +:1025DC0031FF318E03318F16EA308A427217F303C2 +:1025EC001644000171FE61C836FF001701DE02F6C9 +:1025FC001617BD50C7500CFD312BC0D2DF078D28EC +:10260C009F07F9EF047100C8FBF2C6D7C72008FB7F +:10261C00F8FF4015F901DD064015F902DF32170409 +:10262C000600FD292CD2DF0A8C069C058C079C0425 +:10263C00EF06CC0563CC040017040600FD462CD233 +:10264C00DF078C069FC7FBEF04CFC7FBC8ED4727FE +:10265C0017040600FD292CD2DD107100C8FB710394 +:10266C005ECC050071025FED20278C06318E318D1A +:10267C00080E07081C00BD2CEA308A4072AD2CFDF8 +:10268C00300FBD2C8D2D9C06D1DF08CC0601CC075C +:10269C0000EF048D2C9C0717040200FD462CD2DFA2 +:1026AC00738C029FC7FB8C02318E318D080E030890 +:1026BC001C00BD2C4401A5DC09CC0164F6BF0AF951 +:1026CC00EF52AD2C220AF94401A0DC09CC011EF614 +:1026DC00BF0AF9EF3FAD2C44819DDC0BCC010A30D5 +:1026EC00F401BF0AF9EF2DAD2C44019BDC0BCC019E +:1026FC000530F401BF0AF9EF1BAD2C440191DC0B42 +:10270C00CC010030F401BF0AF9EF0971025F30F41B +:10271C0001BF0AF93132040C31245E08CC0564CCBB +:10272C000400EF178C064E01DE0A8C069C058C0704 +:10273C009C04EF078C019C05CC04008C059FC5FB09 +:10274C008C049FC6FBFDB62B8F0CF94E05DD2B4080 +:10275C00C5FB0BDE06400CF90BDE1640C5FB06DE96 +:10276C0006400CF906DE0AD5C5FBDF0ED50CF9DDEB +:10277C00095020C15011FDC234C08FC5FB9F0CF90C +:10278C00FDF32B1008C6D7C7D832C15002FD662BFB +:10279C00C04016F90161F8712010055012FD4A0273 +:1027AC008D326C0870C15002FD662BC05003FD4A7F +:1027BC00028D326C1870C15002FD662BC05016FD94 +:1027CC004A025003FD772B625C01D1DD107170C998 +:1027DC00FB5002C15013FDC234C0F2EF01E2C6D768 +:1027EC00C75004FD772B625C03D1DD405014FD8390 +:1027FC002834C9FB895C9F998A0C7CFF50FF5C14C0 +:10280C00D1DD228A0C7CFF5C147234CDFB89616AA9 +:10281C00997162075600316207058666D1DFF77140 +:10282C006307716B2734DCFB895CEB99712810050D +:10283C005002FD772BD2DD354016F901DF05500A29 +:10284C00FD4A028D326C1070C15002FD662BC0E047 +:10285C00FD4A02D832C15002FD662BC05033FD4AEE +:10286C0002F0C15002FD662BC07178C9FBE0C1506B +:10287C0013FDC234C0C6D7C7C12004FBF8FFCC027D +:10288C00005004FD772B629C038C045C20D1DD0E80 +:10289C008C036C019C038C026C209C02EF138C0447 +:1028AC005C10D1DD0C8C035CFE9C038C026C109CC8 +:1028BC00028C045C08D1DD0E8C036C029C038C0230 +:1028CC006C089C02EF138C045C04D1DD0C8C035C53 +:1028DC00FD9C038C026C049C028C03D1DD05501A08 +:1028EC00FD4A028C0370C15004FD662BC08FC9FBDE +:1028FC005C9F728C03318E316D148C03318E314D93 +:10290C00616D08616C5C606162629FC9FB8FD5FB75 +:10291C007CFF50FF5E02D1DD278FD5FB7CFF5E0272 +:10292C007234CDFB89616A99716207CC0100316206 +:10293C0007086159018C01D1DFF4716307716B27B2 +:10294C00F21006C6D7D9BDFBC15006FD662BC0D907 +:10295C00BEFBC15007FD662BC0D7FD5129F2D7C76E +:10296C00711300711B20710303710205E0C1500348 +:10297C00FD662BC05013FD4A02F0C15005FD662BBD +:10298C00C0500FC1E0FD662BC0500AFD4A02710316 +:10299C00055008FD4A02501FC1E0FD662BC05012C5 +:1029AC00FD4A025003FD772B625C01D1DF03E2EF9D +:1029BC0024F0FD772B629D2E3602F9C75008FD4E90 +:1029CC002BC05003C1FD662BC0710203711A20FD90 +:1029DC000E2BF429F2C6D75003FD772B625C01D184 +:1029EC00DD155014FD8328FDEC275014FD4A02E040 +:1029FC00C15003FD662BC0711300711B20710303C2 +:102A0C005014FD4A02F0C1E0FD662BC0F0C150032A +:102A1C00FD662BC0D7C72004FBF8FFCC02008D2924 +:102A2C009C035010C150A4FDE602C0629D29D4390C +:102A3C00DD04F2EDEB2A8C037B295C08D1DD0F8DD4 +:102A4C00295C08D1DF05CC0210EF03CC02208C03EB +:102A5C007B295C04D1DD158D295C04D1DF088C0247 +:102A6C006C049C02EF068C026C089C028FC8FB5C09 +:102A7C00F3728D295C0C6162629FC8FB8FD4FB7C66 +:102A8C00FF50FF5E029C02D1DD1F34CCFB896E022D +:102A9C0099716207CC0100316207086159018C0100 +:102AAC00D1DFF4716307716B278D295C40D1DD098F +:102ABC005002C15012FDC234C08D295C01D1DD0819 +:102ACC00E0C15012FDC234C0717AFA8D295C41D13B +:102ADC00DD0C5A29BED829C15010FD4F05C0F2108B +:102AEC0004C6D7FD9327F2D7FDEC27F2D7C78FDCAE +:102AFC00FB7617FD8328664FDCFBDFF2F5DCFBF27F +:102B0C00C6D75064FD4A02FD5E2C6261FB71115EFA +:102B1C00F171145E61DC70C15012FD4F05C0FD688F +:102B2C0036CD3F03D7C7C1C1FBF8FFAC0ABB17C1F9 +:102B3C005002C18C0270C1506CFDB603100610041B +:102B4C00C6D7C7C1FBF8FFAC08C15002C18B70C11E +:102B5C00506CFD0E031006C0C6D7C78806166770EA +:102B6C00C1C75084FD80031004C6D7C716C7508454 +:102B7C00FDE602C0C6D7C74A2004DE045600EF02A9 +:102B8C0056014016F901DF048686EF0A4016F90259 +:102B9C00DF045104610666318F12504CD633514C10 +:102BAC00D6610A040A20BD30C6D740C5FB51DC05EE +:102BBC00CF1CFC0FD740C5FB33DC05CF1CFC0BD75F +:102BCC0040C5FB0BDC05CF1CFC07D740C5FB0661E1 +:102BDC00D831320405CF1CFC03D7D5C5FBDD04E589 +:102BEC001CFCD7F51CFCD7D512F9DF0471635ED73A +:102BFC00FD5E2C6261FB71715E71145E71775E61BA +:102C0C00C831625E1771625E71745E71115EF17132 +:102C1C00745E61DC70C15012FD4F05C0D7C7164001 +:102C2C0010FCFFDD0C8F10FC9B1714CA0100F2EF97 +:102C3C0007C75004FD4E2BC0C6D7C7164011FCFF6A +:102C4C00DD078F11FC9BF2EF07C75002FD4E2BC026 +:102C5C00C6D740C5FB0BDE02E2D7F2D771000105E7 +:102C6C0071785005713AD5713BD1713ADD713BD910 +:102C7C008F10055CFC9F1005CF54054AE542057189 +:102C8C0010420571004205714850057130500571B4 +:102C9C00205005CF530505CF52050A7130510571EF +:102CAC00205105713BD5717050058F11055CFC9F4F +:102CBC001105F422D77178500571080105D77140C0 +:102CCC00F00071783002713AE6713BE2713BEA71C7 +:102CDC003BEE8F10055CFC9F1005CF34024AE55289 +:102CEC00FF711A52710A5271483002713030027100 +:102CFC00203002CF330205CF32020A71303102711B +:102D0C003BE6717030028F11055CFC9F1105716000 +:102D1C003002D7717830027148F000D7C788061698 +:102D2C0066614FDD0967614EDE0396EF01866672C0 +:102D3C00C6D7C7161714AA0412A943DD29AA041270 +:102D4C00A923FD6A4EC3AC02FD6A4E13C2BDD81353 +:102D5C00FDAD0FDE0C1714AA0212AA0403BA04EF7D +:102D6C00051714A9BA04AC041231FF319E03317F4C +:102D7C00087208C6D77100F200304400BFB60130AB +:102D8C000188BF9001300984BF9E01BF9C01BF9A8E +:102D9C0001BF9801BF9601BF9401BF9201F53CFFA2 +:102DAC0030FE00BFBE01F6BFBC01BFB80150EEBF84 +:102DBC00BA01A1BFB201C918FE00F6BE6EBE64BE58 +:102DCC006A7123047153078F14F9310507F5E3FB7E +:102DDC00CB6CFF0071535F71425FD730EF00BFB413 +:102DEC0001F6BFBA017108F2007123047153077127 +:102DFC00435FD78F9AFBB09AFBD1DF7331D4D106E6 +:102E0C00715BD1E59CFBD59CFBDD347140C8FBD9D3 +:102E1C009BFBF1E734020023DD0625DD0325DF05EE +:102E2C00F6BE66EF06D9E2FBF1BE66A09BFB409BAB +:102E3C00FB20DF06F59BFBB09CFBCF9AFB19D7CF91 +:102E4C009AFB1E7148C8FBD5E4FBDF04F6BE66D7BF +:102E5C00D9E2FBF14266FFDD16D9E2FBF112AE6658 +:102E6C0043DE05A266FFEF03B266FFCF9AFB03D7E2 +:102E7C00C7161714F6B9AA0412F6231231FF31AE95 +:102E8C0003316FBA02C6D7C7C1FBF8FF8C0850805C +:102E9C00D612AB1413B9AB14AA0412A92312D93746 +:102EAC00FBF133BDD813FD190EBA02C0C6D731647D +:102EBC005F01D74012F902DF10F6BE64BE6EBE6A27 +:102ECC00BFA4FBBFAAFBBFB0FB31545F1530A0FB06 +:102EDC00FD7C2E30A6FBFD7C2E30ACFBFD7C2EED5C +:102EEC006E2F31745F0F71735F7108E8FBF59EFBF9 +:102EFC00F59DFBEF6DD59DFBDF658F36FB9F9DFB35 +:102F0C00409EFB1FDC1A7100E8FB4038FBFFDD2202 +:102F1C00A09FFB8F38FB4F9FFBDE17F59EFBEF123C +:102F2C00D99EFBF1A1605C1F9F9EFB7108E8FBF52D +:102F3C009FFBE99EFB093AFB70C130A0FBFD932E71 +:102F4C00C0E99EFB095AFB70C130A6FBFD932EC055 +:102F5C00E99EFB097AFB70C130ACFBFD932EC0B02F +:102F6C009DFB30A0FBFD3E2DF313BE6E30A6FBFD8A +:102F7C003E2DF313BE6A30ACFBFD3E2DF313BE6445 +:102F8C00D7C736F00071F4DC297170F000CE9D08C3 +:102F9C00CE9EC0CE9F80F594FFF593FFF592FFE592 +:102FAC0097FFE596FFE595FFE598FFCE9C7F7100B6 +:102FBC00BCFB711BE3712BE3711AE7712BE7717A80 +:102FCC009D710A9E31929E02EFFA710B9E71036005 +:102FDC00711360712360C6D7C73102601E71026025 +:102FEC00710A9E31929E02EFFA34EAFB3692FF523E +:102FFC00078B99A5A792DFF9710B9EC6D7C78806D8 +:10300C001631126015711260C734B2FB3092FF1684 +:10301C0052078B99A5A792DFF9C666736718B2FBA6 +:10302C00C6D7C77103603114601E711360710A9E9C +:10303C0031929E02EFFA3492FF36B2FB52078B9913 +:10304C00A5A792DFF9710B9E312460137123607177 +:10305C007B9E8FF2FB9E9A8FF3FB9E9B717A9EC692 +:10306C00D7CFBDFB5CCFBEFB5FCFDEFB5DCF12FCD1 +:10307C0036CF13FCC9E5E9FBD7C7CFBAFB11CFBBE1 +:10308C00FB38CFE2FBFFF5E3FBF5E4FBF5E5FBF5E5 +:10309C00E6FB5600664C64DE08723836FB0086EFA1 +:1030AC00F3C6D7C788061617F1E73403002361E38C +:1030BC00EDF2332361F8EDA031B12361E3EDA731DB +:1030CC002561F8EDB631B1240D0061D8EDF2332451 +:1030DC000B0061F8EDD7312361F8ED1E322361F856 +:1030EC00EDEB312361F8EDB63324060061F8ED8782 +:1030FC0032B12561D8EDA33224000061F8EDB03275 +:10310C002361F8EDF2332361F8EDD033B12361E3A1 +:10311C00EDD3322361F8EDE4322361F8EDF532237F +:10312C0061F8EDE4322361F8ED06332361F8ED1715 +:10313C00332361F8ED26332361F8ED48332361F82E +:10314C00ED54332361F8ED60332361F8ED693324DA +:10315C0002002361E3EDF23324020061F8ED7233D7 +:10316C002361F8ED7F332561F8ED8B33B124060034 +:10317C0061D8EDF23324000061F8EDF5332561F8E8 +:10318C00ED973324120061F8EDB1332361F8EDA211 +:10319C0033EDF633679FBCFBED0334306629FD0F2E +:1031AC003966736718BAFBED033440BFFB6ADF1452 +:1031BC0040C0FB68DF0E674C6CDF09306742FD0FC7 +:1031CC0039713AD5679FC1FBED033467D1DD063009 +:1031DC00533DFD0F3934DAFB89616F99ED03346788 +:1031EC005C02D1DD0830EF2AFD0F39EF0C675C0172 +:1031FC00D1DD0630F42AFD0F39675C3CD1DD10308F +:10320C00F92AFD0F39675C3C7266736218BAFBEDE4 +:10321C00033467D1DD625C01D1DD05300800EF01BC +:10322C00F6609F19FC675C02D1DD03E6EF01F63412 +:10323C0019FC89616899675C04D1DD04E6A1EF0192 +:10324C00F63419FC89616899675C08D1DD0530207A +:10325C0000EF01F63419FC89616899675C10D1DDC7 +:10326C0005301000EF01F63419FC89616899675C30 +:10327C0020D161E8716019FCED0334D434DF0867A8 +:10328C009FE3FBA434EF0D4A3405DE08E8346718DD +:10329C001DFDA434ED0334675C0F7266736218BABB +:1032AC00FBED03344A3464DE1B4A3401DF0667D17C +:1032BC0061F85701E834671836FBA4344A340561C9 +:1032CC00C871725FED0334675C7F70C117F12430F5 +:1032DC0000FD0930C0ED0334675C3F70C117F12469 +:1032EC003000FD0930C0ED0334675C0770C117F185 +:1032FC00243000FD0930C0ED0334675C1F70C1172A +:10330C00F1243000FD0930C0ED03346770C117F1B2 +:10331C00243000FD0930C0ED0334CEABAC710A9EF5 +:10332C0031929E02EFFAD592FFDF05710B9EEFED05 +:10333C00679E99710B9E9FF1FBED033471226067C0 +:10334C005C7F9FF2FBED0334712260675C3F9FF35F +:10335C00FBED0334675C3F9FF4FBED0334675C1FAC +:10336C009FF5FBED0334301E3BFD0F39679FFAFBD5 +:10337C00ED033430D93AFD0F39679FFBFBEF783002 +:10338C00FB3AFD0F39679FFEFBEF6C675C01D16167 +:10339C00E8FD3545EF614A3AC8DE08E83A67186837 +:1033AC00FAA43AEF52679D3AEF4D67318E247000C4 +:1033BC00DD0D240200DF4030FB08FD0F39EF38FD36 +:1033CC003544EF33675C01D1DD05711202EF0371F7 +:1033DC001302675C02D1DD05712202EF0371230237 +:1033EC00679FE9FBEF1100EF0E00664C5BDE077385 +:1033FC006718BAFBEF0100C6D7C716664C30DC095C +:10340C004C37DE05FDE42FEF6E664C02DF1F8FBCE0 +:10341C00FB5C03728F1BFC5C03318E316D08616A9F +:10342C0008128F1BFC5C80312A6162EF59664C3D9F +:10343C00DF0AAE90BF16FCF916FCEF4A664C3EDF75 +:10344C0005F917FCEF40664C4FDF05FD5745EF368D +:10345C00664C61DF08E83A0968FA72EF29664C7F1E +:10346C00DF05FDC33DEF1F664C4EDF0B316461047D +:10347C005210EF12F2EF0F664C5BDC0452FFEF06BA +:10348C00667309BAFB72C6D7C788061617F12410E3 +:10349C0000240500DC07244C00DD17EF17717BFAC4 +:1034AC0017F104BAFB1489617F99717AFA71326051 +:1034BC00EF02A43AC6D7C7C1C1FBF8FF4012F9030B +:1034CC00DD064012F904DF2F8C027309C2FB5E0A81 +:1034DC00D1DF248C02318E04BAFB14896E0A9971E7 +:1034EC006207CC0100316207086159018C01D1DF00 +:1034FC00F4716307716B271004C6D7CF1BFC03F55F +:10350C0019FCF51DFCF51FFCD7C788061617F1E74B +:10351C0034020025DD3D23DD1725DD1C23DD0523CD +:10352C00DD2BEF3B716260679F1EFCCD3F03EF2FDD +:10353C00675C839F1BFCEF27675C039F1DFC675C2C +:10354C00034C0261F8710262FD4A47EF12679F1F3C +:10355C00FCEF0C6791DF08E0C15012FDC234C0C60D +:10356C00D7C71617F1E7240000DD2A23DD1E24033C +:10357C0000DD0724FB00DD24EF25311262053080CD +:10358C0000EF01F6086F1CFC7208EF198F19FCF59F +:10359C0019FC72EF107142615235EF09F2EF0666B9 +:1035AC00730918FC72C6D7C71617F1E7240000DDA3 +:1035BC0038241000DD1C23DD1C23DD30240E00DD3F +:1035CC0018241100DD1B240F00DD12243000DD1542 +:1035DC00EF1EE2EF1D5202EF195204EF155206EFE7 +:1035EC00115205EF0D5207EF09F2EF065203EF02ED +:1035FC0052FFC6D7C7314460377143608D3E9FC2BE +:10360C00FB8D3D9FE1FB36FCFCC7D83DFDBD376112 +:10361C008A70618AFD0238C0D842F1312F609D4119 +:10362C008D3C4B41DD0A7152608D419D3CCD3F0379 +:10363C004A3F05DE09307236FD0F39CD3F6BB43F82 +:10364C007150F000CE300BCF170006CE3106FDC204 +:10365C0002717A30710BE3710BE7C6D78D419D3C3B +:10366C008D419FC3FBD74012F903DF064012F904CA +:10367C00DF02F2D73154600D7153607173608D416C +:10368C009F28FCEF3831646023716360717260D5E0 +:10369C001EFCDF05F529FCEF0B8F1EFC5002D6A19A +:1036AC00609F29FC8F29FC9F28FCEF113174600866 +:1036BC008F29FC9F28FCEF058D419F28FC8F28FC4F +:1036CC009FC3FBD928FCFDE536E928FC09DA2170FB +:1036DC00C15013FD4F05C0F2D7C7C1C1FBF8FF8C19 +:1036EC0002D1DF05F51EFCEF1A8C024C05DE06CF6D +:1036FC001EFC02EF0E8C02318E1231FE03311F6064 +:10370C009F1EFC8F2AFC4F1EFCDD29CC011F8F1E37 +:10371C00FC9F2AFCCC00008B4C08DE148B73091A1E +:10372C00224F1EFCDC058B9C01EF05615900EFE775 +:10373C008C019D401004C6D7C7168B728C01614A50 +:10374C00DE1F8B728C02614ADE138C01728C02615B +:10375C004ADE058C0172EF268C0272EF218B72EF20 +:10376C001D8B728C02614ADE048B72EF118C01721C +:10377C008C026142DE058C0172EF038C0272C6D79B +:10378C00C716710AE7710BE37150F000CE300BCF06 +:10379C00170006669E31FDC202717A30710BE3315F +:1037AC0082E302EFFA8D1F7158F000710BE772C6BD +:1037BC00D7C7C1C1FBF8FF8F12FC4E02DC03F2EF3E +:1037CC00318C024F13FCDC0452FFEF268C022F12BB +:1037DC00FC706131318D128F13FC2F12FC70613132 +:1037EC0033BDD813FD3B0EBB440001DC03F690BB8C +:1037FC008B721004C6D7C7C1FBF8FFAC0814A91410 +:10380C0089708B6128706131FD6A4E13440300711D +:10381C00FEDC23AC08148A04819A04AC08148A04D4 +:10382C004C11DC10A9148B99AC0814CA0200AC081A +:10383C0014CA0310EF72AC0814CA0400AC0814A923 +:10384C0014894DDE0AAC08148A02819A02EF12AC7C +:10385C000814A914894D61D308AC08148A02919AF2 +:10386C0002AC08148A03919A03D1DF3CAC08148A89 +:10387C00024C10DF10A91489318EA112AC0814A9C6 +:10388C00146299EF17AC08148A024CF0DF0EA914DD +:10389C0089318EB112AC0814A9146299AC0814CAFF +:1038AC000200AC0814CA0310C0C6D7EDFA38717BFD +:1038BC00FAC7D44461F83104612E7104617121613D +:1038CC00710361D444DD05B444CEABAC717AFA56C5 +:1038DC0000664C0ADD1272F3311C7902FDCEFC003D +:1038EC0061CAFD593986EFE9717AFAF2C6D7C75623 +:1038FC0000664C0ADE0BF0317E12F6782CFC86EF5B +:10390C00F0C6D7C7C1C1FBF8FFCC01008C014C0A33 +:10391C00DE36717BFA8C01F0317E042CFC14A9612B +:10392C0068DF09AC02B9717AFAF2EF1D8C01F03143 +:10393C007E12792CFC614902DF06717AFAE2EF09FA +:10394C00717AFA615901EFC4E21004C6D7C720049A +:10395C00FBF8FFF6422CFC61F8ED3E3A717BFA9CC9 +:10396C00038C034C0ADE3C8C03F0317E042CFC14DB +:10397C00A96168DF05717AFAEF29717AFA8C037202 +:10398C00F3311C792CFCCEFC0061CA629C02D1DFA5 +:10399C000A8C03F0317E12E6782CFC717BFA6159AB +:1039AC0003EFBECC0200CC01018C02F0317E042C62 +:1039BC00FC14A96168DD7B8C02F0317E12792CFC41 +:1039CC00E743DF688C014C0ADE628C01F0317E1219 +:1039DC00792CFCE743DD50717BFA8C01F0317E04CD +:1039EC002CFC14A96168DF1B616901717BFA8C01E5 +:1039FC00F0317E12F6782CFC717AFA8C024E01DCD6 +:103A0C00E7EF2F8C01F0317E042CFC14A9128C02F0 +:103A1C00F0317E33782CFC8C01F0317E12E6782C60 +:103A2C00FC615902717AFA615901EF98615902ED02 +:103A3C00B53900F21004C6D7C7200CFBF8FF34FFD1 +:103A4C00FBC55006C150A8C15030FD0E031006D264 +:103A5C00DD1DA040FC4040FC08DE03E2EF6B34FAB5 +:103A6C00FB895CFC99FD1E3B7110C8FBF2EF5A30D0 +:103A7C000600C117040600C130FFFBFD724E100496 +:103A8C00F540FC8FFAFB5C01D1DD264012F903DF17 +:103A9C00205010C180FDC234C0C736100571D4C689 +:103AAC00DE0F17C15006C150A8C15030FD0E0310D7 +:103ABC00064012F901DD114012F905DD0B8FFAFBFE +:103ACC005C02D161E8FD6C42F2100CC6D7D9FBFB4D +:103ADC00C15030FDE602C0629FFEFB7130CBFB8F04 +:103AEC00D3FB5C08D1DF06716307716B27F2D7D962 +:103AFC00FEFBC1D9FDFBC15030FD800310047130B9 +:103B0C00CBFB8FD3FB5C08D1DF06716307716B278E +:103B1C00F2D7C7200AFBF8FF500FC15030FDE60268 +:103B2C00C04A3902DF077110C8FBF2EF5F7118C889 +:103B3C00FBCC07004015F901DF05CC0802EF03CCE4 +:103B4C000810CC09808FFAFB5C03D1DF08717AD5A1 +:103B5C00CC0607EF06717BD5CC062F17040600C1E7 +:103B6C005004C150A0C15030FDB6031006C736102A +:103B7C000571D4C6DE154012F903DF0F17C15006CC +:103B8C00C150A8C15030FD0E031006F2100AC6D762 +:103B9C00D512F9DF06F6BD46F544FCD544FCDD0430 +:103BAC00B044FCD7CF44FC048F12F9318FE723DDEE +:103BBC000B24020024030061C8EDC23C8F14F931C0 +:103BCC00233F301B004646DF0AE0C15010FDC234D3 +:103BDC00C0EF1D3077014646DF165002C15010FD74 +:103BEC00C234C0F6464CDF088FDEFB5010D6BD4CFD +:103BFC00F6464CDD37B64CE6464CDF3071025FEFD3 +:103C0C002B301B004646DF13F6464EDF18E0C15042 +:103C1C0010FDC234C0C94E5307EF0A307701464637 +:103C2C0061F871025FF6464E61E8B64E31346208B7 +:103C3C00713361F6BD46EF1431346105F6BD46EFC4 +:103C4C000BA646F6464661F8C946FFFF314262199B +:103C5C004A4805DE16A4484A4805DF0FA44850041C +:103C6C00C15010FDC234C0EF02F448314462194A0D +:103C7C004A05DE16A44A4A4A05DF0FA44A5008C179 +:103C8C005010FDC234C0EF02F44AD44BDD03B44BE8 +:103C9C00D7315262174A4905DE14A4494A4905DF57 +:103CAC000DA4495010C1FDC234C0EF02F4494A4979 +:103CBC000661F8CD4B25D7C736100571D4DE073019 +:103CCC00443AFD0F39D24012F903DF1D31220706A9 +:103CDC0030212AFD0F393144610C7143615080C190 +:103CEC005012FDC234C0FDFA3CFD253DC6D78F1BDA +:103CFC00FC5C01D1DD22D547FCDD04B047FCD7CFFD +:103D0C0047FC098D404F46FCDD0E8D409F46FC5014 +:103D1C0040C15012FDC234C0D74012F903DD04F685 +:103D2C00BD1AD7D5E6FBDF08F6461ADD19B61AD749 +:103D3C00D9E2FBF1461ADD0ED9E2FB12AD1A43DED5 +:103D4C0003A61AD7B61AD7C78FDAFB76F5DAFB5C5F +:103D5C0010D161E8715261665C0FD1DD57665C0170 +:103D6C00D1DD05F512F9EF4C665C02D1DD11E0C135 +:103D7C005003FD662BC0711300711B207103036689 +:103D8C005C04D1DD11711300711B20D51BFC61F893 +:103D9C00710303FD0735665C08D161E871030350BC +:103DAC0005FD4A027102035003C1FD662BC0711A56 +:103DBC0020FD0E2BF2C6D7C72014FBF8FF4A341394 +:103DCC00DC0552FFEDD23E8F14F93115053004009D +:103DDC00EF0F8F14F9314505300500EF04D915F9B3 +:103DEC00F1609C018D2E9C028D209C038F02F99C0E +:103DFC00048F03F99C058D509C068D289C0771340B +:103E0C005EE661301271045E61DC31196162629CA4 +:103E1C0008CC09018F16F99C0AF171240461DC9C11 +:103E2C000BAE6C609C0CAD1A609C0DAE6E609C0E63 +:103E3C00AE6A609C0FAE64609C10F171540761DC3B +:103E4C009C11AE66609C1231140205308000EF01AB +:103E5C00F6C131246205304000EF01F6C2616B08F7 +:103E6C00616A08C131340405302000EF01F6C261EB +:103E7C006B08616A08C131240205300800EF01F6B5 +:103E8C00C2616B08616A08C131546205300400EFED +:103E9C0001F6C2616B08616A08C131446204E6A193 +:103EAC00EF01F6C2616B08616A08C131346203E646 +:103EBC00EF01F6C2616B08616A9C13A434D834F12B +:103ECC00B107A11489721014C6D7C7FD80098F12CF +:103EDC00F9318FE724000061F8EDA14023DD1B23AD +:103EEC0061F8EDAB3F2361F8ED27402361F8ED70ED +:103EFC00402361F8ED5041ED9E404013F901DF295C +:103F0C00F64646DD05F516FDEF03A016FD4016FD41 +:103F1C0065DC0CF6BD46F512F9710261EDE041ADC0 +:103F2C004644060061D8EDE041713261FDD8047160 +:103F3C00535EFDB1234015F903DF09710261F512DF +:103F4C00F9EDE041FD182640C7FB9BDE09710261CB +:103F5C00F512F9EDE041714A2771401105713011EC +:103F6C0005713A22715A2271501105FD6B29D2DD6F +:103F7C0009710261F512F9EDE04171103500CF378E +:103F8C00001D714012054013F901DF05F5E3FBEF4D +:103F9C0004CFE3FB03CF12F902FD5129EDE041FD03 +:103FAC00682CFDCA2C714A9DFD0735FD8530F5370F +:103FBC00FF712BE0F513F9710261CBE43FEFCBE617 +:103FCC00F6F0FDD804713BD47112027123028F14E8 +:103FDC00F93105285004FD772B625C03318E315D7D +:103FEC0034C9FB896168995002FD772BD2DD0671CB +:103FFC0070C9FBEF047178C9FBFDB123FD812D71F4 +:10400C000814F9CF12F9038FBCFB5C02D1DD095007 +:10401C0080C15010FDC234C0EDE041FDE24131548D +:10402C00612FA452D452DD0831A4E00A31020C06EF +:10403C00712BE0FD584231A4E01731040C13712BA5 +:10404C00E05027C15005FD662BC0CF12F904710258 +:10405C0061FD4D428F14F931250731146203F512BD +:10406C00F9EDE041FDE24131020C14F0C15005FDC7 +:10407C00662BC05005FD4A02FD5842CF12F903FDD4 +:10408C004D428F14F931250731146203F512F9ED05 +:10409C00E041F512F9CFE3FB03F5E4FBF5E6FB7128 +:1040AC00525FF6426CFF61E8EDE041F6BD4C7103E6 +:1040BC005FF5FAFBFD1E3BFDE72DFDC12CFD1F2D11 +:1040CC00714B9D711302712302F5CAFBF5CBFBF505 +:1040DC00CCFBF5CDFB31245F02EFFACE3708CBE4F5 +:1040EC00BFFFCBE6FFF3CED4FFCF370009714812E8 +:1040FC0005F6BEE0BEE2BED0716A27FDE32971432E +:10410C0007714B277148100571481105713810055E +:10411C0071381105713302713B22715302715B22AC +:10412C007158100571581105CF12F905713261F6ED +:10413C00BD46F50CFCF50EFCCF14FCFFCF10FCFFBC +:10414C00CF11FCFFF513F9F516FD3112622EFDB1FE +:10415C0023AD4644070061C8E512F9D515F961E8AD +:10416C00FD35058F14F9312511F50EFCF50CFC50BD +:10417C002EFD4A02E513F9E512F9EF58D42ADF5463 +:10418C00FD3505FD4A2371730171320471430271CF +:10419C00035E71525E31949E02EFFA712AE7CEA44F +:1041AC0009F5F3003114620261FDF444FD8009E568 +:1041BC00F300CEA40831126206CF12F905EF097193 +:1041CC003361E513F9E512F9712BE78F14F93125F9 +:1041DC0003F512F9C6D7D548FCDF1A310200155089 +:1041EC0003FD772B625C01D1DF07F512F9710261D7 +:1041FC00D7E548FCD74048FCF0DF0831040041F516 +:10420C0048FCD74048FCC8DF0BF512F9710261CFAE +:10421C0048FCF0D73102000A4048FCFFDD22A048E0 +:10422C00FCD7F0C15004FD662BC08FC9FB5C9F9F6F +:10423C00C9FB7110DAFB30533DFD0F39CF48FCF050 +:10424C00D731045F06F512F9710261D7715361F42D +:10425C0052717207FDC202717307D7FD9605F2D732 +:10426C00C7200CFBF8FF8F00FCF0F9FFFBF303FDFC +:10427C006A4E13BC048F02FCF0F901FCF303FD6AD7 +:10428C004E13BC028F04FCF0F903FCF303FD6A4EE1 +:10429C0013BBAC04BDD8F6BDDAAC04311EBDDCF6E4 +:1042AC00BDDEFDEE0DADD8BDDCADDABDDEAC02BDC4 +:1042BC00D8F6BDDAAC02311EDADCC3DADEC3BDDC03 +:1042CC00F6BDDEFDEE0DC0BDDEC0BDDCADDEFD64B9 +:1042DC000FADD8BDDCADDABDDEABBDD8F6BDDAAB0B +:1042EC00311EDADCC3DADEC3BDDCF6BDDEFDEE0D5D +:1042FC00C0BDDEC0BDDCADDEFD640FDADAADD8FDCD +:10430C004546C3C58FE2FC5C3FF0317E0462FC1471 +:10431C00C2C0B9A0E2FCF6BC08BC0A9C078C074CD6 +:10432C002EDD3E8FE2FC0E0770F161DC605C3FF02D +:10433C00317E127962FCBDD8F6BDDA8C0773092484 +:10434C0022318FBDDC70BDDEFDEE0DAC08BDDCACEA +:10435C000AFD640FADDABC0AADD8BC08615907EF91 +:10436C00BCAC08BDD8AC0ABDDAC9DC0004F6FDB89B +:10437C000EC9DCFFFFF6FDB90FADD8BF5CFCAF5624 +:10438C00FC425CFCDD12AF58FCBF5AFCAF56FCBFC4 +:10439C0058FCAF5CFCBF56FCAF58FC425AFCDC50DE +:1043AC00AF56FC4258FCDE48AF18FD4256FCDE40CE +:1043BC00401CFD16DC1F401CFDA0DE168F5EFC4F62 +:1043CC001CFDDE0EAF56FC2260FC44691061C8FD7A +:1043DC003544F51CFDAF56FC445146DC0BAF56FC86 +:1043EC00241027BF1AFDEF1130F82ABF1AFDEF0970 +:1043FC00401CFDFF61E8A01CFDAF5AFC4258FCDCE0 +:10440C001BAF58FC4256FCDE13AF56FC421AFDDEC5 +:10441C000BF55EFCAF56FCBF60FCEF09405EFCFF89 +:10442C0061E8A05EFC100CC6D7717BFAC7710A9EBE +:10443C0031929E02EFFA8E949F50FC8E969F51FC07 +:10444C008E979F52FC8E989F53FC8E939F54FC8E9C +:10445C00929F55FC710B9E717AFA8F53FCFDCD0F18 +:10446C0076FDC34513BD58D505FCDF0AD506FCDF28 +:10447C0005D507FCDD25F6B14658DF11C9583722A2 +:10448C00665C0391DF060A58181A59009617FDE668 +:10449C004613FD074531646102EF5E520692926944 +:1044AC0050FC684AFCDFF6AD58BD56F854F3311C8D +:1044BC007918F944FEFFDD41D854F1010418F914C0 +:1044CC00A944FFFFDF04E6B9EF0BD854F10104183F +:1044DC00F914A9A1B9A005FCD505FCDF1CA006FCAC +:1044EC00D506FCDF14A007FCD507FCDF0CCF05FCC0 +:1044FC00FFCF06FCFFCF07FCFFC6D7C716D854F179 +:10450C000744A800DC05716261EF1CF647DD18A4B6 +:10451C00544A54A8DC05716261EF0CF854F3311C59 +:10452C00F67818F9B7EFE4C6D7C756A89666F031F7 +:10453C007E12F6B17818F966D1DFF1F505FCF506B7 +:10454C00FCF507FCF454716361C6D7C72004FBF873 +:10455C00FFD434DF178D549FE3FC717BFA52069223 +:10456C0092694AFC68E4FCDFF6717AFA4A3406DE9A +:10457C000EE83409E4FC9C03A4348C0372EF34F988 +:10458C00E3FCF3311C7918F9BB317261058B9C0388 +:10459C00EF128C019C03D5E3FCDF06CFE3FCA7EF05 +:1045AC0003B0E3FC718071776161DC61FB71716157 +:1045BC008C03721004C6D7C72008FBF8FF8F53FC7E +:1045CC00FDCD0F9C078F52FCFDCD0F9C068F51FC2F +:1045DC00FDCD0F9C058F50FCFDCD0F9C048F54FC22 +:1045EC009C038F55FC9C028C06318E011279522251 +:1045FC00BB8C075C03D1DF098C064C0361C8617965 +:10460C00008C05318EB1610900BB313D120103BB39 +:10461C008B0E04708C011C00BB8F0AFC4E03DC0E4D +:10462C008C034F0AFCDC0B8C024F0BFCDC04AB1232 +:10463C00EF03ABB1121008C6D7C7C3C12008FBF8F3 +:10464C00FFF661490A61F8614908DF07F734000099 +:10465C00EDE246E6BC04F6BC06AC0ABC02AC08BBF8 +:10466C00AC06614902AC0461F8614900DE28AC0477 +:10467C00BDD8AC06BDDAE1FD730FADDABC06ADD822 +:10468C00BC04ABBDD8AC02BDDAE1FD8E0FADDABC1B +:10469C0002ADD8BBEFCAAC06BC02AC04BBAC08BDC7 +:1046AC00D8AC0ABDDAAC04BDDCAC06FDF10EAC0432 +:1046BC00BDDCAC06FD640FE1FD8E0FADDABC06ADC2 +:1046CC00D8BC04AC06614902AC0461F8614900DC59 +:1046DC00C5AC0214AB12100CC6D7C7C12004FBF832 +:1046EC00FF8F4DFCFDCD0F9C034E04DF1CAD5646D9 +:1046FC0058DE07AD58265612EF40F64658DF0746EF +:10470C0056DD03E7EF34F7EF318C04318EB1128CA8 +:10471C0003318E43DF1830382226560658BB8C04E2 +:10472C005C0391DF05AB041800BBAB12EF0C8C03E0 +:10473C004E04DE0532A900EF01F71006C6D7717BD7 +:10474C00FA31026209F6465ADD04B65AEF7C71035F +:10475C0062717AFA4012F904DF07715307F424EFFF +:10476C0069D9E5FBF1E7240000DD0F23DD1A23DD19 +:10477C001023DD5323DD2723DD38715307F424EF99 +:10478C0049715207F424EF42D424DF07715207E435 +:10479C0024EF05715307F424C95AFA00EF2CD424E2 +:1047AC00DF0B715207E424C95AFA00EF1DF5E5FB43 +:1047BC00EF18D424DF0B715307E424C95AFA00EF25 +:1047CC0009CFE5FB02EF03FDD747D7D91DFCF1E775 +:1047DC00240000DD0923DD2123DD0923EF1B7153A8 +:1047EC0007F424D7D424DF07715207E424EF0571B2 +:1047FC005307F424C95A2D01D7715207E424D73139 +:10480C00425F01D771635FD9E3FBF1E7240000DD60 +:10481C001223DD1923DD1123DD2623DD3423DD39BD +:10482C0023DD3FFD9748EF3DFDB848EF38D9E2FB5B +:10483C00C1AE6CFD282DC0F313BE6C712304EF25A3 +:10484C00F0C1AE6CFD282DC0F313BE6C712304EFC8 +:10485C0014F6BE6C712204EF0CCB6CFF00712304B8 +:10486C00EF03FD2C494012F905DD064012F901DF7A +:10487C000671230471635F31645F0FF6BE64BE6A18 +:10488C0031220402EF02F690BE6ED7CD2647F45CBF +:10489C00AE6C317DBFF0FCFD0149D2DF0ED9E2FBDD +:1048AC00C1AE6CFD282DC0F313BE6CD7FD0149D2EF +:1048BC00DD0DCD2647F45CAE6C317DBFF0FCD7E846 +:1048CC005C096C225080D6BFECFC22F0FCBDD830C9 +:1048DC004700FD190EBFEEFC30ECFCFD3E2DF31332 +:1048EC00BE6CB426D426DF0CCD2647A45C4A5C1FD4 +:1048FC0061C8F45CD740C5FB0BDC05712304F2D70F +:10490C0040C5FB0661D831225E11F0C1AE6CFD28AA +:10491C002DC0F313BE6C712204EF03FD2C49E2D7BA +:10492C0071625FF0C1AE6CFD282DC0F313BE6CA09C +:10493C00F2FC40F2FC40DC3DF5F2FCD9F3FCF13129 +:10494C003F041EFD14D9F3FCF1BDD85008FD680ED0 +:10495C00087208E6D2DD040192DFFC896158D1DDD2 +:10496C0005712204EF03712304A0F3FC40F3FC2037 +:06497C0061C8F5F3FCD751 +:1049820061FC61FCC1C3C5C7520C929269D4FEC1DD +:10499200DFF88EFD708EFCC1717AFA4012F903DFE6 +:1049A2000630212AFD0F39C09EFC609EFD34D4FEE4 +:1049B2005206C0B9A5A592DFF9C6C4C2C061FC61A6 +:1049C200DF520C929269D4FEC1DFF88EFD708EFC2C +:1049D200C18F4105775C04D1DD06675C01D1DD50F2 +:1049E200313460367162077133608FCAFB5FD2FB6C +:1049F200D1DF1B8FCBFB5FD3FBD1DF128FCCFB5FF1 +:104A0200D4FBD1DF098FCDFB5FD5FBD1DD0C316249 +:104A12000702EFFA716307716B27717361FD2E3024 +:104A2200F4227148500571605005717AFAED1D4B00 +:104A3200675C02D1DD17D422DD134A2202DD0E00AB +:104A4200F4227148500571605005717AFA717AFA50 +:104A52008D22318FE7240000DD0823DD1423DD31B0 +:104A6200EF4FF4347140500571505005E422ED1DB2 +:104A72004B8F40059F0EF9715050058F0EF99F1014 +:104A8200F9D90EF9FD0534629F0FF9CD2202ED1D11 +:104A92004B675C02D1DD17675C10D1DD05CD2203C7 +:104AA200EF0F7148500571605005F422EF6DCD2271 +:104AB200044A2203DF138F0FF99F4005D90FF9C172 +:104AC200D90EF9FD9434C0EF108F400576C7D90E88 +:104AD200F9FDAF30C071505005D910F9F124290009 +:104AE200DD2A240400DD25242200DD20241100DD3E +:104AF2000C240100DD16241E00DD11EF0C400EF91E +:104B020060DF09CF0EF961EF03A00EF94A2203DF3D +:104B12000AD90EF9FD0534629F0FF9C09EFC609E12 +:104B2200FD34D4FE5206C0B9A5A592DFF961FCC1DD +:104B3200C7717AFA714AE5717BBD51405F0401D1B8 +:104B4200DD06F616A747DFF2300400BF2401F6BFE8 +:104B52002A01300B0BBF28010000000000000000FA +:104B6200510FBF28010000000000000000500FBFDD +:104B72002801710AE671235FC6C061FCC1C5717A62 +:104B8200FAD438DD0BEA36899E44A636B438EF33C0 +:104B9200710AE6300400BF2401F6BF2A01300B0B74 +:104BA200BF28010000000000000000510FBF2801D3 +:104BB2000000000000000000500FBF280171135FC9 +:104BC20071235FC4C061FC61EF520C929269D4FE02 +:104BD200C1DFF88EFD708EFCC12006FBF8FF71501C +:104BE2003002CEABACCC0100F6BC0231B2E20F61B6 +:104BF2007902F6614902DFF371603002EF7E8E5175 +:104C02009B713BE28B5C02D1DD1D8B5C08D1DF091D +:104C120071503002CC0100EFCF8C0570FD6D356212 +:104C22009E50CC0102EFC18B5C03D1DF408E509CC1 +:104C320004715030028C01D1DF0E8C0470FDB3354B +:104C4200629C05CC0101EF318C014C02DF067160E0 +:104C52003002EF28CF34025A716030028C0470C1E6 +:104C62008C0570FD1535C0CF34024AEF0F8B5C0105 +:104C7200D1DD0671603002EF03EDEA4B1006C09EF3 +:104C8200FC609EFD34D4FE5206C0B9A5A592DFF9A0 +:104C920061FCC1C3C5C7520C929269D4FEC1DFF850 +:104CA2008EFD708EFCC1710A9E31929E02EFFA8FC8 +:104CB200F4FB4F96FFDF198FF5FB4F97FFDF118F44 +:104CC200F6FB4F98FFDF095004C15011FDC234C0FA +:104CD200710B9EC09EFC609EFD34D4FE5206C0B98C +:104CE200A5A592DFF9C6C4C2C061FCA44461FCC19F +:104CF200C3C5C7520C929269D4FEC1DFF88EFD7013 +:104D02008EFCC1C1FBF8FF8D1F9C018E31318EE7F5 +:104D1200240600DD0823DD0E23DD22EF4E717AFA30 +:104D22008C019D3EEF45717AFA4015F901DF068C40 +:104D3200019D3DEF3651FF2E019D3DEF2E717AFA16 +:104D42004014FCFFDF068C019D28EF058F14FC9DAB +:104D5200288FC8FB5C01D1DF124012F903DD064047 +:104D620012F904DF06306C25FD0F394031FF09DEF0 +:104D720005A031FFEF137158F000714260A02BFCC7 +:104D8200402BFC0361C8F52BFC710BE3C0C09EFCF9 +:104D9200609EFD34D4FE5206C0B9A5A592DFF9C6C5 +:104DA200C4C2C061FC61FF520C929269D4FEC1DFA1 +:104DB200F88EFD708EFCC1717AFA8FFAFB5C03D11A +:104DC200DD194012F903DD064012F904DF0D361039 +:104DD2000571D4DE0630443AFD0F39C09EFC609E58 +:104DE200FD34D4FE5206C0B9A5A592DFF961FC617B +:104DF200FC61FC61FC61FC61FC61FC61FC61FC61C9 +:104E0200FC61FC61FC61FC61FC61FC61FC61FC61B8 +:104E1200FC61FC61FC61FC61FC61FC61FC61FC61A8 +:074E2200FC61FC61FC61FC76 +:0A4E2A0000060C12181E242A303670 +:104E34000000C2FB0000000042FE000000009C3B9A +:104E440000368C220B48FF2DBA2E4A47C33C090971 +:0E4E5400D63E0000983AF82AFF0055555555F5 +:084E6200FF0000000000470002 +:104E6A00317503F7332312D714AEF8C716AC0612FE +:104E7A00C5AC0416F643DD078B99A7A5B3EFF5C2B7 +:024E8A00C6D789 +:024FF400013882 +:0A4FF60031383A30383A3237000003 :00000001FF  \ No newline at end of file diff --git a/branches/sim/bsr.lmf b/branches/sim/bsr.lmf index 236e422..c7ba636 100644 Binary files a/branches/sim/bsr.lmf and b/branches/sim/bsr.lmf differ diff --git a/branches/sim/bsr_k0r.map b/branches/sim/bsr_k0r.map index 81226a9..30c34de 100644 --- a/branches/sim/bsr_k0r.map +++ b/branches/sim/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.33 Date:20 Jul 2011 Page: 1 +78K0R Linker W1.33 Date:27 Jul 2011 Page: 1 Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - obsr.lmf ..\..\..\..\Program Files (x86)\NEC Electronics Tool @@ -25,8 +25,8 @@ Direc-file:bsr_mcu.dr *** Link information *** 69 output segment(s) - 3D9AH byte(s) real data - 6098 symbol(s) defined + 3DE4H byte(s) real data + 6164 symbol(s) defined *** Memory map *** @@ -104,54 +104,54 @@ Direc-file:bsr_mcu.dr LDR_CODL hal 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG ?OCDSTAD 000CEH 0000AH CSEG - LDR_CODE 000D8H 00979H CSEG - LDR_CODE loader 000D8H 00193H - LDR_CODE main 0026BH 00042H - LDR_CODE WDT 002ADH 00000H - LDR_CODE i2c_mcu 002ADH 002ECH + LDR_CODE 000D8H 00976H CSEG + LDR_CODE loader 000D8H 00196H + LDR_CODE main 0026EH 00054H + LDR_CODE WDT 002C2H 00000H + LDR_CODE i2c_mcu 002C2H 002D4H LDR_CODE self_flash - 00599H 00373H + 00596H 00373H LDR_CODE task_debug - 0090CH 00000H + 00909H 00000H LDR_CODE task_status - 0090CH 00077H - LDR_CODE hal 00983H 000CEH - FSL_CODE 00A51H 00322H CSEG + 00909H 00077H + LDR_CODE hal 00980H 000CEH + FSL_CODE 00A4EH 00322H CSEG FSL_CODE fsl_block_cmd - 00A51H 0002BH + 00A4EH 0002BH FSL_CODE fsl_block_check - 00A7CH 00013H + 00A79H 00013H FSL_CODE fsl_common - 00A8FH 0014FH + 00A8CH 0014FH FSL_CODE fsl_reset - 00BDEH 00001H + 00BDBH 00001H FSL_CODE fsl_si_ibf - 00BDFH 00064H + 00BDCH 00064H FSL_CODE fsl_phySwap - 00C43H 0004DH + 00C40H 0004DH FSL_CODE fsl_si_common - 00C90H 00061H - FSL_CODE fsl_swap 00CF1H 00030H + 00C8DH 00061H + FSL_CODE fsl_swap 00CEEH 00030H FSL_CODE fsl_write - 00D21H 00052H - @@LCODE 00D73H 00277H CSEG - @@LCODE @cstart 00D73H 0006DH - @@LCODE @imul 00DE0H 00011H - @@LCODE @lumul 00DF1H 0002BH - @@LCODE @isdiv 00E1CH 00022H - @@LCODE @iudiv 00E3EH 0002DH - @@LCODE @isrem 00E6BH 00021H - @@LCODE @iurem 00E8CH 0002FH - @@LCODE @lsdiv 00EBBH 00039H - @@LCODE @ludiv 00EF4H 0003FH - @@LCODE @divuw 00F33H 00034H - @@LCODE @ladd 00F67H 0000FH - @@LCODE @llsh 00F76H 0001BH - @@LCODE @lursh 00F91H 0001FH - @@LCODE @iscmp 00FB0H 0000CH - @@LCODE @lband 00FBCH 00014H - @@LCODE @bcdtob 00FD0H 0001AH -* gap * 00FEAH 0000CH + 00D1EH 00052H + @@LCODE 00D70H 00277H CSEG + @@LCODE @cstart 00D70H 0006DH + @@LCODE @imul 00DDDH 00011H + @@LCODE @lumul 00DEEH 0002BH + @@LCODE @isdiv 00E19H 00022H + @@LCODE @iudiv 00E3BH 0002DH + @@LCODE @isrem 00E68H 00021H + @@LCODE @iurem 00E89H 0002FH + @@LCODE @lsdiv 00EB8H 00039H + @@LCODE @ludiv 00EF1H 0003FH + @@LCODE @divuw 00F30H 00034H + @@LCODE @ladd 00F64H 0000FH + @@LCODE @llsh 00F73H 0001BH + @@LCODE @lursh 00F8EH 0001FH + @@LCODE @iscmp 00FADH 0000CH + @@LCODE @lband 00FB9H 00014H + @@LCODE @bcdtob 00FCDH 0001AH +* gap * 00FE7H 0000FH MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -194,255 +194,257 @@ Direc-file:bsr_mcu.dr @@CNST led_cam 0226CH 00000H @@CNST led_pow 0226CH 00020H @@CNST hal 0228CH 00000H - ROM_CODE 0228CH 026C1H CSEG - ROM_CODE pm 0228CH 009D8H - ROM_CODE i2c_ctr 02C64H 00062H - ROM_CODE i2c_twl 02CC6H 0005EH - ROM_CODE led 02D24H 00265H - ROM_CODE rtc 02F89H 000E0H - ROM_CODE vreg_ctr 03069H 0049AH - ROM_CODE vreg_twl 03503H 000F9H - ROM_CODE adc 035FCH 002B7H - ROM_CODE renge 038B3H 0018DH - ROM_CODE accero 03A40H 00147H - ROM_CODE sw 03B87H 00127H + ROM_CODE 0228CH 026F6H CSEG + ROM_CODE pm 0228CH 009DCH + ROM_CODE i2c_ctr 02C68H 00062H + ROM_CODE i2c_twl 02CCAH 0005EH + ROM_CODE led 02D28H 00265H + ROM_CODE rtc 02F8DH 000E0H + ROM_CODE vreg_ctr 0306DH 0049AH + ROM_CODE vreg_twl 03507H 000F9H + ROM_CODE adc 03600H 002B7H + ROM_CODE renge 038B7H 0018DH + ROM_CODE accero 03A44H 00158H + ROM_CODE sw 03B9CH 00127H ROM_CODE task_misc - 03CAEH 001EFH - ROM_CODE task_sys 03E9DH 0039AH + 03CC3H 00213H + ROM_CODE task_sys 03ED6H 00396H ROM_CODE pedo_alg_thre_det2 - 04237H 004DEH - ROM_CODE led_cam 04715H 000C1H - ROM_CODE led_pow 047D6H 00177H - @@BASE 0494DH 004A7H CSEG BASE - @@BASE loader 0494DH 00000H - @@BASE pm 0494DH 0003FH - @@BASE i2c_ctr 0498CH 00170H - @@BASE main 04AFCH 00000H - @@BASE magic 04AFCH 00000H - @@BASE WDT 04AFCH 00000H - @@BASE i2c_mcu 04AFCH 00098H - @@BASE i2c_twl 04B94H 000CBH - @@BASE led 04C5FH 00000H - @@BASE rtc 04C5FH 0005DH - @@BASE vreg_ctr 04CBCH 00000H - @@BASE vreg_twl 04CBCH 00000H - @@BASE adc 04CBCH 000B6H - @@BASE renge 04D72H 00000H - @@BASE accero 04D72H 0004AH + 0426CH 004DEH + ROM_CODE led_cam 0474AH 000C1H + ROM_CODE led_pow 0480BH 00177H + @@BASE 04982H 004A7H CSEG BASE + @@BASE loader 04982H 00000H + @@BASE pm 04982H 0003FH + @@BASE i2c_ctr 049C1H 00170H + @@BASE main 04B31H 00000H + @@BASE magic 04B31H 00000H + @@BASE WDT 04B31H 00000H + @@BASE i2c_mcu 04B31H 00098H + @@BASE i2c_twl 04BC9H 000CBH + @@BASE led 04C94H 00000H + @@BASE rtc 04C94H 0005DH + @@BASE vreg_ctr 04CF1H 00000H + @@BASE vreg_twl 04CF1H 00000H + @@BASE adc 04CF1H 000B6H + @@BASE renge 04DA7H 00000H + @@BASE accero 04DA7H 0004AH @@BASE self_flash - 04DBCH 00000H - @@BASE sw 04DBCH 00000H + 04DF1H 00000H + @@BASE sw 04DF1H 00000H @@BASE task_debug - 04DBCH 00000H + 04DF1H 00000H @@BASE task_misc - 04DBCH 00000H - @@BASE task_sys 04DBCH 00000H + 04DF1H 00000H + @@BASE task_sys 04DF1H 00000H @@BASE pedo_alg_thre_det2 - 04DBCH 00000H - @@BASE ini_VECT 04DBCH 00038H + 04DF1H 00000H + @@BASE ini_VECT 04DF1H 00038H @@BASE task_status - 04DF4H 00000H - @@BASE led_cam 04DF4H 00000H - @@BASE led_pow 04DF4H 00000H - @@BASE hal 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP - @@CNSTL @cstart 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP - @@CNSTL pm 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP - @@CNSTL led 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP - @@CNSTL rtc 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP - @@CNSTL adc 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP - @@CNSTL renge 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP - @@CNSTL accero 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP - @@CNSTL sw 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP + 04E29H 00000H + @@BASE led_cam 04E29H 00000H + @@BASE led_pow 04E29H 00000H + @@BASE hal 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP + @@CNSTL @cstart 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP + @@CNSTL pm 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP + @@CNSTL led 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP + @@CNSTL rtc 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP + @@CNSTL adc 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP + @@CNSTL renge 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP + @@CNSTL accero 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP + @@CNSTL sw 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP @@CNSTL task_misc - 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP - @@CNSTL task_sys 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP + 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP + @@CNSTL task_sys 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP - @@CNSTL led_cam 04DF4H 00000H - @@CNSTL 04DF4H 00000H CSEG PAGE64KP - @@CNSTL led_pow 04DF4H 00000H - @@CNSTL 04DF4H 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04DF4H 0000AH - @@R_INIT 04DFEH 00030H CSEG UNIT64KP - @@R_INIT @cstart 04DFEH 00000H - @@R_INIT loader 04DFEH 00000H - @@R_INIT pm 04DFEH 00002H - @@R_INIT i2c_ctr 04E00H 00000H - @@R_INIT main 04E00H 00000H - @@R_INIT magic 04E00H 00000H - @@R_INIT WDT 04E00H 00000H - @@R_INIT i2c_mcu 04E00H 00000H - @@R_INIT i2c_twl 04E00H 00000H - @@R_INIT led 04E00H 00000H - @@R_INIT rtc 04E00H 00000H - @@R_INIT vreg_ctr 04E00H 00000H - @@R_INIT vreg_twl 04E00H 00000H - @@R_INIT adc 04E00H 0000CH - @@R_INIT renge 04E0CH 00014H - @@R_INIT accero 04E20H 00000H - @@R_INIT self_flash - 04E20H 00000H - @@R_INIT sw 04E20H 00002H - @@R_INIT task_debug - 04E22H 00000H - @@R_INIT task_misc - 04E22H 00000H - @@R_INIT task_sys 04E22H 00002H - @@R_INIT pedo_alg_thre_det2 - 04E24H 00006H - @@R_INIT ini_VECT 04E2AH 00000H - @@R_INIT task_status - 04E2AH 00000H - @@R_INIT led_cam 04E2AH 00000H - @@R_INIT led_pow 04E2AH 00004H - @@R_INIT hal 04E2EH 00000H - @@R_INIT @rom 04E2EH 00000H - @@R_INIS 04E2EH 00008H CSEG UNIT64KP - @@R_INIS @cstart 04E2EH 00000H - @@R_INIS loader 04E2EH 00000H - @@R_INIS pm 04E2EH 00002H - @@R_INIS i2c_ctr 04E30H 00002H - @@R_INIS main 04E32H 00000H - @@R_INIS magic 04E32H 00000H - @@R_INIS WDT 04E32H 00000H - @@R_INIS i2c_mcu 04E32H 00000H - @@R_INIS i2c_twl 04E32H 00000H - @@R_INIS led 04E32H 00000H - @@R_INIS rtc 04E32H 00000H - @@R_INIS vreg_ctr 04E32H 00000H - @@R_INIS vreg_twl 04E32H 00000H - @@R_INIS adc 04E32H 00000H - @@R_INIS renge 04E32H 00000H - @@R_INIS accero 04E32H 00000H - @@R_INIS self_flash - 04E32H 00000H - @@R_INIS sw 04E32H 00000H - @@R_INIS task_debug - 04E32H 00000H - @@R_INIS task_misc - 04E32H 00000H - @@R_INIS task_sys 04E32H 00000H - @@R_INIS pedo_alg_thre_det2 - 04E32H 00000H - @@R_INIS ini_VECT 04E32H 00000H - @@R_INIS task_status - 04E32H 00000H - @@R_INIS led_cam 04E32H 00002H - @@R_INIS led_pow 04E34H 00002H - @@R_INIS hal 04E36H 00000H - @@R_INIS @rom 04E36H 00000H - @@CALT 04E36H 00000H CSEG - @@CALT @cstart 04E36H 00000H - @@CALT loader 04E36H 00000H - @@CALT pm 04E36H 00000H - @@CALT i2c_ctr 04E36H 00000H - @@CALT main 04E36H 00000H - @@CALT magic 04E36H 00000H - @@CALT WDT 04E36H 00000H - @@CALT i2c_mcu 04E36H 00000H - @@CALT i2c_twl 04E36H 00000H - @@CALT led 04E36H 00000H - @@CALT rtc 04E36H 00000H - @@CALT vreg_ctr 04E36H 00000H - @@CALT vreg_twl 04E36H 00000H - @@CALT adc 04E36H 00000H - @@CALT renge 04E36H 00000H - @@CALT accero 04E36H 00000H + 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP + @@CNSTL led_cam 04E29H 00000H + @@CNSTL 04E29H 00000H CSEG PAGE64KP + @@CNSTL led_pow 04E29H 00000H + @@CALT 04E29H 00000H CSEG + @@CALT @cstart 04E29H 00000H + @@CALT loader 04E29H 00000H + @@CALT pm 04E29H 00000H + @@CALT i2c_ctr 04E29H 00000H + @@CALT main 04E29H 00000H + @@CALT magic 04E29H 00000H + @@CALT WDT 04E29H 00000H + @@CALT i2c_mcu 04E29H 00000H + @@CALT i2c_twl 04E29H 00000H + @@CALT led 04E29H 00000H + @@CALT rtc 04E29H 00000H + @@CALT vreg_ctr 04E29H 00000H + @@CALT vreg_twl 04E29H 00000H + @@CALT adc 04E29H 00000H + @@CALT renge 04E29H 00000H + @@CALT accero 04E29H 00000H @@CALT self_flash - 04E36H 00000H - @@CALT sw 04E36H 00000H + 04E29H 00000H + @@CALT sw 04E29H 00000H @@CALT task_debug - 04E36H 00000H + 04E29H 00000H @@CALT task_misc - 04E36H 00000H - @@CALT task_sys 04E36H 00000H + 04E29H 00000H + @@CALT task_sys 04E29H 00000H @@CALT pedo_alg_thre_det2 - 04E36H 00000H - @@CALT ini_VECT 04E36H 00000H + 04E29H 00000H + @@CALT ini_VECT 04E29H 00000H @@CALT task_status - 04E36H 00000H - @@CALT led_cam 04E36H 00000H - @@CALT led_pow 04E36H 00000H - @@CALT hal 04E36H 00000H - @@RLINIT 04E36H 00000H CSEG UNIT64KP - @@RLINIT loader 04E36H 00000H - @@RLINIT pm 04E36H 00000H - @@RLINIT i2c_ctr 04E36H 00000H - @@RLINIT main 04E36H 00000H - @@RLINIT magic 04E36H 00000H - @@RLINIT WDT 04E36H 00000H - @@RLINIT i2c_mcu 04E36H 00000H - @@RLINIT i2c_twl 04E36H 00000H - @@RLINIT led 04E36H 00000H - @@RLINIT rtc 04E36H 00000H - @@RLINIT vreg_ctr 04E36H 00000H - @@RLINIT vreg_twl 04E36H 00000H - @@RLINIT adc 04E36H 00000H - @@RLINIT renge 04E36H 00000H - @@RLINIT accero 04E36H 00000H + 04E29H 00000H + @@CALT led_cam 04E29H 00000H + @@CALT led_pow 04E29H 00000H + @@CALT hal 04E29H 00000H + @@RLINIT 04E29H 00000H CSEG UNIT64KP + @@RLINIT loader 04E29H 00000H + @@RLINIT pm 04E29H 00000H + @@RLINIT i2c_ctr 04E29H 00000H + @@RLINIT main 04E29H 00000H + @@RLINIT magic 04E29H 00000H + @@RLINIT WDT 04E29H 00000H + @@RLINIT i2c_mcu 04E29H 00000H + @@RLINIT i2c_twl 04E29H 00000H + @@RLINIT led 04E29H 00000H + @@RLINIT rtc 04E29H 00000H + @@RLINIT vreg_ctr 04E29H 00000H + @@RLINIT vreg_twl 04E29H 00000H + @@RLINIT adc 04E29H 00000H + @@RLINIT renge 04E29H 00000H + @@RLINIT accero 04E29H 00000H @@RLINIT self_flash - 04E36H 00000H - @@RLINIT sw 04E36H 00000H + 04E29H 00000H + @@RLINIT sw 04E29H 00000H @@RLINIT task_debug - 04E36H 00000H + 04E29H 00000H @@RLINIT task_misc - 04E36H 00000H - @@RLINIT task_sys 04E36H 00000H + 04E29H 00000H + @@RLINIT task_sys 04E29H 00000H @@RLINIT pedo_alg_thre_det2 - 04E36H 00000H - @@RLINIT ini_VECT 04E36H 00000H + 04E29H 00000H + @@RLINIT ini_VECT 04E29H 00000H @@RLINIT task_status - 04E36H 00000H - @@RLINIT led_cam 04E36H 00000H - @@RLINIT led_pow 04E36H 00000H - @@RLINIT hal 04E36H 00000H - @@RLINIT @rom 04E36H 00000H - @@CODEL 04E36H 00000H CSEG - @@CODEL pm 04E36H 00000H - @@CODEL i2c_ctr 04E36H 00000H - @@CODEL magic 04E36H 00000H - @@CODEL i2c_twl 04E36H 00000H - @@CODEL led 04E36H 00000H - @@CODEL rtc 04E36H 00000H - @@CODEL vreg_ctr 04E36H 00000H - @@CODEL vreg_twl 04E36H 00000H - @@CODEL adc 04E36H 00000H - @@CODEL renge 04E36H 00000H - @@CODEL accero 04E36H 00000H - @@CODEL sw 04E36H 00000H + 04E29H 00000H + @@RLINIT led_cam 04E29H 00000H + @@RLINIT led_pow 04E29H 00000H + @@RLINIT hal 04E29H 00000H + @@RLINIT @rom 04E29H 00000H + @@CODEL 04E29H 00000H CSEG + @@CODEL pm 04E29H 00000H + @@CODEL i2c_ctr 04E29H 00000H + @@CODEL magic 04E29H 00000H + @@CODEL i2c_twl 04E29H 00000H + @@CODEL led 04E29H 00000H + @@CODEL rtc 04E29H 00000H + @@CODEL vreg_ctr 04E29H 00000H + @@CODEL vreg_twl 04E29H 00000H + @@CODEL adc 04E29H 00000H + @@CODEL renge 04E29H 00000H + @@CODEL accero 04E29H 00000H + @@CODEL sw 04E29H 00000H @@CODEL task_misc - 04E36H 00000H - @@CODEL task_sys 04E36H 00000H + 04E29H 00000H + @@CODEL task_sys 04E29H 00000H @@CODEL pedo_alg_thre_det2 - 04E36H 00000H - @@CODEL ini_VECT 04E36H 00000H - @@CODEL led_cam 04E36H 00000H - @@CODEL led_pow 04E36H 00000H - @@LCODEL 04E36H 00008H CSEG - @@LCODEL abs 04E36H 00008H -* gap * 04E3EH 001B6H + 04E29H 00000H + @@CODEL ini_VECT 04E29H 00000H + @@CODEL led_cam 04E29H 00000H + @@CODEL led_pow 04E29H 00000H +* gap * 04E29H 00001H + @@CNSTL 04E2AH 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04E2AH 0000AH + @@R_INIT 04E34H 0002EH CSEG UNIT64KP + @@R_INIT @cstart 04E34H 00000H + @@R_INIT loader 04E34H 00000H + @@R_INIT pm 04E34H 00002H + @@R_INIT i2c_ctr 04E36H 00000H + @@R_INIT main 04E36H 00000H + @@R_INIT magic 04E36H 00000H + @@R_INIT WDT 04E36H 00000H + @@R_INIT i2c_mcu 04E36H 00000H + @@R_INIT i2c_twl 04E36H 00000H + @@R_INIT led 04E36H 00000H + @@R_INIT rtc 04E36H 00000H + @@R_INIT vreg_ctr 04E36H 00000H + @@R_INIT vreg_twl 04E36H 00000H + @@R_INIT adc 04E36H 0000CH + @@R_INIT renge 04E42H 00014H + @@R_INIT accero 04E56H 00000H + @@R_INIT self_flash + 04E56H 00000H + @@R_INIT sw 04E56H 00000H + @@R_INIT task_debug + 04E56H 00000H + @@R_INIT task_misc + 04E56H 00000H + @@R_INIT task_sys 04E56H 00002H + @@R_INIT pedo_alg_thre_det2 + 04E58H 00006H + @@R_INIT ini_VECT 04E5EH 00000H + @@R_INIT task_status + 04E5EH 00000H + @@R_INIT led_cam 04E5EH 00000H + @@R_INIT led_pow 04E5EH 00004H + @@R_INIT hal 04E62H 00000H + @@R_INIT @rom 04E62H 00000H + @@R_INIS 04E62H 00008H CSEG UNIT64KP + @@R_INIS @cstart 04E62H 00000H + @@R_INIS loader 04E62H 00000H + @@R_INIS pm 04E62H 00002H + @@R_INIS i2c_ctr 04E64H 00002H + @@R_INIS main 04E66H 00000H + @@R_INIS magic 04E66H 00000H + @@R_INIS WDT 04E66H 00000H + @@R_INIS i2c_mcu 04E66H 00000H + @@R_INIS i2c_twl 04E66H 00000H + @@R_INIS led 04E66H 00000H + @@R_INIS rtc 04E66H 00000H + @@R_INIS vreg_ctr 04E66H 00000H + @@R_INIS vreg_twl 04E66H 00000H + @@R_INIS adc 04E66H 00000H + @@R_INIS renge 04E66H 00000H + @@R_INIS accero 04E66H 00000H + @@R_INIS self_flash + 04E66H 00000H + @@R_INIS sw 04E66H 00000H + @@R_INIS task_debug + 04E66H 00000H + @@R_INIS task_misc + 04E66H 00000H + @@R_INIS task_sys 04E66H 00000H + @@R_INIS pedo_alg_thre_det2 + 04E66H 00000H + @@R_INIS ini_VECT 04E66H 00000H + @@R_INIS task_status + 04E66H 00000H + @@R_INIS led_cam 04E66H 00002H + @@R_INIS led_pow 04E68H 00002H + @@R_INIS hal 04E6AH 00000H + @@R_INIS @rom 04E6AH 00000H + @@LCODEL 04E6AH 00022H CSEG + @@LCODEL abs 04E6AH 00008H + @@LCODEL memcpy_n 04E72H 0001AH +* gap * 04E8CH 00168H MGC_VER 04FF4H 00002H CSEG AT MGC_VER magic 04FF4H 00002H MGC_TAIL 04FF6H 0000AH CSEG AT @@ -452,7 +454,7 @@ Direc-file:bsr_mcu.dr BASE ADDRESS=FF900H SIZE=00500H OUTPUT INPUT INPUT BASE SIZE SEGMENT SEGMENT MODULE ADDRESS - @@DATA FF900H 003F2H DSEG BASEP + @@DATA FF900H 003F4H DSEG BASEP @@DATA @cstart FF900H 00002H @@DATA loader FF902H 00000H @@DATA pm FF902H 0000CH @@ -471,41 +473,41 @@ Direc-file:bsr_mcu.dr @@DATA accero FFC40H 00002H @@DATA self_flash FFC42H 00002H - @@DATA sw FFC44H 00000H + @@DATA sw FFC44H 00002H @@DATA task_debug - FFC44H 00000H + FFC46H 00000H @@DATA task_misc - FFC44H 00002H - @@DATA task_sys FFC46H 00002H + FFC46H 00002H + @@DATA task_sys FFC48H 00002H @@DATA pedo_alg_thre_det2 - FFC48H 000A0H - @@DATA ini_VECT FFCE8H 00000H + FFC4AH 000A0H + @@DATA ini_VECT FFCEAH 00000H @@DATA task_status - FFCE8H 00002H - @@DATA led_cam FFCEAH 00000H - @@DATA led_pow FFCEAH 00008H - @@DATA hal FFCF2H 00000H - @@DATA @rom FFCF2H 00000H - @@INIT FFCF2H 00030H DSEG BASEP - @@INIT @cstart FFCF2H 00000H - @@INIT loader FFCF2H 00000H - @@INIT pm FFCF2H 00002H - @@INIT i2c_ctr FFCF4H 00000H - @@INIT main FFCF4H 00000H - @@INIT magic FFCF4H 00000H - @@INIT WDT FFCF4H 00000H - @@INIT i2c_mcu FFCF4H 00000H - @@INIT i2c_twl FFCF4H 00000H - @@INIT led FFCF4H 00000H - @@INIT rtc FFCF4H 00000H - @@INIT vreg_ctr FFCF4H 00000H - @@INIT vreg_twl FFCF4H 00000H - @@INIT adc FFCF4H 0000CH - @@INIT renge FFD00H 00014H - @@INIT accero FFD14H 00000H + FFCEAH 00002H + @@DATA led_cam FFCECH 00000H + @@DATA led_pow FFCECH 00008H + @@DATA hal FFCF4H 00000H + @@DATA @rom FFCF4H 00000H + @@INIT FFCF4H 0002EH DSEG BASEP + @@INIT @cstart FFCF4H 00000H + @@INIT loader FFCF4H 00000H + @@INIT pm FFCF4H 00002H + @@INIT i2c_ctr FFCF6H 00000H + @@INIT main FFCF6H 00000H + @@INIT magic FFCF6H 00000H + @@INIT WDT FFCF6H 00000H + @@INIT i2c_mcu FFCF6H 00000H + @@INIT i2c_twl FFCF6H 00000H + @@INIT led FFCF6H 00000H + @@INIT rtc FFCF6H 00000H + @@INIT vreg_ctr FFCF6H 00000H + @@INIT vreg_twl FFCF6H 00000H + @@INIT adc FFCF6H 0000CH + @@INIT renge FFD02H 00014H + @@INIT accero FFD16H 00000H @@INIT self_flash - FFD14H 00000H - @@INIT sw FFD14H 00002H + FFD16H 00000H + @@INIT sw FFD16H 00000H @@INIT task_debug FFD16H 00000H @@INIT task_misc diff --git a/branches/sim/bsr_system.h b/branches/sim/bsr_system.h index 6f5bb61..54d2b75 100644 --- a/branches/sim/bsr_system.h +++ b/branches/sim/bsr_system.h @@ -17,7 +17,11 @@ enum pwr_state_ enum poweron_reason_ { NONE = 0, - PWSW + RSN_PWSW, + RSN_RTC_ALARM, + RSN_RSV3, + RSN_RSV4, + RSN_RSV5 }; diff --git a/branches/sim/config.h b/branches/sim/config.h index 34d9e06..781fd20 100644 --- a/branches/sim/config.h +++ b/branches/sim/config.h @@ -3,24 +3,24 @@ #define MCU_VER_MAJOR 0x01 -#define MCU_VER_MINOR 0x37 +#define MCU_VER_MINOR 0x38 // デバッグ向けスイッチ -//#define _debug_led_ -//#define _ALLOW_NOBATT_ -//#define _DBG_PEDO_AUTO_ENABLE_ -//#define _DBG_LED_PRINT_ -//#define _DBG_FORCE_FULLCOLOR_ -//#define _PMIC_TEST_ +//#define _debug_led_ // LED print デバッグをしたいとき +//#define _ALLOW_NOBATT_ // 実機電池なし(=アダプタのみ)での起動を許可 +//#define _DBG_PEDO_AUTO_ENABLE_ // 電源投入の瞬間から歩数計on +//#define _DBG_LED_PRINT_ // LED print デバッグをしたいとき(自己アップデート用) //#define _ENABLE_WDT_TEST_ //#define _FORCE_TAIKENDAI_ //#define _FORCE_TAIKENDAI_NBD_ -#define _JHL_DEBUG_ +//#define _DBG_CHK_OFF_LEAK_ // OFF時リーク電流のチェック(デバッガで確認) +#define _DBG_NOP_ // ブレークを貼るためにNOP()を有効にしたいとき -#ifdef _JHL_DEBUG_ + +#ifdef _DBG_NOP_ # define dbg_nop() NOP() #else # define dbg_nop() ; diff --git a/branches/sim/hal.c b/branches/sim/hal.c index 994ab52..101faf2 100644 --- a/branches/sim/hal.c +++ b/branches/sim/hal.c @@ -45,7 +45,7 @@ void hal_update() if( temp_conf & REG_BIT_HAL0_PM_EXTDC_n ) { // 三項式はなんだか大きくなりがち - if(( temp_dat & REG_BIT_HAL0_PM_EXTDC_n ) == 0 ) // ロンリガー + if(( temp_dat & REG_BIT_HAL0_PM_EXTDC_n ) == 0 ) { PM_EXTDC_n = 0; } diff --git a/branches/sim/loader.c b/branches/sim/loader.c index 3c0778a..403ab61 100644 --- a/branches/sim/loader.c +++ b/branches/sim/loader.c @@ -248,7 +248,7 @@ void hdwinit2( ) else { // P0 = bits8(0,0,0,0, 0,0,0,0); // -,-,-,-, -,-,/reset2,/reset1 - P3 = bits8(0,0,0,0, 0,1,1,0); // -,-,-,-, i2c_pu,scl_m,sda_m,/fcr_rst // 簡易I2Cは出力ラッチを1にする + P3 = bits8(0,0,0,0, 1,1,1,0); // -,-,-,-, i2c_pu,scl_m,sda_m,/fcr_rst // 簡易I2Cは出力ラッチを1にする } // PM0 = bits8(1,1,1,1, 1,1,1,1); // BSRマイコンでは、reset1は監視のみになる。 @@ -260,7 +260,7 @@ void hdwinit2( ) // P1 = bits8(0,0,0,0, 0,0,0,0); // bt_temp_p,bt_det_p,led_info_r,led_pow_b led_info_g,32khz_o,led_wifi,led_info_b // P2 = bits8(0,0,0,0, 0,0,0,0); // ad_vol,ad_3d,acc_int1,led_chg, (sw_sel),(rbr_flight),(/rbr_rst),(ext_vdd33) P4 = bits8(0,0,0,0, 1,0,0,0); // -,-,-,-, /chg_en, led_pow_r, dipsw[1,0] -// P5 = bits8(0,0,0,0, 0,0,0,0); // -,-,-,-, i2c_pu,led_3d,/chg,/gyro_cs + P5 = bits8(0,0,0,0, 1,0,0,0); // -,-,-,-, i2c_pu,led_3d,/chg,/gyro_cs // P6 = bits8(0,0,0,0, 0,0,0,0); // -,-,-,-, -,-,sda2,scl2 // P7 = bits8(0,0,0,0, 0,0,0,0); // slp_o,/irq,led_cam,sw_wifi, sw_pow,pm_irw,shell_close,/extdc // P12 = bits8(0,0,0,0, 0,0,0,0); // -,-,-,xtal, xtal,dip(機種判定)[1,0],slp_i @@ -290,7 +290,7 @@ void hdwinit2( ) PM2 = bits8(1,1,1,0, 1,0,0,1); PM4 = bits8(1,1,1,1, 0,0,1,1); - PM5 = bits8(1,1,1,1, 0,0,1,0); + PM5 = bits8(1,1,1,1, 1,0,1,0); PM6 = bits8(1,1,1,1, 1,1,0,0); // I2CのラインがL出力になってしまうが、システムがOFFなのでかまわない PM7 = bits8(0,1,0,1, 1,1,1,1); // PM12 = bits8(1,1,1,1, 1,1,1,1); // 32kHzクロックのピン設定はどっちでもよい diff --git a/branches/sim/main.c b/branches/sim/main.c index 862786a..98344b2 100644 --- a/branches/sim/main.c +++ b/branches/sim/main.c @@ -28,6 +28,7 @@ bit i2c_mcu_time_out_error; // I2C extern void i2c_mcu_error_monitor(); #endif + /* ======================================================== 本当のエントリ関数は loader.c にあります ======================================================== */ @@ -37,7 +38,15 @@ void main_loop( void ) i2c_mcu_time_out_error = false; #endif - // 電池投入時、ファームアップデート後のみ + // HALデバッグリセット + vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] = 0; + vreg_ctr[ VREG_C_HAL_OVW_CONT1 ] = 0; + vreg_ctr[ VREG_C_HAL_OVW_TEMPERATURE ] = 0xFF; + vreg_ctr[ VREG_C_HAL_OVW_BT_FUEL ] = 0xFF; + vreg_ctr[ VREG_C_HAL_OVW_BT_VOLTAGE ] = 0xFF; + + + // 電池投入時、ファームアップデート後のみ RTC_init( ); // 内部でリブートか判定しています renge_init( ); diff --git a/branches/sim/pm.c b/branches/sim/pm.c index 25fdec4..c0bfbdf 100644 --- a/branches/sim/pm.c +++ b/branches/sim/pm.c @@ -99,8 +99,12 @@ void tsk_batt( ) { static u8 task_interval = 0; - if( system_status.pwr_state != OFF_TRIG ) - { + if( system_status.pwr_state == OFF_TRIG ) // OFF_TRIGは一回しかこないので + { // 満充電のに刺した瞬間電源切ると、5sec電源再投入できず不便。消しちゃう + chg_led_override = 0; + } + else + { if( task_interval -- != 0 ) { return; @@ -249,7 +253,7 @@ void pm_chk_adapter() if( pm_extdc_old != PM_EXTDC_n ) // HAL を通すため、 PM_EXTDC_n の volatile にする心配なし { pm_extdc_old = PM_EXTDC_n; - if( PM_EXTDC_n ) + if( !PM_EXTDC_n ) { // 刺さった set_bit( 1, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY ); diff --git a/branches/sim/rtc.c b/branches/sim/rtc.c index c4f80fc..69b4050 100644 --- a/branches/sim/rtc.c +++ b/branches/sim/rtc.c @@ -32,8 +32,11 @@ void RTC_init( void ) // RTC設定 RTCC0 = bits8(0,0,0,0, 1,0,0,0); /* 動作停止、24時間制、32k出力「まだなし」、定周期割り込みなし */ + // (RTCE 0 RCLOE1 RCLOE0 AMPM CT2 CT1 CT0) RTCC1 = bits8(1,1,0,0, 0,0,0,0); /* アラーム割り込み有効&動作開始 */ + // (WALE WALIE 0 WAFG RIFG 0 RWST RWAIT) RTCC2 = bits8(1,0,0,0, 0,0,0,0); /* インターバル:32k/2^6=2ms、RTCDIV出力なし */ + // (RINTE RCLOE2 RCKDIV 0 0 ICT2 ICT1 ICT0) HOUR = 0x00; MIN = 0x00; diff --git a/branches/sim/sim/sfrAlias.h b/branches/sim/sim/sfrAlias.h index 7317751..1e77313 100644 --- a/branches/sim/sim/sfrAlias.h +++ b/branches/sim/sim/sfrAlias.h @@ -130,8 +130,8 @@ #ifdef _MODEL_CTR_ // mcuRegP[ _P5_3 ] に加え、mcuRegP[ _P5_5 ], P140 P141 // P140が出力専用なので... -#define I2C_PU_on() { mcuRegPM[ _P5_3 ] = 1; mcuRegPM[ _P3_3 ] = 1; P14 |= 0x03; mcuRegP[ _P5_3 ] = 1; mcuRegPM[ _P5_3 ] = 0; mcuRegP[ _P3_3 ] = 1; mcuRegPM[ _P3_3 ] = 0; } -#define I2C_PU_off() { mcuRegPM[ _P5_3 ] = 1; mcuRegPM[ _P3_3 ] = 1; P14 &= ~0x03; mcuRegP[ _P5_3 ] = 0; mcuRegPM[ _P5_3 ] = 0; mcuRegP[ _P3_3 ] = 0; mcuRegPM[ _P3_3 ] = 0; } +#define I2C_PU_on() { P14 |= 0x03; mcuRegPM[ _P5_3 ] = 0; mcuRegPM[ _P3_3 ] = 0; } +#define I2C_PU_off() { mcuRegPM[ _P5_3 ] = 1; mcuRegPM[ _P3_3 ] = 1; P14 &= ~0x03; } #endif #define GYRO_ENABLE() mcuRegP[ _P5_0 ] = 0 diff --git a/branches/sim/sw.c b/branches/sim/sw.c index 70af168..ba1150b 100644 --- a/branches/sim/sw.c +++ b/branches/sim/sw.c @@ -26,8 +26,8 @@ #define HOLD_THREASHOLD (u8)( 2000 / INTERVAL_TSK_SW ) #define FORCEOFF_THREASHOLD (u8)( 4000 / INTERVAL_TSK_SW ) */ -#define TIME_MUKAN (u8)( 300 / INTERVAL_TSK_SW ) -#define TIME_MUKAN_PWSW (u16)( 8000 / INTERVAL_TSK_SW ) +#define TIME_MUKAN (u8)( 300 / INTERVAL_TSK_SW ) +#define TIME_MUKAN_PWSW_RED_TRIAL (u16)( 15000 / INTERVAL_TSK_SW ) // 試遊台、homeマスク時間 //========================================================= u16 SW_pow_count; @@ -85,22 +85,22 @@ u16 sw_pwsw_mukan_time; ======================================================== */ void tsk_sw( ) { - static u8 task_interval = 1; + static u8 task_interval; - if( system_status.pwr_state == ON_TRIG ) + if( system_status.pwr_state == OFF_TRIG ) { - SW_pow_count = 0; // カウントクリア + SW_pow_count = 0; // 電源投入に備えてクリア + task_interval = 0; } - if( -- task_interval != 0 ) + if( task_interval != 0 ) { + task_interval--; return; - } - else - { - task_interval = (u8)( INTERVAL_TSK_SW / SYS_INTERVAL_TICK ); + // おしまい } + task_interval = (u8)( INTERVAL_TSK_SW / SYS_INTERVAL_TICK );// プリスケーラ代わりに使ってますね… // 8ms 毎にきます switch ( system_status.pwr_state ) @@ -137,6 +137,7 @@ void tsk_sw( ) } }else{ + // スタンドアロン試遊台 // 電源スイッチの監視 // if( SW_pow_count == ( TIME_PWSW_CLICK ) ) { @@ -144,7 +145,7 @@ void tsk_sw( ) { set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); // いやなタイミングでPWSWを押すとHOMEメニューに入れてしまうのを回避するためのマスクタイマー - sw_pwsw_mukan_time = TIME_MUKAN_PWSW; + sw_pwsw_mukan_time = TIME_MUKAN_PWSW_RED_TRIAL; } } else if( SW_pow_count == ( HOLD_THREASHOLD ) ) @@ -160,13 +161,12 @@ void tsk_sw( ) count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask ); // ボタン押し時間のカウント - // HOME スイッチ // - - chk_clicked( SW_HOME_n, SW_home_count, REG_BIT_SW_HOME_CLICK ); + // 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--; diff --git a/branches/sim/task_debug.c b/branches/sim/task_debug.c index 1541f95..54b594b 100644 --- a/branches/sim/task_debug.c +++ b/branches/sim/task_debug.c @@ -50,13 +50,6 @@ void tsk_debug( ) } */ -#ifdef _PMIC_TEST_ - if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP ) ) - { - iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 0x03, 0 ); - } -#endif - // iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 2, vreg_ctr[ VREG_C_IRQ1 ] ); // iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 1, boot_ura ); // iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 1, vreg_ctr[ VREG_C_SND_VOL ] ); diff --git a/branches/sim/task_misc.c b/branches/sim/task_misc.c index 84c14e2..6ce2183 100644 --- a/branches/sim/task_misc.c +++ b/branches/sim/task_misc.c @@ -308,17 +308,19 @@ u8 extinfo_read() infos[15] = LED_duty_notify_blu; infos[16] = LED_CAM; infos[17] = LED_duty_WiFi; - infos[18] = -// ( PM_EXTDC_n ? REG_BIT_HAL0_PM_EXTDC_n : 0 ) // status0にある - 0 + infos[18] = 0 +// | ( PM_EXTDC_n ? REG_BIT_HAL0_PM_EXTDC_n : 0 ) // status0にある + | ( RBR_RESET_n ? REG_BIT_HAL0_PM_EXTDC_n : 0 ) // ↑空きを使わせてもらう | ( BT_IN_CHG_n ? REG_BIT_HAL0_BT_IN_CHG_n : 0 ) -// | ( SHELL_OPEN ? REG_BIT_HAL0_SHELL_OPEN : 0 ) // status0にある - | ( BT_CHG_Ena_n ? REG_BIT_HAL0_RSV_5 : 0 ) // 空きビット使用,out pin - | 0 + | ( BT_CHG_Ena_n ? REG_BIT_HAL0_RSV_5 : 0 ) // 空きビット使用,out pin + | 0 // WL_TX 使えない +// | ( SHELL_OPEN ? REG_BIT_HAL0_SHELL_OPEN : 0 ) // status0にある + | ( RBR_FLIGHT ? REG_BIT_HAL0_SHELL_OPEN : 0 ) // ↑空きを使わせてもらう | ( SW_WIFI_n ? REG_BIT_HAL0_SW_WIFI_n : 0 ) | ( SW_HOME_n ? REG_BIT_HAL0_SW_HOME_n : 0 ) | ( SW_POW_n ? REG_BIT_HAL0_SW_POW_n : 0 ); + // 項目足すときは気をつけてね!! // iic_burst_state ++; diff --git a/branches/sim/task_sys.c b/branches/sim/task_sys.c index ca3958e..e970137 100644 --- a/branches/sim/task_sys.c +++ b/branches/sim/task_sys.c @@ -47,7 +47,7 @@ extern bit i2c_mcu_time_out_error; //========================================================= -#define PWSW_POWON_TIME (u8)( 20 / SYS_INTERVAL_TICK ) +#define PWSW_POWON_TIME (u8)( 50 / INTERVAL_TSK_SW ) // [ms] /* ======================================================== マイコン内部で必要なもの @@ -64,9 +64,9 @@ void tsk_sys( ) switch ( system_status.pwr_state ) { case ON_CHECK: //------------------------------------------------------- - // スイッチ操作などで割り込みが発生し、スリープが解除されるとここに来ます。 + // pwswか、他の割り込みでスリープが解除されると来ます。 - if( system_status.poweron_reason == NONE ) + if( system_status.poweron_reason == RSN_PWSW ) // アダプタなしで電源スイッチ押したときしか回らない { // スイッチで電源on if( SW_pow_count != 0 ) @@ -80,7 +80,8 @@ void tsk_sys( ) if( pwsw_timeout > 100 ) { - system_status.pwr_state = OFF; // スイッチはノイズだった。寝る。 + SW_pow_count = 0; + system_status.pwr_state = OFF_TRIG; // スイッチはノイズだった。寝る。 renge_task_interval_run_force = true; return; } @@ -90,18 +91,10 @@ void tsk_sys( ) // もう少しスイッチの様子を見る return; } - // 電源投入 - system_status.poweron_reason = PWSW; } SW_pow_mask = true; - // for debug -#ifdef _DEBUG_BT_FUEL_ - vreg_ctr[ VREG_C_DBG01 ] = 99; -#endif - vreg_ctr[ VREG_C_COMMAND3 ] = 0; - // 電源投入 // iic_mcu_start( ); @@ -152,7 +145,7 @@ void tsk_sys( ) 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 - if( system_status.poweron_reason == PWSW ) + if( system_status.poweron_reason == RSN_PWSW ) { // 電源ボタンでのonの時は、LEDを点灯させる vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_AUTO; @@ -338,7 +331,7 @@ void tsk_sys( ) KRM = ( KR_SW_POW ); // Mask ではなく、Modeなのだそうだ。紛らわしい MK0 = ~( INT_MSK0_EXTDC ); - MK1 = ~( INT_MSK1_KR | INT_MSK1_RTCALARM | INT_MSK1_RTCINTVAL ); + MK1 = ~( INT_MSK1_KR | INT_MSK1_RTCINTVAL ); // INT_MSK1_RTCALARM | RTCアラーム封印中 MK2L = 0xFF; // PU5 そのまま @@ -371,13 +364,11 @@ void tsk_sys( ) ACC_VALID = 0; PM_ACC_VALID = 0; - iic_mcu_stop( ); - system_status.pwr_state = OFF; SW_pow_mask = true; SW_pow_count = 0; - // HALデバッグリセット + // HALデバッグリセット 忘れると電源on出来なくなることが… vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] = 0; vreg_ctr[ VREG_C_HAL_OVW_CONT1 ] = 0; vreg_ctr[ VREG_C_HAL_OVW_TEMPERATURE ] = 0xFF; @@ -391,7 +382,7 @@ void tsk_sys( ) if( !PM_EXTDC_n ) { - // アダプタが刺さってるときはこのブロックを繰り返す。 + // アダプタ有り /////////////////////////////// BT_chk(); // 要ポーリング(電池抜かれ検出のため) // ↑の中で必要だったらI2C_m_init呼んでます @@ -402,24 +393,26 @@ void tsk_sys( ) system_status.pwr_state = ON_CHECK; // 直ちに押し時間チェックは合格して電源投入に入る } - if( system_status.model != MODEL_JIKKI ) + if( system_status.model != MODEL_JIKKI ) { iic_mcu_stop( ); } if( system_status.taikendai ) { - vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] = vreg_ctr[ VREG_C_HAL_OVW_CONT1 ] = 0; + vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] = vreg_ctr[ VREG_C_HAL_OVW_CONT1 ] = 0; // 電源投入 - wait_ms(46); - system_status.poweron_reason = PWSW; + wait_ms(46); // pmicの電源再投入仕様のため + system_status.poweron_reason = RSN_PWSW; system_status.pwr_state = ON_CHECK; } } else { - // アダプタなし - if( chg_led_override != 0 ) // これがゼロになるまで待つ + // アダプタなし /////////////////////////////// + u8 irq_mask_original_1; // RTCアラームで起動しないように。 現状、他の割り込みでは起きない + + if( chg_led_override != 0 ) // これがゼロになるまで待つ todo { return; }; @@ -434,46 +427,81 @@ void tsk_sys( ) {;} // 割り込み待ちで寝る // - RTCIMK = 1; + RTCIMK = 1; // systick用インターバルタイマー割り込みマスク CKC = bits8(0,0,0,0, 1,0,0,1); OSMC = 0x00; - - if( PM_EXTDC_n ) // きわどいタイミングで挿抜が起きることがある +#ifdef _DBG_CHK_OFF_LEAK_ { - /* - vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] = 0; - vreg_ctr[ VREG_C_HAL_OVW_CONT1 ] = 0; - vreg_ctr[ VREG_C_HAL_OVW_TEMPERATURE ] = 0xFF; - vreg_ctr[ VREG_C_HAL_OVW_BT_FUEL ] = 0xFF; - vreg_ctr[ VREG_C_HAL_OVW_BT_VOLTAGE ] = 0xFF; -*/ - if( vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] != 0 || - vreg_ctr[ VREG_C_HAL_OVW_BT_FUEL ] == 0xFF ) - { - dbg_nop(); - } + // off中のpin設定ミスチェック + volatile u8 ports_i[12]; + volatile u8 ports_o[12]; - STOP( ); + ports_i[0] = ( PM0 & PU0 & ~P0 ); // プルアップ切り忘れ? + ports_i[1] = ( PM1 & PU1 & ~P1 ); + ports_i[2] = 0; + ports_i[3] = ( PM3 & PU3 & ~P3 ); + ports_i[4] = ( PM4 & PU4 & ~P4 ); + ports_i[5] = ( PM5 & PU5 & ~P5 ); + ports_i[6] = 0; + ports_i[7] = ( PM7 & PU7 & ~P7 ); + ports_i[8] = ( PM12 & PU12 & ~P12 ); + ports_i[9] = ( PM14 & PU14 & ~P14 ); + ports_i[10] = 0; + ports_i[11] = ( PM20 & PU20 & ~P20 ); + + ports_o[0] = ( ~PM0 & P0 ); // H 出力しちゃってるかも + ports_o[1] = ( ~PM1 & P1 ); + ports_o[2] = ( ~PM2 & P2 ); + ports_o[3] = ( ~PM3 & P3 & ~POM3 ); + ports_o[4] = ( ~PM4 & P4 ); // bit3はchg_enなので1でもよい + ports_o[5] = ( ~PM5 & P5 ); + ports_o[6] = ( ~PM6 & P6 ); + ports_o[7] = ( ~PM7 & P7 ); + ports_o[8] = ( ~PM12 & P12 ); + ports_o[9] = ( ~PM14 & P14 ); + ports_o[10] = ( ~PM15 & P15 ); + ports_o[11] = ( ~PM20 & P20 ); + NOP(); // ←ブレーク置くため } - // 起きる // +#endif + if( PM_EXTDC_n ) // きわどいタイミングで挿抜が起きることがある + { + STOP(); + } + + // 起きる // // 起きる条件は // ・KeyReturn割り込み(電源ボタン) - // ・アダプタ挿抜 + // ・RTCアラーム(現在封印) - OSMC = 0x01; + renge_flg_interval = 0; + hal_update(); + + OSMC = 0x01; CKC = bits8(0,0,0,0, 1,0,0,0); - if( PM_EXTDC_n ) - { - // 電源ボタンで起きたとき - SW_pow_mask = false; - system_status.pwr_state = ON_CHECK; - } - // else{ - // アダプタで起きたときは OFF の中をぐるぐるまわる + // 起きた理由は? + if( !PM_EXTDC_n ){ + system_status.pwr_state = OFF; // OFFを回って充電監視 + } +/* // RTCアラーム。封印中 + else if( vreg_ctr[ VREG_C_IRQ1 ] & REG_BIT_RTC_ALARM ) + { + system_status.poweron_reason = RSN_RTC_ALARM; + system_status.pwr_state = ON_CHECK; + } + // else if( 他の割り込みで電源on ){ + // これ以外の許可割り込みで起きないんだけど、いいんですよね // } +*/ + else // if( !SW_POW_n ) // (それ以外なら)電源ボタンで起きた + { + SW_pow_mask = false; + system_status.poweron_reason = RSN_PWSW; + system_status.pwr_state = ON_CHECK; + } RTCIMK = 0; if( system_status.taikendai ) @@ -546,8 +574,8 @@ static void chk_emergencyExit(){ { if( !RESET1_n ) { - if( shirobako_power_control_count != 255 ) - shirobako_power_control_count ++; + if( shirobako_power_control_count != 255 ) + shirobako_power_control_count ++; } else { @@ -599,9 +627,9 @@ void send_getup_to_soc() -/*******************************************************//** +/* ======================================================== firm_update()を task_status_immed型 を返すようにすればいいのですが... - **********************************************************/ + ======================================================== */ task_status_immed tski_firm_update(){ firm_update(); return( ERR_SUCCESS ); diff --git a/branches/sim/user_define.h b/branches/sim/user_define.h index fb4bf2b..8f11573 100644 --- a/branches/sim/user_define.h +++ b/branches/sim/user_define.h @@ -139,8 +139,8 @@ // P5.3 に加え、P5.5, P140 P141 // P140が出力専用なので... -#define I2C_PU_on() { PM5.3 = 1; PM3.3 = 1; P14 |= 0x03; P5.3 = 1; PM5.3 = 0; P3.3 = 1; PM3.3 = 0; } -#define I2C_PU_off() { PM5.3 = 1; PM3.3 = 1; P14 &= ~0x03; P5.3 = 0; PM5.3 = 0; P3.3 = 0; PM3.3 = 0; } +#define I2C_PU_on() { P14 |= 0x03; PM5.3 = 0; PM3.3 = 0; } +#define I2C_PU_off() { PM5.3 = 1; PM3.3 = 1; P14 &= ~0x03; } #define GYRO_ENABLE() P5.0 = 0 #define GYRO_DISABLE() P5.0 = 1 diff --git a/branches/sim/vreg_ctr.c b/branches/sim/vreg_ctr.c index d675f57..3697e1a 100644 --- a/branches/sim/vreg_ctr.c +++ b/branches/sim/vreg_ctr.c @@ -547,7 +547,7 @@ void vreg_ctr_after_read( u8 adrs, u8 data ) } #endif -// マスクされてたら、フラグも立てず、割り込みも入れない。 +// マスクされてたら、フラグ「立てない」、割り込み入れない。 void set_irq( u8 irqreg, u8 irq_flg ) { u8 tot; diff --git a/branches/sim/yav_mcu_bsr.plg b/branches/sim/yav_mcu_bsr.plg index 6801899..b67e74e 100644 --- a/branches/sim/yav_mcu_bsr.plg +++ b/branches/sim/yav_mcu_bsr.plg @@ -1,135 +1,13 @@ 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 -rd2 -qvjl2w -sainter_asm -zpb -no loader.c -loader.c(141) : CC78K0R warning W0401: Conversion may lose significant digits -loader.c(142) : CC78K0R warning W0401: Conversion may lose significant digits -loader.c(174) : 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 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 -rd2 -qvjl2w -sainter_asm -zpb -no pm.c -pm.c(488) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(785) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(789) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(819) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(840) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(906) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(915) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1118) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1120) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 9 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff 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 -rd2 -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 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 -rd2 -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 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 -rd2 -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 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 -rd2 -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 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 -rd2 -qvjl2w -sainter_asm -zpb -no led.c -led.c(82) : CC78K0R warning W0745: Expected function prototype -led.c(332) : 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 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 -rd2 -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 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 -rd2 -qvjl2w -sainter_asm -zpb -no vreg_ctr.c -vreg_ctr.c(163) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(166) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(168) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(169) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(217) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(217) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(222) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(222) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(226) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(226) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(230) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(230) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(234) : 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 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 -rd2 -qvjl2w -sainter_asm -zpb -no vreg_twl.c -vreg_twl.c(55) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_twl.c(59) : 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 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 -rd2 -qvjl2w -sainter_asm -zpb -no adc.c -adc.c(101) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(182) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(228) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(352) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(474) : CC78K0R warning W0745: Expected function prototype -adc.c(503) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(508) : 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 inter_asm\adc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no accero.c -Compilation complete, 0 error(s) and 0 warning(s) found. +accero.c(105) : 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 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 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 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 -rd2 -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 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 -rd2 -qvjl2w -sainter_asm -zpb -no task_misc.c -task_misc.c(292) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(299) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(304) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(305) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(306) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(307) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(308) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(310) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(320) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 9 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff 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 -rd2 -qvjl2w -sainter_asm -zpb -no task_sys.c -task_sys.c(215) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(556) : 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 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 -rd2 -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c -pedo_alg_thre_det2.c(94) : CC78K0R warning W0745: Expected function prototype -pedo_alg_thre_det2.c(109) : 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 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 -rd2 -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 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 -rd2 -qvjl2w -sainter_asm -zpb -no led_pow.c -led_pow.c(99) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(104) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(155) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(215) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(244) : 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 inter_asm\led_pow.asm -Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -obsr.lmf "..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -go85h,0FC00h,1024 -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel Link complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\oc78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf @@ -137,4 +15,4 @@ Object Conversion Complete, 0 error(s) and 0 warning(s) found. C:\Windows\system32\cmd.exe /c ruby nec_s_2_bsrbin2.rb bsr.hex 133 !E debug enable!! -Build Total error(s) : 0 Total warning(s) : 55 +Build Total error(s) : 0 Total warning(s) : 1 diff --git a/branches/sim/yav_mcu_bsr.prj b/branches/sim/yav_mcu_bsr.prj index 27ab599..9abd0af 100644 --- a/branches/sim/yav_mcu_bsr.prj +++ b/branches/sim/yav_mcu_bsr.prj @@ -297,6 +297,300 @@ Include35=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\in Include36=sim\simOnWin.h Include37=sim\sfrAlias.h Include38=hal.h +Include39=sim\sim_interrupt_decrare.c +[Options.LCNV78K0R 0] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 1] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 2] +Version=100 +LCNV_GO=0 +O0=inter_asm +E=0 +CommandFile=0 +[Options.LCNV78K0R 3] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 4] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 5] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LK78K0R 0] +Version=100 +O0=bsr_k0r.lmf +O1=bsr.lmf +O2=flash.lmf +O3=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_k0r.map +P1=bsr.map +P2=flash.map +P3=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=0 +SELFCheck=1 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LK78K0R 1] +Version=100 +O0=a.lmf +G=0 +E=0 +E0=a.elk +GO=0 +GOValue= +GOStart=FC00 +GOSizeValue=1024 +GI=0 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=1 +MemInfoCheck=0 +P=1 +P0=a.map +MI=0 +GB=0 +GBValue= +KM=1 +KD=1 +KP=0 +KL=0 +LF=0 +LL=0 +S=0 +W=1 +SELFCheck=0 +SELF=0 +ZB= +CommandFile=0 +[Options.LK78K0R 2] +Version=100 +O0=bsr.lmf +O1=bsr_k0r.lmf +O2=flash.lmf +O3=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=1B339499E033F240BFAA +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_k0r.map +P1=bsr.map +P2=flash.map +P3=a.map +MI=0 +GB=1 +GBValue=7EFBFF +KM=1 +KD=0 +KP=0 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib +B1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=0 +SELFCheck=0 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +OFILE=C:\78k_data\yav-mcu-basara\branches\sim\bsr.lmf +[Options.LK78K0R 3] +Version=100 +O0=bsr_bsr.lmf +O1=bsr_k0r.lmf +O2=bsr.lmf +O3=flash.lmf +O4=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_bsr.map +P1=bsr_k0r.map +P2=bsr.map +P3=flash.map +P4=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=2 +SELFCheck=0 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LK78K0R 4] +Version=100 +O0=bsr_k0r.lmf +O1=bsr.lmf +O2=flash.lmf +O3=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_k0r.map +P1=bsr.map +P2=flash.map +P3=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=0 +SELFCheck=1 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LK78K0R 5] +Version=100 +O0=bsr_bsr.lmf +O1=bsr_k0r.lmf +O2=bsr.lmf +O3=flash.lmf +O4=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_bsr.map +P1=bsr_k0r.map +P2=bsr.map +P3=flash.map +P4=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=2 +SELFCheck=0 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.78K0R] +BuildMode=2 +BuildMode2=K0R_dbg +BuildMode3=BSR_dbg +BuildMode4=BSR_rel +BuildMode5=BSR_WM0 +DefaultMode2=1 +DefaultMode3=1 +DefaultMode4=1 +DefaultMode5=1 [Options.CC78K0R 0] Version=210 Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r @@ -766,296 +1060,3 @@ VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 VF78K0Rvs= -[Options.LK78K0R 0] -Version=100 -O0=bsr_k0r.lmf -O1=bsr.lmf -O2=flash.lmf -O3=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_k0r.map -P1=bsr.map -P2=flash.map -P3=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=0 -SELFCheck=1 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LK78K0R 1] -Version=100 -O0=a.lmf -G=0 -E=0 -E0=a.elk -GO=0 -GOValue= -GOStart=FC00 -GOSizeValue=1024 -GI=0 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=1 -MemInfoCheck=0 -P=1 -P0=a.map -MI=0 -GB=0 -GBValue= -KM=1 -KD=1 -KP=0 -KL=0 -LF=0 -LL=0 -S=0 -W=1 -SELFCheck=0 -SELF=0 -ZB= -CommandFile=0 -[Options.LK78K0R 2] -Version=100 -O0=bsr.lmf -O1=bsr_k0r.lmf -O2=flash.lmf -O3=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=1B339499E033F240BFAA -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_k0r.map -P1=bsr.map -P2=flash.map -P3=a.map -MI=0 -GB=1 -GBValue=7EFBFF -KM=1 -KD=0 -KP=0 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -B1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=0 -SELFCheck=0 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -OFILE=C:\78k_data\yav-mcu-basara\branches\sim\bsr.lmf -[Options.LK78K0R 3] -Version=100 -O0=bsr_bsr.lmf -O1=bsr_k0r.lmf -O2=bsr.lmf -O3=flash.lmf -O4=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_bsr.map -P1=bsr_k0r.map -P2=bsr.map -P3=flash.map -P4=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=2 -SELFCheck=0 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LK78K0R 4] -Version=100 -O0=bsr_k0r.lmf -O1=bsr.lmf -O2=flash.lmf -O3=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_k0r.map -P1=bsr.map -P2=flash.map -P3=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=0 -SELFCheck=1 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LK78K0R 5] -Version=100 -O0=bsr_bsr.lmf -O1=bsr_k0r.lmf -O2=bsr.lmf -O3=flash.lmf -O4=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_bsr.map -P1=bsr_k0r.map -P2=bsr.map -P3=flash.map -P4=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=2 -SELFCheck=0 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LCNV78K0R 0] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 1] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 2] -Version=100 -LCNV_GO=0 -O0=inter_asm -E=0 -CommandFile=0 -[Options.LCNV78K0R 3] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 4] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 5] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.78K0R] -BuildMode=2 -BuildMode2=K0R_dbg -BuildMode3=BSR_dbg -BuildMode4=BSR_rel -BuildMode5=BSR_WM0 -DefaultMode2=1 -DefaultMode3=1 -DefaultMode4=1 -DefaultMode5=1 diff --git a/branches/sim/yav_mcu_bsr.prk b/branches/sim/yav_mcu_bsr.prk index 6220a79..6c71169 100644 --- a/branches/sim/yav_mcu_bsr.prk +++ b/branches/sim/yav_mcu_bsr.prk @@ -1,19 +1,14 @@ [ProjectManager] FrameMax=0 -FrameX=1244 -FrameY=196 +FrameX=402 +FrameY=228 FrameCX=1440 FrameCY=895 -OpenFile1=i2c_ctr.c,0,150,150,1469,736,0,40,0,0 -OpenFile2=hal.c,0,200,200,1395,681,14,13,13,0 -OpenFile3=sw.c,0,127,86,1322,567,0,138,0,0 -OpenFile4=task_status.c,0,25,25,1220,506,23,30,23,0 -OpenFile5=pm.c,0,225,225,1420,706,15,471,15,0 -OpenFile6=i2c_twl.c,0,50,50,1245,531,38,129,47,0 -OpenFile7=main.c,0,200,200,1370,701,0,1,0,0 -OpenFile8=ProjectWindow +OpenFile1=ProjectWindow PrjPos=0,0,706,0,291 -OpenFile9=OutputWindow +OpenFile2=task_sys.c,0,225,225,1395,726,0,369,0,0 +OpenFile3=config.h,0,0,0,1170,501,24,24,24,0 +OpenFile4=OutputWindow OutputPos=0,16,707,587,1440 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] diff --git a/branches/sim/繝吶シ繧ケ縺九i縺ョ螟画峩.xls b/branches/sim/繝吶シ繧ケ縺九i縺ョ螟画峩.xls index 40250ee..5212dac 100644 Binary files a/branches/sim/繝吶シ繧ケ縺九i縺ョ螟画峩.xls and b/branches/sim/繝吶シ繧ケ縺九i縺ョ螟画峩.xls differ