diff --git a/trunk/accero.c b/trunk/accero.c index 66d483d..2debbc7 100644 --- a/trunk/accero.c +++ b/trunk/accero.c @@ -105,7 +105,7 @@ task_status_immed tsk_cbk_accero( ) { set_irq( VREG_C_IRQ1, REG_BIT_ACC_DAT_RDY ); // ゴミデータのカラ読み - if( ACC_VALID == 1 ) + if( ACC_VALID ) { u8 temp[6]; iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | 0x80 ), 6, temp ); diff --git a/trunk/adc.c b/trunk/adc.c index df2f678..3bc9775 100644 --- a/trunk/adc.c +++ b/trunk/adc.c @@ -99,7 +99,7 @@ void tsk_adc( ) } #endif - +/* if( task_interval-- != 0 ) { return; @@ -108,7 +108,7 @@ void tsk_adc( ) { task_interval = (u8)( INTERVAL_TSK_ADC / SYS_INTERVAL_TICK ); } - +*/ if( adc_updated ) { adc_updated = 0; @@ -116,10 +116,11 @@ void tsk_adc( ) if( system_status.pwr_state == ON ) { // 3D ///////////////////////////////////////// - adc_filter( adc_scaling( adc_raw_dep ), &work_vr_3d ); + vreg_ctr[ VREG_C_TUNE ] = adc_raw_dep; // 生値 // Volume ///////////////////////////////////// { + vreg_ctr[ VREG_C_VOL_ADC_RAW ] = adc_raw_vol; adc_filter( adc_scaling( adc_raw_vol ), &work_vr_vol ); // 結果は*work_vr_volから指されるvol_data_ctr 読みにくい... vol_data_ctr = vol_data_ctr_tmp / 4; @@ -413,29 +414,23 @@ u8 get_adc( u8 ch ) /* ======================================================== VRの可動範囲を考えてスケーリング + + 音量Vol専用　使い回すならそのときどうにかする ======================================================== */ -//#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 <= ASOBI_L ) + if( orig_val <= vreg_ctr[ VREG_C_VOL_CAL_MIN ] ) { return( 0 ); } - if( orig_val >= ( 255 - ASOBI_H )) + if( orig_val >= vreg_ctr[ VREG_C_VOL_CAL_MAX ] ) { return( 255 ); } - orig_val -= ASOBI_L; - temp = (u16)( orig_val * 256 ) / ( 256 - ( ASOBI_L + ASOBI_H )); + temp = (u16)(( orig_val - vreg_ctr[ VREG_C_VOL_CAL_MIN ] ) * 256 ) / ( vreg_ctr[ VREG_C_VOL_CAL_MAX ] - vreg_ctr[ VREG_C_VOL_CAL_MIN ] ); if( temp > 255 ) { temp = 255; @@ -459,7 +454,7 @@ static void adc_filter( u8 new_val, filter_work *work ) { // 大きく離れた work -> large_diff_count += 1; - if( work -> large_diff_count > 3 ) + if( work -> large_diff_count > 16 ) { *( work -> value_used ) = new_val; work -> diffs = 0; diff --git a/trunk/bsr.hex b/trunk/bsr.hex index 47d234b..139f9b3 100644 --- a/trunk/bsr.hex +++ b/trunk/bsr.hex @@ -1,275 +1,273 @@ -:020000005F0C93 -:02000200FFFFFE -:0C000400FFFFFFFFFFFFFFFFFFFFFFFFFC -:04001000E14AE74A90 +:02000000EB0C07 +:0E000200FFFFFFFFFFFFFFFFFFFFFFFFFFFFFE +:04001000AA4AB04AFE :08001400FFFFFFFFFFFFFFFFEC -:02001C00BC4CDA +:02001C00854C11 :06001E00FFFFFFFFFFFFE2 -:02002400284D65 +:02002400F14C9D :04002600FFFFFFFFDA -:02002A00954DF2 +:02002A005E4D29 :08002C00FFFFFFFFFFFFFFFFD4 -:08003400A54E624EA04ED74F0D +:080034006E4E2B4E694EA04FE9 :0E003C00FFFFFFFFFFFFFFFFFFFFFFFFFFFFC4 -:02004A00E94A81 +:02004A00B24AB8 :0E004C00FFFFFFFFFFFFFFFFFFFFFFFFFFFFB4 -:02005A00244B35 +:02005A00ED4A6D :06005C00FFFFFFFFFFFFA4 -:02006200584FF5 +:02006200214F2C :10006400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF9C :10007400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8C :10008400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7C :10009400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6C :1000A400FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5C :0C00B400FFFFFFFFFFFFFFFFFFFFFFFF4C -:0400C0007EFFFF853B +:0400C0007EFFFF04BC :0A00C40010A84B295BE95C03D45B34 -:0A00CE00FFFFFFFFFFFFFFFFFFFF32 -:1000D800C7C1FBF8FFCEABACC736F00071F4C6DC85 -:1000E80015CC0100CC00006159016159008BD1DFAA -:1000F800F98C01D1DFF1CC0000CC01008C014C0956 -:10010800DE468C01318E04F60FC1317B9EFDC41191 -:1001180089728C01318E04F64F14896142DF03F62F -:10012800EF01E6600D9B8C01318E12490021728C23 -:1001380001318E04F64F14896142DF03F6EF01E6C0 -:10014800600D9B615901EFB440F64FFF61F86159AA -:10015800008BD1DD06FDAA01FD1A07CEABACC73670 -:10016800F00071F4C6DE0671301EF9EF168EA89CF9 -:10017800018C015C10D1DD087110D6FB71301EF9BD -:10018800FDAA01FDA402EDDD00C0C6D7717BFACE41 -:10019800A010CEA180E5F300CEA408F5AAFFF5A92A -:1001A800FFD78F1EF931350ACD0003CD0307F40EB2 -:1001B800EF07F400CD0306F40ECF1105FCF510058A -:1001C800CF120511CE20FFCE23F0CE2EFCCD01C0DC -:1001D800F402CD0408F405F406CD0740F40CF40F3E -:1001E800F521FFCE22E9CE24F3CE25F2CE26FCCE91 -:1001F800275FCE2CFFCE2FFFF53000F53100F53309 -:1002080000F53400CF350002CF370019F53C00F572 -:100218003E00CF530006F55700F6BEE0BEE2BED062 -:10022800CBE4FFFFCBE6FFFFCBD4FFFFCE3831CEC8 -:100238003970CF38050AF53905F537FF7108F2002E -:1002480090BFB401F5A5FFF5A6FF7158F000F53091 -:10025800FF7128F0005087BF1801BF1A01BF1C01A9 -:10026800BF1E017148F000F5300271080105F55014 -:1002780005F5BCFFF5BDFFD7C7C1C1FBF8FFCEAB85 -:10028800AC8C02D1DD12616902305C03BBF66149B6 -:1002980000DDEE618900EFF51004C6D7FD5033FD8F -:1002A800963CFD2D05717AFAFD9124F51CF98F1EF7 -:1002B800F93135175003C15084FD3603C0625C0123 -:1002C800D161E8CF1CF902CFDFFB64FD3034FDEDCE -:1002D80002FD6148713222712BE7CEABACFD993C2F -:1002E80061EDEFF6D731020403F6EF01E660341E44 -:1002F800F9718C8971899931120403F6EF01E6606E -:10030800341EF9718C89719999D7D7C7F616FD2DC6 -:1003180005717BFA31522005715220EF0B717AFA80 -:10032800A7F647DFECE2EF04717AFAF2C6D7C7C145 -:10033800C1FBF8FF17A1C1E0C18C0A70C18C027023 -:10034800FD60031006D2DF05F541FBEF04CF41FB4A -:10035800028C01721004C6D7C7C1FBF8FFFD130356 -:10036800D2DD03E2EF618B70FD8004D2DD077153AB -:10037800205202EF528C0870FD9504FDE1048B6C4D -:100388000170FD9504300400BF2401301740BF1CE4 -:1003980001300400BF22018C0A91DF04F6BF2A0154 -:1003A800710BE2CE44FF3182E202EFFAAC0C148EFC -:1003B800449961790C61690A8C0AD1DFDAFD0A0572 -:1003C800710BE2715320F2C0C6D7C7C1FBF8FFFD1D -:1003D8001303D2DD03E2EF25710AE68B70FD80047A -:1003E800D2DD077153205202EF138C0870FD95047B -:1003F8008C0A70FD9504FD0A05715320F2C0C6D71A -:10040800C7C1FBF8FFFD1303D2DD03E2EF67710AF2 -:10041800E6710BE28B70FD8004D2DD077153205228 -:1004280002EF52710BE231422039C7343AFBAC0C6F -:100438001652048B99A5A792DFF9C63184BD02EF45 -:10044800FA717ABDCEB144CBB43AFB8C0A318EBE78 -:10045800B8CEBB48714BE1714BE5710ABD8C089E63 -:1004680044EF11710BE68C089E448C0A9F40FBAC4C -:100478000CBF3EFBF2C0C6D7C716FDB90417FD95E1 -:1004880004D2DD06FD0A05E2EF01F2C6D7C71671F0 -:100498000AE6710BE2669E443182E20300EFF9F648 -:1004A800420401DD09AF0401BF0C01E2EF01F2C60D -:1004B800D7AF2801085CFB08BF2801FD1203AF284D -:1004C800015CFBBF2801300400BF2A01301780BF40 -:1004D8001C01300400BF2201D7AF2401086C0408B6 -:1004E800BF2401AF28016C0F086C0B08BF2801FD61 -:1004F8001203AF2A01085CFB08BF2A01FD1203EDB5 -:10050800B904300400BF2401F6BF2A01300B0BBF29 -:100518002801FD1203300B0FBF2801FD1203300F15 -:100528000FBF2801D731642001D7715220710BBD4C -:100538000000717BBD713A25713A236A0E0371324E -:1005480005713B25713203713B23500AFD8002710E -:1005580020F000FD1203F6BF26015024BF1401CB82 -:10056800440014300F0FBF2801714320710BE27152 -:100578000AE6FDB904CE44FF3182E202EFFAFD0A31 -:1005880005AF0401BF0C01715320716220D73154AB -:100598002002EFFAFDE104713A25713A235A0EFC64 -:1005A800713305713B25713303713B237128F000CA -:1005B800716320D7C7880616FD1303D2DD03E2EF67 -:1005C80038710AE650A4FD8004D2DD077153205229 -:1005D80002EF2617FD95046770FD9504FDE10450B0 -:1005E800A4FD95045020FD9504D942FBFD9504A077 -:1005F80042FBFD0A05715320F2C6D7C72006FBF857 -:10060800FFFD1C095014C15008FD5A08C0CC050450 -:100618008C054C14DE0C8C05318EFD4109615905A1 -:10062800EFEECC05048C054C1461C8EDC906CC046A -:10063800008C044C04DE6FC73641057184C6DC6645 -:100648003022F9BC02F6BB31B2D10EC73641057172 -:1006580084C6DC05CEABACEFEE713BD1AC02148F97 -:1006680040059971505005617902617900F0E161A6 -:100678004900DD09C73641057184C6DECA5040C14C -:100688008C05318E31AD128C04318E318D03BDD87D -:1006980031FFBDDADADAADD8FD0D0CC0D261E8EF72 -:1006A800FE615904EF8B8C05318EFD4509D261E856 -:1006B800EFFEC73641057184C6DC06615905ED2D8C -:1006C8000671605005CC0200CC03008C034C09DE97 -:1006D800248C03318E1249F61F728C03318E04F676 -:1006E8004F14896142DF03F6EF01E6600E029C02B7 -:1006F800615903EFD68C02D1DF08FDCB0AFDDD0B73 -:10070800EF0C5008C15013FD5A08C0FDCA0A100664 -:10071800C6D7C72004FBF8FF715B21CC0100F6BCEB -:1007280002AC02440900DE3EAC0204F61F1441008C -:10073800118972AC020C5114896142DF03F6EF0192 -:10074800E6600E019C01AC021249005172AC020431 -:10075800F67F14896142DF03F6EF01E6600E019C23 -:1007680001617902EFBB40F67FFF61F86159018CA6 -:1007780001D161F8ED2408CC0100717AFAFD2D054C -:10078800711300711B20710303710205E0C150034E -:10079800C15084FDD20310045013FD8002500FC1D4 -:1007A800E0C15084FDD2031004CEABAC6159018C7A -:1007B8000191DD068C014C03DF03E6EF01F6606171 -:1007C800FB7151018C014C0861F8CC0100313207F2 -:1007D80005A068FCEF03F568FC4068FC11DC11F526 -:1007E80068FCF0C15003C15084FDD2031004EF121D -:1007F800E6BC02F6614902DDB00000000061790242 -:10080800EFF1CE3708CBE4FFFFCBE6FFF7CED4FFFE -:10081800CF370008F5120561FDF5ABFFFD1C09D2C5 -:100828005008C15014FD5A08C0D2FDCB0AD2FDDDD4 -:100838000B1004C6D73184BD02EFFA717BBDCBE43F -:10084800FFFFCBE6FFFFCBD4FFFF717ABED7717BEA -:10085800BED7C7C1200AFBF8FF8C0A318E31ADC163 -:10086800317B9DD4C0BC048DD49C068C129C098C11 -:1008780012318E040C00128C09318EBDD813FD9CE8 -:100888000E61C8ED1709CEABAC8C09318EFD3D0960 -:10089800D2DD098C09318EFD4109EFEDCC08008CC1 -:1008A800084C04DE57CEABACF6BC023022F9BBAC28 -:1008B80004148C069EFD118972AB146299AC04A1D4 -:1008C800BC04617900617902F0E1614902DFE0501E -:1008D80040C18C09318E31AD128C08318E318D03B7 -:1008E800BDD831FFBDDADADAADD8FD0D0CC0D2DDE6 -:1008F80006FD5608E2EF19615908EFA38C09318EFD -:10090800FD4509D2DD03E2EF07615909ED7708F2E9 -:10091800100CC6D7C7717B9D717BFAFD3D0830224C -: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 +:1000CE00C7C1FBF8FFCEABACC736F00071F4C6DC8F +:1000DE0015CC0100CC00006159016159008BD1DFB4 +:1000EE00F98C01D1DFF1CC0000CC01008C014C0960 +:1000FE00DE468C01318E04F60FC1317B9EFDC4119C +:10010E0089728C01318E04F64F14896142DF03F639 +:10011E00EF01E6600D9B8C01318E12490021728C2D +:10012E0001318E04F64F14896142DF03F6EF01E6CA +:10013E00600D9B615901EFB440F64FFF61F86159B4 +:10014E00008BD1DD06FDA001FD2107CEABACC7367D +:10015E00F00071F4C6DE06713020F9EF168EA89C01 +:10016E00018C015C10D1DD087110D6FB713020F9C5 +:10017E00FDA001FD9A02EDD300C0C6D7717BFACE69 +:10018E00A010CEA180E5F300CEA408F5AAFFF5A934 +:10019E00FFD78F20F931350ACD0003CD0307F40EBA +:1001AE00EF07F400CD0306F40ECF1105FCF5100594 +:1001BE00CF120511CE20FFCE23F0CE2EFCCD01C0E6 +:1001CE00F402CD0408F405F406CD0740F40CF40F48 +:1001DE00F521FFCE22E9CE24F3CE25F2CE26FCCE9B +:1001EE00275FCE2CFFCE2FFFF53000F53100F53313 +:1001FE0000F53400CF350002CF370019F53C00F57D +:10020E003E00CF530006F55700F6BEE0BEE2BED06C +:10021E00CBE4FFFFCBE6FFFFCBD4FFFFCE3831CED2 +:10022E003970CF38050AF53905F537FF7108F20038 +:10023E0090BFB401F5A5FFF5A6FF7158F000F5309B +:10024E00FF7128F0005087BF1801BF1A01BF1C01B3 +:10025E00BF1E017148F000F5300271080105F5501E +:10026E0005F5BCFFF5BDFFD7C7C1C1FBF8FFCEAB8F +:10027E00AC8C02D1DD12616902305C03BBF66149C0 +:10028E0000DDEE618900EFF51004C6D7FDC833FD21 +:10029E00DA3CFD2305717AFAFDB924F51EF98F209B +:1002AE00F93135175003C15084FD2C03C0625C0137 +:1002BE00D161E8CF1EF902CFDFFB64FDA834FDE368 +:1002CE0002FDAF48714222712BE7CEABACFDDD3C97 +:1002DE0061EDEFF6D731020403F6EF01E66034204C +:1002EE00F9718C8971899931120403F6EF01E66078 +:1002FE003420F9718C89719999D7D7C7F616FD23D9 +:10030E0005717BFA31522005715220EF0B717AFA8A +:10031E00A7F647DFECE2EF04717AFAF2C6D7C7C14F +:10032E00C1FBF8FF17A1C1E0C18C0A70C18C02702D +:10033E00FD56031006D2DF05F541FBEF04CF41FB5E +:10034E00028C01721004C6D7C7C1FBF8FFFD09036A +:10035E00D2DD03E2EF618B70FD7604D2DD077153BF +:10036E00205202EF528C0870FD8B04FDD7048B6C6B +:10037E000170FD8B04300400BF2401301740BF1CF8 +:10038E0001300400BF22018C0A91DF04F6BF2A015E +:10039E00710BE2CE44FF3182E202EFFAAC0C148E06 +:1003AE00449961790C61690A8C0AD1DFDAFD000586 +:1003BE00710BE2715320F2C0C6D7C7C1FBF8FFFD27 +:1003CE000903D2DD03E2EF25710AE68B70FD760498 +:1003DE00D2DD077153205202EF138C0870FD8B048F +:1003EE008C0A70FD8B04FD0005715320F2C0C6D738 +:1003FE00C7C1FBF8FFFD0903D2DD03E2EF67710A07 +:10040E00E6710BE28B70FD7604D2DD07715320523C +:10041E0002EF52710BE231422039C7343AFBAC0C79 +:10042E001652048B99A5A792DFF9C63184BD02EF4F +:10043E00FA717ABDCEB144CBB43AFB8C0A318EBE82 +:10044E00B8CEBB48714BE1714BE5710ABD8C089E6D +:10045E0044EF11710BE68C089E448C0A9F40FBAC56 +:10046E000CBF3EFBF2C0C6D7C716FDAF0417FD8BFF +:10047E0004D2DD06FD0005E2EF01F2C6D7C7167104 +:10048E000AE6710BE2669E443182E20300EFF9F652 +:10049E00420401DD09AF0401BF0C01E2EF01F2C617 +:1004AE00D7AF2801085CFB08BF2801FD0803AF2861 +:1004BE00015CFBBF2801300400BF2A01301780BF4A +:1004CE001C01300400BF2201D7AF2401086C0408C0 +:1004DE00BF2401AF28016C0F086C0B08BF2801FD6B +:1004EE000803AF2A01085CFB08BF2A01FD0803EDD3 +:1004FE00AF04300400BF2401F6BF2A01300B0BBF3E +:10050E002801FD0803300B0FBF2801FD0803300F33 +:10051E000FBF2801D731642001D7715220710BBD56 +:10052E000000717BBD713A25713A236A0E03713258 +:10053E0005713B25713203713B23500AFD76027122 +:10054E0020F000FD0803F6BF26015024BF1401CB96 +:10055E00440014300F0FBF2801714320710BE2715C +:10056E000AE6FDAF04CE44FF3182E202EFFAFD004F +:10057E0005AF0401BF0C01715320716220D73154B5 +:10058E002002EFFAFDD704713A25713A235A0EFC78 +:10059E00713305713B25713303713B237128F000D4 +:1005AE00716320D7C7880616FD0903D2DD03E2EF7B +:1005BE0038710AE650A4FD7604D2DD07715320523D +:1005CE0002EF2617FD8B046770FD8B04FDD70450D8 +:1005DE00A4FD8B045020FD8B04D942FBFD8B04A09F +:1005EE0042FBFD0005715320F2C6D7C72006FBF86B +:1005FE00FFFD23095014C15008FD6108C0CC05044D +:10060E008C054C14DE0C8C05318EFDCD096159051F +:10061E00EFEECC05048C054C1461C8EDD306CC046A +:10062E00008C044C04DE79C73641057184C6DC703B +:10063E003022F9BC02F6BB31B2D10EC7364105717C +:10064E0084C6DC05CEABACEFEE713BD1AC02148FA1 +:10065E0040059971505005617902617900F0E161B0 +:10066E004900DD09C73641057184C6DECA5040C156 +:10067E008C05318E31AD128C04318E318D03BDD887 +:10068E0031FFBDDADADAADD8FD990CC0D2DD0C50EF +:10069E0008C15014FD6108C0FD690C615904EF8159 +:1006AE008C05318EFDD109D2DD0C5008C15014FDE0 +:1006BE006108C0FD690CC73641057184C6DC066150 +:1006CE005905ED230671605005CC0200CC03008C59 +:1006DE00034C09DE248C03318E1249F61F728C03F3 +:1006EE00318E04F64F14896142DF03F6EF01E660A6 +:1006FE000E029C02615903EFD68C02D1DF05FD5725 +:10070E000BEF095008C15014FD6108C0FD690C10B3 +:10071E0006C6D7C72004FBF8FF715B21CC0100F69B +:10072E00BC02AC02440900DE3EAC0204F61F1441CA +:10073E0000118972AC020C5114896142DF03F6EF8D +:10074E0001E6600E019C01AC021249005172AC022E +:10075E0004F67F14896142DF03F6EF01E6600E01B5 +:10076E009C01617902EFBB40F67FFF61F861590190 +:10077E008C01D161F8ED2B08CC0100717AFAFD23C2 +:10078E0005711300711B20710303710205E0C15046 +:10079E0003C15084FDC80310045013FD7602500FA0 +:1007AE00C1E0C15084FDC8031004CEABAC61590149 +:1007BE008C0191DD068C014C03DF03E6EF01F66040 +:1007CE0061FB7151018C014C0861F8CC0100313292 +:1007DE000705A070FCEF03F570FC4070FC11DC11F6 +:1007EE00F570FCF0C15003C15084FDC8031004EF36 +:1007FE0012E6BC02F6614902DDB00000000061792C +:10080E0002EFF1CE3708CBE4FFFFCBE6FFF7CED4F5 +:10081E00FFCF370008F5120561FDF5ABFFFD23098B +:10082E00D25008C15014FD6108C0D2FD570BD2FD45 +:10083E00690C1004C6D73184BD02EFFA717BBDCBB3 +:10084E00E4FFFFCBE6FFFFCBD4FFFF717ABED7717B +:10085E007BBED7C7C1200AFBF8FF8C0A318E31ADA3 +:10086E00C1317B9DD4C0BC048DD49C068C129C09D6 +:10087E008C12318E040C00128C09318EBDD813FDF2 +:10088E00280F61C8ED1E09CEABAC8C09318EFDC9A7 +:10089E0009D2DD098C09318EFDCD09EFEDCC0800B2 +:1008AE008C084C04DE57CEABACF6BC023022F9BB42 +:1008BE00AC04148C069EFD118972AB146299AC04C3 +:1008CE00A1BC04617900617902F0E1614902DFE0C7 +:1008DE005040C18C09318E31AD128C08318E318D64 +:1008EE0003BDD831FFBDDADADAADD8FD990CC0D22E +:1008FE00DD06FD5D08E2EF19615908EFA38C0931A1 +:10090E008EFDD109D2DD03E2EF07615909ED7E08B4 +:10091E00F2100CC6D7C7717B9D717BFAFD4408306F +:10092E0022F9FD7C0AFD070AC6D7FD2309FD560BE9 +:10093E00FD5D08F2D7D7C7D54AFDDD05B04AFDEFFC +:10094E0078CF4AFD02311407067110E3FBEF0471F4 +:10095E0018E3FB8FE3FB7F0EFD76D1DD5C8FE3FBAF +:10096E009F0EFD401EF903DF22665C10D1DD1C8F49 +:10097E00E3FB5C10D1DD0B5080C15011FDBA38C0C5 +:10098E00EF095040C15011FDBA38C0401EF903DDC9 +:10099E0006401EF904DF22665C02D1DD1C8FE3FBEC +:1009AE005C02D1DD0B5040C15010FDBA38C0EF09CA +:0B09BE005020C15010FDBA38C0C6D751 +:1009C9005208EF065203EF025206FEE600FE1B0034 +:1009D900DC16089F03088F0408089F040862FE2498 +:1009E90000089F0408EEBF00EEBA00C1C514410E0D +:1009F90011D9D0FF118FD1FF312E45C4C0D7F231A3 +:100A0900A2C401E2D79DE261DD4C09DF12717BFAD4 +:100A1900C18F06089F5BFDC0CF060800EE27003195 +:100A2900F2FA04CF0608004C00DF05D50008DD16F0 +:100A390061DD717BFAD50608DD0ACDE31F61CD6161 +:100A4900CDEE160061CDFED40061FFFE9A00FCF8E0 +:100A5900FF0EFEB20061CDFED5004C09DF0EC18F3D +:100A690006086F5BFD9F0608C0EE0400CF0608006C +:100A7900F8E3D75200EF025202FE3700CF5AFD00C9 +:100A8900CF060800BF0408C716629F00084100117D +:100A99008F78239B4100118F79239F0108C651004C +:100AA900FE62FFEF025205CF060800C1510CFE0A93 +:100AB90000C0D7C1511DFE0200C0D761DD717BFAAC +:100AC90070CEC0A59EC47CFF9EC4609EC461CDD774 +:100AD90061DD717BFAC18EC45C1BFED6FFCF0608AF +:100AE90001FED7FFC061CDD731F2FA1AC1AEE4BF1A +:100AF9004CFDAEE6BF4EFDAED4BF50FD30FFFFBE8C +:100B0900E4BEE6BED4C0D731F2FA11C1AF4CFDBE86 +:100B1900E4AF4EFDBEE6AF50FDBED4C0D7C1BF5253 +:100B2900FD13BF54FD15BF56FD17BF58FDC0D7AF04 +:100B390052FDDB54FDEB56FDFB58FDD7534B3052AC +:100B49005430324E323030475631323000FFC150C6 +:100B5900FEFEAB0061DD717BFACF060800FE0A00DC +:100B6900FEA4FF61CDF8E3EECF00C7FB0408BF4C3C +:100B7900FD8FC0009C05C5C337040600BF4EFD3577 +:100B890036BB0B300000522BFE6600C2C4C630696A +:100B99000BB800300000B8022004AF4EFDB8003099 +:100BA9000F00B802AF4CFD61FF520AFE3AFFECF8A4 +:100BB900FF0E717BFAC1C7FB04088C05C65C80FE79 +:100BC9000200C0D761DD717BFA70CFC0FFA59FC05D +:100BD900007CFF9FC000609FC00061CDD7618BFE84 +:100BE900E2FF717BBE410011FB000017CEFC0061E2 +:100BF900CB089EFDF31161C999A58392DFF7D7FE52 +:100C0900B1FED55AFDDF23C1CF0308035109FEF414 +:100C1900FDC0D2DF37FE3800A20408CF0308075110 +:100C290009FEE1FDD2B20408DF22C7FB04083183C3 +:100C390002C6D7C6510AFECCFD624C1FDF06CF5A49 +:100C4900FD01EF04CF5AFD00C0EE5BFEC0EE55FE7C +:100C5900C7C1FB04088B31196C0161589BC0C6D709 +:100C6900717BFAFE4DFEAF0408040600C11436CDAF +:100C79000B300000522DF3FE77FF8FC000FE2BFED4 +:100C890061CF5C807C8073C0041900CEFC0F61CBFE +:100C9900C55404EF03C55417FE18FEC7360008BB38 +:100CA900629C0288089C03D1DD334C41DE2F70F130 +:100CB900312DB161090033081C000851FF612A4137 +:100CC9000E118FD0FF613B118FD1FF6138DC0E8B84 +:100CD9005C03DF0964C6C4FE2BFDEECAFDC6C4EE83 +:020CE900C3FD49 +:100CEB0061CF5100718C7109FECBF800FEFC8A01BB +:100CFB0000F6BF00F953C0F693935820FEDFF9417D +:100D0B0000361A203410FDEF05118B99A7A5174457 +:100D1B005620DFF53602F93010FDEF04CC0000A7AA +:100D2B0047DFF94100365620344CFDEF05118B9906 +:100D3B00A7A517445620DFF5364CFD304CFDEF04CC +:100D4B00CC0000A747DFF9FCCE0000EFFE61DD71A0 +:100D5B007BFABEF0ADD8BEF200AEF661CDD7C36163 +:100D6B00DD717BFABEF0ADD8BEF200DBF6FFADDC79 +:100D7B00BEF000AEF6BDD8AEF40312ADDABEF20093 +:100D8B00AEF661CD03BDDAC2D7C3F33174D9088394 +:100D9B00C1F626D8BDD8C031750683C312F623C25F +:100DAB00FDB60D93DF0312F623C2D7440000DD26F8 +:100DBB0061DD717BFACFE80080BEF6F6BEF4BEF2C1 +:100DCB00ADD8BEF0CFE800818FE8003103FAAEF06A +:100DDB00F5E80061CDD7B1D7C3F33174D90883C11E +:100DEB00F626D8BDD8C0317505C312F623C2FD0453 +:100DFB000E93DF0312F623C2D7440000DD2761DD1B +:100E0B00717BFACFE80080BEF6F6BEF4BEF2ADD829 +:100E1B00BEF0CFE800818FE8003103FAAFE000F5B8 +:100E2B00E80061CDD7ADD8D7C3F33174DB0F83C1E5 +:100E3B00F626D8BDD861317026DABDDAC031750D12 +:100E4B0083C312F626DCBDDC61317023C2FD6C0E50 +:100E5B0093DF0CF626D8BDD861317026DABDDAC225 +:100E6B00D7C161686BDC6BDDC0DD2F61DD717BFA97 +:100E7B00CFE80080BEF4ADDCBEF6ADD8BEF0ADDA87 +:100E8B00BEF2CFE800818FE8003103FAAEF0BDD897 +:100E9B00AEF2BDDAF5E80061CDD7F6BDD8BDDAD735 +:100EAB008292DD2B61DD717BFACFE80080BEF0F61C +:100EBB00BEF2BEF46208BEF6CFE800818FE80031C7 +:100ECB0003FAAFE0006072AEF0F5E80061CDD760D9 +:100EDB0072F6B1D706DABDDAADDC06D8BDD861D86B +:100EEB00A6DAD7D1DD17C1C3DAD89DD8ADDA311C5C +:100EFB0061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDEF +:100F0B001BC1C3DADA9DDAADD8311E33311E337112 +:100F1B00F9B4DADFF4BDD813BDDAC2C0D746D8DDD9 +:100F2B000771FF7177D971C0D746DADF08C1ADDC25 +:100F3B0046D8C0DD077177DB71FF71C0D75BDB9DD6 +:100F4B00DB605BDA9DDAADDC5BD9085BD808BDD81A +:100F5B00D7C3C7F3728EFDC162314C4100360020FE +:100F6B001161A072C09EFD62C6C2D7C3C7F3728E59 +:100F7B00FDC1625C0F0C000FFE00314C4100360AC4 +:0F0F8B00201161800FFE0073C09EFD63C6C2D7A8 +:100F9A00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF57 +:100FAA00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF47 +:100FBA00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF37 +:100FCA00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF27 +:100FDA00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF17 +:0C0FEA00FFFFFFFFFFFFFFFFFFFFFFFF07 +:0A0FF60030393A30373A3338000042 :10100000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0 :10101000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0 :10102000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD0 @@ -529,8 +527,8 @@ :0A20000000060C12181E242A3036C8 :10200A00001632486480961228446076920824406A :10201A00FF000000555555554700DCFB0000000045 -:10202A003EFC000000000000963FD739C423372F3A -:10203A00C830453187328A405C4A3C094442000034 +:10202A0046FC000000000000DA3F213AC423A02F3A +:10203A003131AE31FF32CF404409430990420000AA :0C204A000000983AF82A23301299000098 :08205600317503F7332312D7A3 :10205E00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF82 @@ -544,7 +542,7 @@ :1020DE00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF02 :1020EE00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2 :0220FE00FFFFE2 -:0A21000031333A33393A313400002C +:0A21000030393A30373A3338000026 :10210A00AEF0B430B740BA30BB50BBB0BC50BD1013 :10211A00BD60BDB0BFE0C2B0C420C7B0CAE0CE1037 :10212A0001F0141014200630639049006E00777095 @@ -589,715 +587,715 @@ :10239A00FAF3F0F0F3F7FBFE000203030202010076 :1023AA00000000001F003B005A0078009700B500AB :0A23BA00D400F300110130014E01C0 -:1023C4008F09FDB009FDD161E8ED9024CF09FD80AE -:1023D400710407E6613012F6712420611043DD3286 -:1023E400710407E661306061FB7121203124201300 -:1023F4007130E3FB5002C15011FD3038C0CF0BF9EE -:1024040002EF0F7138E3FBE0C15011FD3038C0F525 -:102414000BF94002F94BDC164002F9B9DE10400C0E -:10242400F928DE05A00CF9EF27711320EF224002F2 -:10243400F93EDC064002F9BDDC10400DF928DE054A -:10244400A00DF9EF0B711220EF06F50CF9F50DF95B -:102454003112200D3104200931020705713304EFD4 -:1024640003713204311205097140E3FB714202EF3A -:10247400077148E3FB714302D50BF9DD06B00BF994 -:10248400714202401CF90361F8FDD527D7C78F08B4 -:10249400FD76FDD224D51FF9DD05710320EF2D66ED -:1024A4004F08FD61F83134201A713320FD2D056683 -:1024B4004C07DD0381DF098F1EF9313303FD6A25E3 -:1024C400FD8F25710220301727FDE83CC6D7C77160 -:1024D4006201717201E0FD80025008FD733B629F4E -:1024E40002F95009FD733B62767163014002F9F110 -:1024F400DC05E51FF9EF0F4002F904DE06CF1FF9F2 -:1025040002EF03F51FF9664CEADC06CF08FD07EF7E -:1025140044664CC6DC06CF08FD06EF39664C9FDCEA -:1025240006CF08FD05EF2E664C7CDC06CF08FD04C3 -:10253400EF23664C50DC06CF08FD03EF18664C22EF -:10254400DC06CF08FD02EF0D664C06DC05E508FD50 -:10255400EF03F508FD4008FD07DF09D51FF961F811 -:10256400CF1FF903C6D7C7C1FBF8FF500AFD80028D -:10257400304000BB17C15002C15006C1506CFD0869 -:102584000410065096FD8002C0C6D7C72008FBF889 -:10259400FF8F08FD5006D604CA2214F7500689A5F9 -:1025A4004804F9A390DFF7D51FF961E8ED1327304C -:1025B4004A57BB17C15002C1503EC1506CFD0804BC -:1025C4001006D2DD077100E2FBED13277108E2FB70 -:1025D40017040300C15004C1500CC1506CFD6003CA -:1025E4001006D908FDF10104F42214A9318D12A9B1 -:1025F400318E616B08616A08BB17C15002C1500E6D -:10260400C1506CFD08041006F690BB17C15002C1FE -:10261400500CC1506CFD0804100631542002EFFA2E -:102624007142208F08FDF0312E040A21C15010C1DF -:102634005040C1506CFD0804100631542002EFFADA -:102644007142208F08FDF0312E041A21C15010C1AF -:102654005050C1506CFD0804100631542002EFFAAA -:102664007142208F08FDF0312E042A21C15010C17F -:102674005060C1506CFD0804100631542002EFFA7A -:102684007142208F08FDF0312E043A21C15010C14F -:102694005070C1506CFD0804100650A5FD8002D98D -:1026A40008FDF10104F42214A9318D12A9318E61BF -:1026B4006B08616A08BB17C15002C1500EC1506C4F -:1026C400FD0804100650A5FD80025004C1506CFDA5 -:1026D4003603C0629C07E908FD0909234E0761C35C -:1026E4000AE908FD0902234E0761D8001704030014 -:1026F400C15004C1500CC1506CFD08041006F6BB57 -:1027040017C15002C1503EC1506CFD0804100610A0 -:1027140008C6D7C7C1FBF8FF8F0EF94F02F961F85D -:10272400EDD1274010F928DE06A010F9EDD127F5E8 -:1027340010F98F02F99F0EF98F02F95070D61230FA -:102744007351230480001231FF318E039F0FF99FD0 -:10275400DEFBF6BB8F0FF97C804C95DC1B8F0FF9E9 -:10276400318F241400BDD8AF06F9FDCC0C1231FF13 -:10277400318E03318FBBEF198F0FF9318F24140081 -:10278400BDD8AF08F9FDCC0C1231FF318E03318F67 -:10279400BBD904F9F1610900BB44000171FEDC03FB -:1027A400F690BB8C0101DE02F6BBABABBF6EFC172F -:1027B400C15002C1500CC1506CFD08041006D2DF98 -:1027C400088F02F99F0EF9EF047100E2FBF2C0C614 -:1027D400D7C72008FBF8FF401FF901DF0BCFDFFB51 -:1027E40063CFE1FBC8ED4629401FF902DF2C170433 -:1027F4000600C15002C15004C1506CFD60031006B4 -:10280400D2DD06CFDFFB63EF0A8C069FDFFB8C076C -:102814009FE0FBCFE1FBC8ED462917040600C15039 -:1028240002C15004C1506CFD60031006D2DD10716A -:1028340000E2FB710320F5DFFBE520F9ED1B298C99 -:1028440006318E318D080E07081C00BBD908FDF136 -:10285400041023148972ABFD1F0EBB8C019C068BE4 -:102864009C0717040400C15002C1C1506CFD6003F1 -:102874001006D261E8ED1B298C049FE1FB8C043126 -:102884008E318D080E05081C00BBBDD8F6BDDAC913 -:10289400DC01A5FDA80EDC09CC0364F6BF12F9EF38 -:1028A40076ABBDD8F6BDDAAF12F9BDDCF6BDDEAD50 -:1028B400D8C1ADDAC1C9D800A0F6BDDAADDEFD538A -:1028C4000EADD8BDDCADDABDDEC0BDDAC0BDD8AD5D -:1028D400DEFDA80E61D309CC031EF6BF12F9EF3753 -:1028E400ABBDD8F6BDDAC9DC819DFDA80EDC0BCCEE -:1028F400030A30F401BF12F9EF1DABBDD8F6BDDAFF -:10290400C9DC019BFDA80EDC0BCC030530F401BF30 -:1029140012F9EF03E520F93134040D31120509CF22 -:10292400DFFB64F5E0FBEF1A8C064E03DE0C8C062D -:102934009FDFFB8C079FE0FBEF088C039FDFFBF519 -:10294400E0FB40DFFB0BDE064014F90BDE1640DF34 -:10295400FB06DE064014F906DE0AD5DFFBDF0ED5E2 -:1029640014F9DD095020C15011FD3038C08FDFFB50 -:102974009F14F9D51CF961F8CF14F964401CF903CC -:1029840061E8F515F940DFFB0BDE03E6EF01F660C5 -:102994009C058F15F94E05DD0F8C059F15F98C05E7 -:1029A40070C15012FDBC05C01008C6D7C75007C17E -:1029B4005002C15084FDD20310045012FD80025015 -:1029C4000FC15002C15084FDD20310045003FD8096 -:1029D40002501FC15002C15084FDD203100450168E -:1029E400FD80025003C15084FD3603C0625C01D1F6 -:1029F400DD107170E3FB5002C15013FD3038C0E2AA -:102A0400EF01F2C6D7C75004C15084FD3603C0623B -:102A14005C03D1DD405014FD912A34E3FB895C9FB3 -:102A2400998A0C7CFF50FF5C14D1DD228A0C7CFF58 -:102A34005C147234E7FB89616A997162075600314C -:102A44006207058666D1DFF7716307716B2734F679 -:102A5400FB895CEB995002C15084FD3603C0D2DD82 -:102A6400225007C15002C15084FDD20310045033D8 -:102A7400FD8002F0C15002C15084FDD203100471E4 -:102A840078E3FBE0C15013FD3038C0C6D7C7C1207E -:102A940004FBF8FFCC02005004C15084FD3603C08F -:102AA400629C038C045C20D1DD0E8C036C019C03BE -:102AB4008C026C209C02EF138C045C10D1DD0C8C16 -:102AC400035CFE9C038C026C109C028C045C08D199 -:102AD400DD0E8C036C029C038C026C089C02EF13C9 -:102AE4008C045C04D1DD0C8C035CFD9C038C026CB7 -:102AF400049C028C03D1DD05501AFD80028C037006 -:102B0400C15004C15084FDD20310048FE3FB5C9FC9 -:102B1400728C03318E316D148C03318E314D616DA5 -:102B240008616C5C606162629FE3FB8FEFFB7CFF7A -:102B340050FF5E02D1DD278FEFFB7CFF5E02723413 -:102B4400E7FB89616A99716207CC01003162070869 -:102B54006159018C01D1DFF4716307716B27F210A5 -:102B640006C6D7C7D9D7FBC15006C15084FDD203CE -:102B740010046276D9D8FBC15007C15084FDD2033A -: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 +:1023C400C78F11FDB011FDD161E8EDB724CF11FD28 +:1023D40033710407E661306076F171242061DC61B9 +:1023E4004EDF05F50EF9EF37400EF904DE05A00EB9 +:1023F400F9EF2C6661FB712120312420137130E345 +:10240400FB5002C15011FDBA38C0CF0BF905EF0FD4 +:102414007138E3FBE0C15011FDBA38C0F50BF94047 +:1024240002F94BDC164002F9B9DE10400CF928DE43 +:1024340005A00CF9EF27711320EF224002F93EDCCE +:10244400064002F9BDDC10400DF928DE05A00DF9A7 +:10245400EF0B711220EF06F50CF9F50DF93112208E +:102464000D3104200931020705713304EF03713281 +:1024740004711405E6613060D1DF0CF50FF9714881 +:10248400E3FB714302EF12400FF904DE05A00FF9DC +:10249400EF077140E3FB714202D50BF9DD06B00B87 +:1024A400F9714202401EF903DD06401EF90461F889 +:1024B400FD1628C6D7C78F10FD76FDFA24D521F95D +:1024C400DD05710320EF2D664F10FD61F8313420D6 +:1024D4001A713320FD2305664C07DD0381DF098F64 +:1024E40020F9313303FDAB25FDD02571022030588E +:1024F40027FD2C3DC6D7C7716201717201E0FD76DC +:10250400025008FDA93B629F02F95009FDA93B62F4 +:1025140076716301716820F94002F9F1DC05E52167 +:10252400F9EF244002F904DE1BCF21F9025008C15F +:10253400506CFD2C03C092DF0ED541FBDF097160A6 +:1025440020F9EF03F521F9664CEADC06CF10FD070C +:10255400EF44664CC6DC06CF10FD06EF39664C9F8F +:10256400DC06CF10FD05EF2E664C7CDC06CF10FD9B +:1025740004EF23664C50DC06CF10FD03EF18664CC5 +:1025840022DC06CF10FD02EF0D664C06DC05E510DB +:10259400FDEF03F510FD4010FD07DF09D521F961BA +:1025A400F8CF21F903C6D7C7C1FBF8FF500AFD765F +:1025B40002304000BB17C15002C15006C1506CFD2F +:1025C400FE0310065096FD7602C0C6D7C72008FB4E +:1025D400F8FF8F10FD5006D604CA2214F75006895E +:1025E400A54804F9A390DFF7D521F961E8ED542754 +:1025F400304A57BB17C15002C1503EC1506CFDFE5A +:10260400031006D2DD077100E2FBED54277108E2E6 +:10261400FB17040300C15004C1500CC1506CFD569B +:10262400031006D910FDF10104F42214A9318D120E +:10263400A9318E616B08616A08BB17C15002C15091 +:102644000EC1506CFDFE031006F690BB17C150027C +:10265400C1500CC1506CFDFE03100631542002EF32 +:10266400FA7142208F10FDF0312E040A21C150105E +:10267400C15040C1506CFDFE03100631542002EFDE +:10268400FA7142208F10FDF0312E041A21C150102E +:10269400C15050C1506CFDFE03100631542002EFAE +:1026A400FA7142208F10FDF0312E042A21C15010FE +:1026B400C15060C1506CFDFE03100631542002EF7E +:1026C400FA7142208F10FDF0312E043A21C15010CE +:1026D400C15070C1506CFDFE03100650A5FD76027A +:1026E400D910FDF10104F42214A9318D12A9318EFF +:1026F400616B08616A08BB17C15002C1500EC1501A +:102704006CFDFE03100650A5FD76025004C1506C0A +:10271400FD2C03C0629C07E910FD0909234E0761E3 +:10272400C30AE910FD0902234E0761D80017040308 +:1027340000C15004C1500CC1506CFDFE031006F6DC +:10274400BB17C15002C1503EC1506CFDFE031006C0 +:102754001008C6D7C7C1FBF8FF8F10F94F02F96103 +:10276400F8ED12284012F928DE06A012F9ED12281D +:10277400F512F98F02F99F10F98F02F95070D612F1 +:10278400307351230480001231FF318E039F11F9FD +:102794009FDEFBF6BB8F11F97C804C95DC1B8F11FF +:1027A400F9318F241400BDD8AF06F9FD580D12314C +:1027B400FF318E03318FBBEF198F11F9318F241440 +:1027C40000BDD8AF08F9FD580D1231FF318E033129 +:1027D4008FBBD904F9F1610900BB44000171FEDC2F +:1027E40003F690BB8C0101DE02F6BBABABBF76FCFB +:1027F40017C15002C1500CC1506CFDFE031006D22B +:10280400DF088F02F99F10F9EF047100E2FBF2C0B8 +:10281400C6D7C72008FBF8FF4021F901DF0BCFDF43 +:10282400FB63CFE1FBC8ED89294021F902DF2C17B6 +:10283400040600C15002C15004C1506CFD5603107F +:1028440006D2DD06CFDFFB63EF0A8C069FDFFB8C2D +:10285400079FE0FBCFE1FBC8ED892917040600C1FF +:102864005002C15004C1506CFD56031006D2DD1154 +:102874007100E2FB710320F5DFFB715020F9ED5E7E +:10288400298C06318E318D080E07081C00BBD91027 +:10289400FDF1041023148972ABFDAB0EBB8C019CBB +:1028A400068B9C0717040400C15002C1C1506CFD83 +:1028B40056031006D261E8ED5E298C049FE1FB8C7F +:1028C40004318E318D080E05081C00BBBDD8F6BD41 +:1028D400DAC9DC01A5FD340FDC09CC0364F6BF14AE +:1028E400F9EF77ABBDD8F6BDDAAF14F9BDDCF6BDB0 +:1028F400DEADD8C1ADDAC1C9D800A0F6BDDAADDE0F +:10290400FDDF0EADD8BDDCADDABDDEC0BDDAC0BDC5 +:10291400D8ADDEFD340F61D309CC031EF6BF14F924 +:10292400EF38ABBDD8F6BDDAC9DC819DFD340FDCD0 +:102934000BCC030A30F401BF14F9EF1EABBDD8F67B +:10294400BDDAC9DC019BFD340FDC0BCC030530F48C +:1029540001BF14F9EF04715020F93134040D311220 +:102964000509CFDFFB64F5E0FBEF1A8C064E03DEAE +:102974000C8C069FDFFB8C079FE0FBEF088C039F0A +:10298400DFFBF5E0FB40DFFB0BDE064016F90BDE58 +:102994001640DFFB06DE064016F906DE0AD5DFFB2D +:1029A400DF0ED516F9DD095020C15011FDBA38C02B +:1029B400D51EF961F8CF16F9648F16F94FDFFBDDE8 +:1029C4003D40DFFB51DC06CF36FC0FEF3140DFFB2F +:1029D40033DC06CF36FC0BEF2540DFFB0BDC06CFE8 +:1029E40036FC07EF1940DFFB06DC06CF36FC03EFAD +:1029F4000DD5DFFBDD05E536FCEF03F536FC8FDF97 +:102A0400FB9F16F9401EF90361E8F517F940DFFB57 +:102A14000BDE03E6EF01F6609C058F17F94E05DD2A +:102A24000F8C059F17F98C0570C15012FDB205C0BB +:102A34001008C6D7C75007C15002C15084FDC8034F +:102A440010045012FD7602500FC15002C15084FD93 +:102A5400C80310045003FD7602501FC15002C15038 +:102A640084FDC80310045016FD76025003C150843F +:102A7400FD2C03C0625C01D1DD107170E3FB5002D8 +:102A8400C15013FDBA38C0E2EF01F2C6D7C75004F3 +:102A9400C15084FD2C03C0625C03D1DD405014FDA1 +:102AA400192B34E3FB895C9F998A0C7CFF50FF5CF3 +:102AB40014D1DD228A0C7CFF5C147234E7FB89613B +:102AC4006A997162075600316207058666D1DFF79D +:102AD400716307716B2734F6FB895CEB995002C173 +:102AE4005084FD2C03C0D2DD225007C15002C150D6 +:102AF40084FDC80310045033FD7602F0C15002C1B6 +:102B04005084FDC80310047178E3FBE0C15013FD49 +:102B1400BA38C0C6D7C7C12004FBF8FFCC020050A6 +:102B240004C15084FD2C03C0629C038C045C20D13E +:102B3400DD0E8C036C019C038C026C209C02EF1351 +:102B44008C045C10D1DD0C8C035CFE9C038C026C49 +:102B5400109C028C045C08D1DD0E8C036C029C0377 +:102B64008C026C089C02EF138C045C04D1DD0C8C89 +:102B7400035CFD9C038C026C049C028C03D1DD0578 +:102B8400501AFD76028C0370C15004C15084FDC8F4 +:102B94000310048FE3FB5C9F728C03318E316D1440 +:102BA4008C03318E314D616D08616C5C60616262D1 +:102BB4009FE3FB8FEFFB7CFF50FF5E02D1DD278F8D +:102BC400EFFB7CFF5E027234E7FB89616A997162F4 +:102BD40007CC0100316207086159018C01D1DFF48F +:102BE400716307716B27F21006C6D7C7D9D7FBC12B +:102BF4005006C15084FDC80310046276D9D8FBC1C5 +:102C04005007C15084FDC80310046261666672C631 +:102C1400D7FDEF2BF2D7711300711B2071030371E1 +:102C24000205E0C15003C15084FDC80310045013D1 +:102C3400FD7602F0C15005C15084FDC80310045054 +:102C44000FC1E0C15084FDC8031004500AFD760290 +:102C54007103055008FD7602501FC1E0C15084FD88 +:102C6400C80310045012FD76025003C15084FD2C99 +:102C740003C0625C01D1DF02E2D75003C1C15084BA +:102C8400FDC8031004710203711A205064FD76021A +:102C9400F0C15010FDB205C0F0C15011FDB205C025 +:102CA400F0C15012FDB205C0F50AF9F2D75003C1C4 +:102CB4005084FD2C03C0625C01D1DD195014FD1950 +:102CC4002BFD912A5014FD7602E0C15003C15084BB +:102CD400FDC8031004711300711B20710303F0C1BC +:102CE400E0C15084FDC8031004F0C15003C15084F6 +:102CF400FDC8031004F2D7C72004FBF8FFCC020080 +:102D04008F0AF99C035010C150A4FD2C03C0629F8C +:102D14000AF9D541FBDD04F2EDD52D8C037F0AF9C8 +:102D24005C08D1DD108F0AF95C08D1DF05CC0210F4 +:102D3400EF03CC02208C037F0AF95C04D1DD168FEB +:102D44000AF95C04D1DF088C026C049C02EF068C47 +:102D5400026C089C028FE2FB5CF3728F0AF95C0C34 +:102D64006162629FE2FB8FEEFB7CFF50FF5E029C80 +:102D740002D1DD1F34E6FB896E0299716207CC0132 +:102D840000316207086159018C01D1DFF4716307D6 +:102D9400716B278F0AF95C40D1DD095002C15012D2 +:102DA400FDBA38C08F0AF95C01D1DD08E0C15012C8 +:102DB400FDBA38C0717AFA8F0AF95C41D1DD113459 +:102DC4000AF9895CBE99D90AF9C15010FDB205C04F +:102DD400F21004C6D7FD382AF2D7FD912AF2D7C7DC +:102DE4008FF6FB7617FD192B664FF6FBDFF2F5F62F +:102DF400FBF2C6D77100010571785005713AD5719F +:102E04003BD1713ADD713BD98F10055CFC9F1005F5 +:102E1400CF54054AE542057110420571004205711F +:102E24004850057130500571205005CF530505CF2A +:102E340052050A7130510571205105713BD57170ED +:102E440050058F11055CFC9F1105D77178500571F1 +:102E5400080105D77140F00071783002713AE671CB +:102E64003BE2713BEA713BEE8F10055CFC9F100561 +:102E7400CF34024AE552FF711A52710A5271483036 +:102E8400027130300271203002CF330205CF32029A +:102E94000A71303102713BE6717030028F11055CAA +:102EA400FC9F110571603002D7717830027148F0CF +:102EB40000D7C788061666614FDD0967614EDE03D9 +:102EC40096EF01866672C6D7C7161714AA0412A90C +:102ED40043DD29AA0412A923FD5620C3AC02FD56E2 +:102EE4002013C2BDD813FD280FDE0C1714AA02123A +:102EF400AA0403BA04EF051714A9BA04AC041231E6 +:102F0400FF319E03317F087208C6D7C77100F200F3 +:102F1400304400BFB601300188BF9001300984BF3E +:102F24009E01BF9C01BF9A01BF9801BF9601BF9447 +:102F340001BF9201F53CFF30FE00BFBE01F6BFBCED +:102F440001BFB80150EEBFBA01A1BFB201C918FE5A +:102F54000071201205714820F94021F901DD0B367A +:102F6400100571A461C8714020F971281205F6BEDC +:102F74006EBE64BE6A7153017103018F20F931354D +:102F840007F5FDFBCB6CFF00710321C6D730EF00C2 +:102F9400BFB401F6BFBA017108F200D7711321D989 +:102FA400FDFBF1E7240000DD1223DD1923DD1123ED +:102FB400DD2623DD3423DD3923DD3FFD3B30EF3DCA +:102FC400FD5E30EF38D9FCFBC1AE6CFDB62EC0F30C +:102FD40013BE6C717320EF25F0C1AE6CFDB62EC02C +:102FE400F313BE6C717320EF14F6BE6C717220EF94 +:102FF4000CCB6CFF00717320EF03FDDB308F20F9E5 +:10300400314508717420712104EF067174207151E7 +:1030140001311421218F20F9314510F6BE64BE6AB6 +:103024003174200390EF01F6BE6ED731742004F69C +:1030340090EF01F6BE6AD7CF18FD47F5A8FBAE6C3A +:10304400317DBFAEFBFDB030D2DF0ED9FCFBC1AE8B +:103054006CFDB62EC0F313BE6CD7FDB030D2DD0FBD +:10306400CF18FD47F5A8FBAE6C317DBFAEFBD7E9A9 +:10307400A8FB0918235080D6BFAAFB22AEFBBDD8FB +:10308400304700FD940DBFACFB30AAFBFDCC2EF302 +:1030940013BE6CB018FDD518FDDF10CF18FD47A086 +:1030A400A8FB40A8FB1F61C8F5A8FBD740DFFB0BBA +:1030B400DC05717320F2D740DFFB0661D8311205BD +:1030C40011F0C1AE6CFDB62EC0F313BE6C7172204C +:1030D400EF03FDDB30E2D7711221F0C1AE6CFDB617 +:1030E4002EC0F313BE6CA0B0FB40B0FB40DC3DF53A +:1030F400B0FBD9B1FBF1313F0414FD14D9B1FBF19C +:10310400BDD85008FDE30D087208E6D2DD04019233 +:10311400DFFC896158D1DD05717220EF03717320E2 +:10312400A0B1FB40B1FB2061C8F5B1FBD78FB2FB66 +:10313400B0B2FBD1DF7331D4D106715BD1E5B4FBFE +:10314400D5B4FBDD347140E2FBD9B3FBF1E73402C3 +:103154000023DD0625DD0325DF05F6BE66EF06D96F +:10316400FCFBF1BE66A0B3FB40B3FB20DF06F5B366 +:10317400FBB0B4FBCFB2FB19D7CFB2FB1E7148E250 +:10318400FBD5FEFBDF04F6BE66D7D9FCFBF1426635 +:10319400FFDD16D9FCFBF112AE6643DE05A266FF25 +:1031A400EF03B266FFCFB2FB03D731142101D7403E +:1031B4001EF902DF19F6BE64BE6EBE6ABFB8FBBF5D +:1031C400BEFBBFC4FBBFBCFBBFC2FBBFC8FB31041B +:1031D4002140F6BFB8FBBFBEFBBFC4FBAFBCFB12B4 +:1031E40031FF31AE03316F12F623BFBAFBAFC2FB1E +:1031F4001231FF31AE03316F12F623BFC0FBAFC8EB +:10320400FB1231FF31AE03316F12F623BFC6FBED63 +:10321400CF323134210D713321710802FCF5B6FB34 +:10322400EDCF32D5B5FB61E8EDCC328F44FB9FB5D1 +:10323400FB40B6FB1FDC1F710002FC4046FBFFDDB8 +:1032440024D5B7FBDD05B0B7FBEF1A8F46FB9FB75C +:10325400FBF5B6FBEF0F710802FCD9B6FBF1A160D8 +:103264005C1F9FB6FBE9B6FB0948FB5080D6BFB88C +:10327400FBE9B6FB0968FB5080D6BFBEFBE9B6FB91 +:103284000988FB5080D6BFC4FBAFB8FB22BCFB123D +:10329400D945FBF133BDD813FD940DBFBAFBAFBEC6 +:1032A400FB22C2FB12D945FBF133BDD813FD940DAB +:1032B400BFC0FBAFC4FB22C8FB12D945FBF133BD31 +:1032C400D813FD940DBFC6FBB0B5FB8F20F9314573 +:1032D4001F30C4FBFDCC2EF313BE6430B8FBFDCC11 +:1032E4002EF313BE6E30BEFBFDCC2EF313BE6AD795 +:1032F40030C4FBFDCC2EF313BE6AD7C73122210B99 +:10330400D5CAFBDD06B0CAFBEDC633712321D9FF54 +:10331400FBF1E7240000DD0F23DD1B23DD1123DD9A +:103324005723DD2923DD3B5600F519FDEDB2335655 +:1033340001F519FDEF78D519FDDF075601E519FDF3 +:10334400EF055600F519FDCFCAFBFAEF61D519FD5B +:10335400DF0B5601E519FDCFCAFBFAEF51F5FFFB70 +:10336400EF4CD519FDDF0B5600E519FDCFCAFBFA6A +:10337400EF3CCFFFFB02EF36D937FCF1E724000026 +:10338400DD0923DD2423DD0A23EF1E5600F519FD94 +:10339400EF1CD519FDDF075601E519FDEF055600B1 +:1033A400F519FDCFCAFBFAEF055601E519FD8F208B +:1033B400F93145086661FB715107EF066661FB71DF +:1033C4000101C6D7C736F00071F4DC297170F00032 +:1033D400CE9D08CE9EC0CE9F80F594FFF593FFF559 +:1033E40092FFE597FFE596FFCE9505CE9810CE9C0B +:1033F4007F7100D6FB711BE3712BE3711AE7712B0C +:10340400E7717A9D710A9E31929E02EFFA710B9ECA +:10341400714321715321716321C6D7C73142211EE3 +:10342400714221710A9E31929E02EFFA3404FC36F5 +:1034340092FF52078B99A5A792DFF9710B9EC6D70D +:10344400C788061631522115715221C734CCFB307E +:1034540092FF1652078B99A5A792DFF9C666736788 +:1034640018CCFBC6D7C77143213154211E71532197 +:10347400710A9E31929E02EFFA3492FF36CCFB52CF +:10348400078B99A5A792DFF9710B9E316421137103 +:103494007B9E8F0CFC9E9A8F0DFC9E9B7153217119 +:1034A4007A9EC6D7CFD7FB5CCFD8FB5FCFF8FB3271 +:1034B400D7C7CFD4FB11CFD5FB03CFFCFBFFF5FD62 +:1034C400FBF5FEFBF5FFFBF500FCCFF9FB20F5FA5D +:1034D400FBCF2CFC36CF2DFCC95600664C64DE08AD +:1034E400723844FB0086EFF3C6D7C788061617F177 +:1034F400E73403002361E3EDFE372361F8EDD235B1 +:10350400B12361E3EDD9352561F8EDE835240700F1 +:1035140024070061D8EDFE37240B0061F8ED09366D +:103524002361F8ED50362361F8ED1D362361F8ED83 +:10353400D4372561F8EDE8372561F8EDB936B125C2 +:1035440061D8EDDD3624000061F8EDEA362361F838 +:10355400EDFE372402002361E3ED03372361F8ED28 +:1035640015372361F8ED27372361F8ED153723610B +:10357400F8ED39372361F8ED4B372361F8ED5B370C +:103584002361F8ED64372361F8ED70372361F8EDBA +:103594007C372361F8ED85372402002361E3EDFED7 +:1035A4003724020061F8ED8D372361F8ED99372552 +:1035B40061F8EDA537240A0061F8EDB13724120053 +:1035C40061F8EDCE372361F8EDBC37ED0038679F25 +:1035D400D6FBED0A3830152CFD2C3D66736718D4E4 +:1035E400FBED0A3840D9FB6ADF1440DAFB68DF0ED2 +:1035F400674C6CDF09309645FD2C3D713AD5679FC9 +:10360400DBFBED0A3867D1DD06303441FD2C3D3457 +:10361400F4FB89616F99ED0A38675C02D1DD0830EB +:10362400D92DFD2C3DEF0C675C01D1DD0630DE2D7C +:10363400FD2C3D675C3CD1DD1030E32DFD2C3D6756 +:103644005C3C7266736218D4FBED0A3867D1DD62A4 +:103654005C01D1DD05300800EF01F6609F33FC67A3 +:103664005C02D1DD03E6EF01F63433FC896168992D +:10367400675C04D1DD04E6A1EF01F63433FC896113 +:103684006899675C08D1DD05302000EF01F634331A +:10369400FC89616899675C10D1DD05301000EF0189 +:1036A400F63433FC89616899675C20D161E8716004 +:1036B40033FCED0A38D518F9DF09679FFDFBA01824 +:1036C400F9EF134018F905DE0DD918F9F1B11267B5 +:1036D4004814FDA018F9ED0A38675C0F726673622E +:1036E40018D4FBED0A384018F964DE13E918F967B9 +:1036F4001844FBA018F94018F90561C87132216714 +:103704005C7F318EC117F1243000FD4434C0ED0AD2 +:1037140038675C3F318EC117F1243000FD4434C05A +:10372400ED0A38675C07318EC117F1243000FD447F +:1037340034C0ED0A38675C1F318EC117F1243000A4 +:10374400FD4434C0ED0A3867318EC117F1243000CE +:10375400FD4434C0ED0A38679E999F0BFCED0A388E +:10376400716221675C7F9F0CFCED0A3871622167EE +:103774005C3F9F0DFCED0A38675C3F9F0EFCED0A31 +:1037840038675C1F9F0FFCEF7D30663FFD2C3D6763 +:103794009F14FCEF7130213FFD2C3D679F15FCEF1A +:1037A4006530433FFD2C3D679F18FCEF59675C0172 +:1037B400D1DD53FDAF48EF4E402EFCC8DE48E92E64 +:1037C400FC671872FAA02EFCEF3C679F2EFCEF36C4 +:1037D40067318E247200DF06303809FD2C3D679F67 +:1037E400F7FBEF228FFAFB617F5C12D1DD06309884 +:1037F4003AFD2C3D679FFAFBEF0CEF0A664C5ADE4C +:1038040005736718D4FBC6D7C716664C30DC094C61 +:1038140037DE05FD1F34EF67664C02DF1F8FD6FBD2 +:103824005C03728F35FC5C03318E316D08616A086C +:10383400128F35FC5C80312A6162EF49664C3DDFB2 +:103844000AAE90BF30FCF930FCEF3A664C3EDF051F +:10385400F931FCEF30664C4FDF05FDD348EF2666A7 +:103864004C61DF09E92EFC0972FA72EF18664C7F8D +:10387400DF0D30C141FD2C3D713AD5524AEF066649 +:103884007309D4FB72C6D7C788061617F124100033 +:10389400240500DC07244C00DD17EF18717BFA17B0 +:1038A400F104D4FB1489617F99717AFA717221EF62 +:1038B40003A02EFCC6D7C7C1C1FBF8FF401EF90305 +:1038C400DD06401EF904DF2F8C027309DCFB5E0A5F +:1038D400D1DF248C02318E04D4FB14896E0A9971D1 +:1038E4006207CC0100316207086159018C01D1DF04 +:1038F400F4716307716B271004C6D7CF35FC03F549 +:1039040033FCF537FCF539FCD7C788061617F1E701 +:1039140034020025DD4923DD1A25DD2823DD0523B6 +:10392400DD37EF47712222679F38FC30983AFD2C2F +:103934003DEF38675C03D161F8711223675C839FA4 +:1039440035FCEF27675C039F37FC675C034C02611F +:10395400F8712221FDFF32EF12679F39FCEF0C67EB +:1039640091DF08E0C15012FDBA38C0C6D7C7161798 +:10397400F1E7240000DD4723DD23240300DD0C24CC +:103984000200DD2224F900DD3CEF3D310207053061 +:103994008000EF01F6086F36FC7208EF318F33FCBC +:1039A400F533FC72EF2840DDFB01DD0FD9DDFBF1BF +:1039B4001231FE03311F087208EF13E2EF10710297 +:1039C400235235EF09F2EF0666730932FC72C6D74B +:1039D400C71617F1E7240000DD38241000DD1C238E +:1039E400DD1C23DD30240E00DD18241100DD1B2432 +:1039F4000F00DD12243000DD15EF1EE2EF1D520230 +:103A0400EF195204EF155206EF115205EF0D52074C +:103A1400EF09F2EF065203EF0252FFC6D7C7310493 +:103A24002249710322401EF903DF408F44FC9FDCCE +:103A3400FB8F43FC9FFBFB3620FDC7D943FCFDDA1B +:103A44003B618A70618AFD1F3CC0D946FCF1312F6D +:103A5400609F45FC8F42FC4F45FCDD0F7112228FA5 +:103A640045FC9F42FC30983AFD2C3D7150F000CE4D +:103A7400300BCF170006CE3106FD0803717A307182 +:103A84000BE3710BE7C6D78F45FC9F42FC8F45FCC7 +:103A94009FDDFBD7401EF903DD02F2D78FFAFB5CF2 +:103AA40012D1DD0C8F45FC9F4AFC7148FAFBEF6A8A +:103AB400311422247113227133228FFAFB5C04D156 +:103AC400DD088FF9FB9F4BFCEF068F45FC9F4BFCF9 +:103AD4008F4BFC9F4AFCEF423124222C712322712C +:103AE4003222D538FCDF05F54CFCEF0B8F38FC5047 +:103AF40002D6A1609F4CFC8F4CFC9F4AFC5040C1F5 +:103B04005012FDBA38C0EF12313222088F4BFC9F9D +:103B14004AFCEF068F4CFC9F4AFC8F4AFC9FDDFB5E +:103B2400404AFC01DF05E538FCEF0ED94AFCF112EE +:103B340031FE03311F609F38FC8FFAFB5C01D1DD3D +:103B440002F2D7E94AFC09382370C15013FDB205CB +:103B5400C0F2D7C7168B728C01614ADE248B728C3B +:103B640002614ADE188C01728C02614ADE068C0105 +:103B7400318EEF048C02318E087208EF268B72EFBF +:103B8400228B728C02614ADE048B72EF168C0172F6 +:103B94008C026142DE068C01318EEF048C02318E80 +:103BA400087208C6D7C716710AE7710BE37150F0A3 +:103BB40000CE300BCF170006669E31FD0803717AE4 +:103BC40030710BE33182E302EFFA8D1F7158F0007C +:103BD400710BE772C6D7C7C1C1FBF8FF8F2CFC4E2F +:103BE40002DC03F2EF318C024F2DFCDC0452FFEFB8 +:103BF400268C022F2CFC706131318D128F2DFC2FFD +:103C04002CFC70613133BDD813FDB60DBB440001EB +:103C1400DC03F690BB8B721004C6D7C7C1C1FBF896 +:103C2400FFAC0A14A91489708C026128706131FDFB +:103C340056201344030071FEDC24AC0A148A048168 +:103C44009A04AC0A148A044C11DC11A9148C02994C +:103C5400AC0A14CA0200AC0A14CA0310EF74AC0A0A +:103C640014CA0400AC0A14A914894E02DE0AAC0A70 +:103C7400148A02819A02EF13AC0A14A914894E0221 +:103C840061D308AC0A148A02919A02AC0A148A031A +:103C9400919A03D1DF3CAC0A148A024C10DF10A9BC +:103CA4001489318EA112AC0A14A9146299EF17ACCD +:103CB4000A148A024CF0DF0EA91489318EB112ACB9 +:103CC4000A14A9146299AC0A14CA0200AC0A14CAF0 +:103CD40003101004C6D7ED173D717BFAC7D558FC05 +:103CE40061F831442227714322D558FC61E8B05869 +:103CF400FC717AFA5600664C0BDD1272F3311C79B2 +:103D040028FDCEFC0061CAFD763D86EFE9717AFAA2 +:103D1400F2C6D7C75600664C0ADE0BF0317E12F6A7 +:103D2400785AFC86EFF0C6D7C7C1C1FBF8FFCC01B7 +:103D3400008C014C0ADE36717BFA8C01F0317E0472 +:103D44005AFC14A96168DF09AC02B9717AFAF2EF7E +:103D54001D8C01F0317E12795AFC614902DF067133 +:103D64007AFAE2EF09717AFA615901EFC4E21004B8 +:103D7400C6D7C72004FBF8FFF6425AFC61F8ED6E83 +:103D84003E717BFA9C038C034C0ADE4F8C03F031AA +:103D94007E045AFC14A96168DF05717AFAEF3C8C41 +:103DA40003F0317E12795AFCE743DF06717AFA0098 +:103DB400EF21717AFA8C0372F3311C795AFCCEFC30 +:103DC4000061CA629C02D1DF0A8C03F0317E12E6E4 +:103DD400785AFC717BFA615903EFABCC0200CC0139 +:103DE400018C02F0317E045AFC14A96168DD7B8CDD +:103DF40002F0317E12795AFCE743DF688C014C0AE9 +:103E0400DE628C01F0317E12795AFCE743DD507199 +:103E14007BFA8C01F0317E045AFC14A96168DF1B23 +:103E2400616901717BFA8C01F0317E12F6785AFCDB +:103E3400717AFA8C024E01DCE7EF2F8C01F0317EAF +:103E4400045AFC14A9128C02F0317E33785AFC8C8B +:103E540001F0317E12E6785AFC615902717AFA61F6 +:103E64005901EF98615902EDE53DCC0200CC010007 +:103E74008C014C0ADE1E8C01F0317E045AFC14A91C +:103E84006168DF05CC0201EF068C02D161E80061B4 +:103E94005901EFDCF21004C6D7C72006FBF8FF3443 +:103EA40019FCC55006C150A8C15030FD5603100678 +:103EB400D2DD1DA06EFC406EFC08DE03E2EF5A3436 +:103EC40014FC895CFC99FD663F7110E2FBF2EF493A +:103ED400F56EFC8F14FC5C01D1DD26401EF903DF76 +:103EE400205010C180FDBA38C0C736100571D4C641 +:103EF400DE0F17C15006C150A8C15030FD56031043 +:103F040006401EF901DD11401EF905DD0B8F14FC7E +:103F14005C02D161E8FD9B45F21006C6D7D915FCB9 +:103F2400C15030FD2C03C0629F18FC7130E5FB8F3B +:103F3400EDFB5C08D1DF06716307716B27F2D7D9FB +:103F440018FCC1D917FCC15030FDC80310047130EE +:103F5400E5FB8FEDFB5C08D1DF06716307716B270E +:103F6400F2D7C7200AFBF8FF500FC15030FD2C03D5 +:103F7400C04041FB02DF077110E2FBF2EF547118FD +:103F8400E2FBCC0700CC0812CC09808F14FC5C0344 +:103F9400D1DF08717AD5CC0607EF06717BD5CC0644 +:103FA4002F17040600C15004C150A0C15030FDFEBB +:103FB400031006C736100571D4C6DE15401EF9037A +:103FC400DF0F17C15006C150A8C15030FD56031071 +:103FD40006F2100AC6D7C78F1EF9318F240200DFFC +:103FE40004F6BF72FC8F3EFDB03EFDD161E8EDCD1D +:103FF40040CF3EFD048F1EF9318FE723DD0B2402F1 +:104004000024030061C8EDCD40E6A14272FCDF0A42 +:10401400E0C15010FDBA38C0EF2530C0004272FC38 +:10402400DF0B5002C15010FDBA38C0EF128FF8FBFD +:104034005009D60480004272FC61D8715020F931D5 +:10404400340709716322F6BF72FCEF17316422064C +:10405400F6BF72FCEF0DA272FCF64272FCDF049014 +:10406400BF72FC8F21F9318FE7240000DD0623DDC8 +:104074000D23DF1236100571C4717122EF0B710428 +:1040840002717122EF037172223172221A4074FCA0 +:104094000361D8A074FC4074FC02DF0E5004C150CC +:1040A40010FDBA38C0EF03F574FC314207184075AF +:1040B400FC0361D8A075FC4075FC02DF0C5010C1F4 +:1040C400FDBA38C0EF03F575FCC6D7C736100571C5 +:1040D400D4DE0A309D3EFD2C3DD261F800401EF92D +:1040E40003DF1B3122070730FB2CFD2C3D0031047C +:1040F400230C7103235080C15012FDBA38C0401EF6 +:10410400F903DD05F6BD1AEF25D500FCDF09F646F7 +:104114001ADD1BB61AEF17D9FCFBF1461ADD0FD9CD +:10412400FCFB12AD1A43DE04A61AEF02B61AC6D778 +:104134008FF4FB5C10D161E87122238FF4FB5C0FD8 +:10414400D1DD758FF4FB5C01D1DD05F51EF9EF6857 +:104154008FF4FB5C02D1DD15E0C15003C15084FD36 +:10416400C8031004711300711B207103038FF4FB47 +:104174005C08D1DD05710303EF1C8FF4FB5C04D1F3 +:10418400DD14711300711B203114230371030334F4 +:1041940035FC895CFC995005FD76027102035003DD +:1041A400C1C15084FDC8031004711A20FD8B3A303C +:1041B400983AFD2C3D711323F5F4FBF2D7C7364131 +:1041C40005718461D8ED7F423641057194DE077133 +:1041D400405005CEABAC31B2D104E2ED8E42713B1E +:1041E400D18F18F9A018F9318EE7240000DD1723C8 +:1041F400DD2723DD3223DD3723DD4323DD4F23DDBC +:104204005423DD59EF6D8F20F93163088F21F99F15 +:104214004005EF61F54005EF5CF0C15084FD2C03CF +:10422400C0629F4005EF4E8F10FD9F4005EF465042 +:1042340008C1506CFD2C03C0629F4005EF37500944 +:10424400C1506CFD2C03C0629F4005EF288F76FCA3 +:104254009F4005EF208F02F99F4005EF187114204D +:10426400E661301271042061DC31196162629F40A1 +:1042740005EF02EF06CEABACE2EF0F7160500571B3 +:10428400485005713BD5F518F9F2C6D7C78F1EF90A +:10429400318FE724000061F8ED334423DD1B2361F3 +:1042A400F8ED48432361F8EDD2432361F8ED0E4461 +:1042B4002361F8EDA444ED0445D51FF9DF2BF64244 +:1042C40072FCDD05F540FDEF03A040FD4040FD65B7 +:1042D400DC09F51EF9714222ED0745AF72FC440A70 +:1042E4000061D8ED0745E51FF9716222F540FDF53F +:1042F400F7FBFD2305713320FDB9244021F903DFC9 +:1043040009714222F51EF9ED0745FD162840E1FB2F +:104314009BDE09714222F51EF9ED0745FD1A2CD2E8 +:10432400DD09714222F51EF9ED0745401FF901DF51 +:1043340005F5FDFBEF04CFFDFB03CF1EF902FDEFF6 +:104344002BED0745CF350002CF37001DCF120510E6 +:10435400FDF82DFD582E714A9DFDFF38FDB534F54D +:1043640037FF712BE0F51FF9714222CBE43FEFCB0D +:10437400E6F6F0FD2305713BD48F20F9313530503A +:1043840004C15084FD2C03C0625C03318E315D3462 +:10439400E3FB896168995002C15084FD2C03C0D2AB +:1043A400DD067170E3FBEF047178E3FBFDB924FDD6 +:1043B4000F2F713820F9CF1EF9038FD6FB5C02D181 +:1043C400DD095080C15010FDBA38C0ED0745FD0924 +:1043D4004531A4E020712BE031020C05FD8345EF4B +:1043E400145027C15005C15084FDC8031004CF1ECA +:1043F400F9047142223124230BA078FCD578FC61A6 +:10440400F8FD8345FD7645ED0745FD094531020C70 +:1044140018F0C15005C15084FDC80310045005FDB7 +:104424007602FD8345CF1EF903FD7645ED0745CFA2 +:10443400FDFB03F5FEFB710221F6426CFF61E8ED22 +:104444000745F500FC715820F9F514FCFD663FFDA5 +:10445400912FFD4F2EFDAD2E714B9DF5E4FBF5E53F +:10446400FBF5E6FBF5E7FB31542002EFFACE370803 +:10447400CBE4BFFFCBE6FFF1CED4FFCF370009F585 +:104484001205F6BEE0BEE2BED0716A27FDB12CFD76 +:104494008C05F540FDCF1EF905716222F6BF72FC52 +:1044A4003102071BFDB924AF72FC440A00DC06E5A7 +:1044B4001FF9E51EF9D521F9DD49FD8C05EF44F519 +:1044C4001FF9FD8C0571730171320431120502EF7D +:1044D400FA71430271032071322031949E02EFFA83 +:1044E400712AE7CEA409F5F30061FD3104070371D5 +:1044F4006322E5F300CEA408712BE7E51EF9EF0370 +:1045040000EFFDC6D7D579FCDF1E31020019500338 +:10451400C15084FD2C03C0625C01D1DF07F51EF994 +:10452400714222D7E579FCD74079FCF0DF083104E9 +:10453400003FF579FCD74079FCC8DF0BF51EF97113 +:104544004222CF79FCF0D731020004A079FCD7F0E5 +:10455400C15004C15084FDC80310048FE3FB5C9F69 +:104564009FE3FB7110F4FB303441FD2C3DCF79FC0B +:10457400F0D78F20F9315506F51EF9714222D77113 +:104584002323F578FC717207FD0803FD080371739A +:1045940007D7FDF905F2D7C7200CFBF8FF8F1AFCEB +:1045A400F0F919FCF303FD562013BC048F1CFCF036 +:1045B400F91BFCF303FD562013BC028F1EFCF0F91B +:1045C4001DFCF303FD562013BBAC04BDD8F6BDDAC5 +:1045D400AC04311EBDDCF6BDDEFD690DADD8BDDC1D +:1045E400ADDABDDEAC02BDD8F6BDDAAC02311EDAFE +:1045F400DCC3DADEC3BDDCF6BDDEFD690DC0BDDEA5 +:10460400C0BDDCADDEFDDF0EADD8BDDCADDABDDE98 +:10461400ABBDD8F6BDDAAB311EDADCC3DADEC3BD1E +:10462400DCF6BDDEFD690DC0BDDEC0BDDCADDEFD6A +:10463400DF0EDADAADD8FD094AC3C58F06FD5C3F4B +:10464400F0317E0486FC14C2C0B9A006FDF6BC0895 +:10465400BC0A9C078C074C2EDD3E8F06FD0E0770AE +:10466400F161DC605C3FF0317E127986FCBDD8F6E6 +:10467400BDDA8C0773097A23318FBDDC70BDDEFD92 +:10468400690DAC08BDDCAC0AFDDF0EADDABC0AADC9 +:10469400D8BC08615907EFBCAC08BDD8AC0ABDDA78 +:1046A400C9DC0004F6FD330EC9DCFFFFF6FD480F3C +:1046B400ADD8BF80FCAF7AFC4280FCDD12AF7CFC3D +:1046C400BF7EFCAF7AFCBF7CFCAF80FCBF7AFCAF42 +:1046D4007CFC427EFCDC50AF7AFC427CFCDE48AFC2 +:1046E40042FD427AFCDE404082FC16DC1F4082FC24 +:1046F400A0DE168F83FC4F82FCDE0EAF7AFC228490 +:10470400FC44691061C8FD7447F582FCAF7AFC442F +:104714005146DC0BAF7AFC241027BF44FDEF19305F +:10472400F82ABF44FDEF114082FCFFDD03E6EF01F0 +:10473400F63482FC89610899AF7EFC427CFCDC1B68 +:10474400AF7CFC427AFCDE13AF7AFC4244FDDE0B04 +:10475400F583FCAF7AFCBF84FCEF114083FCFFDDE2 +:1047640003E6EF01F63483FC89610899100CC6D77F +:10477400C72006FBF8FFA01FFCD51FFCDF1CA020F0 +:10478400FCD520FCDF14A021FCD521FCDF0CCF1FBD +:10479400FCFFCF20FCFFCF21FCFF717BFA710A9E46 +:1047A40031929E02EFFA8E98FD5C0F9C038E949FCB +:1047B40046FD8E969F47FD8E979F48FD8E939F08DA +:1047C400FD8E929F09FDFD664913BC04BDD8F6BD5C +:1047D400DA46DADF03B146D8DF2D8C035C0391DFC0 +:1047E40003E6EF01F6046D01313D120103B1BC048F +:1047F400616903CF46FD23CF48FD12CF47FD31CF7A +:1048040008FD59CF09FD598F49FD4E03DF12AF0A48 +:10481400FD614904DE40AC04220AFDFD8748EF3601 +:104824008C03318EB112D949FDF143DF1E8C035C38 +:104834000391DF03E6EF01F6046D01313D1201033C +:10484400220AFD610904FD8748EF0B8F49FD4E03E1 +:10485400DE04F6FD87488C039F49FDAC04BF0AFDC6 +:10486400D907FDF1010422F9BB14A944FFFFDF04B9 +:10487400E6B9EF0BAB14A944FEFFDD03A9A1B910FF +:1048840006C6D7C7161744A90061C836A800A007F2 +:10489400FD4007FDA861C8F507FDF907FDF3311CCC +:1048A400F67822F9B7F647DFE5C6D7C756A8966665 +:1048B400F0317E12F6B17822F966D1DFF1F51FFCF2 +:1048C400F520FCF521FCF507FDC6D7713323D7C7C6 +:1048D4002004FBF8FFD918F9F1E7240000DD1123C7 +:1048E400DD1C23DD2123DD2623DD2F23DD34EF3AF8 +:1048F4008F07FD9F0CFDA018F9F946FDEF60A01885 +:10490400F9F947FDEF58A018F9F948FDEF50A01840 +:10491400F98F49FDFD760F72EF44A018F9F908FDEF +:10492400EF3CA018F9F909FDEF34F90CFDF3311C43 +:104934007922F9BB313223058B9C03EF128C019C45 +:1049440003D50CFDDF06CF0CFDA7EF03B00CFD7102 +:104954008071372361DC61FB7131238C0372100495 +:10496400C6D7C72008FBF8FF8E989C058E979C0439 +:104974008E969C038E949C028E939C018E929B71C6 +:104984000B9E717AFA8C05FD5C0F9C058C04FD5C12 +:104994000F9C048C03FD5C0F9C038C02FD5C0F9C3C +:1049A400028C04F0317E1279AA23BC068C055C03C8 +:1049B400D1DF158C044C03DE0C8C044C02DF098C13 +:1049C400034C1D61F86179068C03318EB1610906CF +:1049D400BC06313D120103BC068C060E02708C0726 +:1049E4001C00BC068F24FC4E01DC0D8C014F24FC02 +:1049F400DC0B8F25FC4DDE05AC0612EF04AC06B1D2 +:104A0400121008C6D7C7C3C12008FBF8FFF66149D6 +:104A14000A61F8614908DF07F7340000EDA64AE6A9 +:104A2400BC04F6BC06AC0ABC02AC08BBAC066149CB +:104A340002AC0461F8614900DE28AC04BDD8AC06C0 +:104A4400BDDAE1FDEE0EADDABC06ADD8BC04ABBDFB +:104A5400D8AC02BDDAE1FD090FADDABC02ADD8BBBA +:104A6400EFCAAC06BC02AC04BBAC08BDD8AC0ABDF2 +:104A7400DAAC04BDDCAC06FD6C0EAC04BDDCAC06EB +:104A8400FDDF0EE1FD090FADDABC06ADD8BC04AC08 +:104A940006614902AC0461F8614900DCC5AC02144A +:064AA400AB12100CC6D796 +:104AAA00CF0BF90461FC61FCC1C3C5C7520C9292D9 +:104ABA0069D4FEC1DFF88EFD708EFCC1717AFA40AE +:104ACA001EF903DF0630FB2CFD2C3DC09EFC609EC8 +:104ADA00FD34D4FE5206C0B9A5A592DFF9C6C4C2F8 +:104AEA00C061FC61DF520C929269D4FEC1DFF88E7C +:104AFA00FD708EFCC1717AFAC736410571A4C6DC15 +:104B0A0051F512FD71485005716050053174213616 +:104B1A007162077173218FE4FB5FECFBD1DF1B8F9E +:104B2A00E5FB5FEDFBD1DF128FE6FB5FEEFBD1DF2A +:104B3A00098FE7FB5FEFFBD1DD0C31620702EFFA69 +:104B4A00716307716B27FDCF48FD6934F518F9EDDC +:104B5A00714CC73641057184C6DE0DF512FD7148E8 +:104B6A005005FD6934ED714CC73641057194C6DEB6 +:104B7A00154012FD03DD0C4012FD04DD064012FD56 +:104B8A000161F8F512FDD912FDF1E7240000DD08F4 +:104B9A0023DD1323DD39EF6071405005E512FD7105 +:104BAA00505005ED714C8F40059F19F99F1CF9D99A +:104BBA0019F9FD0C38629F1BF94019F97FDD06CF00 +:104BCA0012FD02EF03F512FD71505005ED714CC74D +:104BDA003641057194C6DE1CC736410571C4C6DE6E +:104BEA0006CF12FD03EF11F512FD714850057160F1 +:104BFA005005EF73CF12FD044012FD03DF138F1B24 +:104C0A00F99F4005D91BF9C1D919F9FD8B38C0EFB5 +:104C1A00108F400576C7D919F9FDEE34C07150508E +:104C2A0005D91CF9F1242900DD2D240400DD2824EE +:104C3A002200DD23241100DD0C240100DD19241ECD +:104C4A0000DD14EF0C4019F960DF0CCF19F961EFA0 +:104C5A0006F518F9A019F94012FD03DF0AD919F966 +:104C6A00FD0C38629F1BF9C09EFC609EFD34D4FE89 +:104C7A005206C0B9A5A592DFF961FCC1C3C5C752E6 +:104C8A000C929269D4FEC1DFF88EFD708EFCC1F6DB +:104C9A0016717AFA714AE5717BBD51405F0401D100 +:104CAA00DD05A7F647DFF3300400BF2401F6BF2A6B +:104CBA0001300B0BBF2801FD0803300B0FBF280181 +:104CCA00FD0803300F0FBF2801710AE6715320C097 +:104CDA009EFC609EFD34D4FE5206C0B9A5A592DFA3 +:104CEA00F9C6C4C2C061FCC1C3C5C7520C9292695D +:104CFA00D4FEC1DFF88EFD708EFCC1717AFAD54000 +:104D0A00FBDD0EEB3EFB899E44A23EFBB040FBEF6F +:104D1A002B710AE6300400BF2401F6BF2A01300BCA +:104D2A000BBF2801FD0803300B0FBF2801FD080344 +:104D3A00300F0FBF2801714320715320C09EFC60C1 +:104D4A009EFD34D4FE5206C0B9A5A592DFF9C6C4A9 +:104D5A00C2C061FC61EF520C929269D4FEC1DFF8C5 +:104D6A008EFD708EFCC12008FBF8FF71503002CE18 +:104D7A00ABACCC0100F6BC0231B2E210617902F6AA +:104D8A00614902DFF371603002ED154E8E519B715D +:104D9A003BE28B5C02D1DD1D8B5C08D1DF097150CF +:104DAA003002CC0100EFCE8C0770FD7139629E5043 +:104DBA00CC0102EFC08B5C03D1DF408E509C0571A1 +:104DCA005030028C01D1DF0E8C0570FDD439629C03 +:104DDA0007CC0101EF328C014C02DF067160300210 +:104DEA00EF29CF34025A716030028C0570C18C07EA +:104DFA0070FD0D39C0CF34024AEF108B5C01D1DD52 +:104E0A000671603002EF0400ED7F4D1008C09EFC71 +:104E1A00609EFD34D4FE5206C0B9A5A592DFF961A1 +:104E2A00FCC18F0EFC4F96FFDF328F0FFC4F97FFAE +:104E3A00DF2A8F10FC4F98FFDF228FEDFB5C04D135 +:104E4A00DF1A7120E5FB716307716B27401EF905B4 +:104E5A00DD06401EF90161F8CF1FF902C061FCA00E +:104E6A0058FC61FCC1C3C5C7520C929269D4FEC1F9 +:104E7A00DFF88EFD708EFCC1C1FBF8FF8D1F9C010F +:104E8A008E31318EE7240600DD0823DD0F23DD2570 +:104E9A00EF45717AFA8C019F44FCEF3B717AFA4034 +:104EAA0021F901DF078C019F43FCEF2B51FF2E01F3 +:104EBA009F43FCEF22717AFA8C019F02F98FE2FB81 +:104ECA005C01D1DF12401EF903DD06401EF904DF42 +:104EDA0006305827FD2C3D4031FF09DE05A031FF81 +:104EEA00EF197158F0007102224057FC02DF03F6F5 +:104EFA00EF05D957FCF1A1609F57FC710BE3C0C0C5 +:104F0A009EFC609EFD34D4FE5206C0B9A5A592DF70 +:104F1A00F9C6C4C2C061FC61FF520C929269D4FE08 +:104F2A00C1DFF88EFD708EFCC1717AFA8F14FC5CB9 +:104F3A0003D1DD19401EF903DD06401EF904DF0D19 +:104F4A0036100571D4DE06309D3EFD2C3DC09EFC18 +:104F5A00609EFD34D4FE5206C0B9A5A592DFF96160 +:104F6A00FC61FC00EFFD61FC61FC61FC61FC61FC21 +:104F7A0061FC61FC61FC61FC61FC61FC61FC61FC3F +:104F8A0061FC61FC61FC61FC61FC61FC61FC61FC2F +:0C4F9A0061FC61FC61FC61FC61FC61FCDD +:104FA600FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0B +:104FB600FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB +:104FC600FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEB +:104FD600FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDB +:104FE600FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCB +:0A4FF60030393A30373A3338000002 :10500000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB0 :10501000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA0 :10502000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF90 diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index fbd1446..1448198 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 8bbc858..13277c0 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,20 +1,19 @@ -78K0R Linker W1.31 Date:28 Jul 2010 Page: 1 +78K0R Linker W1.31 Date: 4 Aug 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 -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 + \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 Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map @@ -23,9 +22,9 @@ Direc-file:bsr_mcu.dr *** Link information *** - 66 output segment(s) - 3DB9H byte(s) real data - 5401 symbol(s) defined + 64 output segment(s) + 3E0CH byte(s) real data + 5479 symbol(s) defined *** Memory map *** @@ -54,8 +53,10 @@ Direc-file:bsr_mcu.dr LDR_CNSL 00002H 00000H CSEG PAGE64KP LDR_CNSL task_debug 00002H 00000H - ??NMIROM 00002H 00002H CSEG -* gap * 00004H 0000CH + LDR_CNSL 00002H 00000H CSEG PAGE64KP + LDR_CNSL task_status + 00002H 00000H +* gap * 00002H 0000EH @@VECT10 00010H 00004H CSEG AT @@VECT10 ini_VECT 00010H 00004H * gap * 00014H 00008H @@ -93,55 +94,58 @@ Direc-file:bsr_mcu.dr 000C4H 00000H LDR_CODL task_debug 000C4H 00000H + LDR_CODL task_status + 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - ?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 000CEH 008FBH CSEG + LDR_CODE loader 000CEH 001CCH + LDR_CODE main 0029AH 0006EH + LDR_CODE WDT 00308H 00000H + LDR_CODE i2c_mcu 00308H 002F1H LDR_CODE self_flash - 00603H 00339H + 005F9H 0034AH LDR_CODE task_debug - 0093CH 00001H - FSL_CODE 0093DH 00322H CSEG + 00943H 00001H + LDR_CODE task_status + 00944H 00085H + FSL_CODE 009C9H 00322H CSEG FSL_CODE fsl_block_cmd - 0093DH 0002BH + 009C9H 0002BH FSL_CODE fsl_block_check - 00968H 00013H + 009F4H 00013H FSL_CODE fsl_common - 0097BH 0014FH + 00A07H 0014FH FSL_CODE fsl_reset - 00ACAH 00001H + 00B56H 00001H FSL_CODE fsl_si_ibf - 00ACBH 00064H + 00B57H 00064H FSL_CODE fsl_phySwap - 00B2FH 0004DH + 00BBBH 0004DH FSL_CODE fsl_si_common - 00B7CH 00061H - FSL_CODE fsl_swap 00BDDH 00030H + 00C08H 00061H + FSL_CODE fsl_swap 00C69H 00030H FSL_CODE fsl_write - 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 + 00C99H 00052H + @@LCODE 00CEBH 002AFH CSEG + @@LCODE @cstart 00CEBH 0006DH + @@LCODE @imul 00D58H 00011H + @@LCODE @lumul 00D69H 0002BH + @@LCODE @isdiv 00D94H 00022H + @@LCODE @iudiv 00DB6H 0002DH + @@LCODE @isrem 00DE3H 00021H + @@LCODE @iurem 00E04H 0002FH + @@LCODE @lsdiv 00E33H 00039H + @@LCODE @ludiv 00E6CH 0003FH + @@LCODE @divuw 00EABH 00034H + @@LCODE @ladd 00EDFH 0000FH + @@LCODE @llsh 00EEEH 0001BH + @@LCODE @lursh 00F09H 0001FH + @@LCODE @iscmp 00F28H 0000CH + @@LCODE @lscmp 00F34H 00014H + @@LCODE @lband 00F48H 00014H + @@LCODE @bcdtob 00F5CH 0001AH + @@LCODE @bbcd 00F76H 00024H +* gap * 00F9AH 0005CH MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -183,9 +187,6 @@ Direc-file:bsr_mcu.dr 02000H 00000H @@CNSTL 02000H 00000H CSEG PAGE64KP @@CNSTL ini_VECT 02000H 00000H - @@CNSTL 02000H 00000H CSEG PAGE64KP - @@CNSTL task_status - 02000H 00000H @@CNSTL 02000H 0000AH CSEG PAGE64KP @@CNSTL @bcdtob 02000H 0000AH @@CNSTL 0200AH 00010H CSEG PAGE64KP @@ -331,8 +332,6 @@ Direc-file:bsr_mcu.dr @@CODEL pedo_alg_thre_det2 02056H 00000H @@CODEL ini_VECT 02056H 00000H - @@CODEL task_status - 02056H 00000H @@LCODEL 02056H 00008H CSEG @@LCODEL abs 02056H 00008H * gap * 0205EH 000A2H @@ -368,55 +367,53 @@ Direc-file:bsr_mcu.dr @@CNST ini_VECT 023C4H 00000H @@CNST task_status 023C4H 00000H - 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 023C4H 026E6H CSEG + ROM_CODE pm 023C4H 00A34H + ROM_CODE i2c_ctr 02DF8H 00060H + ROM_CODE i2c_twl 02E58H 0005EH + ROM_CODE led 02EB6H 00512H + ROM_CODE rtc 033C8H 000E0H + ROM_CODE vreg_ctr 034A8H 00457H + ROM_CODE vreg_twl 038FFH 00122H + ROM_CODE adc 03A21H 002B9H + ROM_CODE renge 03CDAH 001C3H + ROM_CODE accero 03E9DH 0013DH + ROM_CODE sw 03FDAH 000F5H ROM_CODE task_misc - 0408AH 001BAH - ROM_CODE task_sys 04244H 00309H + 040CFH 001C1H + ROM_CODE task_sys 04290H 0030BH ROM_CODE pedo_alg_thre_det2 - 0454DH 0050FH - ROM_CODE task_status - 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 + 0459BH 0050FH + @@BASE 04AAAH 004FCH CSEG BASE + @@BASE loader 04AAAH 00000H + @@BASE pm 04AAAH 00043H + @@BASE i2c_ctr 04AEDH 00198H + @@BASE main 04C85H 00000H + @@BASE magic 04C85H 00000H + @@BASE WDT 04C85H 00000H + @@BASE i2c_mcu 04C85H 000D9H + @@BASE i2c_twl 04D5EH 000CDH + @@BASE led 04E2BH 00000H + @@BASE rtc 04E2BH 00043H + @@BASE vreg_ctr 04E6EH 00000H + @@BASE vreg_twl 04E6EH 00000H + @@BASE adc 04E6EH 000B3H + @@BASE renge 04F21H 00000H + @@BASE accero 04F21H 0004AH @@BASE self_flash - 04FA2H 00000H - @@BASE sw 04FA2H 00000H + 04F6BH 00000H + @@BASE sw 04F6BH 00000H @@BASE task_debug - 04FA2H 00000H + 04F6BH 00000H @@BASE task_misc - 04FA2H 00000H - @@BASE task_sys 04FA2H 00000H + 04F6BH 00000H + @@BASE task_sys 04F6BH 00000H @@BASE pedo_alg_thre_det2 - 04FA2H 00000H - @@BASE ini_VECT 04FA2H 0003BH + 04F6BH 00000H + @@BASE ini_VECT 04F6BH 0003BH @@BASE task_status - 04FDDH 00000H -* gap * 04FDDH 00019H + 04FA6H 00000H +* gap * 04FA6H 00050H MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL magic 04FF6H 0000AH @@ -424,194 +421,194 @@ Direc-file:bsr_mcu.dr BASE ADDRESS=FF900H SIZE=00500H OUTPUT INPUT INPUT BASE SIZE SEGMENT SEGMENT MODULE ADDRESS - @@DATA FF900H 00408H DSEG BASEP + @@DATA FF900H 00410H DSEG BASEP @@DATA @cstart FF900H 00002H @@DATA loader FF902H 00000H - @@DATA pm FF902H 00014H - @@DATA i2c_ctr FF916H 00006H - @@DATA main FF91CH 0021EH + @@DATA pm FF902H 00016H + @@DATA i2c_ctr FF918H 00006H + @@DATA main FF91EH 0021CH @@DATA magic FFB3AH 00000H @@DATA WDT FFB3AH 00000H @@DATA i2c_mcu FFB3AH 0000AH @@DATA i2c_twl FFB44H 00000H @@DATA led FFB44H 00088H @@DATA rtc FFBCCH 00008H - @@DATA vreg_ctr FFBD4H 00056H - @@DATA vreg_twl FFC2AH 00010H - @@DATA adc FFC3AH 00016H - @@DATA renge FFC50H 00016H - @@DATA accero FFC66H 00002H + @@DATA vreg_ctr FFBD4H 0005EH + @@DATA vreg_twl FFC32H 00010H + @@DATA adc FFC42H 00016H + @@DATA renge FFC58H 00016H + @@DATA accero FFC6EH 00002H @@DATA self_flash - FFC68H 00002H - @@DATA sw FFC6AH 00004H + FFC70H 00002H + @@DATA sw FFC72H 00004H @@DATA task_debug - FFC6EH 00000H + FFC76H 00000H @@DATA task_misc - FFC6EH 00002H - @@DATA task_sys FFC70H 00002H + FFC76H 00002H + @@DATA task_sys FFC78H 00002H @@DATA pedo_alg_thre_det2 - FFC72H 00094H - @@DATA ini_VECT FFD06H 00000H + FFC7AH 00094H + @@DATA ini_VECT FFD0EH 00000H @@DATA task_status - FFD06H 00002H - @@DATA @rom FFD08H 00000H - @@INIT FFD08H 0003CH DSEG BASEP - @@INIT @cstart FFD08H 00000H - @@INIT loader FFD08H 00000H - @@INIT pm FFD08H 00002H - @@INIT i2c_ctr FFD0AH 00002H - @@INIT main FFD0CH 00000H - @@INIT magic FFD0CH 00000H - @@INIT WDT FFD0CH 00000H - @@INIT i2c_mcu FFD0CH 00000H - @@INIT i2c_twl FFD0CH 00000H - @@INIT led FFD0CH 00006H - @@INIT rtc FFD12H 00000H - @@INIT vreg_ctr FFD12H 00000H - @@INIT vreg_twl FFD12H 00000H - @@INIT adc FFD12H 0000EH - @@INIT renge FFD20H 00016H - @@INIT accero FFD36H 00000H + FFD0EH 00002H + @@DATA @rom FFD10H 00000H + @@INIT FFD10H 0003CH DSEG BASEP + @@INIT @cstart FFD10H 00000H + @@INIT loader FFD10H 00000H + @@INIT pm FFD10H 00002H + @@INIT i2c_ctr FFD12H 00002H + @@INIT main FFD14H 00000H + @@INIT magic FFD14H 00000H + @@INIT WDT FFD14H 00000H + @@INIT i2c_mcu FFD14H 00000H + @@INIT i2c_twl FFD14H 00000H + @@INIT led FFD14H 00006H + @@INIT rtc FFD1AH 00000H + @@INIT vreg_ctr FFD1AH 00000H + @@INIT vreg_twl FFD1AH 00000H + @@INIT adc FFD1AH 0000EH + @@INIT renge FFD28H 00016H + @@INIT accero FFD3EH 00000H @@INIT self_flash - FFD36H 00000H - @@INIT sw FFD36H 00002H + FFD3EH 00000H + @@INIT sw FFD3EH 00002H @@INIT task_debug - FFD38H 00000H + FFD40H 00000H @@INIT task_misc - FFD38H 00000H - @@INIT task_sys FFD38H 00002H + FFD40H 00000H + @@INIT task_sys FFD40H 00002H @@INIT pedo_alg_thre_det2 - FFD3AH 00008H - @@INIT ini_VECT FFD42H 00000H + FFD42H 00008H + @@INIT ini_VECT FFD4AH 00000H @@INIT task_status - 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 + FFD4AH 00002H + @@INIT @rom FFD4CH 00000H + @@INIS FFD4CH 00000H DSEG UNITP + @@INIS @cstart FFD4CH 00000H + @@INIS loader FFD4CH 00000H + @@INIS pm FFD4CH 00000H + @@INIS i2c_ctr FFD4CH 00000H + @@INIS main FFD4CH 00000H + @@INIS magic FFD4CH 00000H + @@INIS WDT FFD4CH 00000H + @@INIS i2c_mcu FFD4CH 00000H + @@INIS i2c_twl FFD4CH 00000H + @@INIS led FFD4CH 00000H + @@INIS rtc FFD4CH 00000H + @@INIS vreg_ctr FFD4CH 00000H + @@INIS vreg_twl FFD4CH 00000H + @@INIS adc FFD4CH 00000H + @@INIS renge FFD4CH 00000H + @@INIS accero FFD4CH 00000H @@INIS self_flash - FFD44H 00000H - @@INIS sw FFD44H 00000H + FFD4CH 00000H + @@INIS sw FFD4CH 00000H @@INIS task_debug - FFD44H 00000H + FFD4CH 00000H @@INIS task_misc - FFD44H 00000H - @@INIS task_sys FFD44H 00000H + FFD4CH 00000H + @@INIS task_sys FFD4CH 00000H @@INIS pedo_alg_thre_det2 - FFD44H 00000H - @@INIS ini_VECT FFD44H 00000H + FFD4CH 00000H + @@INIS ini_VECT FFD4CH 00000H @@INIS task_status - 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 + FFD4CH 00000H + @@INIS @rom FFD4CH 00000H + @@DATS FFD4CH 00000H DSEG UNITP + @@DATS @cstart FFD4CH 00000H + @@DATS loader FFD4CH 00000H + @@DATS pm FFD4CH 00000H + @@DATS i2c_ctr FFD4CH 00000H + @@DATS main FFD4CH 00000H + @@DATS magic FFD4CH 00000H + @@DATS WDT FFD4CH 00000H + @@DATS i2c_mcu FFD4CH 00000H + @@DATS i2c_twl FFD4CH 00000H + @@DATS led FFD4CH 00000H + @@DATS rtc FFD4CH 00000H + @@DATS vreg_ctr FFD4CH 00000H + @@DATS vreg_twl FFD4CH 00000H + @@DATS adc FFD4CH 00000H + @@DATS renge FFD4CH 00000H + @@DATS accero FFD4CH 00000H @@DATS self_flash - FFD44H 00000H - @@DATS sw FFD44H 00000H + FFD4CH 00000H + @@DATS sw FFD4CH 00000H @@DATS task_debug - FFD44H 00000H + FFD4CH 00000H @@DATS task_misc - FFD44H 00000H - @@DATS task_sys FFD44H 00000H + FFD4CH 00000H + @@DATS task_sys FFD4CH 00000H @@DATS pedo_alg_thre_det2 - FFD44H 00000H - @@DATS ini_VECT FFD44H 00000H + FFD4CH 00000H + @@DATS ini_VECT FFD4CH 00000H @@DATS task_status - FFD44H 00000H - @@DATS @rom FFD44H 00000H - FSL_DATA FFD44H 00010H DSEG UNITP + FFD4CH 00000H + @@DATS @rom FFD4CH 00000H + FSL_DATA FFD4CH 00010H DSEG UNITP FSL_DATA fsl_common - 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 + FFD4CH 00010H + @@INITL FFD5CH 00000H DSEG UNIT64KP + @@INITL loader FFD5CH 00000H + @@INITL pm FFD5CH 00000H + @@INITL i2c_ctr FFD5CH 00000H + @@INITL main FFD5CH 00000H + @@INITL magic FFD5CH 00000H + @@INITL WDT FFD5CH 00000H + @@INITL i2c_mcu FFD5CH 00000H + @@INITL i2c_twl FFD5CH 00000H + @@INITL led FFD5CH 00000H + @@INITL rtc FFD5CH 00000H + @@INITL vreg_ctr FFD5CH 00000H + @@INITL vreg_twl FFD5CH 00000H + @@INITL adc FFD5CH 00000H + @@INITL renge FFD5CH 00000H + @@INITL accero FFD5CH 00000H @@INITL self_flash - FFD54H 00000H - @@INITL sw FFD54H 00000H + FFD5CH 00000H + @@INITL sw FFD5CH 00000H @@INITL task_debug - FFD54H 00000H + FFD5CH 00000H @@INITL task_misc - FFD54H 00000H - @@INITL task_sys FFD54H 00000H + FFD5CH 00000H + @@INITL task_sys FFD5CH 00000H @@INITL pedo_alg_thre_det2 - FFD54H 00000H - @@INITL ini_VECT FFD54H 00000H + FFD5CH 00000H + @@INITL ini_VECT FFD5CH 00000H @@INITL task_status - 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 + FFD5CH 00000H + @@INITL @rom FFD5CH 00000H + @@DATAL FFD5CH 00000H DSEG UNIT64KP + @@DATAL loader FFD5CH 00000H + @@DATAL pm FFD5CH 00000H + @@DATAL i2c_ctr FFD5CH 00000H + @@DATAL main FFD5CH 00000H + @@DATAL magic FFD5CH 00000H + @@DATAL WDT FFD5CH 00000H + @@DATAL i2c_mcu FFD5CH 00000H + @@DATAL i2c_twl FFD5CH 00000H + @@DATAL led FFD5CH 00000H + @@DATAL rtc FFD5CH 00000H + @@DATAL vreg_ctr FFD5CH 00000H + @@DATAL vreg_twl FFD5CH 00000H + @@DATAL adc FFD5CH 00000H + @@DATAL renge FFD5CH 00000H + @@DATAL accero FFD5CH 00000H @@DATAL self_flash - FFD54H 00000H - @@DATAL sw FFD54H 00000H + FFD5CH 00000H + @@DATAL sw FFD5CH 00000H @@DATAL task_debug - FFD54H 00000H + FFD5CH 00000H @@DATAL task_misc - FFD54H 00000H - @@DATAL task_sys FFD54H 00000H + FFD5CH 00000H + @@DATAL task_sys FFD5CH 00000H @@DATAL pedo_alg_thre_det2 - FFD54H 00000H - @@DATAL ini_VECT FFD54H 00000H + FFD5CH 00000H + @@DATAL ini_VECT FFD5CH 00000H @@DATAL task_status - FFD54H 00000H - @@DATAL @rom FFD54H 00000H -* gap * FFD54H 000ACH + FFD5CH 00000H + @@DATAL @rom FFD5CH 00000H +* gap * FFD5CH 000A4H MEMORY=RAM2 BASE ADDRESS=FFE20H SIZE=000C0H @@ -627,26 +624,26 @@ Direc-file:bsr_mcu.dr @@BITS WDT FFE20H.4 00000H.0 @@BITS i2c_mcu FFE20H.4 00000H.3 @@BITS i2c_twl FFE20H.7 00000H.0 - @@BITS led FFE20H.7 00000H.4 - @@BITS rtc FFE21H.3 00000H.3 - @@BITS vreg_ctr FFE21H.6 00000H.1 - @@BITS vreg_twl FFE21H.7 00000H.0 - @@BITS adc FFE21H.7 00000H.4 - @@BITS renge FFE22H.3 00000H.2 - @@BITS accero FFE22H.5 00000H.0 + @@BITS led FFE20H.7 00000H.5 + @@BITS rtc FFE21H.4 00000H.3 + @@BITS vreg_ctr FFE21H.7 00000H.1 + @@BITS vreg_twl FFE22H.0 00000H.0 + @@BITS adc FFE22H.0 00000H.4 + @@BITS renge FFE22H.4 00000H.2 + @@BITS accero FFE22H.6 00000H.0 @@BITS self_flash - FFE22H.5 00000H.0 - @@BITS sw FFE22H.5 00000H.2 + FFE22H.6 00000H.0 + @@BITS sw FFE22H.6 00000H.2 @@BITS task_debug - FFE22H.7 00000H.0 + FFE23H.0 00000H.0 @@BITS task_misc - FFE22H.7 00000H.3 - @@BITS task_sys FFE23H.2 00000H.0 + FFE23H.0 00000H.3 + @@BITS task_sys FFE23H.3 00000H.0 @@BITS pedo_alg_thre_det2 - FFE23H.2 00000H.1 - @@BITS ini_VECT FFE23H.3 00000H.0 + FFE23H.3 00000H.1 + @@BITS ini_VECT FFE23H.4 00000H.0 @@BITS task_status - FFE23H.3 00000H.0 + FFE23H.4 00000H.0 * gap * FFE24H 000B0H @@SEGREG FFED4H 00004H DSEG AT @@SEGREG @SEGREG FFED4H 00004H diff --git a/trunk/bsr_system.h b/trunk/bsr_system.h index 6f20033..9efc37b 100644 --- a/trunk/bsr_system.h +++ b/trunk/bsr_system.h @@ -44,8 +44,9 @@ typedef struct _system_status_ unsigned char dipsw2:1; unsigned char reboot:1; unsigned char info_fullcolor:1; + unsigned char force_off:1; + unsigned char fake_jikki:1; // キャプチャ箱 SDKには実機と返す enum model_ model; - unsigned char force_off; // bitできないんだそうな }system_status_; diff --git a/trunk/config.h b/trunk/config.h index e23b852..2dd021c 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -8,12 +8,13 @@ //#define _DBG_PEDO_AUTO_ENABLE_ //#define _DBG_LED_PRINT_ //#define _DEBUG_CODEC_POLLING_ +//#define _DBG_FORCE_FULLCOLOR_ //#define _PMIC_TEST_ //#define _ENABLE_WDT_TEST_ //#define _DBG_FORCE_JIKKI_ #define MCU_VER_MAJOR 0x01 -#define MCU_VER_MINOR 0x01 +#define MCU_VER_MINOR 0x03 //#define PM_CCIC_TIM diff --git a/trunk/hoge.bin b/trunk/hoge.bin index d90d7cc..b1f284c 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/led.c b/trunk/led.c index fd54d8b..945f05a 100644 --- a/trunk/led.c +++ b/trunk/led.c @@ -164,6 +164,9 @@ void LED_init( ) system_status.info_fullcolor = 0; if( system_status.model == MODEL_TS_BOARD ) { +#ifdef _DBG_FORCE_FULLCOLOR_ + system_status.info_fullcolor = 1; +#endif } else { @@ -496,13 +499,12 @@ void tsk_led_wifi( ) - +bit info_led_pattern_updated; /* ======================================================== お知らせLED ======================================================== */ void tsk_led_notify( ) { -// static u8 task_interval; static u8 time_to_next_frame; static u8 frame; static u8 loops_to_go; @@ -527,48 +529,7 @@ void tsk_led_notify( ) LED_dim_status_info_B.now = 0; } - if( !info_led_off ) // ←電源off時など強制off - { - // 次のフレームに進める？ - if( time_to_next_frame == 0 ) - { - time_to_next_frame = info_LED.info_LED.term; - - if( frame >= NOTIFY_LED_TERM -1 ) - { - vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] |= REG_BIT_IN_LOOP; - if( info_LED.info_LED.last_loop != 255 ) // 255:無限ループ - { - if( loops_to_go != 0 ) - { - loops_to_go -= 1; - } - else - { - loops_to_go = info_LED.info_LED.last_loop; - frame = 0; - } - } - } - else - { - vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] &= ~REG_BIT_IN_LOOP; - frame = (( frame + 1 ) & 0x1F ); // ←ここでマスクをかけておかないと最終フレーム〜先頭間のグラデが効かない - } - - LED_dim_status_info_R.to = info_LED.info_LED.red[frame] * 128; - LED_dim_status_info_G.to = info_LED.info_LED.grn[frame] * 128; - LED_dim_status_info_B.to = info_LED.info_LED.blu[frame] * 128; - - // グラデーションのデルタを計算 - LED_dim_status_info_R.delta = (( LED_dim_status_info_R.to - LED_dim_status_info_R.now ) ) / info_LED.info_LED.fade_time; - LED_dim_status_info_G.delta = (( LED_dim_status_info_G.to - LED_dim_status_info_G.now ) ) / info_LED.info_LED.fade_time; - LED_dim_status_info_B.delta = (( LED_dim_status_info_B.to - LED_dim_status_info_B.now ) ) / info_LED.info_LED.fade_time; - - } - time_to_next_frame -= 1; - } - else + if( info_led_off ) // ←電源off時など強制off { // フェードアウトさせる LED_dim_status_info_R.to = 0; @@ -578,6 +539,57 @@ void tsk_led_notify( ) LED_dim_status_info_G.delta = 0 - LED_dim_status_info_G.now / 64; LED_dim_status_info_B.delta = 0 - LED_dim_status_info_B.now / 64; } + else + { + // 通常運転 + if( info_led_pattern_updated ) + { + info_led_pattern_updated = 0; + vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] &= ~REG_BIT_IN_LOOP; + frame = 0; // ちゃんと書こう + } + else + { + // 次のフレームに進める？ + if( time_to_next_frame == 0 ) + { + time_to_next_frame = info_LED.info_LED.term; + + if( frame >= NOTIFY_LED_TERM -1 ) + { + vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] |= REG_BIT_IN_LOOP; + if( info_LED.info_LED.last_loop != 255 ) // 255:無限ループ + { + if( loops_to_go != 0 ) + { + loops_to_go -= 1; + } + else + { + loops_to_go = info_LED.info_LED.last_loop; + frame = 0; + } + } + } + else + { + vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] &= ~REG_BIT_IN_LOOP; + frame = (( frame + 1 ) & 0x1F ); // ←ここでマスクをかけておかないと最終フレーム〜先頭間のグラデが効かない + } + + LED_dim_status_info_R.to = info_LED.info_LED.red[frame] * 128; + LED_dim_status_info_G.to = info_LED.info_LED.grn[frame] * 128; + LED_dim_status_info_B.to = info_LED.info_LED.blu[frame] * 128; + + // グラデーションのデルタを計算 + LED_dim_status_info_R.delta = (( LED_dim_status_info_R.to - LED_dim_status_info_R.now ) ) / info_LED.info_LED.fade_time; + LED_dim_status_info_G.delta = (( LED_dim_status_info_G.to - LED_dim_status_info_G.now ) ) / info_LED.info_LED.fade_time; + LED_dim_status_info_B.delta = (( LED_dim_status_info_B.to - LED_dim_status_info_B.now ) ) / info_LED.info_LED.fade_time; + + } + time_to_next_frame -= 1; + } + } if( system_status.info_fullcolor ) { diff --git a/trunk/pm.c b/trunk/pm.c index b9512c2..82ea0b2 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -63,13 +63,12 @@ u8 blset; PM_EXTDCは割り込みメインにするかも ======================================================== */ -#define INTERVAL_TSK_BATT 250 +#define INTERVAL_TSK_BATT 100 bit temp_zone_charge_disable; // 温度で充電停止する時にヒステリシスを付けるため void tsk_batt( ) { static u8 task_interval = 0; - static bit pm_extdc_old; static u8 heikinka_h,heikinka_l; if( task_interval-- != 0 ) @@ -83,20 +82,40 @@ void tsk_batt( ) // アダプタステータス更新 ///////// - if( pm_extdc_old != !PM_EXTDC_n ) { - pm_extdc_old = !PM_EXTDC_n; - if( pm_extdc_old ) + static u8 anti_chatter; + static bit pm_extdc_old; + u8 temp_EXT_DC; + + temp_EXT_DC = !PM_EXTDC_n; // volatileのため + + if( pm_extdc_old == temp_EXT_DC ) { - set_bit( 1, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY ); - set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_CONNECT ); - chg_led_override = (u8)( 1000 / INTERVAL_TSK_BATT / SYS_INTERVAL_TICK ); + anti_chatter = 0; } else { - set_bit( 0, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY ); - set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_DISC ); - chg_led_override = 0; + if( anti_chatter < 4 ) // 電池無しでアダプタさすとCHG_ENがぱたぱたするので + { + anti_chatter++; + } + else + { + // アダプタの情報など更新 + pm_extdc_old = temp_EXT_DC; + if( pm_extdc_old ) + { + set_bit( 1, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY ); + set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_CONNECT ); + chg_led_override = (u8)( 1000 / INTERVAL_TSK_BATT / SYS_INTERVAL_TICK ); + } + else + { + set_bit( 0, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY ); + set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_DISC ); + chg_led_override = 0; + } + } } } @@ -147,16 +166,32 @@ void tsk_batt( ) // 充電 // - // →割り込み。miscの中でよろしくやってくれている。 - if( !BT_IN_CHG_n ) + // →割り込み。 { - set_bit( 1, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); - LED_CHARGE = 1; - } - else - { - set_bit( 0, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); - LED_CHARGE = 0; + static u8 anti_chatter; + u8 temp_CHARGE; + + temp_CHARGE = !BT_IN_CHG_n; // volatileのため。このピンはチャタらない。 + + if( !temp_CHARGE ) + { + anti_chatter = 0; + set_bit( 0, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); // set_bitのみ。 + /// 割り込みはmiscが引き受ける + LED_CHARGE = 0; + } + else + { + if( anti_chatter < 4 ) // 電池無しでアダプタさして、電極をさわさわ + { // すると充電LEDががさがさするので + anti_chatter++; + } + else + { + set_bit( 1, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); + LED_CHARGE = 1; + } + } } if( chg_led_override != 0 ){ // 気がつく人いるかな…？ @@ -165,7 +200,8 @@ void tsk_batt( ) } // 電池残量 // - if( system_status.pwr_state == ON ) + if(( system_status.pwr_state == ON )|| + ( system_status.pwr_state == SLEEP )) { BT_get_left(); } @@ -249,7 +285,6 @@ void BT_model_detect() } else if( raw_adc_temperature < 4 ) { - u8 temp; // 白箱 // system_status.model = MODEL_SHIROBAKO; @@ -605,37 +640,56 @@ void BT_get_left(){ // 残量で割り込み。急激に減ると飛ぶことがある // { - static u8 bt_remain_old; + static u8 bt_remain_old_ctr; - if( (( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO ) && ( BATT_TH_LO < bt_remain_old ))|| - (( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_EMPTY ) && ( BATT_TH_EMPTY < bt_remain_old ))|| - (( vreg_ctr[ VREG_C_BT_REMAIN ] == 0 ) && ( bt_remain_old != 0 )) ) + if( (( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO ) && ( BATT_TH_LO < bt_remain_old_ctr ))|| + (( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_EMPTY ) && ( BATT_TH_EMPTY < bt_remain_old_ctr ))|| + (( vreg_ctr[ VREG_C_BT_REMAIN ] == 0 ) && ( bt_remain_old_ctr != 0 )) ) { set_irq( VREG_C_IRQ1, REG_BIT_BT_REMAIN ); } - bt_remain_old = vreg_ctr[ VREG_C_BT_REMAIN ]; if( system_status.pwr_state == OFF_TRIG ) { - bt_remain_old = 100; + bt_remain_old_ctr = 100; } + + // twlに教えてあげる + if( bt_remain_old_ctr != vreg_ctr[ VREG_C_BT_REMAIN ] ) + { + 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 ] > 50 ){ + 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 ] = 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; + } + } + + bt_remain_old_ctr = vreg_ctr[ VREG_C_BT_REMAIN ]; } // PMIC-NTRに電池残量を教えてあげる { - static u8 bt_remain_old; + static u8 bt_remain_old_ntr; u8 flag; if( system_status.pwr_state != ON ) { - bt_remain_old = NTR_PM_BT_ENOUGH; + bt_remain_old_ntr = NTR_PM_BT_ENOUGH; } flag = (( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO )? NTR_PM_BT_EMPTY: NTR_PM_BT_ENOUGH ); // 1で電池切れ - if( bt_remain_old != flag ) + if( bt_remain_old_ntr != flag ) { - bt_remain_old = flag; + bt_remain_old_ntr = flag; iic_mcu_write_a_byte_codec( CODEC_REG_BT, flag ); } } diff --git a/trunk/self_flash.c b/trunk/self_flash.c index 5e9a470..dc8ef2c 100644 --- a/trunk/self_flash.c +++ b/trunk/self_flash.c @@ -36,7 +36,7 @@ const u8 fsl_low_voltage_u08 = 1; #define INACTIVE_BOOTSECT_TOP 4 #define FIRM_TOP 8 #define FIRM_SIZE 12 -#define UPDATE_BLOCK_LAST ( FIRM_TOP + FIRM_SIZE - 1 ) +#define ALTERNATE_FIRM_BLOCK_TOP ( FIRM_TOP + FIRM_SIZE ) #ifdef _MCU_BSR_ @@ -116,13 +116,13 @@ void firm_update( ) 0x5000 - 0x7FFF (ブロック 20 - 31) にコピー */ firm_duplicate( FIRM_TOP, - UPDATE_BLOCK_LAST +1 ); + ALTERNATE_FIRM_BLOCK_TOP ); // 全ブロック削除 ///////////////////////////////////// // 電源断を判定するため、最初に全クラスタ消去する //（新ファームが書かれるところに残ってる、以前のファームのフッタを消したい） for( target_block = INACTIVE_BOOTSECT_TOP; - target_block <= UPDATE_BLOCK_LAST; + target_block < ALTERNATE_FIRM_BLOCK_TOP; target_block += 1 ) { FSL_Erase( target_block ); @@ -132,7 +132,7 @@ void firm_update( ) // ●ストップコンディションが来るまで続ける // ●終わったら、スタートアップルーチンに飛ぶ for( target_block = INACTIVE_BOOTSECT_TOP; - target_block <= UPDATE_BLOCK_LAST; + target_block < ALTERNATE_FIRM_BLOCK_TOP; target_block += 1 ) { /* すでに消してある。でないと中断されたとき終了してるか判別出来ない @@ -173,32 +173,24 @@ void firm_update( ) != FSL_OK ) { + alert(1); // 書き込み後のチェックエラー - while(1){} // リストア - firm_duplicate( UPDATE_BLOCK_LAST +1, FIRM_TOP ); - FSL_ForceReset(); + firm_duplicate( ALTERNATE_FIRM_BLOCK_TOP, FIRM_TOP ); + FSL_SwapBootCluster( ); // リセットせずに頭から。FSL_Closeは不要 // 戻ってこない // } } // 1ブロック書き込み完了。内部ベリファイを行う -#ifdef _DBG_LED_PRINT_ - P1.5 = 1; - DBG_LED_on; -#endif if( FSL_IVerify( target_block ) != FSL_OK ){ - while(1){} + alert(2); // 再度消去→書き込み ベリファイを繰り返すだけじゃダメでした... todo…？ // リストア - firm_duplicate( UPDATE_BLOCK_LAST +1, FIRM_TOP ); - FSL_ForceReset(); + firm_duplicate( ALTERNATE_FIRM_BLOCK_TOP, FIRM_TOP ); + FSL_SwapBootCluster( ); // リセットせずに頭から。FSL_Closeは不要 // 戻ってこない // } -#ifdef _DBG_LED_PRINT_ - DBG_LED_off; - P1.5 = 0; -#endif if( SPD ) { @@ -222,17 +214,16 @@ void firm_update( ) { // OK! FSL_InvertBootFlag( ); - FSL_SwapBootCluster( ); // リセットせずに頭から。FSL_Closeは不要 - // 戻ってこない // } else { // データ(マジックナンバーしか見てない)エラー // リストア - firm_duplicate( UPDATE_BLOCK_LAST, FIRM_TOP ); - FSL_ForceReset(); // リセット - // 戻ってこない // + alert(3); + firm_duplicate( ALTERNATE_FIRM_BLOCK_TOP, FIRM_TOP ); } + FSL_SwapBootCluster( ); // リセットせずに頭から。FSL_Closeは不要 + // 戻ってこない // } } @@ -352,7 +343,7 @@ void firm_restore( ) 0x4800 - 0x7FFF (ブロック 18 - 27) から 0x2000 - 0x47FF (ブロック 8 - 17) へコピー */ - if( firm_duplicate( UPDATE_BLOCK_LAST +1, FIRM_TOP ) != ERR_SUCCESS ) + if( firm_duplicate( ALTERNATE_FIRM_BLOCK_TOP, FIRM_TOP ) != ERR_SUCCESS ) { alert(2); } @@ -501,7 +492,6 @@ static err firm_duplicate( u8 block_src, { // リカバリはリブート時 todo // led_print(7); -// while(1){} return ( ERR_ERR ); } } diff --git a/trunk/task_misc.c b/trunk/task_misc.c index d7d4400..67cf055 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -84,9 +84,9 @@ void tsk_misc( ) BSRマイコンはaccero.cで割り込みルーチンからタスク登録します。 ======================================================== */ // 割り込みの取りこぼし？ - if( ( vreg_ctr[VREG_C_ACC_CONFIG] & 0x03 ) != 0x00 ) +// if( ( vreg_ctr[VREG_C_ACC_CONFIG] & 0x03 ) != 0x00 ) { - if( ACC_VALID == 1 ) + if( ACC_VALID ) { if( renge_task_immed_add( tsk_cbk_accero ) == ERR_SUCCESS ){ NOP(); @@ -273,7 +273,14 @@ task_status_immed tski_mcu_info_read() #ifdef _DBG_FORCE_JIKKI_ IICA = MODEL_JIKKI; #else - IICA = (u8)system_status.model; + if( !system_status.fake_jikki ) + { + IICA = (u8)system_status.model; + } + else + { + IICA = MODEL_JIKKI; + } #endif break; diff --git a/trunk/task_status.c b/trunk/task_status.c index e054bec..1c81ceb 100644 --- a/trunk/task_status.c +++ b/trunk/task_status.c @@ -3,7 +3,7 @@ #pragma HALT #pragma STOP -#include "incs.h" +#include "incs_loader.h" #include "renge\renge.h" #include "pm.h" diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index 3ae33f3..2d401b4 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -18,7 +18,9 @@ CTR MCU I2C extern u8 mcu_info_read(); // task_misc.c -extern u8 iic_burst_state; + +extern u8 iic_burst_state; // 特殊バーストアクセスする時のカウンタ +extern bit info_led_pattern_updated; // お知らせLEDのパターンを先頭に戻す @@ -78,6 +80,8 @@ void vreg_ctr_reset( ) vreg_ctr[ VREG_C_LED_TUNE ] = 0; vreg_ctr[ VREG_C_VOL_DIGITAL ] = 0x20; vreg_ctr[ VREG_C_VOL_OPTION ] = 0; + vreg_ctr[ VREG_C_VOL_CAL_MIN ] = 0x36; + vreg_ctr[ VREG_C_VOL_CAL_MAX ] = 0xFF - 0x36; { u8 i; for( i = 0; i < sizeof( uni_info_LED ); i++ ) @@ -195,6 +199,10 @@ void vreg_ctr_write( u8 adrs, u8 data ) { info_LED.bindata[ iic_burst_state ] = data; iic_burst_state += 1; + if( iic_burst_state > 4 ) // パターンを1文字でも書いた + { + info_led_pattern_updated = 1; + } } /// 非同期で動いているためここでは書かない。 diff --git a/trunk/vreg_ctr.h b/trunk/vreg_ctr.h index 202f3d0..255d1a4 100644 --- a/trunk/vreg_ctr.h +++ b/trunk/vreg_ctr.h @@ -192,6 +192,7 @@ enum VREG_C_ADRS VREG_C_OFF_DELAY = 0x24, VREG_C_VOL_DIGITAL = 0x25, VREG_C_VOL_OPTION, + VREG_C_VOL_ADC_RAW, VREG_C_LED_BRIGHT = 0x28, VREG_C_LED_POW, @@ -242,6 +243,9 @@ enum VREG_C_ADRS VREG_C_ACC_HOSU_HOUR_BOUNDARY = 0x50, VREG_C_ACC_HOSU_HOUR_BOUNDARY_SEC, + VREG_C_VOL_CAL_MIN = 0x58, + VREG_C_VOL_CAL_MAX, + VREG_C_ENDMARK_ }; diff --git a/trunk/vreg_twl.c b/trunk/vreg_twl.c index 0eba586..4678039 100644 --- a/trunk/vreg_twl.c +++ b/trunk/vreg_twl.c @@ -112,6 +112,8 @@ u8 vreg_twl_read( u8 phy_adrs ) switch( phy_adrs ){ // 10%以下で赤になる case( REG_TWL_INT_ADRS_POWER_INFO ): + /* + get_batt_left()に引っ越し 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 ] > 50 ){ @@ -125,6 +127,7 @@ u8 vreg_twl_read( u8 phy_adrs ) }else{ vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x00; } + */ return( vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] | ( !PM_EXTDC_n ? 0x80: 0x00 ) ); // アダプタbit(アダプタ有無) case( REG_TWL_INT_ADRS_IRQ ): diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index d5ae06d..8408286 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,18 +1,25 @@ 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(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 +pm.c(90) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(174) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(261) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +pm.c(481) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(581) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(582) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(688) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(724) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(762) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(846) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(854) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1009) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +pm.c(1076) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1079) : 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 @@ -23,14 +30,149 @@ 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 23 warning(s) found. +Compilation complete, 0 error(s) and 24 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\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 +"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(244) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(249) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(311) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(370) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(396) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(577) : 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(114) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(123) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(132) : 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(146) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(153) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(163) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(166) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(168) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(169) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(257) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(262) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(267) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(297) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(313) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(423) : 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(126) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(132) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +adc.c(213) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(240) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(332) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(356) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +adc.c(375) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(453) : CC78K0R warning W0745: Expected function prototype +adc.c(482) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(487) : 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(211) : CC78K0R warning W0401: Conversion may lose significant digits +self_flash.c(250) : CC78K0R warning W0401: Conversion may lose significant digits +self_flash.c(251) : 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(312) : 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 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. @@ -40,4 +182,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 23 +Build Total error(s) : 0 Total warning(s) : 81 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 3b6e5c6..a45c114 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -22,7 +22,7 @@ SubClock=None [Mapping] Count=0 [Main] -Geometry=-1211, 40, 1200, 882 +Geometry=92, 176, 1200, 882 Window=Max MDI_MAX=OFF Button=ON @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=27, 151, 757, 775 +Geometry=406, 215, 757, 775 Window=Normal -DispStart=95 -CaretPos=138,0 +DispStart=70 +CaretPos=117,0 Mode=Normal DispFile= Address1= @@ -139,26 +139,10 @@ SaveRange=Screen SaveStart= SaveEnd= Accumulative=ON -[Source1] -Geometry=50, 50, 757, 775 -Window=Normal -DispStart=439 -CaretPos=440,0 -Mode=Normal -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 +Geometry=280, 96, 968, 626 Window=Hide -DispStart=864252928 +DispStart=864531456 CaretPos=0,0 Address1= Address2= @@ -273,7 +257,7 @@ Boundary=13762687 Mode=Proper [Sfr] Geometry=39, -4, 596, 915 -Window=Normal +Window=Hide Address1= Address2= Address3= @@ -830,7 +814,7 @@ L529=IICWL1 L530=IICWH1 L531=SVA1 [Local Variable] -Geometry=909, 497, 353, 199 +Geometry=1151, 707, 353, 199 Window=Normal Boundary=11468964 Mode=Proper @@ -910,17 +894,7 @@ Manager=ON Sort by=Unsort Detail=OFF Last Name= -Name0=vreg_003 -Status0=W -Access Size0=B -Address Range0=EQ -Address0= - <> -Mask Address0=00000000 -Data Range0=NC -Data0=<00000000> - <00000000> -Mask Data0=FFFFFFFF -Pass0=0001 -Count=1 +Count=0 [Event Link] Geometry=0, 0, 0, 0 Window=Hide @@ -936,10 +910,7 @@ Manager=ON Sort by=Unsort Detail=OFF Last Name= -Name0=vreg_004 -Element0=vreg_003 -Set0=OFF -Count=1 +Count=0 [Trace] Geometry=0, 0, 0, 0 Window=Hide @@ -986,76 +957,56 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=835, -4, 441, 502 +Geometry=1145, 20, 441, 702 Window=Normal Boundary=18088086 -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 +0=.info_LED,.,N,A,+,1 +1=.vreg_ctr[9],P,N,A,+,1 +2=.TDR06,P,S,A,+,1 +3=.LED_dim_status_sleep,.,N,A,+,1 +4=.pu20,B,S,A,+,1 +5=.work_vr_vol,.,N,A,+,1 +6=.vol_data_ctr_tmp,P,N,A,+,1 +7=.vol_data_ctr,P,N,A,+,1 +8=.last_modifyer,P,N,A,+,1 +9=.sent_index,P,N,A,+,1 +10=.vreg_ctr,P,N,A,+,1 +11=.P1.5,P,S,A,+,1 +12=.TDR07,P,S,A,+,1 +13=.info_led_override,P,N,A,+,1 +14=.system_status,.,N,A,+,1 +15=.battery_manufacturer,P,N,A,+,1 +Line=16 [Quick Watch] -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 +0=stat,P,A,1 +1=TDR06,P,A,1 +2=TDR03,P,A,1 +3=TDR01,P,A,1 +4=TDR07,P,A,1 +5=TDR05,P,A,1 +6=TDR02,P,A,1 +7=P4.,P,A,1 +8=P4.2,P,A,1 +9=P7.5,P,A,1 +10=PM4.2,P,A,1 +11=vreg_twl,P,A,1 +12=vreg_ctr[35],P,A,1 +13=vreg_ctr[11],P,A,1 +14=vreg_ctr[5],P,A,1 +15=info_LED,P,A,1 [Software Break] -Geometry=869, 649, 445, 260 +Geometry=1049, 744, 445, 260 Window=Normal Width=150 30 200 100 -Name0=Swb00002 -Address0=adc.c#_adc_filter+0x9d +Name0=Swb00001 +Address0=pm.c#_tsk_batt+0xd9 Window0=ASM Status0=ON Name1=Swb00003 -Address1=adc.c#_adc_filter+0x84 +Address1=pm.c#_tsk_batt+0xcd Window1=ASM Status1=ON -Name2=Swb00004 -Address2=sw.c#_tsk_sw+0xae -Window2=ASM -Status2=ON -Count=3 +Count=2 [Reset] Debugger=ON Symbol=OFF diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 173db99..fcbd74f 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -756,37 +756,6 @@ 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 @@ -871,7 +840,7 @@ G=1 E=0 E0=flash.elk E1=a.elk -GO=1 +GO=0 GOValue=85 GOStart=FC00 GOSizeValue=1024 @@ -1038,6 +1007,37 @@ 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 76f4ef9..b4304ce 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,23 +1,25 @@ [ProjectManager] FrameMax=1 -FrameX=267 -FrameY=20 +FrameX=0 +FrameY=55 FrameCX=1299 FrameCY=1044 -OpenFile1=ProjectWindow +OpenFile1=task_sys.c,0,220,220,1464,977,0,137,31,0 +OpenFile2=adc.c,0,264,264,1508,1021,0,423,5,0 +OpenFile3=task_debug.c,0,363,341,1342,978,30,26,42,0 +OpenFile4=magic.c,0,527,528,1771,1285,0,3,0,0 +OpenFile5=vreg_ctr.c,0,447,377,1691,1134,9,197,9,0 +OpenFile6=self_flash.c,0,440,170,1684,927,0,133,0,0 +OpenFile7=accero.c,0,264,264,1243,901,0,160,0,0 +OpenFile8=pedo_alg_thre_det2.c,0,220,220,1188,845,0,434,0,0 +OpenFile9=ProjectWindow PrjPos=0,2,754,3,253 -OpenFile2=task_sys.c,0,220,220,1464,977,0,137,31,0 -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 -OpenFile12=config.h,0,88,228,1332,985,18,42,18,0 +OpenFile10=config.h,0,53,125,1297,882,29,17,29,0 +OpenFile11=pm.h,0,242,242,1486,999,14,107,14,0 +OpenFile12=pm.c,0,335,300,1579,1057,15,156,0,0 +OpenFile13=OutputWindow +OutputPos=0,73,1018,56,1365 +OpenFile14=incs.h,0,0,0,968,625,11,1,11,0 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 7b53443..e374a62 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -12,7 +12,7 @@ T=4c3fc60e 8=reboot.h 9=magic.h [pm.c] -T=4c465d07 +T=4c5769ce 1=incs.h 2=adc.h 3=led.h @@ -36,7 +36,7 @@ T=4c3c0229 7=adc.h 8=pool.h [magic.c] -T=4c4e9b2a +T=4c527b9d 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=4c3ecd56 +T=4c4ff708 1=incs.h 2=led.h [rtc.c] T=4c3db81b 1=incs.h [vreg_ctr.c] -T=4c3fc4a7 +T=4c510269 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -70,14 +70,14 @@ T=4c3fc4a7 8=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 9=fsl_user.h [vreg_twl.c] -T=4c465cb6 +T=4c4fe78d 1=incs.h 2=jhl_defs.h 3=led.h 4=vreg_twl.h 5=vreg_ctr.h [adc.c] -T=4c48ff0b +T=4c5230b3 1=incs.h 2=adc.h 3=pm.h @@ -93,12 +93,12 @@ T=4c318e0f 6=user_define.h 7=bsr_system.h [accero.c] -T=4c3d767c +T=4c525844 1=config.h 2=incs.h 3=..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] -T=4c3f9f78 +T=4c502289 1=incs_loader.h 2=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 3=fsl_user.h @@ -107,7 +107,7 @@ T=4c3f9f78 6=magic.h 7=pm.h [sw.c] -T=4c3ec9e4 +T=4c4f8e06 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -122,7 +122,7 @@ T=4c4698f9 3=pm.h 4=accero.h [task_misc.c] -T=4c4e424f +T=4c525842 1=incs.h 2=renge\renge.h 3=pm.h @@ -154,8 +154,8 @@ T=4c3fdc7e T=4c312edd 1=config.h [task_status.c] -T=4c2aacdb -1=incs.h +T=4c4fe85a +1=incs_loader.h 2=renge\renge.h 3=pm.h 4=accero.h @@ -176,11 +176,11 @@ T=4c119cde T=4c075832 1=config.h [config.h] -T=4c4ea335 +T=4c50d4a9 [user_define.h] T=4c3d838c [bsr_system.h] -T=4c3ec384 +T=4c4fc515 [renge\renge.h] T=4c318e0f 1=renge\renge_defs.h @@ -191,7 +191,7 @@ T=4c073c5a T=4c284e89 1=renge\renge_defs.h [vreg_ctr.h] -T=4c3e964e +T=4c523053 1=config.h [vreg_twl.h] T=4c072cf1