diff --git a/trunk/adc.c b/trunk/adc.c index 5444f59..fdb7de0 100644 --- a/trunk/adc.c +++ b/trunk/adc.c @@ -79,27 +79,13 @@ static u8 adc_scaling( u8 ); void tsk_adc( ) { - static u8 task_interval = 0; static u8 old_tune; static u8 sndvol_codec; static u8 bt_temp_old; -#ifdef _DEBUG_CODEC_POLLING_ -// debug - { - static u8 interval; - -// VOL書き頻度 - interval++; - if( interval == 3 ) - { - interval = 0; - renge_task_immed_add( tski_vol_update ); // T = 2ms polling - } - } - -#endif /* + これやると、Volスライダの反応が劇悪になるので注意 + static u8 task_interval = 0; if( task_interval-- != 0 ) { return; @@ -111,7 +97,7 @@ void tsk_adc( ) */ if( adc_updated ) { - adc_updated = 0; + adc_updated = false; if( system_status.pwr_state == ON ) { @@ -127,7 +113,7 @@ void tsk_adc( ) if( vol_old != vol_data_ctr ) { - vol_changed_by_ctr = 1; + vol_changed_by_ctr = true; vol_old = vol_data_ctr; renge_task_immed_add( tski_vol_update ); // 2ms後でいいでしょう... } @@ -170,7 +156,7 @@ task_status_immed tski_vol_update() { static u8 sent_index, sent_index_slider, sent_index_twl; static u8 sent_data; - static bit last_modifyer; // 0 = ctr + static bit last_modifyer_is_twl; // 0 = ctr if( !( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP )){ @@ -187,8 +173,8 @@ task_status_immed tski_vol_update() else if( vol_changed_by_ctr ) { // スライダ - vol_changed_by_ctr = 0; - last_modifyer = 0; + vol_changed_by_ctr = false; + last_modifyer_is_twl = false; if( vreg_ctr[ VREG_C_VOL_OPTION ] & REG_BIT_VOL_FORCE_REG ) { // レジスタから強制セット @@ -203,8 +189,8 @@ task_status_immed tski_vol_update() else if( vol_changed_by_twl ) { // TWLアプリ - vol_changed_by_twl = 0; - last_modifyer = 1; + vol_changed_by_twl = false; + last_modifyer_is_twl = true; if( vreg_twl[ REG_TWL_INT_ADRS_VOL ] == 0 ) { sent_index_twl = 0; @@ -220,7 +206,7 @@ task_status_immed tski_vol_update() { // force_sliderを0にしたとき & 書きまくるとき // スライダかTWLの最後にセットした方をセット - if( last_modifyer == 0 ) + if( !last_modifyer_is_twl ) { sent_index = sent_index_slider; } @@ -372,7 +358,7 @@ case ( ADC_SEL_AMB_BRIT ): // else { ADCEN = 0; // 止めてしまう - adc_updated = 1; + adc_updated = true; index = ( index == 2 ) ? 0 : ( index + 1 ); // ノイズ取りの配列インデックス } ADIF = 0; // ←これをしないと、いっこ前のチャンネルのデータの完了で直後に割り込む可能性がある @@ -573,7 +559,7 @@ case ( ADC_SEL_AMB_BRIT ): // else { ADCEN = 0; // 止めてしまう - adc_updated = 1; + adc_updated = true; index = ( index == 2 ) ? 0 : ( index + 1 ); // ノイズ取りの配列インデックス } } diff --git a/trunk/bsr.hex b/trunk/bsr.hex index b62345d..ec0361d 100644 --- a/trunk/bsr.hex +++ b/trunk/bsr.hex @@ -1,13 +1,13 @@ -:02000000090DE8 +:02000000E10C11 :02000200FFFFFE -:04001000C64AC84ACA -:02001C009D4CF9 -:02002400094D84 -:02002A00764D11 -:08003400934E414E8E4EC24F67 -:02004A00CA4AA0 -:02005A00054B54 -:02006200464F07 +:04001000A44AA64A0E +:02001C007B4C1B +:02002400E74CA7 +:02002A00544D33 +:08003400714E1F4E6C4EA04FEF +:02004A00A84AC2 +:02005A00E34A77 +:02006200244F29 :0400C000FEFBFF85BF :0A00C4001B339499E033F240BFAA09 :0A00CE00FFFFFFFFFFFFFFFFFFFF32 @@ -20,12 +20,12 @@ :100138000021728C03318E04F64F14896142DF036B :10014800F6EF01E6600E029C02615903EFB040F63B :100158004FFF61F86159028C02D1DD06FDBF01FD38 -:100168004307CEABACC736F00071F4C6DE0671307B +:100168001B07CEABACC736F00071F4C6DE067100D3 :1001780020F9EF238EA89C038C035C10D1DD0A7153 -:1001880010D6FB713020F9EF0B8C035C80D161E84D -:10019800713020F9FDBF01FDB902EDDE001004C683 +:1001880010D6FB710020F9EF0B8C035C80D161E87D +:10019800710020F9FDBF01FDB902EDDE001004C6B3 :1001A800D7717BFACEA010CEA180E5F300CEA408CB -:1001B800F5AAFFF5A9FFD78F20F931350ACD00033D +:1001B800F5AAFFF5A9FFD78F20F931050ACD00036D :1001C800CD0307F40EEF07F400CD0306F40ECF11AC :1001D80005FCF51005CF120511CE20FFCE23F0CE79 :1001E8002EFCCD01C0F402CD0408F405F406CD07B9 @@ -41,224 +41,222 @@ :10028800080105F55005F5BCFFF5BDFFD7C7C1C18D :10029800FBF8FFCEABAC8C02D1DD12616902305C99 :1002A80003BBF6614900DDEE618900EFF51004C675 -:1002B800D7FDE833FD323DFD4205717AFAFDAE24E3 -:1002C800F51EF98F20F93135175003C15084FD4BC5 +:1002B800D7FDEE33FD2B3DFD1A05717AFAFDAE240C +:1002C800F51EF98F20F93105175003C15084FD231D :1002D80003C0625C01D161E8CF1EF902CFDFFB6485 -:1002E800FDC834FD0203FDCB48715222712BE7CEC5 -:1002F800ABACFD353D61EDEFF6D731020403F6EF07 -:1003080001E6603420F9718C8971899931120403EE -:10031800F6EF01E6603420F9718C89719999D7D785 -:10032800C7F616FD4205717BFA316220057162201D -:10033800EF0B717AFAA7F647DFECE2EF04717AFA6D -:10034800F2C6D7C7C1C1FBF8FF17A1C1E0C18C0A2B -:1003580070C18C0270FD75031006D2DF05F541FBF4 -:10036800EF04CF41FB028C01721004C6D7C7C1FB52 -:10037800F8FFFD2803D2DD03E2EF618B70FD9504E1 -:10038800D2DD077163205202EF528C0870FDAA0477 -:10039800FDF6048B6C0170FDAA04300400BF240133 -:1003A800301740BF1C01300400BF22018C0A91DFC6 -:1003B80004F6BF2A01710BE2CE44FF3182E202EF5C -:1003C800FAAC0C148E449961790C61690A8C0AD1D3 -:1003D800DFDAFD1F05710BE2716320F2C0C6D7C7D3 -:1003E800C1FBF8FFFD2803D2DD03E2EF25710AE621 -:1003F8008B70FD9504D2DD077163205202EF138CD8 -:100408000870FDAA048C0A70FDAA04FD1F0571631B -:1004180020F2C0C6D7C7C1FBF8FFFD2803D2DD0311 -:10042800E2EF67710AE6710BE28B70FD9504D2DD8D -:10043800077163205202EF52710BE231522039C723 -:10044800343AFBAC0C1652048B99A5A792DFF9C677 -:100458003184BD02EFFA717ABDCEB144CBB43AFB18 -:100468008C0A318EBEB8CEBB48714BE1714BE57139 -:100478000ABD8C089E44EF11710BE68C089E448CD3 -:100488000A9F40FBAC0CBF3EFBF2C0C6D7C716FDA7 -:10049800CE0417FDAA04D2DD06FD1F05E2EF01F226 -:1004A800C6D7C716710AE6710BE2669E443182E22E -:1004B8000300EFF9F6420401DD09AF0401BF0C01A6 -:1004C800E2EF01F2C6D7AF2801085CFB08BF28019C -:1004D800FD2703AF28015CFBBF2801300400BF2AB9 -:1004E80001301780BF1C01300400BF2201D7AF24A0 -:1004F80001086C0408BF2401AF28016C0F086C0BBD -:1005080008BF2801FD2703AF2A01085CFB08BF2AA2 -:1005180001FD2703EDCE04300400BF2401F6BF2AF5 -:1005280001300B0BBF2801FD2703300B0FBF28013B -:10053800FD2703300F0FBF2801D731742001D77171 -:100548006220710BBD0000717BBD713A25713A23A1 -:100558006A0E03713205713B25713203713B2350DA -:100568000AFD95027120F000FD2703F6BF26015011 -:1005780024BF1401CB440014300F0FBF280171535E -:1005880020710BE2710AE6FDCE04CE44FF3182E20F -:1005980002EFFAFD1F05AF0401BF0C017163207162 -:1005A8007220D731642002EFFAFDF604713A257102 -:1005B8003A235A0EFC713305713B25713303713BA5 -:1005C800237128F000717320D7C7880616FD280309 -:1005D800D2DD03E2EF38710AE650A4FD9504D2DDBE -:1005E800077163205202EF2617FDAA046770FDAA5F -:1005F80004FDF60450A4FDAA045020FDAA04D94223 -:10060800FBFDAA04A042FBFD1F05716320F2C6D7BB -:10061800C72006FBF8FFFD41095014C15008FD7FB3 -:1006280008C0CC05048C054C14DE0C8C05318EFDFD -:10063800EB09615905EFEECC05048C054C1461C833 -:10064800EDF206CC04008C044C04DE79C736410573 -:100658007184C6DC703022F9BC02F6BB31B2D10E0F -:10066800C73641057184C6DC05CEABACEFEE713BF5 -:10067800D1AC02148F40059971505005617902611F -:100688007900F0E1614900DD09C73641057184C68A -:10069800DECA5040C18C05318E31AD128C04318ECA -:1006A800318D03BDD831FFBDDADADAADD8FDB70C2C -:1006B800C0D2DD0C5008C15014FD7F08C0FD740B7A -:1006C800615904EF818C05318EFDEF09D2DD0C50A4 -:1006D80008C15014FD7F08C0FD740BC73641057171 -:1006E80084C6DC06615905ED420671605005CC02EE -:1006F80000CC03008C034C09DE248C03318E124994 -:10070800F61F728C03318E04F64F14896142DF03A1 -:10071800F6EF01E6600E029C02615903EFD68C02E7 -:10072800D1DF08FD750BFD870CEF0C5008C1501484 -:10073800FD7F08C0FD740B1006C6D7C72004FBF860 -:10074800FF715B21CC0100F6BC02AC02440900DE5B -:100758003EAC0204F60F144100118972AC020C5130 -:1007680014896142DF03F6EF01E6600E019C01ACDB -:10077800021249005172AC0204F67F14896142DF0B -:1007880003F6EF01E6600E019C01617902EFBB40C0 -:10079800F67FFF61F86159018C01D161F8ED4D08D0 -:1007A800CC0100717AFAFD4205711300711B2071AA -:1007B8000303710205E0C15003C15084FDE7031033 -:1007C800045013FD9502500FC1E0C15084FDE703AA -:1007D8001004CEABAC6159018C0191DD068C014C43 -:1007E80003DF03E6EF01F66061FB7151018C014CF8 -:1007F8000861F8CC010031320705A070FCEF03F561 -:1008080070FC4070FC11DC11F570FCF0C15003C1A4 -:100818005084FDE7031004EF12E6BC02F6614902BA -:10082800DDB000000000617902EFF1CE3708CBE4BB -:10083800FFFFCBE6FFF7CED4FFCF370008F5120550 -:1008480061FDF5ABFFFD4109D25008C15014FD7F91 -:1008580008C0D2FD740B1004C6D73184BD02EFFA6C -:10086800717BBDCBE4FFFFCBE6FFFFCBD4FFFF716D -:100878007ABED7717BBED7C7C1200AFBF8FF8C0AA6 -:10088800318E31ADC1317B9DD4C0BC048DD49C0662 -:100898008C129C098C12318E040C00128C09318E3A -:1008A800BDD813FD460F61C8ED3C09CEABAC8C0931 -:1008B800318EFDE709D2DD098C09318EFDEB09EF98 -:1008C800EDCC08008C084C04DE57CEABACF6BC026D -:1008D8003022F9BBAC04148C069EFD118972AB144E -:1008E8006299AC04A1BC04617900617902F0E1610C -:1008F8004902DFE05040C18C09318E31AD128C08BD -:10090800318E318D03BDD831FFBDDADADAADD8FDCD -:10091800B70CC0D2DD06FD7B08E2EF19615908EF7C -:10092800A38C09318EFDEF09D2DD03E2EF0761598F -:1009380009ED9C08F2100CC6D7C7717B9D717BFA34 -:10094800FD62083022F9FD9A0AFD250AC6D7FD4145 -:1009580009FD740BFD7B08F2D7D7C7D550FDDD051F -:10096800B050FDEF78CF50FD02311407067110E347 -:10097800FBEF047118E3FB8FE3FB7F12FD76D1DDFB -:100988005C8FE3FB9F12FD401EF903DF22665C10BB -:10099800D1DD1C8FE3FB5C10D1DD0B5080C1501101 -:1009A800FDFF38C0EF095040C15011FDFF38C0406D -:1009B8001EF903DD06401EF904DF22665C02D1DD64 -:1009C8001C8FE3FB5C02D1DD0B5040C15010FDFFD2 -:0F09D80038C0EF095020C15010FDFF38C0C6D7FE -:1009E7005208EF065203EF025206FEE600FE1B0016 -:1009F700DC16089F03088F0408089F040862FE247A -:100A070000089F0408EEBF00EEBA00C1C514410EEE -:100A170011D9D0FF118FD1FF312E45C4C0D7F23184 -:100A2700A2C401E2D79DE261DD4C09DF12717BFAB6 -:100A3700C18F06089F61FDC0CF060800EE27003171 -:100A4700F2FA04CF0608004C00DF05D50008DD16D2 -:100A570061DD717BFAD50608DD0ACDE31F61CD6143 -:100A6700CDEE160061CDFED40061FFFE9A00FCF8C2 -:100A7700FF0EFEB20061CDFED5004C09DF0EC18F1F -:100A870006086F61FD9F0608C0EE0400CF06080048 -:100A9700F8E3D75200EF025202FE3700CF60FD00A5 -:100AA700CF060800BF0408C716629F00084100115F -:100AB7008F78239B4100118F79239F0108C651002E -:100AC700FE62FFEF025205CF060800C1510CFE0A75 -:100AD70000C0D7C1511DFE0200C0D761DD717BFA8E -:100AE70070CEC0A59EC47CFF9EC4609EC461CDD756 -:100AF70061DD717BFAC18EC45C1BFED6FFCF060891 -:100B070001FED7FFC061CDD731F2FA1AC1AEE4BFFB -:100B170052FDAEE6BF54FDAED4BF56FD30FFFFBE5B -:100B2700E4BEE6BED4C0D731F2FA11C1AF52FDBE62 -:100B3700E4AF54FDBEE6AF56FDBED4C0D7C1BF5823 -:100B4700FD13BF5AFD15BF5CFD17BF5EFDC0D7AFD4 -:100B570058FDDB5AFDEB5CFDFB5EFDD7534B305276 -:100B67005430324E323030475631323000FFC150A8 -:100B7700FEFEAB0061DD717BFACF060800FE0A00BE -:100B8700FEA4FF61CDF8E3EECF00C7FB0408BF5218 -:100B9700FD8FC0009C05C5C337040600BF54FD3553 -:100BA70036D90B300000522BFE6600C2C4C6308710 -:100BB7000BB800300000B8022004AF54FDB8003075 -:100BC7000F00B802AF52FD61FF520AFE3AFFECF880 -:100BD700FF0E717BFAC1C7FB04088C05C65C80FE5B -:100BE7000200C0D761DD717BFA70CFC0FFA59FC03F -:100BF700007CFF9FC000609FC00061CDD7618BFE66 -:100C0700E2FF717BBE410011FB000017CEFC0061C3 -:100C1700CB089EFDF31161C999A58392DFF7D7FE33 -:100C2700B1FED560FDDF23C1CF0308035109FEF4F0 -:100C3700FDC0D2DF37FE3800A20408CF03080751F2 -:100C470009FEE1FDD2B20408DF22C7FB04083183A5 -:100C570002C6D7C6510AFECCFD624C1FDF06CF6025 -:100C6700FD01EF04CF60FD00C0EE5BFEC0EE55FE58 -:100C7700C7C1FB04088B31196C0161589BC0C6D7EB -:100C8700717BFAFE4DFEAF0408040600C11436EB73 -:100C97000B300000522DF3FE77FF8FC000FE2BFEB6 -:100CA70061CF5C807C8073C0041900CEFC0F61CBE0 -:100CB700C55404EF03C55417FE18FEC7360008BB1A -:100CC700629C0288089C03D1DD334C41DE2F70F112 -:100CD700312DB161090033081C000851FF612A4119 -:100CE7000E118FD0FF613B118FD1FF6138DC0E8B66 -:100CF7005C03DF0964C6C4FE2BFDEECAFDC6C4EE65 -:020D0700C3FD2A -:100D090061CF5100718C7109FECBF800FEFCA9017D -:100D190000F6BF00F953C0F693935820FEDFF9415E -:100D290000361A203414FDEF05118B99A7A5174435 -:100D39005820DFF53602F93014FDEF04CC0000A786 -:100D490047DFF941003658203452FDEF05118B99E0 -:100D5900A7A517445820DFF53652FD3052FDEF04A0 -:100D6900CC0000A747DFF9FCD80000EFFE61DD7178 -:100D79007BFABEF0ADD8BEF200AEF661CDD7C36145 -:100D8900DD717BFABEF0ADD8BEF200DBF6FFADDC5B -:100D9900BEF000AEF6BDD8AEF40312ADDABEF20075 -:100DA900AEF661CD03BDDAC2D7C3F33174D9088376 -:100DB900C1F626D8BDD8C031750683C312F623C241 -:100DC900FDD40D93DF0312F623C2D7440000DD26BC -:100DD90061DD717BFACFE80080BEF6F6BEF4BEF2A3 -:100DE900ADD8BEF0CFE800818FE8003103FAAEF04C -:100DF900F5E80061CDD7B1D7C3F33174D90883C100 -:100E0900F626D8BDD8C0317505C312F623C2FD2216 -:100E19000E93DF0312F623C2D7440000DD2761DDFC -:100E2900717BFACFE80080BEF6F6BEF4BEF2ADD80B -:100E3900BEF0CFE800818FE8003103FAAFE000F59A -:100E4900E80061CDD7ADD8D7C3F33174DB0F83C1C7 -:100E5900F626D8BDD861317026DABDDAC031750DF4 -:100E690083C312F626DCBDDC61317023C2FD8A0E14 -:100E790093DF0CF626D8BDD861317026DABDDAC207 -:100E8900D7C161686BDC6BDDC0DD2F61DD717BFA79 -:100E9900CFE80080BEF4ADDCBEF6ADD8BEF0ADDA69 -:100EA900BEF2CFE800818FE8003103FAAEF0BDD879 -:100EB900AEF2BDDAF5E80061CDD7F6BDD8BDDAD717 -:100EC9008292DD2B61DD717BFACFE80080BEF0F6FE -:100ED900BEF2BEF46208BEF6CFE800818FE80031A9 -:100EE90003FAAFE0006072AEF0F5E80061CDD760BB -:100EF90072F6B1D706DABDDAADDC06D8BDD861D84D -:100F0900A6DAD7D1DD17C1C3DAD89DD8ADDA311C3D -:100F190061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDD0 -:100F29001BC1C3DADA9DDAADD8311E33311E3371F4 -:100F3900F9B4DADFF4BDD813BDDAC2C0D746D8DDBB -:100F49000771FF7177D971C0D746DADF08C1ADDC07 -:100F590046D8C0DD077177DB71FF71C0D75BDB9DB8 -:100F6900DB605BDA9DDAADDC5BD9085BD808BDD8FC -:100F7900D7C3C7F3728EFDC162314C4100360020E0 -:100F89001161A072C09EFD62C6C2D7C3C7F3728E3B -:100F9900FDC1625C0F0C000FFE00314C4100360AA6 -:0F0FA900201161800FFE0073C09EFD63C6C2D78A -:0A0FF60031313A32333A3531000050 +:1002E800FDCE34FDA948715222712BE7CEABACFD8F +:1002F8002E3D61EDEFF6D7D7C7F616FD1A05717BCF +:10030800FA31622005716220EF0B717AFAA7F6477D +:10031800DFECE2EF04717AFAF2C6D7C7C1C1FBF885 +:10032800FF17A1C1E0C18C0A70C18C0270FD4D039A +:100338001006D2DF05F541FBEF04CF41FB028C012B +:10034800721004C6D7C7C1FBF8FFFD0003D2DD0356 +:10035800E2EF618B70FD6D04D2DD077163205202FC +:10036800EF528C0870FD8204FDCE048B6C0170FD89 +:100378008204300400BF2401301740BF1C01300440 +:1003880000BF22018C0A91DF04F6BF2A01710BE23B +:10039800CE44FF3182E202EFFAAC0C148E4499612C +:1003A800790C61690A8C0AD1DFDAFDF704710BE276 +:1003B800716320F2C0C6D7C7C1FBF8FFFD0003D2A6 +:1003C800DD03E2EF25710AE68B70FD6D04D2DD07CF +:1003D8007163205202EF138C0870FD82048C0A703E +:1003E800FD8204FDF704716320F2C0C6D7C7C1FBC4 +:1003F800F8FFFD0003D2DD03E2EF67710AE6710B37 +:10040800E28B70FD6D04D2DD077163205202EF525A +:10041800710BE231522039C7343AFBAC0C16520446 +:100428008B99A5A792DFF9C63184BD02EFFA717ADC +:10043800BDCEB144CBB43AFB8C0A318EBEB8CEBB2C +:1004480048714BE1714BE5710ABD8C089E44EF1170 +:10045800710BE68C089E448C0A9F40FBAC0CBF3E97 +:10046800FBF2C0C6D7C716FDA60417FD8204D2DD6D +:1004780006FDF704E2EF01F2C6D7C716710AE67166 +:100488000BE2669E443182E20300EFF9F642040172 +:10049800DD09AF0401BF0C01E2EF01F2C6D7AF28B6 +:1004A80001085CFB08BF2801FDFF02AF28015CFBC7 +:1004B800BF2801300400BF2A01301780BF1C01305B +:1004C8000400BF2201D7AF2401086C0408BF24012F +:1004D800AF28016C0F086C0B08BF2801FDFF02AFA5 +:1004E8002A01085CFB08BF2A01FDFF02EDA60430C3 +:1004F8000400BF2401F6BF2A01300B0BBF2801FD01 +:10050800FF02300B0FBF2801FDFF02300F0FBF287D +:1005180001D731742001D7716220710BBD000071C1 +:100528007BBD713A25713A236A0E03713205713B1E +:1005380025713203713B23500AFD95027120F000AA +:10054800FDFF02F6BF26015024BF1401CB4400145E +:10055800300F0FBF2801715320710BE2710AE6FDBD +:10056800A604CE44FF3182E202EFFAFDF704AF049D +:1005780001BF0C01716320717220D731642002EF32 +:10058800FAFDCE04713A25713A235A0EFC713305EF +:10059800713B25713303713B237128F0007173207F +:1005A800D7C7880616FD0003D2DD03E2EF38710ACB +:1005B800E650A4FD6D04D2DD077163205202EF26D8 +:1005C80017FD82046770FD8204FDCE0450A4FD82ED +:1005D800045020FD8204D942FBFD8204A042FBFDA9 +:1005E800F704716320F2C6D7C72006FBF8FFFD1990 +:1005F800095014C15008FD5708C0CC05048C054C9F +:1006080014DE0C8C05318EFDC309615905EFEECC63 +:1006180005048C054C1461C8EDCA06CC04008C0492 +:100628004C04DE79C73641057184C6DC703022F986 +:10063800BC02F6BB31B2D10EC73641057184C6DCA7 +:1006480005CEABACEFEE713BD1AC02148F400599EF +:1006580071505005617902617900F0E1614900DD6E +:1006680009C73641057184C6DECA5040C18C0531C0 +:100678008E31AD128C04318E318D03BDD831FFBD62 +:10068800DADADAADD8FD8F0CC0D2DD0C5008C150D3 +:1006980014FD5708C0FD4C0B615904EF818C0531DE +:1006A8008EFDC709D2DD0C5008C15014FD5708C093 +:1006B800FD4C0BC73641057184C6DC06615905ED52 +:1006C8001A0671605005CC0200CC03008C034C095B +:1006D800DE248C03318E1249F61F728C03318E048E +:1006E800F64F14896142DF03F6EF01E6600E029CC3 +:1006F80002615903EFD68C02D1DF08FD4D0BFD5F77 +:100708000CEF0C5008C15014FD5708C0FD4C0B10DD +:1007180006C6D7C72004FBF8FF715B21CC0100F6A1 +:10072800BC02AC02440900DE3EAC0204F60F1441E0 +:1007380000118972AC020C5114896142DF03F6EF93 +:1007480001E6600E019C01AC021249005172AC0234 +:1007580004F67F14896142DF03F6EF01E6600E01BB +:100768009C01617902EFBB40F67FFF61F861590196 +:100778008C01D161F8ED2508CC0100717AFAFD1AD7 +:1007880005711300711B20710303710205E0C1504C +:1007980003C15084FDBF0310045013FD9502500F90 +:1007A800C1E0C15084FDBF031004CEABAC61590158 +:1007B8008C0191DD068C014C03DF03E6EF01F66046 +:1007C80061FB7151018C014C0861F8CC0100313298 +:1007D8000705A070FCEF03F570FC4070FC11DC11FC +:1007E800F570FCF0C15003C15084FDBF031004EF45 +:1007F80012E6BC02F6614902DDB000000000617932 +:1008080002EFF1CE3708CBE4FFFFCBE6FFF7CED4FB +:10081800FFCF370008F5120561FDF5ABFFFD19099B +:10082800D25008C15014FD5708C0D2FD4C0B10041B +:10083800C6D73184BD02EFFA717BBDCBE4FFFFCB95 +:10084800E6FFFFCBD4FFFF717ABED7717BBED7C757 +:10085800C1200AFBF8FF8C0A318E31ADC1317B9D76 +:10086800D4C0BC048DD49C068C129C098C12318E89 +:10087800040C00128C09318EBDD813FD1E0F61C8FF +:10088800ED1409CEABAC8C09318EFDBF09D2DD0960 +:100898008C09318EFDC309EFEDCC08008C084C049F +:1008A800DE57CEABACF6BC023022F9BBAC04148CDC +:1008B800069EFD118972AB146299AC04A1BC046157 +:1008C8007900617902F0E1614902DFE05040C18CB2 +:1008D80009318E31AD128C08318E318D03BDD8317E +:1008E800FFBDDADADAADD8FD8F0CC0D2DD06FD53D4 +:1008F80008E2EF19615908EFA38C09318EFDC70989 +:10090800D2DD03E2EF07615909ED7408F2100CC655 +:10091800D7C7717B9D717BFAFD3A083022F9FD72C9 +:100928000AFDFD09C6D7FD1909FD4C0BFD5308F258 +:10093800D7D7C7D558FDDD05B058FDEF78CF58FD9E +:1009480002311407067110E3FBEF047118E3FB8F03 +:10095800E3FB7F1CFD76D1DD5C8FE3FB9F1CFD4034 +:100968001EF903DF22665C10D1DD1C8FE3FB5C10EF +:10097800D1DD0B5080C15011FD0539C0EF09504041 +:10098800C15011FD0539C0401EF903DD06401EF9AE +:1009980004DF22665C02D1DD1C8FE3FB5C02D1DD43 +:1009A8000B5040C15010FD0539C0EF095020C1500F +:0709B80010FD0539C0C6D790 +:1009BF005208EF065203EF025206FEE600FE1B003E +:1009CF00DC16089F03088F0408089F040862FE24A2 +:1009DF0000089F0408EEBF00EEBA00C1C514410E17 +:1009EF0011D9D0FF118FD1FF312E45C4C0D7F231AD +:1009FF00A2C401E2D79DE261DD4C09DF12717BFADF +:100A0F00C18F06089F69FDC0CF060800EE27003191 +:100A1F00F2FA04CF0608004C00DF05D50008DD16FA +:100A2F0061DD717BFAD50608DD0ACDE31F61CD616B +:100A3F00CDEE160061CDFED40061FFFE9A00FCF8EA +:100A4F00FF0EFEB20061CDFED5004C09DF0EC18F47 +:100A5F0006086F69FD9F0608C0EE0400CF06080068 +:100A6F00F8E3D75200EF025202FE3700CF68FD00C5 +:100A7F00CF060800BF0408C716629F000841001187 +:100A8F008F78239B4100118F79239F0108C6510056 +:100A9F00FE62FFEF025205CF060800C1510CFE0A9D +:100AAF0000C0D7C1511DFE0200C0D761DD717BFAB6 +:100ABF0070CEC0A59EC47CFF9EC4609EC461CDD77E +:100ACF0061DD717BFAC18EC45C1BFED6FFCF0608B9 +:100ADF0001FED7FFC061CDD731F2FA1AC1AEE4BF24 +:100AEF005AFDAEE6BF5CFDAED4BF5EFD30FFFFBE6C +:100AFF00E4BEE6BED4C0D731F2FA11C1AF5AFDBE83 +:100B0F00E4AF5CFDBEE6AF5EFDBED4C0D7C1BF6033 +:100B1F00FD13BF62FD15BF64FD17BF66FDC0D7AFE4 +:100B2F0060FDDB62FDEB64FDFB66FDD7534B30527E +:100B3F005430324E323030475631323000FFC150D0 +:100B4F00FEFEAB0061DD717BFACF060800FE0A00E6 +:100B5F00FEA4FF61CDF8E3EECF00C7FB0408BF5A38 +:100B6F00FD8FC0009C05C5C337040600BF5CFD3573 +:100B7F0036B10B300000522BFE6600C2C4C6305F88 +:100B8F000BB800300000B8022004AF5CFDB8003095 +:100B9F000F00B802AF5AFD61FF520AFE3AFFECF8A0 +:100BAF00FF0E717BFAC1C7FB04088C05C65C80FE83 +:100BBF000200C0D761DD717BFA70CFC0FFA59FC067 +:100BCF00007CFF9FC000609FC00061CDD7618BFE8E +:100BDF00E2FF717BBE410011FB000017CEFC0061EC +:100BEF00CB089EFDF31161C999A58392DFF7D7FE5C +:100BFF00B1FED568FDDF23C1CF0308035109FEF411 +:100C0F00FDC0D2DF37FE3800A20408CF030807511A +:100C1F0009FEE1FDD2B20408DF22C7FB04083183CD +:100C2F0002C6D7C6510AFECCFD624C1FDF06CF6845 +:100C3F00FD01EF04CF68FD00C0EE5BFEC0EE55FE78 +:100C4F00C7C1FB04088B31196C0161589BC0C6D713 +:100C5F00717BFAFE4DFEAF0408040600C11436C3C3 +:100C6F000B300000522DF3FE77FF8FC000FE2BFEDE +:100C7F0061CF5C807C8073C0041900CEFC0F61CB08 +:100C8F00C55404EF03C55417FE18FEC7360008BB42 +:100C9F00629C0288089C03D1DD334C41DE2F70F13A +:100CAF00312DB161090033081C000851FF612A4141 +:100CBF000E118FD0FF613B118FD1FF6138DC0E8B8E +:100CCF005C03DF0964C6C4FE2BFDEECAFDC6C4EE8D +:020CDF00C3FD53 +:100CE10061CF5100718C7109FECBF800FEFCA901A6 +:100CF10000F6BF00F953C0F693935820FEDFF94187 +:100D010000361A20341EFDEF05118B99A7A5174453 +:100D11005620DFF53602F9301EFDEF04CC0000A7A6 +:100D210047DFF94100365620345AFDEF05118B9902 +:100D3100A7A517445620DFF5365AFD305AFDEF04BA +:100D4100CC0000A747DFF9FCD80000EFFE61DD71A0 +:100D51007BFABEF0ADD8BEF200AEF661CDD7C3616D +:100D6100DD717BFABEF0ADD8BEF200DBF6FFADDC83 +:100D7100BEF000AEF6BDD8AEF40312ADDABEF2009D +:100D8100AEF661CD03BDDAC2D7C3F33174D908839E +:100D9100C1F626D8BDD8C031750683C312F623C269 +:100DA100FDAC0D93DF0312F623C2D7440000DD260C +:100DB10061DD717BFACFE80080BEF6F6BEF4BEF2CB +:100DC100ADD8BEF0CFE800818FE8003103FAAEF074 +:100DD100F5E80061CDD7B1D7C3F33174D90883C128 +:100DE100F626D8BDD8C0317505C312F623C2FDFA67 +:100DF1000D93DF0312F623C2D7440000DD2761DD26 +:100E0100717BFACFE80080BEF6F6BEF4BEF2ADD833 +:100E1100BEF0CFE800818FE8003103FAAFE000F5C2 +:100E2100E80061CDD7ADD8D7C3F33174DB0F83C1EF +:100E3100F626D8BDD861317026DABDDAC031750D1C +:100E410083C312F626DCBDDC61317023C2FD620E64 +:100E510093DF0CF626D8BDD861317026DABDDAC22F +:100E6100D7C161686BDC6BDDC0DD2F61DD717BFAA1 +:100E7100CFE80080BEF4ADDCBEF6ADD8BEF0ADDA91 +:100E8100BEF2CFE800818FE8003103FAAEF0BDD8A1 +:100E9100AEF2BDDAF5E80061CDD7F6BDD8BDDAD73F +:100EA1008292DD2B61DD717BFACFE80080BEF0F626 +:100EB100BEF2BEF46208BEF6CFE800818FE80031D1 +:100EC10003FAAFE0006072AEF0F5E80061CDD760E3 +:100ED10072F6B1D706DABDDAADDC06D8BDD861D875 +:100EE100A6DAD7D1DD17C1C3DAD89DD8ADDA311C66 +:100EF10061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDF9 +:100F01001BC1C3DADA9DDAADD8311E33311E33711C +:100F1100F9B4DADFF4BDD813BDDAC2C0D746D8DDE3 +:100F21000771FF7177D971C0D746DADF08C1ADDC2F +:100F310046D8C0DD077177DB71FF71C0D75BDB9DE0 +:100F4100DB605BDA9DDAADDC5BD9085BD808BDD824 +:100F5100D7C3C7F3728EFDC162314C410036002008 +:100F61001161A072C09EFD62C6C2D7C3C7F3728E63 +:100F7100FDC1625C0F0C000FFE00314C4100360ACE +:0F0F8100201161800FFE0073C09EFD63C6C2D7B2 +:0A0FF60031313A33383A333300004A :0A20000000060C12181E242A3036C8 :10200A00001632486480961228446076920824406A :10201A00FF000000555555554700DCFB0000000045 -:10202A0046FC000000000000F63F663AC423CF2FAA -:10203A006031DD311F33094162096109BA4200008A -:0E204A000000983AF82AFF2330129900000097 -:08205800317503F7332312D7A1 -:0A21000031313A32333A3531000034 +:10202A0046FC00000000EF3F6C3AC423D52F66310E +:10203A00E331253302413A09390998420000000088 +:0C204A00983AF82AFF2330129900000099 +:08205600317503F7332312D7A3 +:0A21000031313A33383A333300002E :10210A00AEF0B430B740BA30BB50BBB0BC50BD1013 :10211A00BD60BDB0BFE0C2B0C420C7B0CAE0CE1037 :10212A0001F0141014200630639049006E00777095 @@ -303,8 +301,8 @@ :10239A00FAF3F0F0F3F7FBFE000203030202010076 :1023AA00000000001F003B005A0078009700B500AB :0A23BA00D400F300110130014E01C0 -:1023C400C7D51EF9DD108F15FDB015FDD161E8EDFF -:1023D4007124CF15FD33FD73244002F94BDC164004 +:1023C400C7D51EF9DD108F1FFDB01FFDD161E8EDEB +:1023D4007124CF1FFD33FD73244002F94BDC1640FA :1023E40002F9B9DE10400DF928DE05A00DF9EF273A :1023F400711320EF224002F93EDC064002F9BDDCF5 :1024040010400EF928DE05A00EF9EF0B711220EF33 @@ -316,82 +314,82 @@ :10246400F901DD09401EF90561E8FD0828C6D7C752 :10247400710407E6613060768F10F9614EDD2966DC :102484009F10F9D1DD137130E3FB5002C15011FDEF -:10249400FF38C0CF0BF905EF0F7138E3FBE0C150F3 -:1024A40011FDFF38C0F50BF9C6D7C78F14FD76FDB3 -:1024B400EF24D521F9DD05710320EF2D664F14FDBE -:1024C40061F83124201A712320FD4205664C07DD92 -:1024D4000381DF098F20F9313303FDA025FDC525D4 -:1024E400710220304A27FD843DC6D7C7716201714D -:1024F4007201E0FD95025008FD013C629F02F95013 -:1025040009FD013C6276716301716820F94002F9AA +:102494000539C0CF0BF905EF0F7138E3FBE0C150EC +:1024A40011FD0539C0F50BF9C6D7C78F1EFD76FDA2 +:1024B400EF24D521F9DD05710320EF2D664F1EFDB4 +:1024C40061F83124201A712320FD1A05664C07DDBA +:1024D4000381DF098F20F9310303FDA025FDC52504 +:1024E400710220304A27FD7D3DC6D7C77162017154 +:1024F4007201E0FD95025008FDFA3B629F02F9501B +:1025040009FDFA3B6276716301713820F94002F9E2 :10251400F1DC05E521F9EF244002F904DE1BCF21AB -:10252400F9025008C1506CFD4B03C092DF0ED54137 -:10253400FBDF09716020F9EF03F521F9664CEADC51 -:1025440006CF14FD07EF44664CC6DC06CF14FD0627 -:10255400EF39664C9FDC06CF14FD05EF2E664C7CEC -:10256400DC06CF14FD04EF23664C50DC06CF14FDCB -:1025740003EF18664C22DC06CF14FD02EF0D664C07 -:1025840006DC05E514FDEF03F514FD4014FD07DF3B +:10252400F9025008C1506CFD2303C092DF0ED5415F +:10253400FBDF09713020F9EF03F521F9664CEADC81 +:1025440006CF1EFD07EF44664CC6DC06CF1EFD0613 +:10255400EF39664C9FDC06CF1EFD05EF2E664C7CE2 +:10256400DC06CF1EFD04EF23664C50DC06CF1EFDB7 +:1025740003EF18664C22DC06CF1EFD02EF0D664CFD +:1025840006DC05E51EFDEF03F51EFD401EFD07DF1D :1025940009D521F961F8CF21F903C6D7C7C1FBF8E2 :1025A400FF500AFD9502304000BB17C15002C150D4 -:1025B40006C1506CFD1D0410065096FD9502C0C660 -:1025C400D7C72008FBF8FF8F14FD5006D604CA2293 +:1025B40006C1506CFDF50310065096FD9502C0C689 +:1025C400D7C72008FBF8FF8F1EFD5006D604CA2289 :1025D40014F7500689A54804F9A390DFF7D521F92B :1025E40061E8ED4627304A57BB17C15002C1503E3F -:1025F400C1506CFD1D041006D2DD077100E2FBED35 +:1025F400C1506CFDF5031006D2DD077100E2FBED5E :1026040046277108E2FB17040300C15004C1500CB3 -:10261400C1506CFD75031006D914FDF10104F422B8 +:10261400C1506CFD4D031006D91EFDF10104F422D6 :1026240014A9318D12A9318E616B08616A08BB1738 -:10263400C15002C1500EC1506CFD1D041006F6902D -:10264400BB17C15002C1500CC1506CFD1D041006D3 -:1026540031642002EFFA7152208F14FDF0312E0400 -:102664000A21C15010C15040C1506CFD1D04100618 -:1026740031642002EFFA7152208F14FDF0312E04E0 -:102684001A21C15010C15050C1506CFD1D041006D8 -:1026940031642002EFFA7152208F14FDF0312E04C0 -:1026A4002A21C15010C15060C1506CFD1D04100698 -:1026B40031642002EFFA7152208F14FDF0312E04A0 -:1026C4003A21C15010C15070C1506CFD1D04100658 -:1026D40050A5FD9502D914FDF10104F42214A93189 +:10263400C15002C1500EC1506CFDF5031006F69056 +:10264400BB17C15002C1500CC1506CFDF5031006FC +:1026540031642002EFFA7152208F1EFDF0312E04F6 +:102664000A21C15010C15040C1506CFDF503100641 +:1026740031642002EFFA7152208F1EFDF0312E04D6 +:102684001A21C15010C15050C1506CFDF503100601 +:1026940031642002EFFA7152208F1EFDF0312E04B6 +:1026A4002A21C15010C15060C1506CFDF5031006C1 +:1026B40031642002EFFA7152208F1EFDF0312E0496 +:1026C4003A21C15010C15070C1506CFDF503100681 +:1026D40050A5FD9502D91EFDF10104F42214A9317F :1026E4008D12A9318E616B08616A08BB17C1500253 -:1026F400C1500EC1506CFD1D04100650A5FD95027D -:102704005004C1506CFD4B03C0629C07E914FD09E1 -:1027140009234E0761C308E914FD0902234E071774 -:10272400040300C15004C1500CC1506CFD1D0410C1 -:1027340006F6BB17C15002C1503EC1506CFD1D04CA +:1026F400C1500EC1506CFDF503100650A5FD9502A6 +:102704005004C1506CFD2303C0629C07E91EFD09FF +:1027140009234E0761C308E91EFD0902234E07176A +:10272400040300C15004C1500CC1506CFDF50310EA +:1027340006F6BB17C15002C1503EC1506CFDF503F3 :1027440010061008C6D7C7C1FBF8FF8F11F94F0256 :10275400F961F8ED04284013F928DE06A013F9ED19 :102764000428F513F98F02F99F11F98F02F95070BB :10277400D612307351230480001231FF318E039F2F :1027840012F99FDEFBF6BB8F12F97C804C95DC1BA3 -:102794008F12F9318F241400BDD8AF06F9FD760DE0 +:102794008F12F9318F241400BDD8AF06F9FD4E0D08 :1027A4001231FF318E03318FBBEF198F12F9318F44 -:1027B400241400BDD8AF08F9FD760D1231FF318E17 +:1027B400241400BDD8AF08F9FD4E0D1231FF318E3F :1027C40003318FBBD904F9F1610900BB44000171E5 :1027D400FEDC03F690BB8C0101DE02F6BBABABBFA3 -:1027E40078FC17C15002C1500CC1506CFD1D04107F +:1027E40078FC17C15002C1500CC1506CFDF50310A8 :1027F40006D2DF088F02F99F11F9EF047100E2FBA2 :10280400F2C0C6D7C72008FBF8FF4021F901DF0B4F :10281400CFDFFB63CFE1FBC8ED7B294021F902DF69 -:102824002C17040600C15002C15004C1506CFD7540 +:102824002C17040600C15002C15004C1506CFD4D68 :10283400031006D2DD06CFDFFB63EF0A8C069FDFB1 :10284400FB8C079FE0FBCFE1FBC8ED7B2917040657 -:1028540000C15002C15004C1506CFD75031006D272 -:10286400DD117100E2FB710320F5DFFB715020F9EB +:1028540000C15002C15004C1506CFD4D031006D29A +:10286400DD117100E2FB710320F5DFFB712020F91B :10287400ED50298C06318E318D080E07081C00BBE3 -:10288400D914FDF1041023148972ABFDC90EBB8C5D +:10288400D91EFDF1041023148972ABFDA10EBB8C7B :10289400019C068B9C0717040400C15002C1C1505F -:1028A4006CFD75031006D261E8ED50298C049FE19C +:1028A4006CFD4D031006D261E8ED50298C049FE1C4 :1028B400FB8C04318E318D080E05081C00BBBDD87D -:1028C400F6BDDAC9DC01A5FD520FDC09CC0364F6C0 +:1028C400F6BDDAC9DC01A5FD2A0FDC09CC0364F6E8 :1028D400BF14F9EF77ABBDD8F6BDDAAF14F9BDDCA0 :1028E400F6BDDEADD8C1ADDAC1C9D800A0F6BDDAF7 -:1028F400ADDEFDFD0EADD8BDDCADDABDDEC0BDDAAA -:10290400C0BDD8ADDEFD520F61D309CC031EF6BFA6 -:1029140014F9EF38ABBDD8F6BDDAC9DC819DFD52A0 +:1028F400ADDEFDD50EADD8BDDCADDABDDEC0BDDAD2 +:10290400C0BDD8ADDEFD2A0F61D309CC031EF6BFCE +:1029140014F9EF38ABBDD8F6BDDAC9DC819DFD2AC8 :102924000FDC0BCC030A30F401BF14F9EF1EABBD6E -:10293400D8F6BDDAC9DC019BFD520FDC0BCC0305D4 -:1029440030F401BF14F9EF04715020F93134040D4F +:10293400D8F6BDDAC9DC019BFD2A0FDC0BCC0305FC +:1029440030F401BF14F9EF04712020F93134040D7F :1029540031120509CFDFFB64F5E0FBEF1A8C064E5C :1029640003DE0C8C069FDFFB8C079FE0FBEF088CDB :10297400039FDFFBF5E0FBD51EF961F8CF16F96480 @@ -401,57 +399,57 @@ :1029B400DC06CF36FC03EF0DD5DFFBDD05E536FC89 :1029C400EF03F536FC40DFFB0BDE064016F90BDEA9 :1029D4001640DFFB06DE064016F906DE0AD5DFFBED -:1029E400DF0ED516F9DD095020C15011FDFF38C0A6 +:1029E400DF0ED516F9DD095020C15011FD0539C09F :1029F4008FDFFB9F16F9D51EF9DF05713320EF3900 :102A040040DFFB0BDE03E6EF01F66061FB71412062 :102A1400F171442061DC4F0CF961F83132201A71F4 :102A24003220F171442061DC9F0CF9F17144206182 -:102A3400DC70C15012FDD105C01008C6D7C75007BD -:102A4400C15002C15084FDE70310045012FD9502E9 -:102A5400500FC15002C15084FDE70310045003FD20 -:102A64009502501FC15002C15084FDE70310045069 -:102A740016FD95025003C15084FD4B03C0625C01F6 -:102A8400D1DD107170E3FB5002C15013FDFF38C05B -:102A9400E2EF01F2C6D7C75004C15084FD4B03C016 +:102A3400DC70C15012FDA905C01008C6D7C75007E5 +:102A4400C15002C15084FDBF0310045012FD950211 +:102A5400500FC15002C15084FDBF0310045003FD48 +:102A64009502501FC15002C15084FDBF0310045091 +:102A740016FD95025003C15084FD2303C0625C011E +:102A8400D1DD107170E3FB5002C15013FD0539C054 +:102A9400E2EF01F2C6D7C75004C15084FD2303C03E :102AA400625C03D1DD405014FD332B34E3FB895CBD :102AB4009F998A0C7CFF50FF5C14D1DD228A0C7C28 :102AC400FF5C147234E7FB89616A997162075600EE :102AD400316207058666D1DFF7716307716B2734AE -:102AE400F6FB895CEB995002C15084FD4B03C0D2C4 -:102AF400DD335017C15002C15084FDE7031004E0D8 -:102B0400FD95025007C15002C15084FDE703100433 -:102B14005033FD9502F0C15002C15084FDE703100B -:102B2400047178E3FBE0C15013FDFF38C0C6D7C77A -:102B3400C12004FBF8FFCC02005004C15084FD4BBB +:102AE400F6FB895CEB995002C15084FD2303C0D2EC +:102AF400DD335017C15002C15084FDBF031004E000 +:102B0400FD95025007C15002C15084FDBF0310045B +:102B14005033FD9502F0C15002C15084FDBF031033 +:102B2400047178E3FBE0C15013FD0539C0C6D7C773 +:102B3400C12004FBF8FFCC02005004C15084FD23E3 :102B440003C0629C038C045C20D1DD0E8C036C01F9 :102B54009C038C026C209C02EF138C045C10D1DD6E :102B64000C8C035CFE9C038C026C109C028C045C39 :102B740008D1DD0E8C036C029C038C026C089C0251 :102B8400EF138C045C04D1DD0C8C035CFD9C038C82 :102B9400026C049C028C03D1DD05501AFD95028C55 -:102BA4000370C15004C15084FDE70310048FE3FB9C +:102BA4000370C15004C15084FDBF0310048FE3FBC4 :102BB4005C9F728C03318E316D148C03318E314DD8 :102BC400616D08616C5C606162629FE3FB8FEFFB87 :102BD4007CFF50FF5E02D1DD278FEFFB7CFF5E029E :102BE4007234E7FB89616A99716207CC0100316232 :102BF40007086159018C01D1DFF4716307716B27F8 :102C0400F21006C6D7C7D9D7FBC15006C15084FD00 -:102C1400E70310046276D9D8FBC15007C15084FD84 -:102C2400E70310046261666672C6D7FD092CF2D709 +:102C1400BF0310046276D9D8FBC15007C15084FDAC +:102C2400BF0310046261666672C6D7FD092CF2D731 :102C3400711300711B20710303710205E0C150037D -:102C4400C15084FDE70310045013FD9502F0C150F8 -:102C540005C15084FDE7031004500FC1E0C1508446 -:102C6400FDE7031004500AFD95027103055008FDA9 -:102C74009502501FC1E0C15084FDE70310045012B7 -:102C8400FD95025003C15084FD4B03C0625C01D129 -:102C9400DF02E2D75003C1C15084FDE70310047181 +:102C4400C15084FDBF0310045013FD9502F0C15020 +:102C540005C15084FDBF031004500FC1E0C150846E +:102C6400FDBF031004500AFD95027103055008FDD1 +:102C74009502501FC1E0C15084FDBF0310045012DF +:102C8400FD95025003C15084FD2303C0625C01D151 +:102C9400DF02E2D75003C1C15084FDBF03100471A9 :102CA4000203711A20FDF82DF50AF9F2D75003C179 -:102CB4005084FD4B03C0625C01D1DD195014FD3317 +:102CB4005084FD2303C0625C01D1DD195014FD333F :102CC4002BFD9A2A5014FD9502E0C15003C1508493 -:102CD400FDE7031004711300711B20710303F0C19D -:102CE400E0C15084FDE7031004F0C15003C15084D7 -:102CF400FDE7031004F2D7C72004FBF8FFCC020061 -:102D04008F0AF99C035010C150A4FD4B03C0629F6D +:102CD400FDBF031004711300711B20710303F0C1C5 +:102CE400E0C15084FDBF031004F0C15003C15084FF +:102CF400FDBF031004F2D7C72004FBF8FFCC020089 +:102D04008F0AF99C035010C150A4FD2303C0629F95 :102D14000AF9D541FBDD04F2EDD52D8C037F0AF9C8 :102D24005C08D1DD108F0AF95C08D1DF05CC0210F4 :102D3400EF03CC02208C037F0AF95C04D1DD168FEB @@ -461,14 +459,14 @@ :102D740002D1DD1F34E6FB896E0299716207CC0132 :102D840000316207086159018C01D1DFF4716307D6 :102D9400716B278F0AF95C40D1DD095002C15012D2 -:102DA400FDFF38C08F0AF95C01D1DD08E0C1501283 -:102DB400FDFF38C0717AFA8F0AF95C41D1DD113414 -:102DC4000AF9895CBE99D90AF9C15010FDD105C030 +:102DA400FD0539C08F0AF95C01D1DD08E0C150127C +:102DB400FD0539C0717AFA8F0AF95C41D1DD11340D +:102DC4000AF9895CBE99D90AF9C15010FDA905C058 :102DD400F21004C6D7FD412AF2D7FD9A2AF2D7C7CA :102DE4008FF6FB7617FD332B664FF6FBDFF2F5F615 :102DF400FBF2C6D75064FD950240DFFB0BDE03E611 -:102E0400EF01F6609F0CF9D90CF9C15012FDD10500 -:102E1400C0FDDD3A30EA3AED843D71000105717878 +:102E0400EF01F6609F0CF9D90CF9C15012FDA90528 +:102E1400C0FDD63A30E33AED7D3D7100010571788D :102E24005005713AD5713BD1713ADD713BD98F10A0 :102E3400055CFC9F1005CF54054AE542057110421C :102E440005710042057148500571305005712050DC @@ -482,533 +480,530 @@ :102EC40030028F11055CFC9F110571603002D771CF :102ED4007830027148F000D7C788061666614FDD66 :102EE4000967614EDE0396EF01866672C6D7C71680 -:102EF4001714AA0412A943DD29AA0412A923FD5810 -:102F040020C3AC02FD582013C2BDD813FD460FDE0A +:102EF4001714AA0412A943DD29AA0412A923FD5612 +:102F040020C3AC02FD562013C2BDD813FD1E0FDE34 :102F14000C1714AA0212AA0403BA04EF051714A981 :102F2400BA04AC041231FF319E03317F087208C623 -:102F3400D7C77100F200304400BFB601300188BF2A -:102F44009001300984BF9E01BF9C01BF9A01BF98C4 -:102F540001BF9601BF9401BF9201F53CFF30FE0012 -:102F6400BFBE01F6BFBC01BFB80150EEBFBA01A19C -:102F7400BFB201C918FE0071201205714820F94042 -:102F840021F901DD0B36100571A461C8714020F9E7 -:102F940071281205F6BE6EBE64BE6A7123047153B5 -:102FA400078F20F9313507F5FDFBCB6CFF0071135A -:102FB40021C6D730EF00BFB401F6BFBA017108F2E1 -:102FC40000712304715307715301D7712321D9FD73 -:102FD400FBF1E7240000DD1223DD1923DD1123DDDD -:102FE4002623DD3423DD3923DD3FFD6A30EF3DFD4B -:102FF4008D30EF38D9FCFBC1AE6CFDDC2EC0F31371 -:10300400BE6C710321EF25F0C1AE6CFDDC2EC0F364 -:1030140013BE6C710321EF14F6BE6C710221EF0C28 -:10302400CB6CFF00710321EF03FD0A318F20F931CE -:103034004508710421712104EF06710421715101C5 -:10304400312421218F20F9314510F6BE64BE6A3146 -:1030540004210390EF01F6BE6ED731042104F690EB -:10306400EF01F6BE6AD7CF1CFD47F5A8FBAE6C3165 -:103074007DBFAEFBFDDF30D2DF0ED9FCFBC1AE6CF1 -:10308400FDDC2EC0F313BE6CD7FDDF30D2DD0FCFD5 -:103094001CFD47F5A8FBAE6C317DBFAEFBD7E9A89C -:1030A400FB0918235080D6BFAAFB22AEFBBDD83043 -:1030B4004700FDB20DBFACFB30AAFBFDF22EF313AB -:1030C400BE6CB01CFDD51CFDDF10CF1CFD47A0A8B5 -:1030D400FB40A8FB1F61C8F5A8FBD740DFFB0BDC56 -:1030E40005710321F2D740DFFB0661D831120511C7 -:1030F400F0C1AE6CFDDC2EC0F313BE6C710221EF87 -:1031040003FD0A31E2D7712221F0C1AE6CFDDC2E41 -:10311400C0F313BE6CA0B0FB40B0FB40DC3DF5B087 -:10312400FBD9B1FBF1313F0418FD14D9B1FBF1BD5A -:10313400D85008FD010E087208E6D2DD040192DFC2 -:10314400FC896158D1DD05710221EF03710321A0CF -:10315400B1FB40B1FB2061C8F5B1FBD78FB2FBB026 -:10316400B2FBD1DF7331D4D106715BD1E5B4FBD5A9 -:10317400B4FBDD347140E2FBD9B3FBF1E734020068 -:1031840023DD0625DD0325DF05F6BE66EF06D9FC43 -:10319400FBF1BE66A0B3FB40B3FB20DF06F5B3FB37 -:1031A400B0B4FBCFB2FB19D7CFB2FB1E7148E2FB20 -:1031B400D5FEFBDF04F6BE66D7D9FCFBF14266FF01 -:1031C400DD16D9FCFBF112AE6643DE05A266FFEF05 -:1031D40003B266FFCFB2FB03D731242101D7401ECF -:1031E400F902DF10F6BE64BE6EBE6ABFBCFBBFC28E -:1031F400FBBFC8FB31142139F6BFB8FBBFBEFBBF10 -:10320400C4FB22BCFB1231FF31AE03316FBFBAFBEA -:10321400F622C2FB1231FF31AE03316FBFC0FBF6A1 -:1032240022C8FB1231FF31AE03316FBFC6FBEDEF95 -:103234003231442110714321710802FCF5B6FBF5CB -:10324400B5FBEDEF32D5B5FB61E8EDEC328F44FB15 -:103254009FB5FB40B6FB1FDC1A710002FC4046FB25 -:10326400FFDD22A0B7FB8F46FB4FB7FBDE17F5B699 -:10327400FBEF12D9B6FBF1A1605C1F9FB6FB71088E -:1032840002FCF5B7FBE9B6FB0948FB5080D6BFB892 -:10329400FBE9B6FB0968FB5080D6BFBEFBE9B6FB71 -:1032A4000988FB5080D6BFC4FBAFB8FB22BCFB121D -:1032B400D945FBF133BDD813FDB20DBFBAFBAFBE88 -:1032C400FB22C2FB12D945FBF133BDD813FDB20D6D -:1032D400BFC0FBAFC4FB22C8FB12D945FBF133BD11 -:1032E400D813FDB20DBFC6FBB0B5FB8F20F9314535 -:1032F4001F30C4FBFDF22EF313BE6430B8FBFDF2A5 -:103304002EF313BE6E30BEFBFDF22EF313BE6AD74E -:1033140030C4FBFDF22EF313BE6AD7C73132210B42 -:10332400D5CAFBDD06B0CAFBEDE633713321D9FF04 -:10333400FBF1E7240000DD0F23DD1B23DD1123DD7A -:103344005723DD2923DD3B5600F51DFDEDD2335611 -:1033540001F51DFDEF78D51DFDDF075601E51DFDC7 -:10336400EF055600F51DFDCFCAFBFAEF61D51DFD33 -:10337400DF0B5601E51DFDCFCAFBFAEF51F5FFFB4C -:10338400EF4CD51DFDDF0B5600E51DFDCFCAFBFA42 -:10339400EF3CCFFFFB02EF36D937FCF1E724000006 -:1033A400DD0923DD2423DD0A23EF1E5600F51DFD70 -:1033B400EF1CD51DFDDF075601E51DFDEF05560089 -:1033C400F51DFDCFCAFBFAEF055601E51DFD8F2063 -:1033D400F93145086661FB715107EF066661FB71BF -:1033E4000101C6D7C736F00071F4DC297170F00012 -:1033F400CE9D08CE9EC0CE9F80F594FFF593FFF539 -:1034040092FFE597FFE596FFCE9506F598FFCE9CD3 -:103414007F7100D6FB711BE3712BE3711AE7712BEB -:10342400E7717A9D710A9E31929E02EFFA710B9EAA -:10343400715321716321717321C6D7C73152211E83 -:10344400715221710A9E31929E02EFFA3404FC36C5 -:1034540092FF52078B99A5A792DFF9710B9EC6D7ED -:10346400C788061631622115716221C734CCFB303E -:1034740092FF1652078B99A5A792DFF9C666736768 -:1034840018CCFBC6D7C77153213164211E71632147 -:10349400710A9E31929E02EFFA3492FF36CCFB52AF -:1034A400078B99A5A792DFF9710B9E3174211371D3 -:1034B4007B9E8F0CFC9E9A8F0DFC9E9B71732171D9 -:1034C4007A9EC6D7CFD7FB5CCFD8FB5FCFF8FB3251 -:1034D400D7C7CFD4FB11CFD5FB06CFFCFBFFF5FD3F -:1034E400FBF5FEFBF5FFFBF500FCCFF9FB20F5FA3D -:1034F400FBCF2CFC36CF2DFCC95600664C64DE088D -:10350400723844FB0086EFF3C6D7C788061617F156 -:10351400E73403002361E3ED43382361F8EDF2352A -:10352400B12361E3EDF9352561F8ED083624070090 -:1035340024070061D8ED4338240B0061F8ED2936E7 -:103544002361F8ED70362361F8ED3D362361F8ED23 -:1035540019382561F8ED2D382561F8EDD936B125F6 -:1035640061D8EDFD3624000061F8ED0A372361F8D7 -:10357400ED43382402002361E3ED2F372361F8ED96 -:1035840041372361F8ED53372361F8ED4137236167 -:10359400F8ED65372361F8ED77372361F8ED873768 -:1035A4002361F8EDA9372361F8EDB5372361F8ED10 -:1035B400C1372361F8EDCA372402002361E3ED43E8 -:1035C4003824020061F8EDD2372361F8EDDE3725A7 -:1035D40061F8EDEA37240A0061F8EDF637241200A9 -:1035E40061F8ED13382361F8ED0138ED4538679F34 -:1035F400D6FBED4F38302F2CFD843D66736718D40D -:10360400FBED4F3840D9FB6ADF1440DAFB68DF0E6C -:10361400674C6CDF0930C345FD843D713AD5679F23 -:10362400DBFBED4F3867D1DD06306A41FD843D3464 -:10363400F4FB89616F99ED4F38675C02D1DD083086 -:10364400D92DFD843DEF0C675C01D1DD0630DE2D04 -:10365400FD843D675C3CD1DD1030E32DFD843D6786 -:103664005C3C7266736218D4FBED4F3867D1DD623F -:103674005C01D1DD05300800EF01F6609F33FC6783 -:103684005C02D1DD03E6EF01F63433FC896168990D -:10369400675C04D1DD04E6A1EF01F63433FC8961F3 -:1036A4006899675C08D1DD05302000EF01F63433FA -:1036B400FC89616899675C10D1DD05301000EF0169 -:1036C400F63433FC89616899675C20D161E87160E4 -:1036D40033FCED4F38D518F9DF09679FFDFBA018BF -:1036E400F9EF134018F905DE0DD918F9F1B1126795 -:1036F4004818FDA018F9ED4F38675C0F72667362C5 -:1037040018D4FBED4F384018F964DE1F4018F90156 -:10371400DF0667D161F85701E918F9671844FBA07F -:1037240018F94018F90561C8714221675C7F318E30 -:10373400C117F1243000FD6434C0ED4F38675C3F9D -:10374400318EC117F1243000FD6434C0ED4F386769 -:103754005C07318EC117F1243000FD6434C0ED4F95 -:1037640038675C1F318EC117F1243000FD6434C00A -:10377400ED4F3867318EC117F1243000FD6434C039 -:10378400ED4F38CEABAC710A9E31929E02EFFAD562 -:1037940092FFDF05710B9EEFED679E99710B9E9F63 -:1037A4000BFCED4F38717221675C7F9F0CFCED4F71 -:1037B40038717221675C3F9F0DFCED4F38675C3FA9 -:1037C4009F0EFCED4F38675C1F9F0FFCEF7D30822E -:1037D4003FFD843D679F14FCEF71303D3FFD843D08 -:1037E400679F15FCEF65305F3FFD843D679F18FCC4 -:1037F400EF59675C01D1DD53FDCB48EF4E402EFC01 -:10380400C8DE48E92EFC671872FAA02EFCEF3C676C -:103814009F2EFCEF3667318E247200DF0630560986 -:10382400FD843D679FF7FBEF228FFAFB617F5C10FD -:10383400D1DD0630EA3AFD843D679FFAFBEF0CEFD9 -:103844000A664C5ADE05736718D4FBC6D7C71666DA -:103854004C30DC094C37DE05FD3F34EF67664C0223 -:10386400DF1F8FD6FB5C03728F35FC5C03318E3116 -:103874006D08616A08128F35FC5C80312A6162EF41 -:1038840049664C3DDF0AAE90BF30FCF930FCEF3A9C -:10389400664C3EDF05F931FCEF30664C4FDF05FD29 -:1038A400EF48EF26664C61DF09E92EFC0972FA72D3 -:1038B400EF18664C7FDF0D30EA41FD843D713AD547 -:1038C400524AEF06667309D4FB72C6D7C788061638 -:1038D40017F1241000240500DC07244C00DD17EF49 -:1038E40018717BFA17F104D4FB1489617F99717AFA -:1038F400FA710222EF03A02EFCC6D7C7C1C1FBF8A0 -:10390400FF401EF903DD06401EF904DF2F8C02730D -:1039140009DCFB5E0AD1DF248C02318E04D4FB1453 -:10392400896E0A99716207CC0100316207086159F6 -:10393400018C01D1DFF4716307716B271004C6D7C2 -:10394400CF35FC03F533FCF537FCF539FCD7C788D4 -:10395400061617F1E734020025DD4923DD1A25DDBB -:103964002823DD0523DD37EF47713222679F38FCBA -:1039740030EA3AFD843DEF38675C03D161F8712287 -:1039840023675C839F35FCEF27675C039F37FC67E5 -:103994005C034C0261F8713221FD1F33EF12679F03 -:1039A40039FCEF0C6791DF08E0C15012FDFF38C00D -:1039B400C6D7C71617F1E7240000DD4723DD23240B -:1039C4000300DD0C240200DD2224F900DD3CEF3D80 -:1039D40031020705308000EF01F6086F36FC7208EB -:1039E400EF318F33FCF533FC72EF2840DDFB01DD52 -:1039F4000FD9DDFBF11231FE03311F087208EF13FA -:103A0400E2EF107112235235EF09F2EF06667309E3 -:103A140032FC72C6D7C71617F1E7240000DD38243C -:103A24001000DD1C23DD1C23DD30240E00DD1824F2 -:103A34001100DD1B240F00DD12243000DD15EF1E04 -:103A4400E2EF1D5202EF195204EF155206EF115224 -:103A540005EF0D5207EF09F2EF065203EF0252FF92 -:103A6400C6D7C78F2AFDB02AFDD1DF6BCF2AFD0749 -:103A740031142249711322401EF903DF408F44FCA4 -:103A84009FDCFB8F43FC9FFBFB3624FDC7D943FC23 -:103A9400FD323C618A70618AFD773CC0D946FCF1F5 -:103AA400312F609F45FC8F42FC4F45FCDD0F712296 -:103AB400228F45FC9F42FC30EA3AFD843D7150F070 -:103AC40000CE300BCF170006CE3106FD2703717AE6 -:103AD40030710BE3710BE7C6D78F45FC9F42FC8F17 -:103AE40045FC9FDDFBD7401EF903DF06401EF904A9 -:103AF400DF02F2D78FFAFB5C10D1DD0C8F45FC9FFF -:103B04004AFC7148FAFBEF6A3124222471232271A2 -:103B140043228FFAFB5C04D1DD088FF9FB9F4BFC39 -:103B2400EF068F45FC9F4BFC8F4BFC9F4AFCEF42FA -:103B34003134222C713322714222D538FCDF05F551 -:103B44004CFCEF0B8F38FC5002D6A1609F4CFC8FCD -:103B54004CFC9F4AFC5040C15012FDFF38C0EF128C -:103B6400314222088F4BFC9F4AFCEF068F4CFC9F8E -:103B74004AFC8F4AFC9FDDFB404AFC01DF05E53827 -:103B8400FCEF0ED94AFCF11231FE03311F609F385D -:103B9400FC8FFAFB5C01D1DD02F2D7E94AFC09385B -:103BA4002370C15013FDD105C0F2D7C7168B728C98 -:103BB40001614ADE248B728C02614ADE188C017228 -:103BC4008C02614ADE068C01318EEF048C02318E48 -:103BD400087208EF268B72EF228B728C02614ADE28 -:103BE400048B72EF168C01728C026142DE068C012A -:103BF400318EEF048C02318E087208C6D7C7167155 -:103C04000AE7710BE37150F000CE300BCF170006BA -:103C1400669E31FD2703717A30710BE33182E30232 -:103C2400EFFA8D1F7158F000710BE772C6D7C7C148 -:103C3400C1FBF8FF8F2CFC4E02DC03F2EF318C0247 -:103C44004F2DFCDC0452FFEF268C022F2CFC7061FC -:103C540031318D128F2DFC2F2CFC70613133BDD886 -:103C640013FDD40DBB440001DC03F690BB8B721032 -:103C740004C6D7C7C1C1FBF8FFAC0A14A9148970E4 -:103C84008C026128706131FD58201344030071FED9 -:103C9400DC24AC0A148A04819A04AC0A148A044C05 -:103CA40011DC11A9148C0299AC0A14CA0200AC0AE2 -:103CB40014CA0310EF74AC0A14CA0400AC0A14A9A1 -:103CC40014894E02DE0AAC0A148A02819A02EF13A6 -:103CD400AC0A14A914894E0261D308AC0A148A02EE -:103CE400919A02AC0A148A03919A03D1DF3CAC0A7C -:103CF400148A024C10DF10A91489318EA112AC0A67 -:103D040014A9146299EF17AC0A148A024CF0DF0E5E -:103D1400A91489318EB112AC0A14A9146299AC0A9F -:103D240014CA0200AC0A14CA03101004C6D7ED6FFB -:103D34003D717BFAC7D558FC61F831542227715381 -:103D440022D558FC61E8B058FC717AFA5600664CEA -:103D54000BDD1272F3311C792CFDCEFC0061CAFD1F -:103D6400CE3D86EFE9717AFAF2C6D7C75600664CA3 -:103D74000ADE0BF0317E12F6785AFC86EFF0C6D7D5 -:103D8400C7C1C1FBF8FFCC01008C014C0ADE3671BF -:103D94007BFA8C01F0317E045AFC14A96168DF09B6 -:103DA400AC02B9717AFAF2EF1D8C01F0317E12790E -:103DB4005AFC614902DF06717AFAE2EF09717AFA74 -:103DC400615901EFC4E21004C6D7C72004FBF8FF11 -:103DD400F6425AFC61F8EDB33E717BFA9C038C0306 -:103DE4004C0ADE3C8C03F0317E045AFC14A9616851 -:103DF400DF05717AFAEF29717AFA8C0372F3311CB8 -:103E0400795AFCCEFC0061CA629C02D1DF0A8C03A1 -:103E1400F0317E12E6785AFC717BFA615903EFBEE9 -:103E2400CC0200CC01018C02F0317E045AFC14A9AE -:103E34006168DD7B8C02F0317E12795AFCE743DF46 -:103E4400688C014C0ADE628C01F0317E12795AFCD6 -:103E5400E743DD50717BFA8C01F0317E045AFC1487 -:103E6400A96168DF1B616901717BFA8C01F0317E05 -:103E740012F6785AFC717AFA8C024E01DCE7EF2FC5 -:103E84008C01F0317E045AFC14A9128C02F0317EAC -:103E940033785AFC8C01F0317E12E6785AFC615971 -:103EA40002717AFA615901EF98615902ED2A3E00D4 -:103EB400F21004C6D7C72006FBF8FF3419FCC5501E -:103EC40006C150A8C15030FD75031006D2DD1DA0F7 -:103ED4006EFC406EFC08DE03E2EF5A3414FC895C8D -:103EE400FC99FD823F7110E2FBF2EF49F56EFC8F05 -:103EF40014FC5C01D1DD26401EF903DF205010C103 -:103F040080FDFF38C0C736100571D4C6DE0F17C157 -:103F14005006C150A8C15030FD75031006401EF96B -:103F240001DD11401EF905DD0B8F14FC5C02D1612B -:103F3400E8FDC845F21006C6D7D915FCC15030FDBE -:103F44004B03C0629F18FC7130E5FB8FEDFB5C08EE -:103F5400D1DF06716307716B27F2D7D918FCC1D979 -:103F640017FCC15030FDE70310047130E5FB8FED01 -:103F7400FB5C08D1DF06716307716B27F2D7C7209A -:103F84000AFBF8FF500FC15030FD4B03C04041FB0A -:103F940002DF077110E2FBF2EF547118E2FBCC0769 -:103FA40000CC0812CC09808F14FC5C03D1DF0871AB -:103FB4007AD5CC0607EF06717BD5CC062F170406FD -:103FC40000C15004C150A0C15030FD1D041006C7EB -:103FD40036100571D4C6DE15401EF903DF0F17C174 -:103FE4005006C150A8C15030FD75031006F2100AE6 -:103FF400C6D7C7401EF902DF04F6BF72FC8F42FD2C -:10400400B042FDD161E8ED0741CF42FD048F1EF9B6 -:10401400318FE723DD0B24020024030061C8ED0780 -:10402400413027004272FCDF0AE0C15010FDFF3826 -:10403400C0EF2530C0004272FCDF0B5002C15010AB -:10404400FDFF38C0EF128FF8FB5009D60480004200 -:1040540072FC61D8715020F931340709717322F66A -:10406400BF72FCEF1731742206F6BF72FCEF0DA28B -:1040740072FCF64272FCDF0490BF72FC8F21F931AE -:104084008FE7240000DD0623DD0D23DF1236100543 -:1040940071C4710123EF0B710402710123EF0371E9 -:1040A40002233102231A4074FC0361D8A074FC403B -:1040B40074FC02DF0E5004C15010FDFF38C0EF0342 -:1040C400F574FC3104231A4076FC0361D8A076FC15 -:1040D4004076FC02DF0E5008C15010FDFF38C0EFDF -:1040E40003F576FC314207184075FC0361D8A075CE -:1040F400FC4075FC02DF0C5010C1FDFF38C0EF031B -:10410400F575FCC6D7C736100571D4DE0730B93E45 -:10411400FD843DD2401EF903DF1A3122070630FB2D -:104124002CFD843D3114230C7113235080C1501293 -:10413400FDFF38C0401EF903DD05F6BD1AEF25D595 -:1041440000FCDF09F6461ADD1BB61AEF17D9FCFB93 -:10415400F1461ADD0FD9FCFB12AD1A43DE04A61A90 -:10416400EF02B61AC6D7C78FF4FB76F5F4FB5C10E2 -:10417400D161E8713223665C0FD1DD67665C01D1E1 -:10418400DD05F51EF9EF5C665C02D1DD15E0C1507A -:1041940003C15084FDE7031004711300711B2071E7 -:1041A4000303665C08D1DD05710303EF1A665C0442 -:1041B400D1DD14711300711B203124230371030317 -:1041C4003435FC895CFC995005FD9502710203505D -:1041D40003C1C15084FDE7031004711A2071232325 -:1041E400FDF82DF2C6D7C7364105718461D8EDA913 -:1041F400423641057194DE0771405005CEABAC31B7 -:10420400B2D104E2EDB842713BD18F18F9A018F98C -:10421400318EE7240000DD1723DD2823DD3323DD81 -:104224003823DD4423DD5023DD5523DD5AEF6E8F23 -:1042340020F93163088F21F99F4005EF62CF4005D3 -:1042440004EF5CF0C15084FD4B03C0629F4005EF56 -:104254004E8F14FD9F4005EF465008C1506CFD4B36 -:1042640003C0629F4005EF375009C1506CFD4B03FA -:10427400C0629F4005EF288F78FC9F4005EF208F98 -:1042840002F99F4005EF18711420E66130127104A1 -:104294002061DC31196162629F4005EF02EF06CEB6 -:1042A400ABACE2EF0F7160500571485005713BD51E -:1042B400F518F9F2C6D7C78F1EF9318FE72400002D -:1042C40061F8ED5D4423DD1B2361F8ED7243236146 -:1042D400F8EDFC432361F8ED38442361F8EDCE4456 -:1042E400ED3145D51FF9DF2BF64272FCDD05F544AF -:1042F400FDEF03A044FD4044FD65DC09F51EF971A2 -:104304005222ED3445AF72FC440A0061D8ED3445C5 -:10431400E51FF9717222F544FDF5F7FBFD420571C5 -:104324002320FDAE244021F903DF09715222F51E3A -:10433400F9ED3445FD082840E1FB9BDE097152226A -:10434400F51EF9ED3445FD342CD2DD09715222F508 -:104354001EF9ED3445401FF901DF05F5FDFBEF04BF -:10436400CFFDFB03CF1EF902FD092CED3445CF35FB -:104374000002CF37001DCF120510FD1E2EFD7E2E2C -:10438400714A9DFD4439FDD534F537FF712BE0F5B5 -:104394001FF9715222CBE43FEFCBE6F6F0FD420564 -:1043A400713BD48F20F93135305004C15084FD4B1A -:1043B40003C0625C03318E315D34E3FB896168992B -:1043C4005002C15084FD4B03C0D2DD067170E3FB83 -:1043D400EF047178E3FBFDAE24FD352F713820F92D -:1043E400CF1EF9038FD6FB5C02D1DD095080C1508A -:1043F40010FDFF38C0ED3445FD364531A4E0207191 -:104404002BE031020C05FDB045EF145027C15005D7 -:10441400C15084FDE7031004CF1EF9047152223108 -:1044240034230BA07AFCD57AFC61F8FDB045FDA3DA -:1044340045ED3445FD364531020C18F0C15005C137 -:104444005084FDE70310045005FD9502FDB045CFEF -:104454001EF903FDA345ED3445CFFDFB03F5FEFB3B -:10446400F500FC711221F6426CFF61E8ED344571F0 -:104474005820F9F514FCFD823FFDB72FFD752EFD84 -:10448400D32E714B9DF5E4FBF5E5FBF5E6FBF5E773 -:10449400FB31642002EFFACE3708CBE4BFFFCBE652 -:1044A400FFF1CED4FFCF370009F51205F6BEE0BE0A -:1044B400E2BED0716A27FDB12CFDAB05F544FDCFFA -:1044C4001EF905717222F6BF72FC3102071BFDAEA4 -:1044D40024AF72FC440A00DC06E51FF9E51EF9D599 -:1044E40021F9DD4CFDAB05EF47F51FF9FDAB05FDEB -:1044F400732471730171320431120502EFFA7143AE -:104504000271032071222031949E02EFFA712AE78E -:10451400CEA409F5F30061FD31040703717322E5AC -:10452400F300CEA408712BE7E51EF9EF0300EFFDBD -:10453400C6D7D57BFCDF1E310200195003C150845D -:10454400FD4B03C0625C01D1DF07F51EF9715222F5 -:10455400D7E57BFCD7407BFCF0DF083104003FF556 -:104564007BFCD7407BFCC8DF0BF51EF9715222CFD0 -:104574007BFCF0D731020004A07BFCD7F0C15004CF -:10458400C15084FDE70310048FE3FB5C9F9FE3FBB2 -:104594007110F4FB306A41FD843DCF7BFCF0D78F72 -:1045A40020F9315506F51EF9715222D7713323F5DE -:1045B4007AFC717207FD2703FD2703717307D7FD8A -:1045C4001806F2D7C7200CFBF8FF8F1AFCF0F91974 -:1045D400FCF303FD582013BC048F1CFCF0F91BFCF6 -:1045E400F303FD582013BC028F1EFCF0F91DFCF3ED -:1045F40003FD582013BBAC04BDD8F6BDDAAC0431BE -:104604001EBDDCF6BDDEFD870DADD8BDDCADDABD6B -:10461400DEAC02BDD8F6BDDAAC02311EDADCC3DA98 -:10462400DEC3BDDCF6BDDEFD870DC0BDDEC0BDDC76 -:10463400ADDEFDFD0EADD8BDDCADDABDDEABBDD863 -:10464400F6BDDAAB311EDADCC3DADEC3BDDCF6BD9F -:10465400DEFD870DC0BDDEC0BDDCADDEFDFD0EDAC6 -:10466400DAADD8FD254AC3C58F08FD5C3FF0317E25 -:104674000488FC14C2C0B9A008FDF6BC08BC0A9C9E -:10468400078C074C2EDD3E8F08FD0E0770F161DCB0 -:10469400605C3FF0317E127988FCBDD8F6BDDA8CBF -:1046A4000773097A23318FBDDC70BDDEFD870DAC45 -:1046B40008BDDCAC0AFDFD0EADDABC0AADD8BC0801 -:1046C400615907EFBCAC08BDD8AC0ABDDAC9DC003F -:1046D40004F6FD510EC9DCFFFFF6FD660FADD8BF31 -:1046E40082FCAF7CFC4282FCDD12AF7EFCBF80FC0E -:1046F400AF7CFCBF7EFCAF82FCBF7CFCAF7EFC4287 -:1047040080FCDC50AF7CFC427EFCDE48AF46FD42C0 -:104714007CFCDE40404AFD16DC1F404AFDA0DE164C -:104724008F84FC4F4AFDDE0EAF7CFC2286FC44697C -:104734001061C8FDA147F54AFDAF7CFC445146DC3D -:104744000BAF7CFC241027BF48FDEF1930F82ABFBB -:1047540048FDEF11404AFDFFDD03E6EF01F6344A60 -:10476400FD89610899AF80FC427EFCDC1BAF7EFCB6 -:10477400427CFCDE13AF7CFC4248FDDE0BF584FC7E -:10478400AF7CFCBF86FCEF114084FCFFDD03E6EF49 -:1047940001F63484FC89610899100CC6D7C7200639 -:1047A400FBF8FFA01FFCD51FFCDF1CA020FCD520BC -:1047B400FCDF14A021FCD521FCDF0CCF1FFCFFCFB4 -:1047C40020FCFFCF21FCFF717BFA710A9E31929E7F -:1047D40002EFFA8E98FD7A0F9C039F0CFD8E949F36 -:1047E4004BFD8E969F4CFD8E979F4DFD8E939F0A99 -:1047F400FD8E929F0BFDFD824913BC04BDD8F6BD0E -:10480400DA46DADF03B146D8DF198C035C0391DFA3 -:1048140003E6EF01F6046D01313D120103B1BC045E -:104824006169038F4EFD4E03DF12AF0EFD61490433 -:10483400DE40AC04220EFDFDA348EF368C03318E1E -:10484400B112D94EFDF143DF1E8C035C0391DF03EB -:10485400E6EF01F6046D01313D120103220EFD6104 -:104864000904FDA348EF0B8F4EFD4E03DE04F6FD55 -:10487400A3488C039F4EFDAC04BF0EFDD909FDF186 -:10488400010422F9BB14A944FFFFDF04E6B9EF0BCE -:10489400AB14A944FEFFDD03A9A1B91006C6D7C70E -:1048A400161744A90061C836A800A009FD4009FDF7 -:1048B400A861C8F509FDF909FDF3311CF67822F960 -:1048C400B7F647DFE5C6D7C756A89666F0317E121D -:1048D400F6B17822F966D1DFF1F51FFCF520FCF57D -:1048E40021FCF509FDC6D7714323D7C72004FBF883 -:1048F400FFD918F9F1E7240000DD1123DD1C23DDC5 -:104904002123DD2623DD2F23DD34EF3A8F09FD9F9C -:1049140010FDA018F9F94BFDEF60A018F9F94CFD52 -:10492400EF58A018F9F94DFDEF50A018F98F0CFDC0 -:10493400FD940F72EF44A018F9F90AFDEF3CA0189A -:10494400F9F90BFDEF34F910FDF3311C7922F9BBB1 -:10495400314223058B9C03EF128C019C03D510FD7F -:10496400DF06CF10FDA7EF03B010FD718071472360 -:1049740061DC61FB7141238C03721004C6D7C7202C -:1049840008FBF8FF8E989C058E979C048E969C03DA -:104994008E949C028E939C018E929B710B9E717AD5 -:1049A400FA8C05FD7A0F9C058C04FD7A0F9C048C0F -:1049B40003FD7A0F9C038C02FD7A0F9C028C04F099 -:1049C400317E1279AA23BC068C055C03D1DF158CD9 -:1049D400044C03DE0C8C044C02DF098C034C1D6177 -:1049E400F86179068C03318EB1610906BC06313D4C -:1049F400120103BC068C060E02708C071C00BC0658 -:104A04008F24FC4E01DC0D8C014F24FCDC0B8F2524 -:104A1400FC4DDE05AC0612EF04AC06B1121008C65C -:104A2400D7C7C3C12008FBF8FFF661490A61F861E2 -:104A34004908DF07F7340000EDC24AE6BC04F6BCBF -:104A440006AC0ABC02AC08BBAC06614902AC04610A -:104A5400F8614900DE28AC04BDD8AC06BDDAE1FD3E -:104A64000C0FADDABC06ADD8BC04ABBDD8AC02BDEE -:104A7400DAE1FD270FADDABC02ADD8BBEFCAAC0654 -:104A8400BC02AC04BBAC08BDD8AC0ABDDAAC04BDF6 -:104A9400DCAC06FD8A0EAC04BDDCAC06FDFD0EE10B -:104AA400FD270FADDABC06ADD8BC04AC06614902E3 -:104AB400AC0461F8614900DCC5AC0214AB12100C03 -:024AC400C6D753 -:104AC60061FC61FCC1C3C5C7520C929269D4FEC198 -:104AD600DFF88EFD708EFCC1717AFA401EF903DF95 -:104AE6000630FB2CFD843DC09EFC609EFD34D4FE4A -:104AF6005206C0B9A5A592DFF9C6C4C2C061FC6161 -:104B0600DF520C929269D4FEC1DFF88EFD708EFCE6 -:104B1600C1717AFAC736410571A4C6DC51F516FD96 -:104B26007148500571605005310422367162077173 -:104B360003228FE4FB5FECFBD1DF1B8FE5FB5FED10 -:104B4600FBD1DF128FE6FB5FEEFBD1DF098FE7FBC0 -:104B56005FEFFBD1DD0C31620702EFFA716307717B -:104B66006B27FDEB48FD8934F518F9ED894CC736FE -:104B760041057184C6DE0DF516FD71485005FD89A7 -:104B860034ED894CC73641057194C6DE154016FDD5 -:104B960003DD0C4016FD04DD064016FD0161F8F547 -:104BA60016FDD916FDF1E7240000DD0823DD1323E9 -:104BB600DD39EF6071405005E516FD71505005ED89 -:104BC600894C8F40059F19F99F1CF9D919F9FD5198 -:104BD60038629F1BF94019F97FDD06CF16FD02EFFB -:104BE60003F516FD71505005ED894CC73641057128 -:104BF60094C6DE1CC736410571C4C6DE06CF16FD57 -:104C060003EF11F516FD7148500571605005EF73FD -:104C1600CF16FD044016FD03DF138F1BF99F4005D9 -:104C2600D91BF9C1D919F9FDD038C0EF108F40054D -:104C360076C7D919F9FD0E35C071505005D91CF942 -:104C4600F1242900DD2D240400DD28242200DD23A3 -:104C5600241100DD0C240100DD19241E00DD14EFF3 -:104C66000C4019F960DF0CCF19F961EF06F518F958 -:104C7600A019F94016FD03DF0AD919F9FD5138626A -:104C86009F1BF9C09EFC609EFD34D4FE5206C0B93F -:104C9600A5A592DFF961FCC1C3C5C7520C92926902 -:104CA600D4FEC1DFF88EFD708EFCC1F616717AFA5D -:104CB600714AE5717BBD51405F0401D1DD05A7F660 -:104CC60047DFF3300400BF2401F6BF2A01300B0B87 -:104CD600BF2801FD2703300B0FBF2801FD27033036 -:104CE6000F0FBF2801710AE6716320C09EFC609E0B -:104CF600FD34D4FE5206C0B9A5A592DFF9C6C4C2DA -:104D0600C061FCC1C3C5C7520C929269D4FEC1DF13 -:104D1600F88EFD708EFCC1717AFAD540FBDD0EEB84 -:104D26003EFB899E44A23EFBB040FBEF2B710AE698 -:104D3600300400BF2401F6BF2A01300B0BBF280147 -:104D4600FD2703300B0FBF2801FD2703300F0FBFD0 -:104D56002801715320716320C09EFC609EFD34D4EF -:104D6600FE5206C0B9A5A592DFF9C6C4C2C061FC51 -:104D760061EF520C929269D4FEC1DFF88EFD708EFF -:104D8600FCC12008FBF8FF71503002CEABACCC0161 -:104D960000F6BC0231B2E20F617902F6614902DF28 -:104DA600F371603002EF7E8E519B713BE28B5C02A9 -:104DB600D1DD1D8B5C08D1DF0971503002CC0100BA -:104DC600EFCF8C0770FDB639629E50CC0102EFC161 -:104DD6008B5C03D1DF408E509C05715030028C01F4 -:104DE600D1DF0E8C0570FD193A629C07CC0101EFEC -:104DF600318C014C02DF0671603002EF28CF34029D -:104E06005A716030028C0570C18C0770FD5239C032 -:104E1600CF34024AEF0F8B5C01D1DD0671603002A0 -:104E2600EF03ED974D1008C09EFC609EFD34D4FE46 -:104E36005206C0B9A5A592DFF961FCC1710A9E317F -:104E4600929E02EFFA8F0EFC4F96FFDF358F0FFC16 -:104E56004F97FFDF2D8F10FC4F98FFDF258FEDFB5F -:104E66005C04D1DF1D7120E5FB716307716B274080 -:104E76001EF905DD06401EF901DF07CF1FF902E521 -:104E86001EF9710B9EC061FCA058FC61FCC1C3C534 -:104E9600C7520C929269D4FEC1DFF88EFD708EFC6B -:104EA600C1C1FBF8FF8D1F9C018E31318EE72406B0 -:104EB60000DD0823DD0F23DD25EF45717AFA8C012D -:104EC6009F44FCEF3B717AFA4021F901DF078C0120 -:104ED6009F43FCEF2B51FF2E019F43FCEF22717A7B -:104EE600FA8C019F02F98FE2FB5C01D1DF12401EB2 -:104EF600F903DD06401EF904DF06304A27FD843D2E -:104F06004031FF09DE05A031FFEF197158F000713D -:104F160012224057FC02DF03F6EF05D957FCF1A138 -:104F2600609F57FC710BE3C0C09EFC609EFD34D4AD -:104F3600FE5206C0B9A5A592DFF9C6C4C2C061FC7F -:104F460061FF520C929269D4FEC1DFF88EFD708E1D -:104F5600FCC1717AFA8F14FC5C03D1DD19401EF98D -:104F660003DD06401EF904DF0D36100571D4DE069A -:104F760030B93EFD843DC09EFC609EFD34D4FE5299 -:104F860006C0B9A5A592DFF961FC61FC61FC61FC74 -:104F960061FC61FC61FC61FC61FC61FC61FC61FC23 -:104FA60061FC61FC61FC61FC61FC61FC61FC61FC13 -:104FB60061FC61FC61FC61FC61FC61FC61FC61FC03 -:024FC60061FC8C -:0A4FF60031313A32333A3531000010 +:102F3400D7C7712012057100F200304400BFB601FA +:102F4400300188BF9001300984BF9E01BF9C01BF3E +:102F54009A01BF9801BF9601BF9401BF9201F53C4D +:102F6400FF30FE00BFBE01F6BFBC01BFB80150EE8A +:102F7400BFBA01A1BFB201C918FE00711020F94007 +:102F840021F901DF06711820F9EF0B36100571A441 +:102F940061D8711820F971281205F6BE6EBE64BEA0 +:102FA4006A7123047153078F20F9310507F5FDFB7E +:102FB400CB6CFF00711321C6D730EF00BFB401F60C +:102FC400BFBA017108F200712304715307715301F0 +:102FD400D7712321D9FDFBF1E7240000DD1223DDA5 +:102FE4001923DD1123DD2623DD3423DD3923DD3FE1 +:102FF400FD7030EF3DFD9330EF38D9FCFBC1AE6C72 +:10300400FDDC2EC0F313BE6C710321EF25F0C1AEBD +:103014006CFDDC2EC0F313BE6C710321EF14F6BEFD +:103024006C710221EF0CCB6CFF00710321EF03FDE7 +:1030340010318F20F9311508710421712104EF0634 +:10304400710421715101312421218F20F93115108E +:10305400F6BE64BE6A3104210390EF01F6BE6ED75A +:1030640031042104F690EF01F6BE6AD7CF26FD475E +:10307400F5A8FBAE6C317DBFAEFBFDE530D2DF0EB3 +:10308400D9FCFBC1AE6CFDDC2EC0F313BE6CD7FDC6 +:10309400E530D2DD0FCF26FD47F5A8FBAE6C317DC0 +:1030A400BFAEFBD7E9A8FB0918235080D6BFAAFB03 +:1030B40022AEFBBDD8304700FD8A0DBFACFB30AA61 +:1030C400FBFDF22EF313BE6CB026FDD526FDDF10FA +:1030D400CF26FD47A0A8FB40A8FB1F61C8F5A8FBAD +:1030E400D740DFFB0BDC05710321F2D740DFFB0681 +:1030F40061D831120511F0C1AE6CFDDC2EC0F313A2 +:10310400BE6C710221EF03FD1031E2D7712221F070 +:10311400C1AE6CFDDC2EC0F313BE6CA0B0FB40B09E +:10312400FB40DC3DF5B0FBD9B1FBF1313F0422FD9E +:1031340014D9B1FBF1BDD85008FDD90D087208E6C9 +:10314400D2DD040192DFFC896158D1DD05710221D1 +:10315400EF03710321A0B1FB40B1FB2061C8F5B1BD +:10316400FBD78FB2FBB0B2FBD1DF7331D4D1067180 +:103174005BD1E5B4FBD5B4FBDD347140E2FBD9B3DC +:10318400FBF1E734020023DD0625DD0325DF05F628 +:10319400BE66EF06D9FCFBF1BE66A0B3FB40B3FBF1 +:1031A40020DF06F5B3FBB0B4FBCFB2FB19D7CFB227 +:1031B400FB1E7148E2FBD5FEFBDF04F6BE66D7D9E1 +:1031C400FCFBF14266FFDD16D9FCFBF112AE66434F +:1031D400DE05A266FFEF03B266FFCFB2FB03D73171 +:1031E400242101D7401EF902DF10F6BE64BE6EBE74 +:1031F4006ABFBCFBBFC2FBBFC8FB31142139F6BF99 +:10320400B8FBBFBEFBBFC4FB22BCFB1231FF31AE17 +:1032140003316FBFBAFBF622C2FB1231FF31AE039A +:10322400316FBFC0FBF622C8FB1231FF31AE033150 +:103234006FBFC6FBEDF53231442110714321710893 +:1032440002FCF5B6FBF5B5FBEDF532D5B5FB61E84F +:10325400EDF2328F44FB9FB5FB40B6FB1FDC1A71C5 +:103264000002FC4046FBFFDD22A0B7FB8F46FB4F6C +:10327400B7FBDE17F5B6FBEF12D9B6FBF1A1605C24 +:103284001F9FB6FB710802FCF5B7FBE9B6FB0948C2 +:10329400FB5080D6BFB8FBE9B6FB0968FB5080D66B +:1032A400BFBEFBE9B6FB0988FB5080D6BFC4FBAFA9 +:1032B400B8FB22BCFB12D945FBF133BDD813FD8A00 +:1032C4000DBFBAFBAFBEFB22C2FB12D945FBF133E3 +:1032D400BDD813FD8A0DBFC0FBAFC4FB22C8FB12CF +:1032E400D945FBF133BDD813FD8A0DBFC6FBB0B57C +:1032F400FB8F20F931151F30C4FBFDF22EF313BEF2 +:103304006430B8FBFDF22EF313BE6E30BEFBFDF24B +:103314002EF313BE6AD730C4FBFDF22EF313BE6A3C +:10332400D7C73132210BD5CAFBDD06B0CAFBEDECA1 +:1033340033713321D9FFFBF1E7240000DD0F23DDD6 +:103344001B23DD1123DD5723DD2923DD3B5600F547 +:1033540027FDEDD8335601F527FDEF78D527FDDF9E +:10336400075601E527FDEF055600F527FDCFCAFBFB +:10337400FAEF61D527FDDF0B5601E527FDCFCAFB28 +:10338400FAEF51F5FFFBEF4CD527FDDF0B5600E5B7 +:1033940027FDCFCAFBFAEF3CCFFFFB02EF36D9374C +:1033A400FCF1E7240000DD0923DD2423DD0A23EFFB +:1033B4001E5600F527FDEF1CD527FDDF075601E556 +:1033C40027FDEF055600F527FDCFCAFBFAEF05569A +:1033D40001E527FD8F20F93115086661FB7151075E +:1033E400EF066661FB710101C6D7C736F00071F4C0 +:1033F400DC297170F000CE9D08CE9EC0CE9F80F572 +:1034040094FFF593FFF592FFE597FFE596FFCE95C0 +:1034140006F598FFCE9C7F7100D6FB711BE3712BE0 +:10342400E3711AE7712BE7717A9D710A9E31929EBE +:1034340002EFFA710B9E715321716321717321C6DE +:10344400D7C73152211E715221710A9E31929E02B8 +:10345400EFFA3404FC3692FF52078B99A5A792DF4A +:10346400F9710B9EC6D7C7880616316221157162A1 +:1034740021C734CCFB3092FF1652078B99A5A79233 +:10348400DFF9C666736718CCFBC6D7C77153213101 +:1034940064211E716321710A9E31929E02EFFA34F7 +:1034A40092FF36CCFB52078B99A5A792DFF9710BDB +:1034B4009E31742113717B9E8F0CFC9E9A8F0DFCA0 +:1034C4009E9B717321717A9EC6D7CFD7FB5CCFD8F0 +:1034D400FB5FCFF8FB32D7C7CFD4FB11CFD5FB07A7 +:1034E400CFFCFBFFF5FDFBF5FEFBF5FFFBF500FC58 +:1034F400CFF9FB20F5FAFBCF2CFC36CF2DFCC956B7 +:1035040000664C64DE08723844FB0086EFF3C6D7CD +:10351400C788061617F1E73403002361E3ED493841 +:103524002361F8EDF835B12361E3EDFF352561F84A +:10353400ED0E3624070024070061D8ED4938240B2A +:103544000061F8ED2F362361F8ED76362361F8ED4E +:1035540043362361F8ED1F382561F8ED33382561D2 +:10356400F8EDDF36B12561D8ED033724000061F8AA +:10357400ED10372361F8ED49382402002361E3EDAF +:1035840035372361F8ED47372361F8ED5937236167 +:10359400F8ED47372361F8ED6B372361F8ED7D379C +:1035A4002361F8ED8D372361F8EDAF372361F8ED32 +:1035B400BB372361F8EDC7372361F8EDD037240218 +:1035C400002361E3ED493824020061F8EDD8372384 +:1035D40061F8EDE4372561F8EDF037240A0061F86D +:1035E400EDFC3724120061F8ED19382361F8ED077A +:1035F40038ED4B38679FD6FBED5538302F2CFD7DC9 +:103604003D66736718D4FBED553840D9FB6ADF1467 +:1036140040DAFB68DF0E674C6CDF0930A145FD7DA5 +:103624003D713AD5679FDBFBED553867D1DD063038 +:103634006341FD7D3D34F4FB89616F99ED55386735 +:103644005C02D1DD0830D92DFD7D3DEF0C675C01B6 +:10365400D1DD0630DE2DFD7D3D675C3CD1DD1030D3 +:10366400E32DFD7D3D675C3C7266736218D4FBED0F +:10367400553867D1DD625C01D1DD05300800EF010A +:10368400F6609F33FC675C02D1DD03E6EF01F6349C +:1036940033FC89616899675C04D1DD04E6A1EF011C +:1036A400F63433FC89616899675C08D1DD05302004 +:1036B40000EF01F63433FC89616899675C10D1DD51 +:1036C40005301000EF01F63433FC89616899675CBA +:1036D40020D161E8716033FCED5538D518F9DF0964 +:1036E400679FFDFBA018F9EF134018F905DE0DD90B +:1036F40018F9F1B112674822FDA018F9ED553867A1 +:103704005C0F7266736218D4FBED55384018F96487 +:10371400DE1F4018F901DF0667D161F85701E91887 +:10372400F9671844FBA018F94018F90561C87142FB +:1037340021675C7F318EC117F1243000FD6A34C0EB +:10374400ED5538675C3F318EC117F1243000FD6AB6 +:1037540034C0ED5538675C07318EC117F124300051 +:10376400FD6A34C0ED5538675C1F318EC117F124F2 +:103774003000FD6A34C0ED553867318EC117F1242D +:103784003000FD6A34C0ED5538CEABAC710A9E31C1 +:10379400929E02EFFAD592FFDF05710B9EEFED6763 +:1037A4009E99710B9E9F0BFCED5538717221675CDD +:1037B4007F9F0CFCED5538717221675C3F9F0DFCB7 +:1037C400ED5538675C3F9F0EFCED5538675C1F9FD5 +:1037D4000FFCEF7D307B3FFD7D3D679F14FCEF7157 +:1037E40030363FFD7D3D679F15FCEF6530583FFD4A +:1037F4007D3D679F18FCEF59675C01D1DD53FDA93E +:1038040048EF4E402EFCC8DE48E92EFC671872FAD9 +:10381400A02EFCEF3C679F2EFCEF3667318E24729E +:1038240000DF06302E09FD7D3D679FF7FBEF228FF9 +:10383400FAFB617F5C10D1DD0630E33AFD7D3D6724 +:103844009FFAFBEF0CEF0A664C5ADE05736718D437 +:10385400FBC6D7C716664C30DC094C37DE05FD4580 +:1038640034EF67664C02DF1F8FD6FB5C03728F3523 +:10387400FC5C03318E316D08616A08128F35FC5C83 +:1038840080312A6162EF49664C3DDF0AAE90BF3059 +:10389400FCF930FCEF3A664C3EDF05F931FCEF30C1 +:1038A400664C4FDF05FDCD48EF26664C61DF09E924 +:1038B4002EFC0972FA72EF18664C7FDF0D30E3417B +:1038C400FD7D3D713AD5524AEF06667309D4FB7209 +:1038D400C6D7C788061617F1241000240500DC0794 +:1038E400244C00DD17EF18717BFA17F104D4FB1494 +:1038F40089617F99717AFA710222EF03A02EFCC6C6 +:10390400D7C7C1C1FBF8FF401EF903DD06401EF90D +:1039140004DF2F8C027309DCFB5E0AD1DF248C02E6 +:10392400318E04D4FB14896E0A99716207CC0100AC +:10393400316207086159018C01D1DFF471630771A9 +:103944006B271004C6D7CF35FC03F533FCF537FCE1 +:10395400F539FCD7C788061617F1E734020025DDD0 +:103964004923DD1A25DD2823DD0523DD37EF4771E3 +:103974003222679F38FC30E33AFD7D3DEF38675CC7 +:1039840003D161F8712223675C839F35FCEF2767BD +:103994005C039F37FC675C034C0261F8713221FDC4 +:1039A4002533EF12679F39FCEF0C6791DF08E0C104 +:1039B4005012FD0539C0C6D7C71617F1E724000019 +:1039C400DD4723DD23240300DD0C240200DD222453 +:1039D400F900DD3CEF3D31020705308000EF01F6D0 +:1039E400086F36FC7208EF318F33FCF533FC72EF4D +:1039F4002840DDFB01DD0FD9DDFBF11231FE03317F +:103A04001F087208EF13E2EF107112235235EF0909 +:103A1400F2EF0666730932FC72C6D7C71617F1E7D0 +:103A2400240000DD38241000DD1C23DD1C23DD30E0 +:103A3400240E00DD18241100DD1B240F00DD1224E8 +:103A44003000DD15EF1EE2EF1D5202EF195204EFB4 +:103A5400155206EF115205EF0D5207EF09F2EF066A +:103A64005203EF0252FFC6D7C73114224971132201 +:103A7400401EF903DF408F44FC9FDCFB8F43FC9F17 +:103A8400FBFB362EFDC7D943FCFD2B3C618A7061DC +:103A94008AFD703CC0D946FCF1312F609F45FC8FF4 +:103AA40042FC4F45FCDD0F7122228F45FC9F42FCF6 +:103AB40030E33AFD7D3D7150F000CE300BCF17005E +:103AC40006CE3106FDFF02717A30710BE3710BE70C +:103AD400C6D78F45FC9F42FC8F45FC9FDDFBD7403A +:103AE4001EF903DF06401EF904DF02F2D78FFAFB4A +:103AF4005C10D1DD0C8F45FC9F4AFC7148FAFBEF4A +:103B04006A312422247123227143228FFAFB5C043C +:103B1400D1DD088FF9FB9F4BFCEF068F45FC9F4BD3 +:103B2400FC8F4BFC9F4AFCEF423134222C71332230 +:103B3400714222D538FCDF05F54CFCEF0B8F38FCC5 +:103B44005002D6A1609F4CFC8F4CFC9F4AFC504015 +:103B5400C15012FD0539C0EF12314222088F4BFCCF +:103B64009F4AFCEF068F4CFC9F4AFC8F4AFC9FDD6A +:103B7400FB404AFC01DF05E538FCEF0ED94AFCF1B5 +:103B84001231FE03311F609F38FC8FFAFB5C01D1B8 +:103B9400DD02F2D7E94AFC09382370C15013FDA9AC +:103BA40005C0F2D7C7168B728C01614ADE248B7272 +:103BB4008C02614ADE188C01728C02614ADE068C2A +:103BC40001318EEF048C02318E087208EF268B725D +:103BD400EF228B728C02614ADE048B72EF168C0129 +:103BE400728C026142DE068C01318EEF048C02314C +:103BF4008E087208C6D7C716710AE7710BE37150B5 +:103C0400F000CE300BCF170006669E31FDFF027127 +:103C14007A30710BE33182E302EFFA8D1F7158F0B1 +:103C240000710BE772C6D7C7C1C1FBF8FF8F2CFC2C +:103C34004E02DC03F2EF318C024F2DFCDC0452FF08 +:103C4400EF268C022F2CFC706131318D128F2DFCEC +:103C54002F2CFC70613133BDD813FDAC0DBB440077 +:103C640001DC03F690BB8B721004C6D7C7C1C1FB3D +:103C7400F8FFAC0A14A91489708C026128706131B0 +:103C8400FD56201344030071FEDC24AC0A148A049C +:103C9400819A04AC0A148A044C11DC11A9148C0214 +:103CA40099AC0A14CA0200AC0A14CA0310EF74AC2B +:103CB4000A14CA0400AC0A14A914894E02DE0AAC20 +:103CC4000A148A02819A02EF13AC0A14A914894EC9 +:103CD4000261D308AC0A148A02919A02AC0A148ACB +:103CE40003919A03D1DF3CAC0A148A024C10DF1012 +:103CF400A91489318EA112AC0A14A9146299EF1780 +:103D0400AC0A148A024CF0DF0EA91489318EB11268 +:103D1400AC0A14A9146299AC0A14CA0200AC0A14BD +:103D2400CA03101004C6D7ED683D717BFAC7D55895 +:103D3400FC61F831542227715322D558FC61E8B054 +:103D440058FC717AFA5600664C0BDD1272F3311C82 +:103D54007934FDCEFC0061CAFDC73D86EFE9717A76 +:103D6400FAF2C6D7C75600664C0ADE0BF0317E1253 +:103D7400F6785AFC86EFF0C6D7C7C1C1FBF8FFCC72 +:103D840001008C014C0ADE36717BFA8C01F0317E25 +:103D9400045AFC14A96168DF09AC02B9717AFAF219 +:103DA400EF1D8C01F0317E12795AFC614902DF0665 +:103DB400717AFAE2EF09717AFA615901EFC4E210FB +:103DC40004C6D7C72004FBF8FFF6425AFC61F8ED9D +:103DD400AC3E717BFA9C038C034C0ADE3C8C03F0F2 +:103DE400317E045AFC14A96168DF05717AFAEF295F +:103DF400717AFA8C0372F3311C795AFCCEFC00619F +:103E0400CA629C02D1DF0A8C03F0317E12E6785A32 +:103E1400FC717BFA615903EFBECC0200CC01018C2A +:103E240002F0317E045AFC14A96168DD7B8C02F037 +:103E3400317E12795AFCE743DF688C014C0ADE625A +:103E44008C01F0317E12795AFCE743DD50717BFA24 +:103E54008C01F0317E045AFC14A96168DF1B61698E +:103E640001717BFA8C01F0317E12F6785AFC717A7A +:103E7400FA8C024E01DCE7EF2F8C01F0317E045AFC +:103E8400FC14A9128C02F0317E33785AFC8C01F0B8 +:103E9400317E12E6785AFC615902717AFA6159014D +:103EA400EF98615902ED233E00F21004C6D7C720F3 +:103EB40006FBF8FF3419FCC55006C150A8C15030A8 +:103EC400FD4D031006D2DD1DA06EFC406EFC08DE25 +:103ED40003E2EF5A3414FC895CFC99FD7B3F7110BA +:103EE400E2FBF2EF49F56EFC8F14FC5C01D1DD2698 +:103EF400401EF903DF205010C180FD0539C0C736CC +:103F0400100571D4C6DE0F17C15006C150A8C150A8 +:103F140030FD4D031006401EF901DD11401EF90568 +:103F2400DD0B8F14FC5C02D161E8FDA645F210069E +:103F3400C6D7D915FCC15030FD2303C0629F18FCBD +:103F44007130E5FB8FEDFB5C08D1DF06716307710F +:103F54006B27F2D7D918FCC1D917FCC15030FDBF6B +:103F64000310047130E5FB8FEDFB5C08D1DF0671B3 +:103F74006307716B27F2D7C7200AFBF8FF500FC104 +:103F84005030FD2303C04041FB02DF077110E2FB08 +:103F9400F2EF547118E2FBCC0700CC0812CC098074 +:103FA4008F14FC5C03D1DF08717AD5CC0607EF06C9 +:103FB400717BD5CC062F17040600C15004C150A054 +:103FC400C15030FDF5031006C736100571D4C6DEA6 +:103FD40015401EF903DF0F17C15006C150A8C15088 +:103FE40030FD4D031006F2100AC6D7C7401EF90271 +:103FF400DF04F6BF72FC8F4AFDB04AFDD161E8EDE3 +:104004000041CF4AFD048F1EF9318FE723DD0B24D5 +:10401400020024030061C8ED00413027004272FC15 +:10402400DF0AE0C15010FD0539C0EF2530C0004261 +:1040340072FCDF0B5002C15010FD0539C0EF128F26 +:10404400F8FB5009D60480004272FC61D87120202C +:10405400F931340709717322F6BF72FCEF1731741A +:104064002206F6BF72FCEF0DA272FCF64272FCDF70 +:104074000490BF72FC8F21F9318FE7240000DD0624 +:1040840023DD0D23DF1236100571C4710123EF0BFC +:10409400710402710123EF037102233102231A40D8 +:1040A40074FC0361D8A074FC4074FC02DF0E50045D +:1040B400C15010FD0539C0EF03F574FC3104231A17 +:1040C4004076FC0361D8A076FC4076FC02DF0E50FB +:1040D40008C15010FD0539C0EF03F576FC314207E5 +:1040E400184075FC0361D8A075FC4075FC02DF0C18 +:1040F4005010C1FD0539C0EF03F575FCC6D7C736AE +:10410400100571D4DE0730B23EFD7D3DD2401EF96C +:1041140003DF1A3122070630FB2CFD7D3D311423C9 +:104124000C7113235080C15012FD0539C0401EF993 +:1041340003DD05F6BD1AEF25D500FCDF09F6461AA6 +:10414400DD1BB61AEF17D9FCFBF1461ADD0FD9FCBB +:10415400FB12AD1A43DE04A61AEF02B61AC6D7C77D +:104164008FF4FB76F5F4FB5C10D161E871322366C1 +:104174005C0FD1DD67665C01D1DD05F51EF9EF5CEE +:10418400665C02D1DD15E0C15003C15084FDBF035C +:104194001004711300711B20710303665C08D1DDE8 +:1041A40005710303EF1A665C04D1DD147113007109 +:1041B4001B20312423037103033435FC895CFC99EF +:1041C4005005FD95027102035003C1C15084FDBF27 +:1041D400031004711A20712323FDF82DF2C6D7C7EA +:1041E400364105718461D8ED87423641057194DE0C +:1041F4000771405005CEABAC31B2D104E2ED96422A +:10420400713BD1CEABAC4018F909DE77D518F9DF94 +:10421400618F20F93133088F21F99F4005EF04CFD6 +:10422400400504F0C15084FD2303C0629F7AFC8FD3 +:104234001EFD9F7BFC367CFCC75002C15008C15058 +:104244006CFD4D0310068F78FC9F7EFC8F02F99F56 +:104254007FFC711420E661301271042061DC311995 +:104264006162629F80FC8F20F93169317A9F81FC01 +:10427400EF0BD918F9F1124979FC9F4005A018F900 +:10428400E2EF0F7160500571485005713BD5F51888 +:10429400F9F2C6D7C78F1EF9318FE724000061F801 +:1042A400ED3B4423DD1B2361F8ED50432361F8ED1E +:1042B400DA432361F8ED16442361F8EDAC44ED0FC5 +:1042C40045D51FF9DF2BF64272FCDD05F54CFDEFF9 +:1042D40003A04CFD404CFD65DC09F51EF97152222A +:1042E400ED1245AF72FC440A0061D8ED1245E51F9A +:1042F400F9717222F54CFDF5F7FBFD1A05712320C7 +:10430400FDAE244021F903DF09715222F51EF9EDB7 +:104314001245FD082840E1FB9BDE09715222F51E7F +:10432400F9ED1245FD342CD2DD09715222F51EF946 +:10433400ED1245401FF901DF05F5FDFBEF04CFFD4C +:10434400FB03CF1EF902FD092CED1245CF35000207 +:10435400CF37001DCF120510FD1E2EFD7E2E714A93 +:104364009DFD4A39FDDB34F537FF712BE0F51FF96C +:10437400715222CBE43FEFCBE6F6F0FD1A05713B18 +:10438400D48F20F93105305004C15084FD2303C07B +:10439400625C03318E315D34E3FB896168995002BC +:1043A400C15084FD2303C0D2DD067170E3FBEF042A +:1043B4007178E3FBFDAE24FD352F710820F9CF1E83 +:1043C400F9038FD6FB5C02D1DD095080C15010FD8A +:1043D4000539C0ED1245FD144531A4E020712BE0F0 +:1043E40031020C05FD8E45EF145027C15005C15014 +:1043F40084FDBF031004CF1EF9047152223134230B +:104404000BA084FCD584FC61F8FD8E45FD8145ED4F +:104414001245FD144531020C18F0C15005C15084F9 +:10442400FDBF0310045005FD9502FD8E45CF1EF916 +:1044340003FD8145ED1245CFFDFB03F5FEFBF500C1 +:10444400FC711221F6426CFF61E8ED1245712820DF +:10445400F9F514FCFD7B3FFDBD2FFD752EFDD32E1C +:10446400714B9DF5E4FBF5E5FBF5E6FBF5E7FB3168 +:10447400642002EFFACE3708CBE4BFFFCBE6FFF1AE +:10448400CED4FFCF370009F51205F6BEE0BEE2BE7A +:10449400D0716A27FDB12CFD8305F54CFDCF1EF9C3 +:1044A40005717222F6BF72FC3102071BFDAE24AF08 +:1044B40072FC440A00DC06E51FF9E51EF9D521F972 +:1044C400DD4CFD8305EF47F51FF9FD8305FD7324DE +:1044D40071730171320431120502EFFA71430271F2 +:1044E400032071222031949E02EFFA712AE7CEA4B0 +:1044F40009F5F30061FD31040703717322E5F3004C +:10450400CEA408712BE7E51EF9EF0300EFFDC6D733 +:10451400D585FCDF1E310200195003C15084FD23F0 +:1045240003C0625C01D1DF07F51EF9715222D7E5A1 +:1045340085FCD74085FCF0DF083104003FF585FC9D +:10454400D74085FCC8DF0BF51EF9715222CF85FCDC +:10455400F0D731020004A085FCD7F0C15004C1504B +:1045640084FDBF0310048FE3FB5C9F9FE3FB71108A +:10457400F4FB306341FD7D3DCF85FCF0D78F20F9FE +:10458400312506F51EF9715222D7713323F584FCC7 +:10459400717207FDFF02FDFF02717307D7FDF0057D +:1045A400F2D7C7200CFBF8FF8F1AFCF0F919FCF3C3 +:1045B40003FD562013BC048F1CFCF0F91BFCF30311 +:1045C400FD562013BC028F1EFCF0F91DFCF303FD05 +:1045D400562013BBAC04BDD8F6BDDAAC04311EBD05 +:1045E400DCF6BDDEFD5F0DADD8BDDCADDABDDEAC05 +:1045F40002BDD8F6BDDAAC02311EDADCC3DADEC3A2 +:10460400BDDCF6BDDEFD5F0DC0BDDEC0BDDCADDED4 +:10461400FDD50EADD8BDDCADDABDDEABBDD8F6BD83 +:10462400DAAB311EDADCC3DADEC3BDDCF6BDDEFD97 +:104634005F0DC0BDDEC0BDDCADDEFDD50EDADAAD8A +:10464400D8FD034AC3C58F12FD5C3FF0317E04924E +:10465400FC14C2C0B9A012FDF6BC08BC0A9C078CAD +:10466400074C2EDD3E8F12FD0E0770F161DC605C9D +:104674003FF0317E127992FCBDD8F6BDDA8C077317 +:10468400097A23318FBDDC70BDDEFD5F0DAC08BD42 +:10469400DCAC0AFDD50EADDABC0AADD8BC08615954 +:1046A40007EFBCAC08BDD8AC0ABDDAC9DC0004F61F +:1046B400FD290EC9DCFFFFF6FD3E0FADD8BF8CFC13 +:1046C400AF86FC428CFCDD12AF88FCBF8AFCAF864F +:1046D400FCBF88FCAF8CFCBF86FCAF88FC428AFC24 +:1046E400DC50AF86FC4288FCDE48AF4EFD4286FCBF +:1046F400DE404052FD16DC1F4052FDA0DE168F8EB8 +:10470400FC4F52FDDE0EAF86FC2290FC4469106122 +:10471400C8FD7F47F552FDAF86FC445146DC0BAF24 +:1047240086FC241027BF50FDEF1930F82ABF50FD36 +:10473400EF114052FDFFDD03E6EF01F63452FD892F +:10474400610899AF8AFC4288FCDC1BAF88FC428676 +:10475400FCDE13AF86FC4250FDDE0BF58EFCAF860B +:10476400FCBF90FCEF11408EFCFFDD03E6EF01F689 +:10477400348EFC89610899100CC6D7C72006FBF853 +:10478400FFA01FFCD51FFCDF1CA020FCD520FCDFF4 +:1047940014A021FCD521FCDF0CCF1FFCFFCF20FC93 +:1047A400FFCF21FCFF717BFA710A9E31929E02EFCA +:1047B400FA8E98FD520F9C039F16FD8E949F53FD15 +:1047C4008E969F54FD8E979F55FD8E939F14FD8E5C +:1047D400929F15FDFD604913BC04BDD8F6BDDA46B1 +:1047E400DADF03B146D8DF198C035C0391DF03E6FB +:1047F400EF01F6046D01313D120103B1BC0461699E +:10480400038F56FD4E03DF12AF18FD614904DE40ED +:10481400AC042218FDFD8148EF368C03318EB112B1 +:10482400D956FDF143DF1E8C035C0391DF03E6EFF1 +:1048340001F6046D01313D1201032218FD610904E2 +:10484400FD8148EF0B8F56FD4E03DE04F6FD8148D3 +:104854008C039F56FDAC04BF18FDD913FDF1010470 +:1048640022F9BB14A944FFFFDF04E6B9EF0BAB1434 +:10487400A944FEFFDD03A9A1B91006C6D7C71617C0 +:1048840044A90061C836A800A013FD4013FDA86127 +:10489400C8F513FDF913FDF3311CF67822F9B7F6C8 +:1048A40047DFE5C6D7C756A89666F0317E12F6B143 +:1048B4007822F966D1DFF1F51FFCF520FCF521FC27 +:1048C400F513FDC6D7714323D7C72004FBF8FFD9DE +:1048D40018F9F1E7240000DD1123DD1C23DD212379 +:1048E400DD2623DD2F23DD34EF3A8F13FD9F1AFDE0 +:1048F400A018F9F953FDEF60A018F9F954FDEF5829 +:10490400A018F9F955FDEF50A018F98F16FDFD6CAC +:104914000F72EF44A018F9F914FDEF3CA018F9F94F +:1049240015FDEF34F91AFDF3311C7922F9BB31423C +:1049340023058B9C03EF128C019C03D51AFDDF0623 +:10494400CF1AFDA7EF03B01AFD718071472361DC14 +:1049540061FB7141238C03721004C6D7C72008FB86 +:10496400F8FF8E989C058E979C048E969C038E94DB +:104974009C028E939C018E929B710B9E717AFA8C91 +:1049840005FD520F9C058C04FD520F9C048C03FD05 +:10499400520F9C038C02FD520F9C028C04F0317E5A +:1049A4001279AA23BC068C055C03D1DF158C044C58 +:1049B40003DE0C8C044C02DF098C034C1D61F8618E +:1049C40079068C03318EB1610906BC06313D1201B2 +:1049D40003BC068C060E02708C071C00BC068F24D8 +:1049E400FC4E01DC0D8C014F24FCDC0B8F25FC4DAF +:1049F400DE05AC0612EF04AC06B1121008C6D7C728 +:104A0400C3C12008FBF8FFF661490A61F86149084F +:104A1400DF07F7340000EDA04AE6BC04F6BC06ACA0 +:104A24000ABC02AC08BBAC06614902AC0461F86183 +:104A34004900DE28AC04BDD8AC06BDDAE1FDE40EC5 +:104A4400ADDABC06ADD8BC04ABBDD8AC02BDDAE16E +:104A5400FDFF0EADDABC02ADD8BBEFCAAC06BC029A +:104A6400AC04BBAC08BDD8AC0ABDDAAC04BDDCAC4C +:104A740006FD620EAC04BDDCAC06FDD50EE1FDFF07 +:104A84000EADDABC06ADD8BC04AC06614902AC0478 +:104A940061F8614900DCC5AC0214AB12100CC6D736 +:104AA40061FC61FCC1C3C5C7520C929269D4FEC1BA +:104AB400DFF88EFD708EFCC1717AFA401EF903DFB7 +:104AC4000630FB2CFD7D3DC09EFC609EFD34D4FE73 +:104AD4005206C0B9A5A592DFF9C6C4C2C061FC6183 +:104AE400DF520C929269D4FEC1DFF88EFD708EFC09 +:104AF400C1717AFAC736410571A4C6DC51F520FDAF +:104B04007148500571605005310422367162077195 +:104B140003228FE4FB5FECFBD1DF1B8FE5FB5FED32 +:104B2400FBD1DF128FE6FB5FEEFBD1DF098FE7FBE2 +:104B34005FEFFBD1DD0C31620702EFFA716307719D +:104B44006B27FDC948FD8F34F518F9ED674CC7365E +:104B540041057184C6DE0DF520FD71485005FD8FB9 +:104B640034ED674CC73641057194C6DE154020FD0F +:104B740003DD0C4020FD04DD064020FD0161F8F555 +:104B840020FDD920FDF1E7240000DD0823DD1323F7 +:104B9400DD39EF6071405005E520FD71505005EDA1 +:104BA400674C8F40059F19F99F1CF9D919F9FD57D6 +:104BB40038629F1BF94019F97FDD06CF20FD02EF13 +:104BC40003F520FD71505005ED674CC73641057162 +:104BD40094C6DE1CC736410571C4C6DE06CF20FD6F +:104BE40003EF11F520FD7148500571605005EF7316 +:104BF400CF20FD044020FD03DF138F1BF99F4005E8 +:104C0400D91BF9C1D919F9FDD638C0EF108F400569 +:104C140076C7D919F9FD1435C071505005D91CF95E +:104C2400F1242900DD2D240400DD28242200DD23C5 +:104C3400241100DD0C240100DD19241E00DD14EF15 +:104C44000C4019F960DF0CCF19F961EF06F518F97A +:104C5400A019F94020FD03DF0AD919F9FD5738627C +:104C64009F1BF9C09EFC609EFD34D4FE5206C0B961 +:104C7400A5A592DFF961FCC1C3C5C7520C92926924 +:104C8400D4FEC1DFF88EFD708EFCC1F616717AFA7F +:104C9400714AE5717BBD51405F0401D1DD05A7F682 +:104CA40047DFF3300400BF2401F6BF2A01300B0BA9 +:104CB400BF2801FDFF02300B0FBF2801FDFF0230AA +:104CC4000F0FBF2801710AE6716320C09EFC609E2D +:104CD400FD34D4FE5206C0B9A5A592DFF9C6C4C2FC +:104CE400C061FCC1C3C5C7520C929269D4FEC1DF36 +:104CF400F88EFD708EFCC1717AFAD540FBDD0EEBA7 +:104D04003EFB899E44A23EFBB040FBEF2B710AE6BA +:104D1400300400BF2401F6BF2A01300B0BBF280169 +:104D2400FDFF02300B0FBF2801FDFF02300F0FBF44 +:104D34002801715320716320C09EFC609EFD34D411 +:104D4400FE5206C0B9A5A592DFF9C6C4C2C061FC73 +:104D540061EF520C929269D4FEC1DFF88EFD708E21 +:104D6400FCC12008FBF8FF71503002CEABACCC0183 +:104D740000F6BC0231B2E20F617902F6614902DF4A +:104D8400F371603002EF7E8E519B713BE28B5C02CB +:104D9400D1DD1D8B5C08D1DF0971503002CC0100DC +:104DA400EFCF8C0770FDBC39629E50CC0102EFC17D +:104DB4008B5C03D1DF408E509C05715030028C0116 +:104DC400D1DF0E8C0570FD1F3A629C07CC0101EF08 +:104DD400318C014C02DF0671603002EF28CF3402BF +:104DE4005A716030028C0570C18C0770FD5839C04F +:104DF400CF34024AEF0F8B5C01D1DD0671603002C3 +:104E0400EF03ED754D1008C09EFC609EFD34D4FE8A +:104E14005206C0B9A5A592DFF961FCC1710A9E31A1 +:104E2400929E02EFFA8F0EFC4F96FFDF358F0FFC38 +:104E34004F97FFDF2D8F10FC4F98FFDF258FEDFB81 +:104E44005C04D1DF1D7120E5FB716307716B2740A2 +:104E54001EF905DD06401EF901DF07CF1FF902E543 +:104E64001EF9710B9EC061FCA058FC61FCC1C3C556 +:104E7400C7520C929269D4FEC1DFF88EFD708EFC8D +:104E8400C1C1FBF8FF8D1F9C018E31318EE72406D2 +:104E940000DD0823DD0F23DD25EF45717AFA8C014F +:104EA4009F44FCEF3B717AFA4021F901DF078C0142 +:104EB4009F43FCEF2B51FF2E019F43FCEF22717A9D +:104EC400FA8C019F02F98FE2FB5C01D1DF12401ED4 +:104ED400F903DD06401EF904DF06304A27FD7D3D57 +:104EE4004031FF09DE05A031FFEF197158F0007160 +:104EF40012224057FC02DF03F6EF05D957FCF1A15B +:104F0400609F57FC710BE3C0C09EFC609EFD34D4CF +:104F1400FE5206C0B9A5A592DFF9C6C4C2C061FCA1 +:104F240061FF520C929269D4FEC1DFF88EFD708E3F +:104F3400FCC1717AFA8F14FC5C03D1DD19401EF9AF +:104F440003DD06401EF904DF0D36100571D4DE06BC +:104F540030B23EFD7D3DC09EFC609EFD34D4FE52C9 +:104F640006C0B9A5A592DFF961FC61FC61FC61FC96 +:104F740061FC61FC61FC61FC61FC61FC61FC61FC45 +:104F840061FC61FC61FC61FC61FC61FC61FC61FC35 +:104F940061FC61FC61FC61FC61FC61FC61FC61FC25 +:024FA40061FCAE +:0A4FF60031313A33383A333300000A :00000001FF  \ No newline at end of file diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index 959d827..235878c 100644 Binary files a/trunk/bsr.lmf and b/trunk/bsr.lmf differ diff --git a/trunk/bsr_k0r.map b/trunk/bsr_k0r.map index 5db1a30..7961fdf 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.31 Date:14 Sep 2010 Page: 1 +78K0R Linker W1.31 Date:15 Sep 2010 Page: 1 Command: -yC:\Program Files\NEC Electronics Tools\DEV -_msgoff -obsr.l mf ..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10 @@ -24,8 +24,8 @@ Direc-file:bsr_mcu.dr *** Link information *** 66 output segment(s) - 3E50H byte(s) real data - 5493 symbol(s) defined + 3E04H byte(s) real data + 5416 symbol(s) defined *** Memory map *** @@ -100,55 +100,55 @@ Direc-file:bsr_mcu.dr 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG ?OCDSTAD 000CEH 0000AH CSEG - LDR_CODE 000D8H 0090FH CSEG + LDR_CODE 000D8H 008E7H CSEG LDR_CODE loader 000D8H 001E1H - LDR_CODE main 002B9H 0006EH - LDR_CODE WDT 00327H 00000H - LDR_CODE i2c_mcu 00327H 002F1H + LDR_CODE main 002B9H 00046H + LDR_CODE WDT 002FFH 00000H + LDR_CODE i2c_mcu 002FFH 002F1H LDR_CODE self_flash - 00618H 00349H + 005F0H 00349H LDR_CODE task_debug - 00961H 00001H + 00939H 00001H LDR_CODE task_status - 00962H 00085H - FSL_CODE 009E7H 00322H CSEG + 0093AH 00085H + FSL_CODE 009BFH 00322H CSEG FSL_CODE fsl_block_cmd - 009E7H 0002BH + 009BFH 0002BH FSL_CODE fsl_block_check - 00A12H 00013H + 009EAH 00013H FSL_CODE fsl_common - 00A25H 0014FH + 009FDH 0014FH FSL_CODE fsl_reset - 00B74H 00001H + 00B4CH 00001H FSL_CODE fsl_si_ibf - 00B75H 00064H + 00B4DH 00064H FSL_CODE fsl_phySwap - 00BD9H 0004DH + 00BB1H 0004DH FSL_CODE fsl_si_common - 00C26H 00061H - FSL_CODE fsl_swap 00C87H 00030H + 00BFEH 00061H + FSL_CODE fsl_swap 00C5FH 00030H FSL_CODE fsl_write - 00CB7H 00052H - @@LCODE 00D09H 002AFH CSEG - @@LCODE @cstart 00D09H 0006DH - @@LCODE @imul 00D76H 00011H - @@LCODE @lumul 00D87H 0002BH - @@LCODE @isdiv 00DB2H 00022H - @@LCODE @iudiv 00DD4H 0002DH - @@LCODE @isrem 00E01H 00021H - @@LCODE @iurem 00E22H 0002FH - @@LCODE @lsdiv 00E51H 00039H - @@LCODE @ludiv 00E8AH 0003FH - @@LCODE @divuw 00EC9H 00034H - @@LCODE @ladd 00EFDH 0000FH - @@LCODE @llsh 00F0CH 0001BH - @@LCODE @lursh 00F27H 0001FH - @@LCODE @iscmp 00F46H 0000CH - @@LCODE @lscmp 00F52H 00014H - @@LCODE @lband 00F66H 00014H - @@LCODE @bcdtob 00F7AH 0001AH - @@LCODE @bbcd 00F94H 00024H -* gap * 00FB8H 0003EH + 00C8FH 00052H + @@LCODE 00CE1H 002AFH CSEG + @@LCODE @cstart 00CE1H 0006DH + @@LCODE @imul 00D4EH 00011H + @@LCODE @lumul 00D5FH 0002BH + @@LCODE @isdiv 00D8AH 00022H + @@LCODE @iudiv 00DACH 0002DH + @@LCODE @isrem 00DD9H 00021H + @@LCODE @iurem 00DFAH 0002FH + @@LCODE @lsdiv 00E29H 00039H + @@LCODE @ludiv 00E62H 0003FH + @@LCODE @divuw 00EA1H 00034H + @@LCODE @ladd 00ED5H 0000FH + @@LCODE @llsh 00EE4H 0001BH + @@LCODE @lursh 00EFFH 0001FH + @@LCODE @iscmp 00F1EH 0000CH + @@LCODE @lscmp 00F2AH 00014H + @@LCODE @lband 00F3EH 00014H + @@LCODE @bcdtob 00F52H 0001AH + @@LCODE @bbcd 00F6CH 00024H +* gap * 00F90H 00066H MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -194,7 +194,7 @@ Direc-file:bsr_mcu.dr @@CNSTL @bcdtob 02000H 0000AH @@CNSTL 0200AH 00010H CSEG PAGE64KP @@CNSTL @bbcd 0200AH 00010H - @@R_INIT 0201AH 0003EH CSEG UNIT64KP + @@R_INIT 0201AH 0003CH CSEG UNIT64KP @@R_INIT @cstart 0201AH 00000H @@R_INIT loader 0201AH 00000H @@R_INIT pm 0201AH 00002H @@ -208,136 +208,136 @@ Direc-file:bsr_mcu.dr @@R_INIT rtc 02024H 00000H @@R_INIT vreg_ctr 02024H 00000H @@R_INIT vreg_twl 02024H 00000H - @@R_INIT adc 02024H 0000EH - @@R_INIT renge 02032H 00016H - @@R_INIT accero 02048H 00000H + @@R_INIT adc 02024H 0000CH + @@R_INIT renge 02030H 00016H + @@R_INIT accero 02046H 00000H @@R_INIT self_flash - 02048H 00000H - @@R_INIT sw 02048H 00002H + 02046H 00000H + @@R_INIT sw 02046H 00002H @@R_INIT task_debug - 0204AH 00000H + 02048H 00000H @@R_INIT task_misc - 0204AH 00000H - @@R_INIT task_sys 0204AH 00002H + 02048H 00000H + @@R_INIT task_sys 02048H 00002H @@R_INIT pedo_alg_thre_det2 - 0204CH 0000AH - @@R_INIT ini_VECT 02056H 00000H + 0204AH 0000AH + @@R_INIT ini_VECT 02054H 00000H @@R_INIT task_status - 02056H 00002H - @@R_INIT @rom 02058H 00000H - @@R_INIS 02058H 00000H CSEG UNIT64KP - @@R_INIS @cstart 02058H 00000H - @@R_INIS loader 02058H 00000H - @@R_INIS pm 02058H 00000H - @@R_INIS i2c_ctr 02058H 00000H - @@R_INIS main 02058H 00000H - @@R_INIS magic 02058H 00000H - @@R_INIS WDT 02058H 00000H - @@R_INIS i2c_mcu 02058H 00000H - @@R_INIS i2c_twl 02058H 00000H - @@R_INIS led 02058H 00000H - @@R_INIS rtc 02058H 00000H - @@R_INIS vreg_ctr 02058H 00000H - @@R_INIS vreg_twl 02058H 00000H - @@R_INIS adc 02058H 00000H - @@R_INIS renge 02058H 00000H - @@R_INIS accero 02058H 00000H + 02054H 00002H + @@R_INIT @rom 02056H 00000H + @@R_INIS 02056H 00000H CSEG UNIT64KP + @@R_INIS @cstart 02056H 00000H + @@R_INIS loader 02056H 00000H + @@R_INIS pm 02056H 00000H + @@R_INIS i2c_ctr 02056H 00000H + @@R_INIS main 02056H 00000H + @@R_INIS magic 02056H 00000H + @@R_INIS WDT 02056H 00000H + @@R_INIS i2c_mcu 02056H 00000H + @@R_INIS i2c_twl 02056H 00000H + @@R_INIS led 02056H 00000H + @@R_INIS rtc 02056H 00000H + @@R_INIS vreg_ctr 02056H 00000H + @@R_INIS vreg_twl 02056H 00000H + @@R_INIS adc 02056H 00000H + @@R_INIS renge 02056H 00000H + @@R_INIS accero 02056H 00000H @@R_INIS self_flash - 02058H 00000H - @@R_INIS sw 02058H 00000H + 02056H 00000H + @@R_INIS sw 02056H 00000H @@R_INIS task_debug - 02058H 00000H + 02056H 00000H @@R_INIS task_misc - 02058H 00000H - @@R_INIS task_sys 02058H 00000H + 02056H 00000H + @@R_INIS task_sys 02056H 00000H @@R_INIS pedo_alg_thre_det2 - 02058H 00000H - @@R_INIS ini_VECT 02058H 00000H + 02056H 00000H + @@R_INIS ini_VECT 02056H 00000H @@R_INIS task_status - 02058H 00000H - @@R_INIS @rom 02058H 00000H - @@CALT 02058H 00000H CSEG - @@CALT @cstart 02058H 00000H - @@CALT loader 02058H 00000H - @@CALT pm 02058H 00000H - @@CALT i2c_ctr 02058H 00000H - @@CALT main 02058H 00000H - @@CALT magic 02058H 00000H - @@CALT WDT 02058H 00000H - @@CALT i2c_mcu 02058H 00000H - @@CALT i2c_twl 02058H 00000H - @@CALT led 02058H 00000H - @@CALT rtc 02058H 00000H - @@CALT vreg_ctr 02058H 00000H - @@CALT vreg_twl 02058H 00000H - @@CALT adc 02058H 00000H - @@CALT renge 02058H 00000H - @@CALT accero 02058H 00000H + 02056H 00000H + @@R_INIS @rom 02056H 00000H + @@CALT 02056H 00000H CSEG + @@CALT @cstart 02056H 00000H + @@CALT loader 02056H 00000H + @@CALT pm 02056H 00000H + @@CALT i2c_ctr 02056H 00000H + @@CALT main 02056H 00000H + @@CALT magic 02056H 00000H + @@CALT WDT 02056H 00000H + @@CALT i2c_mcu 02056H 00000H + @@CALT i2c_twl 02056H 00000H + @@CALT led 02056H 00000H + @@CALT rtc 02056H 00000H + @@CALT vreg_ctr 02056H 00000H + @@CALT vreg_twl 02056H 00000H + @@CALT adc 02056H 00000H + @@CALT renge 02056H 00000H + @@CALT accero 02056H 00000H @@CALT self_flash - 02058H 00000H - @@CALT sw 02058H 00000H + 02056H 00000H + @@CALT sw 02056H 00000H @@CALT task_debug - 02058H 00000H + 02056H 00000H @@CALT task_misc - 02058H 00000H - @@CALT task_sys 02058H 00000H + 02056H 00000H + @@CALT task_sys 02056H 00000H @@CALT pedo_alg_thre_det2 - 02058H 00000H - @@CALT ini_VECT 02058H 00000H + 02056H 00000H + @@CALT ini_VECT 02056H 00000H @@CALT task_status - 02058H 00000H - @@RLINIT 02058H 00000H CSEG UNIT64KP - @@RLINIT loader 02058H 00000H - @@RLINIT pm 02058H 00000H - @@RLINIT i2c_ctr 02058H 00000H - @@RLINIT main 02058H 00000H - @@RLINIT magic 02058H 00000H - @@RLINIT WDT 02058H 00000H - @@RLINIT i2c_mcu 02058H 00000H - @@RLINIT i2c_twl 02058H 00000H - @@RLINIT led 02058H 00000H - @@RLINIT rtc 02058H 00000H - @@RLINIT vreg_ctr 02058H 00000H - @@RLINIT vreg_twl 02058H 00000H - @@RLINIT adc 02058H 00000H - @@RLINIT renge 02058H 00000H - @@RLINIT accero 02058H 00000H + 02056H 00000H + @@RLINIT 02056H 00000H CSEG UNIT64KP + @@RLINIT loader 02056H 00000H + @@RLINIT pm 02056H 00000H + @@RLINIT i2c_ctr 02056H 00000H + @@RLINIT main 02056H 00000H + @@RLINIT magic 02056H 00000H + @@RLINIT WDT 02056H 00000H + @@RLINIT i2c_mcu 02056H 00000H + @@RLINIT i2c_twl 02056H 00000H + @@RLINIT led 02056H 00000H + @@RLINIT rtc 02056H 00000H + @@RLINIT vreg_ctr 02056H 00000H + @@RLINIT vreg_twl 02056H 00000H + @@RLINIT adc 02056H 00000H + @@RLINIT renge 02056H 00000H + @@RLINIT accero 02056H 00000H @@RLINIT self_flash - 02058H 00000H - @@RLINIT sw 02058H 00000H + 02056H 00000H + @@RLINIT sw 02056H 00000H @@RLINIT task_debug - 02058H 00000H + 02056H 00000H @@RLINIT task_misc - 02058H 00000H - @@RLINIT task_sys 02058H 00000H + 02056H 00000H + @@RLINIT task_sys 02056H 00000H @@RLINIT pedo_alg_thre_det2 - 02058H 00000H - @@RLINIT ini_VECT 02058H 00000H + 02056H 00000H + @@RLINIT ini_VECT 02056H 00000H @@RLINIT task_status - 02058H 00000H - @@RLINIT @rom 02058H 00000H - @@CODEL 02058H 00000H CSEG - @@CODEL pm 02058H 00000H - @@CODEL i2c_ctr 02058H 00000H - @@CODEL magic 02058H 00000H - @@CODEL i2c_twl 02058H 00000H - @@CODEL led 02058H 00000H - @@CODEL rtc 02058H 00000H - @@CODEL vreg_ctr 02058H 00000H - @@CODEL vreg_twl 02058H 00000H - @@CODEL adc 02058H 00000H - @@CODEL renge 02058H 00000H - @@CODEL accero 02058H 00000H - @@CODEL sw 02058H 00000H + 02056H 00000H + @@RLINIT @rom 02056H 00000H + @@CODEL 02056H 00000H CSEG + @@CODEL pm 02056H 00000H + @@CODEL i2c_ctr 02056H 00000H + @@CODEL magic 02056H 00000H + @@CODEL i2c_twl 02056H 00000H + @@CODEL led 02056H 00000H + @@CODEL rtc 02056H 00000H + @@CODEL vreg_ctr 02056H 00000H + @@CODEL vreg_twl 02056H 00000H + @@CODEL adc 02056H 00000H + @@CODEL renge 02056H 00000H + @@CODEL accero 02056H 00000H + @@CODEL sw 02056H 00000H @@CODEL task_misc - 02058H 00000H - @@CODEL task_sys 02058H 00000H + 02056H 00000H + @@CODEL task_sys 02056H 00000H @@CODEL pedo_alg_thre_det2 - 02058H 00000H - @@CODEL ini_VECT 02058H 00000H - @@LCODEL 02058H 00008H CSEG - @@LCODEL abs 02058H 00008H -* gap * 02060H 000A0H + 02056H 00000H + @@CODEL ini_VECT 02056H 00000H + @@LCODEL 02056H 00008H CSEG + @@LCODEL abs 02056H 00008H +* gap * 0205EH 000A2H MGC_MIMI 02100H 0000AH CSEG AT MGC_MIMI magic 02100H 0000AH @@CNST 0210AH 002BAH CSEG @@ -370,53 +370,53 @@ Direc-file:bsr_mcu.dr @@CNST ini_VECT 023C4H 00000H @@CNST task_status 023C4H 00000H - ROM_CODE 023C4H 02702H CSEG + ROM_CODE 023C4H 026E0H CSEG ROM_CODE pm 023C4H 00A5AH ROM_CODE i2c_ctr 02E1EH 00060H ROM_CODE i2c_twl 02E7EH 0005EH - ROM_CODE led 02EDCH 0050CH - ROM_CODE rtc 033E8H 000E0H - ROM_CODE vreg_ctr 034C8H 0047CH - ROM_CODE vreg_twl 03944H 00122H - ROM_CODE adc 03A66H 002CCH - ROM_CODE renge 03D32H 00187H - ROM_CODE accero 03EB9H 0013DH - ROM_CODE sw 03FF6H 00113H + ROM_CODE led 02EDCH 00512H + ROM_CODE rtc 033EEH 000E0H + ROM_CODE vreg_ctr 034CEH 0047CH + ROM_CODE vreg_twl 0394AH 00122H + ROM_CODE adc 03A6CH 002BFH + ROM_CODE renge 03D2BH 00187H + ROM_CODE accero 03EB2H 0013DH + ROM_CODE sw 03FEFH 00113H ROM_CODE task_misc - 04109H 001B1H - ROM_CODE task_sys 042BAH 0030EH + 04102H 00196H + ROM_CODE task_sys 04298H 0030EH ROM_CODE pedo_alg_thre_det2 - 045C8H 004FEH - @@BASE 04AC6H 00502H CSEG BASE - @@BASE loader 04AC6H 00000H - @@BASE pm 04AC6H 0003FH - @@BASE i2c_ctr 04B05H 00198H - @@BASE main 04C9DH 00000H - @@BASE magic 04C9DH 00000H - @@BASE WDT 04C9DH 00000H - @@BASE i2c_mcu 04C9DH 000D9H - @@BASE i2c_twl 04D76H 000CBH - @@BASE led 04E41H 00000H - @@BASE rtc 04E41H 00052H - @@BASE vreg_ctr 04E93H 00000H - @@BASE vreg_twl 04E93H 00000H - @@BASE adc 04E93H 000B3H - @@BASE renge 04F46H 00000H - @@BASE accero 04F46H 0004AH + 045A6H 004FEH + @@BASE 04AA4H 00502H CSEG BASE + @@BASE loader 04AA4H 00000H + @@BASE pm 04AA4H 0003FH + @@BASE i2c_ctr 04AE3H 00198H + @@BASE main 04C7BH 00000H + @@BASE magic 04C7BH 00000H + @@BASE WDT 04C7BH 00000H + @@BASE i2c_mcu 04C7BH 000D9H + @@BASE i2c_twl 04D54H 000CBH + @@BASE led 04E1FH 00000H + @@BASE rtc 04E1FH 00052H + @@BASE vreg_ctr 04E71H 00000H + @@BASE vreg_twl 04E71H 00000H + @@BASE adc 04E71H 000B3H + @@BASE renge 04F24H 00000H + @@BASE accero 04F24H 0004AH @@BASE self_flash - 04F90H 00000H - @@BASE sw 04F90H 00000H + 04F6EH 00000H + @@BASE sw 04F6EH 00000H @@BASE task_debug - 04F90H 00000H + 04F6EH 00000H @@BASE task_misc - 04F90H 00000H - @@BASE task_sys 04F90H 00000H + 04F6EH 00000H + @@BASE task_sys 04F6EH 00000H @@BASE pedo_alg_thre_det2 - 04F90H 00000H - @@BASE ini_VECT 04F90H 00038H + 04F6EH 00000H + @@BASE ini_VECT 04F6EH 00038H @@BASE task_status - 04FC8H 00000H -* gap * 04FC8H 0002EH + 04FA6H 00000H +* gap * 04FA6H 00050H MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL magic 04FF6H 0000AH @@ -424,7 +424,7 @@ Direc-file:bsr_mcu.dr BASE ADDRESS=FF900H SIZE=00500H OUTPUT INPUT INPUT BASE SIZE SEGMENT SEGMENT MODULE ADDRESS - @@DATA FF900H 00414H DSEG BASEP + @@DATA FF900H 0041EH DSEG BASEP @@DATA @cstart FF900H 00002H @@DATA loader FF902H 00000H @@DATA pm FF902H 00016H @@ -447,171 +447,171 @@ Direc-file:bsr_mcu.dr @@DATA task_debug FFC78H 00000H @@DATA task_misc - FFC78H 00002H - @@DATA task_sys FFC7AH 00002H + FFC78H 0000CH + @@DATA task_sys FFC84H 00002H @@DATA pedo_alg_thre_det2 - FFC7CH 00096H - @@DATA ini_VECT FFD12H 00000H + FFC86H 00096H + @@DATA ini_VECT FFD1CH 00000H @@DATA task_status - FFD12H 00002H - @@DATA @rom FFD14H 00000H - @@INIT FFD14H 0003EH DSEG BASEP - @@INIT @cstart FFD14H 00000H - @@INIT loader FFD14H 00000H - @@INIT pm FFD14H 00002H - @@INIT i2c_ctr FFD16H 00002H - @@INIT main FFD18H 00000H - @@INIT magic FFD18H 00000H - @@INIT WDT FFD18H 00000H - @@INIT i2c_mcu FFD18H 00000H - @@INIT i2c_twl FFD18H 00000H - @@INIT led FFD18H 00006H - @@INIT rtc FFD1EH 00000H - @@INIT vreg_ctr FFD1EH 00000H - @@INIT vreg_twl FFD1EH 00000H - @@INIT adc FFD1EH 0000EH - @@INIT renge FFD2CH 00016H - @@INIT accero FFD42H 00000H + FFD1CH 00002H + @@DATA @rom FFD1EH 00000H + @@INIT FFD1EH 0003CH DSEG BASEP + @@INIT @cstart FFD1EH 00000H + @@INIT loader FFD1EH 00000H + @@INIT pm FFD1EH 00002H + @@INIT i2c_ctr FFD20H 00002H + @@INIT main FFD22H 00000H + @@INIT magic FFD22H 00000H + @@INIT WDT FFD22H 00000H + @@INIT i2c_mcu FFD22H 00000H + @@INIT i2c_twl FFD22H 00000H + @@INIT led FFD22H 00006H + @@INIT rtc FFD28H 00000H + @@INIT vreg_ctr FFD28H 00000H + @@INIT vreg_twl FFD28H 00000H + @@INIT adc FFD28H 0000CH + @@INIT renge FFD34H 00016H + @@INIT accero FFD4AH 00000H @@INIT self_flash - FFD42H 00000H - @@INIT sw FFD42H 00002H + FFD4AH 00000H + @@INIT sw FFD4AH 00002H @@INIT task_debug - FFD44H 00000H + FFD4CH 00000H @@INIT task_misc - FFD44H 00000H - @@INIT task_sys FFD44H 00002H + FFD4CH 00000H + @@INIT task_sys FFD4CH 00002H @@INIT pedo_alg_thre_det2 - FFD46H 0000AH - @@INIT ini_VECT FFD50H 00000H + FFD4EH 0000AH + @@INIT ini_VECT FFD58H 00000H @@INIT task_status - FFD50H 00002H - @@INIT @rom FFD52H 00000H - @@INIS FFD52H 00000H DSEG UNITP - @@INIS @cstart FFD52H 00000H - @@INIS loader FFD52H 00000H - @@INIS pm FFD52H 00000H - @@INIS i2c_ctr FFD52H 00000H - @@INIS main FFD52H 00000H - @@INIS magic FFD52H 00000H - @@INIS WDT FFD52H 00000H - @@INIS i2c_mcu FFD52H 00000H - @@INIS i2c_twl FFD52H 00000H - @@INIS led FFD52H 00000H - @@INIS rtc FFD52H 00000H - @@INIS vreg_ctr FFD52H 00000H - @@INIS vreg_twl FFD52H 00000H - @@INIS adc FFD52H 00000H - @@INIS renge FFD52H 00000H - @@INIS accero FFD52H 00000H + FFD58H 00002H + @@INIT @rom FFD5AH 00000H + @@INIS FFD5AH 00000H DSEG UNITP + @@INIS @cstart FFD5AH 00000H + @@INIS loader FFD5AH 00000H + @@INIS pm FFD5AH 00000H + @@INIS i2c_ctr FFD5AH 00000H + @@INIS main FFD5AH 00000H + @@INIS magic FFD5AH 00000H + @@INIS WDT FFD5AH 00000H + @@INIS i2c_mcu FFD5AH 00000H + @@INIS i2c_twl FFD5AH 00000H + @@INIS led FFD5AH 00000H + @@INIS rtc FFD5AH 00000H + @@INIS vreg_ctr FFD5AH 00000H + @@INIS vreg_twl FFD5AH 00000H + @@INIS adc FFD5AH 00000H + @@INIS renge FFD5AH 00000H + @@INIS accero FFD5AH 00000H @@INIS self_flash - FFD52H 00000H - @@INIS sw FFD52H 00000H + FFD5AH 00000H + @@INIS sw FFD5AH 00000H @@INIS task_debug - FFD52H 00000H + FFD5AH 00000H @@INIS task_misc - FFD52H 00000H - @@INIS task_sys FFD52H 00000H + FFD5AH 00000H + @@INIS task_sys FFD5AH 00000H @@INIS pedo_alg_thre_det2 - FFD52H 00000H - @@INIS ini_VECT FFD52H 00000H + FFD5AH 00000H + @@INIS ini_VECT FFD5AH 00000H @@INIS task_status - FFD52H 00000H - @@INIS @rom FFD52H 00000H - @@DATS FFD52H 00000H DSEG UNITP - @@DATS @cstart FFD52H 00000H - @@DATS loader FFD52H 00000H - @@DATS pm FFD52H 00000H - @@DATS i2c_ctr FFD52H 00000H - @@DATS main FFD52H 00000H - @@DATS magic FFD52H 00000H - @@DATS WDT FFD52H 00000H - @@DATS i2c_mcu FFD52H 00000H - @@DATS i2c_twl FFD52H 00000H - @@DATS led FFD52H 00000H - @@DATS rtc FFD52H 00000H - @@DATS vreg_ctr FFD52H 00000H - @@DATS vreg_twl FFD52H 00000H - @@DATS adc FFD52H 00000H - @@DATS renge FFD52H 00000H - @@DATS accero FFD52H 00000H + FFD5AH 00000H + @@INIS @rom FFD5AH 00000H + @@DATS FFD5AH 00000H DSEG UNITP + @@DATS @cstart FFD5AH 00000H + @@DATS loader FFD5AH 00000H + @@DATS pm FFD5AH 00000H + @@DATS i2c_ctr FFD5AH 00000H + @@DATS main FFD5AH 00000H + @@DATS magic FFD5AH 00000H + @@DATS WDT FFD5AH 00000H + @@DATS i2c_mcu FFD5AH 00000H + @@DATS i2c_twl FFD5AH 00000H + @@DATS led FFD5AH 00000H + @@DATS rtc FFD5AH 00000H + @@DATS vreg_ctr FFD5AH 00000H + @@DATS vreg_twl FFD5AH 00000H + @@DATS adc FFD5AH 00000H + @@DATS renge FFD5AH 00000H + @@DATS accero FFD5AH 00000H @@DATS self_flash - FFD52H 00000H - @@DATS sw FFD52H 00000H + FFD5AH 00000H + @@DATS sw FFD5AH 00000H @@DATS task_debug - FFD52H 00000H + FFD5AH 00000H @@DATS task_misc - FFD52H 00000H - @@DATS task_sys FFD52H 00000H + FFD5AH 00000H + @@DATS task_sys FFD5AH 00000H @@DATS pedo_alg_thre_det2 - FFD52H 00000H - @@DATS ini_VECT FFD52H 00000H + FFD5AH 00000H + @@DATS ini_VECT FFD5AH 00000H @@DATS task_status - FFD52H 00000H - @@DATS @rom FFD52H 00000H - FSL_DATA FFD52H 00010H DSEG UNITP + FFD5AH 00000H + @@DATS @rom FFD5AH 00000H + FSL_DATA FFD5AH 00010H DSEG UNITP FSL_DATA fsl_common - FFD52H 00010H - @@INITL FFD62H 00000H DSEG UNIT64KP - @@INITL loader FFD62H 00000H - @@INITL pm FFD62H 00000H - @@INITL i2c_ctr FFD62H 00000H - @@INITL main FFD62H 00000H - @@INITL magic FFD62H 00000H - @@INITL WDT FFD62H 00000H - @@INITL i2c_mcu FFD62H 00000H - @@INITL i2c_twl FFD62H 00000H - @@INITL led FFD62H 00000H - @@INITL rtc FFD62H 00000H - @@INITL vreg_ctr FFD62H 00000H - @@INITL vreg_twl FFD62H 00000H - @@INITL adc FFD62H 00000H - @@INITL renge FFD62H 00000H - @@INITL accero FFD62H 00000H + FFD5AH 00010H + @@INITL FFD6AH 00000H DSEG UNIT64KP + @@INITL loader FFD6AH 00000H + @@INITL pm FFD6AH 00000H + @@INITL i2c_ctr FFD6AH 00000H + @@INITL main FFD6AH 00000H + @@INITL magic FFD6AH 00000H + @@INITL WDT FFD6AH 00000H + @@INITL i2c_mcu FFD6AH 00000H + @@INITL i2c_twl FFD6AH 00000H + @@INITL led FFD6AH 00000H + @@INITL rtc FFD6AH 00000H + @@INITL vreg_ctr FFD6AH 00000H + @@INITL vreg_twl FFD6AH 00000H + @@INITL adc FFD6AH 00000H + @@INITL renge FFD6AH 00000H + @@INITL accero FFD6AH 00000H @@INITL self_flash - FFD62H 00000H - @@INITL sw FFD62H 00000H + FFD6AH 00000H + @@INITL sw FFD6AH 00000H @@INITL task_debug - FFD62H 00000H + FFD6AH 00000H @@INITL task_misc - FFD62H 00000H - @@INITL task_sys FFD62H 00000H + FFD6AH 00000H + @@INITL task_sys FFD6AH 00000H @@INITL pedo_alg_thre_det2 - FFD62H 00000H - @@INITL ini_VECT FFD62H 00000H + FFD6AH 00000H + @@INITL ini_VECT FFD6AH 00000H @@INITL task_status - FFD62H 00000H - @@INITL @rom FFD62H 00000H - @@DATAL FFD62H 00000H DSEG UNIT64KP - @@DATAL loader FFD62H 00000H - @@DATAL pm FFD62H 00000H - @@DATAL i2c_ctr FFD62H 00000H - @@DATAL main FFD62H 00000H - @@DATAL magic FFD62H 00000H - @@DATAL WDT FFD62H 00000H - @@DATAL i2c_mcu FFD62H 00000H - @@DATAL i2c_twl FFD62H 00000H - @@DATAL led FFD62H 00000H - @@DATAL rtc FFD62H 00000H - @@DATAL vreg_ctr FFD62H 00000H - @@DATAL vreg_twl FFD62H 00000H - @@DATAL adc FFD62H 00000H - @@DATAL renge FFD62H 00000H - @@DATAL accero FFD62H 00000H + FFD6AH 00000H + @@INITL @rom FFD6AH 00000H + @@DATAL FFD6AH 00000H DSEG UNIT64KP + @@DATAL loader FFD6AH 00000H + @@DATAL pm FFD6AH 00000H + @@DATAL i2c_ctr FFD6AH 00000H + @@DATAL main FFD6AH 00000H + @@DATAL magic FFD6AH 00000H + @@DATAL WDT FFD6AH 00000H + @@DATAL i2c_mcu FFD6AH 00000H + @@DATAL i2c_twl FFD6AH 00000H + @@DATAL led FFD6AH 00000H + @@DATAL rtc FFD6AH 00000H + @@DATAL vreg_ctr FFD6AH 00000H + @@DATAL vreg_twl FFD6AH 00000H + @@DATAL adc FFD6AH 00000H + @@DATAL renge FFD6AH 00000H + @@DATAL accero FFD6AH 00000H @@DATAL self_flash - FFD62H 00000H - @@DATAL sw FFD62H 00000H + FFD6AH 00000H + @@DATAL sw FFD6AH 00000H @@DATAL task_debug - FFD62H 00000H + FFD6AH 00000H @@DATAL task_misc - FFD62H 00000H - @@DATAL task_sys FFD62H 00000H + FFD6AH 00000H + @@DATAL task_sys FFD6AH 00000H @@DATAL pedo_alg_thre_det2 - FFD62H 00000H - @@DATAL ini_VECT FFD62H 00000H + FFD6AH 00000H + @@DATAL ini_VECT FFD6AH 00000H @@DATAL task_status - FFD62H 00000H - @@DATAL @rom FFD62H 00000H -* gap * FFD62H 0009EH + FFD6AH 00000H + @@DATAL @rom FFD6AH 00000H +* gap * FFD6AH 00096H MEMORY=RAM2 BASE ADDRESS=FFE20H SIZE=000C0H diff --git a/trunk/bsr_system.h b/trunk/bsr_system.h index bfe0685..2631114 100644 --- a/trunk/bsr_system.h +++ b/trunk/bsr_system.h @@ -39,9 +39,6 @@ typedef struct _system_status_ { enum pwr_state_ pwr_state; enum poweron_reason_ poweron_reason; - unsigned char dipsw0:1; - unsigned char dipsw1:1; - unsigned char dipsw2:1; unsigned char reboot:1; unsigned char info_fullcolor:1; unsigned char force_off:1; diff --git a/trunk/config.h b/trunk/config.h index ca5adb3..6dadefb 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -10,11 +10,10 @@ //#define _DBG_FORCE_FULLCOLOR_ //#define _PMIC_TEST_ //#define _ENABLE_WDT_TEST_ -//#define _DBG_FORCE_JIKKI_ //#define _TAIKENDAI_ #define MCU_VER_MAJOR 0x01 -#define MCU_VER_MINOR 0x06 +#define MCU_VER_MINOR 0x07 //#define _MODEL_TEG2_ diff --git a/trunk/hoge.bin b/trunk/hoge.bin index 8655915..73bfa06 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/i2c_ctr.c b/trunk/i2c_ctr.c index d5a517a..13acf25 100644 --- a/trunk/i2c_ctr.c +++ b/trunk/i2c_ctr.c @@ -94,7 +94,7 @@ __interrupt void int_iic_ctr( ) if( irq_readed ) { IRQ0_neg; - irq_readed = 0; + irq_readed = false; if( !( (( vreg_ctr[VREG_C_IRQ0] & vreg_ctr[VREG_C_IRQ_MASK0 ] ) == 0 ) && (( vreg_ctr[VREG_C_IRQ1] & vreg_ctr[VREG_C_IRQ_MASK1 ] ) == 0 ) && (( vreg_ctr[VREG_C_IRQ2] & vreg_ctr[VREG_C_IRQ_MASK2 ] ) == 0 ) diff --git a/trunk/i2c_mcu.c b/trunk/i2c_mcu.c index 07b4c07..c21958f 100644 --- a/trunk/i2c_mcu.c +++ b/trunk/i2c_mcu.c @@ -91,7 +91,7 @@ static err iic_mcu_wait_free() DI(); if( !iic_mcu_busy ) { - iic_mcu_busy = 1; + iic_mcu_busy = true; break; } EI(); @@ -132,7 +132,7 @@ u8 iic_mcu_read_a_byte( u8 SLA, u8 adrs ) if( iic_mcu_call_slave( SLA ) != 0 ) { iic_mcu_result = ERR_NOSLAVE; - iic_mcu_busy = 0; + iic_mcu_busy = false; return ( 0 ); } @@ -160,7 +160,7 @@ u8 iic_mcu_read_a_byte( u8 SLA, u8 adrs ) iic_mcu_send_sp( ); IICIF10 = 0; // 後を濁さないこと - iic_mcu_busy = 0; + iic_mcu_busy = false; return ( dat ); #endif } @@ -192,7 +192,7 @@ err iic_mcu_read( u8 slave, u8 adrs, u8 len, u8 * dest ) // スタートコンディションとスレーブの呼び出し、レジスタアドレスの送信 if( iic_mcu_call_slave( slave ) != 0 ) { - iic_mcu_busy = 0; + iic_mcu_busy = false; return ( ERR_NOSLAVE ); } @@ -230,7 +230,7 @@ err iic_mcu_read( u8 slave, u8 adrs, u8 len, u8 * dest ) iic_mcu_send_sp( ); IICIF10 = 0; - iic_mcu_busy = 0; + iic_mcu_busy = false; return ( ERR_SUCCESS ); } @@ -255,7 +255,7 @@ err iic_mcu_write_a_byte( u8 SLA, u8 adrs, u8 dat ) } temp = dat; - iic_mcu_wo_dma = 1; + iic_mcu_wo_dma = true; return ( iic_mcu_write( SLA, adrs, 1, &temp ) ); #else // １文字の時はDMAとか起動しないでさっさと終わらせる @@ -268,13 +268,13 @@ err iic_mcu_write_a_byte( u8 SLA, u8 adrs, u8 dat ) IICMK10 = 1; if( iic_mcu_call_slave( SLA ) != ERR_SUCCESS ) { - iic_mcu_busy = 0; + iic_mcu_busy = false; return ( ERR_NOSLAVE ); } iic_mcu_send_a_byte( adrs ); iic_mcu_send_a_byte( dat ); iic_mcu_send_sp( ); - iic_mcu_busy = 0; + iic_mcu_busy = false; return ( ERR_SUCCESS ); #endif } @@ -311,7 +311,7 @@ err iic_mcu_write( u8 slave, u8 adrs, u8 len, void * src ) IICIF10 = 0; if( iic_mcu_call_slave( slave ) != ERR_SUCCESS ) { - iic_mcu_busy = 0; + iic_mcu_busy = false; return ( ERR_NOSLAVE ); } @@ -398,7 +398,7 @@ __interrupt void int_dma1( ) SO0 = 0x0404 | TAUS_MASK; } IICMK10 = 1; - iic_mcu_busy = 0; + iic_mcu_busy = false; } @@ -434,8 +434,8 @@ __interrupt void int_iic10( ) SO0 = 0x0404 | TAUS_MASK; } - iic_mcu_wo_dma = 0; - iic_mcu_busy = 0; + iic_mcu_wo_dma = false; + iic_mcu_busy = false; } @@ -549,7 +549,7 @@ void iic_mcu_start( ) { return; } - iic_mcu_busy = 1; + iic_mcu_busy = true; DST1 = 0; NOP( ); // 2clkもしくは、DSTn==0をポーリング NOP( ); @@ -566,7 +566,7 @@ void iic_mcu_start( ) SDR02 = 10 << 9; // ボーレート設定 8M/1/(x+1)/2 SO0 = 0x0404 | TAUS_MASK; // 最初はHH - iic_mcu_wo_dma = 0; + iic_mcu_wo_dma = false; // バスのリセット @@ -581,8 +581,8 @@ void iic_mcu_start( ) SIR02 = SSR02; - iic_mcu_busy = 0; - iic_mcu_initialized = 1; + iic_mcu_busy = false; + iic_mcu_initialized = true; } @@ -599,7 +599,7 @@ void iic_mcu_stop( ) iic_mcu_send_re_st( ); // SCL,SDAをLLにする I2C_PU_off(); SAU0EN = 0; - iic_mcu_initialized = 0; + iic_mcu_initialized = false; } @@ -618,7 +618,7 @@ void iic_mcu_stop( ) err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat ) { static u8 count; - + // １文字の時はDMAとか起動しないでさっさと終わらせる if( iic_mcu_wait_free() != ERR_SUCCESS ) { @@ -629,7 +629,7 @@ err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat ) IICMK10 = 1; if( iic_mcu_call_slave( IIC_SLA_CODEC ) != ERR_SUCCESS ) { - iic_mcu_busy = 0; + iic_mcu_busy = false; return ( ERR_NOSLAVE ); } iic_mcu_send_a_byte( adrs ); @@ -645,6 +645,6 @@ err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat ) count++; iic_mcu_send_sp( ); - iic_mcu_busy = 0; + iic_mcu_busy = false; return ( ERR_SUCCESS ); } diff --git a/trunk/led.c b/trunk/led.c index 689caf1..b79f683 100644 --- a/trunk/led.c +++ b/trunk/led.c @@ -138,6 +138,8 @@ void LED_init( ) 　　　　　　　　６　電源 Ｌ 　　　　　　　　７　電源 Ｈ */ + INFO_LED_IS_FULLCOLOR_PU = 1; // お知らせLEDを識別　先に上げておく + TAU0EN = 1; TPS0 = BIT_PRS012 | BIT_PRS002; // マスタークロックはCK01,8M/2 /2^4 = 250kHz @@ -160,19 +162,19 @@ void LED_init( ) TDR00 = LED_BRIGHT_MAX - 1; // 周期 10bit // お知らせLEDを識別 // - INFO_LED_IS_FULLCOLOR_PU = 1; - system_status.info_fullcolor = 0; +// INFO_LED_IS_FULLCOLOR_PU = 1; // もうちょっと前に上げておかないと… + system_status.info_fullcolor = 1; if( system_status.model == MODEL_TS_BOARD ) { -#ifdef _DBG_FORCE_FULLCOLOR_ - system_status.info_fullcolor = 1; +#ifndef _DBG_FORCE_FULLCOLOR_ + system_status.info_fullcolor = 0; #endif } else { - if( !INFO_LED_IS_FULLCOLOR_n ) + if( INFO_LED_IS_FULLCOLOR_n ) { - system_status.info_fullcolor = 1; + system_status.info_fullcolor = 0; } } INFO_LED_IS_FULLCOLOR_PU = 0; @@ -188,7 +190,7 @@ void LED_init( ) vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_AUTO; LED_duty_pow_blu = LED_BRIGHT_MAX; } - info_led_off = 0; + info_led_off = false; } @@ -230,7 +232,7 @@ enum LED_ILUM_MODE{ ======================================================== */ void tsk_led_pow( ) { - info_led_override = 0; + info_led_override = false; switch ( vreg_ctr[VREG_C_LED_POW] ) { case ( LED_POW_ILM_AUTO ): @@ -392,7 +394,7 @@ static void led_pow_bt_empty() static u8 delay; static u8 red_blink_poi; - info_led_override = 1; + info_led_override = true; // 赤点滅 led_fade_to( LED_duty_pow_blu, 0 ); @@ -543,7 +545,7 @@ void tsk_led_notify( ) // 通常運転 if( info_led_pattern_updated ) { - info_led_pattern_updated = 0; + info_led_pattern_updated = false; vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] &= ~REG_BIT_IN_LOOP; frame = 0; // ちゃんと書こう time_to_next_frame = 0; @@ -626,7 +628,7 @@ void tsk_led_cam( ) return; } } - cam_led_update = 0; // TWL のブリンク設定（一発だけ点灯）のため + cam_led_update = false; // TWL のブリンク設定（一発だけ点灯）のため // ブリンクのように待たせたいとき以外は毎週起動する // (レジスタの変更にすぐに反応する) diff --git a/trunk/loader.c b/trunk/loader.c index 60d857f..09d8e91 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -94,35 +94,6 @@ void main( ) // ファームの整合性チェック // { -#if 0 - u8 i; - u8 comp = 0; - u8 comp2 = 0; - u8 comp3 = 0; - u8 temp; - - // ローダーと本体は同じバージョンか？ - /// 次へのアップデートの途中で終わってないか？ - for( i = 0; i < sizeof( __TIME__ ); i++ ) // sizeof( __TIME__ ) = 8 らし - { - comp += ( *( __far u8 * )( MGC_LOAD + i ) == *( u8 * )( MGC_FOOT + i ) ) ? 0 : 1; - comp2 += ( *( u8 * )( MGC_HEAD + i ) == *( u8 * )( MGC_FOOT + i ) ) ? 0 : 1; - } - - if( *( u8 * )( MGC_FOOT ) == 0xFF ) // 消去済のまま - { - comp3 += 1; - } - - if(! ( (comp == 0) && (comp2 == 0) && (comp3 == 0) )) - { - hdwinit2( ); - // ファームリストアを試みる - temp = ( ((comp == 0)? 0:1 ) + ((comp2 == 0)? 0:2 ) + ((comp3 == 0)? 0:4 ) ); - firm_restore( temp ); - // 帰ってこない。リセットをかける。 - } -#else u8 i; u8 comp = 0; u8 temp; @@ -140,14 +111,13 @@ void main( ) comp += 1; } - if(! ( (comp == 0) )) + if( comp != 0 ) { hdwinit2( ); // ファームリストアを試みる firm_restore( ); // 帰ってこない。リセットをかける。 } -#endif } WDT_Restart( ); @@ -356,7 +326,6 @@ void wait_ms( u8 ms ){ u16 fine; WDT_Restart(); - // まだ適当です！ while( ms != 0 ){ ms--; fine = 860; diff --git a/trunk/main.c b/trunk/main.c index c720611..b0f976d 100644 --- a/trunk/main.c +++ b/trunk/main.c @@ -18,10 +18,6 @@ #include "pool.h" -// ======================================================== -static void read_dipsw( ); - - // ======================================================== system_status_ system_status; uni_pool pool; @@ -57,11 +53,9 @@ void main_loop( void ) vreg_ctr_init( ); - read_dipsw( ); // 特定スイッチで何かするか？ - clear_hosu_hist(); // 履歴クリア - renge_task_interval_run_force = 1; + renge_task_interval_run_force = true; RTCIMK = 0; /* 割り込み(アラーム&インターバル)許可 */ @@ -76,15 +70,3 @@ void main_loop( void ) } -/* ======================================================== - ======================================================== */ -static void read_dipsw( ) -{ - // ソフトディップスイッチ読み込み -// PU4 |= 0x03; // dip sw 0,1 - system_status.dipsw0 = ( DIPSW_0 == 0 ) ? 0 : 1; - system_status.dipsw1 = ( DIPSW_1 == 0 ) ? 0 : 1; -// PU4 &= ~0x03; -} - - diff --git a/trunk/pedo_alg_thre_det2.c b/trunk/pedo_alg_thre_det2.c index 290ea16..3772076 100644 --- a/trunk/pedo_alg_thre_det2.c +++ b/trunk/pedo_alg_thre_det2.c @@ -403,7 +403,7 @@ u8 hosu_read( ) p_record_buffer -= 1; } } - record_read_msb_lsb += 1; + record_read_msb_lsb ^= 1; return( dat ); } } diff --git a/trunk/pm.h b/trunk/pm.h index 1df7330..f581bea 100644 --- a/trunk/pm.h +++ b/trunk/pm.h @@ -159,7 +159,7 @@ task_status_immed tski_PM_LCD_off(); task_status_immed tski_PM_BL_set(); -#define PM_Chg_Stop() { BT_TEMP_P = 0; BT_CHG_DISABLE(); while( !BT_IN_CHG_n ){;}; LED_CHARGE = 0; bt_chg_ready = 0; } +#define PM_Chg_Stop() { BT_TEMP_P = 0; BT_CHG_DISABLE(); while( !BT_IN_CHG_n ){;}; LED_CHARGE = 0; bt_chg_ready = false; } // 　これを呼ぶ前に、現在温度を教えておく必要があります。 diff --git a/trunk/renge/renge.c b/trunk/renge/renge.c index d89cb1d..6b67588 100644 --- a/trunk/renge/renge.c +++ b/trunk/renge/renge.c @@ -20,6 +20,9 @@ //#define _renge_test_ +#define true 1 +#define false 0 + //****************************************************************************** u8 renge_flg_interval; bit renge_task_interval_run_force; @@ -84,9 +87,9 @@ err renge_task_interval_run(){ // インターバル起動 DI(); if(( renge_flg_interval != 0 ) || - ( renge_task_interval_run_force != 0 )) // todo 統合 + ( renge_task_interval_run_force )) // todo 統合 { - renge_task_interval_run_force = 0; + renge_task_interval_run_force = false; if( renge_flg_interval != 0 ) { renge_flg_interval -= 1; diff --git a/trunk/rtc.c b/trunk/rtc.c index 8e21da7..dc98342 100644 --- a/trunk/rtc.c +++ b/trunk/rtc.c @@ -58,9 +58,9 @@ void RTC_init( void ) } RWAIT = 0; - rtc_lock = 0; - rtc_dirty = 0; - rtc_alarm_dirty = 0; + rtc_lock = false; + rtc_dirty = false; + rtc_alarm_dirty = false; } @@ -102,9 +102,9 @@ __interrupt void int_rtc( ) ======================================================== */ void rtc_buf_reflesh( ) { - if( rtc_lock == 0 ) + if( !rtc_lock ) { - rtc_lock = 1; + rtc_lock = true; RWAIT = 1; while( !RWST ) {; @@ -126,9 +126,9 @@ void rtc_buf_reflesh( ) ======================================================== */ void set_rtc( u8 adrs, u8 data ) { - if( rtc_dirty == 0 ) + if( !rtc_dirty ) { - rtc_dirty = 1; + rtc_dirty = true; memcpy( rtc_work, &SEC, 7 ); // renge_task_immed_add( tski_rtc_close ); // I2C終了時に行う } @@ -145,13 +145,13 @@ void rtc_unlock( ) { // リードロック // if( rtc_lock != 0 ){ - rtc_lock = 0; + rtc_lock = false; // } // ライトロック - if( rtc_dirty != 0 ) + if( rtc_dirty ) { - rtc_dirty = 0; + rtc_dirty = false; RWAIT = 1; while( !RWST ) {; @@ -166,7 +166,7 @@ void rtc_unlock( ) WALE = 0; ALARMWM = vreg_ctr[VREG_C_RTC_ALARM_MIN]; ALARMWH = vreg_ctr[VREG_C_RTC_ALARM_HOUR]; - rtc_dirty = 0; + rtc_alarm_dirty = false; WALE = 1; } } diff --git a/trunk/sw.c b/trunk/sw.c index 3c6b400..ff6613c 100644 --- a/trunk/sw.c +++ b/trunk/sw.c @@ -77,11 +77,9 @@ void tsk_sw( ) { static u8 task_interval = 0; - switch ( system_status.pwr_state ) + if( system_status.pwr_state == ON_TRIG ) { - case ( ON_TRIG ): - SW_pow_count = 0; - break; + SW_pow_count = 0; // カウントクリア } if( task_interval-- != 0 ) diff --git a/trunk/task_misc.c b/trunk/task_misc.c index 4bcb06f..f01a955 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -111,7 +111,7 @@ void tsk_misc( ) ======================================================== */ if( twl_ver_read ) { - twl_ver_read = 0; + twl_ver_read = false; set_irq( VREG_C_IRQ2, REG_BIT_TWL_VER_READ ); } } @@ -170,7 +170,7 @@ task_status_immed do_command0( ) if( temp_command & REG_BIT_GOING_TO_SLEEP ) { - going_to_sleep = 1; + going_to_sleep = true; } if( ( temp_command & ( REG_BIT_OFF_REQ | REG_BIT_RESET1_REQ | REG_BIT_FCRAM_RESET_REQ | REG_BIT_RESET2_REQ )) != 0x00 ) @@ -205,7 +205,7 @@ task_status_immed do_command0( ) PM_reset_neg(); RESET2_neg; - twl_ntr_mode = 0; + twl_ntr_mode = false; // CODEC 不定レジスタ初期化 codec_reg_init(); @@ -242,22 +242,33 @@ extern bit bt_chg_ready; /* ======================================================== 　デバッグ用にいろいろ読んできます。 　返値はデータそのもの - ======================================================== */ + 出てくる順場は、 + 1) プラットフォーム + 2) PMIC バージョン + 3) 電池メーカー + 4) ガスゲージバージョン + 5) 〃 + 6) ( rcomp & 0xFF ) + 7) raw_adc_temperature + 8) ( !temp_zone_charge_disable | ( bt_chg_ready << 1 ) ) + 9) + ======================================================== */ task_status_immed tski_mcu_info_read() { + static u8 infos[10]; - if( SPD ) + if( SPD ) // stop { goto end; } - if( STD ) + if( STD ) // restart { SPIE = 1; WDT_Restart( ); } - if( IICAIF == 0 ) + if( IICAIF == 0 ) // I2Cのステートが進むのを待つ { return( ERR_CONTINUE ); } @@ -266,11 +277,13 @@ task_status_immed tski_mcu_info_read() IICAIF = 0; } - switch( iic_burst_state++ ){ - case( 0 ): // 本体種類識別 -#ifdef _DBG_FORCE_JIKKI_ - IICA = MODEL_JIKKI; -#else + WDT_Restart( ); + if( iic_burst_state > 8 ) + { + goto end; + } + else if( iic_burst_state == 0 ) + { if( !system_status.captureBox ) { IICA = (u8)system_status.model; @@ -279,41 +292,20 @@ task_status_immed tski_mcu_info_read() { IICA = MODEL_CAPTURE_BOX; } -#endif - break; - - case( 1 ): // IICがなにかエラーでも知らない。00かFFならエラーの可能性が高い - IICA = iic_mcu_read_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VER ); - break; - - case( 2 ): // 電池メーカーの識別 - IICA = battery_manufacturer; - break; - - case( 3 ): // ガスゲージバージョン - IICA = iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VERSION ); - break; - - case( 4 ): // LSB - IICA = iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VERSION + 1 ); - break; - - case( 5 ): - IICA = (u8)( _dbg_rcomp & 0xFF ); - break; - - case( 6 ): - IICA = raw_adc_temperature; - break; - - case( 7 ): - IICA = ( !temp_zone_charge_disable | ( bt_chg_ready << 1 ) ); - break; - - default: - goto end; + // これで勝手に転送が始まるから今のうちにデータの準備をしておく + infos[0] = iic_mcu_read_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VER ); + infos[1] = battery_manufacturer; + iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VERSION, 2, &infos[2] ); + infos[4] = (u8)( _dbg_rcomp & 0xFF ); + infos[5] = raw_adc_temperature; + infos[6] = ( !temp_zone_charge_disable | ( bt_chg_ready << 1 ) ); + infos[7] = system_status.info_fullcolor; } - WDT_Restart( ); + else + { + IICA = infos[ iic_burst_state -1 ]; + } + iic_burst_state++; return( ERR_CONTINUE ); end: diff --git a/trunk/task_sys.c b/trunk/task_sys.c index 0d85469..aec4589 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -65,7 +65,7 @@ void tsk_sys( ) if( timeout > 100 ) { system_status.pwr_state = OFF_TRIG; // スイッチはノイズだった。寝る。 - renge_task_interval_run_force = 1; + renge_task_interval_run_force = true; return; } @@ -78,7 +78,7 @@ void tsk_sys( ) system_status.poweron_reason = PWSW; } - SW_pow_mask = 1; + SW_pow_mask = true; timeout = 0; @@ -94,13 +94,13 @@ void tsk_sys( ) // 電源投入 // iic_mcu_start( ); - bt_force_update = 0; + bt_force_update = false; BT_chk(); // 実機やバッテリの判定、電池残量ICの設定 #ifndef _ALLOW_NOBATT_ if( system_status.model == MODEL_JIKKI_NOBATT ) { - renge_task_interval_run_force = 1; + renge_task_interval_run_force = true; system_status.pwr_state = OFF_TRIG; return; } @@ -114,14 +114,14 @@ void tsk_sys( ) ) { // 電池が少ないので起動させない(電圧チェックもされてる) - renge_task_interval_run_force = 1; + renge_task_interval_run_force = true; system_status.pwr_state = OFF_TRIG; return; } if( PM_sys_pow_on( ) != ERR_SUCCESS ) { // 電源起動不可エラー - renge_task_interval_run_force = 1; + renge_task_interval_run_force = true; system_status.pwr_state = OFF_TRIG; return; } @@ -160,7 +160,7 @@ void tsk_sys( ) PIF0 = 0; system_status.poweron_reason = NONE; - renge_task_interval_run_force = 1; + renge_task_interval_run_force = true; MK0 = INT_MSK0_RSV; MK1 = INT_MSK1_RSV; @@ -217,7 +217,7 @@ void tsk_sys( ) { PM_VDD_ecoMode(); system_status.pwr_state = SLEEP; - renge_task_interval_run_force = 1; + renge_task_interval_run_force = true; } } @@ -266,7 +266,7 @@ void tsk_sys( ) vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ILM_OFF; vreg_ctr[ VREG_C_LED_WIFI ] = WIFI_LED_OFF; vreg_ctr[ VREG_C_LED_TUNE ] = LED_TUNE_ILM_OFF; - info_led_off = 1; + info_led_off = true; if( LED_duty_pow_blu != 0 ) { return; @@ -318,7 +318,7 @@ void tsk_sys( ) timeout = 0; system_status.pwr_state = BT_CHARGE; - SW_pow_mask = 1; + SW_pow_mask = true; SW_pow_count = 0; @@ -357,7 +357,7 @@ void tsk_sys( ) iic_mcu_stop( ); pm_chk_adapter(); PM_Chg_Stop(); - bt_force_update = 1; + bt_force_update = true; while( RWST ) {;} @@ -380,7 +380,7 @@ void tsk_sys( ) { // 一度起こしてしまう。ペリフェラルの初期化など流用のため。 // 電源ボタンのタイムアウトで返ってくる - SW_pow_mask = 0; + SW_pow_mask = false; } # ifdef _MCU_BSR_ OSMC = 0x01; @@ -421,7 +421,7 @@ static void chk_emergencyExit(){ // リセットが下がってる /// PMICが異常終了判断をした system_status.pwr_state = OFF_TRIG; - renge_task_interval_run_force = 1; + renge_task_interval_run_force = true; } else { @@ -449,7 +449,7 @@ static void chk_emergencyExit(){ { // 白箱は電源を切りたいらしい system_status.pwr_state = OFF_TRIG; - renge_task_interval_run_force = 1; + renge_task_interval_run_force = true; shirobako_power_control_count = 240; } else @@ -484,7 +484,7 @@ static void force_off_check() if( system_status.force_off ) { system_status.pwr_state = OFF_TRIG; - renge_task_interval_run_force = 1; + renge_task_interval_run_force = true; } } @@ -496,7 +496,7 @@ static void force_off_check() ======================================================== */ void send_getup_to_soc() { - going_to_sleep = 0; + going_to_sleep = false; timeout_sleep = 0; #ifdef _MODEL_CTR_ SLP_ACK = 1; diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index 974f41f..be72fef 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -201,7 +201,7 @@ void vreg_ctr_write( u8 adrs, u8 data ) iic_burst_state += 1; if( iic_burst_state > 4 ) // パターンを1文字でも書いた { - info_led_pattern_updated = 1; + info_led_pattern_updated = true; } } @@ -247,12 +247,12 @@ void vreg_ctr_write( u8 adrs, u8 data ) break; case ( VREG_C_RTC_ALARM_MIN ): - rtc_alarm_dirty = 1; + rtc_alarm_dirty = true; vreg_ctr[ VREG_C_RTC_ALARM_MIN ] = (u8)( data & 0x7F ); break; case ( VREG_C_RTC_ALARM_HOUR ): - rtc_alarm_dirty = 1; + rtc_alarm_dirty = true; vreg_ctr[ VREG_C_RTC_ALARM_HOUR ] = (u8)( data & 0x3F ); break; @@ -465,7 +465,7 @@ void vreg_ctr_after_read( u8 adrs, u8 data ) DI(); vreg_ctr[ adrs ] ^= data; EI(); - irq_readed = 1; + irq_readed = true; break; case VREG_CX_FREE_DATA: diff --git a/trunk/vreg_twl.c b/trunk/vreg_twl.c index 4678039..c842dd1 100644 --- a/trunk/vreg_twl.c +++ b/trunk/vreg_twl.c @@ -47,7 +47,7 @@ void vreg_twl_write( u8 adrs, u8 data ) { case ( REG_TWL_INT_ADRS_VOL ): { - vol_changed_by_twl = 1; + vol_changed_by_twl = true; vreg_twl[ REG_TWL_INT_ADRS_VOL ] = data; renge_task_immed_add( tski_vol_update ); break; @@ -56,7 +56,7 @@ void vreg_twl_write( u8 adrs, u8 data ) case ( REG_TWL_INT_ADRS_MODE ): if(( data & 0x03 ) == 0 ) { - twl_ntr_mode = 1; + twl_ntr_mode = true; } vreg_twl[ REG_TWL_INT_ADRS_MODE ] = ( data & 0x83 ); // [8]vol32 [1:0]nand break; @@ -65,7 +65,7 @@ void vreg_twl_write( u8 adrs, u8 data ) vreg_twl[ REG_TWL_INT_ADRS_CAM ] = ( data & 0x03 ); if( ( data & 0x03 ) == TWL_CAMLED_BLINK ) { - cam_led_update = 1; + cam_led_update = true; } tsk_led_cam(); // todo 大丈夫？ break; @@ -146,7 +146,7 @@ u8 vreg_twl_read( u8 phy_adrs ) case( REG_TWL_INT_ADRS_VER_INFO ): // set_irq( VREG_C_IRQ2, REG_BIT_TWL_VER_READ ); // 速度的に無理なので - twl_ver_read = 1; + twl_ver_read = true; return( TWL_REG_VER_INFO ); case( REG_TWL_ADRS_NON_EXIST ): diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index c40318d..b33d501 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -22,7 +22,7 @@ SubClock=None [Mapping] Count=0 [Main] -Geometry=-1205, 80, 1200, 882 +Geometry=135, 208, 1200, 882 Window=Max MDI_MAX=OFF Button=ON @@ -50,7 +50,7 @@ LoadFilter1=5 Offset1=0 Object1=ON Symbol1=ON -Erase1=OFF +Erase1=ON HighSpeed1=OFF CPU Reset1=ON Symbol Reset1=ON @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=15, 24, 1021, 1043 +Geometry=151, 98, 1021, 817 Window=Normal -DispStart=377 -CaretPos=378,0 +DispStart=16 +CaretPos=69,0 Mode=Normal DispFile= Address1= @@ -140,26 +140,18 @@ SaveStart= SaveEnd= Accumulative=ON [Source1] -Geometry=0, 0, 877, 1043 +Geometry=25, 25, 1021, 817 Window=Normal -DispStart=631 -CaretPos=1062,0 +DispStart=136 +CaretPos=46,31 Mode=Normal -DispFile=pm.c -Accumulative=ON -[Source2] -Geometry=477, 23, 877, 1043 -Window=Normal -DispStart=445 -CaretPos=266,9 -Mode=Normal -DispFile=task_sys.c +DispFile=led.c Accumulative=ON [Assemble] Geometry=124, 418, 968, 626 Window=Normal -DispStart=17725 -CaretPos=17725,27 +DispStart=764 +CaretPos=764,27 Address1= Address2= Address3= @@ -976,40 +968,57 @@ Count=0 Geometry=1075, 10, 441, 702 Window=Normal Boundary=18088086 -0=+vreg_ctr,P,N,A,-,1 -1=.info_led_override,P,N,A,+,1 -2=.TDR07,P,S,A,+,1 -3=.PM4.2,P,S,A,+,1 -4=.P4.2,P,S,A,+,1 -5=.PM1.5,P,S,A,+,1 -6=.P1.5,P,S,A,+,1 -7=.SW_pow_count,P,N,A,+,1 -8=+system_status,.,N,A,-,1 -9=.info_LED,.,N,A,+,1 -10=.time_to_next_frame,P,N,A,+,1 -Line=11 +0=.infos,P,N,A,+,1 +1=.bt_remain_old_ctr,P,N,A,+,1 +2=.bt_remain_old_ntr,P,N,A,+,1 +3=.bt_remain_old_ntr,P,N,A,+,1 +4=.vreg_ctr,P,N,A,+,1 +5=.info_led_override,P,N,A,+,1 +6=.TDR07,P,S,A,+,1 +7=.PM4.2,P,S,A,+,1 +8=.P4.2,P,S,A,+,1 +9=.PM1.5,P,S,A,+,1 +10=.P1.5,P,S,A,+,1 +11=.SW_pow_count,P,N,A,+,1 +12=.battery_manufacturer,P,N,A,+,1 +13=.system_status,.,N,A,+,1 +14=.info_LED,.,N,A,+,1 +15=.time_to_next_frame,P,N,A,+,1 +Line=16 [Quick Watch] -0=P12.0,P,A,1 -1=acc_norm,P,A,1 -2=chg_led_override,P,A,1 -3=temp_pm_extdc,P,A,1 -4=pm_extdc_old,P,A,1 -5=time_to_next_frame,P,A,1 -6=system_status,P,A,1 -7=vreg_ctr,P,A,1 -8=P4.2,P,A,1 -9=PM4.2,P,A,1 -10=TDR07,P,A,1 -11=info_led_override,P,A,1 -12=P1.5,P,A,1 -13=PM1.6,P,A,1 -14=PM1.5,P,A,1 -15=SW_pow_count,P,A,1 +0=pm_extdc_old,P,A,1 +1=time_to_next_frame,P,A,1 +2=system_status,P,A,1 +3=vreg_ctr,P,A,1 +4=P4.2,P,A,1 +5=PM4.2,P,A,1 +6=TDR07,P,A,1 +7=info_led_override,P,A,1 +8=P1.5,P,A,1 +9=PM1.6,P,A,1 +10=PM1.5,P,A,1 +11=SW_pow_count,P,A,1 +12=bt_remain_old_ntr,P,A,1 +13=bt_remain_old_ctr,P,A,1 +14=infos,P,A,1 +15=battery_manufacturer,P,A,1 [Software Break] Geometry=709, 826, 445, 260 Window=Normal Width=150 30 200 100 -Count=0 +Name0=Swb00001 +Address0=task_misc.c#_tski_mcu_info_read+0x87 +Window0=ASM +Status0=ON +Name1=Swb00002 +Address1=led.c#_LED_init+0x1 +Window1=ASM +Status1=ON +Name2=Swb00003 +Address2=led.c#_LED_init+0x54 +Window2=ASM +Status2=ON +Count=3 [Reset] Debugger=ON Symbol=OFF diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index ca6c545..a1b42e6 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -4,16 +4,15 @@ FrameX=21 FrameY=37 FrameCX=1299 FrameCY=1044 -OpenFile1=led.c,0,504,84,1559,996,20,560,31,0 -OpenFile2=pm.h,0,198,198,1442,924,24,139,24,0 -OpenFile3=loader.c,0,176,176,1420,902,9,92,9,0 -OpenFile4=self_flash.c,0,242,242,1486,968,48,255,48,0 -OpenFile5=ProjectWindow +OpenFile1=ProjectWindow PrjPos=0,2,754,3,253 +OpenFile2=jhl_defs.h,0,286,286,1530,1012,0,15,26,0 +OpenFile3=renge\renge.c,0,348,332,1592,1058,15,24,22,0 +OpenFile4=i2c_mcu.c,0,330,330,1574,1056,24,552,28,0 +OpenFile5=batt_params.h,0,352,352,1596,1078,0,97,0,0 OpenFile6=OutputWindow OutputPos=0,491,1000,330,1535 -OpenFile7=pm.c,0,288,42,1532,768,5,488,0,0 -OpenFile8=user_define.h,0,128,280,1372,1037,49,11,49,0 +OpenFile7=pm.c,0,260,62,1504,788,1,267,0,0 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index ab8297d..e019f2a 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -12,7 +12,7 @@ T=4c889612 8=reboot.h 9=magic.h [pm.c] -T=4c8db696 +T=4c8edcae 1=incs.h 2=adc.h 3=led.h @@ -22,11 +22,11 @@ T=4c8db696 7=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 8=fsl_user.h [i2c_ctr.c] -T=4c3e9a73 +T=4c8ed590 1=config.h 2=incs.h [main.c] -T=4c5a5ef2 +T=4c8ed590 1=incs_loader.h 2=WDT.h 3=rtc.h @@ -36,13 +36,13 @@ T=4c5a5ef2 7=adc.h 8=pool.h [magic.c] -T=4c8dcae0 +T=4c8edcae 1=config.h [WDT.c] T=4bf0d1e1 1=incs_loader.h [i2c_mcu.c] -T=4c3c5d1f +T=4c8ed5b8 1=incs_loader.h 2=i2c_mcu.h [i2c_twl.c] @@ -52,14 +52,14 @@ T=4c8db696 3=i2c_twl_defs.h 4=i2c_twl.h [led.c] -T=4c871cec +T=4c8ed590 1=incs.h 2=led.h [rtc.c] -T=4c883032 +T=4c8ed590 1=incs.h [vreg_ctr.c] -T=4c89d17c +T=4c8ed590 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -70,21 +70,21 @@ T=4c89d17c 8=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 9=fsl_user.h [vreg_twl.c] -T=4c4fe78d +T=4c8ed590 1=incs.h 2=jhl_defs.h 3=led.h 4=vreg_twl.h 5=vreg_ctr.h [adc.c] -T=4c89d17c +T=4c8ed8d7 1=incs.h 2=adc.h 3=pm.h 4=led.h 5=voltable.h [renge\renge.c] -T=4c8db630 +T=4c8ed5ae 1=renge\renge.h 2=renge\renge_task_intval.h 3=renge\renge_task_immediate.h @@ -107,7 +107,7 @@ T=4c88907a 6=magic.h 7=pm.h [sw.c] -T=4c6cdcfe +T=4c8ed8d7 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -122,7 +122,7 @@ T=4c4698f9 3=pm.h 4=accero.h [task_misc.c] -T=4c8db696 +T=4c8ed590 1=incs.h 2=renge\renge.h 3=pm.h @@ -131,7 +131,7 @@ T=4c8db696 6=i2c_mcu.h 7=led.h [task_sys.c] -T=4c8db2f7 +T=4c8ed590 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -143,7 +143,7 @@ T=4c8db2f7 9=adc.h 10=self_flash.h [pedo_alg_thre_det2.c] -T=4c6a6818 +T=4c8ed590 1=incs.h 2=..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h 3=accero.h @@ -173,10 +173,10 @@ T=4c889601 8=i2c_mcu.h 9=WDT.h [jhl_defs.h] -T=4c075832 +T=4c8ed032 1=config.h [config.h] -T=4c8ddc4c +T=4c8ed8d7 [user_define.h] T=4c84442a [bsr_system.h] @@ -206,7 +206,7 @@ T=4bf0d1e0 [i2c_ctr.h] T=4bf0d1e1 [pm.h] -T=4c8db54c +T=4c8ed590 [rtc.h] T=4bf0d1e1 [reboot.h]