diff --git a/trunk/adc.c b/trunk/adc.c index 75fa447..df2f678 100644 --- a/trunk/adc.c +++ b/trunk/adc.c @@ -31,6 +31,7 @@ typedef struct filter_work u8* value_used; s8 diffs; // KIKAN中の偏り具合 s8 kikan; + u8 large_diff_count; }filter_work; @@ -86,17 +87,17 @@ void tsk_adc( ) #ifdef _DEBUG_CODEC_POLLING_ // debug { - static bit interval; + static u8 interval; -// VOL書き頻度を半分にする +// VOL書き頻度 interval++; - if( !interval ) + if( interval == 3 ) { - return; + interval = 0; + renge_task_immed_add( tski_vol_update ); // T = 2ms polling } } - renge_task_immed_add( tski_vol_update ); // T = 2ms polling #endif if( task_interval-- != 0 ) @@ -413,24 +414,32 @@ u8 get_adc( u8 ch ) /* ======================================================== VRの可動範囲を考えてスケーリング ======================================================== */ -#define ASOBI_L 4 -#define ASOBI_H 16 +//#define ASOBI_L 4 +//#define ASOBI_H 16 +#define ASOBI_L 32+2+1 +#define ASOBI_H 32+2+1 + + + static u8 adc_scaling( u8 orig_val ) { u16 temp; - if( orig_val > ( 255 - ASOBI_H )) - { - return( 255 ); - } - if( orig_val <= ASOBI_L ) { return( 0 ); } + if( orig_val >= ( 255 - ASOBI_H )) + { + return( 255 ); + } orig_val -= ASOBI_L; temp = (u16)( orig_val * 256 ) / ( 256 - ( ASOBI_L + ASOBI_H )); + if( temp > 255 ) + { + temp = 255; + } return( (u8)( temp & 0xFF ) ); } @@ -438,8 +447,6 @@ static u8 adc_scaling( u8 orig_val ) - - /* ======================================================== 似非ヒステリシス V2 四捨五入的な動きします @@ -448,16 +455,20 @@ static u8 adc_scaling( u8 orig_val ) static void adc_filter( u8 new_val, filter_work *work ) { u8 temp; - if( abs( new_val - *( work -> value_used )) > 2 ) { // 大きく離れた - *( work -> value_used ) = new_val; - work -> diffs = 0; - work -> kikan = KIKAN; + work -> large_diff_count += 1; + if( work -> large_diff_count > 3 ) + { + *( work -> value_used ) = new_val; + work -> diffs = 0; + work -> kikan = KIKAN; + } } else { + work -> large_diff_count = 0; // 近所の値でも、ある期間でいっぱい偏っていたらそっちに寄せる if( *( work -> value_used ) < new_val ) { diff --git a/trunk/bsr.hex b/trunk/bsr.hex index 82aeac6..47d234b 100644 --- a/trunk/bsr.hex +++ b/trunk/bsr.hex @@ -1,21 +1,21 @@ -:020000005E0C94 +:020000005F0C93 :02000200FFFFFE :0C000400FFFFFFFFFFFFFFFFFFFFFFFFFC -:04001000A64AAC4A06 +:04001000E14AE74A90 :08001400FFFFFFFFFFFFFFFFEC -:02001C00814C15 +:02001C00BC4CDA :06001E00FFFFFFFFFFFFE2 -:02002400ED4CA1 +:02002400284D65 :04002600FFFFFFFFDA -:02002A005A4D2D +:02002A00954DF2 :08002C00FFFFFFFFFFFFFFFFD4 -:080034006A4E274E654E9C4FF9 +:08003400A54E624EA04ED74F0D :0E003C00FFFFFFFFFFFFFFFFFFFFFFFFFFFFC4 -:02004A00AE4ABC +:02004A00E94A81 :0E004C00FFFFFFFFFFFFFFFFFFFFFFFFFFFFB4 -:02005A00E94A71 +:02005A00244B35 :06005C00FFFFFFFFFFFFA4 -:020062001D4F30 +:02006200584FF5 :10006400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF9C :10007400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8C :10008400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7C @@ -53,11 +53,11 @@ :10026800BF1E017148F000F5300271080105F55014 :1002780005F5BCFFF5BDFFD7C7C1C1FBF8FFCEAB85 :10028800AC8C02D1DD12616902305C03BBF66149B6 -:1002980000DDEE618900EFF51004C6D7FD3133FDAE -:1002A8005D3CFD2D05717AFAFD9124F51CF98F1E30 +:1002980000DDEE618900EFF51004C6D7FD5033FD8F +:1002A800963CFD2D05717AFAFD9124F51CF98F1EF7 :1002B800F93135175003C15084FD3603C0625C0123 -:1002C800D161E8CF1CF902CFDFFB64FD1134FDEDED -:1002D80002FD2A48713222712BE7CEABACFD603C9F +:1002C800D161E8CF1CF902CFDFFB64FD3034FDEDCE +:1002D80002FD6148713222712BE7CEABACFD993C2F :1002E80061EDEFF6D731020403F6EF01E660341E44 :1002F800F9718C8971899931120403F6EF01E6606E :10030800341EF9718C89719999D7D7C7F616FD2DC6 @@ -109,7 +109,7 @@ :1005E800A4FD95045020FD9504D942FBFD9504A077 :1005F80042FBFD0A05715320F2C6D7C72006FBF857 :10060800FFFD1C095014C15008FD5A08C0CC050450 -:100618008C054C14DE0C8C05318EFD4009615905A2 +:100618008C054C14DE0C8C05318EFD4109615905A1 :10062800EFEECC05048C054C1461C8EDC906CC046A :10063800008C044C04DE6FC73641057184C6DC6645 :100648003022F9BC02F6BB31B2D10EC73641057172 @@ -117,14 +117,14 @@ :1006680040059971505005617902617900F0E161A6 :100678004900DD09C73641057184C6DECA5040C14C :100688008C05318E31AD128C04318E318D03BDD87D -:1006980031FFBDDADADAADD8FD0C0CC0D261E8EF73 -:1006A800FE615904EF8B8C05318EFD4409D261E857 +:1006980031FFBDDADADAADD8FD0D0CC0D261E8EF72 +:1006A800FE615904EF8B8C05318EFD4509D261E856 :1006B800EFFEC73641057184C6DC06615905ED2D8C :1006C8000671605005CC0200CC03008C034C09DE97 :1006D800248C03318E1249F61F728C03318E04F676 :1006E8004F14896142DF03F6EF01E6600E029C02B7 -:1006F800615903EFD68C02D1DF08FDCA0AFDDC0B75 -:10070800EF0C5008C15013FD5A08C0FDC90A100665 +:1006F800615903EFD68C02D1DF08FDCB0AFDDD0B73 +:10070800EF0C5008C15013FD5A08C0FDCA0A100664 :10071800C6D7C72004FBF8FF715B21CC0100F6BCEB :1007280002AC02440900DE3EAC0204F61F1441008C :10073800118972AC020C5114896142DF03F6EF0192 @@ -142,134 +142,134 @@ :1007F800E6BC02F6614902DDB00000000061790242 :10080800EFF1CE3708CBE4FFFFCBE6FFF7CED4FFFE :10081800CF370008F5120561FDF5ABFFFD1C09D2C5 -:100828005008C15014FD5A08C0D2FDCA0AD2FDDCD6 +:100828005008C15014FD5A08C0D2FDCB0AD2FDDDD4 :100838000B1004C6D73184BD02EFFA717BBDCBE43F :10084800FFFFCBE6FFFFCBD4FFFF717ABED7717BEA :10085800BED7C7C1200AFBF8FF8C0A318E31ADC163 :10086800317B9DD4C0BC048DD49C068C129C098C11 -:1008780012318E040C00128C09318EBDD813FD9BE9 -:100888000E61C8ED1709CEABAC8C09318EFD3C0961 -:10089800D2DD098C09318EFD4009EFEDCC08008CC2 +:1008780012318E040C00128C09318EBDD813FD9CE8 +:100888000E61C8ED1709CEABAC8C09318EFD3D0960 +:10089800D2DD098C09318EFD4109EFEDCC08008CC1 :1008A800084C04DE57CEABACF6BC023022F9BBAC28 :1008B80004148C069EFD118972AB146299AC04A1D4 :1008C800BC04617900617902F0E1614902DFE0501E :1008D80040C18C09318E31AD128C08318E318D03B7 -:1008E800BDD831FFBDDADADAADD8FD0C0CC0D2DDE7 +:1008E800BDD831FFBDDADADAADD8FD0D0CC0D2DDE6 :1008F80006FD5608E2EF19615908EFA38C09318EFD -:10090800FD4409D2DD03E2EF07615909ED7708F2EA +:10090800FD4509D2DD03E2EF07615909ED7708F2E9 :10091800100CC6D7C7717B9D717BFAFD3D0830224C -:10092800F9FDEF09FD7A09C6D7FD1C09FDC90AFDC5 -:040938005608F2D794 -:10093C005208EF065203EF025206FEE600FE1B00C1 -:10094C00DC16089F03088F0408089F040862FE2425 -:10095C0000089F0408EEBF00EEBA00C1C514410E9A -:10096C0011D9D0FF118FD1FF312E45C4C0D7F23130 -:10097C00A2C401E2D79DE261DD4C09DF12717BFA62 -:10098C00C18F06089F4FFDC0CF060800EE2700312F -:10099C00F2FA04CF0608004C00DF05D50008DD167E -:1009AC0061DD717BFAD50608DD0ACDE31F61CD61EF -:1009BC00CDEE160061CDFED40061FFFE9A00FCF86E -:1009CC00FF0EFEB20061CDFED5004C09DF0EC18FCB -:1009DC0006086F4FFD9F0608C0EE0400CF06080006 -:1009EC00F8E3D75200EF025202FE3700CF4EFD0063 -:1009FC00CF060800BF0408C716629F00084100110B -:100A0C008F78239B4100118F79239F0108C65100D9 -:100A1C00FE62FFEF025205CF060800C1510CFE0A20 -:100A2C0000C0D7C1511DFE0200C0D761DD717BFA39 -:100A3C0070CEC0A59EC47CFF9EC4609EC461CDD701 -:100A4C0061DD717BFAC18EC45C1BFED6FFCF06083C -:100A5C0001FED7FFC061CDD731F2FA1AC1AEE4BFA7 -:100A6C0040FDAEE6BF42FDAED4BF44FD30FFFFBE3D -:100A7C00E4BEE6BED4C0D731F2FA11C1AF40FDBE20 -:100A8C00E4AF42FDBEE6AF44FDBED4C0D7C1BF4605 -:100A9C00FD13BF48FD15BF4AFD17BF4CFDC0D7AFB6 -:100AAC0046FDDB48FDEB4AFDFB4CFDD7534B30526A -:100ABC005430324E323030475631323000FFC15054 -:100ACC00FEFEAB0061DD717BFACF060800FE0A006A -:100ADC00FEA4FF61CDF8E3EECF00C7FB0408BF40D6 -:100AEC00FD8FC0009C05C5C337040600BF42FD3511 -:100AFC00362E0B300000522BFE6600C2C4C630DC12 -:100B0C000AB800300000B8022004AF42FDB8003033 -:100B1C000F00B802AF40FD61FF520AFE3AFFECF83D -:100B2C00FF0E717BFAC1C7FB04088C05C65C80FE06 -:100B3C000200C0D761DD717BFA70CFC0FFA59FC0EA -:100B4C00007CFF9FC000609FC00061CDD7618BFE11 -:100B5C00E2FF717BBE410011FB000017CEFC00616F -:100B6C00CB089EFDF31161C999A58392DFF7D7FEDF -:100B7C00B1FED54EFDDF23C1CF0308035109FEF4AE -:100B8C00FDC0D2DF37FE3800A20408CF030807519E -:100B9C0009FEE1FDD2B20408DF22C7FB0408318351 -:100BAC0002C6D7C6510AFECCFD624C1FDF06CF4EE3 -:100BBC00FD01EF04CF4EFD00C0EE5BFEC0EE55FE16 -:100BCC00C7C1FB04088B31196C0161589BC0C6D797 -:100BDC00717BFAFE4DFEAF0408040600C1143640CA -:100BEC000B300000522DF3FE77FF8FC000FE2BFE62 -:100BFC0061CF5C807C8073C0041900CEFC0F61CB8C -:100C0C00C55404EF03C55417FE18FEC7360008BBC5 -:100C1C00629C0288089C03D1DD334C41DE2F70F1BD -:100C2C00312DB161090033081C000851FF612A41C4 -:100C3C000E118FD0FF613B118FD1FF6138DC0E8B11 -:100C4C005C03DF0964C6C4FE2BFDEECAFDC6C4EE10 -:020C5C00C3FDD6 -:100C5E0061CF5100718C7109FECBF800FEFC94013E -:100C6E0000F6BF00F953C0F693935820FEDFF9410A -:100C7E0000360A203408FDEF05118B99A7A51744FD -:100C8E004220DFF53602F93008FDEF04CC0000A754 -:100C9E0047DFF941003642203440FDEF05118B99B4 -:100CAE00A7A517444220DFF53640FD3040FDEF0486 -:100CBE00CC0000A747DFF9FCD80000EFFE61DD7124 -:100CCE007BFABEF0ADD8BEF200AEF661CDD7C361F1 -:100CDE00DD717BFABEF0ADD8BEF200DBF6FFADDC07 -:100CEE00BEF000AEF6BDD8AEF40312ADDABEF20021 -:100CFE00AEF661CD03BDDAC2D7C3F33174D9088322 -:100D0E00C1F626D8BDD8C031750683C312F623C2EC -:100D1E00FD290D93DF0312F623C2D7440000DD2612 -:100D2E0061DD717BFACFE80080BEF6F6BEF4BEF24E -:100D3E00ADD8BEF0CFE800818FE8003103FAAEF0F7 -:100D4E00F5E80061CDD7B1D7C3F33174D90883C1AB -:100D5E00F626D8BDD8C0317505C312F623C2FD776D -:100D6E000D93DF0312F623C2D7440000DD2761DDA9 -:100D7E00717BFACFE80080BEF6F6BEF4BEF2ADD8B7 -:100D8E00BEF0CFE800818FE8003103FAAFE000F546 -:100D9E00E80061CDD7ADD8D7C3F33174DB0F83C173 -:100DAE00F626D8BDD861317026DABDDAC031750DA0 -:100DBE0083C312F626DCBDDC61317023C2FDDF0D6C -:100DCE0093DF0CF626D8BDD861317026DABDDAC2B3 -:100DDE00D7C161686BDC6BDDC0DD2F61DD717BFA25 -:100DEE00CFE80080BEF4ADDCBEF6ADD8BEF0ADDA15 -:100DFE00BEF2CFE800818FE8003103FAAEF0BDD825 -:100E0E00AEF2BDDAF5E80061CDD7F6BDD8BDDAD7C2 -:100E1E008292DD2B61DD717BFACFE80080BEF0F6A9 -:100E2E00BEF2BEF46208BEF6CFE800818FE8003154 -:100E3E0003FAAFE0006072AEF0F5E80061CDD76066 -:100E4E0072F6B1D706DABDDAADDC06D8BDD861D8F8 -:100E5E00A6DAD7D1DD17C1C3DAD89DD8ADDA311CE9 -:100E6E0061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD7C -:100E7E001BC1C3DADA9DDAADD8311E33311E3371A0 -:100E8E00F9B4DADFF4BDD813BDDAC2C0D746D8DD67 -:100E9E000771FF7177D971C0D746DADF08C1ADDCB3 -:100EAE0046D8C0DD077177DB71FF71C0D75BDB9D64 -:100EBE00DB605BDA9DDAADDC5BD9085BD808BDD8A8 -:100ECE00D7C3C7F3728EFDC162314C41003600208C -:0B0EDE001161A072C09EFD62C6C2D769 -:100EE900FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF09 -:100EF900FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF9 -:100F0900FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE8 -:100F1900FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD8 -:100F2900FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC8 -:100F3900FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB8 -:100F4900FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA8 -:100F5900FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF98 -:100F6900FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF88 -:100F7900FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF78 -:100F8900FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF68 -:100F9900FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF58 -:100FA900FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF48 -:100FB900FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF38 -:100FC900FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF28 -:100FD900FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF18 -:0D0FE900FFFFFFFFFFFFFFFFFFFFFFFFFF08 -:0A0FF60031333A30333A3530000051 +:10092800F9FDF009FD7B09C6D7FD1C09FDCA0AFDC2 +:050938005608F2D7D7BC +:10093D005208EF065203EF025206FEE600FE1B00C0 +:10094D00DC16089F03088F0408089F040862FE2424 +:10095D0000089F0408EEBF00EEBA00C1C514410E99 +:10096D0011D9D0FF118FD1FF312E45C4C0D7F2312F +:10097D00A2C401E2D79DE261DD4C09DF12717BFA61 +:10098D00C18F06089F53FDC0CF060800EE2700312A +:10099D00F2FA04CF0608004C00DF05D50008DD167D +:1009AD0061DD717BFAD50608DD0ACDE31F61CD61EE +:1009BD00CDEE160061CDFED40061FFFE9A00FCF86D +:1009CD00FF0EFEB20061CDFED5004C09DF0EC18FCA +:1009DD0006086F53FD9F0608C0EE0400CF06080001 +:1009ED00F8E3D75200EF025202FE3700CF52FD005E +:1009FD00CF060800BF0408C716629F00084100110A +:100A0D008F78239B4100118F79239F0108C65100D8 +:100A1D00FE62FFEF025205CF060800C1510CFE0A1F +:100A2D0000C0D7C1511DFE0200C0D761DD717BFA38 +:100A3D0070CEC0A59EC47CFF9EC4609EC461CDD700 +:100A4D0061DD717BFAC18EC45C1BFED6FFCF06083B +:100A5D0001FED7FFC061CDD731F2FA1AC1AEE4BFA6 +:100A6D0044FDAEE6BF46FDAED4BF48FD30FFFFBE30 +:100A7D00E4BEE6BED4C0D731F2FA11C1AF44FDBE1B +:100A8D00E4AF46FDBEE6AF48FDBED4C0D7C1BF4AF8 +:100A9D00FD13BF4CFD15BF4EFD17BF50FDC0D7AFA9 +:100AAD004AFDDB4CFDEB4EFDFB50FDD7534B305259 +:100ABD005430324E323030475631323000FFC15053 +:100ACD00FEFEAB0061DD717BFACF060800FE0A0069 +:100ADD00FEA4FF61CDF8E3EECF00C7FB0408BF44D1 +:100AED00FD8FC0009C05C5C337040600BF46FD350C +:100AFD00362F0B300000522BFE6600C2C4C630DD0F +:100B0D000AB800300000B8022004AF46FDB800302E +:100B1D000F00B802AF44FD61FF520AFE3AFFECF838 +:100B2D00FF0E717BFAC1C7FB04088C05C65C80FE05 +:100B3D000200C0D761DD717BFA70CFC0FFA59FC0E9 +:100B4D00007CFF9FC000609FC00061CDD7618BFE10 +:100B5D00E2FF717BBE410011FB000017CEFC00616E +:100B6D00CB089EFDF31161C999A58392DFF7D7FEDE +:100B7D00B1FED552FDDF23C1CF0308035109FEF4A9 +:100B8D00FDC0D2DF37FE3800A20408CF030807519D +:100B9D0009FEE1FDD2B20408DF22C7FB0408318350 +:100BAD0002C6D7C6510AFECCFD624C1FDF06CF52DE +:100BBD00FD01EF04CF52FD00C0EE5BFEC0EE55FE11 +:100BCD00C7C1FB04088B31196C0161589BC0C6D796 +:100BDD00717BFAFE4DFEAF0408040600C1143641C8 +:100BED000B300000522DF3FE77FF8FC000FE2BFE61 +:100BFD0061CF5C807C8073C0041900CEFC0F61CB8B +:100C0D00C55404EF03C55417FE18FEC7360008BBC4 +:100C1D00629C0288089C03D1DD334C41DE2F70F1BC +:100C2D00312DB161090033081C000851FF612A41C3 +:100C3D000E118FD0FF613B118FD1FF6138DC0E8B10 +:100C4D005C03DF0964C6C4FE2BFDEECAFDC6C4EE0F +:020C5D00C3FDD5 +:100C5F0061CF5100718C7109FECBF800FEFC94013D +:100C6F0000F6BF00F953C0F693935820FEDFF94109 +:100C7F0000361A203408FDEF05118B99A7A51744EC +:100C8F005620DFF53602F93008FDEF04CC0000A73F +:100C9F0047DFF941003656203444FDEF05118B999B +:100CAF00A7A517445620DFF53644FD3044FDEF0469 +:100CBF00CC0000A747DFF9FCD80000EFFE61DD7123 +:100CCF007BFABEF0ADD8BEF200AEF661CDD7C361F0 +:100CDF00DD717BFABEF0ADD8BEF200DBF6FFADDC06 +:100CEF00BEF000AEF6BDD8AEF40312ADDABEF20020 +:100CFF00AEF661CD03BDDAC2D7C3F33174D9088321 +:100D0F00C1F626D8BDD8C031750683C312F623C2EB +:100D1F00FD2A0D93DF0312F623C2D7440000DD2610 +:100D2F0061DD717BFACFE80080BEF6F6BEF4BEF24D +:100D3F00ADD8BEF0CFE800818FE8003103FAAEF0F6 +:100D4F00F5E80061CDD7B1D7C3F33174D90883C1AA +:100D5F00F626D8BDD8C0317505C312F623C2FD786B +:100D6F000D93DF0312F623C2D7440000DD2761DDA8 +:100D7F00717BFACFE80080BEF6F6BEF4BEF2ADD8B6 +:100D8F00BEF0CFE800818FE8003103FAAFE000F545 +:100D9F00E80061CDD7ADD8D7C3F33174DB0F83C172 +:100DAF00F626D8BDD861317026DABDDAC031750D9F +:100DBF0083C312F626DCBDDC61317023C2FDE00D6A +:100DCF0093DF0CF626D8BDD861317026DABDDAC2B2 +:100DDF00D7C161686BDC6BDDC0DD2F61DD717BFA24 +:100DEF00CFE80080BEF4ADDCBEF6ADD8BEF0ADDA14 +:100DFF00BEF2CFE800818FE8003103FAAEF0BDD824 +:100E0F00AEF2BDDAF5E80061CDD7F6BDD8BDDAD7C1 +:100E1F008292DD2B61DD717BFACFE80080BEF0F6A8 +:100E2F00BEF2BEF46208BEF6CFE800818FE8003153 +:100E3F0003FAAFE0006072AEF0F5E80061CDD76065 +:100E4F0072F6B1D706DABDDAADDC06D8BDD861D8F7 +:100E5F00A6DAD7D1DD17C1C3DAD89DD8ADDA311CE8 +:100E6F0061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD7B +:100E7F001BC1C3DADA9DDAADD8311E33311E33719F +:100E8F00F9B4DADFF4BDD813BDDAC2C0D746D8DD66 +:100E9F000771FF7177D971C0D746DADF08C1ADDCB2 +:100EAF0046D8C0DD077177DB71FF71C0D75BDB9D63 +:100EBF00DB605BDA9DDAADDC5BD9085BD808BDD8A7 +:100ECF00D7C3C7F3728EFDC162314C41003600208B +:100EDF001161A072C09EFD62C6C2D7C3C7F3728EE6 +:100EEF00FDC1625C0F0C000FFE00314C4100360A51 +:0F0EFF00201161800FFE0073C09EFD63C6C2D735 +:100F0E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE3 +:100F1E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD3 +:100F2E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC3 +:100F3E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB3 +:100F4E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA3 +:100F5E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF93 +:100F6E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF83 +:100F7E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF73 +:100F8E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF63 +:100F9E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF53 +:100FAE00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF43 +:100FBE00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF33 +:100FCE00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF23 +:100FDE00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF13 +:080FEE00FFFFFFFFFFFFFFFF03 +:0A0FF60031333A33393A3134000048 :10100000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0 :10101000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0 :10102000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD0 @@ -527,24 +527,24 @@ :101FE000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF01 :101FF000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1 :0A20000000060C12181E242A3036C8 -:10200A00FF000000555555554700DCFB00003EFC1B -:10201A00000000005D3FBA39C423182FA9302631C9 -:10202A0068325340214A52400D4200000000983A5B -:08203A00F82A2330129900007E -:08204200317503F7332312D7B7 -:10204A00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF96 -:10205A00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF86 -:10206A00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF76 -:10207A00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF66 -:10208A00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF56 -:10209A00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF46 -:1020AA00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF36 -:1020BA00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF26 -:1020CA00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF16 -:1020DA00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF06 -:1020EA00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6 -:0620FA00FFFFFFFFFFFFE6 -:0A21000031333A30333A3530000035 +:10200A00001632486480961228446076920824406A +:10201A00FF000000555555554700DCFB0000000045 +:10202A003EFC000000000000963FD739C423372F3A +:10203A00C830453187328A405C4A3C094442000034 +:0C204A000000983AF82A23301299000098 +:08205600317503F7332312D7A3 +:10205E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF82 +:10206E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF72 +:10207E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF62 +:10208E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF52 +:10209E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF42 +:1020AE00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF32 +:1020BE00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF22 +:1020CE00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF12 +:1020DE00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF02 +:1020EE00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2 +:0220FE00FFFFE2 +:0A21000031333A33393A313400002C :10210A00AEF0B430B740BA30BB50BBB0BC50BD1013 :10211A00BD60BDB0BFE0C2B0C420C7B0CAE0CE1037 :10212A0001F0141014200630639049006E00777095 @@ -592,8 +592,8 @@ :1023C4008F09FDB009FDD161E8ED9024CF09FD80AE :1023D400710407E6613012F6712420611043DD3286 :1023E400710407E661306061FB7121203124201300 -:1023F4007130E3FB5002C15011FD1238C0CF0BF90C -:1024040002EF0F7138E3FBE0C15011FD1238C0F543 +:1023F4007130E3FB5002C15011FD3038C0CF0BF9EE +:1024040002EF0F7138E3FBE0C15011FD3038C0F525 :102414000BF94002F94BDC164002F9B9DE10400C0E :10242400F928DE05A00CF9EF27711320EF224002F2 :10243400F93EDC064002F9BDDC10400DF928DE054A @@ -605,9 +605,9 @@ :10249400FD76FDD224D51FF9DD05710320EF2D66ED :1024A4004F08FD61F83134201A713320FD2D056683 :1024B4004C07DD0381DF098F1EF9313303FD6A25E3 -:1024C400FD8F25710220301727FDAF3CC6D7C77199 -:1024D4006201717201E0FD80025008FD563B629F6B -:1024E40002F95009FD563B62767163014002F9F12D +:1024C400FD8F25710220301727FDE83CC6D7C77160 +:1024D4006201717201E0FD80025008FD733B629F4E +:1024E40002F95009FD733B62767163014002F9F110 :1024F400DC05E51FF9EF0F4002F904DE06CF1FF9F2 :1025040002EF03F51FF9664CEADC06CF08FD07EF7E :1025140044664CC6DC06CF08FD06EF39664C9FDCEA @@ -647,9 +647,9 @@ :1027340010F98F02F99F0EF98F02F95070D61230FA :102744007351230480001231FF318E039F0FF99FD0 :10275400DEFBF6BB8F0FF97C804C95DC1B8F0FF9E9 -:10276400318F241400BDD8AF06F9FDCB0C1231FF14 +:10276400318F241400BDD8AF06F9FDCC0C1231FF13 :10277400318E03318FBBEF198F0FF9318F24140081 -:10278400BDD8AF08F9FDCB0C1231FF318E03318F68 +:10278400BDD8AF08F9FDCC0C1231FF318E03318F67 :10279400BBD904F9F1610900BB44000171FEDC03FB :1027A400F690BB8C0101DE02F6BBABABBF6EFC172F :1027B400C15002C1500CC1506CFD08041006D2DF98 @@ -662,24 +662,24 @@ :1028240002C15004C1506CFD60031006D2DD10716A :1028340000E2FB710320F5DFFBE520F9ED1B298C99 :1028440006318E318D080E07081C00BBD908FDF136 -:10285400041023148972ABFD1E0EBB8C019C068BE5 +:10285400041023148972ABFD1F0EBB8C019C068BE4 :102864009C0717040400C15002C1C1506CFD6003F1 :102874001006D261E8ED1B298C049FE1FB8C043126 :102884008E318D080E05081C00BBBDD8F6BDDAC913 -:10289400DC01A5FDA70EDC09CC0364F6BF12F9EF39 +:10289400DC01A5FDA80EDC09CC0364F6BF12F9EF38 :1028A40076ABBDD8F6BDDAAF12F9BDDCF6BDDEAD50 -:1028B400D8C1ADDAC1C9D800A0F6BDDAADDEFD528B +:1028B400D8C1ADDAC1C9D800A0F6BDDAADDEFD538A :1028C4000EADD8BDDCADDABDDEC0BDDAC0BDD8AD5D -:1028D400DEFDA70E61D309CC031EF6BF12F9EF3754 -:1028E400ABBDD8F6BDDAC9DC819DFDA70EDC0BCCEF +:1028D400DEFDA80E61D309CC031EF6BF12F9EF3753 +:1028E400ABBDD8F6BDDAC9DC819DFDA80EDC0BCCEE :1028F400030A30F401BF12F9EF1DABBDD8F6BDDAFF -:10290400C9DC019BFDA70EDC0BCC030530F401BF31 +:10290400C9DC019BFDA80EDC0BCC030530F401BF30 :1029140012F9EF03E520F93134040D31120509CF22 :10292400DFFB64F5E0FBEF1A8C064E03DE0C8C062D :102934009FDFFB8C079FE0FBEF088C039FDFFBF519 :10294400E0FB40DFFB0BDE064014F90BDE1640DF34 :10295400FB06DE064014F906DE0AD5DFFBDF0ED5E2 -:1029640014F9DD095020C15011FD1238C08FDFFB6E +:1029640014F9DD095020C15011FD3038C08FDFFB50 :102974009F14F9D51CF961F8CF14F964401CF903CC :1029840061E8F515F940DFFB0BDE03E6EF01F660C5 :102994009C058F15F94E05DD0F8C059F15F98C05E7 @@ -688,7 +688,7 @@ :1029C4000FC15002C15084FDD20310045003FD8096 :1029D40002501FC15002C15084FDD203100450168E :1029E400FD80025003C15084FD3603C0625C01D1F6 -:1029F400DD107170E3FB5002C15013FD1238C0E2C8 +:1029F400DD107170E3FB5002C15013FD3038C0E2AA :102A0400EF01F2C6D7C75004C15084FD3603C0623B :102A14005C03D1DD405014FD912A34E3FB895C9FB3 :102A2400998A0C7CFF50FF5C14D1DD228A0C7CFF58 @@ -697,7 +697,7 @@ :102A5400FB895CEB995002C15084FD3603C0D2DD82 :102A6400225007C15002C15084FDD20310045033D8 :102A7400FD8002F0C15002C15084FDD203100471E4 -:102A840078E3FBE0C15013FD1238C0C6D7C7C1209C +:102A840078E3FBE0C15013FD3038C0C6D7C7C1207E :102A940004FBF8FFCC02005004C15084FD3603C08F :102AA400629C038C045C20D1DD0E8C036C019C03BE :102AB4008C026C209C02EF138C045C10D1DD0C8C16 @@ -713,592 +713,591 @@ :102B54006159018C01D1DFF4716307716B27F210A5 :102B640006C6D7C7D9D7FBC15006C15084FDD203CE :102B740010046276D9D8FBC15007C15084FDD2033A -:102B840010046261666672C6D7FD672BF2D77113B3 -:102B940000711B20710303710205E0C15003C15091 -:102BA40084FDD20310045013FD8002F0C15005C10E -:102BB4005084FDD2031004500FC1E0C15084FDD2F3 -:102BC400031004500AFD80027103055008FD8002C1 -:102BD400501FC1E0C15084FDD20310045012FD8087 -:102BE400025003C15084FD3603C0625C01D1DF0290 -:102BF400E2D75003C1C15084FDD203100471020313 -:102C0400711A205064FD8002F0C15010FDBC05C053 -:102C1400F0C15011FDBC05C0F0C15012FDBC05C08F -:102C2400F50AF9F2D75003C15084FD3603C0625C43 -:102C340001D1DD195014FD912AFD092A5014FD809B -:102C440002E0C15003C15084FDD20310047113008B -:102C5400711B20710303F0C1E0C15084FDD2031045 -:102C640004F0C15003C15084FDD2031004F2D7C74D -:102C74002004FBF8FFCC02008F0AF99C035010C11A -:102C840050A4FD3603C0629F0AF9D541FBDD04F26E -:102C9400ED4D2D8C037F0AF95C08D1DD108F0AF904 -:102CA4005C08D1DF05CC0210EF03CC02208C037F3B -:102CB4000AF95C04D1DD168F0AF95C04D1DF088CB3 -:102CC400026C049C02EF068C026C089C028FE2FBEF -:102CD4005CF3728F0AF95C0C6162629FE2FB8FEE17 -:102CE400FB7CFF50FF5E029C02D1DD1F34E6FB89B2 -:102CF4006E0299716207CC010031620708615901C3 -:102D04008C01D1DFF4716307716B278F0AF95C4082 -:102D1400D1DD095002C15012FD1238C08F0AF95C8E -:102D240001D1DD08E0C15012FD1238C0717AFA8F6A -:102D34000AF95C41D1DD11340AF9895CBE99D90ADA -:102D4400F9C15010FDBC05C0F21004C6D7FDB0296E -:102D5400F2D7FD092AF2D7C78FF6FB7617FD912A21 -:102D6400664FF6FBDFF2F5F6FBF2C6D771000105FC -:102D740071785005713AD5713BD1713ADD713BD907 -:102D84008F10055CFC9F1005CF54054AE542057180 -:102D940010420571004205714850057130500571AB -:102DA400205005CF530505CF52050A7130510571E6 -:102DB400205105713BD5717050058F11055CFC9F46 -:102DC4001105D77178500571080105D77140F000DD -:102DD40071783002713AE6713BE2713BEA713BEE85 -:102DE4008F10055CFC9F1005CF34024AE552FF7139 -:102DF4001A52710A52714830027130300271203017 -:102E040002CF330205CF32020A71303102713BE640 -:102E1400717030028F11055CFC9F110571603002E6 -:102E2400D7717830027148F000D7C78806166661FA -:102E34004FDD0967614EDE0396EF01866672C6D7E1 -:102E4400C7161714AA0412A943DD29AA0412A92338 -:102E5400FD4220C3AC02FD422013C2BDD813FD9B2A -:102E64000EDE0C1714AA0212AA0403BA04EF051703 -:102E740014A9BA04AC041231FF319E03317F0872E5 -:102E840008C6D7C77100F200304400BFB601300154 -:102E940088BF9001300984BF9E01BF9C01BF9A0185 -:102EA400BF9801BF9601BF9401BF9201F53CFF306A -:102EB400FE00BFBE01F6BFBC01BFB80150EEBFBAF1 -:102EC40001A1BFB201C918FE007120120571481E8C -:102ED400F9401FF901DD0B36100571A461C871407A -:102EE4001EF971281205F6BE6EBE64BE6A715301E6 -:102EF4007103018F1EF9313507F5FDFBCB6CFF0023 -:102F0400710321C6D730EF00BFB401F6BFBA017117 -:102F140008F200D7711321D9FDFBF1E7240000DD8D -:102F24001223DD1923DD1123DD2623DD3423DD39CE -:102F340023DD3FFDB32FEF3DFDD62FEF38D9FCFB4A -:102F4400C1AE6CFD2E2EC0F313BE6C717320EF2541 -:102F5400F0C1AE6CFD2E2EC0F313BE6C717320EF66 -:102F640014F6BE6C717220EF0CCB6CFF00717320F1 -:102F7400EF03FD53308F1EF9314508717420712120 -:102F840004EF06717420715101311421218F1EF94F -:102F9400314510F6BE64BE6A3174200390EF01F629 -:102FA400BE6ED731742004F690EF01F6BE6AD7CF17 -:102FB40010FD47F5A8FBAE6C317DBFAEFBFD28309C -:102FC400D2DF0ED9FCFBC1AE6CFD2E2EC0F313BEB6 -:102FD4006CD7FD2830D2DD0FCF10FD47F5A8FBAE2E -:102FE4006C317DBFAEFBD7E9A8FB0918235080D60E -:102FF400BFAAFB22AEFBBDD8304700FD070DBFAC16 -:10300400FB30AAFBFD442EF313BE6CB010FDD510AB -:10301400FDDF10CF10FD47A0A8FB40A8FB1F61C82F -:10302400F5A8FBD740DFFB0BDC05717320F2D7401A -:10303400DFFB0661D831120511F0C1AE6CFD2E2EF6 -:10304400C0F313BE6C717220EF03FD5330E2D771ED -:103054001221F0C1AE6CFD2E2EC0F313BE6CA0B0D5 -:10306400FB40B0FB40DC3DF5B0FBD9B1FBF1313F97 -:10307400040CFD14D9B1FBF1BDD85008FD560D0860 -:103084007208E6D2DD040192DFFC896158D1DD05C6 -:10309400717220EF03717320A0B1FB40B1FB20617A -:1030A400C8F5B1FBD78FB2FBB0B2FBD1DF7331D41B -:1030B400D106715BD1E5B4FBD5B4FBDD347140E2DC -:1030C400FBD9B3FBF1E734020023DD0625DD03253C -:1030D400DF05F6BE66EF06D9FCFBF1BE66A0B3FBC6 -:1030E40040B3FB20DF06F5B3FBB0B4FBCFB2FB1952 -:1030F400D7CFB2FB1E7148E2FBD5FEFBDF04F6BE60 -:1031040066D7D9FCFBF14266FFDD16D9FCFBF11250 -:10311400AE6643DE05A266FFEF03B266FFCFB2FBE5 -:1031240003D731142101D7401CF902DF19F6BE641C -:10313400BE6EBE6ABFB8FBBFBEFBBFC4FBBFBCFB59 -:10314400BFC2FBBFC8FB31042103EDFB31D5B5FB86 -:1031540061E8EDF6318F44FB9FB5FB40B6FB1FDC05 -:103164001F710002FC4046FBFFDD24D5B7FBDD05E3 -:10317400B0B7FBEF1A8F46FB9FB7FBF5B6FBEF0F1B -:10318400710802FCD9B6FBF1A1605C1F9FB6FBE994 -:10319400B6FB0948FB5080D6BFB8FBE9B6FB09680B -:1031A400FB5080D6BFBEFBE9B6FB0988FB5080D636 -:1031B400BFC4FBAFB8FB22BCFB12D945FBF133BD46 -:1031C400D813FD070DBFBAFBAFBEFB22C2FB12D959 -:1031D40045FBF133BDD813FD070DBFC0FBAFC4FBE6 -:1031E40022C8FB12D945FBF133BDD813FD070DBF2F -:1031F400C6FBB0B5FBEF3DF6BFB8FBBFBEFBBFC41B -:10320400FBAFBCFB1231FF31AE03316F12F623BFAB -:10321400BAFBAFC2FB1231FF31AE03316F12F6239A -:10322400BFC0FBAFC8FB1231FF31AE03316F12F6E2 -:1032340023BFC6FB8F1EF931451F30C4FBFD442E4E -:10324400F313BE6430B8FBFD442EF313BE6E30BEE0 -:10325400FBFD442EF313BE6AD730C4FBFD442EF3AA -:1032640013BE6AD7C73122210BD5CAFBDD06B0CA0B -:10327400FBED2F33712321D9FFFBF1E7240000DD9F -:103284000F23DD1B23DD1123DD5723DD2923DD3B44 -:103294005600F511FDED1B335601F511FDEF78D500 -:1032A40011FDDF075601E511FDEF055600F511FD8F -:1032B400CFCAFBFAEF61D511FDDF0B5601E511FD15 -:1032C400CFCAFBFAEF51F5FFFBEF4CD511FDDF0B35 -:1032D4005600E511FDCFCAFBFAEF3CCFFFFB02EF2E -:1032E40036D92FFCF1E7240000DD0923DD2423DD9A -:1032F4000A23EF1E5600F511FDEF1CD511FDDF0763 -:103304005601E511FDEF055600F511FDCFCAFBFA94 -:10331400EF055601E511FD8F1EF93145086661FB85 -:10332400715107EF066661FB710101C6D7C736F01C -:103334000071F4DC297170F000CE9D08CE9EC0CEE1 -:103344009F80F594FFF593FFF592FFE597FFE596CF -:10335400FFCE9505CE9810CE9C7F7100D6FB711BD5 -:10336400E3712BE3711AE7712BE7717A9D710A9E61 -:1033740031929E02EFFA710B9E71332171432171D8 -:103384005321C6D7C73132211E713221710A9E31B1 -:10339400929E02EFFA3404FC3692FF52078B99A5F1 -:1033A400A792DFF9710B9EC6D7C788061631422152 -:1033B40015714221C734CCFB3092FF1652078B990A -:1033C400A5A792DFF9C666736718CCFBC6D7C77189 -:1033D40033213144211E714321710A9E31929E0290 -:1033E400EFFA3492FF36CCFB52078B99A5A792DFF4 -:1033F400F9710B9E31542113717B9E8F0CFC9E9AA4 -:103404008F0DFC9E9B714321717A9EC6D7CFD7FB4B -:103414005CCFD8FB5FCFF8FB32D7C7CFD4FB10CF3C -:10342400D5FB30CFFCFBFFF5FDFBF5FEFBF5FFFB09 -:10343400F500FCCFF9FB20F5FAFB5600664C64DE80 -:1034440008723844FB0086EFF3C6D7C78806161700 -:10345400F1E73403002361E3ED56372361F8ED33DC -:1034640035B12361E3ED3A352561F8ED493524079B -:103474000024070061D8ED5637240B0061F8ED6A8B -:10348400352361F8EDB1352361F8ED7E352361F81C -:10349400ED2C372561F8ED40372561F8ED1A36B18A -:1034A4002561D8ED3E3624000061F8ED4B362361EA -:1034B400F8ED56372402002361E3ED5B362361F80F -:1034C400ED6D362361F8ED7F362361F8ED6D36231B -:1034D40061F8ED91362361F8EDA3362361F8EDB37D -:1034E400362361F8EDBC362361F8EDC8362361F864 -:1034F400EDD4362361F8EDDD362402002361E3EDDB -:10350400563724020061F8EDE5362361F8EDF13613 -:103514002561F8EDFD36240A0061F8ED093724121F -:103524000061F8ED26372361F8ED1437ED5837675D -:103534009FD6FBED6237308D2BFDAF3C6673671869 -:10354400D4FBED623740D9FB6ADF1440DAFB68DF55 -:103554000E674C6CDF09301145FDAF3C713AD567FD -:103564009FDBFBED623767D1DD0630C040FDAF3C29 -:1035740034F4FB89616F99ED6237675C02D1DD0831 -:1035840030512DFDAF3CEF0C675C01D1DD063056A8 -:103594002DFDAF3C675C3CD1DD10305B2DFDAF3CB5 -:1035A400675C3C7266736218D4FBED623767D1DDE9 -:1035B400625C01D1DD05300800EF01F6609F2BFC51 -:1035C400675C02D1DD03E6EF01F6342BFC89616808 -:1035D40099675C04D1DD04E6A1EF01F6342BFC8984 -:1035E400616899675C08D1DD05302000EF01F6348D -:1035F4002BFC89616899675C10D1DD05301000EF00 -:1036040001F6342BFC89616899675C20D161E8710B -:10361400602BFCED6237D516F9DF09679FFDFBA02F -:1036240016F9EF134016F905DE0DD916F9F1B112AA -:1036340067480CFDA016F9ED6237675C0F7266737C -:103644006218D4FBED62374016F964DE0AE916F914 -:10365400671844FBA016F9675C7F318EC117F1240B -:103664003000FDAD33C0ED6237675C3F318EC1176A -:10367400F1243000FDAD33C0ED6237675C07318E55 -:10368400C117F1243000FDAD33C0ED6237675C1F14 -:10369400318EC117F1243000FDAD33C0ED623767C0 -:1036A400318EC117F1243000FDAD33C0ED623767B0 -:1036B4009E999F0BFCED6237715221675C7F9F0CD2 -:1036C400FCED6237715221675C3F9F0DFCED623760 -:1036D400675C3F9F0EFCED6237675C1F9F0FFCEF3A -:1036E4007D30E93EFDAF3C679F14FCEF7130A43E92 -:1036F400FDAF3C679F15FCEF6530C63EFDAF3C67F0 -:103704009F18FCEF59675C01D1DD53FD2A48EF4E49 -:103714004026FCC8DE48E926FC671872FAA026FC9D -:10372400EF3C679F26FCEF3667318E247200DF067C -:10373400303109FDAF3C679FF7FBEF228FFAFB6145 -:103744007F5C12D1DD0630453AFDAF3C679FFAFB42 -:10375400EF0CEF0A664C52DE05736718D4FBC6D72C -:10376400C716664C30DC094C37DE05FD8833EF673D -:10377400664C02DF1F8FD6FB5C03728F2DFC5C034B -:10378400318E316D08616A08128F2DFC5C80312AFC -:103794006162EF49664C3DDF0AAE90BF28FCF92810 -:1037A400FCEF3A664C3EDF05F929FCEF30664C4FDE -:1037B400DF05FD4E48EF26664C61DF09E926FC096A -:1037C40072FA72EF18664C7FDF0D304D41FDAF3C4D -:1037D400713AD5524AEF06667309D4FB72C6D7C74D -:1037E40088061617F1241000240500DC07244C0079 -:1037F400DD17EF18717BFA17F104D4FB1489617F8C -:1038040099717AFA716221EF03A026FCC6D7C7C169 -:10381400C1FBF8FF401CF903DD06401CF904DF2F4F -:103824008C027309DCFB5E0AD1DF248C02318E0426 -:10383400D4FB14896E0A99716207CC0100316207C6 -:10384400086159018C01D1DFF4716307716B271092 -:1038540004C6D7CF2DFC03F52BFCF52FFCF531FC6A -:10386400D7C788061617F1E734020025DD4923DDA2 -:103874001A25DD2823DD0523DD37EF477112226782 -:103884009F30FC30453AFDAF3CEF38675C03D161B3 -:10389400F8710223675C839F2DFCEF27675C039F0D -:1038A4002FFC675C034C0261F8712221FD6832EF42 -:1038B40012679F31FCEF0C6791DF08E0C15012FDE5 -:1038C4001238C0C6D7C71617F1E724000061F8ED17 -:1038D4005B3923DD61240300DD0C240200DD602458 -:1038E400F900DD7AEF7B40DFFB5BDC06CF2EFC0FBB -:1038F400EF3240DFFB4CDC06CF2EFC0BEF2640DF23 -:10390400FB33DC06CF2EFC07EF1A40DFFB0BDC0693 -:10391400CF2EFC03EF0E40DFFB06DC05E52EFCEFAB -:1039240003F52EFC31020705308000EF01F6086F25 -:103934002EFC7208EF318F2BFCF52BFC72EF284024 -:10394400DDFB01DD0FD9DDFBF11231FE03311F0870 -:103954007208EF13E2EF107172225235EF09F2EFA1 -:10396400066673092AFC72C6D7C71617F1E7240046 -:1039740000DD38241000DD1C23DD1C23DD30240E83 -:1039840000DD18241100DD1B240F00DD122430009B -:10399400DD15EF1EE2EF1D5202EF195204EF15522E -:1039A40006EF115205EF0D5207EF09F2EF0652032D -:1039B400EF0252FFC6D7C78F1AFDB01AFDD1DF72CE -:1039C400CF1AFD0731742150717321401CF903DFB4 -:1039D400473612FDC7D93CFCFD873B618A70618A7A -:1039E400FDB63BC03616FDC7D93BFCFD873B618A5B -:1039F40070618AFDB63BC0D93EFCF1312F609F3D1A -:103A0400FC8F3AFC4F3DFCDD0F7102228F3DFC9F81 -:103A14003AFC30453AFDAF3C7150F000CE300BCF4C -:103A2400170006CE3106FD1203717A30710BE37173 -:103A34000BE7C6D78F3DFC9F3AFC8F3DFC9FDDFB17 -:103A4400D7401CF903DD02F2D78FFAFB5C12D1DDFB -:103A54000C8F3DFC9F42FC7148FAFBEF6A31042253 -:103A6400247103227123228FFAFB5C04D1DD088FB9 -:103A7400F9FB9F43FCEF068F3DFC9F43FC8F43FC07 -:103A84009F42FCEF423114222C711322712222D561 -:103A940030FCDF05F544FCEF0B8F30FC5002D6A15F -:103AA400609F44FC8F44FC9F42FC5040C15012FD77 -:103AB4001238C0EF12312222088F43FC9F42FCEFE0 -:103AC400068F44FC9F42FC8F42FC9FDDFB4042FC7E -:103AD40001DF05E530FCEF0ED942FCF11231FE03A3 -:103AE400311F609F30FC8FFAFB5C01D1DD02F2D7FD -:103AF400E942FC09382370C15013FDBC05C0F2D75C -:103B0400C7168B728C01614ADE248B728C02614A67 -:103B1400DE188C01728C02614ADE068C01318EEF54 -:103B2400048C02318E087208EF268B72EF228B729E -:103B34008C02614ADE048B72EF168C01728C026176 -:103B440042DE068C01318EEF048C02318E0872083D -:103B5400C6D7C716710AE7710BE37150F000CE3077 -:103B64000BCF170006669E31FD1203717A30710B7C -:103B7400E33182E302EFFA8D1F7158F000710BE715 -:103B840072C6D7C7C1C1FBF8FF8C024CF0DC0452EB -:103B9400FFEF1B8C024C05DE03F2EF128C022C04A7 -:103BA4009C02318E318D52ECFD1E0EBB8B721004C3 -:103BB400C6D7C7C1C1FBF8FFAC0A14A91489708C1D -:103BC400026128706131FD42201344030071FEDC60 -:103BD40016AC0A14A9148C0299AC0A14CA0200ACDB -:103BE4000A14CA0310EF6EAC0A14A914894E02DE3B -:103BF4000AAC0A148A02819A02EF13AC0A14A914BB -:103C0400894E0261D308AC0A148A02919A02AC0A62 -:103C1400148A03919A03D1DF3CAC0A148A024C1033 -:103C2400DF10A91489318EA112AC0A14A914629967 -:103C3400EF17AC0A148A024CF0DF0EA91489318EF6 -:103C4400B112AC0A14A9146299AC0A14CA0200ACE9 -:103C54000A14CA03101004C6D7ED9A3C717BFAC744 -:103C6400D550FC61F831342227713322D550FC61E0 -:103C7400E8B050FC717AFA5600664C0BDD1272F310 -:103C8400311C791CFDCEFC0061CAFDF93C86EFE9CC -:103C9400717AFAF2C6D7C75600664C0ADE0BF031C9 -:103CA4007E12F67852FC86EFF0C6D7C7C1C1FBF886 -:103CB400FFCC01008C014C0ADE36717BFA8C01F0DA -:103CC400317E0452FC14A96168DF09AC02B9717A2F -:103CD400FAF2EF1D8C01F0317E127952FC61490237 -:103CE400DF06717AFAE2EF09717AFA615901EFC4D9 -:103CF400E21004C6D7C72004FBF8FFF64252FC6169 -:103D0400F8EDF13D717BFA9C038C034C0ADE4F8C79 -:103D140003F0317E0452FC14A96168DF05717AFA5C -:103D2400EF3C8C03F0317E127952FCE743DF0671DD -:103D34007AFA00EF21717AFA8C0372F3311C79520A -:103D4400FCCEFC0061CA629C02D1DF0A8C03F03114 -:103D54007E12E67852FC717BFA615903EFABCC0218 -:103D640000CC01018C02F0317E0452FC14A961687C -:103D7400DD7B8C02F0317E127952FCE743DF688CE4 -:103D8400014C0ADE628C01F0317E127952FCE74369 -:103D9400DD50717BFA8C01F0317E0452FC14A96170 -:103DA40068DF1B616901717BFA8C01F0317E12F6C8 -:103DB4007852FC717AFA8C024E01DCE7EF2F8C0109 -:103DC400F0317E0452FC14A9128C02F0317E337857 -:103DD40052FC8C01F0317E12E67852FC615902717A -:103DE4007AFA615901EF98615902ED683DCC0200FD -:103DF400CC01008C014C0ADE1E8C01F0317E045291 -:103E0400FC14A96168DF05CC0201EF068C02D161C4 -:103E1400E800615901EFDCF21004C6D7C72006FBA5 -:103E2400F8FF3419FCC55006C150A8C15030FD60DC -:103E3400031006D2DD1DA066FC4066FC08DE03E22A -:103E4400EF5A3414FC895CFC99FDE93E7110E2FBE5 -:103E5400F2EF49F566FC8F14FC5C01D1DD26401CB1 -:103E6400F903DF205010C180FD1238C0C736100599 -:103E740071D4C6DE0F17C15006C150A8C15030FD21 -:103E840060031006401CF901DD11401CF905DD0B2F -:103E94008F14FC5C02D161E8FD1645F21006C6D70A -:103EA400D915FCC15030FD3603C0629F18FC713037 -:103EB400E5FB8FEDFB5C08D1DF06716307716B27AF -:103EC400F2D7D918FCC1D917FCC15030FDD2031068 -:103ED400047130E5FB8FEDFB5C08D1DF06716307ED -:103EE400716B27F2D7C7200AFBF8FF500FC150307F -:103EF400FD3603C04041FB02DF077110E2FBF2EF25 -:103F0400547118E2FBCC0700CC0812CC09808F1442 -:103F1400FC5C03D1DF08717AD5CC0607EF06717B10 -:103F2400D5CC062F17040600C15004C150A0C150BF -:103F340030FD08041006C736100571D4C6DE1540DE -:103F44001CF903DF0F17C15006C150A8C15030FD42 -:103F540060031006F2100AC6D7C78F1CF9318F24EC -:103F64000200DF04F6BF6AFC8F32FDB032FDD1617E -:103F7400E8ED5040CF32FD048F1CF9318FE723DD8B -:103F84000B24020024030061C8ED5040E6A1426AFC -:103F9400FCDF0AE0C15010FD1238C0EF2430C0002D -:103FA400426AFCDF0B5002C15010FD1238C0EF1101 -:103FB4008FF8FB5009D6048000426AFC61D8E520E2 -:103FC400F931340709715322F6BF6AFCEF173154F3 -:103FD4002206F6BF6AFCEF0DA26AFCF6426AFCDF19 -:103FE4000490BF6AFC8F1FF9318FE7240000DD07BE -:103FF400B12361D30CEF1236100571C4716122EF45 -:104004000B710402716122EF037162223162221A80 -:10401400406CFC0361D8A06CFC406CFC02DF0E50C9 -:1040240004C15010FD1238C0EF03F56CFC31420797 -:1040340018406DFC0361D8A06DFC406DFC02DF0CE0 -:104044005010C1FD1238C0EF03F56DFCC6D7D7C7B9 -:104054008F14FC5C03D1DD1136100571D4DE0A30F7 -:10406400203EFDAF3CD261F800401CF903DF1B3158 -:1040740022070730732CFDAF3C003174220C71739E -:10408400225080C15012FD1238C0401CF903DD05D6 -:10409400F6BD1AEF25D500FCDF09F6461ADD1BB67E -:1040A4001AEF17D9FCFBF1461ADD0FD9FCFB12AD50 -:1040B4001A43DE04A61AEF02B61AC6D78FF4FB5CC5 -:1040C40010D161E87112238FF4FB5C0FD1DD758F81 -:1040D400F4FB5C01D1DD05F51CF9EF688FF4FB5CA2 -:1040E40002D1DD15E0C15003C15084FDD203100498 -:1040F400711300711B207103038FF4FB5C08D1DD85 -:1041040005710303EF1C8FF4FB5C04D1DD14711300 -:1041140000711B2031042303710303342DFC895CDB -:10412400FC995005FD80027102035003C1C1508403 -:10413400FDD2031004711A20FD383A30453AFDAF20 -:104144003C710323F5F4FBF2D7C736410571846152 -:10415400D8EDFC413641057194DE0771405005CE1F -:10416400ABAC31B2D104E2ED0B42713BD18F16F905 -:10417400A016F9318EE7240000DD1723DD1C23DDB2 -:104184002723DD2C23DD3823DD4423DD4923DD4EC5 -:10419400EF668F1FF99F4005EF58F0C15084FD363C -:1041A40003C0629F4005EF4A8F08FD9F4005EF4220 -:1041B4005008C1506CFD3603C0629F4005EF335078 -:1041C40009C1506CFD3603C0629F4005EF248F6E19 -:1041D400FC9F4005EF1C8F02F99F4005EF147114FA -:1041E40020E661301271042061DC31196162629F42 -:1041F4004005CEABACE2EF0F71605005714850053D -:10420400713BD5F516F9F2C6D7C78F1CF9318FE784 -:1042140024000061F8EDB04323DD1B2361F8EDC5F4 -:10422400422361F8ED4F432361F8ED8B432361F89A -:10423400ED2044ED8044D51DF9DF2BF6426AFCDD08 -:1042440005F534FDEF03A034FD4034FD65DC09F5CC -:104254001CF9713222ED8344AF6AFC440A0061D830 -:10426400ED8344E51DF9715222F534FDF5F7FBFDAC -:104274002D05713320FD9124401FF903DF097132AC -:1042840022F51CF9ED8344FDD52740E1FB9BDE09B3 -:10429400713222F51CF9ED8344FD922BD2DD0971B4 -:1042A4003222F51CF9ED8344401DF901DF05F5FDCB -:1042B400FBEF04CFFDFB03CF1CF902FD672BED835D -:1042C40044CF350002CF37001DCF120510FD702DED -:1042D400FDD02D714A9DFD5738FD1E34F537FF7111 -:1042E4002BE0F51DF9713222CBE43FEFCBE6F6F07B -:1042F400FD2D05713BD48F1EF93135305004C1506A -:1043040084FD3603C0625C03318E315D34E3FB8986 -:104314006168995002C15084FD3603C0D2DD067134 -:1043240070E3FBEF047178E3FBFD9124FD872E71AC -:10433400381EF9CF1CF9038FD6FB5C02D1DD09507E -:1043440080C15010FD1238C0ED8344FD854431A472 -:10435400E020712BE031020C05FDFE44EF145027E0 -:10436400C15005C15084FDD2031004CF1CF904715F -:1043740032223114230BA070FCD570FC61F8FDFED1 -:1043840044FDF244ED8344FD854431020C18F0C130 -:104394005005C15084FDD20310045005FD8002FD78 -:1043A400FE44CF1CF903FDF244ED8344CFFDFB032F -:1043B400F5FEFB710221F6426CFF61E8ED8344F5E2 -:1043C40000FCF520F9F514FCFDE93EFD092FFDC7BD -:1043D4002DFD252E714B9DF5E4FBF5E5FBF5E6FB84 -:1043E400F5E7FB31542002EFFACE3708CBE4BFFFE8 -:1043F400CBE6FFF1CED4FFCF370009F51205F6BEA8 -:10440400E0BEE2BED0716A27FD292CFD9605F53485 -:10441400FDCF1CF905715222F6BF6AFC3102071B5D -:10442400FD9124AF6AFC440A00DC06E51DF9E51C95 -:10443400F9D51FF9DD49FD9605EF44F51DF9FD9603 -:104444000571730171320431120502EFFA714302EE -:1044540071032071322031949E02EFFA712AE7CE63 -:10446400A409F5F30061FD31040703715322E5F358 -:1044740000CEA408712BE7E51CF9EF0300EFFDC69D -:10448400D7D571FCDF1E310200195003C15084FDE1 -:104494003603C0625C01D1DF07F51CF9713222D703 -:1044A400E571FCD74071FCF0DF083104003FF57181 -:1044B400FCD74071FCC8DF0BF51CF9713222CF71B7 -:1044C400FCF0D731020004A071FCD7F0C15004C144 -:1044D4005084FDD20310048FE3FB5C9F9FE3FB71C8 -:1044E40010F4FB30C040FDAF3CCF71FCF0D7D520B9 -:1044F400F9DD06F51CF9713222D7711323F570FC2E -:10450400717207FD1203FD1203717307D7FD0306D1 -:10451400F2D7C7200CFBF8FF8F1AFCF0F919FCF353 -:1045240003FD422013BC048F1CFCF0F91BFCF303B5 -:10453400FD422013BC028F1EFCF0F91DFCF303FDA9 -:10454400422013BBAC04BDD8F6BDDAAC04311EBDA9 -:10455400DCF6BDDEFDDC0CADD8BDDCADDABDDEAC19 -:1045640002BDD8F6BDDAAC02311EDADCC3DADEC332 -:10457400BDDCF6BDDEFDDC0CC0BDDEC0BDDCADDEE9 -:10458400FD520EADD8BDDCADDABDDEABBDD8F6BD97 -:10459400DAAB311EDADCC3DADEC3BDDCF6BDDEFD28 -:1045A400DC0CC0BDDEC0BDDCADDEFD520EDADAAD22 -:1045B400D8FD8049C3C58FFEFC5C3FF0317E047E8C -:1045C400FC14C2C0B9A0FEFCF6BC08BC0A9C078C53 -:1045D400074C2EDD3E8FFEFC0E0770F161DC605C43 -:1045E4003FF0317E12797EFCBDD8F6BDDA8C0773BC -:1045F400097A23318FBDDC70BDDEFDDC0CAC08BD57 -:10460400DCAC0AFD520EADDABC0AADD8BC08615967 -:1046140007EFBCAC08BDD8AC0ABDDAC9DC0004F6AF -:10462400FDA60DC9DCFFFFF6FDBB0EADD8BF78FCBF -:10463400AF72FC4278FCDD12AF74FCBF76FCAF7243 -:10464400FCBF74FCAF78FCBF72FCAF74FC4276FC18 -:10465400DC50AF72FC4274FCDE48AF36FD4272FCA3 -:10466400DE40407AFC16DC1F407AFCA0DE168F7B0D -:10467400FC4F7AFCDE0EAF72FC227CFC44691061B4 -:10468400C8FDEF46F57AFCAF72FC445146DC0BAF33 -:1046940072FC241027BF38FDEF1930F82ABF38FD0B -:1046A400EF11407AFCFFDD03E6EF01F6347AFC8972 -:1046B400610899AF76FC4274FCDC1BAF74FC427257 -:1046C400FCDE13AF72FC4238FDDE0BF57BFCAF72EF -:1046D400FCBF7CFCEF11407BFCFFDD03E6EF01F641 -:1046E400347BFC89610899100CC6D7C72006FBF8F7 -:1046F400FFA01FFCD51FFCDF1CA020FCD520FCDF85 -:1047040014A021FCD521FCDF0CCF1FFCFFCF20FC23 -:10471400FFCF21FCFF717BFA710A9E31929E02EF5A -:10472400FA8E98FDCF0E9C038E949F3AFD8E969F31 -:104734003BFD8E979F3CFD8E939F00FD8E929F01C3 -:10474400FDFDDD4813BC04BDD8F6BDDA46DADF034F -:10475400B146D8DF2D8C035C0391DF03E6EF01F64D -:10476400046D01313D120103B1BC04616903CF3A08 -:10477400FD23CF3CFD12CF3BFD31CF00FD59CF01CE -:10478400FD598F3DFD4E03DF12AF02FD614904DE8A -:1047940040AC042202FDFD0248EF368C03318EB199 -:1047A40012D93DFDF143DF1E8C035C0391DF03E668 -:1047B400EF01F6046D01313D1201032202FD61098E -:1047C40004FD0248EF0B8F3DFD4E03DE04F6FD02AF -:1047D400488C039F3DFDAC04BF02FDD9FFFCF101F1 -:1047E4000422F9BB14A944FFFFDF04E6B9EF0BABC5 -:1047F40014A944FEFFDD03A9A1B91006C6D7C71644 -:104804001744A90061C836A800A0FFFC40FFFCA81B -:1048140061C8F5FFFCF9FFFCF3311CF67822F9B707 -:10482400F647DFE5C6D7C756A89666F0317E12F67E -:10483400B17822F966D1DFF1F51FFCF520FCF521F2 -:10484400FCF5FFFCC6D7712323D7C72004FBF8FF70 -:10485400D916F9F1E7240000DD1123DD1C23DD2145 -:1048640023DD2623DD2B23DD30EF368FFFFC9F0471 -:10487400FDA016F9F93AFDEF5CA016F9F93BFDEF3E -:1048840054A016F9F93CFDEF4CA016F9F93DFDEFE3 -:1048940044A016F9F900FDEF3CA016F9F901FDEF6B -:1048A40034F904FDF3311C7922F9BB312223058B41 -:1048B4009C03EF128C019C03D504FDDF06CF04FD9D -:1048C400A7EF03B004FD718071272361DC61FB71E4 -:1048D40021238C03721004C6D7C72008FBF8FF8E6F -:1048E400989C058E979C048E969C038E949C028EB5 -:1048F400939C018E929B710B9E717AFA8C05FDCF6D -:104904000E9C058C04FDCF0E9C048C03FDCF0E9CE5 -:10491400038C02FDCF0E9C028C04F0317E1279AA26 -:1049240023BC068C055C03D1DF158C044C03DE0C20 -:104934008C044C02DF098C034C1D61F86179068CF0 -:1049440003318EB1610906BC06313D120103BC0678 -:104954008C060E02708C071C00BC068F24FC4E01D2 -:10496400DC0D8C014F24FCDC0B8F25FC4DDE05ACEB -:104974000612EF04AC06B1121008C6D7C7C3C12093 -:1049840008FBF8FFF661490A61F8614908DF07F797 -:10499400340000ED1D4AE6BC04F6BC06AC0ABC02B9 -:1049A400AC08BBAC06614902AC0461F8614900DEA5 -:1049B40028AC04BDD8AC06BDDAE1FD610EADDABCAD -:1049C40006ADD8BC04ABBDD8AC02BDDAE1FD7C0EAB -:1049D400ADDABC02ADD8BBEFCAAC06BC02AC04BBBA -:1049E400AC08BDD8AC0ABDDAAC04BDDCAC06FDDF56 -:1049F4000DAC04BDDCAC06FD520EE1FD7C0EADDA5F -:104A0400BC06ADD8BC04AC06614902AC0461F861D3 -:104A14004900DCC5AC0214AB12100CC6D7C7D53E96 -:104A2400FDDD05B03EFDEF78CF3EFD0231140706F3 -:104A34007110E3FBEF047118E3FB8FE3FB7F06FDCA -:104A440076D1DD5C8FE3FB9F06FD401CF903DF227A -:104A5400665C10D1DD1C8FE3FB5C10D1DD0B508054 -:104A6400C15011FD1238C0EF095040C15011FD1260 -:104A740038C0401CF903DD06401CF904DF22665CE3 -:104A840002D1DD1C8FE3FB5C02D1DD0B5040C15031 -:104A940010FD1238C0EF095020C15010FD1238C06B -:024AA400C6D773 -:104AA600CF0BF90461FC61FCC1C3C5C7520C9292DD -:104AB60069D4FEC1DFF88EFD708EFCC1717AFA40B2 -:104AC6001CF903DF0630732CFDAF3CC09EFC609ED4 -:104AD600FD34D4FE5206C0B9A5A592DFF9C6C4C2FC -:104AE600C061FC61DF520C929269D4FEC1DFF88E80 -:104AF600FD708EFCC1717AFAC736410571A4C6DC19 -:104B060051F50AFD71485005716050053164213632 -:104B16007162077163218FE4FB5FECFBD1DF1B8FB2 -:104B2600E5FB5FEDFBD1DF128FE6FB5FEEFBD1DF2E -:104B3600098FE7FB5FEFFBD1DD0C31620702EFFA6D -:104B4600716307716B27FD4A48FDD233F516F9EDFF -:104B56006D4CC73641057184C6DE0DF50AFD7148F8 -:104B66005005FDD233ED6D4CC73641057194C6DE56 -:104B760015400AFD03DD0C400AFD04DD06400AFD72 -:104B86000161F8F50AFDD90AFDF1E7240000DD0808 -:104B960023DD1323DD39EF6071405005E50AFD7111 -:104BA600505005ED6D4C8F40059F17F99F1AF9D9A6 -:104BB60017F9FD6437629F19F94017F97FDD06CFB3 -:104BC6000AFD02EF03F50AFD71505005ED6D4CC765 -:104BD6003641057194C6DE1CC736410571C4C6DE72 -:104BE60006CF0AFD03EF11F50AFD71485005716005 -:104BF6005005EF73CF0AFD04400AFD03DF138F193A -:104C0600F99F4005D919F9C1D917F9FDE337C0EF66 -:104C1600108F400576C7D917F9FD4F34C071505033 -:104C260005D91AF9F1242900DD2D240400DD2824F4 -:104C36002200DD23241100DD0C240100DD19241ED1 -:104C460000DD14EF0C4017F960DF0CCF17F961EFA8 -:104C560006F516F9A017F9400AFD03DF0AD917F978 -:104C6600FD6437629F19F9C09EFC609EFD34D4FE38 -:104C76005206C0B9A5A592DFF961FCC1C3C5C752EA -:104C86000C929269D4FEC1DFF88EFD708EFCC1F6DF -:104C960016717AFA714AE5717BBD51405F0401D104 -:104CA600DD05A7F647DFF3300400BF2401F6BF2A6F -:104CB60001300B0BBF2801FD1203300B0FBF28017B -:104CC600FD1203300F0FBF2801710AE6715320C091 -:104CD6009EFC609EFD34D4FE5206C0B9A5A592DFA7 -:104CE600F9C6C4C2C061FCC1C3C5C7520C92926961 -:104CF600D4FEC1DFF88EFD708EFCC1717AFAD54004 -:104D0600FBDD0EEB3EFB899E44A23EFBB040FBEF73 -:104D16002B710AE6300400BF2401F6BF2A01300BCE -:104D26000BBF2801FD1203300B0FBF2801FD120334 -:104D3600300F0FBF2801714320715320C09EFC60C5 -:104D46009EFD34D4FE5206C0B9A5A592DFF9C6C4AD -:104D5600C2C061FC61EF520C929269D4FEC1DFF8C9 -:104D66008EFD708EFCC12008FBF8FF71503002CE1C -:104D7600ABACCC0100F6BC0231B2E210617902F6AE -:104D8600614902DFF371603002ED114E8E519B7165 -:104D96003BE28B5C02D1DD1D8B5C08D1DF097150D3 -:104DA6003002CC0100EFCE8C0770FDC938629E50F0 -:104DB600CC0102EFC08B5C03D1DF408E509C0571A5 -:104DC6005030028C01D1DF0E8C0570FD6D39629C6E -:104DD60007CC0101EF328C014C02DF067160300214 -:104DE600EF29CF34025A716030028C0570C18C07EE -:104DF60070FD6538C0CF34024AEF108B5C01D1DDFF -:104E06000671603002EF0400ED7B4D1008C09EFC79 -:104E1600609EFD34D4FE5206C0B9A5A592DFF961A5 -:104E2600FCC18F0EFC4F96FFDF328F0FFC4F97FFB2 -:104E3600DF2A8F10FC4F98FFDF228FEDFB5C04D139 -:104E4600DF1A7120E5FB716307716B27401CF905BA -:104E5600DD06401CF90161F8CF1DF902C061FCA016 -:104E660050FC61FCC1C3C5C7520C929269D4FEC105 -:104E7600DFF88EFD708EFCC1C1FBF8FF8D1F9C0113 -:104E86008E31318EE7240600DD0823DD0F23DD2574 -:104E9600EF45717AFA8C019F3CFCEF3B717AFA4040 -:104EA6001FF901DF078C019F3BFCEF2B51FF2E0101 -:104EB6009F3BFCEF22717AFA8C019F02F98FE2FB8D -:104EC6005C01D1DF12401CF903DD06401CF904DF4A -:104ED60006301727FDAF3C4031FF09DE05A031FF44 -:104EE600EF197158F000717221404FFC02DF03F692 -:104EF600EF05D94FFCF1A1609F4FFC710BE3C0C0D9 -:104F06009EFC609EFD34D4FE5206C0B9A5A592DF74 -:104F1600F9C6C4C2C061FC61FF520C929269D4FE0C -:104F2600C1DFF88EFD708EFCC1717AFA8F14FC5CBD -:104F360003D1DD19401CF903DD06401CF904DF0D21 -:104F460036100571D4DE0630203EFDAF3CC09EFC17 -:104F5600609EFD34D4FE5206C0B9A5A592DFF96164 -:104F6600FC61FC00EFFD61FC61FC61FC61FC61FC25 -:104F760061FC61FC61FC61FC61FC61FC61FC61FC43 -:104F860061FC61FC61FC61FC61FC61FC61FC61FC33 -:0C4F960061FC61FC61FC61FC61FC61FCE1 -:104FA200FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0F -:104FB200FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -:104FC200FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF -:104FD200FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDF -:104FE200FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCF -:044FF200FFFFFFFFBF -:0A4FF60031333A30333A3530000011 +:102B840010046261666672C6D7FD672BF2D7C72050 +:102B940004FBF8FF711300711B207103037102051C +:102BA400E0C15003C15084FDD20310045013FD80D2 +:102BB40002F0C15005C15084FDD2031004500FC16E +:102BC400E0C15084FDD2031004500AFD8002710359 +:102BD400055008FD8002501FC1E0C15084FDD2039E +:102BE40010045012FD80025003C15084FD3603C00E +:102BF400625C01D1DF03E2EF4717040200C1500217 +:102C0400C15008C1506CFD60031006629C01500362 +:102C1400C1C15084FDD2031004710203711A205003 +:102C240064FD8002F0C15010FDBC05C0F0C150111C +:102C3400FDBC05C0F0C15012FDBC05C0F50AF9F297 +:102C44001004C6D75003C15084FD3603C0625C0132 +:102C5400D1DD195014FD912AFD092A5014FD80027A +:102C6400E0C15003C15084FDD203100471130071FC +:102C74001B20710303F0C1E0C15084FDD203100492 +:102C8400F0C15003C15084FDD2031004F2D7C72011 +:102C940004FBF8FFCC02008F0AF99C035010C150CA +:102CA400A4FD3603C0629F0AF9D541FBDD04F2EDB1 +:102CB4006C2D8C037F0AF95C08D1DD108F0AF95C56 +:102CC40008D1DF05CC0210EF03CC02208C037F0A6D +:102CD400F95C04D1DD168F0AF95C04D1DF088C029B +:102CE4006C049C02EF068C026C089C028FE2FB5C75 +:102CF400F3728F0AF95C0C6162629FE2FB8FEEFB58 +:102D04007CFF50FF5E029C02D1DD1F34E6FB896E1E +:102D14000299716207CC0100316207086159018C84 +:102D240001D1DFF4716307716B278F0AF95C40D11D +:102D3400DD095002C15012FD3038C08F0AF95C0120 +:102D4400D1DD08E0C15012FD3038C0717AFA8F0A23 +:102D5400F95C41D1DD11340AF9895CBE99D90AF9CB +:102D6400C15010FDBC05C0F21004C6D7FDB029F255 +:102D7400D7FD092AF2D7C78FF6FB7617FD912A668D +:102D84004FF6FBDFF2F5F6FBF2C6D77100010571D1 +:102D9400785005713AD5713BD1713ADD713BD98FC9 +:102DA40010055CFC9F1005CF54054AE542057110DF +:102DB400420571004205714850057130500571207B +:102DC4005005CF530505CF52050A713051057120C6 +:102DD4005105713BD5717050058F11055CFC9F1135 +:102DE40005D77178500571080105D77140F000715D +:102DF400783002713AE6713BE2713BEA713BEE8F47 +:102E040010055CFC9F1005CF34024AE552FF711A8D +:102E140052710A527148300271303002712030020E +:102E2400CF330205CF32020A71303102713BE671B1 +:102E34007030028F11055CFC9F110571603002D760 +:102E4400717830027148F000D7C788061666614F62 +:102E5400DD0967614EDE0396EF01866672C6D7C749 +:102E6400161714AA0412A943DD29AA0412A923FDE2 +:102E74005620C3AC02FD562013C2BDD813FD9C0ED0 +:102E8400DE0C1714AA0212AA0403BA04EF051714DD +:102E9400A9BA04AC041231FF319E03317F087208D1 +:102EA400C6D7C77100F200304400BFB601300188B4 +:102EB400BF9001300984BF9E01BF9C01BF9A01BF2E +:102EC4009801BF9601BF9401BF9201F53CFF30FE0B +:102ED40000BFBE01F6BFBC01BFB80150EEBFBA01CE +:102EE400A1BFB201C918FE007120120571481EF974 +:102EF400401FF901DD0B36100571A461C871401E35 +:102F0400F971281205F6BE6EBE64BE6A7153017172 +:102F140003018F1EF9313507F5FDFBCB6CFF007102 +:102F24000321C6D730EF00BFB401F6BFBA01710860 +:102F3400F200D7711321D9FDFBF1E7240000DD1263 +:102F440023DD1923DD1123DD2623DD3423DD39239D +:102F5400DD3FFDD22FEF3DFDF52FEF38D9FCFBC14E +:102F6400AE6CFD4D2EC0F313BE6C717320EF25F0D3 +:102F7400C1AE6CFD4D2EC0F313BE6C717320EF1403 +:102F8400F6BE6C717220EF0CCB6CFF00717320EFF6 +:102F940003FD72308F1EF9314508717420712104CC +:102FA400EF06717420715101311421218F1EF93102 +:102FB4004510F6BE64BE6A3174200390EF01F6BE7C +:102FC4006ED731742004F690EF01F6BE6AD7CF10A5 +:102FD400FD47F5A8FBAE6C317DBFAEFBFD4730D29B +:102FE400DF0ED9FCFBC1AE6CFD4D2EC0F313BE6CDD +:102FF400D7FD4730D2DD0FCF10FD47F5A8FBAE6CEF +:10300400317DBFAEFBD7E9A8FB0918235080D6BF9A +:10301400AAFB22AEFBBDD8304700FD080DBFACFBB8 +:1030240030AAFBFD632EF313BE6CB010FDD510FD6A +:10303400DF10CF10FD47A0A8FB40A8FB1F61C8F517 +:10304400A8FBD740DFFB0BDC05717320F2D740DF10 +:10305400FB0661D831120511F0C1AE6CFD4D2EC0D6 +:10306400F313BE6C717220EF03FD7230E2D771125C +:1030740021F0C1AE6CFD4D2EC0F313BE6CA0B0FBAD +:1030840040B0FB40DC3DF5B0FBD9B1FBF1313F046E +:103094000CFD14D9B1FBF1BDD85008FD570D0872D1 +:1030A40008E6D2DD040192DFFC896158D1DD0571A7 +:1030B4007220EF03717320A0B1FB40B1FB2061C803 +:1030C400F5B1FBD78FB2FBB0B2FBD1DF7331D4D1F2 +:1030D40006715BD1E5B4FBD5B4FBDD347140E2FB92 +:1030E400D9B3FBF1E734020023DD0625DD0325DF38 +:1030F40005F6BE66EF06D9FCFBF1BE66A0B3FB4045 +:10310400B3FB20DF06F5B3FBB0B4FBCFB2FB19D79A +:10311400CFB2FB1E7148E2FBD5FEFBDF04F6BE66B0 +:10312400D7D9FCFBF14266FFDD16D9FCFBF112AEE8 +:103134006643DE05A266FFEF03B266FFCFB2FB0370 +:10314400D731142101D7401CF902DF19F6BE64BE41 +:103154006EBE6ABFB8FBBFBEFBBFC4FBBFBCFBBF38 +:10316400C2FBBFC8FB31042103ED1A32D5B5FB61A4 +:10317400E8ED15328F44FB9FB5FB40B6FB1FDC1F07 +:10318400710002FC4046FBFFDD24D5B7FBDD05B032 +:10319400B7FBEF1A8F46FB9FB7FBF5B6FBEF0F713A +:1031A4000802FCD9B6FBF1A1605C1F9FB6FBE9B62F +:1031B400FB0948FB5080D6BFB8FBE9B6FB0968FBA6 +:1031C4005080D6BFBEFBE9B6FB0988FB5080D6BF52 +:1031D400C4FBAFB8FB22BCFB12D945FBF133BDD80D +:1031E40013FD080DBFBAFBAFBEFB22C2FB12D945CB +:1031F400FBF133BDD813FD080DBFC0FBAFC4FB22E8 +:10320400C8FB12D945FBF133BDD813FD080DBFC669 +:10321400FBB0B5FBEF3DF6BFB8FBBFBEFBBFC4FBC5 +:10322400AFBCFB1231FF31AE03316F12F623BFBACC +:10323400FBAFC2FB1231FF31AE03316F12F623BF75 +:10324400C0FBAFC8FB1231FF31AE03316F12F6235E +:10325400BFC6FB8F1EF931451F30C4FBFD632EF33F +:1032640013BE6430B8FBFD632EF313BE6E30BEFB99 +:10327400FD632EF313BE6AD730C4FBFD632EF31334 +:10328400BE6AD7C73122210BD5CAFBDD06B0CAFB03 +:10329400ED4E33712321D9FFFBF1E7240000DD0F4C +:1032A40023DD1B23DD1123DD5723DD2923DD3B56DD +:1032B40000F511FDED3A335601F511FDEF78D51106 +:1032C400FDDF075601E511FDEF055600F511FDCFB1 +:1032D400CAFBFAEF61D511FDDF0B5601E511FDCFF5 +:1032E400CAFBFAEF51F5FFFBEF4CD511FDDF0B568E +:1032F40000E511FDCFCAFBFAEF3CCFFFFB02EF362E +:10330400D92FFCF1E7240000DD0923DD2423DD0AA5 +:1033140023EF1E5600F511FDEF1CD511FDDF0756F6 +:1033240001E511FDEF055600F511FDCFCAFBFAEFDB +:10333400055601E511FD8F1EF93145086661FB71E3 +:103344005107EF066661FB710101C6D7C736F0006D +:1033540071F4DC297170F000CE9D08CE9EC0CE9F22 +:1033640080F594FFF593FFF592FFE597FFE596FF4F +:10337400CE9505CE9810CE9C7F7100D6FB711BE3D1 +:10338400712BE3711AE7712BE7717A9D710A9E31F3 +:10339400929E02EFFA710B9E713321714321715396 +:1033A40021C6D7C73132211E713221710A9E319252 +:1033B4009E02EFFA3404FC3692FF52078B99A5A7BC +:1033C40092DFF9710B9EC6D7C788061631422115C4 +:1033D400714221C734CCFB3092FF1652078B99A55A +:1033E400A792DFF9C666736718CCFBC6D7C77133DB +:1033F400213144211E714321710A9E31929E02EFB4 +:10340400FA3492FF36CCFB52078B99A5A792DFF9C9 +:10341400710B9E31542113717B9E8F0CFC9E9A8FED +:103424000DFC9E9B714321717A9EC6D7CFD7FB5C5E +:10343400CFD8FB5FCFF8FB32D7C7CFD4FB11E5D58C +:10344400FBCFFCFBFFF5FDFBF5FEFBF5FFFBF500F9 +:10345400FCCFF9FB20F5FAFB5600664C64DE0872DB +:103464003844FB0086EFF3C6D7C788061617F1E782 +:103474003403002361E3ED74372361F8ED5135B172 +:103484002361E3ED58352561F8ED67352407002401 +:10349400070061D8ED7437240B0061F8ED883523FB +:1034A40061F8EDCF352361F8ED9C352361F8ED4AE1 +:1034B400372561F8ED5E372561F8ED3836B12561C1 +:1034C400D8ED5C3624000061F8ED69362361F8ED2F +:1034D40074372402002361E3ED79362361F8ED8B20 +:1034E400362361F8ED9D362361F8ED8B362361F8C0 +:1034F400EDAF362361F8EDC1362361F8EDD1362303 +:1035040061F8EDDA362361F8EDE6362361F8EDF281 +:10351400362361F8EDFB362402002361E3ED7437B2 +:1035240024020061F8ED03372361F8ED0F372561BC +:10353400F8ED1B37240A0061F8ED273724120061E7 +:10354400F8ED44372361F8ED3237ED7637679FD6CF +:10355400FBED8037308D2BFDE83C66736718D4FB98 +:10356400ED803740D9FB6ADF1440DAFB68DF0E6771 +:103574004C6CDF09304845FDE83C713AD5679FDB68 +:10358400FBED803767D1DD0630F740FDE83C34F4CD +:10359400FB89616F99ED8037675C02D1DD0830707B +:1035A4002DFDE83CEF0C675C01D1DD0630752DFD87 +:1035B400E83C675C3CD1DD10307A2DFDE83C675C6B +:1035C4003C7266736218D4FBED803767D1DD625CB0 +:1035D40001D1DD05300800EF01F6609F2BFC675C2C +:1035E40002D1DD03E6EF01F6342BFC8961689967AB +:1035F4005C04D1DD04E6A1EF01F6342BFC8961689B +:1036040099675C08D1DD05302000EF01F6342BFC0E +:1036140089616899675C10D1DD05301000EF01F60F +:10362400342BFC89616899675C20D161E871602B57 +:10363400FCED8037D516F9DF09679FFDFBA016F96D +:10364400EF134016F905DE0DD916F9F1B1126748EA +:103654000CFDA016F9ED8037675C0F726673621873 +:10366400D4FBED80374016F964DE0AE916F96718D1 +:1036740044FBA016F9675C7F318EC117F12430003A +:10368400FDCC33C0ED8037675C3F318EC117F12428 +:103694003000FDCC33C0ED8037675C07318EC11735 +:1036A400F1243000FDCC33C0ED8037675C1F318ED0 +:1036B400C117F1243000FDCC33C0ED803767318E63 +:1036C400C117F1243000FDCC33C0ED8037679E99DB +:1036D4009F0BFCED8037715221675C7F9F0CFCEDE2 +:1036E4008037715221675C3F9F0DFCED8037675C2A +:1036F4003F9F0EFCED8037675C1F9F0FFCEF7D3012 +:10370400223FFDE83C679F14FCEF7130DD3EFDE88D +:103714003C679F15FCEF6530FF3EFDE83C679F1852 +:10372400FCEF59675C01D1DD53FD6148EF4E402643 +:10373400FCC8DE48E926FC671872FAA026FCEF3CB8 +:10374400679F26FCEF3667318E247200DF06303126 +:1037540009FDE83C679FF7FBEF228FFAFB617F5C72 +:1037640012D1DD0630623AFDE83C679FFAFBEF0CAC +:10377400EF0A664C52DE05736718D4FBC6D7C7162A +:10378400664C30DC094C37DE05FDA733EF67664C29 +:1037940002DF1F8FD6FB5C03728F2DFC5C03318E1E +:1037A400316D08616A08128F2DFC5C80312A6162D8 +:1037B400EF49664C3DDF0AAE90BF28FCF928FCEFC8 +:1037C4003A664C3EDF05F929FCEF30664C4FDF05C5 +:1037D400FD8548EF26664C61DF09E926FC0972FA8B +:1037E40072EF18664C7FDF0D308441FDE83C713A7E +:1037F400D5524AEF06667309D4FB72C6D7C788064A +:103804001617F1241000240500DC07244C00DD17F2 +:10381400EF18717BFA17F104D4FB1489617F997155 +:103824007AFA716221EF03A026FCC6D7C7C1C1FB97 +:10383400F8FF401CF903DD06401CF904DF2F8C025D +:103844007309DCFB5E0AD1DF248C02318E04D4FBC5 +:1038540014896E0A99716207CC010031620708610C +:1038640059018C01D1DFF4716307716B271004C611 +:10387400D7CF2DFC03F52BFCF52FFCF531FCD7C776 +:1038840088061617F1E734020025DD4923DD1A25E1 +:10389400DD2823DD0523DD37EF47711222679F30D2 +:1038A400FC30623AFDE83CEF38675C03D161F871A3 +:1038B4000223675C839F2DFCEF27675C039F2FFC2B +:1038C400675C034C0261F8712221FD8732EF1267B5 +:1038D4009F31FCEF0C6791DF08E0C15012FD3038D6 +:1038E400C0C6D7C71617F1E724000061F8ED783990 +:1038F40023DD60240300DD0C240200DD5F24F900D5 +:10390400DD79EF7A40DFFB51DC06CF2EFC0FEF317F +:1039140040DFFB33DC06CF2EFC0BEF2540DFFB0B37 +:10392400DC06CF2EFC07EF1940DFFB06DC06CF2EAA +:10393400FC03EF0DD5DFFBDD05E52EFCEF03F52ED3 +:10394400FC31020705308000EF01F6086F2EFC728F +:1039540008EF318F2BFCF52BFC72EF2840DDFB01C7 +:10396400DD0FD9DDFBF11231FE03311F087208EFC0 +:1039740013E2EF107172225235EF09F2EF0666730B +:10398400092AFC72C6D7C71617F1E7240000DD38F0 +:10399400241000DD1C23DD1C23DD30240E00DD1883 +:1039A400241100DD1B240F00DD12243000DD15EF8F +:1039B4001EE2EF1D5202EF195204EF155206EF11E9 +:1039C4005205EF0D5207EF09F2EF065203EF0252D0 +:1039D400FFC6D7C78F1EFDB01EFDD1DF72CF1EFDFF +:1039E4000731742150717321401CF903DF473612EB +:1039F400FDC7D93CFCFDA43B618A70618AFDDB3BB9 +:103A0400C03618FDC7D93BFCFDA43B618A70618AAE +:103A1400FDDB3BC0D93EFCF1312F609F3DFC8F3A6A +:103A2400FC4F3DFCDD0F7102228F3DFC9F3AFC30C0 +:103A3400623AFDE83C7150F000CE300BCF1700061F +:103A4400CE3106FD1203717A30710BE3710BE7C6B8 +:103A5400D78F3DFC9F3AFC8F3DFC9FDDFBD7401C7C +:103A6400F903DD02F2D78FFAFB5C12D1DD0C8F3D36 +:103A7400FC9F42FC7148FAFBEF6A31042224710373 +:103A8400227123228FFAFB5C04D1DD088FF9FB9F9E +:103A940043FCEF068F3DFC9F43FC8F43FC9F42FC9D +:103AA400EF423114222C711322712222D530FCDF13 +:103AB40005F544FCEF0B8F30FC5002D6A1609F4407 +:103AC400FC8F44FC9F42FC5040C15012FD3038C072 +:103AD400EF12312222088F43FC9F42FCEF068F44F1 +:103AE400FC9F42FC8F42FC9FDDFB4042FC01DF0552 +:103AF400E530FCEF0ED942FCF11231FE03311F60B8 +:103B04009F30FC8FFAFB5C01D1DD02F2D7E942FC65 +:103B140009382370C15013FDBC05C0F2D7C7168BFA +:103B2400728C01614ADE248B728C02614ADE188C2D +:103B340001728C02614ADE068C01318EEF048C0224 +:103B4400318E087208EF268B72EF228B728C026121 +:103B54004ADE048B72EF168C01728C026142DE061F +:103B64008C01318EEF048C02318E087208C6D7C7DF +:103B740016710AE7710BE37150F000CE300BCF17CA +:103B84000006669E31FD1203717A30710BE33182B7 +:103B9400E302EFFA8D1F7158F000710BE772C6D77C +:103BA400C7C1C1FBF8FF8C024C24DE03F2EF248C66 +:103BB400024CE2DC0452FFEF1A8C022C239C0231EB +:103BC4008E318D52BAFD1F0EBB440001DC03F6900A +:103BD400BB8B721004C6D7C7C1C1FBF8FFAC0A1473 +:103BE400A91489708C026128706131FD5620134438 +:103BF400030071FEDC24AC0A148A04819A04AC0A22 +:103C0400148A044C04DC11A9148C0299AC0A14CA59 +:103C14000200AC0A14CA0310EF74AC0A14CA0400FC +:103C2400AC0A14A914894E02DE0AAC0A148A028171 +:103C34009A02EF13AC0A14A914894E0261D308AC9A +:103C44000A148A02919A02AC0A148A03919A03D143 +:103C5400DF3CAC0A148A024C10DF10A91489318E9F +:103C6400A112AC0A14A9146299EF17AC0A148A02BF +:103C74004CF0DF0EA91489318EB112AC0A14A914C8 +:103C84006299AC0A14CA0200AC0A14CA03101004E4 +:103C9400C6D7EDD33C717BFAC7D550FC61F83134FB +:103CA4002227713322D550FC61E8B050FC717AFAB6 +:103CB4005600664C0BDD1272F3311C7920FDCEFCEC +:103CC4000061CAFD323D86EFE9717AFAF2C6D7C7C0 +:103CD4005600664C0ADE0BF0317E12F67852FC86F2 +:103CE400EFF0C6D7C7C1C1FBF8FFCC01008C014C73 +:103CF4000ADE36717BFA8C01F0317E0452FC14A981 +:103D04006168DF09AC02B9717AFAF2EF1D8C01F037 +:103D1400317E127952FC614902DF06717AFAE2EFD0 +:103D240009717AFA615901EFC4E21004C6D7C720B9 +:103D340004FBF8FFF64252FC61F8ED2A3E717BFA6F +:103D44009C038C034C0ADE4F8C03F0317E0452FC3E +:103D540014A96168DF05717AFAEF3C8C03F0317EB7 +:103D6400127952FCE743DF06717AFA00EF21717A87 +:103D7400FA8C0372F3311C7952FCCEFC0061CA62E6 +:103D84009C02D1DF0A8C03F0317E12E67852FC717A +:103D94007BFA615903EFABCC0200CC01018C02F039 +:103DA400317E0452FC14A96168DD7B8C02F0317E03 +:103DB400127952FCE743DF688C014C0ADE628C0105 +:103DC400F0317E127952FCE743DD50717BFA8C01AD +:103DD400F0317E0452FC14A96168DF1B6169017132 +:103DE4007BFA8C01F0317E12F67852FC717AFA8CEF +:103DF400024E01DCE7EF2F8C01F0317E0452FC14FB +:103E0400A9128C02F0317E337852FC8C01F0317EA1 +:103E140012E67852FC615902717AFA615901EF98FD +:103E2400615902EDA13DCC0200CC01008C014C0A89 +:103E3400DE1E8C01F0317E0452FC14A96168DF059A +:103E4400CC0201EF068C02D161E800615901EFDC7C +:103E5400F21004C6D7C72006FBF8FF3419FCC5507E +:103E640006C150A8C15030FD60031006D2DD1DA06C +:103E740066FC4066FC08DE03E2EF5A3414FC895CFD +:103E8400FC99FD223F7110E2FBF2EF49F566FC8FCD +:103E940014FC5C01D1DD26401CF903DF205010C165 +:103EA40080FD3038C0C736100571D4C6DE0F17C187 +:103EB4005006C150A8C15030FD60031006401CF9E3 +:103EC40001DD11401CF905DD0B8F14FC5C02D1618E +:103ED400E8FD4D45F21006C6D7D915FCC15030FD9A +:103EE4003603C0629F18FC7130E5FB8FEDFB5C0864 +:103EF400D1DF06716307716B27F2D7D918FCC1D9DA +:103F040017FCC15030FDD20310047130E5FB8FED76 +:103F1400FB5C08D1DF06716307716B27F2D7C720FA +:103F24000AFBF8FF500FC15030FD3603C04041FB7F +:103F340002DF077110E2FBF2EF547118E2FBCC07C9 +:103F440000CC0812CC09808F14FC5C03D1DF08710B +:103F54007AD5CC0607EF06717BD5CC062F1704065D +:103F640000C15004C150A0C15030FD08041006C760 +:103F740036100571D4C6DE15401CF903DF0F17C1D6 +:103F84005006C150A8C15030FD60031006F2100A5B +:103F9400C6D7C78F1CF9318F240200DF04F6BF6A2D +:103FA400FC8F36FDB036FDD161E8ED8840CF36FD9B +:103FB400048F1CF9318FE723DD0B24020024030056 +:103FC40061C8ED8840E6A1426AFCDF0AE0C15010F6 +:103FD400FD3038C0EF2430C000426AFCDF0B5002D1 +:103FE400C15010FD3038C0EF118FF8FB5009D604D2 +:103FF4008000426AFC61D8E520F931340709715325 +:1040040022F6BF6AFCEF1731542206F6BF6AFCEFB2 +:104014000DA26AFCF6426AFCDF0490BF6AFC8F1FA3 +:10402400F9318FE7240000DD0623DD0D23DF12368E +:10403400100571C4716122EF0B710402716122EFEA +:10404400037162223162221A406CFC0361D8A06CB5 +:10405400FC406CFC02DF0E5004C15010FD3038C02F +:10406400EF03F56CFC31420718406DFC0361D8A0E6 +:104074006DFC406DFC02DF0C5010C1FD3038C0EF08 +:1040840003F56DFCC6D7C78F14FC5C03D1DD113674 +:10409400100571D4DE0A30593EFDE83CD261F800C7 +:1040A400401CF903DF1B3122070730922CFDE83C4A +:1040B400003174220C7173225080C15012FD3038CB +:1040C400C0401CF903DD05F6BD1AEF25D500FCDF61 +:1040D40009F6461ADD1BB61AEF17D9FCFBF1461A8E +:1040E400DD0FD9FCFB12AD1A43DE04A61AEF02B6AB +:1040F4001AC6D78FF4FB5C10D161E87112238FF4D8 +:10410400FB5C0FD1DD758FF4FB5C01D1DD05F51C83 +:10411400F9EF688FF4FB5C02D1DD15E0C15003C1F7 +:104124005084FDD2031004711300711B207103032A +:104134008FF4FB5C08D1DD05710303EF1C8FF4FBE6 +:104144005C04D1DD14711300711B2031042303714D +:104154000303342DFC895CFC995005FD8002710237 +:10416400035003C1C15084FDD2031004711A20FD11 +:10417400553A30623AFDE83C710323F5F4FBF2D77B +:10418400C7364105718461D8ED33423641057194D7 +:10419400DE0771405005CEABAC31B2D104E2ED4242 +:1041A40042713BD18F16F9A016F9318EE724000035 +:1041B400DD1723DD1C23DD2723DD2C23DD3823DD60 +:1041C4004423DD4923DD4EEF668F1FF99F4005EF41 +:1041D40058F0C15084FD3603C0629F4005EF4A8FFA +:1041E40008FD9F4005EF425008C1506CFD3603C0E6 +:1041F400629F4005EF335009C1506CFD3603C06225 +:104204009F4005EF248F6EFC9F4005EF1C8F02F941 +:104214009F4005EF14711420E6613012710420618F +:10422400DC31196162629F4005CEABACE2EF0F71E5 +:1042340060500571485005713BD5F516F9F2C6D7A3 +:10424400C78F1CF9318FE724000061F8EDE74323A1 +:10425400DD1B2361F8EDFC422361F8ED8643236105 +:10426400F8EDC2432361F8ED5744EDB744D51DF989 +:10427400DF2BF6426AFCDD05F538FDEF03A038FDBF +:104284004038FD65DC09F51CF9713222EDBA44AF02 +:104294006AFC440A0061D8EDBA44E51DF971522262 +:1042A400F538FDF5F7FBFD2D05713320FD91244014 +:1042B4001FF903DF09713222F51CF9EDBA44FDD56B +:1042C4002740E1FB9BDE09713222F51CF9EDBA446B +:1042D400FD922BD2DD09713222F51CF9EDBA44406E +:1042E4001DF901DF05F5FDFBEF04CFFDFB03CF1C3A +:1042F400F902FD672BEDBA44CF350002CF37001D1C +:10430400CF120510FD8F2DFDEF2D714A9DFD7538DF +:10431400FD3D34F537FF712BE0F51DF9713222CBE9 +:10432400E43FEFCBE6F6F0FD2D05713BD48F1EF98B +:104334003135305004C15084FD3603C0625C033112 +:104344008E315D34E3FB896168995002C15084FD6C +:104354003603C0D2DD067170E3FBEF047178E3FB32 +:10436400FD9124FDA62E71381EF9CF1CF9038FD6BA +:10437400FB5C02D1DD095080C15010FD3038C0ED26 +:10438400BA44FDBC4431A4E020712BE031020C0599 +:10439400FD3545EF145027C15005C15084FDD203AB +:1043A4001004CF1CF9047132223114230BA070FCC9 +:1043B400D570FC61F8FD3545FD2945EDBA44FDBCD9 +:1043C4004431020C18F0C15005C15084FDD20310D1 +:1043D400045005FD8002FD3545CF1CF903FD294538 +:1043E400EDBA44CFFDFB03F5FEFB710221F6426CEE +:1043F400FF61E8EDBA44F500FCF520F9F514FCFD85 +:10440400223FFD282FFDE62DFD442E714B9DF5E442 +:10441400FBF5E5FBF5E6FBF5E7FB31542002EFFA8B +:10442400CE3708CBE4BFFFCBE6FFF1CED4FFCF37C6 +:104434000009F51205F6BEE0BEE2BED0716A27FDA2 +:10444400482CFD9605F538FDCF1CF905715222F66E +:10445400BF6AFC3102071BFD9124AF6AFC440A00C9 +:10446400DC06E51DF9E51CF9D51FF9DD49FD9605C6 +:10447400EF44F51DF9FD9605717301713204311293 +:104484000502EFFA71430271032071322031949EC8 +:1044940002EFFA712AE7CEA409F5F30061FD3104B5 +:1044A4000703715322E5F300CEA408712BE7E51C42 +:1044B400F9EF0300EFFDC6D7D571FCDF1E31020012 +:1044C400195003C15084FD3603C0625C01D1DF077B +:1044D400F51CF9713222D7E571FCD74071FCF0DF8D +:1044E400083104003FF571FCD74071FCC8DF0BF5BF +:1044F4001CF9713222CF71FCF0D731020004A07193 +:10450400FCD7F0C15004C15084FDD20310048FE3E2 +:10451400FB5C9F9FE3FB7110F4FB30F740FDE83C2C +:10452400CF71FCF0D7D520F9DD06F51CF9713222E4 +:10453400D7711323F570FC717207FD1203FD12038A +:10454400717307D7FD0306F2D7C7200CFBF8FF8F62 +:104554001AFCF0F919FCF303FD562013BC048F1C5C +:10456400FCF0F91BFCF303FD562013BC028F1EFC68 +:10457400F0F91DFCF303FD562013BBAC04BDD8F6C3 +:10458400BDDAAC04311EBDDCF6BDDEFDDD0CADD8FC +:10459400BDDCADDABDDEAC02BDD8F6BDDAAC0231AD +:1045A4001EDADCC3DADEC3BDDCF6BDDEFDDD0CC025 +:1045B400BDDEC0BDDCADDEFD530EADD8BDDCADDA75 +:1045C400BDDEABBDD8F6BDDAAB311EDADCC3DADE54 +:1045D400C3BDDCF6BDDEFDDD0CC0BDDEC0BDDCADA3 +:1045E400DEFD530EDADAADD8FDBB49C3C58FFEFC40 +:1045F4005C3FF0317E047EFC14C2C0B9A0FEFCF620 +:10460400BC08BC0A9C078C074C2EDD3E8FFEFC0EBA +:104614000770F161DC605C3FF0317E12797EFCBD95 +:10462400D8F6BDDA8C0773097A23318FBDDC70BDEF +:10463400DEFDDD0CAC08BDDCAC0AFD530EADDABC0E +:104644000AADD8BC08615907EFBCAC08BDD8AC0AA8 +:10465400BDDAC9DC0004F6FDA70DC9DCFFFFF6FDD9 +:10466400BC0EADD8BF78FCAF72FC4278FCDD12AF53 +:1046740074FCBF76FCAF72FCBF74FCAF78FCBF72F5 +:10468400FCAF74FC4276FCDC50AF72FC4274FCDE7E +:1046940048AF3AFD4272FCDE40407AFC16DC1F4013 +:1046A4007AFCA0DE168F7BFC4F7AFCDE0EAF72FC28 +:1046B400227CFC44691061C8FD2647F57AFCAF7280 +:1046C400FC445146DC0BAF72FC241027BF3CFDEFC9 +:1046D4001930F82ABF3CFDEF11407AFCFFDD03E6F8 +:1046E400EF01F6347AFC89610899AF76FC4274FCD8 +:1046F400DC1BAF74FC4272FCDE13AF72FC423CFD67 +:10470400DE0BF57BFCAF72FCBF7CFCEF11407BFC45 +:10471400FFDD03E6EF01F6347BFC89610899100C98 +:10472400C6D7C72006FBF8FFA01FFCD51FFCDF1C63 +:10473400A020FCD520FCDF14A021FCD521FCDF0C3B +:10474400CF1FFCFFCF20FCFFCF21FCFF717BFA7150 +:104754000A9E31929E02EFFA8E98FDD00E9C038E33 +:10476400949F3EFD8E969F3FFD8E979F40FD8E93B6 +:104774009F00FD8E929F01FDFD184913BC04BDD816 +:10478400F6BDDA46DADF03B146D8DF2D8C035C03CD +:1047940091DF03E6EF01F6046D01313D120103B12F +:1047A400BC04616903CF3EFD23CF40FD12CF3FFD22 +:1047B40031CF00FD59CF01FD598F41FD4E03DF126A +:1047C400AF02FD614904DE40AC042202FDFD39481C +:1047D400EF368C03318EB112D941FDF143DF1E8CCB +:1047E400035C0391DF03E6EF01F6046D01313D1232 +:1047F40001032202FD610904FD3948EF0B8F41FDDD +:104804004E03DE04F6FD39488C039F41FDAC04BF22 +:1048140002FDD9FFFCF1010422F9BB14A944FFFFF6 +:10482400DF04E6B9EF0BAB14A944FEFFDD03A9A135 +:10483400B91006C6D7C7161744A90061C836A80020 +:10484400A0FFFC40FFFCA861C8F5FFFCF9FFFCF3E6 +:10485400311CF67822F9B7F647DFE5C6D7C756A864 +:104864009666F0317E12F6B17822F966D1DFF1F561 +:104874001FFCF520FCF521FCF5FFFCC6D7712323B2 +:10488400D7C72004FBF8FFD916F9F1E7240000DDAF +:104894001123DD1C23DD2123DD2623DD2F23DD343D +:1048A400EF3A8FFFFC9F04FDA016F9F93EFDEF607F +:1048B400A016F9F93FFDEF58A016F9F940FDEF50A5 +:1048C400A016F98F41FDFDEA0E72EF44A016F9F926 +:1048D40000FDEF3CA016F9F901FDEF34F904FDF3F6 +:1048E400311C7922F9BB312223058B9C03EF128CF6 +:1048F400019C03D504FDDF06CF04FDA7EF03B0043C +:10490400FD718071272361DC61FB7121238C0372AB +:104914001004C6D7C72008FBF8FF8E989C058E9715 +:104924009C048E969C038E949C028E939C018E9282 +:104934009B710B9E717AFA8C05FDD00E9C058C043C +:10494400FDD00E9C048C03FDD00E9C038C02FDD084 +:104954000E9C028C04F0317E1279AA23BC068C05CD +:104964005C03D1DF158C044C03DE0C8C044C02DF99 +:10497400098C034C1D61F86179068C03318EB16199 +:104984000906BC06313D120103BC068C060E0270FA +:104994008C071C00BC068F24FC4E01DC0D8C014FDF +:1049A40024FCDC0B8F25FC4DDE05AC0612EF04ACB9 +:1049B40006B1121008C6D7C7C3C12008FBF8FFF61A +:1049C40061490A61F8614908DF07F7340000ED58CE +:1049D4004AE6BC04F6BC06AC0ABC02AC08BBAC0696 +:1049E400614902AC0461F8614900DE28AC04BDD819 +:1049F400AC06BDDAE1FD620EADDABC06ADD8BC048E +:104A0400ABBDD8AC02BDDAE1FD7D0EADDABC02ADC2 +:104A1400D8BBEFCAAC06BC02AC04BBAC08BDD8AC76 +:104A24000ABDDAAC04BDDCAC06FDE00DAC04BDDCB3 +:104A3400AC06FD530EE1FD7D0EADDABC06ADD8BC6F +:104A440004AC06614902AC0461F8614900DCC5AC00 +:104A54000214AB12100CC6D7C7D542FDDD05B04217 +:104A6400FDEF78CF42FD02311407067110E3FBEF2E +:104A7400047118E3FB8FE3FB7F06FD76D1DD5C8FC9 +:104A8400E3FB9F06FD401CF903DF22665C10D1DDC9 +:104A94001C8FE3FB5C10D1DD0B5080C15011FD3045 +:104AA40038C0EF095040C15011FD3038C0401CF9E6 +:104AB40003DD06401CF904DF22665C02D1DD1C8F95 +:104AC400E3FB5C02D1DD0B5040C15010FD3038C017 +:0D4AD400EF095020C15010FD3038C0C6D78A +:104AE100CF0BF90461FC61FCC1C3C5C7520C9292A2 +:104AF10069D4FEC1DFF88EFD708EFCC1717AFA4077 +:104B01001CF903DF0630922CFDE83CC09EFC609E40 +:104B1100FD34D4FE5206C0B9A5A592DFF9C6C4C2C0 +:104B2100C061FC61DF520C929269D4FEC1DFF88E44 +:104B3100FD708EFCC1717AFAC736410571A4C6DCDD +:104B410051F50AFD714850057160500531642136F7 +:104B51007162077163218FE4FB5FECFBD1DF1B8F77 +:104B6100E5FB5FEDFBD1DF128FE6FB5FEEFBD1DFF3 +:104B7100098FE7FB5FEFFBD1DD0C31620702EFFA32 +:104B8100716307716B27FD8148FDF133F516F9ED6E +:104B9100A84CC73641057184C6DE0DF50AFD714882 +:104BA1005005FDF133EDA84CC73641057194C6DEC1 +:104BB10015400AFD03DD0C400AFD04DD06400AFD37 +:104BC1000161F8F50AFDD90AFDF1E7240000DD08CD +:104BD10023DD1323DD39EF6071405005E50AFD71D6 +:104BE100505005EDA84C8F40059F17F99F1AF9D930 +:104BF10017F9FD8237629F19F94017F97FDD06CF5A +:104C01000AFD02EF03F50AFD71505005EDA84CC7EE +:104C11003641057194C6DE1CC736410571C4C6DE36 +:104C210006CF0AFD03EF11F50AFD714850057160C9 +:104C31005005EF73CF0AFD04400AFD03DF138F19FE +:104C4100F99F4005D919F9C1D917F9FD0138C0EF0C +:104C5100108F400576C7D917F9FD6D34C0715050DA +:104C610005D91AF9F1242900DD2D240400DD2824B9 +:104C71002200DD23241100DD0C240100DD19241E96 +:104C810000DD14EF0C4017F960DF0CCF17F961EF6D +:104C910006F516F9A017F9400AFD03DF0AD917F93D +:104CA100FD8237629F19F9C09EFC609EFD34D4FEDF +:104CB1005206C0B9A5A592DFF961FCC1C3C5C752AF +:104CC1000C929269D4FEC1DFF88EFD708EFCC1F6A4 +:104CD10016717AFA714AE5717BBD51405F0401D1C9 +:104CE100DD05A7F647DFF3300400BF2401F6BF2A34 +:104CF10001300B0BBF2801FD1203300B0FBF280140 +:104D0100FD1203300F0FBF2801710AE6715320C055 +:104D11009EFC609EFD34D4FE5206C0B9A5A592DF6B +:104D2100F9C6C4C2C061FCC1C3C5C7520C92926925 +:104D3100D4FEC1DFF88EFD708EFCC1717AFAD540C8 +:104D4100FBDD0EEB3EFB899E44A23EFBB040FBEF38 +:104D51002B710AE6300400BF2401F6BF2A01300B93 +:104D61000BBF2801FD1203300B0FBF2801FD1203F9 +:104D7100300F0FBF2801714320715320C09EFC608A +:104D81009EFD34D4FE5206C0B9A5A592DFF9C6C472 +:104D9100C2C061FC61EF520C929269D4FEC1DFF88E +:104DA1008EFD708EFCC12008FBF8FF71503002CEE1 +:104DB100ABACCC0100F6BC0231B2E210617902F673 +:104DC100614902DFF371603002ED4C4E8E519B71EF +:104DD1003BE28B5C02D1DD1D8B5C08D1DF09715098 +:104DE1003002CC0100EFCE8C0770FDE738629E5097 +:104DF100CC0102EFC08B5C03D1DF408E509C05716A +:104E01005030028C01D1DF0E8C0570FD8A39629C15 +:104E110007CC0101EF328C014C02DF0671603002D8 +:104E2100EF29CF34025A716030028C0570C18C07B2 +:104E310070FD8338C0CF34024AEF108B5C01D1DDA5 +:104E41000671603002EF0400EDB64D1008C09EFC03 +:104E5100609EFD34D4FE5206C0B9A5A592DFF9616A +:104E6100FCC18F0EFC4F96FFDF328F0FFC4F97FF77 +:104E7100DF2A8F10FC4F98FFDF228FEDFB5C04D1FE +:104E8100DF1A7120E5FB716307716B27401CF9057F +:104E9100DD06401CF90161F8CF1DF902C061FCA0DB +:104EA10050FC61FCC1C3C5C7520C929269D4FEC1CA +:104EB100DFF88EFD708EFCC1C1FBF8FF8D1F9C01D8 +:104EC1008E31318EE7240600DD0823DD0F23DD2539 +:104ED100EF45717AFA8C019F3CFCEF3B717AFA4005 +:104EE1001FF901DF078C019F3BFCEF2B51FF2E01C6 +:104EF1009F3BFCEF22717AFA8C019F02F98FE2FB52 +:104F01005C01D1DF12401CF903DD06401CF904DF0E +:104F110006301727FDE83C4031FF09DE05A031FFCF +:104F2100EF197158F000717221404FFC02DF03F656 +:104F3100EF05D94FFCF1A1609F4FFC710BE3C0C09D +:104F41009EFC609EFD34D4FE5206C0B9A5A592DF39 +:104F5100F9C6C4C2C061FC61FF520C929269D4FED1 +:104F6100C1DFF88EFD708EFCC1717AFA8F14FC5C82 +:104F710003D1DD19401CF903DD06401CF904DF0DE6 +:104F810036100571D4DE0630593EFDE83CC09EFC6A +:104F9100609EFD34D4FE5206C0B9A5A592DFF96129 +:104FA100FC61FC00EFFD61FC61FC61FC61FC61FCEA +:104FB10061FC61FC61FC61FC61FC61FC61FC61FC08 +:104FC10061FC61FC61FC61FC61FC61FC61FC61FCF8 +:0C4FD10061FC61FC61FC61FC61FC61FCA6 +:104FDD00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD4 +:094FED00FFFFFFFFFFFFFFFFFFC4 +:0A4FF60031333A33393A3134000008 :10500000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB0 :10501000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA0 :10502000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF90 diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index 6eebbd6..fbd1446 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 984f6c9..8bbc858 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,19 +1,20 @@ -78K0R Linker W1.31 Date:16 Jul 2010 Page: 1 +78K0R Linker W1.31 Date:28 Jul 2010 Page: 1 Command: -yC:\Program Files\NEC Electronics Tools\DEV -_msgoff -obsr.l mf ..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10 - \lib78k0r\s0rm.rel -gi10A84B295BE95C03D45Bh -pbsr_k0r.map -nk - d -gb7EFFFFh -bC:\Program Files\NEC Electronics Tools\FSL78K0 - R_Type02ES\V1.20\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0rm.lib -b - cl0rmf.lib -iC:\Program Files\NEC Electronics Tools\CC78K0R\W - 2.10\lib78k0r -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.r - el main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel - rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.r - el self_flash.rel sw.rel task_debug.rel task_misc.rel task_sy - s.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel + \lib78k0r\s0rm.rel -go85h,0FC00h,1024 -gi10A84B295BE95C03D45B + h -pbsr_k0r.map -nkd -gb7EFFFFh -bC:\Program Files\NEC Electr + onics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -bcl0rdm + .lib -bcl0rm.lib -bcl0rmf.lib -iC:\Program Files\NEC Electron + ics Tools\CC78K0R\W2.10\lib78k0r -dbsr_mcu.dr -s -w0 loader.r + el pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel + i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel + renge.rel accero.rel self_flash.rel sw.rel task_debug.rel ta + sk_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel + task_status.rel Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map @@ -22,9 +23,9 @@ Direc-file:bsr_mcu.dr *** Link information *** - 64 output segment(s) - 3D70H byte(s) real data - 5384 symbol(s) defined + 66 output segment(s) + 3DB9H byte(s) real data + 5401 symbol(s) defined *** Memory map *** @@ -50,7 +51,11 @@ Direc-file:bsr_mcu.dr LDR_CNSL 00002H 00000H CSEG PAGE64KP LDR_CNSL self_flash 00002H 00000H -* gap * 00002H 0000EH + LDR_CNSL 00002H 00000H CSEG PAGE64KP + LDR_CNSL task_debug + 00002H 00000H + ??NMIROM 00002H 00002H CSEG +* gap * 00004H 0000CH @@VECT10 00010H 00004H CSEG AT @@VECT10 ini_VECT 00010H 00004H * gap * 00014H 00008H @@ -86,52 +91,57 @@ Direc-file:bsr_mcu.dr LDR_CODL i2c_mcu 000C4H 00000H LDR_CODL self_flash 000C4H 00000H + LDR_CODL task_debug + 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - LDR_CODE 000CEH 00864H CSEG - LDR_CODE loader 000CEH 001CCH - LDR_CODE main 0029AH 0006EH - LDR_CODE WDT 00308H 00000H - LDR_CODE i2c_mcu 00308H 002F1H + ?OCDSTAD 000CEH 0000AH CSEG + LDR_CODE 000D8H 00865H CSEG + LDR_CODE loader 000D8H 001CCH + LDR_CODE main 002A4H 0006EH + LDR_CODE WDT 00312H 00000H + LDR_CODE i2c_mcu 00312H 002F1H LDR_CODE self_flash - 005F9H 00339H - FSL_CODE 00932H 00322H CSEG + 00603H 00339H + LDR_CODE task_debug + 0093CH 00001H + FSL_CODE 0093DH 00322H CSEG FSL_CODE fsl_block_cmd - 00932H 0002BH + 0093DH 0002BH FSL_CODE fsl_block_check - 0095DH 00013H + 00968H 00013H FSL_CODE fsl_common - 00970H 0014FH + 0097BH 0014FH FSL_CODE fsl_reset - 00ABFH 00001H + 00ACAH 00001H FSL_CODE fsl_si_ibf - 00AC0H 00064H + 00ACBH 00064H FSL_CODE fsl_phySwap - 00B24H 0004DH + 00B2FH 0004DH FSL_CODE fsl_si_common - 00B71H 00061H - FSL_CODE fsl_swap 00BD2H 00030H + 00B7CH 00061H + FSL_CODE fsl_swap 00BDDH 00030H FSL_CODE fsl_write - 00C02H 00052H - @@LCODE 00C54H 002AFH CSEG - @@LCODE @cstart 00C54H 0006DH - @@LCODE @imul 00CC1H 00011H - @@LCODE @lumul 00CD2H 0002BH - @@LCODE @isdiv 00CFDH 00022H - @@LCODE @iudiv 00D1FH 0002DH - @@LCODE @isrem 00D4CH 00021H - @@LCODE @iurem 00D6DH 0002FH - @@LCODE @lsdiv 00D9CH 00039H - @@LCODE @ludiv 00DD5H 0003FH - @@LCODE @divuw 00E14H 00034H - @@LCODE @ladd 00E48H 0000FH - @@LCODE @llsh 00E57H 0001BH - @@LCODE @lursh 00E72H 0001FH - @@LCODE @iscmp 00E91H 0000CH - @@LCODE @lscmp 00E9DH 00014H - @@LCODE @lband 00EB1H 00014H - @@LCODE @bcdtob 00EC5H 0001AH - @@LCODE @bbcd 00EDFH 00024H -* gap * 00F03H 000F3H + 00C0DH 00052H + @@LCODE 00C5FH 002AFH CSEG + @@LCODE @cstart 00C5FH 0006DH + @@LCODE @imul 00CCCH 00011H + @@LCODE @lumul 00CDDH 0002BH + @@LCODE @isdiv 00D08H 00022H + @@LCODE @iudiv 00D2AH 0002DH + @@LCODE @isrem 00D57H 00021H + @@LCODE @iurem 00D78H 0002FH + @@LCODE @lsdiv 00DA7H 00039H + @@LCODE @ludiv 00DE0H 0003FH + @@LCODE @divuw 00E1FH 00034H + @@LCODE @ladd 00E53H 0000FH + @@LCODE @llsh 00E62H 0001BH + @@LCODE @lursh 00E7DH 0001FH + @@LCODE @iscmp 00E9CH 0000CH + @@LCODE @lscmp 00EA8H 00014H + @@LCODE @lband 00EBCH 00014H + @@LCODE @bcdtob 00ED0H 0001AH + @@LCODE @bbcd 00EEAH 00024H +* gap * 00F0EH 000E8H MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -163,9 +173,6 @@ Direc-file:bsr_mcu.dr @@CNSTL accero 02000H 00000H @@CNSTL 02000H 00000H CSEG PAGE64KP @@CNSTL sw 02000H 00000H - @@CNSTL 02000H 00000H CSEG PAGE64KP - @@CNSTL task_debug - 02000H 00000H @@CNSTL 02000H 00000H CSEG PAGE64KP @@CNSTL task_misc 02000H 00000H @@ -183,7 +190,7 @@ Direc-file:bsr_mcu.dr @@CNSTL @bcdtob 02000H 0000AH @@CNSTL 0200AH 00010H CSEG PAGE64KP @@CNSTL @bbcd 0200AH 00010H - @@R_INIT 0201AH 00038H CSEG UNIT64KP + @@R_INIT 0201AH 0003CH CSEG UNIT64KP @@R_INIT @cstart 0201AH 00000H @@R_INIT loader 0201AH 00000H @@R_INIT pm 0201AH 00002H @@ -197,140 +204,138 @@ 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 0000AH - @@R_INIT renge 0202EH 00016H - @@R_INIT accero 02044H 00000H + @@R_INIT adc 02024H 0000EH + @@R_INIT renge 02032H 00016H + @@R_INIT accero 02048H 00000H @@R_INIT self_flash - 02044H 00000H - @@R_INIT sw 02044H 00002H + 02048H 00000H + @@R_INIT sw 02048H 00002H @@R_INIT task_debug - 02046H 00000H + 0204AH 00000H @@R_INIT task_misc - 02046H 00000H - @@R_INIT task_sys 02046H 00002H + 0204AH 00000H + @@R_INIT task_sys 0204AH 00002H @@R_INIT pedo_alg_thre_det2 - 02048H 00008H - @@R_INIT ini_VECT 02050H 00000H + 0204CH 00008H + @@R_INIT ini_VECT 02054H 00000H @@R_INIT task_status - 02050H 00002H - @@R_INIT @rom 02052H 00000H - @@R_INIS 02052H 00000H CSEG UNIT64KP - @@R_INIS @cstart 02052H 00000H - @@R_INIS loader 02052H 00000H - @@R_INIS pm 02052H 00000H - @@R_INIS i2c_ctr 02052H 00000H - @@R_INIS main 02052H 00000H - @@R_INIS magic 02052H 00000H - @@R_INIS WDT 02052H 00000H - @@R_INIS i2c_mcu 02052H 00000H - @@R_INIS i2c_twl 02052H 00000H - @@R_INIS led 02052H 00000H - @@R_INIS rtc 02052H 00000H - @@R_INIS vreg_ctr 02052H 00000H - @@R_INIS vreg_twl 02052H 00000H - @@R_INIS adc 02052H 00000H - @@R_INIS renge 02052H 00000H - @@R_INIS accero 02052H 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 - 02052H 00000H - @@R_INIS sw 02052H 00000H + 02056H 00000H + @@R_INIS sw 02056H 00000H @@R_INIS task_debug - 02052H 00000H + 02056H 00000H @@R_INIS task_misc - 02052H 00000H - @@R_INIS task_sys 02052H 00000H + 02056H 00000H + @@R_INIS task_sys 02056H 00000H @@R_INIS pedo_alg_thre_det2 - 02052H 00000H - @@R_INIS ini_VECT 02052H 00000H + 02056H 00000H + @@R_INIS ini_VECT 02056H 00000H @@R_INIS task_status - 02052H 00000H - @@R_INIS @rom 02052H 00000H - @@CALT 02052H 00000H CSEG - @@CALT @cstart 02052H 00000H - @@CALT loader 02052H 00000H - @@CALT pm 02052H 00000H - @@CALT i2c_ctr 02052H 00000H - @@CALT main 02052H 00000H - @@CALT magic 02052H 00000H - @@CALT WDT 02052H 00000H - @@CALT i2c_mcu 02052H 00000H - @@CALT i2c_twl 02052H 00000H - @@CALT led 02052H 00000H - @@CALT rtc 02052H 00000H - @@CALT vreg_ctr 02052H 00000H - @@CALT vreg_twl 02052H 00000H - @@CALT adc 02052H 00000H - @@CALT renge 02052H 00000H - @@CALT accero 02052H 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 - 02052H 00000H - @@CALT sw 02052H 00000H + 02056H 00000H + @@CALT sw 02056H 00000H @@CALT task_debug - 02052H 00000H + 02056H 00000H @@CALT task_misc - 02052H 00000H - @@CALT task_sys 02052H 00000H + 02056H 00000H + @@CALT task_sys 02056H 00000H @@CALT pedo_alg_thre_det2 - 02052H 00000H - @@CALT ini_VECT 02052H 00000H + 02056H 00000H + @@CALT ini_VECT 02056H 00000H @@CALT task_status - 02052H 00000H - @@RLINIT 02052H 00000H CSEG UNIT64KP - @@RLINIT loader 02052H 00000H - @@RLINIT pm 02052H 00000H - @@RLINIT i2c_ctr 02052H 00000H - @@RLINIT main 02052H 00000H - @@RLINIT magic 02052H 00000H - @@RLINIT WDT 02052H 00000H - @@RLINIT i2c_mcu 02052H 00000H - @@RLINIT i2c_twl 02052H 00000H - @@RLINIT led 02052H 00000H - @@RLINIT rtc 02052H 00000H - @@RLINIT vreg_ctr 02052H 00000H - @@RLINIT vreg_twl 02052H 00000H - @@RLINIT adc 02052H 00000H - @@RLINIT renge 02052H 00000H - @@RLINIT accero 02052H 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 - 02052H 00000H - @@RLINIT sw 02052H 00000H + 02056H 00000H + @@RLINIT sw 02056H 00000H @@RLINIT task_debug - 02052H 00000H + 02056H 00000H @@RLINIT task_misc - 02052H 00000H - @@RLINIT task_sys 02052H 00000H + 02056H 00000H + @@RLINIT task_sys 02056H 00000H @@RLINIT pedo_alg_thre_det2 - 02052H 00000H - @@RLINIT ini_VECT 02052H 00000H + 02056H 00000H + @@RLINIT ini_VECT 02056H 00000H @@RLINIT task_status - 02052H 00000H - @@RLINIT @rom 02052H 00000H - @@CODEL 02052H 00000H CSEG - @@CODEL pm 02052H 00000H - @@CODEL i2c_ctr 02052H 00000H - @@CODEL magic 02052H 00000H - @@CODEL i2c_twl 02052H 00000H - @@CODEL led 02052H 00000H - @@CODEL rtc 02052H 00000H - @@CODEL vreg_ctr 02052H 00000H - @@CODEL vreg_twl 02052H 00000H - @@CODEL adc 02052H 00000H - @@CODEL renge 02052H 00000H - @@CODEL accero 02052H 00000H - @@CODEL sw 02052H 00000H - @@CODEL task_debug - 02052H 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 - 02052H 00000H - @@CODEL task_sys 02052H 00000H + 02056H 00000H + @@CODEL task_sys 02056H 00000H @@CODEL pedo_alg_thre_det2 - 02052H 00000H - @@CODEL ini_VECT 02052H 00000H + 02056H 00000H + @@CODEL ini_VECT 02056H 00000H @@CODEL task_status - 02052H 00000H - @@LCODEL 02052H 00008H CSEG - @@LCODEL abs 02052H 00008H -* gap * 0205AH 000A6H + 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 @@ -363,57 +368,55 @@ Direc-file:bsr_mcu.dr @@CNST ini_VECT 023C4H 00000H @@CNST task_status 023C4H 00000H - ROM_CODE 023C4H 026E5H CSEG - ROM_CODE pm 023C4H 009ACH - ROM_CODE i2c_ctr 02D70H 00060H - ROM_CODE i2c_twl 02DD0H 0005EH - ROM_CODE led 02E2EH 00503H - ROM_CODE rtc 03331H 000E0H - ROM_CODE vreg_ctr 03411H 00445H - ROM_CODE vreg_twl 03856H 00163H - ROM_CODE adc 039B9H 002A3H - ROM_CODE renge 03C5CH 001C3H - ROM_CODE accero 03E1FH 0013DH - ROM_CODE sw 03F5CH 000F5H - ROM_CODE task_debug - 04051H 00001H + ROM_CODE 023C4H 0271DH CSEG + ROM_CODE pm 023C4H 009CBH + ROM_CODE i2c_ctr 02D8FH 00060H + ROM_CODE i2c_twl 02DEFH 0005EH + ROM_CODE led 02E4DH 00503H + ROM_CODE rtc 03350H 000E0H + ROM_CODE vreg_ctr 03430H 00445H + ROM_CODE vreg_twl 03875H 00162H + ROM_CODE adc 039D7H 002BFH + ROM_CODE renge 03C96H 001C3H + ROM_CODE accero 03E59H 0013DH + ROM_CODE sw 03F96H 000F4H ROM_CODE task_misc - 04052H 001BAH - ROM_CODE task_sys 0420CH 00309H + 0408AH 001BAH + ROM_CODE task_sys 04244H 00309H ROM_CODE pedo_alg_thre_det2 - 04515H 0050FH + 0454DH 0050FH ROM_CODE task_status - 04A24H 00085H - @@BASE 04AA9H 004FCH CSEG BASE - @@BASE loader 04AA9H 00000H - @@BASE pm 04AA9H 00043H - @@BASE i2c_ctr 04AECH 00198H - @@BASE main 04C84H 00000H - @@BASE magic 04C84H 00000H - @@BASE WDT 04C84H 00000H - @@BASE i2c_mcu 04C84H 000D9H - @@BASE i2c_twl 04D5DH 000CDH - @@BASE led 04E2AH 00000H - @@BASE rtc 04E2AH 00043H - @@BASE vreg_ctr 04E6DH 00000H - @@BASE vreg_twl 04E6DH 00000H - @@BASE adc 04E6DH 000B3H - @@BASE renge 04F20H 00000H - @@BASE accero 04F20H 0004AH + 04A5CH 00085H + @@BASE 04AE1H 004FCH CSEG BASE + @@BASE loader 04AE1H 00000H + @@BASE pm 04AE1H 00043H + @@BASE i2c_ctr 04B24H 00198H + @@BASE main 04CBCH 00000H + @@BASE magic 04CBCH 00000H + @@BASE WDT 04CBCH 00000H + @@BASE i2c_mcu 04CBCH 000D9H + @@BASE i2c_twl 04D95H 000CDH + @@BASE led 04E62H 00000H + @@BASE rtc 04E62H 00043H + @@BASE vreg_ctr 04EA5H 00000H + @@BASE vreg_twl 04EA5H 00000H + @@BASE adc 04EA5H 000B3H + @@BASE renge 04F58H 00000H + @@BASE accero 04F58H 0004AH @@BASE self_flash - 04F6AH 00000H - @@BASE sw 04F6AH 00000H + 04FA2H 00000H + @@BASE sw 04FA2H 00000H @@BASE task_debug - 04F6AH 00000H + 04FA2H 00000H @@BASE task_misc - 04F6AH 00000H - @@BASE task_sys 04F6AH 00000H + 04FA2H 00000H + @@BASE task_sys 04FA2H 00000H @@BASE pedo_alg_thre_det2 - 04F6AH 00000H - @@BASE ini_VECT 04F6AH 0003BH + 04FA2H 00000H + @@BASE ini_VECT 04FA2H 0003BH @@BASE task_status - 04FA5H 00000H -* gap * 04FA5H 00051H + 04FDDH 00000H +* gap * 04FDDH 00019H MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL magic 04FF6H 0000AH @@ -452,7 +455,7 @@ Direc-file:bsr_mcu.dr @@DATA task_status FFD06H 00002H @@DATA @rom FFD08H 00000H - @@INIT FFD08H 00038H DSEG BASEP + @@INIT FFD08H 0003CH DSEG BASEP @@INIT @cstart FFD08H 00000H @@INIT loader FFD08H 00000H @@INIT pm FFD08H 00002H @@ -466,149 +469,149 @@ Direc-file:bsr_mcu.dr @@INIT rtc FFD12H 00000H @@INIT vreg_ctr FFD12H 00000H @@INIT vreg_twl FFD12H 00000H - @@INIT adc FFD12H 0000AH - @@INIT renge FFD1CH 00016H - @@INIT accero FFD32H 00000H + @@INIT adc FFD12H 0000EH + @@INIT renge FFD20H 00016H + @@INIT accero FFD36H 00000H @@INIT self_flash - FFD32H 00000H - @@INIT sw FFD32H 00002H + FFD36H 00000H + @@INIT sw FFD36H 00002H @@INIT task_debug - FFD34H 00000H + FFD38H 00000H @@INIT task_misc - FFD34H 00000H - @@INIT task_sys FFD34H 00002H + FFD38H 00000H + @@INIT task_sys FFD38H 00002H @@INIT pedo_alg_thre_det2 - FFD36H 00008H - @@INIT ini_VECT FFD3EH 00000H + FFD3AH 00008H + @@INIT ini_VECT FFD42H 00000H @@INIT task_status - FFD3EH 00002H - @@INIT @rom FFD40H 00000H - @@INIS FFD40H 00000H DSEG UNITP - @@INIS @cstart FFD40H 00000H - @@INIS loader FFD40H 00000H - @@INIS pm FFD40H 00000H - @@INIS i2c_ctr FFD40H 00000H - @@INIS main FFD40H 00000H - @@INIS magic FFD40H 00000H - @@INIS WDT FFD40H 00000H - @@INIS i2c_mcu FFD40H 00000H - @@INIS i2c_twl FFD40H 00000H - @@INIS led FFD40H 00000H - @@INIS rtc FFD40H 00000H - @@INIS vreg_ctr FFD40H 00000H - @@INIS vreg_twl FFD40H 00000H - @@INIS adc FFD40H 00000H - @@INIS renge FFD40H 00000H - @@INIS accero FFD40H 00000H + FFD42H 00002H + @@INIT @rom FFD44H 00000H + @@INIS FFD44H 00000H DSEG UNITP + @@INIS @cstart FFD44H 00000H + @@INIS loader FFD44H 00000H + @@INIS pm FFD44H 00000H + @@INIS i2c_ctr FFD44H 00000H + @@INIS main FFD44H 00000H + @@INIS magic FFD44H 00000H + @@INIS WDT FFD44H 00000H + @@INIS i2c_mcu FFD44H 00000H + @@INIS i2c_twl FFD44H 00000H + @@INIS led FFD44H 00000H + @@INIS rtc FFD44H 00000H + @@INIS vreg_ctr FFD44H 00000H + @@INIS vreg_twl FFD44H 00000H + @@INIS adc FFD44H 00000H + @@INIS renge FFD44H 00000H + @@INIS accero FFD44H 00000H @@INIS self_flash - FFD40H 00000H - @@INIS sw FFD40H 00000H + FFD44H 00000H + @@INIS sw FFD44H 00000H @@INIS task_debug - FFD40H 00000H + FFD44H 00000H @@INIS task_misc - FFD40H 00000H - @@INIS task_sys FFD40H 00000H + FFD44H 00000H + @@INIS task_sys FFD44H 00000H @@INIS pedo_alg_thre_det2 - FFD40H 00000H - @@INIS ini_VECT FFD40H 00000H + FFD44H 00000H + @@INIS ini_VECT FFD44H 00000H @@INIS task_status - FFD40H 00000H - @@INIS @rom FFD40H 00000H - @@DATS FFD40H 00000H DSEG UNITP - @@DATS @cstart FFD40H 00000H - @@DATS loader FFD40H 00000H - @@DATS pm FFD40H 00000H - @@DATS i2c_ctr FFD40H 00000H - @@DATS main FFD40H 00000H - @@DATS magic FFD40H 00000H - @@DATS WDT FFD40H 00000H - @@DATS i2c_mcu FFD40H 00000H - @@DATS i2c_twl FFD40H 00000H - @@DATS led FFD40H 00000H - @@DATS rtc FFD40H 00000H - @@DATS vreg_ctr FFD40H 00000H - @@DATS vreg_twl FFD40H 00000H - @@DATS adc FFD40H 00000H - @@DATS renge FFD40H 00000H - @@DATS accero FFD40H 00000H + FFD44H 00000H + @@INIS @rom FFD44H 00000H + @@DATS FFD44H 00000H DSEG UNITP + @@DATS @cstart FFD44H 00000H + @@DATS loader FFD44H 00000H + @@DATS pm FFD44H 00000H + @@DATS i2c_ctr FFD44H 00000H + @@DATS main FFD44H 00000H + @@DATS magic FFD44H 00000H + @@DATS WDT FFD44H 00000H + @@DATS i2c_mcu FFD44H 00000H + @@DATS i2c_twl FFD44H 00000H + @@DATS led FFD44H 00000H + @@DATS rtc FFD44H 00000H + @@DATS vreg_ctr FFD44H 00000H + @@DATS vreg_twl FFD44H 00000H + @@DATS adc FFD44H 00000H + @@DATS renge FFD44H 00000H + @@DATS accero FFD44H 00000H @@DATS self_flash - FFD40H 00000H - @@DATS sw FFD40H 00000H + FFD44H 00000H + @@DATS sw FFD44H 00000H @@DATS task_debug - FFD40H 00000H + FFD44H 00000H @@DATS task_misc - FFD40H 00000H - @@DATS task_sys FFD40H 00000H + FFD44H 00000H + @@DATS task_sys FFD44H 00000H @@DATS pedo_alg_thre_det2 - FFD40H 00000H - @@DATS ini_VECT FFD40H 00000H + FFD44H 00000H + @@DATS ini_VECT FFD44H 00000H @@DATS task_status - FFD40H 00000H - @@DATS @rom FFD40H 00000H - FSL_DATA FFD40H 00010H DSEG UNITP + FFD44H 00000H + @@DATS @rom FFD44H 00000H + FSL_DATA FFD44H 00010H DSEG UNITP FSL_DATA fsl_common - FFD40H 00010H - @@INITL FFD50H 00000H DSEG UNIT64KP - @@INITL loader FFD50H 00000H - @@INITL pm FFD50H 00000H - @@INITL i2c_ctr FFD50H 00000H - @@INITL main FFD50H 00000H - @@INITL magic FFD50H 00000H - @@INITL WDT FFD50H 00000H - @@INITL i2c_mcu FFD50H 00000H - @@INITL i2c_twl FFD50H 00000H - @@INITL led FFD50H 00000H - @@INITL rtc FFD50H 00000H - @@INITL vreg_ctr FFD50H 00000H - @@INITL vreg_twl FFD50H 00000H - @@INITL adc FFD50H 00000H - @@INITL renge FFD50H 00000H - @@INITL accero FFD50H 00000H + FFD44H 00010H + @@INITL FFD54H 00000H DSEG UNIT64KP + @@INITL loader FFD54H 00000H + @@INITL pm FFD54H 00000H + @@INITL i2c_ctr FFD54H 00000H + @@INITL main FFD54H 00000H + @@INITL magic FFD54H 00000H + @@INITL WDT FFD54H 00000H + @@INITL i2c_mcu FFD54H 00000H + @@INITL i2c_twl FFD54H 00000H + @@INITL led FFD54H 00000H + @@INITL rtc FFD54H 00000H + @@INITL vreg_ctr FFD54H 00000H + @@INITL vreg_twl FFD54H 00000H + @@INITL adc FFD54H 00000H + @@INITL renge FFD54H 00000H + @@INITL accero FFD54H 00000H @@INITL self_flash - FFD50H 00000H - @@INITL sw FFD50H 00000H + FFD54H 00000H + @@INITL sw FFD54H 00000H @@INITL task_debug - FFD50H 00000H + FFD54H 00000H @@INITL task_misc - FFD50H 00000H - @@INITL task_sys FFD50H 00000H + FFD54H 00000H + @@INITL task_sys FFD54H 00000H @@INITL pedo_alg_thre_det2 - FFD50H 00000H - @@INITL ini_VECT FFD50H 00000H + FFD54H 00000H + @@INITL ini_VECT FFD54H 00000H @@INITL task_status - FFD50H 00000H - @@INITL @rom FFD50H 00000H - @@DATAL FFD50H 00000H DSEG UNIT64KP - @@DATAL loader FFD50H 00000H - @@DATAL pm FFD50H 00000H - @@DATAL i2c_ctr FFD50H 00000H - @@DATAL main FFD50H 00000H - @@DATAL magic FFD50H 00000H - @@DATAL WDT FFD50H 00000H - @@DATAL i2c_mcu FFD50H 00000H - @@DATAL i2c_twl FFD50H 00000H - @@DATAL led FFD50H 00000H - @@DATAL rtc FFD50H 00000H - @@DATAL vreg_ctr FFD50H 00000H - @@DATAL vreg_twl FFD50H 00000H - @@DATAL adc FFD50H 00000H - @@DATAL renge FFD50H 00000H - @@DATAL accero FFD50H 00000H + FFD54H 00000H + @@INITL @rom FFD54H 00000H + @@DATAL FFD54H 00000H DSEG UNIT64KP + @@DATAL loader FFD54H 00000H + @@DATAL pm FFD54H 00000H + @@DATAL i2c_ctr FFD54H 00000H + @@DATAL main FFD54H 00000H + @@DATAL magic FFD54H 00000H + @@DATAL WDT FFD54H 00000H + @@DATAL i2c_mcu FFD54H 00000H + @@DATAL i2c_twl FFD54H 00000H + @@DATAL led FFD54H 00000H + @@DATAL rtc FFD54H 00000H + @@DATAL vreg_ctr FFD54H 00000H + @@DATAL vreg_twl FFD54H 00000H + @@DATAL adc FFD54H 00000H + @@DATAL renge FFD54H 00000H + @@DATAL accero FFD54H 00000H @@DATAL self_flash - FFD50H 00000H - @@DATAL sw FFD50H 00000H + FFD54H 00000H + @@DATAL sw FFD54H 00000H @@DATAL task_debug - FFD50H 00000H + FFD54H 00000H @@DATAL task_misc - FFD50H 00000H - @@DATAL task_sys FFD50H 00000H + FFD54H 00000H + @@DATAL task_sys FFD54H 00000H @@DATAL pedo_alg_thre_det2 - FFD50H 00000H - @@DATAL ini_VECT FFD50H 00000H + FFD54H 00000H + @@DATAL ini_VECT FFD54H 00000H @@DATAL task_status - FFD50H 00000H - @@DATAL @rom FFD50H 00000H -* gap * FFD50H 000B0H + FFD54H 00000H + @@DATAL @rom FFD54H 00000H +* gap * FFD54H 000ACH MEMORY=RAM2 BASE ADDRESS=FFE20H SIZE=000C0H diff --git a/trunk/config.h b/trunk/config.h index ab57ecd..e23b852 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -10,10 +10,10 @@ //#define _DEBUG_CODEC_POLLING_ //#define _PMIC_TEST_ //#define _ENABLE_WDT_TEST_ - +//#define _DBG_FORCE_JIKKI_ #define MCU_VER_MAJOR 0x01 -#define MCU_VER_MINOR 0x00 +#define MCU_VER_MINOR 0x01 //#define PM_CCIC_TIM diff --git a/trunk/hoge.bin b/trunk/hoge.bin index e11de0e..d90d7cc 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/pm.c b/trunk/pm.c index 5c5aa33..b9512c2 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -214,7 +214,7 @@ void BT_chk() bt_force_update = 0; iic_mcu_start( ); // 中で初期化フラグをもってるので呼びまくって良い　こんなところに…orz if( (( battery_manufacturer_old == BT_VENDER_OPEN ) || - ( battery_manufacturer_old == BT_VENDER_NOT_CHECKED )) && + ( battery_manufacturer_old == BT_VENDER_NOT_CHECKED )) && !system_status.reboot ) { BT_mgic_quick_start(); @@ -240,6 +240,7 @@ void BT_model_detect() temp = get_adc( ADC_SEL_BATT_DET ); BT_DET_P = 0; + system_status.fake_jikki = 0; // プラットフォーム判定 // if( raw_adc_temperature > 0xF0 ) { @@ -248,8 +249,16 @@ void BT_model_detect() } else if( raw_adc_temperature < 4 ) { + u8 temp; // 白箱 // system_status.model = MODEL_SHIROBAKO; + + // もしかして：キャプチャボード // + if(( iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VERSION ) == 0x01 ) && + ( iic_mcu_result == ERR_OK )) + { + system_status.fake_jikki = 1; + } } else { @@ -619,10 +628,10 @@ void BT_get_left(){ if( system_status.pwr_state != ON ) { - bt_remain_old = 0; + bt_remain_old = NTR_PM_BT_ENOUGH; } - flag = (( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO )? 1 : 0 ); // 1で電池切れ + flag = (( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO )? NTR_PM_BT_EMPTY: NTR_PM_BT_ENOUGH ); // 1で電池切れ if( bt_remain_old != flag ) { @@ -634,8 +643,6 @@ void BT_get_left(){ - - /* ======================================================== 液晶系の電源制御 　ステータスフラグはすぐに立ててしまう。 diff --git a/trunk/pm.h b/trunk/pm.h index 5d8d212..5a8d715 100644 --- a/trunk/pm.h +++ b/trunk/pm.h @@ -69,6 +69,12 @@ typedef enum BT_VENDER +enum NTR_PM_BT_STATUS{ + NTR_PM_BT_ENOUGH, + NTR_PM_BT_EMPTY +}; + + //========================================================= // CODEC上のPMIC互換レジスタ diff --git a/trunk/sw.c b/trunk/sw.c index 5b49e92..3540b76 100644 --- a/trunk/sw.c +++ b/trunk/sw.c @@ -129,11 +129,11 @@ void tsk_sw( ) { # ifdef _MODEL_CTR_ case( MODEL_JIKKI ): + case( MODEL_SHIROBAKO ): SW_HOME_n = SW_HOME_n_JIKKI; break; # endif case( MODEL_TS_BOARD ): - case( MODEL_SHIROBAKO ): SW_HOME_n = SW_HOME_n_TSBOARD; break; default: diff --git a/trunk/task_debug.c b/trunk/task_debug.c index 59cd6f1..99b1966 100644 --- a/trunk/task_debug.c +++ b/trunk/task_debug.c @@ -3,9 +3,11 @@ #pragma HALT #pragma STOP -#include "incs.h" +#include "incs_loader.h" +//#include "incs.h" #include "renge\renge.h" #include "pm.h" +#include "accero.h" /* ======================================================== diff --git a/trunk/task_misc.c b/trunk/task_misc.c index 34b3e25..d7d4400 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -170,7 +170,7 @@ task_status_immed do_command0( ) { going_to_sleep = 1; } - + if( ( vreg_ctr[VREG_C_COMMAND0] & ( REG_BIT_OFF_REQ | REG_BIT_RESET1_REQ | REG_BIT_FCRAM_RESET_REQ | REG_BIT_RESET2_REQ )) != 0x00 ) { if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_OFF_REQ ) @@ -247,7 +247,7 @@ extern bit bt_chg_ready; ======================================================== */ task_status_immed tski_mcu_info_read() { - + if( SPD ) { goto end; @@ -270,7 +270,11 @@ task_status_immed tski_mcu_info_read() switch( iic_burst_state++ ){ case( 0 ): // 本体種類識別 +#ifdef _DBG_FORCE_JIKKI_ + IICA = MODEL_JIKKI; +#else IICA = (u8)system_status.model; +#endif break; case( 1 ): // IICがなにかエラーでも知らない。00かFFならエラーの可能性が高い @@ -297,7 +301,7 @@ task_status_immed tski_mcu_info_read() IICA = raw_adc_temperature; break; - case( 7 ): + case( 7 ): IICA = ( !temp_zone_charge_disable | ( bt_chg_ready << 1 ) ); break; diff --git a/trunk/vreg_twl.c b/trunk/vreg_twl.c index 988d39b..0eba586 100644 --- a/trunk/vreg_twl.c +++ b/trunk/vreg_twl.c @@ -110,16 +110,17 @@ u8 vreg_twl_read( u8 phy_adrs ) u8 temp; switch( phy_adrs ){ + // 10%以下で赤になる case( REG_TWL_INT_ADRS_POWER_INFO ): - if( vreg_ctr[ VREG_C_BT_REMAIN ] > 90 ){ + if( vreg_ctr[ VREG_C_BT_REMAIN ] > 80 ){ vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x0F; - }else if( vreg_ctr[ VREG_C_BT_REMAIN ] > 75 ){ - vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x0B; }else if( vreg_ctr[ VREG_C_BT_REMAIN ] > 50 ){ - vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x07; + vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x0B; }else if( vreg_ctr[ VREG_C_BT_REMAIN ] > BATT_TH_LO ){ - vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x03; + vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x07; }else if( vreg_ctr[ VREG_C_BT_REMAIN ] > BATT_TH_EMPTY ){ + vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x03; + }else if( vreg_ctr[ VREG_C_BT_REMAIN ] > 0 ){ vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x01; }else{ vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x00; diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index 2583598..d5ae06d 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,23 +1,18 @@ C:\WINDOWS\system32\cmd.exe /c touch magic.c -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no loader.c -loader.c(104) : CC78K0R warning W0401: Conversion may lose significant digits -loader.c(105) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\loader.asm -Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no pm.c pm.c(225) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' pm.c(437) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(537) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(538) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(625) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(663) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(701) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(785) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(793) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(948) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -pm.c(1015) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1018) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(661) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(699) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(783) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(791) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(871) : CC78K0R warning W0510: Pointer mismatch in function 'iic_mcu_read' +pm.c(952) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +pm.c(1019) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1022) : CC78K0R warning W0401: Conversion may lose significant digits batt_params.h(97) : CC78K0R warning W0401: Conversion may lose significant digits batt_params.h(97) : CC78K0R warning W0401: Conversion may lose significant digits batt_params.h(98) : CC78K0R warning W0401: Conversion may lose significant digits @@ -28,149 +23,14 @@ batt_params.h(100) : CC78K0R warning W0401: Conversion may lose significant digi batt_params.h(101) : CC78K0R warning W0401: Conversion may lose significant digits batt_params.h(102) : CC78K0R warning W0401: Conversion may lose significant digits batt_params.h(103) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 22 warning(s) found. +Compilation complete, 0 error(s) and 23 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pm.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_ctr.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no main.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\main.asm -Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no magic.c Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no WDT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\WDT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_mcu.c -i2c_mcu.c(205) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_mcu.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_twl.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no led.c -led.c(108) : CC78K0R warning W0745: Expected function prototype -led.c(241) : CC78K0R warning W0401: Conversion may lose significant digits -led.c(246) : CC78K0R warning W0401: Conversion may lose significant digits -led.c(308) : CC78K0R warning W0401: Conversion may lose significant digits -led.c(367) : CC78K0R warning W0401: Conversion may lose significant digits -led.c(393) : CC78K0R warning W0401: Conversion may lose significant digits -led.c(556) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 7 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\led.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no rtc.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\rtc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no vreg_ctr.c -vreg_ctr.c(110) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -vreg_ctr.c(119) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -vreg_ctr.c(128) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -vreg_ctr.c(138) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -vreg_ctr.c(142) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -vreg_ctr.c(149) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -vreg_ctr.c(159) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(160) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(162) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(165) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(249) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -vreg_ctr.c(254) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -vreg_ctr.c(259) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -vreg_ctr.c(289) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -vreg_ctr.c(305) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -vreg_ctr.c(415) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -Compilation complete, 0 error(s) and 17 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no vreg_twl.c -vreg_twl.c(52) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -vreg_twl.c(61) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_twl.c(65) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 3 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no adc.c -adc.c(124) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(130) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -adc.c(211) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(238) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(330) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(354) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -adc.c(373) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(452) : CC78K0R warning W0745: Expected function prototype -adc.c(476) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(481) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 10 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\adc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no renge\renge.c -renge\renge.c(149) : CC78K0R warning W0411: Illegal pointer combination -renge\renge.c(157) : CC78K0R warning W0412: Illegal pointer combination in conditional expression -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\renge.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no accero.c -accero.c(242) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\accero.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no self_flash.c -self_flash.c(219) : CC78K0R warning W0401: Conversion may lose significant digits -self_flash.c(259) : CC78K0R warning W0401: Conversion may lose significant digits -self_flash.c(260) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 3 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\self_flash.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no sw.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\sw.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_debug.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_debug.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_misc.c -task_misc.c(91) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -task_misc.c(105) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -task_misc.c(207) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -task_misc.c(301) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 4 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_misc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_sys.c -task_sys.c(184) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(446) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(448) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' -Compilation complete, 0 error(s) and 3 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_sys.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c -pedo_alg_thre_det2.c(58) : CC78K0R warning W0745: Expected function prototype -pedo_alg_thre_det2.c(73) : CC78K0R warning W0401: Conversion may lose significant digits -pedo_alg_thre_det2.c(140) : CC78K0R warning W0401: Conversion may lose significant digits -pedo_alg_thre_det2.c(153) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 4 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pedo_alg_thre_det2.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no ini_VECT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\ini_VECT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_status.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_status.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lk78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r\s0rm.rel" -gi10A84B295BE95C03D45Bh -pbsr_k0r.map -nkd -gb7EFFFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r" -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lk78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r\s0rm.rel" -go85h,0FC00h,1024 -gi10A84B295BE95C03D45Bh -pbsr_k0r.map -nkd -gb7EFFFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r" -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel Link complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\oc78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -o.\bsr.hex -ki -U0FFH -R bsr.lmf Object Conversion Complete, 0 error(s) and 0 warning(s) found. @@ -180,4 +40,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 79 +Build Total error(s) : 0 Total warning(s) : 23 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 3837fc9..3b6e5c6 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=136, 60, 803, 775 +Geometry=27, 151, 757, 775 Window=Normal -DispStart=41 -CaretPos=79,0 +DispStart=95 +CaretPos=138,0 Mode=Normal DispFile= Address1= @@ -140,18 +140,26 @@ SaveStart= SaveEnd= Accumulative=ON [Source1] -Geometry=0, 0, 803, 775 +Geometry=50, 50, 757, 775 Window=Normal -DispStart=344 -CaretPos=389,16 +DispStart=439 +CaretPos=440,0 Mode=Normal -DispFile=pedo_alg_thre_det2.c +DispFile=adc.c +Accumulative=ON +[Source2] +Geometry=0, 0, 757, 775 +Window=Normal +DispStart=95 +CaretPos=148,0 +Mode=Normal +DispFile=sw.c Accumulative=ON [Assemble] Geometry=282, 92, 968, 626 -Window=Normal -DispStart=3325 -CaretPos=3325,27 +Window=Hide +DispStart=864252928 +CaretPos=0,0 Address1= Address2= Address3= @@ -822,7 +830,7 @@ L529=IICWL1 L530=IICWH1 L531=SVA1 [Local Variable] -Geometry=908, 407, 353, 335 +Geometry=909, 497, 353, 199 Window=Normal Boundary=11468964 Mode=Proper @@ -981,71 +989,73 @@ Count=0 Geometry=835, -4, 441, 502 Window=Normal Boundary=18088086 -0=.timeout_sleep,P,N,A,+,1 -1=.going_to_sleep,P,N,A,+,1 -2=.now_longhour,P,N,A,+,1 -3=.TDR06,P,S,A,+,1 -4=.LED_dim_status_sleep,.,N,A,+,1 -5=.frame_sleep,P,N,A,+,1 -6=.PM20,B,S,A,+,1 -7=.P20,P,S,A,+,1 -8=.pu20,B,S,A,+,1 -9=.work_vr_vol,.,N,A,+,1 -10=.vol_data_ctr_tmp,P,N,A,+,1 -11=.vol_data_ctr,P,N,A,+,1 -12=.last_modifyer,P,N,A,+,1 -13=.sent_index,P,N,A,+,1 -14=.vreg_ctr,P,N,A,+,1 -15=.P1.5,P,S,A,+,1 -16=.TDR07,P,S,A,+,1 -17=.info_led_override,P,N,A,+,1 -18=.system_status,.,N,A,+,1 -19=.battery_manufacturer,P,N,A,+,1 -20=.last_year,P,N,A,+,1 -21=.last_month,P,N,A,+,1 -22=.last_day,P,N,A,+,1 -23=.last_hour,P,N,A,+,1 -24=.now_min,P,N,A,+,1 -25=.now_sec,P,N,A,+,1 -Line=26 +0=.vreg_ctr[9],P,N,A,+,1 +1=.timeout_sleep,P,N,A,+,1 +2=.going_to_sleep,P,N,A,+,1 +3=.now_longhour,P,N,A,+,1 +4=.TDR06,P,S,A,+,1 +5=.LED_dim_status_sleep,.,N,A,+,1 +6=.frame_sleep,P,N,A,+,1 +7=.PM20,B,S,A,+,1 +8=.P20,P,S,A,+,1 +9=.pu20,B,S,A,+,1 +10=.work_vr_vol,.,N,A,+,1 +11=.vol_data_ctr_tmp,P,N,A,+,1 +12=.vol_data_ctr,P,N,A,+,1 +13=.last_modifyer,P,N,A,+,1 +14=.sent_index,P,N,A,+,1 +15=.vreg_ctr,P,N,A,+,1 +16=.P1.5,P,S,A,+,1 +17=.TDR07,P,S,A,+,1 +18=.info_led_override,P,N,A,+,1 +19=+system_status,.,N,A,-,1 +20=.battery_manufacturer,P,N,A,+,1 +21=.last_year,P,N,A,+,1 +22=.last_month,P,N,A,+,1 +23=.last_day,P,N,A,+,1 +24=.last_hour,P,N,A,+,1 +25=.now_min,P,N,A,+,1 +26=.now_sec,P,N,A,+,1 +27=.adc_raw_vol,P,N,A,+,1 +28=.vol_data_ctr_tmp,P,N,A,+,1 +29=.vol_data_ctr,P,N,A,+,1 +30=.vol_old,P,N,A,+,1 +31=.SW_HOME_n,P,N,A,+,1 +Line=32 [Quick Watch] -0=pu6,P,A,1 -1=frame_sleep,P,A,1 -2=LED_dim_status_sleep,P,A,1 -3=TDR06,P,A,1 -4=now_longhour,P,A,1 -5=going_to_sleep,P,A,1 -6=timeout_sleep,P,A,1 -7=info_led_override,P,A,1 -8=TDR07,P,A,1 -9=P1.5,P,A,1 -10=last_year,P,A,1 -11=last_month,P,A,1 -12=last_day,P,A,1 -13=last_hour,P,A,1 -14=now_min,P,A,1 -15=now_sec,P,A,1 +0=info_led_override,P,A,1 +1=TDR07,P,A,1 +2=P1.5,P,A,1 +3=last_year,P,A,1 +4=last_month,P,A,1 +5=last_day,P,A,1 +6=last_hour,P,A,1 +7=now_min,P,A,1 +8=now_sec,P,A,1 +9=vreg_ctr[ 9],P,A,1 +10=vreg_ctr[9],P,A,1 +11=vol_old,P,A,1 +12=vol_data_ctr,P,A,1 +13=vol_data_ctr_tmp,P,A,1 +14=adc_raw_vol,P,A,1 +15=SW_HOME_n,P,A,1 [Software Break] Geometry=869, 649, 445, 260 Window=Normal Width=150 30 200 100 Name0=Swb00002 -Address0=i2c_ctr.c#_int_iic_ctr+0x57 +Address0=adc.c#_adc_filter+0x9d Window0=ASM Status0=ON -Name1=Swb00001 -Address1=sw.c#_tsk_sw+0x4c +Name1=Swb00003 +Address1=adc.c#_adc_filter+0x84 Window1=ASM Status1=ON -Name2=Swb00005 -Address2=sw.c#_tsk_sw+0x65 +Name2=Swb00004 +Address2=sw.c#_tsk_sw+0xae Window2=ASM Status2=ON -Name3=Swb00003 -Address3=sw.c#_tsk_sw+0x3a -Window3=ASM -Status3=ON -Count=4 +Count=3 [Reset] Debugger=ON Symbol=OFF diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index fcbd74f..173db99 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -756,6 +756,37 @@ ZF=0 S=1 E=0 CommandFile=0 +[Options.LCNV78K0R 0] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 1] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 2] +Version=100 +LCNV_GO=0 +O0=inter_asm +E=0 +CommandFile=0 +[Options.LCNV78K0R 3] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 4] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 5] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 [Options.LK78K0R 0] Version=100 O0=bsr_k0r.lmf @@ -840,7 +871,7 @@ G=1 E=0 E0=flash.elk E1=a.elk -GO=0 +GO=1 GOValue=85 GOStart=FC00 GOSizeValue=1024 @@ -1007,37 +1038,6 @@ ZB= Etcetera0= Etcetera1=boot.lmf CommandFile=0 -[Options.LCNV78K0R 0] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 1] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 2] -Version=100 -LCNV_GO=0 -O0=inter_asm -E=0 -CommandFile=0 -[Options.LCNV78K0R 3] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 4] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 5] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 [Options.78K0R] BuildMode=2 BuildMode2=K0R_dbg diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 5d9d692..76f4ef9 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,19 +1,23 @@ [ProjectManager] FrameMax=1 -FrameX=152 -FrameY=55 +FrameX=267 +FrameY=20 FrameCX=1299 FrameCY=1044 OpenFile1=ProjectWindow PrjPos=0,2,754,3,253 OpenFile2=task_sys.c,0,220,220,1464,977,0,137,31,0 -OpenFile3=task_misc.c,0,198,198,1166,823,48,91,48,0 -OpenFile4=vreg_ctr.c,0,367,300,1611,1057,8,109,28,0 -OpenFile5=pedo_alg_thre_det2.c,0,220,220,1188,845,0,434,0,0 -OpenFile6=adc.c,0,264,264,1508,1021,9,226,9,0 -OpenFile7=OutputWindow +OpenFile3=vreg_ctr.c,0,367,300,1611,1057,8,109,28,0 +OpenFile4=pedo_alg_thre_det2.c,0,220,220,1188,845,0,434,0,0 +OpenFile5=pm.h,0,242,242,1486,999,0,119,4,0 +OpenFile6=pm.c,0,335,300,1579,1057,42,630,42,0 +OpenFile7=adc.c,0,264,264,1508,1021,0,423,5,0 +OpenFile8=accero.c,0,264,264,1243,901,0,160,0,0 +OpenFile9=task_debug.c,0,363,341,1342,978,30,26,42,0 +OpenFile10=task_misc.c,0,184,129,1152,754,0,275,0,0 +OpenFile11=OutputWindow OutputPos=0,21,966,690,1552 -OpenFile8=config.h,0,88,228,1332,985,28,17,0,0 +OpenFile12=config.h,0,88,228,1332,985,18,42,18,0 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index bb86583..7b53443 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4c3d4c95 +T=4c3fc60e 1=incs_loader.h 2=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 3=fsl_user.h @@ -12,7 +12,7 @@ T=4c3d4c95 8=reboot.h 9=magic.h [pm.c] -T=4c3d87c0 +T=4c465d07 1=incs.h 2=adc.h 3=led.h @@ -36,7 +36,7 @@ T=4c3c0229 7=adc.h 8=pool.h [magic.c] -T=4c3ecca8 +T=4c4e9b2a 1=config.h [WDT.c] T=4bf0d1e1 @@ -52,14 +52,14 @@ T=4c29c700 3=i2c_twl_defs.h 4=i2c_twl.h [led.c] -T=4c3ec648 +T=4c3ecd56 1=incs.h 2=led.h [rtc.c] T=4c3db81b 1=incs.h [vreg_ctr.c] -T=4c3e964e +T=4c3fc4a7 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -70,14 +70,14 @@ T=4c3e964e 8=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 9=fsl_user.h [vreg_twl.c] -T=4c3af447 +T=4c465cb6 1=incs.h 2=jhl_defs.h 3=led.h 4=vreg_twl.h 5=vreg_ctr.h [adc.c] -T=4c3dadd9 +T=4c48ff0b 1=incs.h 2=adc.h 3=pm.h @@ -98,7 +98,7 @@ T=4c3d767c 2=incs.h 3=..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] -T=4c3d4266 +T=4c3f9f78 1=incs_loader.h 2=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 3=fsl_user.h @@ -116,12 +116,13 @@ T=4c3ec9e4 6=rtc.h 7=sw.h [task_debug.c] -T=4c3d42f7 -1=incs.h +T=4c4698f9 +1=incs_loader.h 2=renge\renge.h 3=pm.h +4=accero.h [task_misc.c] -T=4c3c5c5b +T=4c4e424f 1=incs.h 2=renge\renge.h 3=pm.h @@ -142,7 +143,7 @@ T=4c3ea0de 9=adc.h 10=self_flash.h [pedo_alg_thre_det2.c] -T=4c3da657 +T=4c3fdc7e 1=incs.h 2=..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h 3=accero.h @@ -175,7 +176,7 @@ T=4c119cde T=4c075832 1=config.h [config.h] -T=4c3eccb0 +T=4c4ea335 [user_define.h] T=4c3d838c [bsr_system.h] @@ -205,7 +206,7 @@ T=4bf0d1e0 [i2c_ctr.h] T=4bf0d1e1 [pm.h] -T=4c3d838c +T=4c465cfd [rtc.h] T=4bf0d1e1 [reboot.h]