diff --git a/trunk/accero.c b/trunk/accero.c index e0510c6..66d483d 100644 --- a/trunk/accero.c +++ b/trunk/accero.c @@ -172,28 +172,12 @@ task_status_immed acc_hosu_set( ) if( iic_mcu_result == ERR_NOSLAVE ) { vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_ACCERO_ERR; -#ifdef _MCU_BSR_ -// PMK23 = 1; -#endif return ( ERR_FINISED ); // とりあえず、タスクは削除しなくてはならない }else{ vreg_ctr[ VREG_C_STATUS_1 ] &= ~REG_BIT_ACCERO_ERR; } - - + str_send_buf[1] = 0x00; // ctrl2 HPF:normal, filterd, HPF for IRQ : dis/dis, HPF coeff:norm -#ifdef _MODEL_WM0_ -# ifdef _MODEL_WM0_TEG2_CTRC_ - str_send_buf[2] = 0x02; // 回路が一部違う -# else - - str_send_buf[2] = 0x10; // 3 IRQ pol :Active HI, Drive:Pushpull, - /// IRQ2flg latch: auto clear after read, IRQ2 conf: IRQ( fall,shock,...) - /// 1 : auto clear after read, conf: data ready -# endif - -#else -# ifdef _MODEL_CTR_ /* if( system_status.model == MODEL_TS_BOARD ) { @@ -206,32 +190,20 @@ if( system_status.model == MODEL_TS_BOARD ) str_send_buf[2] = 0x10; // 3 IRQ pol :Active HI, Drive:Pushpull, } */ - str_send_buf[2] = 0x12; // 面倒なので両方...。 -# else - // TS( type T ) - str_send_buf[2] = 0x02; // 3 IRQ pol :Active HI, Drive:Pushpull, - /// IRQ2flg latch: auto clear after read, IRQ2 conf: IRQ( fall,shock,...) - /// 1 : auto clear after read, conf: data ready -# endif -#endif - - str_send_buf[3] = 0x80; // ctrl3 block update:enable, MSB first, scale: +-2G(default), selftest: dis + str_send_buf[2] = 0b00010010; // 面倒なので両方...。 + str_send_buf[3] = 0x80; // ctrl3 block update:enable, MSB first, scale: +-2G(default), selftest: dis if( ( vreg_ctr[VREG_C_ACC_CONFIG] & ( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ ) ) == 0 ) { -#ifdef _MCU_BSR_ - PMK23 = 1; -#endif + PMK23 = 1; // 完全停止 str_send_buf[0] = ( ACC_BITS_PM_PDN << ACC_bP_PM0 | 0 << ACC_bP_DR0 | ACC_BITS_ALL_AXIS_ON ); } else { -#ifdef _MCU_BSR_ PMK23 = 0; -#endif // 100Hz 自動取り込み str_send_buf[0] = ( ACC_BITS_PM_NORM << ACC_bP_PM0 diff --git a/trunk/adc.c b/trunk/adc.c index 0dc0c57..68f7480 100644 --- a/trunk/adc.c +++ b/trunk/adc.c @@ -83,7 +83,7 @@ void tsk_adc( ) static u8 sndvol_codec; static u8 bt_temp_old; -#if 0 +#ifdef _DEBUG_CODEC_POLLING_ // debug { static bit interval; @@ -95,31 +95,9 @@ void tsk_adc( ) return; } } -#endif - -#if 0 - { - static u16 loop; - - if( system_status.pwr_state == ON ) - { - loop++; - if( loop == 499 ){ - } - else if( loop == 500 ){ - loop = 0; - } - else - { - vol_written_ctr = slider_to_codec[ vol_data_ctr ]; - } - } - renge_task_immed_add( tski_vol_update ); - } -//*/ -#endif renge_task_immed_add( tski_vol_update ); // T = 2ms polling +#endif if( task_interval-- != 0 ) { @@ -149,7 +127,7 @@ void tsk_adc( ) { vol_changed_by_ctr = 1; vol_old = vol_data_ctr; - // renge_task_immed_add( tski_vol_update ); 2ms後でいいでしょう... + renge_task_immed_add( tski_vol_update ); // 2ms後でいいでしょう... } } @@ -197,7 +175,7 @@ task_status_immed tski_vol_update() } // どの音量にするの？ // - if( vreg_ctr[ VREG_C_VOL_OPTION ] & REG_BIT_VOL_FORCE_SLIDER ) + if( vreg_ctr[ VREG_C_VOL_OPTION ] & ( REG_BIT_VOL_FORCE_SLIDER | REG_BIT_VOL_UPDATE_TO_SLIDER ) ) { // 最優先 スライダに上書き sent_index = vol_data_ctr; @@ -263,17 +241,12 @@ task_status_immed tski_vol_update() if( vreg_ctr[ VREG_C_VOL_OPTION ] & REG_BIT_VOL_BY_SPI ) { return( ERR_FINISED ); + // by SPI ならここまででおしまい // } - // by SPI ならここまででおしまい // - - // debug todo - iic_mcu_read_a_byte( IIC_SLA_CODEC, CODEC_REG_VOL ); // codecに伝える - iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_VOL, slider_to_codec[ sent_index ] ); - - // debug todo - iic_mcu_read_a_byte( IIC_SLA_CODEC, CODEC_REG_VOL ); + /// 同値でも書く + iic_mcu_write_a_byte_codec( CODEC_REG_VOL, slider_to_codec[ sent_index ] ); // set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE ); // 割り込み廃止 return( ERR_FINISED ); @@ -391,7 +364,6 @@ case ( ADC_SEL_AMB_BRIT ): // if( ADS < ADC_SEL_BATT_DET ) { ADS += 1; // 次のチャンネル - ADIF = 0; // ←これをしないと、いっこ前のチャンネルのデータの完了で直後に割り込む可能性がある } else { @@ -399,6 +371,7 @@ case ( ADC_SEL_AMB_BRIT ): // adc_updated = 1; index = ( index == 2 ) ? 0 : ( index + 1 ); // ノイズ取りの配列インデックス } + ADIF = 0; // ←これをしないと、いっこ前のチャンネルのデータの完了で直後に割り込む可能性がある } diff --git a/trunk/bsr.hex b/trunk/bsr.hex index a311d3e..b257d8d 100644 --- a/trunk/bsr.hex +++ b/trunk/bsr.hex @@ -1,13 +1,13 @@ -:020000000C0DE5 +:02000000750C7D :02000200FFFFFE -:0400100079497F4962 -:02001C003F4B58 -:02002400AB4BE4 -:02002A00184C70 -:08003400284DE54C234D5A4E06 -:02004A008149EA -:02005A00BC499F -:02006200DB4D74 +:04001000584A5E4AA2 +:02001C001E4C78 +:020024008A4C04 +:02002A00F74C91 +:08003400074EC44D024E394F86 +:02004A00604A0A +:02005A009B4ABF +:02006200BA4E94 :0400C000FEFBFF85BF :0A00C400FFFFFFFFFFFFFFFFFFFF3C :0A00CE00FFFFFFFFFFFFFFFFFFFF32 @@ -19,11 +19,11 @@ :10012800EF01E6600D9B8C01318E12490021728C23 :1001380001318E04F64F14896142DF03F6EF01E6C0 :10014800600D9B615901EFB440F64FFF61F86159AA -:10015800008BD1DD06FDBE01FDC707CEABACC736AF +:10015800008BD1DD06FDBE01FD2E07CEABACC73648 :10016800F00071F4C6DE0671301EF9EF2A8EA89CE5 :10017800018C015C90D1DD118C015C10D161E871BA -:1001880010D4FB71301EF9EF0B8C015C01D161E8D2 -:100198007120D4FBFDBE01FDB802EDDD00C0C6D75D +:1001880010D6FB71301EF9EF0B8C015C01D161E8D0 +:100198007120D6FBFDBE01FDB802EDDD00C0C6D75B :1001A800717BFACEA010CEA180E5F300CEA408F5AD :1001B800AAFFF5A9FFD78F1EF931350ACD0003CD67 :1001C8000307F40EEF07F400CD0306F40ECF110574 @@ -41,11 +41,11 @@ :100288000105F55005F5BCFFF5BDFFD7C7C1C1FB9A :10029800F8FFCEABAC8C02D1DD12616902305C0391 :1002A800BBF6614900DDEE618900EFF51004C6D7A1 -:1002B800FDD005FD523BFD4105717AFAFD8524F517 +:1002B800FD1F33FD453CFD4105717AFAFD9124F59A :1002C8001CF98F1EF93135175003C15084FD4A03BC -:1002D800C0625C01D161E8CF1CF902CFDDFB64FD8F -:1002E800F632FD0103FD3047713222712BE7CEABA8 -:1002F800ACFD553B61EDEFF6D731020403F6EF0193 +:1002D800C0625C01D161E8CF1CF902CFDFFB64FD8D +:1002E800FF33FD0103FD0F48713222712BE7CEABBE +:1002F800ACFD483C61EDEFF6D731020403F6EF019F :10030800E660341EF9718C8971899931120403F6FB :10031800EF01E660341EF9718C89719999D7D7C7B6 :10032800F616FD4105717BFA31522005715220EF16 @@ -90,176 +90,166 @@ :10059800EFFAFD1E05AF0401BF0C01715320716213 :1005A80020D731542002EFFAFDF504713A25713A4B :1005B800235A0EFC713305713B25713303713B23BC -:1005C8007128F000716320D7C736F00071F4DC2978 -:1005D8007170F000CE9D08CE9EC0CE9F80F594FF2E -:1005E800F593FFF592FFE597FFE596FFCE9505CECB -:1005F8009810CE9C7F7100D4FB711BE3712BE371C3 -:100608001AE7712BE7717A9D710A9E31929E02EF6B -:10061800FA710B9E713321714321715321C6D7C7DB -:100628003132211E713221710A9E31929E02EFFAF7 -:100638003402FC3692FF52078B99A5A792DFF97115 -:100648000B9EC6D7C788061631422115714221C7AD -:1006580034CAFB3092FF1652078B99A5A792DFF98F -:10066800C666736718CAFBC6D7C7713321314421E0 -:100678001E714321710A9E31929E02EFFA3492FF55 -:1006880036CAFB52078B99A5A792DFF9710B9E31E9 -:10069800542113717B9E8F0AFC9E9A8F0BFC9E9BA4 -:1006A800714321717A9EC6D7C72006FBF8FFFDC7A4 -:1006B800095014C15008FD0709C0CC05048C054C2D -:1006C80014DE0C8C05318EFDEE09615905EFEECC78 -:1006D80005048C054C1461C8ED7607CC04008C0425 -:1006E8004C04DE6FC73641057184C6DC663022F9DA -:1006F800BC02F6BB31B2D10EC73641057184C6DCE7 -:1007080005CEABACEFEE713BD1AC02148F4005992E -:1007180071505005617902617900F0E1614900DDAD -:1007280009C73641057184C6DECA5040C18C0531FF -:100738008E31AD128C04318E318D03BDD831FFBDA1 -:10074800DADADAADD8FDBA0CC0D261E8EFFE615949 -:1007580004EF8B8C05318EFDF209D261E8EFFEC7FC -:100768003641057184C6DC06615905EDDA0671600B -:100778005005CC0200CC03008C034C09DE248C030A -:10078800318E1249F61F728C03318E04F64F14898C -:100798006142DF03F6EF01E6600E029C0261590335 -:1007A800EFD68C02D1DF08FD780BFD8A0CEF0C50D8 -:1007B80008C15013FD0709C0FD770B1006C6D7C73F -:1007C8002004FBF8FF715B21CC0100F6BC02AC02EF -:1007D800440900DE3EAC0204F61F14410011897280 -:1007E800AC020C5114896142DF03F6EF01E6600E9A -:1007F800019C01AC021249005172AC0204F67F144C -:10080800896142DF03F6EF01E6600E019C01617920 -:1008180002EFBB40F67FFF61F86159018C01D1619D -:10082800F8EDD108CC0100717AFAFD410571130089 -:10083800711B20710303710205E0C15003C150848C -:10084800FDE60310045013FD9402500FC1E0C1509F -:1008580084FDE6031004CEABAC6159018C0191DD37 -:10086800068C014C03DF03E6EF01F66061FB715172 -:10087800018C014C0861F8CC010031320705A066F3 -:10088800FCEF03F566FC4066FC11DC11F566FCF034 -:10089800C15003C15084FDE6031004EF12E6BC0208 -:1008A800F6614902DDB000000000617902EFF1CE87 -:1008B8003708CBE4FFFFCBE6FFF7CED4FFCF3700F6 -:1008C80008F5120561FDF5ABFFFDC709D25008C157 -:1008D8005014FD0709C0D2FD780BD2FD8A0C100414 -:1008E800C6D73184BD02EFFA717BBDCBE4FFFFCBE5 -:1008F800E6FFFFCBD4FFFF717ABED7717BBED7C7A7 -:10090800C1200AFBF8FF8C0A318E31ADC1317B9DC5 -:10091800D4C0BC048DD49C068C129C098C12318ED8 -:10092800040C00128C09318EBDD813FD490F61C823 -:10093800EDC209CEABAC8C09318EFDEA09D2DD09D6 -:100948008C09318EFDEE09EFEDCC08008C084C04C3 -:10095800DE56CEABACF6BC023022F9BBAC04148C2C -:10096800069EFD118972AB146299AC04A1BC0461A6 -:100978007900617902F0E1614902DFE05040C18C01 -:1009880009318E31AD128C08318E318D03BDD831CD -:10099800FFBDDADADAADD8FDBA0CC0D2DD05FD0349 -:1009A80009EFFE615908EFA48C09318EFDF209D2D6 -:1009B80061E8EFFE615909ED2409F2100CC6D7C7AA -:1009C800717B9D717BFAFDEA083022F9FD9D0AFDD5 -:1009D800280AC6D7FDC709FD8A0CFD770BFD030958 -:0209E800F2D744 -:1009EA005208EF065203EF025206FEE600FE1B0013 -:1009FA00DC16089F03088F0408089F040862FE2477 -:100A0A0000089F0408EEBF00EEBA00C1C514410EEB -:100A1A0011D9D0FF118FD1FF312E45C4C0D7F23181 -:100A2A00A2C401E2D79DE261DD4C09DF12717BFAB3 -:100A3A00C18F06089F51FDC0CF060800EE2700317E -:100A4A00F2FA04CF0608004C00DF05D50008DD16CF -:100A5A0061DD717BFAD50608DD0ACDE31F61CD6140 -:100A6A00CDEE160061CDFED40061FFFE9A00FCF8BF -:100A7A00FF0EFEB20061CDFED5004C09DF0EC18F1C -:100A8A0006086F51FD9F0608C0EE0400CF06080055 -:100A9A00F8E3D75200EF025202FE3700CF50FD00B2 -:100AAA00CF060800BF0408C716629F00084100115C -:100ABA008F6C239B4100118F6D239F0108C6510043 -:100ACA00FE62FFEF025205CF060800C1510CFE0A72 -:100ADA0000C0D7C1511DFE0200C0D761DD717BFA8B -:100AEA0070CEC0A59EC47CFF9EC4609EC461CDD753 -:100AFA0061DD717BFAC18EC45C1BFED6FFCF06088E -:100B0A0001FED7FFC061CDD731F2FA1AC1AEE4BFF8 -:100B1A0042FDAEE6BF44FDAED4BF46FD30FFFFBE88 -:100B2A00E4BEE6BED4C0D731F2FA11C1AF42FDBE6F -:100B3A00E4AF44FDBEE6AF46FDBED4C0D7C1BF4850 -:100B4A00FD13BF4AFD15BF4CFD17BF4EFDC0D7AF01 -:100B5A0048FDDB4AFDEB4CFDFB4EFDD7534B3052B3 -:100B6A005430324E323030475631323000FFC150A5 -:100B7A00FEFEAB0061DD717BFACF060800FE0A00BB -:100B8A00FEA4FF61CDF8E3EECF00C7FB0408BF4225 -:100B9A00FD8FC0009C05C5C337040600BF44FD3560 -:100BAA0036DC0B300000522BFE6600C2C4C6308A07 -:100BBA000BB800300000B8022004AF44FDB8003082 -:100BCA000F00B802AF42FD61FF520AFE3AFFECF88D -:100BDA00FF0E717BFAC1C7FB04088C05C65C80FE58 -:100BEA000200C0D761DD717BFA70CFC0FFA59FC03C -:100BFA00007CFF9FC000609FC00061CDD7618BFE63 -:100C0A00E2FF717BBE410011FB000017CEFC0061C0 -:100C1A00CB089EFDF31161C999A58392DFF7D7FE30 -:100C2A00B1FED550FDDF23C1CF0308035109FEF4FD -:100C3A00FDC0D2DF37FE3800A20408CF03080751EF -:100C4A0009FEE1FDD2B20408DF22C7FB04083183A2 -:100C5A0002C6D7C6510AFECCFD624C1FDF06CF5032 -:100C6A00FD01EF04CF50FD00C0EE5BFEC0EE55FE65 -:100C7A00C7C1FB04088B31196C0161589BC0C6D7E8 -:100C8A00717BFAFE4DFEAF0408040600C11436EE6D -:100C9A000B300000522DF3FE77FF8FC000FE2BFEB3 -:100CAA0061CF5C807C8073C0041900CEFC0F61CBDD -:100CBA00C55404EF03C55417FE18FEC7360008BB17 -:100CCA00629C0288089C03D1DD334C41DE2F70F10F -:100CDA00312DB161090033081C000851FF612A4116 -:100CEA000E118FD0FF613B118FD1FF6138DC0E8B63 -:100CFA005C03DF0964C6C4FE2BFDEECAFDC6C4EE62 -:020D0A00C3FD27 -:100D0C0061CF5100718C7109FECBF800FEFCA8017B -:100D1C0000F6BF00F953C0F693935820FEDFF9415B -:100D2C0000361A203406FDEF05118B99A7A5174440 -:100D3C005620DFF53602F93006FDEF04CC0000A793 -:100D4C0047DFF941003656203442FDEF05118B99EF -:100D5C00A7A517445620DFF53642FD3042FDEF04BF -:100D6C00CC0000A747DFF9FCD80000EFFE61DD7175 -:100D7C007BFABEF0ADD8BEF200AEF661CDD7C36142 -:100D8C00DD717BFABEF0ADD8BEF200DBF6FFADDC58 -:100D9C00BEF000AEF6BDD8AEF40312ADDABEF20072 -:100DAC00AEF661CD03BDDAC2D7C3F33174D9088373 -:100DBC00C1F626D8BDD8C031750683C312F623C23E -:100DCC00FDD70D93DF0312F623C2D7440000DD26B6 -:100DDC0061DD717BFACFE80080BEF6F6BEF4BEF2A0 -:100DEC00ADD8BEF0CFE800818FE8003103FAAEF049 -:100DFC00F5E80061CDD7B1D7C3F33174D90883C1FD -:100E0C00F626D8BDD8C0317505C312F623C2FD2510 -:100E1C000E93DF0312F623C2D7440000DD2761DDF9 -:100E2C00717BFACFE80080BEF6F6BEF4BEF2ADD808 -:100E3C00BEF0CFE800818FE8003103FAAFE000F597 -:100E4C00E80061CDD7ADD8D7C3F33174DB0F83C1C4 -:100E5C00F626D8BDD861317026DABDDAC031750DF1 -:100E6C0083C312F626DCBDDC61317023C2FD8D0E0E -:100E7C0093DF0CF626D8BDD861317026DABDDAC204 -:100E8C00D7C161686BDC6BDDC0DD2F61DD717BFA76 -:100E9C00CFE80080BEF4ADDCBEF6ADD8BEF0ADDA66 -:100EAC00BEF2CFE800818FE8003103FAAEF0BDD876 -:100EBC00AEF2BDDAF5E80061CDD7F6BDD8BDDAD714 -:100ECC008292DD2B61DD717BFACFE80080BEF0F6FB -:100EDC00BEF2BEF46208BEF6CFE800818FE80031A6 -:100EEC0003FAAFE0006072AEF0F5E80061CDD760B8 -:100EFC0072F6B1D706DABDDAADDC06D8BDD861D84A -:100F0C00A6DAD7D1DD17C1C3DAD89DD8ADDA311C3A -:100F1C0061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDCD -:100F2C001BC1C3DADA9DDAADD8311E33311E3371F1 -:100F3C00F9B4DADFF4BDD813BDDAC2C0D746D8DDB8 -:100F4C000771FF7177D971C0D746DADF08C1ADDC04 -:100F5C0046D8C0DD077177DB71FF71C0D75BDB9DB5 -:100F6C00DB605BDA9DDAADDC5BD9085BD808BDD8F9 -:100F7C00D7C3C7F3728EFDC162314C4100360020DD -:100F8C001161A072C09EFD62C6C2D7C3C7F3728E38 -:100F9C00FDC1625C0F0C000FFE00314C4100360AA3 -:0F0FAC00201161800FFE0073C09EFD63C6C2D787 -:0A0FF60032303A34313A333600004D +:1005C8007128F000716320D7C7880616FD2703D26B +:1005D800DD03E2EF38710AE650A4FD9404D2DD078A +:1005E8007153205202EF2617FDA9046770FDA90474 +:1005F800FDF50450A4FDA9045020FDA904D942FB2F +:10060800FDA904A042FBFD1E05715320F2C6D7C701 +:100618002006FBF8FFFD30095014C15008FD6E0894 +:10062800C0CC05048C054C14DE0C8C05318EFD57AE +:1006380009615905EFEECC05048C054C1461C8ED31 +:10064800DD06CC04008C044C04DE6FC7364105710E +:1006580084C6DC663022F9BC02F6BB31B2D10EC7C3 +:100668003641057184C6DC05CEABACEFEE713BD1EB +:10067800AC02148F40059971505005617902617977 +:1006880000F0E1614900DD09C73641057184C6DE25 +:10069800CA5040C18C05318E31AD128C04318E3177 +:1006A8008D03BDD831FFBDDADADAADD8FD230CC031 +:1006B800D261E8EFFE615904EF8B8C05318EFD5B4A +:1006C80009D261E8EFFEC73641057184C6DC0661D0 +:1006D8005905ED410671605005CC0200CC03008C31 +:1006E800034C09DE248C03318E1249F61F728C03E9 +:1006F800318E04F64F14896142DF03F6EF01E6609C +:100708000E029C02615903EFD68C02D1DF08FDE18D +:100718000AFDF30BEF0C5008C15013FD6E08C0FD25 +:10072800E00A1006C6D7C72004FBF8FF715B21CC8E +:100738000100F6BC02AC02440900DE3EAC0204F63D +:100748001F144100118972AC020C5114896142DFF7 +:1007580003F6EF01E6600E019C01AC02124900515C +:1007680072AC0204F67F14896142DF03F6EF01E6FA +:10077800600E019C01617902EFBB40F67FFF61F8D2 +:100788006159018C01D161F8ED3808CC0100717A0A +:10079800FAFD4105711300711B20710303710205F5 +:1007A800E0C15003C15084FDE60310045013FD94CA +:1007B80002500FC1E0C15084FDE6031004CEABAC7B +:1007C8006159018C0191DD068C014C03DF03E6EFD2 +:1007D80001F66061FB7151018C014C0861F8CC0194 +:1007E8000031320705A068FCEF03F568FC4068FC9F +:1007F80011DC11F568FCF0C15003C15084FDE6031B +:100808001004EF12E6BC02F6614902DDB0000000F8 +:1008180000617902EFF1CE3708CBE4FFFFCBE6FFAA +:10082800F7CED4FFCF370008F5120561FDF5ABFF11 +:10083800FD3009D25008C15014FD6E08C0D2FDE148 +:100848000AD2FDF30B1004C6D73184BD02EFFA714A +:100858007BBDCBE4FFFFCBE6FFFFCBD4FFFF717A74 +:10086800BED7717BBED7C7C1200AFBF8FF8C0A31FF +:100878008E31ADC1317B9DD4C0BC048DD49C068C17 +:10088800129C098C12318E040C00128C09318EBD19 +:10089800D813FDB20E61C8ED2B09CEABAC8C093173 +:1008A8008EFD5309D2DD098C09318EFD5709EFED14 +:1008B800CC08008C084C04DE57CEABACF6BC02303A +:1008C80022F9BBAC04148C069EFD118972AB14622C +:1008D80099AC04A1BC04617900617902F0E1614935 +:1008E80002DFE05040C18C09318E31AD128C0831E5 +:1008F8008E318D03BDD831FFBDDADADAADD8FD23EC +:100908000CC0D2DD06FD6A08E2EF19615908EFA3B1 +:100918008C09318EFD5B09D2DD03E2EF07615909CD +:10092800ED8B08F2100CC6D7C7717B9D717BFAFD61 +:1009380051083022F9FD060AFD9109C6D7FD300994 +:0B094800FDF30BFDE00AFD6A08F2D78A +:100953005208EF065203EF025206FEE600FE1B00AA +:10096300DC16089F03088F0408089F040862FE240E +:1009730000089F0408EEBF00EEBA00C1C514410E83 +:1009830011D9D0FF118FD1FF312E45C4C0D7F23119 +:10099300A2C401E2D79DE261DD4C09DF12717BFA4B +:1009A300C18F06089F4DFDC0CF060800EE2700311A +:1009B300F2FA04CF0608004C00DF05D50008DD1667 +:1009C30061DD717BFAD50608DD0ACDE31F61CD61D8 +:1009D300CDEE160061CDFED40061FFFE9A00FCF857 +:1009E300FF0EFEB20061CDFED5004C09DF0EC18FB4 +:1009F30006086F4DFD9F0608C0EE0400CF060800F1 +:100A0300F8E3D75200EF025202FE3700CF4CFD004D +:100A1300CF060800BF0408C716629F0008410011F3 +:100A23008F78239B4100118F79239F0108C65100C2 +:100A3300FE62FFEF025205CF060800C1510CFE0A09 +:100A430000C0D7C1511DFE0200C0D761DD717BFA22 +:100A530070CEC0A59EC47CFF9EC4609EC461CDD7EA +:100A630061DD717BFAC18EC45C1BFED6FFCF060825 +:100A730001FED7FFC061CDD731F2FA1AC1AEE4BF90 +:100A83003EFDAEE6BF40FDAED4BF42FD30FFFFBE2C +:100A9300E4BEE6BED4C0D731F2FA11C1AF3EFDBE0B +:100AA300E4AF40FDBEE6AF42FDBED4C0D7C1BF44F4 +:100AB300FD13BF46FD15BF48FD17BF4AFDC0D7AFA5 +:100AC30044FDDB46FDEB48FDFB4AFDD7534B30525B +:100AD3005430324E323030475631323000FFC1503D +:100AE300FEFEAB0061DD717BFACF060800FE0A0053 +:100AF300FEA4FF61CDF8E3EECF00C7FB0408BF3EC1 +:100B0300FD8FC0009C05C5C337040600BF40FD35FB +:100B130036450B300000522BFE6600C2C4C630F3CC +:100B23000AB800300000B8022004AF40FDB800301E +:100B33000F00B802AF3EFD61FF520AFE3AFFECF828 +:100B4300FF0E717BFAC1C7FB04088C05C65C80FEEF +:100B53000200C0D761DD717BFA70CFC0FFA59FC0D3 +:100B6300007CFF9FC000609FC00061CDD7618BFEFA +:100B7300E2FF717BBE410011FB000017CEFC006158 +:100B8300CB089EFDF31161C999A58392DFF7D7FEC8 +:100B9300B1FED54CFDDF23C1CF0308035109FEF499 +:100BA300FDC0D2DF37FE3800A20408CF0308075187 +:100BB30009FEE1FDD2B20408DF22C7FB040831833A +:100BC30002C6D7C6510AFECCFD624C1FDF06CF4CCE +:100BD300FD01EF04CF4CFD00C0EE5BFEC0EE55FE01 +:100BE300C7C1FB04088B31196C0161589BC0C6D780 +:100BF300717BFAFE4DFEAF0408040600C11436579C +:100C03000B300000522DF3FE77FF8FC000FE2BFE4A +:100C130061CF5C807C8073C0041900CEFC0F61CB74 +:100C2300C55404EF03C55417FE18FEC7360008BBAE +:100C3300629C0288089C03D1DD334C41DE2F70F1A6 +:100C4300312DB161090033081C000851FF612A41AD +:100C53000E118FD0FF613B118FD1FF6138DC0E8BFA +:100C63005C03DF0964C6C4FE2BFDEECAFDC6C4EEF9 +:020C7300C3FDBF +:100C750061CF5100718C7109FECBF800FEFCA80113 +:100C850000F6BF00F953C0F693935820FEDFF941F3 +:100C950000361A203406FDEF05118B99A7A51744D8 +:100CA5005220DFF53602F93006FDEF04CC0000A72F +:100CB50047DFF94100365220343EFDEF05118B998F +:100CC500A7A517445220DFF5363EFD303EFDEF0463 +:100CD500CC0000A747DFF9FCD80000EFFE61DD710D +:100CE5007BFABEF0ADD8BEF200AEF661CDD7C361DA +:100CF500DD717BFABEF0ADD8BEF200DBF6FFADDCF0 +:100D0500BEF000AEF6BDD8AEF40312ADDABEF20009 +:100D1500AEF661CD03BDDAC2D7C3F33174D908830A +:100D2500C1F626D8BDD8C031750683C312F623C2D5 +:100D3500FD400D93DF0312F623C2D7440000DD26E4 +:100D450061DD717BFACFE80080BEF6F6BEF4BEF237 +:100D5500ADD8BEF0CFE800818FE8003103FAAEF0E0 +:100D6500F5E80061CDD7B1D7C3F33174D90883C194 +:100D7500F626D8BDD8C0317505C312F623C2FD8E3F +:100D85000D93DF0312F623C2D7440000DD2761DD92 +:100D9500717BFACFE80080BEF6F6BEF4BEF2ADD8A0 +:100DA500BEF0CFE800818FE8003103FAAFE000F52F +:100DB500E80061CDD7ADD8D7C3F33174DB0F83C15C +:100DC500F626D8BDD861317026DABDDAC031750D89 +:100DD50083C312F626DCBDDC61317023C2FDF60D3E +:100DE50093DF0CF626D8BDD861317026DABDDAC29C +:100DF500D7C161686BDC6BDDC0DD2F61DD717BFA0E +:100E0500CFE80080BEF4ADDCBEF6ADD8BEF0ADDAFD +:100E1500BEF2CFE800818FE8003103FAAEF0BDD80D +:100E2500AEF2BDDAF5E80061CDD7F6BDD8BDDAD7AB +:100E35008292DD2B61DD717BFACFE80080BEF0F692 +:100E4500BEF2BEF46208BEF6CFE800818FE800313D +:100E550003FAAFE0006072AEF0F5E80061CDD7604F +:100E650072F6B1D706DABDDAADDC06D8BDD861D8E1 +:100E7500A6DAD7D1DD17C1C3DAD89DD8ADDA311CD2 +:100E850061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD65 +:100E95001BC1C3DADA9DDAADD8311E33311E337189 +:100EA500F9B4DADFF4BDD813BDDAC2C0D746D8DD50 +:100EB5000771FF7177D971C0D746DADF08C1ADDC9C +:100EC50046D8C0DD077177DB71FF71C0D75BDB9D4D +:100ED500DB605BDA9DDAADDC5BD9085BD808BDD891 +:100EE500D7C3C7F3728EFDC162314C410036002075 +:100EF5001161A072C09EFD62C6C2D7C3C7F3728ED0 +:100F0500FDC1625C0F0C000FFE00314C4100360A3A +:0F0F1500201161800FFE0073C09EFD63C6C2D71E +:0A0FF60031373A33343A3432000048 :0A20000000060C12181E242A3036C8 :10200A00001632486480961228446076920824406A -:10201A00FF000000555555550000DAFB00003CFC56 -:10202A0000000000523E9D38B823192F6D30EB3066 -:10203A002D32603FF448453F4C3F1A4100000000F2 -:0C204A000000983AF82A23301299000098 -:08205600317503F7332312D7A3 -:0A21000032303A34313A3336000031 +:10201A00FF000000555555554700DCFB00003EFC0B +:10202A0000000000453FA639C423092F9630143119 +:10203A0056323940D3493840F34100000000983AFB +:08204A00F82A2330129900006E +:08205200317503F7332312D7A7 +:0A21000031373A33343A343200002C :10210A00AEF0B430B740BA30BB50BBB0BC50BD1013 :10211A00BD60BDB0BFE0C2B0C420C7B0CAE0CE1037 :10212A0001F0141014200630639049006E00777095 @@ -292,701 +282,715 @@ :1022DA00A7FBAB0000FF67FDAB0000FF67FDAB008B :1022EA0000FF67FDAB0000FF67FD00D800D800D8EB :1022FA0020DA20DA20DA20DAEAEAEA69696969E8A2 -:10230A00E8E867676767020202010101010000004D -:10231A0000000817263544536271807162534435B0 -:10232A0026177F7E7D7C7A797877767574727170DC -:10233A006F6E6D6C6A6968676665646261605F5E2C -:10234A005D5C5A5958575655535251504F4E4D4B42 -:10235A004A494948474645434241403F3E3D3B3A48 -:10236A003938080101020203030200FEFBF7F3F009 -:10237A00F0F3FA041225384D5F6E777A776E5F4D67 -:10238A0038251204FAF3F0F0F3F7FBFE0002030318 -:10239A0002020100000000001F003B005A00780002 -:0E23AA009700B500D400F300110130014E0180 -:1023B8008F07FDB007FDD161E8ED8424CF07FD80CC -:1023C800710407E6613012F6712420611043DD3292 -:1023D800710407E661306061FB712120312420130C -:1023E8007130E1FB5002C15011FDF536C0CF0BF939 -:1023F80002EF0F7138E1FBE0C15011FDF536C0F571 -:102408000BF94002F94BDC164002F9B9DE10400C1A -:10241800F928DE05A00CF9EF27711320EF224002FE -:10242800F93EDC064002F9BDDC10400DF928DE0556 -:10243800A00DF9EF0B711220EF06F50CF9F50DF967 -:102448003112200D3104200931020705713304EFE0 -:1024580003713204311205097140E1FB714202EF48 -:10246800077148E1FB714302D50BF9DD06B00BF9A2 -:10247800714202401CF90361F8FDC727D7C78F06D0 -:10248800FD76FDC124401FF901DD05710320EF270A -:10249800664F06FD61F831342014713320FD410583 -:1024A800664C07DD038161F8FD5B25FD802571021F -:1024B80020300927FDA43BC6D7C77162017172019C -:1024C800E0FD94025008FD4B3A629F02F95009FD65 -:1024D8004B3A62767163014002F9F1DC06CF1FF9CD -:1024E80002EF0F4002F904DE06CF1FF903EF03E500 -:1024F8001FF9664CEADC06CF06FD07EF44664CC6BA -:10250800DC06CF06FD06EF39664C9FDC06CF06FDDC -:1025180005EF2E664C7CDC06CF06FD04EF23664CE7 -:1025280050DC06CF06FD03EF18664C22DC06CF060A -:10253800FD02EF0D664C06DC05E506FDEF03F5062A -:10254800FD4006FD07DF0A401FF90161F8CF1FF9BA -:1025580004C6D7C7C1FBF8FF500AFD9402304000FB -:10256800BB17C15002C15006C1506CFD1C041006B7 -:102578005096FD9402C0C6D7C72008FBF8FF8F0607 -:10258800FD5006D604CA2214F7500689A54804F956 -:10259800A390DFF7401FF90161E8ED0527304A579E -:1025A800BB17C15002C1503EC1506CFD1C0410063F -:1025B800D2DD077100E0FBED05277108E0FB170489 -:1025C8000300C15004C1500CC1506CFD74031006C7 -:1025D800D906FDF10104F42214A9318D12A9318E16 -:1025E800616B08616A08BB17C15002C1500EC15027 -:1025F8006CFD1C041006F690BB17C15002C1500CAC -:10260800C1506CFD1C04100631542002EFFA7142CF -:10261800208F06FDF0312E040A21C15010C1504010 -:10262800C1506CFD1C04100631542002EFFA7142AF -:10263800208F06FDF0312E041A21C15010C15050D0 -:10264800C1506CFD1C04100631542002EFFA71428F -:10265800208F06FDF0312E042A21C15010C1506090 -:10266800C1506CFD1C04100631542002EFFA71426F -:10267800208F06FDF0312E043A21C15010C1507050 -:10268800C1506CFD1C04100650A5FD9402D906FD2E -:10269800F10104F42214A9318D12A9318E616B085D -:1026A800616A08BB17C15002C1500EC1506CFD1CB5 -:1026B80004100650A5FD94025004C1506CFD4A0355 -:1026C800C0629C07E906FD0909234E0761C30AE9B0 -:1026D80006FD0902234E0761D80017040300C15004 -:1026E80004C1500CC1506CFD1C041006F6BB17C188 -:1026F8005002C1503EC1506CFD1C0410061008C6A3 -:10270800D7C7C1FBF8FF8F0EF94F02F961F8EDC387 -:10271800274010F928DE06A010F9EDC327F510F9B7 -:102728008F02F99F0EF98F02F95070D6123073514B -:10273800230480001231FF318E039F0FF99FDCFBC9 -:10274800F6BB8F0FF97C804C95DC1B8F0FF9318F0E -:10275800241400BDD8AF06F9FD790D1231FF318E72 -:1027680003318FBBEF198F0FF9318F241400BDD8B7 -:10277800AF08F9FD790D1231FF318E03318FBBD9C6 -:1027880004F9F1610900BB44000171FEDC03F69015 -:10279800BB8C0101DE02F6BBABABBF6EFC17C150B0 -:1027A80002C1500CC1506CFD1C041006D2DF088F0A -:1027B80002F99F0EF9EF047100E0FBF2C0C6D7C71B -:1027C8002008FBF8FF401FF902DF0BCFDDFB63CFCA -:1027D800DFFBC8ED3829401FF903DF2C170406007A -:1027E800C15002C15004C1506CFD74031006D2DD03 -:1027F80006CFDDFB63EF0A8C069FDDFB8C079FDEAF -:10280800FBCFDFFBC8ED382917040600C15002C111 -:102818005004C1506CFD74031006D2DD107100E045 -:10282800FB710320F5DDFBE520F9ED0D298C063160 -:102838008E318D080E07081C00BBD906FDF1041067 -:1028480023148972ABFDCC0EBB8C019C068B9C07B4 -:1028580017040400C15002C1C1506CFD7403100676 -:10286800D261E8ED0D298C049FDFFB8C04318E3199 -:102878008D080E05081C00BBBDD8F6BDDAC9DC0101 -:10288800A5FD550FDC09CC0364F6BF12F9EF76AB52 -:10289800BDD8F6BDDAAF12F9BDDCF6BDDEADD8C1E4 -:1028A800ADDAC1C9D800A0F6BDDAADDEFD000FADC6 -:1028B800D8BDDCADDABDDEC0BDDAC0BDD8ADDEFD49 -:1028C800550F61D309CC031EF6BF12F9EF37ABBD24 -:1028D800D8F6BDDAC9DC819DFD550FDC0BCC030AA7 -:1028E80030F401BF12F9EF1DABBDD8F6BDDAC9DC73 -:1028F800019BFD550FDC0BCC030530F401BF12F929 -:10290800EF03E520F93134040D31120509CFDDFB61 -:1029180064F5DEFBEF1A8C064E03DE0C8C069FDD99 -:10292800FB8C079FDEFBEF088C039FDDFBF5DEFBCE -:1029380040DDFB0BDE064014F90BDE1640DDFB061E -:10294800DE064014F906DE0AD5DDFBDF0ED514F9E4 -:10295800DD095020C15011FDF536C08FDDFB9F14F5 -:10296800F9D51CF961F8CF14F964401CF90361E842 -:10297800F515F940DDFB0BDE03E6EF01F6609C057B -:102988008F15F94E05DD138C059F15F98C0570C15F -:102998005012C150A4FDE60310041008C6D7C75052 -:1029A80007C15002C15084FDE60310045012FD9483 -:1029B80002500FC15002C15084FDE60310045003B9 -:1029C800FD9402501FC15002C15084FDE60310045B -:1029D8005016FD94025003C15084FD4A03C0625C46 -:1029E80001D1DD107170E1FB5002C15013FDF536C5 -:1029F800C0E2EF01F2C6D7C75004C15084FD4A03B4 -:102A0800C0625C03D1DD405014FD872A34E1FB89A4 -:102A18005C9F998A0C7CFF50FF5C14D1DD228A0CE4 -:102A28007CFF5C147234E5FB89616A997162075610 -:102A380000316207058666D1DFF7716307716B277E -:102A480034F4FB895CEB995002C15084FD4A03C001 -:102A5800D2DD225007C15002C15084FDE6031004A4 -:102A68005033FD9402F0C15002C15084FDE60310BA -:102A7800047178E1FBE0C15013FDF536C0C6D7C735 -:102A8800C12004FBF8FFCC02005004C15084FD4A69 -:102A980003C0629C038C045C20D1DD0E8C036C01A6 -:102AA8009C038C026C209C02EF138C045C10D1DD1B -:102AB8000C8C035CFE9C038C026C109C028C045CE6 -:102AC80008D1DD0E8C036C029C038C026C089C02FE -:102AD800EF138C045C04D1DD0C8C035CFD9C038C2F -:102AE800026C049C028C03D1DD05501AFD94028C03 -:102AF8000370C15004C15084FDE60310048FE1FB4C -:102B08005C9F728C03318E316D148C03318E314D84 -:102B1800616D08616C5C606162629FE1FB8FEDFB37 -:102B28007CFF50FF5E02D1DD278FEDFB7CFF5E024C -:102B38007234E5FB89616A99716207CC01003162E0 -:102B480007086159018C01D1DFF4716307716B27A4 -:102B5800F21006C6D7C7D9D5FBC15006C15084FDAF -:102B6800E60310046276D9D6FBC15007C15084FD34 -:102B7800E60310046261666672C6D7FD5D2BF2D764 -:102B8800C72004FBF8FF711300711B207103037148 -:102B98000205E0C15003C15084FDE6031004501340 -:102BA800FD9402F0C15005C15084FDE603100450A5 -:102BB8000FC1E0C15084FDE6031004500AFD9402E1 -:102BC8007103055008FD9402501FC1E0C15084FDF7 -:102BD800E60310045012FD94025003C15084FD4ACC -:102BE80003C0625C01D1DF03E2EF3C5003C1C15076 -:102BF80084FDE6031004710203711A20C717A11699 -:102C0800F74918239BA3A75103614ADFF4C6506410 -:102C1800FD940217A1C15003C15010C150A4FD1C5E -:102C2800041006F50AF9F21004C6D75003C15084FF -:102C3800FD4A03C0625C01D1DD195014FD872AFDED -:102C4800FF295014FD9402E0C15003C15084FDE6F1 -:102C5800031004711300711B20710303F0C1E0C15C -:102C68005084FDE6031004F0C15003C15084FDE612 -:102C7800031004F2D7C72004FBF8FFCC02008F0A28 -:102C8800F99C035010C150A4FD4A03C0629F0AF981 -:102C9800D541FBDD04F2ED5B2D8C037F0AF95C085E -:102CA800D1DD108F0AF95C08D1DF05CC0210EF03E3 -:102CB800CC02208C037F0AF95C04D1DD168F0AF957 -:102CC8005C04D1DF088C026C049C02EF068C026C59 -:102CD800089C028FE0FB5CF3728F0AF95C0C61625E -:102CE800629FE0FB8FECFB7CFF50FF5E029C02D1F1 -:102CF800DD1F34E4FB896E0299716207CC01003153 -:102D08006207086159018C01D1DFF4716307716BA7 -:102D1800278F0AF95C40D1DD095002C15012FDF538 -:102D280036C08F0AF95C01D1DD08E0C15012FDF50B -:102D380036C0717AFA8F0AF95C41D1DD15340AF987 -:102D4800895CBE99D90AF9C15010C150A4FDE603A7 -:102D58001004F21004C6D7FDA629F2D7FDFF29F208 -:102D6800D7C78FF4FB7617FD872A664FF4FBDFF28F -:102D7800F5F4FBF2C6D77100010571785005713A78 -:102D8800D5713BD1713ADD713BD98F10055CFC9F41 -:102D98001005CF54054AE5420571104205710042FD -:102DA80005714850057130500571205005CF530505 -:102DB80005CF52050A7130510571205105713BD577 -:102DC800717050058F11055CFC9F1105D771785003 -:102DD8000571080105D77140F00071783002713A29 -:102DE800E6713BE2713BEA713BEE8F10055CFC9F9C -:102DF8001005CF34024AE552FF711A52710A527116 -:102E08004830027130300271203002CF330205CFD2 -:102E180032020A71303102713BE6717030028F1153 -:102E2800055CFC9F110571603002D7717830027122 -:102E380048F000D7C788061666614FDD0967614EFE -:102E4800DE0396EF01866672C6D7C7161714AA0462 -:102E580012A943DD29AA0412A923FD5620C3AC02F6 -:102E6800FD562013C2BDD813FD490FDE0C1714AA56 -:102E78000212AA0403BA04EF051714A9BA04AC0491 -:102E88001231FF319E03317F087208C6D7C771001F -:102E9800F200304400BFB601300188BF900130090C -:102EA80084BF9E01BF9C01BF9A01BF9801BF9601D4 -:102EB800BF9401BF9201F53CFF30FE00BFBE01F692 -:102EC800BFBC01BFB80150EEBFBA01A1BFB201C972 -:102ED80018FE007120120571481EF9401FF902DD25 -:102EE8000B36100571A461C871401EF971281205CE -:102EF8008F1EF9313507F5FBFBCB6CFF0071032101 -:102F0800C6D730EF00BFB401F6BFBA017108F200AE -:102F1800D7711321D9FBFBF1E7240000DD1423DD71 -:102F28001B23DD1323DD1A23DD2823DD2D23DD33C9 -:102F3800EF0AFDA82FEF2FFD3030EF2AFDA82FEF65 -:102F480025F0C1AE6CFD3C2EC0F313BE6C7173202E -:102F5800EF14F6BE6C717220EF0CCB6CFF0071732E -:102F680020EF03FDDA2F8F1EF931450871742071A7 -:102F78002104EF06717420715101311421218F1E33 -:102F8800F9314510F6BE64BE6A3174200390EF0132 -:102F9800F6BE6ED731742004F690EF01F6BE6AD7FC -:102FA80040DDFB06DE04FDDA2FD740DDFB0BDE102B -:102FB800F0C1AE6CFD3C2EC0F313BE6C717220D70D -:102FC800D9FAFBC1AE6CFD3C2EC0F313BE6C717315 -:102FD80020D7711221F0C1AE6CFD3C2EC0F313BE98 -:102FE8006CA0A6FB40A6FB40DC3DF5A6FBD9A7FBE1 -:102FF800F1313F040AFD14D9A7FBF1BDD85008FDF3 -:10300800040E087208E6D2DD040192DFFC896158DB -:10301800D1DD05717220EF03717320A0A7FB40A7D3 -:10302800FB2061C8F5A7FBD7E9A9FB091C23508041 -:10303800D6BFAAFB22AEFB1231FF319E03317FBF00 -:10304800ACFB30AAFBFD522EF313BE6CB0A8FBD527 -:10305800A8FBDF10CFA8FB80A0A9FB40A9FB0F614C -:10306800C8F5A9FBD78FB0FBB0B0FBD1DF7431D462 -:10307800D107715BD1CFB2FB02D5B2FBDD34714011 -:10308800E0FBD9B1FBF1E734020023DD0625DD03BF -:1030980025DF05F6BE66EF06D9FAFBF1BE66A0B1DC -:1030A800FB40B1FB20DF06F5B1FBB0B2FBCFB0FBB4 -:1030B80016D7CFB0FB1E7148E0FBD5FCFBDF04F64A -:1030C800BE66D7D9FAFBF14266FFDD16D9FAFBF1E5 -:1030D80012AE6643DE05A266FFEF03B266FFCFB00D -:1030E800FB03D731142101D7401CF902DF19F6BEC2 -:1030F80064BE6EBE6ABFB6FBBFBCFBBFC2FBBFBA35 -:10310800FBBFC0FBBFC6FB31042103EDC031D5B303 -:10311800FB61E8EDBB318F42FB9FB3FB40B4FB1F63 -:10312800DC1F710000FC4044FBFFDD24D5B5FBDD4E -:1031380005B0B5FBEF1A8F44FB9FB5FBF5B4FBEF69 -:103148000F710800FCD9B4FBF1A1605C1F9FB4FBB0 -:10315800E9B4FB0946FB5080D6BFB6FBE9B4FB09CE -:1031680066FB5080D6BFBCFBE9B4FB0986FB5080E8 -:10317800D6BFC2FBAFB6FB22BAFB12D943FBF13371 -:10318800BDD813FDB50DBFB8FBAFBCFB22C0FB1209 -:10319800D943FBF133BDD813FDB50DBFBEFBAFC29C -:1031A800FB22C6FB12D943FBF133BDD813FDB50D85 -:1031B800BFC4FBB0B3FBEF3DF6BFB6FBBFBCFBBF64 -:1031C800C2FBAFBAFB1231FF31AE03316F12F623E7 -:1031D800BFB8FBAFC0FB1231FF31AE03316F12F63F -:1031E80023BFBEFBAFC6FB1231FF31AE03316F12F6 -:1031F800F623BFC4FB8F1EF931451F30C2FBFD52B9 -:103208002EF313BE6430B6FBFD522EF313BE6E30A0 -:10321800BCFBFD522EF313BE6AD730C2FBFD522E03 -:10322800F313BE6AD7C73122210BD5C8FBDD06B020 -:10323800C8FBEDF432712321D9FDFBF1E72400002E -:10324800DD0F23DD1B23DD1123DD5723DD2923DDDE -:103258003B5600F50EFDEDE0325601F50EFDEF7818 -:10326800D50EFDDF075601E50EFDEF055600F50EFC -:10327800FDCFC8FBFAEF61D50EFDDF0B5601E50E59 -:10328800FDCFC8FBFAEF51F5FDFBEF4CD50EFDDF86 -:103298000B5600E50EFDCFC8FBFAEF3CCFFDFB0255 -:1032A800EF36D92DFCF1E7240000DD0923DD2423C6 -:1032B800DD0A23EF1E5600F50EFDEF1CD50EFDDFCF -:1032C800075601E50EFDEF055600F50EFDCFC8FBCC -:1032D800FAEF055601E50EFD8F1EF93145086661C6 -:1032E800FB715107EF066661FB710101C6D7CFFA82 -:1032F800FBFFCFD5FB5CCFD6FB5FCFF6FB32D7C742 -:10330800CFD2FB10CFD3FB27CFF7FB20F5FBFBF584 -:10331800FCFBF5FDFBF5FEFB5600664C64DE08720F -:103328003842FB0086EFF3C6D7C788061617F1E7C1 -:103338003403002361E3ED45362361F8ED1534B11C -:103348002361E3ED1C342561F8ED2B3424070024B8 -:10335800070061D8ED4536240B0061F8ED4C3423A5 -:1033680061F8ED93342361F8ED60342361F8ED0FD3 -:10337800362561F8ED2F362561F8EDFC34B125616D -:10338800D8ED203524000061F8ED2D352361F8EDE6 -:1033980045362402002361E3ED3D352361F8ED4F06 -:1033A800352361F8ED61352361F8ED4F352361F878 -:1033B800ED73352361F8ED85352361F8ED953523F7 -:1033C80061F8ED9E352361F8EDAA352361F8EDB675 -:1033D800352361F8EDBF352402002361E3ED45365E -:1033E80024020061F8EDC8352361F8EDD435256174 -:1033F800F8EDE035240A0061F8EDEC35241200619F -:10340800F8ED09362361F8EDF735ED4736679FD4B7 -:10341800FBED513630832BFDA43B66736718D2FB56 -:10342800ED513640D7FB6ADF1440D8FB68DF0E67E2 -:103438004C6CDF09301A44FDA43B713AD5679FD91B -:10344800FBED513667D1DD0630CD3FFDA43B34F2AC -:10345800FB89616F99ED5136675C02D1DD08305FF9 -:103468002DFDA43BEF0C675C01D1DD0630642DFD1A -:10347800A43B675C3CD1DD1030692DFDA43B675C43 -:103488003C7266736218D2FBED513667D1DD625C1F -:1034980001D1DD05300800EF01F6609F29FC675C6B -:1034A80002D1DD03E6EF01F63429FC8961689967EA -:1034B8005C04D1DD04E6A1EF01F63429FC896168DA -:1034C80099675C08D1DD05302000EF01F63429FC4E -:1034D80089616899675C10D1DD05301000EF01F64D -:1034E8003429FC89616899675C20D161E871602999 -:1034F800FCED5136D516F9DF09679FFBFBA016F9DD -:10350800EF134016F905DE0DD916F9F1B112674827 -:103518000AFDA016F9ED5136675C0F7266736218E2 -:10352800D2FBED51364016F964DE0AE916F9671840 -:1035380042FBA016F9675C7F318EC117F124300079 -:10354800FD4C06C0ED5136675C3F318EC117F12442 -:103558003000FD4C06C0ED5136675C07318EC1174F -:10356800F1243000FD4C06C0ED5136675C1F318EEA -:10357800C117F1243000FD4C06C0ED513667318E7D -:10358800C117F1243000FD4C06C0ED5136679E99F5 -:103598009F09FCED5136715221675C7F9F0AFCED53 -:1035A8005136715221675C3F9F0BFCED5136675CC9 -:1035B8003F9F0CFCED5136675C1F9F0DFCED5136AB -:1035C80030DE3DFDA43B679F12FCEF7D30993DFD49 -:1035D800A43B679F13FCEF7130BB3DFDA43B679F85 -:1035E80016FCEF65675C01D161E8FD3047EF5A4092 -:1035F80024FCC8DE54E924FC671872FAA024FCEF06 -:1036080048679F24FCEF4267318E247200DD07244F -:103618000500DD0AEF0B30DC09FDA43BEF03F5AB39 -:10362800FF679FF5FBEF228FF8FB617F5C02D1DD1E -:1036380006302839FDA43B679FF8FBEF0CEF0A66BC -:103648004C52DE05736718D2FBC6D7C716664C30D6 -:10365800DC094C37DE05FD2706EF67664C02DF1FE5 -:103668008FD4FB5C03728F2BFC5C03318E316D08A9 -:10367800616A08128F2BFC5C80312A6162EF49660F -:103688004C3DDF0AAE90BF26FCF926FCEF3A664CAB -:103698003EDF05F927FCEF30664C4FDF05FD544748 -:1036A800EF26664C61DF09E924FC0972FA72EF180B -:1036B800664C7FDF0D305A40FDA43B713AD5524A23 -:1036C800EF06667309D2FB72C6D7C71617F1241026 -:1036D80000240500DC07244C00DD0DEF0E6672386F -:1036E800D2FB00716221EF03A024FCC6D7C7C1C179 -:1036F800FBF8FF401CF903DD06401CF904DF2F8CA2 -:10370800027309DAFB5E0AD1DF248C02318E04D2FF -:10371800FB14896E0A99716207CC010031620708AF -:103728006159018C01D1DFF4716307716B271004B3 -:10373800C6D7CF2BFC03F529FCF52DFCF52FFCD7BC -:10374800C788061617F1E734020025DD4923DD1A7C -:1037580025DD2823DD0523DD37EF47711222679F1A -:103768002EFC302839FDA43BEF38675C03D161F8A3 -:10377800710223675C839F2BFCEF27675C039F2DF7 -:10378800FC675C034C0261F8712221FD2D32EF12B7 -:10379800679F2FFCEF0C6791DF08E0C15012FDF521 -:1037A80036C0C6D7C71617F1E724000061F8ED3E0A -:1037B8003823DD61240300DD0C240200DD6024F9D8 -:1037C80000DD7AEF7B40DDFB5BDC06CF2CFC0FEFE6 -:1037D8003240DDFB4CDC06CF2CFC0BEF2640DDFB3A -:1037E80033DC06CF2CFC07EF1A40DDFB0BDC06CFE1 -:1037F8002CFC03EF0E40DDFB06DC05E52CFCEF039B -:10380800F52CFC31020705308000EF01F6086F2C1B -:10381800FC7208EF318F29FCF529FC72EF2840DB98 -:10382800FB01DD0FD9DBFBF11231FE03311F0872FA -:1038380008EF13E2EF107172225235EF09F2EF062A -:1038480066730928FC72C6D7C71617F1E72400006B -:10385800DD38241000DD1C23DD1C23DD30240E00A0 -:10386800DD18241100DD1B240F00DD12243000DDDB -:1038780015EF1EE2EF1D5202EF195204EF15520622 -:10388800EF115205EF0D5207EF09F2EF065203EF61 -:103898000252FFC6D7C7302839FDA43B8F18FDB0A8 -:1038A80018FDD1DF6CCF18FD073174214A717321DF -:1038B800401CF903DF413610FDC7D93AFCFD7C3ABC -:1038C800618A70618AFDAB3AC03614FDC7D939FCEC -:1038D800FD7C3A618A70618AFDAB3AC0D93CFCF143 -:1038E800312F609F3BFC8F38FC4F3BFCDD09710298 -:1038F800228F3BFC9F38FC7150F000CE300BCF1765 -:103908000006CE3106FD2603717A30710BE3710B88 -:10391800E7C6D78F3BFC9F38FC8F3BFC9FDBFBD770 -:10392800401CF903DD02F2D78FF8FB5C02D1DD08F9 -:103938008F3BFC9F40FCEF6A310422247103227103 -:1039480023228FF8FB5C04D1DD088FF7FB9F41FC35 -:10395800EF068F3BFC9F41FC8F41FC9F40FCEF42F0 -:103968003114222C711322712222D52EFCDF05F589 -:1039780042FCEF0B8F2EFC5002D6A1609F42FC8FB9 -:1039880042FC9F40FC5040C15012FDF536C0EF127A -:10399800312222088F41FC9F40FCEF068F42FC9F9A -:1039A80040FC8F40FC9FDBFB4040FC01DF05E52E1F -:1039B800FCEF0ED940FCF11231FE03311F609F2E3F -:1039C800FC8FF8FB5C01D1DD02F2D75013C150A483 -:1039D800FD4A03C0E940FC092C2370C15013C150B3 -:1039E800A4FDE60310045013C150A4FD4A03C0F21D -:1039F800D7C7168B728C01614ADE248B728C0261E8 -:103A08004ADE188C01728C02614ADE068C01318E06 -:103A1800EF048C02318E087208EF268B72EF228B2E -:103A2800728C02614ADE048B72EF168C01728C0272 -:103A38006142DE068C01318EEF048C02318E0872F1 -:103A480008C6D7C716710AE7710BE37150F000CEAC -:103A5800300BCF170006669E31FD2603717A307150 -:103A68000BE33182E302EFFA8D1F7158F000710BFE -:103A7800E772C6D7C7C1C1FBF8FF8C024CF0DC0463 -:103A880052FFEF1B8C024C05DE03F2EF128C022C66 -:103A9800049C02318E318D52ECFDCC0EBB8B721022 -:103AA80004C6D7C7C1C1FBF8FFAC0A14A9148970B2 -:103AB8008C026128706131FD56201344030071FEA9 -:103AC800DC16AC0A14A9148C0299AC0A14CA0200B8 -:103AD800AC0A14CA0310EF6EAC0A14A914894E027A -:103AE800DE0AAC0A148A02819A02EF13AC0A14A9FE -:103AF80014894E0261D308AC0A148A02919A02AC66 -:103B08000A148A03919A03D1DF3CAC0A148A024C46 -:103B180010DF10A91489318EA112AC0A14A91462FD -:103B280099EF17AC0A148A024CF0DF0EA9148931F8 -:103B38008EB112AC0A14A9146299AC0A14CA020014 -:103B4800AC0A14CA03101004C6D7ED8F3B717BFA78 -:103B5800C7D54EFC61F831342227713322D54EFC8B -:103B680061E8B04EFC717AFA5600664C0CDD1272B0 -:103B7800F3311C791AFDCEFC0061CAFDEE3B86EFDD -:103B8800E9717AFAF2C6D7C75600664C0ADE0BF01E -:103B9800317E12F67850FC86EFF0C6D7C7C1C1FB5C -:103BA800F8FFCC01008C014C0ADE36717BFA8C01DF -:103BB800F0317E0450FC14A96168DF09AC02B971C8 -:103BC8007AFAF2EF1D8C01F0317E127950FC6149CE -:103BD80002DF06717AFAE2EF09717AFA615901EFA8 -:103BE800C4E21004C6D7C72004FBF8FFF64250FC15 -:103BF80061F8EDE63C717BFA9C038C034C0ADE4FBE -:103C08008C03F0317E0450FC14A96168DF05717AD9 -:103C1800FAEF3C8C03F0317E127950FCE743DF0663 -:103C2800717AFA00EF21717AFA8C0372F3311C79F8 -:103C380050FCCEFC0061CA629C02D1DF0A8C03F002 -:103C4800317E12E67850FC717BFA615903EFABCCF8 -:103C58000200CC01018C02F0317E0450FC14A961F1 -:103C680068DD7B8C02F0317E127950FCE743DF6817 -:103C78008C014C0ADE628C01F0317E127950FCE72F -:103C880043DD50717BFA8C01F0317E0450FC14A99D -:103C98006168DF1B616901717BFA8C01F0317E126A -:103CA800F67850FC717AFA8C024E01DCE7EF2F8C23 -:103CB80001F0317E0450FC14A9128C02F0317E33DD -:103CC8007850FC8C01F0317E12E67850FC61590284 -:103CD800717AFA615901EF98615902ED5D3CCC02A5 -:103CE80000CC01008C014C0ADE1E8C01F0317E04F0 -:103CF80050FC14A96168DF05CC0201EF068C02D1E3 -:103D080061E800615901EFDCF21004C6D7C720064C -:103D1800FBF8FF3417FCC55006C150A8C15030FD50 -:103D280074031006D2DD1DA064FC4064FC08DE03A9 -:103D3800E2EF5A3412FC895CFC99FDDE3D7110E01B -:103D4800FBF2EF49F564FC8F12FC5C01D1DD2640E3 -:103D58001CF903DF205010C180FDF536C0C73610AE -:103D68000571D4C6DE0F17C15006C150A8C1503026 -:103D7800FD74031006401CF901DD11401CF905DD36 -:103D88000B8F12FC5C02D161E8FD1F44F21006C6DD -:103D9800D7D913FCC15030FD4A03C0629F16FC718D -:103DA80030E3FB8FEBFB5C08D1DF06716307716BB7 -:103DB80027F2D7D916FCC1D915FCC15030FDE6034E -:103DC80010047130E3FB8FEBFB5C08D1DF067163F5 -:103DD80007716B27F2D7C7200AFBF8FF500FC150B5 -:103DE80030FD4A03C04041FB02DF077110E0FBF2DF -:103DF800EF547118E0FBCC0700CC0812CC09808F77 -:103E080012FC5C03D1DF08717AD5CC0607EF067186 -:103E18007BD5CC062F17040600C15004C150A0C1A1 -:103E28005030FD1C041006C736100571D4C6DE15C7 -:103E3800401CF903DF0F17C15006C150A8C150300C -:103E4800FD74031006F2100AC6D7C78F1CF9318F0C -:103E5800240200DF04F6BF68FC8F32FDB032FDD1CA -:103E680061E8ED433FCF32FD048F1CF9318FE72322 -:103E7800DD0B24020024030061C8ED433FE6A142A4 -:103E880068FCDF0AE0C15010FDF536C0EF2430F4BD -:103E9800004268FCDF0B5002C15010FDF536C0EF40 -:103EA800118FF6FB5005D604F4004268FC61D8E592 -:103EB80020F931340709715322F6BF68FCEF173136 -:103EC800542206F6BF68FCEF0DA268FCF64268FCB7 -:103ED800DF0490BF68FC8F1FF9318FE723DD07B13E -:103EE8002361D30CEF1236100571C4716122EF0BF8 -:103EF800710402716122EF037162223162221A4059 -:103F08006AFC0361D8A06AFC406AFC02DF0E500418 -:103F1800C15010FDF536C0EF03F56AFC31420718B1 -:103F2800406BFC0361D8A06BFC406BFC02DF0C50BB -:103F380010C1FDF536C0EF03F56BFCC6D7C7401CB2 -:103F4800F902C6D7C72004FBF8FF401CF90361E853 -:103F5800401CF9041004C6D7C78F12FC5C03D1DDDE -:103F68001136100571D4DE0A30153DFDA43BD2612F -:103F7800F800401CF903DF1B31220707307D2CFDB8 -:103F8800A43B003174220C7173225080C15012FD81 -:103F9800F536C0401CF903DD05F6BD1AEF25D5FE40 -:103FA800FBDF09F6461ADD1BB61AEF17D9FAFBF143 -:103FB800461ADD0FD9FAFB12AD1A43DE04A61AEF32 -:103FC80002B61AC6D78FF2FB5C10D161E8711223D2 -:103FD8008FF2FB5C0FD1DD758FF2FB5C01D1DD0543 -:103FE800F51CF9EF688FF2FB5C02D1DD15E0C150DA -:103FF80003C15084FDE6031004711300711B207186 -:1040080003038FF2FB5C08D1DD05710303EF1C8FFE -:10401800F2FB5C04D1DD14711300711B2031042301 -:1040280003710303342BFC895CFC995005FD940251 -:104038007102035003C1C15084FDE6031004711AD4 -:1040480020FD1B39302839FDA43B710323F5F2FB11 -:10405800F2D7C7364105718461D8ED09413641056B -:104068007194DE0771405005CEABAC31B2D104E299 -:10407800ED1841713BD18F16F9A016F9318EE7245E -:104088000000DD1723DD1C23DD2723DD2C23DD388D -:1040980023DD4423DD4923DD4EEF668F1FF99F4062 -:1040A80005EF58F0C15084FD4A03C0629F4005EFF8 -:1040B8004A8F06FD9F4005EF425008C1506CFD4AEB -:1040C80003C0629F4005EF335009C1506CFD4A039D -:1040D800C0629F4005EF248F6EFC9F4005EF1C8F48 -:1040E80002F99F4005EF14711420E6613012710443 -:1040F8002061DC31196162629F4005CEABACE2EF12 -:104108000F7160500571485005713BD5F516F9F2ED -:10411800C6D7C78F1CF9318FE724000061F8EDBEC0 -:104128004223DD1B2361F8EDD2412361F8ED5C42A7 -:104138002361F8ED99422361F8ED2843ED8943D5D1 -:104148001DF9DF2BF64268FCDD05F537FDEF03A00E -:1041580037FD4037FD65DC09F51CF9713222ED8C1D -:1041680043AF68FC440A0061D8ED8C43E51DF97142 -:104178005222F537FDF5F5FBFD4105713320FD852C -:1041880024401FF904DF09713222F51CF9ED8C4334 -:10419800FDC72740DFFB9BDE09713222F51CF9EDD4 -:1041A8008C43FD882BD2DD09713222F51CF9ED8C88 -:1041B80043401DF901DF05F5FBFBEF04CFFBFB03D3 -:1041C800CF1CF902FD5D2BED8C43CF350002CF37B4 -:1041D800001DCF120510FD7E2DFDDE2D714A9DFDBF -:1041E8003A37FD0733F537FF712BE0F51DF97132CA -:1041F80022CBE43FEFCBE6F6F0FD4105713BD48FCF -:104208001EF93135305004C15084FD4A03C0625C48 -:1042180003318E315D34E1FB896168995002C150E8 -:1042280084FD4A03C0D2DD067170E1FBEF047178AA -:10423800E1FBFD8524FD952E71381EF9CF1CF9038D -:104248008FD4FB5C02D1DD095080C15010FDF536DA -:10425800C0ED8C43FD8E4331A4E020712BE0310288 -:104268000C05FD0744EF145027C15005C15084FDCB -:10427800E6031004CF1CF9047132223114230CA078 -:1042880036FD4036FDFF61F8FD0744FDFB43ED8C2C -:1042980043FD8E4331020C18F0C15005C15084FD16 -:1042A800E60310045005FD9402FD0744CF1CF903F2 -:1042B800FDFB43ED8C43CFFBFB03F5FCFB710221B7 -:1042C800F6426CFF61E8ED8C43F5FEFBF520F9FD45 -:1042D8000A2FFDD52DFD332E714B9DF5E2FBF5E33D -:1042E800FBF5E4FBF5E5FB31542002EFFACE370885 -:1042F800CBE4BFFFCBE6FFF1CED4FFCF370009F503 -:104308001205F6BEE0BEE2BED0716A27FD332CFD71 -:10431800AA05F537FDCF1CF905715222F6BF68FCD6 -:104328003102071CFD8524AF68FC440A00DC06E561 -:104338001DF9E51CF9401FF901DD49FDAA05EF4407 -:10434800F51DF9FDAA0571730171320431120502D8 -:10435800EFFA71430271032071322031949E02EF0B -:10436800FA712AE7CEA409F5F30061FD31040703C9 -:10437800715322E5F300CEA408712BE7E51CF9EF91 -:104388000300EFFDC6D7D570FCDF1E3102001950BF -:1043980003C15084FD4A03C0625C01D1DF07F51CEC -:1043A800F9713222D7E570FCD74070FCF0DF083194 -:1043B80004003FF570FCD74070FCC8DF0BF51CF912 -:1043C800713222CF70FCF0D731020004A070FCD704 -:1043D800F0C15004C15084FDE60310048FE1FB5C7A -:1043E8009F9FE1FB7110F2FB30CD3FFDA43BCF70E6 -:1043F800FCF0D7D520F9DD06F51CF9713222D7710A -:104408001323F536FD717207FD2603FD260371732C -:1044180007D7FDB006F2D7C7200CFBF8FF8F18FCB2 -:10442800F0F917FCF303FD562013BC048F1AFCF0B7 -:10443800F919FCF303FD562013BC028F1CFCF0F99C -:104448001BFCF303FD562013BBAC04BDD8F6BDDA44 -:10445800AC04311EBDDCF6BDDEFD8A0DADD8BDDC79 -:10446800ADDABDDEAC02BDD8F6BDDAAC02311EDA7B -:10447800DCC3DADEC3BDDCF6BDDEFD8A0DC0BDDE01 -:10448800C0BDDCADDEFD000FADD8BDDCADDABDDEF4 -:10449800ABBDD8F6BDDAAB311EDADCC3DADEC3BD9C -:1044A800DCF6BDDEFD8A0DC0BDDEC0BDDCADDEFDC7 -:1044B800000FDADAADD8FD5348C3C58FFEFC5C3F68 -:1044C800F0317E047EFC14C2C0B9A0FEFCF6BC0824 -:1044D800BC0A9C078C074C2EDD3E8FFEFC0E077035 -:1044E800F161DC605C3FF0317E12797EFCBDD8F66C -:1044F800BDDA8C0773096E23318FBDDC70BDDEFD1C -:104508008A0DAC08BDDCAC0AFD000FADDABC0AAD03 -:10451800D8BC08615907EFBCAC08BDD8AC0ABDDAF5 -:10452800C9DC0004F6FD540EC9DCFFFFF6FD690F77 -:10453800ADD8BF78FCAF72FC4278FCDD12AF74FCDA -:10454800BF76FCAF72FCBF74FCAF78FCBF72FCAFE7 -:1045580074FC4276FCDC50AF72FC4274FCDE48AF5F -:1045680038FD4272FCDE40407AFC16DC1F407AFCC3 -:10457800A0DE168F7BFC4F7AFCDE0EAF72FC227C2D -:10458800FC44691061C8FDF845F57AFCAF72FC443B -:104598005146DC0BAF72FC241027BF3AFDEF1930EF -:1045A800F82ABF3AFDEF11407AFCFFDD03E6EF0180 -:1045B800F6347AFC89610899AF76FC4274FCDC1BFE -:1045C800AF74FC4272FCDE13AF72FC423AFDDE0BA4 -:1045D800F57BFCAF72FCBF7CFCEF11407BFCFFDD80 -:1045E80003E6EF01F6347BFC89610899100CC6D705 -:1045F800C72008FBF8FFA01DFCD51DFCDF1CA01E72 -:10460800FCD51EFCDF14A01FFCD51FFCDF0CCF1D42 -:10461800FCFFCF1EFCFFCF1FFCFF717BFA710A9EC7 -:1046280031929E02EFFA8E98FD7D0F9C058E949F25 -:104638003CFD8E969F3DFD8E979F3EFD8E939C047C -:104648008E929C03FDE54713BC068F22FC4E04DCCA -:104658000E8C044F22FCDF0C8C034F23FCDC05CCB2 -:104668000201EF03CC02008F3FFD4E05DF218C06CF -:104678000E02708C071C0012AF00FD43DE4E8C0644 -:104688000E02708C071C002200FDFD0847EF3D8CD0 -:1046980005318EB112D93FFDF143DF258C055C034E -:1046A80091DF03E6EF01F6046D01313D12010322AB -:1046B80000FD610906080E02081C00BBFD0847EF53 -:1046C8000B8F3FFD4E05DE04F6FD08478C059F3F26 -:1046D800FD8C060E02708C071C00BF00FDD9FFFC84 -:1046E800F1010422F9BB14A944FFFFDF04E6B9EF86 -:1046F8000BAB14A944FEFFDD03A9A1B91008C6D766 -:10470800C7161744A90061C836A800A0FFFC40FFDF -:10471800FCA861C8F5FFFCF9FFFCF3311CF6782210 -:10472800F9B7F647DFE5C6D7C756A89666F0317ED3 -:1047380012F6B17822F966D1DFF1F51DFCF51EFC01 -:10474800F51FFCF5FFFCC6D7712323D7C72004FB50 -:10475800F8FFD916F9F1E7240000DD1123DD1C2349 -:10476800DD2123DD2623DD2F23DD33EF388FFFFC0A -:104778009F02FDA016F9F93CFDEF5EA016F9F93D80 -:10478800FDEF56A016F9F93EFDEF4EA016F98F3F42 -:10479800FDFD970F72EF42A016F95255EF3BA01698 -:1047A800F952AAEF34F902FDF3311C7922F9BB3131 -:1047B8002223058B9C03EF128C019C03D502FDDF9D -:1047C80006CF02FDA7EF03B002FD718071272361B8 -:1047D800DC61FB7121238C03721004C6D7C7200645 -:1047E800FBF8FF8E98FD7D0F9C038E97FD7D0F9C37 -:1047F800028E96FD7D0F9C018E94FD7D0F9B710BA3 -:104808009E717AFA8C02F0317E12799E23BC048C58 -:10481800035C03D1DF158C024C03DE0C8C024C02C6 -:10482800DF098C014C1D61F86179048C01318EB16E -:10483800610904BC04313D120103BC048C040D70F1 -:104848008C051C00BC04121006C6D7C7C3C12008BB -:10485800FBF8FFF661490A61F8614908DF07F73498 -:104868000000EDF048E6BC04F6BC06AC0ABC02AC9D -:1048780008BBAC06614902AC0461F8614900DE2856 -:10488800AC04BDD8AC06BDDAE1FD0F0FADDABC064D -:10489800ADD8BC04ABBDD8AC02BDDAE1FD2A0FAD82 -:1048A800DABC02ADD8BBEFCAAC06BC02AC04BBACE8 -:1048B80008BDD8AC0ABDDAAC04BDDCAC06FD8D0E73 -:1048C800AC04BDDCAC06FD000FE1FD2A0FADDABC7F -:1048D80006ADD8BC04AC06614902AC0461F8614974 -:1048E80000DCC5AC0214AB12100CC6D7C7D540FD0E -:1048F800DD05B040FDEF78CF40FD023114070671A9 -:1049080010E1FBEF047118E1FB8FE1FB7F04FD76FA -:10491800D1DD5C8FE1FB9F04FD401CF903DF2266BB -:104928005C10D1DD1C8FE1FB5C10D1DD0B5080C128 -:104938005011FDF536C0EF095040C15011FDF53654 -:10494800C0401CF903DD06401CF904DF22665C0246 -:10495800D1DD1C8FE1FB5C02D1DD0B5040C1501052 -:10496800FDF536C0EF095020C15010FDF536C0C620 -:01497800D767 -:10497900CF0BF90461FC61FCC1C3C5C7520C92920B -:1049890069D4FEC1DFF88EFD708EFCC1717AFA40E0 -:104999001CF903DF06307D2CFDA43BC09EFC609E04 -:1049A900FD34D4FE5206C0B9A5A592DFF9C6C4C22A -:1049B900C061FC61DF520C929269D4FEC1DFF88EAE -:1049C900FD708EFCC1717AFAC736410571A4C6DC47 -:1049D90041F508FD71485005716050053164212683 -:1049E900716207716321D5E2FBDF0FD5E3FBDF0AB3 -:1049F900D5E4FBDF05D5E5FBDD0C31620702EFFAF3 -:104A0900716307716B27FD5047FD7106F516F9EDC6 -:104A19002B4BC73641057184C6DE0DF508FD71487B -:104A29005005FD7106ED2B4BC73641057194C6DE65 -:104A3900154008FD03DD0C4008FD04DD064008FDB6 -:104A49000161F8F508FDD908FDF1E7240000DD084A -:104A590023DD1323DD39EF6071405005E508FD7151 -:104A6900505005ED2B4B8F40059F17F99F1AF9D927 -:104A790017F9FD5336629F19F94017F97FDD06CF03 -:104A890008FD02EF03F508FD71505005ED2B4BC7EA -:104A99003641057194C6DE1CC736410571C4C6DEB0 -:104AA90006CF08FD03EF11F508FD71485005716047 -:104AB9005005EF6ECF08FD044008FD03DF0E8F1986 -:104AC900F99F4005D917F9FDD236EF108F400576C9 -:104AD900C7D917F9FD3133C071505005D91AF9F109 -:104AE900242900DD2D240400DD28242200DD2324CF -:104AF9001100DD0C240100DD19241E00DD14EF0C6A -:104B09004017F960DF0CCF17F961EF06F516F9A028 -:104B190017F94008FD03DF0AD917F9FD5336629FDB -:104B290019F9C09EFC609EFD34D4FE5206C0B9A599 -:104B3900A592DFF961FCC1C3C5C7520C929269D431 -:104B4900FEC1DFF88EFD708EFCC1F616717AFA711E -:104B59004AE5717BBD51405F0401D1DD05A7F647E8 -:104B6900DFF3300400BF2401F6BF2A01300B0BBF6D -:104B79002801FD2603300B0FBF2801FD2603300F46 -:104B89000FBF2801710AE6715320C09EFC609EFD8B -:104B990034D4FE5206C0B9A5A592DFF9C6C4C2C075 -:104BA90061FCC1C3C5C7520C929269D4FEC1DFF83A -:104BB9008EFD708EFCC1717AFAD540FBDD0EEB3E9D -:104BC900FB899E44A23EFBB040FBEF2B710AE63005 -:104BD9000400BF2401F6BF2A01300B0BBF2801FDD9 -:104BE9002603300B0FBF2801FD2603300F0FBF2806 -:104BF90001714320715320C09EFC609EFD34D4FE98 -:104C09005206C0B9A5A592DFF9C6C4C2C061FC614C -:104C1900EF520C929269D4FEC1DFF88EFD708EFCC2 -:104C2900C12008FBF8FF71503002CEABACCC0100BB -:104C3900F6BC0231B2E210617902F6614902DFF392 -:104C490071603002EDCF4C8E519B713BE28B5C025F -:104C5900D1DD1D8B5C08D1DF0971503002CC010018 -:104C6900EFCE8C0770FDAC37629E50CC0102EFC0CD -:104C79008B5C03D1DF408E509C05715030028C0152 -:104C8900D1DF0E8C0570FD5038629C07CC0101EF15 -:104C9900328C014C02DF0671603002EF29CF3402F9 -:104CA9005A716030028C0570C18C0770FD4837C09D -:104CB900CF34024AEF108B5C01D1DD0671603002FE -:104CC900EF0400ED394C1008C09EFC609EFD34D401 -:104CD900FE5206C0B9A5A592DFF961FCC18F0CFC93 -:104CE9004F96FFDF328F0DFC4F97FFDF2A8F0EFCA7 -:104CF9004F98FFDF228FEBFB5C04D1DF1A7120E3B1 -:104D0900FB716307716B27401CF905DD06401CF92F -:104D19000161F8CF1DF902C061FCA04EFC61FCC124 -:104D2900C3C5C7520C929269D4FEC1DFF88EFD70DB -:104D39008EFCC1C1FBF8FF8D1F9C018E31318EE7BE -:104D4900240600DD0823DD0F23DD25EF45717AFAFE -:104D59008C019F3AFCEF3B717AFA401FF902DF0799 -:104D69008C019F39FCEF2B51FF2E019F39FCEF225B -:104D7900717AFA8C019F02F98FE0FB5C01D1DF1295 -:104D8900401CF903DD06401CF904DF06300927FD44 -:104D9900A43B4031FF09DE08A031FF710BE3EF1995 -:104DA9007158F000717221404DFC02DF03F6EF05E6 -:104DB900D94DFCF1A1609F4DFCC0C09EFC609EFDD9 -:104DC90034D4FE5206C0B9A5A592DFF9C6C4C2C043 -:104DD90061FC61FF520C929269D4FEC1DFF88EFD2D -:104DE900708EFCC1717AFA8F12FC5C03D1DD194017 -:104DF9001CF903DD06401CF904DF0D36100571D4DA -:104E0900DE0630153DFDA43BC09EFC609EFD34D4FA -:104E1900FE5206C0B9A5A592DFF961FC61FC00EF5D -:104E2900FD61FC61FC61FC61FC61FC61FC61FC6190 -:104E3900FC61FC61FC61FC61FC61FC61FC61FC6181 -:104E4900FC61FC61FC61FC61FC61FC61FC61FC6171 -:074E5900FC61FC61FC61FC3F -:0A4FF60032303A34313A333600000D +:10230A00E8E867676767020202010101010019260E +:10231A00344453626E777D80807D776E6253443495 +:10232A002619100A08080808080808080A107F7EF3 +:10233A007D7C7A7978777675747271706F6E6D6C50 +:10234A006A6968676665646261605F5E5D5C5A5966 +:10235A0058575655535251504F4E4D4B4A4949487A +:10236A00474645434241403F3E3D3B3A39380801E2 +:10237A0001020203030200FEFBF7F3F0F0F3FA0492 +:10238A001225384D5F6E777A776E5F4D38251204C5 +:10239A00FAF3F0F0F3F7FBFE000203030202010076 +:1023AA00000000001F003B005A0078009700B500AB +:0A23BA00D400F300110130014E01C0 +:1023C4008F07FDB007FDD161E8ED9024CF07FD80B4 +:1023D400710407E6613012F6712420611043DD3286 +:1023E400710407E661306061FB7121203124201300 +:1023F4007130E3FB5002C15011FDFE37C0CF0BF921 +:1024040002EF0F7138E3FBE0C15011FDFE37C0F558 +:102414000BF94002F94BDC164002F9B9DE10400C0E +:10242400F928DE05A00CF9EF27711320EF224002F2 +:10243400F93EDC064002F9BDDC10400DF928DE054A +:10244400A00DF9EF0B711220EF06F50CF9F50DF95B +:102454003112200D3104200931020705713304EFD4 +:1024640003713204311205097140E3FB714202EF3A +:10247400077148E3FB714302D50BF9DD06B00BF994 +:10248400714202401CF90361F8FDD327D7C78F06B8 +:10249400FD76FDCD24401FF901DD05710320EF27F2 +:1024A400664F06FD61F831342014713320FD410577 +:1024B400664C07DD038161F8FD6725FD8C257102FB +:1024C40020301527FD973CC6D7C771620171720190 +:1024D400E0FD94025008FD3E3B629F02F95009FD65 +:1024E4003E3B62767163014002F9F1DC06CF1FF9CD +:1024F40002EF0F4002F904DE06CF1FF903EF03E5F4 +:102504001FF9664CEADC06CF06FD07EF44664CC6AD +:10251400DC06CF06FD06EF39664C9FDC06CF06FDD0 +:1025240005EF2E664C7CDC06CF06FD04EF23664CDB +:1025340050DC06CF06FD03EF18664C22DC06CF06FE +:10254400FD02EF0D664C06DC05E506FDEF03F5061E +:10255400FD4006FD07DF0A401FF90161F8CF1FF9AE +:1025640004C6D7C7C1FBF8FF500AFD9402304000EF +:10257400BB17C15002C15006C1506CFD1C041006AB +:102584005096FD9402C0C6D7C72008FBF8FF8F06FB +:10259400FD5006D604CA2214F7500689A54804F94A +:1025A400A390DFF7401FF90161E8ED1127304A5786 +:1025B400BB17C15002C1503EC1506CFD1C04100633 +:1025C400D2DD077100E2FBED11277108E2FB17046D +:1025D4000300C15004C1500CC1506CFD74031006BB +:1025E400D906FDF10104F42214A9318D12A9318E0A +:1025F400616B08616A08BB17C15002C1500EC1501B +:102604006CFD1C041006F690BB17C15002C1500C9F +:10261400C1506CFD1C04100631542002EFFA7142C3 +:10262400208F06FDF0312E040A21C15010C1504004 +:10263400C1506CFD1C04100631542002EFFA7142A3 +:10264400208F06FDF0312E041A21C15010C15050C4 +:10265400C1506CFD1C04100631542002EFFA714283 +:10266400208F06FDF0312E042A21C15010C1506084 +:10267400C1506CFD1C04100631542002EFFA714263 +:10268400208F06FDF0312E043A21C15010C1507044 +:10269400C1506CFD1C04100650A5FD9402D906FD22 +:1026A400F10104F42214A9318D12A9318E616B0851 +:1026B400616A08BB17C15002C1500EC1506CFD1CA9 +:1026C40004100650A5FD94025004C1506CFD4A0349 +:1026D400C0629C07E906FD0909234E0761C30AE9A4 +:1026E40006FD0902234E0761D80017040300C150F8 +:1026F40004C1500CC1506CFD1C041006F6BB17C17C +:102704005002C1503EC1506CFD1C0410061008C696 +:10271400D7C7C1FBF8FF8F0EF94F02F961F8EDCF6F +:10272400274010F928DE06A010F9EDCF27F510F99F +:102734008F02F99F0EF98F02F95070D6123073513F +:10274400230480001231FF318E039F0FF99FDEFBBB +:10275400F6BB8F0FF97C804C95DC1B8F0FF9318F02 +:10276400241400BDD8AF06F9FDE20C1231FF318EFE +:1027740003318FBBEF198F0FF9318F241400BDD8AB +:10278400AF08F9FDE20C1231FF318E03318FBBD952 +:1027940004F9F1610900BB44000171FEDC03F69009 +:1027A400BB8C0101DE02F6BBABABBF6EFC17C150A4 +:1027B40002C1500CC1506CFD1C041006D2DF088FFE +:1027C40002F99F0EF9EF047100E2FBF2C0C6D7C70D +:1027D4002008FBF8FF401FF902DF0BCFDFFB63CFBC +:1027E400E1FBC8ED4429401FF903DF2C1704060060 +:1027F400C15002C15004C1506CFD74031006D2DDF7 +:1028040006CFDFFB63EF0A8C069FDFFB8C079FE09C +:10281400FBCFE1FBC8ED442917040600C15002C1F7 +:102824005004C1506CFD74031006D2DD107100E237 +:10283400FB710320F5DFFBE520F9ED19298C063146 +:102844008E318D080E07081C00BBD906FDF104105B +:1028540023148972ABFD350EBB8C019C068B9C073F +:1028640017040400C15002C1C1506CFD740310066A +:10287400D261E8ED19298C049FE1FB8C04318E317F +:102884008D080E05081C00BBBDD8F6BDDAC9DC01F5 +:10289400A5FDBE0EDC09CC0364F6BF12F9EF76ABDE +:1028A400BDD8F6BDDAAF12F9BDDCF6BDDEADD8C1D8 +:1028B400ADDAC1C9D800A0F6BDDAADDEFD690EAD52 +:1028C400D8BDDCADDABDDEC0BDDAC0BDD8ADDEFD3D +:1028D400BE0E61D309CC031EF6BF12F9EF37ABBDB0 +:1028E400D8F6BDDAC9DC819DFDBE0EDC0BCC030A33 +:1028F40030F401BF12F9EF1DABBDD8F6BDDAC9DC67 +:10290400019BFDBE0EDC0BCC030530F401BF12F9B4 +:10291400EF03E520F93134040D31120509CFDFFB53 +:1029240064F5E0FBEF1A8C064E03DE0C8C069FDF89 +:10293400FB8C079FE0FBEF088C039FDFFBF5E0FBBC +:1029440040DFFB0BDE064014F90BDE1640DFFB060E +:10295400DE064014F906DE0AD5DFFBDF0ED514F9D6 +:10296400DD095020C15011FDFE37C08FDFFB9F14DD +:10297400F9D51CF961F8CF14F964401CF90361E836 +:10298400F515F940DFFB0BDE03E6EF01F6609C056D +:102994008F15F94E05DD0F8C059F15F98C0570C157 +:1029A4005012FDD005C01008C6D7C75007C1500249 +:1029B400C15084FDE60310045012FD9402500FC16F +:1029C4005002C15084FDE60310045003FD940250EC +:1029D4001FC15002C15084FDE60310045016FD943B +:1029E400025003C15084FD4A03C0625C01D1DD1072 +:1029F4007170E3FB5002C15013FDFE37C0E2EF01DA +:102A0400F2C6D7C75004C15084FD4A03C0625C03B8 +:102A1400D1DD405014FD8F2A34E3FB895C9F998AF1 +:102A24000C7CFF50FF5C14D1DD228A0C7CFF5C140B +:102A34007234E7FB89616A99716207560031620753 +:102A4400058666D1DFF7716307716B2734F6FB895E +:102A54005CEB995002C15084FD4A03C0D2DD225080 +:102A640007C15002C15084FDE60310045033FD94A5 +:102A740002F0C15002C15084FDE60310047178E3F2 +:102A8400FBE0C15013FDFE37C0C6D7C7C12004FB0D +:102A9400F8FFCC02005004C15084FD4A03C0629C7C +:102AA400038C045C20D1DD0E8C036C019C038C022E +:102AB4006C209C02EF138C045C10D1DD0C8C035C45 +:102AC400FE9C038C026C109C028C045C08D1DD0E0D +:102AD4008C036C029C038C026C089C02EF138C0424 +:102AE4005C04D1DD0C8C035CFD9C038C026C049CA7 +:102AF400028C03D1DD05501AFD94028C0370C15081 +:102B040004C15084FDE60310048FE3FB5C9F728CC8 +:102B140003318E316D148C03318E314D616D08613A +:102B24006C5C606162629FE3FB8FEFFB7CFF50FF94 +:102B34005E02D1DD278FEFFB7CFF5E027234E7FB80 +:102B440089616A99716207CC010031620708615991 +:102B5400018C01D1DFF4716307716B27F21006C693 +:102B6400D7C7D9D7FBC15006C15084FDE603100472 +:102B74006276D9D8FBC15007C15084FDE603100426 +:102B84006261666672C6D7FD652BF2D77113007158 +:102B94001B20710303710205E0C15003C15084FD81 +:102BA400E60310045013FD9402F0C15005C1508493 +:102BB400FDE6031004500FC1E0C15084FDE603108C +:102BC40004500AFD94027103055008FD9402501F3D +:102BD400C1E0C15084FDE60310045012FD9402507C +:102BE40003C15084FD4A03C0625C01D1DF02E2D715 +:102BF4005003C1C15084FDE6031004710203711A2D +:102C0400205064FD9402F0C15010FDD005C0F0C105 +:102C14005011FDD005C0F0C15012FDD005C0F50A19 +:102C2400F9F2D75003C15084FD4A03C0625C01D15C +:102C3400DD195014FD8F2AFD072A5014FD9402E07B +:102C4400C15003C15084FDE6031004711300711BCD +:102C540020710303F0C1E0C15084FDE6031004F0C9 +:102C6400C15003C15084FDE6031004F2D7C7200409 +:102C7400FBF8FFCC02008F0AF99C035010C150A44A +:102C8400FD4A03C0629F0AF9D541FBDD04F2ED4B16 +:102C94002D8C037F0AF95C08D1DD108F0AF95C08DA +:102CA400D1DF05CC0210EF03CC02208C037F0AF99C +:102CB4005C04D1DD168F0AF95C04D1DF088C026C48 +:102CC400049C02EF068C026C089C028FE2FB5CF30E +:102CD400728F0AF95C0C6162629FE2FB8FEEFB7CEF +:102CE400FF50FF5E029C02D1DD1F34E6FB896E02B9 +:102CF40099716207CC0100316207086159018C01A6 +:102D0400D1DFF4716307716B278F0AF95C40D1DD61 +:102D1400095002C15012FDFE37C08F0AF95C01D17F +:102D2400DD08E0C15012FDFE37C0717AFA8F0AF94E +:102D34005C41D1DD11340AF9895CBE99D90AF9C123 +:102D44005010FDD005C0F21004C6D7FDAE29F2D74D +:102D5400FD072AF2D7C78FF6FB7617FD8F2A664F39 +:102D6400F6FBDFF2F5F6FBF2C6D7710001057178C8 +:102D74005005713AD5713BD1713ADD713BD98F1051 +:102D8400055CFC9F1005CF54054AE54205711042CD +:102D9400057100420571485005713050057120508D +:102DA40005CF530505CF52050A71305105712051E5 +:102DB40005713BD5717050058F11055CFC9F1105A1 +:102DC400D77178500571080105D77140F00071780A +:102DD4003002713AE6713BE2713BEA713BEE8F10CF +:102DE400055CFC9F1005CF34024AE552FF711A526C +:102DF400710A52714830027130300271203002CFB2 +:102E0400330205CF32020A71303102713BE6717030 +:102E140030028F11055CFC9F110571603002D7717F +:102E24007830027148F000D7C788061666614FDD16 +:102E34000967614EDE0396EF01866672C6D7C71630 +:102E44001714AA0412A943DD29AA0412A923FD52C6 +:102E540020C3AC02FD522013C2BDD813FDB20EDE56 +:102E64000C1714AA0212AA0403BA04EF051714A932 +:102E7400BA04AC041231FF319E03317F087208C6D4 +:102E8400D7C77100F200304400BFB601300188BFDB +:102E94009001300984BF9E01BF9C01BF9A01BF9875 +:102EA40001BF9601BF9401BF9201F53CFF30FE00C3 +:102EB400BFBE01F6BFBC01BFB80150EEBFBA01A14D +:102EC400BFB201C918FE007120120571481EF940F5 +:102ED4001FF902DD0B36100571A461C871401EF99B +:102EE400712812058F1EF9313507F5FDFBCB6CFFF8 +:102EF40000710321C6D730EF00BFB401F6BFBA0199 +:102F04007108F200D7711321D9FDFBF1E724000009 +:102F1400DD1223DD1923DD1123DD2623DD3423DD3A +:102F24003923DD3FFDA42FEF3DFDC72FEF38D9FC3A +:102F3400FBC1AE6CFD2C2EC0F313BE6C717320EF7D +:102F440025F0C1AE6CFD2C2EC0F313BE6C71732042 +:102F5400EF14F6BE6C717220EF0CCB6CFF00717332 +:102F640020EF03FD40308F1EF93145087174207144 +:102F74002104EF06717420715101311421218F1E37 +:102F8400F9314510F6BE64BE6A3174200390EF0136 +:102F9400F6BE6ED731742004F690EF01F6BE6AD700 +:102FA400CF0EFD47F5A8FBAE6C317DBFAEFBFD191E +:102FB40030D2DF0ED9FCFBC1AE6CFD2C2EC0F31356 +:102FC400BE6CD7FD1930D2DD0FCF0EFD47F5A8FB3F +:102FD400AE6C317DBFAEFBD7E9A8FB091823508046 +:102FE400D6BFAAFB22AEFBBDD8304700FD1E0DBFE5 +:102FF400ACFB30AAFBFD422EF313BE6CB00EFDD524 +:103004000EFDDF10CF0EFD47A0A8FB40A8FB1F61FB +:10301400C8F5A8FBD740DFFB0BDC05717320F2D7A2 +:1030240040DFFB06DC11F0C1AE6CFD2C2EC0F313A7 +:10303400BE6C717220EF03FD4030E2D7711221F0B3 +:10304400C1AE6CFD2C2EC0F313BE6CA0B0FB40B01F +:10305400FB40DC3DF5B0FBD9B1FBF1313F040AFD87 +:1030640014D9B1FBF1BDD85008FD6D0D087208E606 +:10307400D2DD040192DFFC896158D1DD0571722033 +:10308400EF03717320A0B1FB40B1FB2061C8F5B11F +:10309400FBD78FB2FBB0B2FBD1DF7431D4D107714F +:1030A4005BD1CFB4FB02D5B4FBDD347140E2FBD974 +:1030B400B3FBF1E734020023DD0625DD0325DF053C +:1030C400F6BE66EF06D9FCFBF1BE66A0B3FB40B3C7 +:1030D400FB20DF06F5B3FBB0B4FBCFB2FB16D7CFB2 +:1030E400B2FB1E7148E2FBD5FEFBDF04F6BE66D7D9 +:1030F400D9FCFBF14266FFDD16D9FCFBF112AE668A +:1031040043DE05A266FFEF03B266FFCFB2FB03D72F +:1031140031142101D7401CF902DF19F6BE64BE6EDA +:10312400BE6ABFB8FBBFBEFBBFC4FBBFBCFBBFC214 +:10313400FBBFC8FB31042103EDE931D5B5FB61E8E0 +:10314400EDE4318F44FB9FB5FB40B6FB1FDC1F71E0 +:103154000002FC4046FBFFDD24D5B7FBDD05B0B71C +:10316400FBEF1A8F46FB9FB7FBF5B6FBEF0F710819 +:1031740002FCD9B6FBF1A1605C1F9FB6FBE9B6FB6C +:103184000948FB5080D6BFB8FBE9B6FB0968FB5081 +:1031940080D6BFBEFBE9B6FB0988FB5080D6BFC40E +:1031A400FBAFB8FB22BCFB12D945FBF133BDD813EE +:1031B400FD1E0DBFBAFBAFBEFB22C2FB12D945FBFD +:1031C400F133BDD813FD1E0DBFC0FBAFC4FB22C835 +:1031D400FB12D945FBF133BDD813FD1E0DBFC6FB51 +:1031E400B0B5FBEF3DF6BFB8FBBFBEFBBFC4FBAF42 +:1031F400BCFB1231FF31AE03316F12F623BFBAFBB1 +:10320400AFC2FB1231FF31AE03316F12F623BFC0E0 +:10321400FBAFC8FB1231FF31AE03316F12F623BF8F +:10322400C6FB8F1EF931451F30C4FBFD422EF3133C +:10323400BE6430B8FBFD422EF313BE6E30BEFBFD00 +:10324400422EF313BE6AD730C4FBFD422EF313BEE5 +:103254006AD7C73122210BD5CAFBDD06B0CAFBED04 +:103264001D33712321D9FFFBF1E7240000DD0F2377 +:10327400DD1B23DD1123DD5723DD2923DD3B560030 +:10328400F50FFDED09335601F50FFDEF78D50FFD70 +:10329400DF075601E50FFDEF055600F50FFDCFCA18 +:1032A400FBFAEF61D50FFDDF0B5601E50FFDCFCA29 +:1032B400FBFAEF51F5FFFBEF4CD50FFDDF0B56008A +:1032C400E50FFDCFCAFBFAEF3CCFFFFB02EF36D987 +:1032D4002FFCF1E7240000DD0923DD2423DD0A238C +:1032E400EF1E5600F50FFDEF1CD50FFDDF0756014D +:1032F400E50FFDEF055600F50FFDCFCAFBFAEF050C +:103304005601E50FFD8F1EF93145086661FB7151C9 +:1033140007EF066661FB710101C6D7C736F000717D +:10332400F4DC297170F000CE9D08CE9EC0CE9F8043 +:10333400F594FFF593FFF592FFE597FFE596FFCE31 +:103344009505CE9810CE9C7F7100D6FB711BE3715E +:103354002BE3711AE7712BE7717A9D710A9E319202 +:103364009E02EFFA710B9E71332171432171532137 +:10337400C6D7C73132211E713221710A9E31929E05 +:1033840002EFFA3404FC3692FF52078B99A5A792F8 +:10339400DFF9710B9EC6D7C7880616314221157115 +:1033A4004221C734CCFB3092FF1652078B99A5A754 +:1033B40092DFF9C666736718CCFBC6D7C771332191 +:1033C4003144211E714321710A9E31929E02EFFA0B +:1033D4003492FF36CCFB52078B99A5A792DFF97183 +:1033E4000B9E31542113717B9E8F0CFC9E9A8F0D82 +:1033F400FC9E9B714321717A9EC6D7CFD7FB5CCFCD +:10340400D8FB5FCFF8FB32D7C7CFD4FB10CFD5FBA7 +:1034140029CFFCFBFFF5FDFBF5FEFBF5FFFBF500FB +:10342400FCCFF9FB205600664C64DE08723844FB7E +:103434000086EFF3C6D7C788061617F1E7340300F2 +:103444002361E3ED4E372361F8ED1E35B12361E3CB +:10345400ED25352561F8ED34352407002407006196 +:10346400D8ED4E37240B0061F8ED55352361F8EDA6 +:103474009C352361F8ED69352361F8ED1837256132 +:10348400F8ED38372561F8ED0536B12561D8ED2919 +:103494003624000061F8ED36362361F8ED4E37240A +:1034A40002002361E3ED46362361F8ED58362361CB +:1034B400F8ED6A362361F8ED58362361F8ED7C3671 +:1034C4002361F8ED8E362361F8ED9E362361F8ED25 +:1034D400A7362361F8EDB3362361F8EDBF362361D7 +:1034E400F8EDC8362402002361E3ED4E37240200D0 +:1034F40061F8EDD1362361F8EDDD362561F8EDE9AB +:1035040036240A0061F8EDF53624120061F8ED1254 +:10351400372361F8ED0037ED5037679FD6FBED5A3E +:1035240037308B2BFD973C66736718D4FBED5A3705 +:1035340040D9FB6ADF1440DAFB68DF0E674C6CDFAE +:103544000930F944FD973C713AD5679FDBFBED5A8E +:103554003767D1DD0630A640FD973C34F4FB896122 +:103564006F99ED5A37675C02D1DD08304F2DFD9716 +:103574003CEF0C675C01D1DD0630542DFD973C67B0 +:103584005C3CD1DD1030592DFD973C675C3C726684 +:10359400736218D4FBED5A3767D1DD625C01D1DD6B +:1035A40005300800EF01F6609F2BFC675C02D1DD5B +:1035B40003E6EF01F6342BFC89616899675C04D15A +:1035C400DD04E6A1EF01F6342BFC89616899675CA0 +:1035D40008D1DD05302000EF01F6342BFC89616849 +:1035E40099675C10D1DD05301000EF01F6342BFC37 +:1035F40089616899675C20D161E871602BFCED5AA0 +:1036040037D516F9DF09679FFDFBA016F9EF1340C4 +:1036140016F905DE0DD916F9F1B11267480AFDA0B5 +:1036240016F9ED5A37675C0F7266736218D4FBEDB6 +:103634005A374016F964DE0AE916F9671844FBA004 +:1036440016F9675C7F318EC117F1243000FD9B337E +:10365400C0ED5A37675C3F318EC117F1243000FD4D +:103664009B33C0ED5A37675C07318EC117F12430A4 +:1036740000FD9B33C0ED5A37675C1F318EC117F1D3 +:10368400243000FD9B33C0ED5A3767318EC117F1EA +:10369400243000FD9B33C0ED5A37679E999F0BFC85 +:1036A400ED5A37715221675C7F9F0CFCED5A3771DC +:1036B4005221675C3F9F0DFCED5A37675C3F9F0EBC +:1036C400FCED5A37675C1F9F0FFCED5A3730D13E33 +:1036D400FD973C679F14FCEF7D308C3EFD973C6763 +:1036E4009F15FCEF7130AE3EFD973C679F18FCEFD1 +:1036F40065675C01D161E8FD0F48EF5A4026FCC8BC +:10370400DE54E926FC671872FAA026FCEF48679F8E +:1037140026FCEF4267318E247200DD07240500DDAC +:103724000AEF0B304509FD973CEF03F5ABFF679FAC +:10373400F7FBEF228FFAFB617F5C12D1DD0630319B +:103744003AFD973C679FFAFBEF0CEF0A664C52DE9A +:1037540005736718D4FBC6D7C716664C30DC094C12 +:1037640037DE05FD7633EF67664C02DF1F8FD6FB2D +:103774005C03728F2DFC5C03318E316D08616A0825 +:10378400128F2DFC5C80312A6162EF49664C3DDF6B +:103794000AAE90BF28FCF928FCEF3A664C3EDF05E0 +:1037A400F929FCEF30664C4FDF05FD3348EF266600 +:1037B4004C61DF09E926FC0972FA72EF18664C7F46 +:1037C400DF0D303341FD973C713AD5524AEF06661E +:1037D4007309D4FB72C6D7C71617F1241000240549 +:1037E40000DC07244C00DD0DEF0E667238D4FB00BC +:1037F400716221EF03A026FCC6D7C7C1C1FBF8FF45 +:10380400401CF903DD06401CF904DF2F8C02730908 +:10381400DCFB5E0AD1DF248C02318E04D4FB1489D4 +:103824006E0A99716207CC0100316207086159017F +:103834008C01D1DFF4716307716B271004C6D7CFF5 +:103844002DFC03F52BFCF52FFCF531FCD7C78806BE +:103854001617F1E734020025DD4923DD1A25DD289A +:1038640023DD0523DD37EF47711222679F30FC30DB +:10387400313AFD973CEF38675C03D161F87102235C +:10388400675C839F2DFCEF27675C039F2FFC675CBD +:10389400034C0261F8712221FD5632EF12679F3109 +:1038A400FCEF0C6791DF08E0C15012FDFE37C0C683 +:1038B400D7C71617F1E724000061F8ED473923DD77 +:1038C40061240300DD0C240200DD6024F900DD7AAC +:1038D400EF7B40DFFB5BDC06CF2EFC0FEF3240DFDB +:1038E400FB4CDC06CF2EFC0BEF2640DFFB33DC0663 +:1038F400CF2EFC07EF1A40DFFB0BDC06CF2EFC03B8 +:10390400EF0E40DFFB06DC05E52EFCEF03F52EFC95 +:1039140031020705308000EF01F6086F2EFC7208B3 +:10392400EF318F2BFCF52BFC72EF2840DDFB01DD22 +:103934000FD9DDFBF11231FE03311F087208EF13BA +:10394400E2EF107172225235EF09F2EF0666730945 +:103954002AFC72C6D7C71617F1E7240000DD382405 +:103964001000DD1C23DD1C23DD30240E00DD1824B3 +:103974001100DD1B240F00DD12243000DD15EF1EC5 +:10398400E2EF1D5202EF195204EF155206EF1152E5 +:1039940005EF0D5207EF09F2EF065203EF0252FF53 +:1039A400C6D7C78F18FDB018FDD1DF72CF18FD0739 +:1039B40031742150717321401CF903DF473610FD27 +:1039C400C7D93CFCFD6F3B618A70618AFD9E3BC098 +:1039D4003614FDC7D93BFCFD6F3B618A70618AFDDB +:1039E4009E3BC0D93EFCF1312F609F3DFC8F3AFCD9 +:1039F4004F3DFCDD0F7102228F3DFC9F3AFC3031BC +:103A04003AFD973C7150F000CE300BCF170006CE34 +:103A14003106FD2603717A30710BE3710BE7C6D7CB +:103A24008F3DFC9F3AFC8F3DFC9FDDFBD7401CF98A +:103A340003DD02F2D78FFAFB5C12D1DD088F3DFC67 +:103A44009F42FCEF6A310422247103227123228FE6 +:103A5400FAFB5C04D1DD088FF9FB9F43FCEF068F72 +:103A64003DFC9F43FC8F43FC9F42FCEF42311422F8 +:103A74002C711322712222D530FCDF05F544FCEFB2 +:103A84000B8F30FC5002D6A1609F44FC8F44FC9FF6 +:103A940042FC5040C15012FDFE37C0EF12312222C9 +:103AA400088F43FC9F42FCEF068F44FC9F42FC8F2F +:103AB40042FC9FDDFB4042FC01DF05E530FCEF0EDC +:103AC400D942FCF11231FE03311F609F30FC8FFAA2 +:103AD400FB5C01D1DD02F2D7E942FC09382370C155 +:103AE4005013FDD005C0F2D7C7168B728C01614A02 +:103AF400DE248B728C02614ADE188C01728C0261A6 +:103B04004ADE068C01318EEF048C02318E08720875 +:103B1400EF268B72EF228B728C02614ADE048B7269 +:103B2400EF168C01728C026142DE068C01318EEF3D +:103B3400048C02318E087208C6D7C716710AE77161 +:103B44000BE37150F000CE300BCF170006669E31A8 +:103B5400FD2603717A30710BE33182E302EFFA8DB3 +:103B64001F7158F000710BE772C6D7C7C1C1FBF8CB +:103B7400FF8C024CF0DC0452FFEF1B8C024C05DE80 +:103B840003F2EF128C022C049C02318E318D52EC24 +:103B9400FD350EBB8B721004C6D7C7C1C1FBF8FF3D +:103BA400AC0A14A91489708C026128706131FD5229 +:103BB400201344030071FEDC16AC0A14A9148C0211 +:103BC40099AC0A14CA0200AC0A14CA0310EF6EAC12 +:103BD4000A14A914894E02DE0AAC0A148A02819AD4 +:103BE40002EF13AC0A14A914894E0261D308AC0A7B +:103BF400148A02919A02AC0A148A03919A03D1DFBF +:103C04003CAC0A148A024C10DF10A91489318EA12D +:103C140012AC0A14A9146299EF17AC0A148A024C64 +:103C2400F0DF0EA91489318EB112AC0A14A9146202 +:103C340099AC0A14CA0200AC0A14CA03101004C6D0 +:103C4400D7ED823C717BFAC7D550FC61F831342240 +:103C540027713322D550FC61E8B050FC717AFA56D2 +:103C640000664C0BDD1272F3311C791AFDCEFC0098 +:103C740061CAFDE13C86EFE9717AFAF2C6D7C7560C +:103C840000664C0ADE0BF0317E12F67852FC86EFA9 +:103C9400F0C6D7C7C1C1FBF8FFCC01008C014C0AA8 +:103CA400DE36717BFA8C01F0317E0452FC14A9617A +:103CB40068DF09AC02B9717AFAF2EF1D8C01F031B8 +:103CC4007E127952FC614902DF06717AFAE2EF0949 +:103CD400717AFA615901EFC4E21004C6D7C720040F +:103CE400FBF8FFF64252FC61F8EDD93D717BFA9C7A +:103CF400038C034C0ADE4F8C03F0317E0452FC1417 +:103D0400A96168DF05717AFAEF3C8C03F0317E1209 +:103D14007952FCE743DF06717AFA00EF21717AFAEF +:103D24008C0372F3311C7952FCCEFC0061CA629C94 +:103D340002D1DF0A8C03F0317E12E67852FC717BEB +:103D4400FA615903EFABCC0200CC01018C02F031D3 +:103D54007E0452FC14A96168DD7B8C02F0317E1272 +:103D64007952FCE743DF688C014C0ADE628C01F077 +:103D7400317E127952FCE743DD50717BFA8C01F0FD +:103D8400317E0452FC14A96168DF1B616901717BF7 +:103D9400FA8C01F0317E12F67852FC717AFA8C02B8 +:103DA4004E01DCE7EF2F8C01F0317E0452FC14A9A4 +:103DB400128C02F0317E337852FC8C01F0317E1289 +:103DC400E67852FC615902717AFA615901EF9861FF +:103DD4005902ED503DCC0200CC01008C014C0ADEAE +:103DE4001E8C01F0317E0452FC14A96168DF05CCFD +:103DF4000201EF068C02D161E800615901EFDCF2A7 +:103E04001004C6D7C72006FBF8FF3419FCC55006BA +:103E1400C150A8C15030FD74031006D2DD1DA06648 +:103E2400FC4066FC08DE03E2EF5A3414FC895CFCB7 +:103E340099FDD13E7110E2FBF2EF49F566FC8F1457 +:103E4400FC5C01D1DD26401CF903DF205010C18049 +:103E5400FDFE37C0C736100571D4C6DE0F17C1503A +:103E640006C150A8C15030FD74031006401CF9016E +:103E7400DD11401CF905DD0B8F14FC5C02D161E8F7 +:103E8400FDFE44F21006C6D7D915FCC15030FD4AD8 +:103E940003C0629F18FC7130E5FB8FEDFB5C08D119 +:103EA400DF06716307716B27F2D7D918FCC1D917E4 +:103EB400FCC15030FDE60310047130E5FB8FEDFBCF +:103EC4005C08D1DF06716307716B27F2D7C7200A3C +:103ED400FBF8FF500FC15030FD4A03C04041FB02C4 +:103EE400DF077110E2FBF2EF547118E2FBCC07001C +:103EF400CC0812CC09808F14FC5C03D1DF08717AE2 +:103F0400D5CC0607EF06717BD5CC062F1704060027 +:103F1400C15004C150A0C15030FD1C041006C73666 +:103F2400100571D4C6DE15401CF903DF0F17C1500C +:103F340006C150A8C15030FD74031006F2100AC621 +:103F4400D7C78F1CF9318F240200DF04F6BF6AFC47 +:103F54008F30FDB030FDD161E8ED3640CF30FD0447 +:103F64008F1CF9318FE723DD0B2402002403006149 +:103F7400C8ED3640E6A1426AFCDF0AE0C15010FDFC +:103F8400FE37C0EF2430F400426AFCDF0B5002C15C +:103F94005010FDFE37C0EF118FF8FB5005D604F426 +:103FA40000426AFC61D8E520F931340709715322D3 +:103FB400F6BF6AFCEF1731542206F6BF6AFCEF0D18 +:103FC400A26AFCF6426AFCDF0490BF6AFC8F1FF908 +:103FD400318FE723DD07B12361D30CEF12361005CF +:103FE40071C4716122EF0B710402716122EF0371DC +:103FF40062223162221A406CFC0361D8A06CFC403E +:104004006CFC02DF0E5004C15010FDFE37C0EF03FC +:10401400F56CFC31420718406DFC0361D8A06DFCBF +:10402400406DFC02DF0C5010C1FDFE37C0EF03F5FC +:104034006DFCC6D7D7C78F14FC5C03D1DD113610D5 +:104044000571D4DE0A30083EFD973CD261F8004089 +:104054001CF903DF1B3122070730712CFD973C004C +:104064003174220C7173225080C15012FDFE37C08E +:10407400401CF903DD05F6BD1AEF25D500FCDF0968 +:10408400F6461ADD1BB61AEF17D9FCFBF1461ADD0A +:104094000FD9FCFB12AD1A43DE04A61AEF02B61ABE +:1040A400C6D78FF4FB5C10D161E87112238FF4FB47 +:1040B4005C0FD1DD758FF4FB5C01D1DD05F51CF9D6 +:1040C400EF688FF4FB5C02D1DD15E0C15003C150F1 +:1040D40084FDE6031004711300711B207103038F28 +:1040E400F4FB5C08D1DD05710303EF1C8FF4FB5C6A +:1040F40004D1DD14711300711B20310423037103F7 +:1041040003342DFC895CFC995005FD940271020373 +:104114005003C1C15084FDE6031004711A20FD242C +:104124003A30313AFD973C710323F5F4FBF2D7C7DB +:10413400364105718461D8EDE2413641057194DE62 +:104144000771405005CEABAC31B2D104E2EDF14180 +:10415400713BD18F16F9A016F9318EE7240000DDEA +:104164001723DD1C23DD2723DD2C23DD3823DD4449 +:1041740023DD4923DD4EEF668F1FF99F4005EF587D +:10418400F0C15084FD4A03C0629F4005EF4A8F0688 +:10419400FD9F4005EF425008C1506CFD4A03C062C8 +:1041A4009F4005EF335009C1506CFD4A03C0629F24 +:1041B4004005EF248F6EFC9F4005EF1C8F02F99F92 +:1041C4004005EF14711420E661301271042061DCA3 +:1041D40031196162629F4005CEABACE2EF0F7160B2 +:1041E400500571485005713BD5F516F9F2C6D7C78D +:1041F4008F1CF9318FE724000061F8ED974323DD2C +:104204001B2361F8EDAB422361F8ED35432361F8DC +:10421400ED72432361F8ED0744ED6844D51DF9DFE1 +:104224002BF6426AFCDD05F533FDEF03A033FD40B8 +:1042340033FD65DC09F51CF9713222ED6B44AF6A7C +:10424400FC440A0061D8ED6B44E51DF9715222F576 +:1042540033FDF5F7FBFD4105713320FD9124401F2B +:10426400F904DF09713222F51CF9ED6B44FDD32703 +:1042740040E1FB9BDE09713222F51CF9ED6B44FD34 +:10428400902BD2DD09713222F51CF9ED6B44401DEF +:10429400F901DF05F5FDFBEF04CFFDFB03CF1CF9AE +:1042A40002FD652BED6B44CF350002CF37001DCFE7 +:1042B400120510FD6E2DFDCE2D714A9DFD4338FD76 +:1042C4000C34F537FF712BE0F51DF9713222CBE484 +:1042D4003FEFCBE6F6F0FD4105713BD48F1EF9317B +:1042E40035305004C15084FD4A03C0625C03318EF2 +:1042F400315D34E3FB896168995002C15084FD4A01 +:1043040003C0D2DD067170E3FBEF047178E3FBFDBB +:104314009124FD852E71381EF9CF1CF9038FD6FB2D +:104324005C02D1DD095080C15010FDFE37C0ED6B39 +:1043340044FD6D4431A4E020712BE031020C05FDF5 +:10434400E644EF145027C15005C15084FDE6031024 +:1043540004CF1CF9047132223114230CA032FD4025 +:1043640032FDFF61F8FDE644FDDA44ED6B44FD6D7A +:104374004431020C18F0C15005C15084FDE603100D +:10438400045005FD9402FDE644CF1CF903FDDA4414 +:10439400ED6B44CFFDFB03F5FEFB710221F6426C8D +:1043A400FF61E8ED6B44F500FCF520F9F514FCFD24 +:1043B400D13EFDFA2EFDC52DFD232E714B9DF5E456 +:1043C400FBF5E5FBF5E6FBF5E7FB31542002EFFADC +:1043D400CE3708CBE4BFFFCBE6FFF1CED4FFCF3717 +:1043E4000009F51205F6BEE0BEE2BED0716A27FDF3 +:1043F400272CFDAA05F533FDCF1CF905715222F6D1 +:10440400BF6AFC3102071CFD9124AF6AFC440A0018 +:10441400DC06E51DF9E51CF9401FF901DD49FDAA9B +:1044240005EF44F51DF9FDAA0571730171320431DC +:10443400120502EFFA7143027103207132203194A4 +:104444009E02EFFA712AE7CEA409F5F30061FD316B +:10445400040703715322E5F300CEA408712BE7E5AA +:104464001CF9EF0300EFFDC6D7D570FCDF1E310247 +:1044740000195003C15084FD4A03C0625C01D1DFBE +:1044840007F51CF9713222D7E570FCD74070FCF0B7 +:10449400DF083104003FF570FCD74070FCC8DF0B27 +:1044A400F51CF9713222CF70FCF0D731020004A060 +:1044B40070FCD7F0C15004C15084FDE60310048F92 +:1044C400E3FB5C9F9FE3FB7110F4FB30A640FD9778 +:1044D4003CCF70FCF0D7D520F9DD06F51CF971321C +:1044E40022D7711323F532FD717207FD2603FD26D1 +:1044F40003717307D7FD1706F2D7C7200CFBF8FF2B +:104504008F1AFCF0F919FCF303FD522013BC048F3D +:104514001CFCF0F91BFCF303FD522013BC028F1E9C +:10452400FCF0F91DFCF303FD522013BBAC04BDD811 +:10453400F6BDDAAC04311EBDDCF6BDDEFDF30CAD18 +:10454400D8BDDCADDABDDEAC02BDD8F6BDDAAC0256 +:10455400311EDADCC3DADEC3BDDCF6BDDEFDF30CEE +:10456400C0BDDEC0BDDCADDEFD690EADD8BDDCADC9 +:10457400DABDDEABBDD8F6BDDAAB311EDADCC3DAA8 +:10458400DEC3BDDCF6BDDEFDF30CC0BDDEC0BDDCAC +:10459400ADDEFD690EDADAADD8FD3249C3C58FFE52 +:1045A400FC5C3FF0317E047EFC14C2C0B9A0FEFC6A +:1045B400F6BC08BC0A9C078C074C2EDD3E8FFEFC23 +:1045C4000E0770F161DC605C3FF0317E12797EFC95 +:1045D400BDD8F6BDDA8C0773097A23318FBDDC7040 +:1045E400BDDEFDF30CAC08BDDCAC0AFD690EADDA32 +:1045F400BC0AADD8BC08615907EFBCAC08BDD8AC47 +:104604000ABDDAC9DC0004F6FDBD0DC9DCFFFFF606 +:10461400FDD20EADD8BF78FCAF72FC4278FCDD123F +:10462400AF74FCBF76FCAF72FCBF74FCAF78FCBF08 +:1046340072FCAF74FC4276FCDC50AF72FC4274FC3A +:10464400DE48AF34FD4272FCDE40407AFC16DC1FCB +:10465400407AFCA0DE168F7BFC4F7AFCDE0EAF7234 +:10466400FC227CFC44691061C8FDD746F57AFCAF96 +:1046740072FC445146DC0BAF72FC241027BF36FD9C +:10468400EF1930F82ABF36FDEF11407AFCFFDD0345 +:10469400E6EF01F6347AFC89610899AF76FC42743E +:1046A400FCDC1BAF74FC4272FCDE13AF72FC4236BE +:1046B400FDDE0BF57BFCAF72FCBF7CFCEF11407B95 +:1046C400FCFFDD03E6EF01F6347BFC8961089910F9 +:1046D4000CC6D7C72008FBF8FFA01FFCD51FFCDFC2 +:1046E4001CA020FCD520FCDF14A021FCD521FCDF7C +:1046F4000CCF1FFCFFCF20FCFFCF21FCFF717BFA06 +:10470400710A9E31929E02EFFA8E98FDE60E9C0588 +:104714008E949F38FD8E969F39FD8E979F3AFD8E1D +:10472400939C048E929C03FDC44813BC068F24FC06 +:104734004E04DC0E8C044F24FCDF0C8C034F25FC50 +:10474400DC05CC0201EF03CC02008F3BFD4E05DFFC +:10475400218C060E02708C071C0012AF00FD43DE94 +:104764004E8C060E02708C071C002200FDFDE747EC +:10477400EF3D8C05318EB112D93BFDF143DF258C21 +:10478400055C0391DF03E6EF01F6046D01313D1290 +:1047940001032200FD610906080E02081C00BBFD8E +:1047A400E747EF0B8F3BFD4E05DE04F6FDE7478C34 +:1047B400059F3BFD8C060E02708C071C00BF00FD9C +:1047C400D9FFFCF1010422F9BB14A944FFFFDF0463 +:1047D400E6B9EF0BAB14A944FEFFDD03A9A1B910A0 +:1047E40008C6D7C7161744A90061C836A800A0FF99 +:1047F400FC40FFFCA861C8F5FFFCF9FFFCF3311C89 +:10480400F67822F9B7F647DFE5C6D7C756A8966605 +:10481400F0317E12F6B17822F966D1DFF1F51FFC92 +:10482400F520FCF521FCF5FFFCC6D7712323D7C77F +:104834002004FBF8FFD916F9F1E7240000DD112369 +:10484400DD1C23DD2123DD2623DD2F23DD33EF389B +:104854008FFFFC9F02FDA016F9F938FDEF5EA0164C +:10486400F9F939FDEF56A016F9F93AFDEF4EA01605 +:10487400F98F3BFDFD000F72EF42A016F95255EF80 +:104884003BA016F952AAEF34F902FDF3311C792248 +:10489400F9BB312223058B9C03EF128C019C03D5B9 +:1048A40002FDDF06CF02FDA7EF03B002FD718071A8 +:1048B400272361DC61FB7121238C03721004C6D7AA +:1048C400C72006FBF8FF8E98FDE60E9C038E97FD2D +:1048D400E60E9C028E96FDE60E9C018E94FDE60E7D +:1048E4009B710B9E717AFA8C02F0317E1279AA23A5 +:1048F400BC048C035C03D1DF158C024C03DE0C8CEE +:10490400024C02DF098C014C1D61F86179048C01B1 +:10491400318EB1610904BC04313D120103BC048C25 +:10492400040D708C051C00BC04121006C6D7C7C346 +:10493400C12008FBF8FFF661490A61F8614908DF04 +:1049440007F7340000EDCF49E6BC04F6BC06AC0A18 +:10495400BC02AC08BBAC06614902AC0461F8614915 +:1049640000DE28AC04BDD8AC06BDDAE1FD780EAD9E +:10497400DABC06ADD8BC04ABBDD8AC02BDDAE1FDEF +:10498400930EADDABC02ADD8BBEFCAAC06BC02AC28 +:1049940004BBAC08BDD8AC0ABDDAAC04BDDCAC06C3 +:1049A400FDF60DAC04BDDCAC06FD690EE1FD930E15 +:1049B400ADDABC06ADD8BC04AC06614902AC0461F6 +:1049C400F8614900DCC5AC0214AB12100CC6D7C7A1 +:1049D400D53CFDDD05B03CFDEF78CF3CFD02311444 +:1049E40007067110E3FBEF047118E3FB8FE3FB7F11 +:1049F40004FD76D1DD5C8FE3FB9F04FD401CF903CD +:104A0400DF22665C10D1DD1C8FE3FB5C10D1DD0B73 +:104A14005080C15011FDFE37C0EF095040C1501104 +:104A2400FDFE37C0401CF903DD06401CF904DF22FB +:104A3400665C02D1DD1C8FE3FB5C02D1DD0B5040D0 +:104A4400C15010FDFE37C0EF095020C15010FDFECB +:044A540037C0C6D7CA +:104A5800CF0BF90461FC61FCC1C3C5C7520C92922B +:104A680069D4FEC1DFF88EFD708EFCC1717AFA4000 +:104A78001CF903DF0630712CFD973CC09EFC609E3C +:104A8800FD34D4FE5206C0B9A5A592DFF9C6C4C24A +:104A9800C061FC61DF520C929269D4FEC1DFF88ECE +:104AA800FD708EFCC1717AFAC736410571A4C6DC67 +:104AB80041F508FD714850057160500531642126A3 +:104AC800716207716321D5E4FBDF0FD5E5FBDF0ACF +:104AD800D5E6FBDF05D5E7FBDD0C31620702EFFA0F +:104AE800716307716B27FD2F48FDC033F516F9ED8B +:104AF8000A4CC73641057184C6DE0DF508FD7148BC +:104B08005005FDC033ED0A4CC73641057194C6DE29 +:104B1800154008FD03DD0C4008FD04DD064008FDD6 +:104B28000161F8F508FDD908FDF1E7240000DD086A +:104B380023DD1323DD39EF6071405005E508FD7171 +:104B4800505005ED0A4C8F40059F17F99F1AF9D967 +:104B580017F9FD5C37629F19F94017F97FDD06CF19 +:104B680008FD02EF03F508FD71505005ED0A4CC72A +:104B78003641057194C6DE1CC736410571C4C6DED0 +:104B880006CF08FD03EF11F508FD71485005716067 +:104B98005005EF6ECF08FD044008FD03DF0E8F19A6 +:104BA800F99F4005D917F9FDDB37EF108F400576DF +:104BB800C7D917F9FD3A34C071505005D91AF9F11F +:104BC800242900DD2D240400DD28242200DD2324EF +:104BD8001100DD0C240100DD19241E00DD14EF0C8A +:104BE8004017F960DF0CCF17F961EF06F516F9A049 +:104BF80017F94008FD03DF0AD917F9FD5C37629FF2 +:104C080019F9C09EFC609EFD34D4FE5206C0B9A5B9 +:104C1800A592DFF961FCC1C3C5C7520C929269D451 +:104C2800FEC1DFF88EFD708EFCC1F616717AFA713E +:104C38004AE5717BBD51405F0401D1DD05A7F64708 +:104C4800DFF3300400BF2401F6BF2A01300B0BBF8D +:104C58002801FD2603300B0FBF2801FD2603300F66 +:104C68000FBF2801710AE6715320C09EFC609EFDAB +:104C780034D4FE5206C0B9A5A592DFF9C6C4C2C095 +:104C880061FCC1C3C5C7520C929269D4FEC1DFF85A +:104C98008EFD708EFCC1717AFAD540FBDD0EEB3EBD +:104CA800FB899E44A23EFBB040FBEF2B710AE63025 +:104CB8000400BF2401F6BF2A01300B0BBF2801FDF9 +:104CC8002603300B0FBF2801FD2603300F0FBF2826 +:104CD80001714320715320C09EFC609EFD34D4FEB8 +:104CE8005206C0B9A5A592DFF9C6C4C2C061FC616D +:104CF800EF520C929269D4FEC1DFF88EFD708EFCE3 +:104D0800C12008FBF8FF71503002CEABACCC0100DB +:104D1800F6BC0231B2E210617902F6614902DFF3B2 +:104D280071603002EDAE4D8E519B713BE28B5C029F +:104D3800D1DD1D8B5C08D1DF0971503002CC010038 +:104D4800EFCE8C0770FDB538629E50CC0102EFC0E3 +:104D58008B5C03D1DF408E509C05715030028C0172 +:104D6800D1DF0E8C0570FD5939629C07CC0101EF2B +:104D7800328C014C02DF0671603002EF29CF340219 +:104D88005A716030028C0570C18C0770FD5138C0B3 +:104D9800CF34024AEF108B5C01D1DD06716030021E +:104DA800EF0400ED184D1008C09EFC609EFD34D441 +:104DB800FE5206C0B9A5A592DFF961FCC18F0EFCB1 +:104DC8004F96FFDF328F0FFC4F97FFDF2A8F10FCC3 +:104DD8004F98FFDF228FEDFB5C04D1DF1A7120E5CD +:104DE800FB716307716B27401CF905DD06401CF950 +:104DF8000161F8CF1DF902C061FCA050FC61FCC143 +:104E0800C3C5C7520C929269D4FEC1DFF88EFD70FB +:104E18008EFCC1C1FBF8FF8D1F9C018E31318EE7DE +:104E2800240600DD0823DD0F23DD25EF45717AFA1E +:104E38008C019F3CFCEF3B717AFA401FF902DF07B7 +:104E48008C019F3BFCEF2B51FF2E019F3BFCEF2277 +:104E5800717AFA8C019F02F98FE2FB5C01D1DF12B3 +:104E6800401CF903DD06401CF904DF06301527FD58 +:104E7800973C4031FF09DE05A031FFEF197158F06A +:104E880000717221404FFC02DF03F6EF05D94FFC99 +:104E9800F1A1609F4FFC710BE3C0C09EFC609EFDBA +:104EA80034D4FE5206C0B9A5A592DFF9C6C4C2C063 +:104EB80061FC61FF520C929269D4FEC1DFF88EFD4D +:104EC800708EFCC1717AFA8F14FC5C03D1DD194035 +:104ED8001CF903DD06401CF904DF0D36100571D4FA +:104EE800DE0630083EFD973CC09EFC609EFD34D433 +:104EF800FE5206C0B9A5A592DFF961FC61FC00EF7E +:104F0800FD61FC61FC61FC61FC61FC61FC61FC61B0 +:104F1800FC61FC61FC61FC61FC61FC61FC61FC61A1 +:104F2800FC61FC61FC61FC61FC61FC61FC61FC6191 +:074F3800FC61FC61FC61FC5F +:0A4FF60031373A33343A3432000008 :00000001FF  \ No newline at end of file diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index 4b78cbf..b41c127 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 ebfe101..b3a1b39 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.31 Date:13 Jul 2010 Page: 1 +78K0R Linker W1.31 Date:14 Jul 2010 Page: 1 Command: -yC:\Program Files\NEC Electronics Tools\DEV -_msgoff -obsr.l mf ..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10 @@ -24,8 +24,8 @@ Direc-file:bsr_mcu.dr *** Link information *** 66 output segment(s) - 3CE9H byte(s) real data - 5453 symbol(s) defined + 3D2DH byte(s) real data + 5403 symbol(s) defined *** Memory map *** @@ -48,8 +48,6 @@ Direc-file:bsr_mcu.dr LDR_CNSL WDT 00002H 00000H LDR_CNSL 00002H 00000H CSEG PAGE64KP LDR_CNSL i2c_mcu 00002H 00000H - LDR_CNSL 00002H 00000H CSEG PAGE64KP - LDR_CNSL rtc 00002H 00000H LDR_CNSL 00002H 00000H CSEG PAGE64KP LDR_CNSL self_flash 00002H 00000H @@ -88,57 +86,55 @@ Direc-file:bsr_mcu.dr LDR_CODL main 000C4H 00000H LDR_CODL WDT 000C4H 00000H LDR_CODL i2c_mcu 000C4H 00000H - LDR_CODL rtc 000C4H 00000H LDR_CODL self_flash 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG ?OCDSTAD 000CEH 0000AH CSEG - LDR_CODE 000D8H 00912H CSEG + LDR_CODE 000D8H 0087BH CSEG LDR_CODE loader 000D8H 001E0H LDR_CODE main 002B8H 0006EH LDR_CODE WDT 00326H 00000H - LDR_CODE i2c_mcu 00326H 002AAH - LDR_CODE rtc 005D0H 000E0H + LDR_CODE i2c_mcu 00326H 002F1H LDR_CODE self_flash - 006B0H 0033AH - FSL_CODE 009EAH 00322H CSEG + 00617H 0033CH + FSL_CODE 00953H 00322H CSEG FSL_CODE fsl_block_cmd - 009EAH 0002BH + 00953H 0002BH FSL_CODE fsl_block_check - 00A15H 00013H + 0097EH 00013H FSL_CODE fsl_common - 00A28H 0014FH + 00991H 0014FH FSL_CODE fsl_reset - 00B77H 00001H + 00AE0H 00001H FSL_CODE fsl_si_ibf - 00B78H 00064H + 00AE1H 00064H FSL_CODE fsl_phySwap - 00BDCH 0004DH + 00B45H 0004DH FSL_CODE fsl_si_common - 00C29H 00061H - FSL_CODE fsl_swap 00C8AH 00030H + 00B92H 00061H + FSL_CODE fsl_swap 00BF3H 00030H FSL_CODE fsl_write - 00CBAH 00052H - @@LCODE 00D0CH 002AFH CSEG - @@LCODE @cstart 00D0CH 0006DH - @@LCODE @imul 00D79H 00011H - @@LCODE @lumul 00D8AH 0002BH - @@LCODE @isdiv 00DB5H 00022H - @@LCODE @iudiv 00DD7H 0002DH - @@LCODE @isrem 00E04H 00021H - @@LCODE @iurem 00E25H 0002FH - @@LCODE @lsdiv 00E54H 00039H - @@LCODE @ludiv 00E8DH 0003FH - @@LCODE @divuw 00ECCH 00034H - @@LCODE @ladd 00F00H 0000FH - @@LCODE @llsh 00F0FH 0001BH - @@LCODE @lursh 00F2AH 0001FH - @@LCODE @iscmp 00F49H 0000CH - @@LCODE @lscmp 00F55H 00014H - @@LCODE @lband 00F69H 00014H - @@LCODE @bcdtob 00F7DH 0001AH - @@LCODE @bbcd 00F97H 00024H -* gap * 00FBBH 0003BH + 00C23H 00052H + @@LCODE 00C75H 002AFH CSEG + @@LCODE @cstart 00C75H 0006DH + @@LCODE @imul 00CE2H 00011H + @@LCODE @lumul 00CF3H 0002BH + @@LCODE @isdiv 00D1EH 00022H + @@LCODE @iudiv 00D40H 0002DH + @@LCODE @isrem 00D6DH 00021H + @@LCODE @iurem 00D8EH 0002FH + @@LCODE @lsdiv 00DBDH 00039H + @@LCODE @ludiv 00DF6H 0003FH + @@LCODE @divuw 00E35H 00034H + @@LCODE @ladd 00E69H 0000FH + @@LCODE @llsh 00E78H 0001BH + @@LCODE @lursh 00E93H 0001FH + @@LCODE @iscmp 00EB2H 0000CH + @@LCODE @lscmp 00EBEH 00014H + @@LCODE @lband 00ED2H 00014H + @@LCODE @bcdtob 00EE6H 0001AH + @@LCODE @bbcd 00F00H 00024H +* gap * 00F24H 000D2H MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -156,6 +152,8 @@ Direc-file:bsr_mcu.dr @@CNSTL i2c_twl 02000H 00000H @@CNSTL 02000H 00000H CSEG PAGE64KP @@CNSTL led 02000H 00000H + @@CNSTL 02000H 00000H CSEG PAGE64KP + @@CNSTL rtc 02000H 00000H @@CNSTL 02000H 00000H CSEG PAGE64KP @@CNSTL vreg_ctr 02000H 00000H @@CNSTL 02000H 00000H CSEG PAGE64KP @@ -188,7 +186,7 @@ Direc-file:bsr_mcu.dr @@CNSTL @bcdtob 02000H 0000AH @@CNSTL 0200AH 00010H CSEG PAGE64KP @@CNSTL @bbcd 0200AH 00010H - @@R_INIT 0201AH 0003CH CSEG UNIT64KP + @@R_INIT 0201AH 00038H CSEG UNIT64KP @@R_INIT @cstart 0201AH 00000H @@R_INIT loader 0201AH 00000H @@R_INIT pm 0201AH 00002H @@ -203,220 +201,222 @@ Direc-file:bsr_mcu.dr @@R_INIT vreg_ctr 02024H 00000H @@R_INIT vreg_twl 02024H 00000H @@R_INIT adc 02024H 0000AH - @@R_INIT renge 0202EH 00018H - @@R_INIT accero 02046H 00000H + @@R_INIT renge 0202EH 00016H + @@R_INIT accero 02044H 00000H @@R_INIT self_flash - 02046H 00000H - @@R_INIT sw 02046H 00002H + 02044H 00000H + @@R_INIT sw 02044H 00002H @@R_INIT task_debug - 02048H 00002H + 02046H 00000H @@R_INIT task_misc - 0204AH 00000H - @@R_INIT task_sys 0204AH 00002H + 02046H 00000H + @@R_INIT task_sys 02046H 00002H @@R_INIT pedo_alg_thre_det2 - 0204CH 00008H - @@R_INIT ini_VECT 02054H 00000H + 02048H 00008H + @@R_INIT ini_VECT 02050H 00000H @@R_INIT task_status - 02054H 00002H - @@R_INIT @rom 02056H 00000H - @@R_INIS 02056H 00000H CSEG UNIT64KP - @@R_INIS @cstart 02056H 00000H - @@R_INIS loader 02056H 00000H - @@R_INIS pm 02056H 00000H - @@R_INIS i2c_ctr 02056H 00000H - @@R_INIS main 02056H 00000H - @@R_INIS magic 02056H 00000H - @@R_INIS WDT 02056H 00000H - @@R_INIS i2c_mcu 02056H 00000H - @@R_INIS i2c_twl 02056H 00000H - @@R_INIS led 02056H 00000H - @@R_INIS rtc 02056H 00000H - @@R_INIS vreg_ctr 02056H 00000H - @@R_INIS vreg_twl 02056H 00000H - @@R_INIS adc 02056H 00000H - @@R_INIS renge 02056H 00000H - @@R_INIS accero 02056H 00000H + 02050H 00002H + @@R_INIT @rom 02052H 00000H + @@R_INIS 02052H 00000H CSEG UNIT64KP + @@R_INIS @cstart 02052H 00000H + @@R_INIS loader 02052H 00000H + @@R_INIS pm 02052H 00000H + @@R_INIS i2c_ctr 02052H 00000H + @@R_INIS main 02052H 00000H + @@R_INIS magic 02052H 00000H + @@R_INIS WDT 02052H 00000H + @@R_INIS i2c_mcu 02052H 00000H + @@R_INIS i2c_twl 02052H 00000H + @@R_INIS led 02052H 00000H + @@R_INIS rtc 02052H 00000H + @@R_INIS vreg_ctr 02052H 00000H + @@R_INIS vreg_twl 02052H 00000H + @@R_INIS adc 02052H 00000H + @@R_INIS renge 02052H 00000H + @@R_INIS accero 02052H 00000H @@R_INIS self_flash - 02056H 00000H - @@R_INIS sw 02056H 00000H + 02052H 00000H + @@R_INIS sw 02052H 00000H @@R_INIS task_debug - 02056H 00000H + 02052H 00000H @@R_INIS task_misc - 02056H 00000H - @@R_INIS task_sys 02056H 00000H + 02052H 00000H + @@R_INIS task_sys 02052H 00000H @@R_INIS pedo_alg_thre_det2 - 02056H 00000H - @@R_INIS ini_VECT 02056H 00000H + 02052H 00000H + @@R_INIS ini_VECT 02052H 00000H @@R_INIS task_status - 02056H 00000H - @@R_INIS @rom 02056H 00000H - @@CALT 02056H 00000H CSEG - @@CALT @cstart 02056H 00000H - @@CALT loader 02056H 00000H - @@CALT pm 02056H 00000H - @@CALT i2c_ctr 02056H 00000H - @@CALT main 02056H 00000H - @@CALT magic 02056H 00000H - @@CALT WDT 02056H 00000H - @@CALT i2c_mcu 02056H 00000H - @@CALT i2c_twl 02056H 00000H - @@CALT led 02056H 00000H - @@CALT rtc 02056H 00000H - @@CALT vreg_ctr 02056H 00000H - @@CALT vreg_twl 02056H 00000H - @@CALT adc 02056H 00000H - @@CALT renge 02056H 00000H - @@CALT accero 02056H 00000H + 02052H 00000H + @@R_INIS @rom 02052H 00000H + @@CALT 02052H 00000H CSEG + @@CALT @cstart 02052H 00000H + @@CALT loader 02052H 00000H + @@CALT pm 02052H 00000H + @@CALT i2c_ctr 02052H 00000H + @@CALT main 02052H 00000H + @@CALT magic 02052H 00000H + @@CALT WDT 02052H 00000H + @@CALT i2c_mcu 02052H 00000H + @@CALT i2c_twl 02052H 00000H + @@CALT led 02052H 00000H + @@CALT rtc 02052H 00000H + @@CALT vreg_ctr 02052H 00000H + @@CALT vreg_twl 02052H 00000H + @@CALT adc 02052H 00000H + @@CALT renge 02052H 00000H + @@CALT accero 02052H 00000H @@CALT self_flash - 02056H 00000H - @@CALT sw 02056H 00000H + 02052H 00000H + @@CALT sw 02052H 00000H @@CALT task_debug - 02056H 00000H + 02052H 00000H @@CALT task_misc - 02056H 00000H - @@CALT task_sys 02056H 00000H + 02052H 00000H + @@CALT task_sys 02052H 00000H @@CALT pedo_alg_thre_det2 - 02056H 00000H - @@CALT ini_VECT 02056H 00000H + 02052H 00000H + @@CALT ini_VECT 02052H 00000H @@CALT task_status - 02056H 00000H - @@RLINIT 02056H 00000H CSEG UNIT64KP - @@RLINIT loader 02056H 00000H - @@RLINIT pm 02056H 00000H - @@RLINIT i2c_ctr 02056H 00000H - @@RLINIT main 02056H 00000H - @@RLINIT magic 02056H 00000H - @@RLINIT WDT 02056H 00000H - @@RLINIT i2c_mcu 02056H 00000H - @@RLINIT i2c_twl 02056H 00000H - @@RLINIT led 02056H 00000H - @@RLINIT rtc 02056H 00000H - @@RLINIT vreg_ctr 02056H 00000H - @@RLINIT vreg_twl 02056H 00000H - @@RLINIT adc 02056H 00000H - @@RLINIT renge 02056H 00000H - @@RLINIT accero 02056H 00000H + 02052H 00000H + @@RLINIT 02052H 00000H CSEG UNIT64KP + @@RLINIT loader 02052H 00000H + @@RLINIT pm 02052H 00000H + @@RLINIT i2c_ctr 02052H 00000H + @@RLINIT main 02052H 00000H + @@RLINIT magic 02052H 00000H + @@RLINIT WDT 02052H 00000H + @@RLINIT i2c_mcu 02052H 00000H + @@RLINIT i2c_twl 02052H 00000H + @@RLINIT led 02052H 00000H + @@RLINIT rtc 02052H 00000H + @@RLINIT vreg_ctr 02052H 00000H + @@RLINIT vreg_twl 02052H 00000H + @@RLINIT adc 02052H 00000H + @@RLINIT renge 02052H 00000H + @@RLINIT accero 02052H 00000H @@RLINIT self_flash - 02056H 00000H - @@RLINIT sw 02056H 00000H + 02052H 00000H + @@RLINIT sw 02052H 00000H @@RLINIT task_debug - 02056H 00000H + 02052H 00000H @@RLINIT task_misc - 02056H 00000H - @@RLINIT task_sys 02056H 00000H + 02052H 00000H + @@RLINIT task_sys 02052H 00000H @@RLINIT pedo_alg_thre_det2 - 02056H 00000H - @@RLINIT ini_VECT 02056H 00000H + 02052H 00000H + @@RLINIT ini_VECT 02052H 00000H @@RLINIT task_status - 02056H 00000H - @@RLINIT @rom 02056H 00000H - @@CODEL 02056H 00000H CSEG - @@CODEL pm 02056H 00000H - @@CODEL i2c_ctr 02056H 00000H - @@CODEL magic 02056H 00000H - @@CODEL i2c_twl 02056H 00000H - @@CODEL led 02056H 00000H - @@CODEL vreg_ctr 02056H 00000H - @@CODEL vreg_twl 02056H 00000H - @@CODEL adc 02056H 00000H - @@CODEL renge 02056H 00000H - @@CODEL accero 02056H 00000H - @@CODEL sw 02056H 00000H + 02052H 00000H + @@RLINIT @rom 02052H 00000H + @@CODEL 02052H 00000H CSEG + @@CODEL pm 02052H 00000H + @@CODEL i2c_ctr 02052H 00000H + @@CODEL magic 02052H 00000H + @@CODEL i2c_twl 02052H 00000H + @@CODEL led 02052H 00000H + @@CODEL rtc 02052H 00000H + @@CODEL vreg_ctr 02052H 00000H + @@CODEL vreg_twl 02052H 00000H + @@CODEL adc 02052H 00000H + @@CODEL renge 02052H 00000H + @@CODEL accero 02052H 00000H + @@CODEL sw 02052H 00000H @@CODEL task_debug - 02056H 00000H + 02052H 00000H @@CODEL task_misc - 02056H 00000H - @@CODEL task_sys 02056H 00000H + 02052H 00000H + @@CODEL task_sys 02052H 00000H @@CODEL pedo_alg_thre_det2 - 02056H 00000H - @@CODEL ini_VECT 02056H 00000H + 02052H 00000H + @@CODEL ini_VECT 02052H 00000H @@CODEL task_status - 02056H 00000H - @@LCODEL 02056H 00008H CSEG - @@LCODEL abs 02056H 00008H -* gap * 0205EH 000A2H + 02052H 00000H + @@LCODEL 02052H 00008H CSEG + @@LCODEL abs 02052H 00008H +* gap * 0205AH 000A6H MGC_MIMI 02100H 0000AH CSEG AT MGC_MIMI magic 02100H 0000AH - @@CNST 0210AH 002AEH CSEG + @@CNST 0210AH 002BAH CSEG @@CNST @cstart 0210AH 00000H @@CNST loader 0210AH 00000H - @@CNST pm 0210AH 00212H - @@CNST i2c_ctr 0231CH 00000H - @@CNST main 0231CH 00000H - @@CNST magic 0231CH 00000H - @@CNST WDT 0231CH 00000H - @@CNST i2c_mcu 0231CH 00000H - @@CNST i2c_twl 0231CH 00000H - @@CNST led 0231CH 00010H - @@CNST rtc 0232CH 00000H - @@CNST vreg_ctr 0232CH 00000H - @@CNST vreg_twl 0232CH 00000H - @@CNST adc 0232CH 00040H - @@CNST renge 0236CH 00000H - @@CNST accero 0236CH 00000H + @@CNST pm 0210AH 0020EH + @@CNST i2c_ctr 02318H 00000H + @@CNST main 02318H 00000H + @@CNST magic 02318H 00000H + @@CNST WDT 02318H 00000H + @@CNST i2c_mcu 02318H 00000H + @@CNST i2c_twl 02318H 00000H + @@CNST led 02318H 00020H + @@CNST rtc 02338H 00000H + @@CNST vreg_ctr 02338H 00000H + @@CNST vreg_twl 02338H 00000H + @@CNST adc 02338H 00040H + @@CNST renge 02378H 00000H + @@CNST accero 02378H 00000H @@CNST self_flash - 0236CH 00002H - @@CNST sw 0236EH 00000H + 02378H 00002H + @@CNST sw 0237AH 00000H @@CNST task_debug - 0236EH 00000H + 0237AH 00000H @@CNST task_misc - 0236EH 00000H - @@CNST task_sys 0236EH 00000H + 0237AH 00000H + @@CNST task_sys 0237AH 00000H @@CNST pedo_alg_thre_det2 - 0236EH 0004AH - @@CNST ini_VECT 023B8H 00000H + 0237AH 0004AH + @@CNST ini_VECT 023C4H 00000H @@CNST task_status - 023B8H 00000H - ROM_CODE 023B8H 025C1H CSEG - ROM_CODE pm 023B8H 009C6H - ROM_CODE i2c_ctr 02D7EH 00060H - ROM_CODE i2c_twl 02DDEH 0005EH - ROM_CODE led 02E3CH 004BAH - ROM_CODE vreg_ctr 032F6H 00444H - ROM_CODE vreg_twl 0373AH 00163H - ROM_CODE adc 0389DH 002B5H - ROM_CODE renge 03B52H 001C3H - ROM_CODE accero 03D15H 0013DH - ROM_CODE sw 03E52H 000F3H + 023C4H 00000H + ROM_CODE 023C4H 02694H CSEG + ROM_CODE pm 023C4H 009AAH + ROM_CODE i2c_ctr 02D6EH 00060H + ROM_CODE i2c_twl 02DCEH 0005EH + ROM_CODE led 02E2CH 004F3H + ROM_CODE rtc 0331FH 000E0H + ROM_CODE vreg_ctr 033FFH 00444H + ROM_CODE vreg_twl 03843H 00163H + ROM_CODE adc 039A6H 0029FH + ROM_CODE renge 03C45H 001C3H + ROM_CODE accero 03E08H 0013DH + ROM_CODE sw 03F45H 000F3H ROM_CODE task_debug - 03F45H 0001BH + 04038H 00001H ROM_CODE task_misc - 03F60H 001BAH - ROM_CODE task_sys 0411AH 00305H + 04039H 001BAH + ROM_CODE task_sys 041F3H 0030BH ROM_CODE pedo_alg_thre_det2 - 0441FH 004D5H + 044FEH 004D5H ROM_CODE task_status - 048F4H 00085H - @@BASE 04979H 004E7H CSEG BASE - @@BASE loader 04979H 00000H - @@BASE pm 04979H 00043H - @@BASE i2c_ctr 049BCH 00183H - @@BASE main 04B3FH 00000H - @@BASE magic 04B3FH 00000H - @@BASE WDT 04B3FH 00000H - @@BASE i2c_mcu 04B3FH 000D9H - @@BASE i2c_twl 04C18H 000CDH - @@BASE led 04CE5H 00000H - @@BASE rtc 04CE5H 00043H - @@BASE vreg_ctr 04D28H 00000H - @@BASE vreg_twl 04D28H 00000H - @@BASE adc 04D28H 000B3H - @@BASE renge 04DDBH 00000H - @@BASE accero 04DDBH 0004AH + 049D3H 00085H + @@BASE 04A58H 004E7H CSEG BASE + @@BASE loader 04A58H 00000H + @@BASE pm 04A58H 00043H + @@BASE i2c_ctr 04A9BH 00183H + @@BASE main 04C1EH 00000H + @@BASE magic 04C1EH 00000H + @@BASE WDT 04C1EH 00000H + @@BASE i2c_mcu 04C1EH 000D9H + @@BASE i2c_twl 04CF7H 000CDH + @@BASE led 04DC4H 00000H + @@BASE rtc 04DC4H 00043H + @@BASE vreg_ctr 04E07H 00000H + @@BASE vreg_twl 04E07H 00000H + @@BASE adc 04E07H 000B3H + @@BASE renge 04EBAH 00000H + @@BASE accero 04EBAH 0004AH @@BASE self_flash - 04E25H 00000H - @@BASE sw 04E25H 00000H + 04F04H 00000H + @@BASE sw 04F04H 00000H @@BASE task_debug - 04E25H 00000H + 04F04H 00000H @@BASE task_misc - 04E25H 00000H - @@BASE task_sys 04E25H 00000H + 04F04H 00000H + @@BASE task_sys 04F04H 00000H @@BASE pedo_alg_thre_det2 - 04E25H 00000H - @@BASE ini_VECT 04E25H 0003BH + 04F04H 00000H + @@BASE ini_VECT 04F04H 0003BH @@BASE task_status - 04E60H 00000H -* gap * 04E60H 00196H + 04F3FH 00000H +* gap * 04F3FH 000B7H MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL magic 04FF6H 0000AH @@ -432,20 +432,20 @@ Direc-file:bsr_mcu.dr @@DATA main FF91CH 0021EH @@DATA magic FFB3AH 00000H @@DATA WDT FFB3AH 00000H - @@DATA i2c_mcu FFB3AH 00008H - @@DATA i2c_twl FFB42H 00000H - @@DATA led FFB42H 00088H - @@DATA rtc FFBCAH 00008H - @@DATA vreg_ctr FFBD2H 00056H - @@DATA vreg_twl FFC28H 00010H - @@DATA adc FFC38H 00016H - @@DATA renge FFC4EH 00016H - @@DATA accero FFC64H 00002H + @@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 self_flash - FFC66H 00002H - @@DATA sw FFC68H 00004H + FFC68H 00002H + @@DATA sw FFC6AH 00004H @@DATA task_debug - FFC6CH 00002H + FFC6EH 00000H @@DATA task_misc FFC6EH 00002H @@DATA task_sys FFC70H 00002H @@ -455,7 +455,7 @@ Direc-file:bsr_mcu.dr @@DATA task_status FFD04H 00002H @@DATA @rom FFD06H 00000H - @@INIT FFD06H 0003CH DSEG BASEP + @@INIT FFD06H 00038H DSEG BASEP @@INIT @cstart FFD06H 00000H @@INIT loader FFD06H 00000H @@INIT pm FFD06H 00002H @@ -470,148 +470,148 @@ Direc-file:bsr_mcu.dr @@INIT vreg_ctr FFD10H 00000H @@INIT vreg_twl FFD10H 00000H @@INIT adc FFD10H 0000AH - @@INIT renge FFD1AH 00018H - @@INIT accero FFD32H 00000H + @@INIT renge FFD1AH 00016H + @@INIT accero FFD30H 00000H @@INIT self_flash - FFD32H 00000H - @@INIT sw FFD32H 00002H + FFD30H 00000H + @@INIT sw FFD30H 00002H @@INIT task_debug - FFD34H 00002H + FFD32H 00000H @@INIT task_misc - FFD36H 00000H - @@INIT task_sys FFD36H 00002H + FFD32H 00000H + @@INIT task_sys FFD32H 00002H @@INIT pedo_alg_thre_det2 - FFD38H 00008H - @@INIT ini_VECT FFD40H 00000H + FFD34H 00008H + @@INIT ini_VECT FFD3CH 00000H @@INIT task_status - FFD40H 00002H - @@INIT @rom FFD42H 00000H - @@INIS FFD42H 00000H DSEG UNITP - @@INIS @cstart FFD42H 00000H - @@INIS loader FFD42H 00000H - @@INIS pm FFD42H 00000H - @@INIS i2c_ctr FFD42H 00000H - @@INIS main FFD42H 00000H - @@INIS magic FFD42H 00000H - @@INIS WDT FFD42H 00000H - @@INIS i2c_mcu FFD42H 00000H - @@INIS i2c_twl FFD42H 00000H - @@INIS led FFD42H 00000H - @@INIS rtc FFD42H 00000H - @@INIS vreg_ctr FFD42H 00000H - @@INIS vreg_twl FFD42H 00000H - @@INIS adc FFD42H 00000H - @@INIS renge FFD42H 00000H - @@INIS accero FFD42H 00000H + FFD3CH 00002H + @@INIT @rom FFD3EH 00000H + @@INIS FFD3EH 00000H DSEG UNITP + @@INIS @cstart FFD3EH 00000H + @@INIS loader FFD3EH 00000H + @@INIS pm FFD3EH 00000H + @@INIS i2c_ctr FFD3EH 00000H + @@INIS main FFD3EH 00000H + @@INIS magic FFD3EH 00000H + @@INIS WDT FFD3EH 00000H + @@INIS i2c_mcu FFD3EH 00000H + @@INIS i2c_twl FFD3EH 00000H + @@INIS led FFD3EH 00000H + @@INIS rtc FFD3EH 00000H + @@INIS vreg_ctr FFD3EH 00000H + @@INIS vreg_twl FFD3EH 00000H + @@INIS adc FFD3EH 00000H + @@INIS renge FFD3EH 00000H + @@INIS accero FFD3EH 00000H @@INIS self_flash - FFD42H 00000H - @@INIS sw FFD42H 00000H + FFD3EH 00000H + @@INIS sw FFD3EH 00000H @@INIS task_debug - FFD42H 00000H + FFD3EH 00000H @@INIS task_misc - FFD42H 00000H - @@INIS task_sys FFD42H 00000H + FFD3EH 00000H + @@INIS task_sys FFD3EH 00000H @@INIS pedo_alg_thre_det2 - FFD42H 00000H - @@INIS ini_VECT FFD42H 00000H + FFD3EH 00000H + @@INIS ini_VECT FFD3EH 00000H @@INIS task_status - FFD42H 00000H - @@INIS @rom FFD42H 00000H - @@DATS FFD42H 00000H DSEG UNITP - @@DATS @cstart FFD42H 00000H - @@DATS loader FFD42H 00000H - @@DATS pm FFD42H 00000H - @@DATS i2c_ctr FFD42H 00000H - @@DATS main FFD42H 00000H - @@DATS magic FFD42H 00000H - @@DATS WDT FFD42H 00000H - @@DATS i2c_mcu FFD42H 00000H - @@DATS i2c_twl FFD42H 00000H - @@DATS led FFD42H 00000H - @@DATS rtc FFD42H 00000H - @@DATS vreg_ctr FFD42H 00000H - @@DATS vreg_twl FFD42H 00000H - @@DATS adc FFD42H 00000H - @@DATS renge FFD42H 00000H - @@DATS accero FFD42H 00000H + FFD3EH 00000H + @@INIS @rom FFD3EH 00000H + @@DATS FFD3EH 00000H DSEG UNITP + @@DATS @cstart FFD3EH 00000H + @@DATS loader FFD3EH 00000H + @@DATS pm FFD3EH 00000H + @@DATS i2c_ctr FFD3EH 00000H + @@DATS main FFD3EH 00000H + @@DATS magic FFD3EH 00000H + @@DATS WDT FFD3EH 00000H + @@DATS i2c_mcu FFD3EH 00000H + @@DATS i2c_twl FFD3EH 00000H + @@DATS led FFD3EH 00000H + @@DATS rtc FFD3EH 00000H + @@DATS vreg_ctr FFD3EH 00000H + @@DATS vreg_twl FFD3EH 00000H + @@DATS adc FFD3EH 00000H + @@DATS renge FFD3EH 00000H + @@DATS accero FFD3EH 00000H @@DATS self_flash - FFD42H 00000H - @@DATS sw FFD42H 00000H + FFD3EH 00000H + @@DATS sw FFD3EH 00000H @@DATS task_debug - FFD42H 00000H + FFD3EH 00000H @@DATS task_misc - FFD42H 00000H - @@DATS task_sys FFD42H 00000H + FFD3EH 00000H + @@DATS task_sys FFD3EH 00000H @@DATS pedo_alg_thre_det2 - FFD42H 00000H - @@DATS ini_VECT FFD42H 00000H + FFD3EH 00000H + @@DATS ini_VECT FFD3EH 00000H @@DATS task_status - FFD42H 00000H - @@DATS @rom FFD42H 00000H - FSL_DATA FFD42H 00010H DSEG UNITP + FFD3EH 00000H + @@DATS @rom FFD3EH 00000H + FSL_DATA FFD3EH 00010H DSEG UNITP FSL_DATA fsl_common - FFD42H 00010H - @@INITL FFD52H 00000H DSEG UNIT64KP - @@INITL loader FFD52H 00000H - @@INITL pm FFD52H 00000H - @@INITL i2c_ctr FFD52H 00000H - @@INITL main FFD52H 00000H - @@INITL magic FFD52H 00000H - @@INITL WDT FFD52H 00000H - @@INITL i2c_mcu FFD52H 00000H - @@INITL i2c_twl FFD52H 00000H - @@INITL led FFD52H 00000H - @@INITL rtc FFD52H 00000H - @@INITL vreg_ctr FFD52H 00000H - @@INITL vreg_twl FFD52H 00000H - @@INITL adc FFD52H 00000H - @@INITL renge FFD52H 00000H - @@INITL accero FFD52H 00000H + FFD3EH 00010H + @@INITL FFD4EH 00000H DSEG UNIT64KP + @@INITL loader FFD4EH 00000H + @@INITL pm FFD4EH 00000H + @@INITL i2c_ctr FFD4EH 00000H + @@INITL main FFD4EH 00000H + @@INITL magic FFD4EH 00000H + @@INITL WDT FFD4EH 00000H + @@INITL i2c_mcu FFD4EH 00000H + @@INITL i2c_twl FFD4EH 00000H + @@INITL led FFD4EH 00000H + @@INITL rtc FFD4EH 00000H + @@INITL vreg_ctr FFD4EH 00000H + @@INITL vreg_twl FFD4EH 00000H + @@INITL adc FFD4EH 00000H + @@INITL renge FFD4EH 00000H + @@INITL accero FFD4EH 00000H @@INITL self_flash - FFD52H 00000H - @@INITL sw FFD52H 00000H + FFD4EH 00000H + @@INITL sw FFD4EH 00000H @@INITL task_debug - FFD52H 00000H + FFD4EH 00000H @@INITL task_misc - FFD52H 00000H - @@INITL task_sys FFD52H 00000H + FFD4EH 00000H + @@INITL task_sys FFD4EH 00000H @@INITL pedo_alg_thre_det2 - FFD52H 00000H - @@INITL ini_VECT FFD52H 00000H + FFD4EH 00000H + @@INITL ini_VECT FFD4EH 00000H @@INITL task_status - FFD52H 00000H - @@INITL @rom FFD52H 00000H - @@DATAL FFD52H 00000H DSEG UNIT64KP - @@DATAL loader FFD52H 00000H - @@DATAL pm FFD52H 00000H - @@DATAL i2c_ctr FFD52H 00000H - @@DATAL main FFD52H 00000H - @@DATAL magic FFD52H 00000H - @@DATAL WDT FFD52H 00000H - @@DATAL i2c_mcu FFD52H 00000H - @@DATAL i2c_twl FFD52H 00000H - @@DATAL led FFD52H 00000H - @@DATAL rtc FFD52H 00000H - @@DATAL vreg_ctr FFD52H 00000H - @@DATAL vreg_twl FFD52H 00000H - @@DATAL adc FFD52H 00000H - @@DATAL renge FFD52H 00000H - @@DATAL accero FFD52H 00000H + FFD4EH 00000H + @@INITL @rom FFD4EH 00000H + @@DATAL FFD4EH 00000H DSEG UNIT64KP + @@DATAL loader FFD4EH 00000H + @@DATAL pm FFD4EH 00000H + @@DATAL i2c_ctr FFD4EH 00000H + @@DATAL main FFD4EH 00000H + @@DATAL magic FFD4EH 00000H + @@DATAL WDT FFD4EH 00000H + @@DATAL i2c_mcu FFD4EH 00000H + @@DATAL i2c_twl FFD4EH 00000H + @@DATAL led FFD4EH 00000H + @@DATAL rtc FFD4EH 00000H + @@DATAL vreg_ctr FFD4EH 00000H + @@DATAL vreg_twl FFD4EH 00000H + @@DATAL adc FFD4EH 00000H + @@DATAL renge FFD4EH 00000H + @@DATAL accero FFD4EH 00000H @@DATAL self_flash - FFD52H 00000H - @@DATAL sw FFD52H 00000H + FFD4EH 00000H + @@DATAL sw FFD4EH 00000H @@DATAL task_debug - FFD52H 00000H + FFD4EH 00000H @@DATAL task_misc - FFD52H 00000H - @@DATAL task_sys FFD52H 00000H + FFD4EH 00000H + @@DATAL task_sys FFD4EH 00000H @@DATAL pedo_alg_thre_det2 - FFD52H 00000H - @@DATAL ini_VECT FFD52H 00000H + FFD4EH 00000H + @@DATAL ini_VECT FFD4EH 00000H @@DATAL task_status - FFD52H 00000H - @@DATAL @rom FFD52H 00000H -* gap * FFD52H 000AEH + FFD4EH 00000H + @@DATAL @rom FFD4EH 00000H +* gap * FFD4EH 000B2H MEMORY=RAM2 BASE ADDRESS=FFE20H SIZE=000C0H diff --git a/trunk/config.h b/trunk/config.h index 59f923d..9bcf9a8 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -1,18 +1,19 @@ #ifndef __config__ #define __config__ -#define _debug_led_ -//#define _FORCE_OFF_1SEC_ +//#define _debug_led_ //#define _ALLOW_NOBATT_ -//#define _FORCE_INFO_LED_FULLCOLOR_ //#define _DEBUG_BT_IRQ_ //#define _DEBUG_BT_TEMP_ //#define _DBG_PEDO_AUTO_ENABLE_ //#define _DBG_LED_PRINT_ +//#define _DEBUG_CODEC_POLLING_ +//#define _PMIC_TEST_ + #define MCU_VER_MAJOR 0x00 -#define MCU_VER_MINOR 0x27 +#define MCU_VER_MINOR 0x29 //#define PM_CCIC_TIM @@ -27,28 +28,24 @@ // ↑TEG2 CPU ＋ Type-C #define _MODEL_CTR_ - // ↑TS board, WM1,1 TS-CTRC + // ↑TS board, WM1,1 TS-CTRC, 実機 // 特殊仕様 // //#define _SW_HOME_ENABLE_ // ---------------------------------- // #ifdef _MODEL_TEG2_ -#define _PMIC_TWL_ -#define _MCU_KE3_ +unsupported! #endif #ifdef _MODEL_WM0_ -#define _PMIC_TWL_ -#define _MCU_BSR_ -#define _SW_HOME_ENABLE_ +unsupported! #endif #ifdef _MODEL_TS0_ -#define _PMIC_CTR_ -#define _MCU_BSR_ +unsupported! #endif #ifdef _MODEL_CTR_ diff --git a/trunk/hoge.bin b/trunk/hoge.bin index d9bcfb7..cc8d517 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/i2c_mcu.c b/trunk/i2c_mcu.c index 575dd25..07b4c07 100644 --- a/trunk/i2c_mcu.c +++ b/trunk/i2c_mcu.c @@ -601,3 +601,50 @@ void iic_mcu_stop( ) SAU0EN = 0; iic_mcu_initialized = 0; } + + + + + + + + + + +/* ======================================================== + コーデックに 『１バイト』 ライト + iic_mcu_write_a_byte CODEC不具合ワークアラウンド + ======================================================== */ +err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat ) +{ + static u8 count; + + // １文字の時はDMAとか起動しないでさっさと終わらせる + if( iic_mcu_wait_free() != ERR_SUCCESS ) + { + return( ERR_ERR ); + } + + // スタートコンディションとスレーブの呼び出し... + IICMK10 = 1; + if( iic_mcu_call_slave( IIC_SLA_CODEC ) != ERR_SUCCESS ) + { + iic_mcu_busy = 0; + return ( ERR_NOSLAVE ); + } + iic_mcu_send_a_byte( adrs ); + iic_mcu_send_a_byte( dat ); + + // ワークアラウンドここから + /// リスタートにしてダミーライト + iic_mcu_send_re_st( ); + iic_mcu_send_a_byte( IIC_SLA_CODEC ); // ダミーライト + iic_mcu_send_a_byte( 0x20 ); + iic_mcu_send_a_byte( count ); + + count++; + + iic_mcu_send_sp( ); + iic_mcu_busy = 0; + return ( ERR_SUCCESS ); +} diff --git a/trunk/i2c_mcu.h b/trunk/i2c_mcu.h index a2b278d..af2b1d1 100644 --- a/trunk/i2c_mcu.h +++ b/trunk/i2c_mcu.h @@ -23,6 +23,8 @@ u8 iic_mcu_read_a_byte( u8 SLA, u8 adrs ); err iic_mcu_write( u8 SLA, u8 adrs, u8 len, void * src ); err iic_mcu_write_a_byte( u8 SLA, u8 adrs, u8 dat ); +err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat ); + // ↓その通信が完了したら解除されます。 #define iic_mcu_set_wo_dma() { while( iic_mcu_busy ){;} iic_mcu_wo_dma = 1; } diff --git a/trunk/led.c b/trunk/led.c index 55408f3..f41e90f 100644 --- a/trunk/led.c +++ b/trunk/led.c @@ -25,33 +25,35 @@ // ======================================================== -static void led_pow_normal( ); -static void led_pow_sleep( ); -static void led_pow_bt_empty(); +// スリープ中明滅のテーブル。マジか。 +const u8 LED_PTN_SLEEP[] = { + 25, 38, 52, 68, 83, 98, 110, 119, + 125, 128, 128, 125, 119, 110, 98, 83, + 68, 52, 38, 25, 16, 10, 8, 8, + 8, 8, 8, 8, 8, 8, 10, 16 + }; + + +#define LED_SLEEP_FRAME_LEN 71 +#define LED_SLEEP_DIM_LEN 71 +#define LED_SLEEP_FRAME_NUM 32 // ======================================================== -// お知らせLEDのパターンデータ -uni_info_LED info_LED; +static void led_pow_normal( ); +static void led_pow_sleep( ); +static void led_pow_bt_empty(); +static u8 led_pow_batt_low(); + +// ======================================================== // 赤LEDの電池残量LEDの点滅パターン st_led_red_batt_empty led_red_batt_empty = { 0x55, 0x55, 0x55, 0x55 }; - -// スリープ中明滅のテーブル。マジか。 -//const u8 LED_PTN_SLEEP[] = { 8,10,16,25, 36,47,56,62, 64,62,56,47, 36,25,16,10 }; -//const u8 LED_PTN_SLEEP[] = { 8,12,24,42,64,86,104,116,120,116,104,86,64,42,24,12 }; -//const u8 LED_PTN_SLEEP[] = { 0,5,18,39,64,89,109,123,128,123,109,89,64,39,18,5 }; -const u8 LED_PTN_SLEEP[] = { 8,23,38,53,68,83,98,113,128,113,98,83,68,53,38,23 }; - - - -#define LED_SLEEP_FRAME_LEN 128 -#define LED_SLEEP_DIM_LEN 128 -#define LED_SLEEP_FRAME_NUM 16 - +// お知らせLEDのパターンデータ +uni_info_LED info_LED; // フルカラーとの自動判別のため、一時領域としてもっておく bit LED_pow_red_Mirror; @@ -61,6 +63,13 @@ bit info_led_override; bit cam_led_update; +// 電源LEDのスリープパターンのステータス類 +u8 time_to_next_frame_sleep = LED_SLEEP_FRAME_LEN; +u8 frame_sleep; +st_LED_dim_status LED_dim_status_sleep; + + + // ======================================================== #define led_fade_to( now, goal ) now = fade_to( now, goal ) @@ -141,11 +150,7 @@ void LED_init( ) ISC = 0; TOM0 = 0b0000000011111110; // 出力モード。4はPWM出力しないが1にしないとTO5以降にクロックが届かない -#ifdef _MCU_BSR_ TOL0 = 0b0000000000000000; // 出力を反転させるかフラグ -#else - TOL0 = 0b0000000000000100; // 出力を反転させるかフラグ -#endif TO0 = 0; // タイマー動作中で、タイマー出力にしてないときのピンのラッチ。タイマー出力を使わないなら０ TOE0 = 0b0000000011101110; // TOxをタイマーモジュールが制御？ @@ -159,9 +164,6 @@ void LED_init( ) system_status.info_fullcolor = 0; if( system_status.model == MODEL_TS_BOARD ) { -#ifdef _FORCE_INFO_LED_FULLCOLOR_ - system_status.info_fullcolor = 1; -#endif } else { @@ -221,6 +223,7 @@ void tsk_led_pow( ) switch ( vreg_ctr[VREG_C_LED_POW] ) { case ( LED_POW_ILM_AUTO ): + default: led_pow_normal( ); break; @@ -229,8 +232,8 @@ void tsk_led_pow( ) break; case ( LED_POW_ILM_ON ): - default: - led_pow_normal( ); + led_fade_to( LED_duty_pow_blu, vreg_ctr[VREG_C_LED_BRIGHT] ); + LED_pow_red_Mirror = 0; break; case ( LED_POW_ILM_OFF ): @@ -285,11 +288,74 @@ void tsk_led_pow( ) ======================================================== */ static void led_pow_normal( ) { - if( vreg_ctr[VREG_C_BT_REMAIN] <= BATT_TH_EMPTY ) + time_to_next_frame_sleep = LED_SLEEP_FRAME_LEN; + frame_sleep = 0; + LED_dim_status_sleep.now = (sx16)LED_duty_pow_blu * 128; + + if( led_pow_batt_low() != 0 ) { - led_pow_bt_empty(); + return; + // おしまい } - else if( vreg_ctr[VREG_C_BT_REMAIN] <= BATT_TH_LO ) + + // 青点灯 + led_fade_to( LED_duty_pow_blu, vreg_ctr[VREG_C_LED_BRIGHT] ); +} + + + +/* ======================================================== + ホタルパターン + 電池残量で赤→赤点滅にする + ======================================================== */ +static void led_pow_sleep( ) +{ + if( led_pow_batt_low() != 0 ) + { + time_to_next_frame_sleep = LED_SLEEP_FRAME_LEN; + frame_sleep = 0; + LED_dim_status_sleep.now = (sx16)LED_duty_pow_blu * 128; + return; + // おしまい + } + + LED_dim_status_sleep.to = LED_PTN_SLEEP[frame_sleep] * 128; + + // グラデーションのデルタを計算 + LED_dim_status_sleep.delta = (( LED_dim_status_sleep.to - LED_dim_status_sleep.now ) ) / LED_SLEEP_DIM_LEN; + led_fade_to2( LED_duty_pow_blu, &LED_dim_status_sleep ); + + // 次のフレームに進める？ + time_to_next_frame_sleep -= 1; + if( time_to_next_frame_sleep == 0 ) + { + time_to_next_frame_sleep = LED_SLEEP_FRAME_LEN; + + frame_sleep += 1; + if( frame_sleep >= LED_SLEEP_FRAME_NUM -1 ) + { + frame_sleep = 0; + } + } +} + + + +/* ======================================================== + 電池が少ないときの共通 +　返値：　0　電池が少なくなかった +　　　　　1　　　　少なかったので共通パターンにした + ======================================================== */ +static u8 led_pow_batt_low() +{ + if( vreg_ctr[VREG_C_BT_REMAIN] > BATT_TH_LO ) + { + LED_pow_red_Mirror = 0; + return 0; + // おしまい + } + + if( vreg_ctr[VREG_C_BT_REMAIN] > BATT_TH_EMPTY ) { // 赤点灯 led_fade_to( LED_duty_pow_blu, 0 ); @@ -297,13 +363,19 @@ static void led_pow_normal( ) } else { - // 青点灯 - led_fade_to( LED_duty_pow_blu, vreg_ctr[VREG_C_LED_BRIGHT] ); - LED_pow_red_Mirror = 0; + led_pow_bt_empty(); } + return 1; } + + +/* ======================================================== +　電池がないパターン +　　指定パターンを流す +　　お知らせを上書きしたりする + ======================================================== */ static void led_pow_bt_empty() { static u8 delay; @@ -338,35 +410,6 @@ static void led_pow_bt_empty() } -/* ======================================================== - ホタルパターン - 電池残量で赤→赤点滅にする - ======================================================== */ -static void led_pow_sleep( ) -{ - static u8 time_to_next_frame; - static u8 frame; - static st_LED_dim_status LED_dim_status; - - LED_dim_status.to = LED_PTN_SLEEP[frame] * 128; - - // グラデーションのデルタを計算 - LED_dim_status.delta = (( LED_dim_status.to - LED_dim_status.now ) ) / LED_SLEEP_DIM_LEN; - led_fade_to2( LED_duty_pow_blu, &LED_dim_status ); - - // 次のフレームに進める？ - time_to_next_frame -= 1; - if( time_to_next_frame == 0 ) - { - time_to_next_frame = LED_SLEEP_FRAME_LEN; - - frame += 1; - if( frame >= LED_SLEEP_FRAME_NUM -1 ) - { - frame = 0; - } - } -} diff --git a/trunk/loader.c b/trunk/loader.c index 94ba68a..a38b2a6 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -125,11 +125,6 @@ void main( ) { if( ( my_resf & 0x10 ) != 0 ) { -#ifdef _PMIC_TWL_ - // 暴走してしまうので再起動させる - PM_reset_ast(); - /// hdwinit2 内で解除する -#endif vreg_ctr[ VREG_C_MCU_STATUS ] |= REG_BIT_STATUS_WDT_RESET; // set_irq( VREG_C_IRQ0, REG_BIT_IRQ_WDT_RESET ); // ↑I2Cの初期化後に行う @@ -158,10 +153,9 @@ void hdwinit( void ) DI( ); /* マスタ割り込み禁止 */ CMC = 0b00010000; /* X1発振せず(入力ポート)、XT1使用、超低電力発振は不安定に付き通常で */ +// CMC = 0b00010100; /* ↑超低電力発振（不安定に付き使うな）*/ CSC = 0b10000000; /* X1発振なし、XT1発振あり、高速内蔵発振動作 */ -#ifdef _MCU_BSR_ OSMC = 0x01; /* 隠しレジスタ */ -#endif CKC = 0b00001000; /* CPU/周辺クロック=fMAIN、fMAIN=fMX、fCLK=fMX */ /*--- 低電圧検出回路の設定 ---*/ @@ -178,26 +172,9 @@ void hdwinit2( ) // ポート設定 ///////////////////////////////////////// if( system_status.reboot ) // リセットピンだけはすぐにセットする { -#ifdef _MODEL_TEG2_ - P0 = 0b00000011; - P3 = 0b00000110; // 簡易I2Cは出力ラッチを1にする - P14 = 0b00000001; -#endif -#ifdef _MODEL_WM0_ - P0 = 0b00000011; - P3 = 0b00000110; // 簡易I2Cは出力ラッチを1にする - P14 = 0b00000001; -#endif -#ifdef _MODEL_TS0_ P0 = 0b00000011; P3 = 0b00000111; // 簡易I2Cは出力ラッチを1にする P14 = 0b00000000; -#endif -#ifdef _MODEL_CTR_ - P0 = 0b00000011; - P3 = 0b00000111; // 簡易I2Cは出力ラッチを1にする - P14 = 0b00000000; -#endif } else { @@ -207,36 +184,13 @@ void hdwinit2( ) } -#ifdef _MCU_BSR_ PM20 = 0b11111100; -#else - PM8 = 0b11111111; -#endif - -#ifdef _MCU_BSR_ P20 = 0b00000000; -#else - P8 = 0b00000000; -#endif -#ifdef _MCU_BSR_ -# ifdef _MODEL_CTR_ -# ifdef _SW_HOME_ENABLE_ PU20 = 0b00010001; -# else - PU20 = 0b00000001; -# endif -# else - PU20 = 0b00000000; -# endif -#endif -#ifdef _MCU_BSR_ PM0 = 0b11111111; // BSRマイコンでは、reset1は監視のみになる。 -#else - PM0 = 0b00000000; // 0で出力 -#endif PM3 = 0b11110000; // P31,32は簡易I2C PM14 = 0b11111100; // debugger[1] とりあえず出力 @@ -253,18 +207,10 @@ void hdwinit2( ) PM1 = 0b00000000; PM2 = 0b11101001; -#ifdef _PMIC_CTR_ PM4 = 0b11110011; -#else - PM4 = 0b11111011; -#endif PM5 = 0b11110010; PM6 = 0b11111100; // I2CのラインがL出力になってしまうが、システムがOFFなのでかまわない -#ifdef _PMIC_CTR_ PM7 = 0b01011111; -#else - PM7 = 0b00011111; -#endif PM12 = 0b11111111; // 32kHzクロックのピン設定はどっちでもよい PM15 = 0b11111111; @@ -295,20 +241,12 @@ void hdwinit2( ) /*--- 割り込み設定 ---------*/ IF0 = 0x0000; /* 割り込み要求フラグクリア */ IF1 = 0x0000; -#ifdef _MCU_BSR_ IF2 = 0x0000; -#else - IF2L = 0x00; -#endif MK0 = 0xFFFF; /* 割り込み禁止 */ MK1 = 0xFFFF; -#ifdef _MCU_BSR_ MK2 = 0xFFFF; -#else - MK2L = 0xFF; -#endif #if 0 // デフォルト値 @@ -323,15 +261,11 @@ void hdwinit2( ) #endif /*--- 外部割込の有効エッジ設定 ---*/ -#ifdef _MCU_BSR_ EGP0 = 0b00110001; EGN0 = 0b01110000; EGP2 = 0b00001010; EGN2 = 0b00000000; -#else - EGP0 = 0b10110001; - EGN0 = 0b01110000; -#endif + /*--- キー割り込み設定 ---*/ KRM = 0b00000000; /* 全キー割り込み信号を検出しない */ @@ -344,14 +278,6 @@ void hdwinit2( ) // RTCC0 = 0b00000000; /* カウンタ動作停止 */ // 別途初期化関数 -#ifndef _MCU_BSR_ - /*--- コンパレータ/プログラマブル・ゲイン・アップの動作停止 ---*/ - OACMPEN = 0; /* クロック供給停止 */ - OAM = 0x00; /* プログラマブル・ゲイン・アップの動作停止 */ - C0CTL = 0x00; /* コンパレータ0動作停止 */ - C1CTL = 0x00; /* コンパレータ1動作停止 */ -#endif - /*--- クロック出力/ブザー出力停止 ---*/ CKS0 = 0b00000000; CKS1 = 0b00000000; @@ -367,19 +293,12 @@ void hdwinit2( ) SCR02 = 0x0087; SCR03 = 0x0087; -#ifdef _MCU_BSR_ // IICの動作停止 IICA0EN = 0; /* IICA0(CTR)へのクロック供給停止 */ IICCTL00 = 0x00; /* IICA1動作停止 */ IICA1EN = 0; // IICA1(TWL)へのクロック供給停止 IICCTL01 = 0x00; // IICA1動作停止 -#else - /*--- IICAの動作停止 ---*/ - IICAEN = 0; /* IICAへのクロック供給停止 */ - IICCTL0 = 0x00; /* IICA動作停止 */ -#endif - /*--- DMAの動作停止 ---*/ DRC0 = 0b00000000; /* DMAチャネル0の動作禁止 */ DRC1 = 0b00000000; /* DMAチャネル1の動作禁止 */ diff --git a/trunk/pm.c b/trunk/pm.c index 9f308dc..3810667 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -626,7 +626,7 @@ void BT_get_left(){ if( bt_remain_old != flag ) { bt_remain_old = flag; - iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_BT, flag ); + iic_mcu_write_a_byte_codec( CODEC_REG_BT, flag ); } } } @@ -871,11 +871,11 @@ err PM_sys_pow_on( ) RESET2_neg; { - u8 codec_reg_init[3] = { 0,0,0 }; - wait_ms( 100 ); // CODEC 不定レジスタ初期化 - iic_mcu_write( IIC_SLA_CODEC, CODEC_REG_PM, 3, codec_reg_init ); + iic_mcu_write_a_byte_codec( CODEC_REG_PM, 0 ); + iic_mcu_write_a_byte_codec( CODEC_REG_PM+1, 0 ); + iic_mcu_write_a_byte_codec( CODEC_REG_PM+2, 0 ); reg_shadow = 0; // こんなところで... } @@ -1063,7 +1063,7 @@ task_status_immed ntr_pmic_comm( ) if( ( reg_shadow & ( REG_BIT_TWL_REQ_OFF_REQ | REG_BIT_TWL_REQ_RST_REQ )) != 0 ) { reg_shadow &= ~( REG_BIT_TWL_REQ_OFF_REQ | REG_BIT_TWL_REQ_RST_REQ ); - iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_PM, reg_shadow ); + iic_mcu_write_a_byte_codec( CODEC_REG_PM, reg_shadow ); } return ( ERR_FINISED ); } diff --git a/trunk/renge/renge_task_intval.h b/trunk/renge/renge_task_intval.h index 58a997e..6f9dd9d 100644 --- a/trunk/renge/renge_task_intval.h +++ b/trunk/renge/renge_task_intval.h @@ -7,7 +7,7 @@ enum TSK { - TSK_SW, TSK_ADC, TSK_BATT, TSK_LED_POW, TSK_LED_WIFI, TSK_LED_NOTIFY, TSK_LED_CAM, TSK_MISC, TSK_STATUS, TSK_DEBUG, TSK_DEBUG2, TSK_SYS, TSK_LAST + TSK_SW, TSK_ADC, TSK_BATT, TSK_LED_POW, TSK_LED_WIFI, TSK_LED_NOTIFY, TSK_LED_CAM, TSK_MISC, TSK_STATUS, TSK_DEBUG, TSK_SYS, TSK_LAST }; extern void tsk_sw(); @@ -20,7 +20,6 @@ extern void tsk_led_cam(); extern void tsk_misc(); extern void tsk_status(); extern void tsk_debug(); -extern void tsk_debug2(); extern void tsk_sys(); const void ( *tasks[ TSK_LAST ] )() = { @@ -34,7 +33,6 @@ const void ( *tasks[ TSK_LAST ] )() = { tsk_misc, tsk_status, tsk_debug, - tsk_debug2, tsk_sys, }; diff --git a/trunk/renge/renge_tasks.txt b/trunk/renge/renge_tasks.txt index 3ee9b59..73af545 100644 --- a/trunk/renge/renge_tasks.txt +++ b/trunk/renge/renge_tasks.txt @@ -8,5 +8,4 @@ led_cam misc status debug -debug2 sys diff --git a/trunk/rtc.c b/trunk/rtc.c index e88ef4a..340daa2 100644 --- a/trunk/rtc.c +++ b/trunk/rtc.c @@ -5,7 +5,7 @@ #pragma inline -#include "incs_loader.h" +#include "incs.h" diff --git a/trunk/self_flash.c b/trunk/self_flash.c index cf1f2bd..a010085 100644 --- a/trunk/self_flash.c +++ b/trunk/self_flash.c @@ -80,8 +80,8 @@ static err firm_duplicate( u8 block_src, u8 block_dest ); void alert( u8 ); void led_print( u8 ); #else -# define alert() ; -# define led_print() ; +# define alert( x ) ; +# define led_print( x ) ; #endif @@ -487,10 +487,10 @@ static err firm_duplicate( u8 block_src, ( fsl_u08 ) ( SELF_UPDATE_BUFF_SIZE / SAM_WORD_SIZE ) ) != FSL_OK ) { - // リカバリはリブート時 todo // + // リカバリはリブート時 // FSL_Close( ); led_print(5); - while(1){} +// while(1){} return ( ERR_ERR ); } } @@ -501,7 +501,7 @@ static err firm_duplicate( u8 block_src, { // リカバリはリブート時 todo // led_print(7); - while(1){} +// while(1){} return ( ERR_ERR ); } } diff --git a/trunk/task_debug.c b/trunk/task_debug.c index ce24778..59cd6f1 100644 --- a/trunk/task_debug.c +++ b/trunk/task_debug.c @@ -10,59 +10,41 @@ /* ======================================================== ======================================================== */ -void tsk_debug( ) -{ - u8 temp; - static u8 count = 0; - static u8 task_interval; - - if( system_status.pwr_state == ON_TRIG ){ - -#ifdef _MODEL_WM0_ - P5.0 = 1; // /WL_RST に配線されています -#endif -#ifndef _MODEL_CTR_ - iic_mcu_write_a_byte( IIC_SLA_DCP, 0x08, 0x80 ); // ACR←0x80 揮発モードへ -#endif - -#ifdef _DBG_PEDO_AUTO_ENABLE_ - vreg_ctr[ VREG_C_ACC_CONFIG ] = 0x03; - renge_task_immed_add( acc_hosu_set ); -#endif - - /* - temp = iic_mcu_read_a_byte( IIC_SLA_8LEDS, IIC_8LEDS_REG_DO ); - count += 1; - iic_mcu_write_a_byte( IIC_SLA_8LEDS, IIC_8LEDS_REG_DO, count ); - iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 3, count ); - */ - } - - return; -} - - // 7セグ 4バイト版 # define IIC_SLA_DBG_MONITOR 0x44 -void tsk_debug2( ) +void tsk_debug( ) { - u8 str[4]; +// u8 temp; +#ifdef _DBG_PEDO_AUTO_ENABLE_ + if( system_status.pwr_state == ON_TRIG ){ + // 歩数計を起動時にonにする + vreg_ctr[ VREG_C_ACC_CONFIG ] = 0x03; + renge_task_immed_add( acc_hosu_set ); + } +#endif + + /* + if( system_status.pwr_state == ON_TRIG ){ + { + static u8 count = 0; + // デバッグLED（8bit）の初期化 + temp = iic_mcu_read_a_byte( IIC_SLA_8LEDS, IIC_8LEDS_REG_DO ); + count += 1; + iic_mcu_write_a_byte( IIC_SLA_8LEDS, IIC_8LEDS_REG_DO, count ); + iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 3, count ); + } + } + */ + +#ifdef _PMIC_TEST_ if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP ) ) { -/* - str[3] = vreg_ctr[ VREG_C_FREE0 ]; - str[2] = vreg_ctr[ VREG_C_FREE1 ]; - str[1] = vreg_ctr[ VREG_C_STATUS ]; - str[0] = vreg_ctr[ VREG_C_RTC_SEC ]; - - str[3] = vreg_ctr[ VREG_C_SND_VOL ]; - str[2] = vreg_ctr[ VREG_C_TUNE ]; - str[1] = vreg_ctr[ VREG_C_ACC_CONFIG ]; - str[0] = SEC; -*/ + iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 0x03, 0 ); + } +#endif // iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 2, vreg_ctr[ VREG_C_IRQ1 ] ); // iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 1, boot_ura ); @@ -74,13 +56,30 @@ void tsk_debug2( ) // iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 1, vreg_ctr[ VREG_C_STATUS ] ); // iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 0, vreg_ctr[ VREG_C_ACC_ZH ] ); -// iic_mcu_write( IIC_SLA_DBG_MONITOR, 0, 4, &str[0] ); + /* + { + u8 str[4]; + + if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP ) ) + { + str[3] = vreg_ctr[ VREG_C_FREE0 ]; + str[2] = vreg_ctr[ VREG_C_FREE1 ]; + str[1] = vreg_ctr[ VREG_C_STATUS ]; + str[0] = vreg_ctr[ VREG_C_RTC_SEC ]; + + str[3] = vreg_ctr[ VREG_C_SND_VOL ]; + str[2] = vreg_ctr[ VREG_C_TUNE ]; + str[1] = vreg_ctr[ VREG_C_ACC_CONFIG ]; + str[0] = SEC; + iic_mcu_write( IIC_SLA_DBG_MONITOR, 0x03, 4, &str ); + } } - return; + */ } + #if 0 /* ======================================================== タスクひな形 diff --git a/trunk/task_misc.c b/trunk/task_misc.c index 6c32b08..34b3e25 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -213,7 +213,7 @@ task_status_immed do_command0( ) wait_ms( 100 ); { u8 codec_reg_init[3] = { 0,0,0 }; - iic_mcu_write( IIC_SLA_CODEC, CODEC_REG_PM, 3, codec_reg_init ); + iic_mcu_write_codec( IIC_SLA_CODEC, CODEC_REG_PM, 3, codec_reg_init ); } */ } diff --git a/trunk/task_sys.c b/trunk/task_sys.c index fddf85a..72dafc1 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -141,22 +141,13 @@ void tsk_sys( ) // ここまで来ると、電源投入確定 // PM_LCD_vcom_set( ); // LCDの対向電圧値など書き込み -#ifdef _PMIC_TWL_ - PM_TEG_LCD_dis( 0 ); -#endif break; case ON_TRIG: //------------------------------------------------------- PU5 = 0b00000010; // 1:PM_CHARGE PU7 = 0b00011101; // 4:SW_WIFI 3:SW_PWSW 2:PM_IRQ 0:PM_EXTDC_n -#ifdef _MODEL_CTR_ -# ifdef _SW_HOME_ENABLE_ PU20 = 0b00010000; // SW_HOME -# else - PU20 = 0b00000000; -# endif -#endif IIC_ctr_Init( ); IIC_twl_Init( ); @@ -268,6 +259,9 @@ void tsk_sys( ) vreg_ctr[ VREG_C_LED_TUNE ] = LED_TUNE_ILM_OFF; system_status.force_off = 0; + vreg_ctr[ VREG_C_ACC_CONFIG ] = 0x00; + acc_hosu_set(); + LED_stop( ); IIC_ctr_Stop( ); IIC_twl_Stop( ); diff --git a/trunk/user_define.h b/trunk/user_define.h index dc97bb9..6493970 100644 --- a/trunk/user_define.h +++ b/trunk/user_define.h @@ -254,7 +254,6 @@ #define INFO_LED_IS_FULLCOLOR_PU PU20.2 - /////////////////////////////////////////////////////////// #define INT_MSK0_IIC_M_DMA 0b0001000000000000 diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index 429b23f..d7295fe 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -53,8 +53,6 @@ extern task_status_immed tski_mcu_reset(); // マイコンリセット時に呼ばれます void vreg_ctr_init( ) { - vreg_ctr[ VREG_C_LED_BRIGHT ] = 0xFF; - vreg_ctr[ VREG_C_VCOM_T ] = VCOM_DEFAULT_T; vreg_ctr[ VREG_C_VCOM_B ] = VCOM_DEFAULT_B; @@ -73,11 +71,12 @@ void vreg_ctr_reset( ) #endif vreg_ctr[ VREG_C_MCU_VER_MINOR ] = MCU_VER_MINOR; - vreg_ctr[ VREG_C_VOL_DIGITAL ] = 0x20; + vreg_ctr[ VREG_C_LED_BRIGHT ] = 0xFF; vreg_ctr[ VREG_C_LED_POW ] = 0; vreg_ctr[ VREG_C_LED_WIFI ] = 0; vreg_ctr[ VREG_C_LED_CAM ] = 0; vreg_ctr[ VREG_C_LED_TUNE ] = 0; + vreg_ctr[ VREG_C_VOL_DIGITAL ] = 0x20; { u8 i; for( i = 0; i < sizeof( uni_info_LED ); i++ ) @@ -297,17 +296,13 @@ void vreg_ctr_write( u8 adrs, u8 data ) break; case ( VREG_C_VOL_OPTION ): - if(( vreg_ctr[ VREG_C_VOL_OPTION ] ^ data ) & REG_BIT_VOL_FORCE_SLIDER ) + if(( vreg_ctr[ VREG_C_VOL_OPTION ] ^ data ) & ( REG_BIT_VOL_FORCE_SLIDER | REG_BIT_VOL_UPDATE_TO_SLIDER )) { renge_task_immed_add( tski_vol_update ); } vreg_ctr[ VREG_C_VOL_OPTION ] = data; break; - #define REG_BIT_VOL_FORCE_REG ( 1 << 2 ) -#define REG_BIT_VOL_FORCE_SLIDER ( 1 << 1 ) - - // read only // case ( VREG_C_MCU_VER_MAJOR ): case ( VREG_C_MCU_VER_MINOR ): diff --git a/trunk/vreg_ctr.h b/trunk/vreg_ctr.h index 49acd68..40c9d44 100644 --- a/trunk/vreg_ctr.h +++ b/trunk/vreg_ctr.h @@ -113,6 +113,7 @@ #define REG_BIT_TWL_IRQ_VOL_CHANGE 0x40 // VOL option (0x26) +#define REG_BIT_VOL_UPDATE_TO_SLIDER ( 1 << 4 ) #define REG_BIT_VOL_FORCE_REG ( 1 << 2 ) #define REG_BIT_VOL_FORCE_SLIDER ( 1 << 1 ) #define REG_BIT_VOL_BY_SPI ( 1 << 0 ) diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index 3580c34..21d2e92 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,15 +1,171 @@ 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(96) : CC78K0R warning W0401: Conversion may lose significant digits +loader.c(97) : 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(224) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +pm.c(436) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(536) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(537) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(624) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(663) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(701) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(785) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(793) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(948) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +pm.c(1015) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1018) : CC78K0R warning W0401: Conversion may lose significant digits +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 +batt_params.h(98) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.h(99) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.h(99) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.h(100) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.h(101) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.h(102) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.h(103) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 22 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pm.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_ctr.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_ctr.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no main.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\main.asm +Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no magic.c Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no WDT.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\WDT.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_mcu.c +i2c_mcu.c(205) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 1 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_mcu.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_twl.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_twl.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no led.c +led.c(108) : CC78K0R warning W0745: Expected function prototype +led.c(235) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(240) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(302) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(361) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(387) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(550) : 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(109) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(118) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(127) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(137) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(141) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(148) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(158) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(159) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(161) : CC78K0R warning W0401: Conversion may lose significant digits +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(248) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(253) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(258) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(287) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(301) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(410) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +Compilation complete, 0 error(s) and 17 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_ctr.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no vreg_twl.c +vreg_twl.c(52) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_twl.c(61) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_twl.c(65) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 3 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_twl.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no adc.c +adc.c(124) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(130) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +adc.c(210) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(237) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(329) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(353) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +adc.c(372) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(451) : CC78K0R warning W0745: Expected function prototype +adc.c(475) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(480) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 10 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\adc.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no renge\renge.c +renge\renge.c(149) : CC78K0R warning W0411: Illegal pointer combination +renge\renge.c(157) : CC78K0R warning W0412: Illegal pointer combination in conditional expression +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\renge.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no accero.c +accero.c(242) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +Compilation complete, 0 error(s) and 1 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\accero.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no self_flash.c +self_flash.c(219) : CC78K0R warning W0401: Conversion may lose significant digits +self_flash.c(259) : CC78K0R warning W0401: Conversion may lose significant digits +self_flash.c(260) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 3 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\self_flash.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no sw.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\sw.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_debug.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_debug.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_misc.c +task_misc.c(91) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +task_misc.c(105) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +task_misc.c(207) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +task_misc.c(301) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 4 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_misc.asm +Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_sys.c -task_sys.c(193) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(452) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(454) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +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 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" -go85h,0FC00h,1024 -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map -nkd -gb0FEFBFFh -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 -nu -ki bsr.lmf @@ -20,4 +176,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 3 +Build Total error(s) : 0 Total warning(s) : 79 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 38ba7ea..ff30aa2 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -23,7 +23,7 @@ SubClock=None Count=0 [Main] Geometry=-1211, 40, 1200, 882 -Window=Normal +Window=Max MDI_MAX=OFF Button=ON Mode=Auto @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=86, 109, 754, 790 +Geometry=25, 96, 754, 790 Window=Normal -DispStart=83 -CaretPos=114,20 +DispStart=247 +CaretPos=283,0 Mode=Normal DispFile= Address1= @@ -142,27 +142,11 @@ Accumulative=ON [Source1] Geometry=0, 0, 754, 790 Window=Normal -DispStart=331 -CaretPos=356,0 +DispStart=292 +CaretPos=1,0 Mode=Normal DispFile=led.c Accumulative=ON -[Source2] -Geometry=0, 0, 754, 790 -Window=Normal -DispStart=379 -CaretPos=433,0 -Mode=Normal -DispFile=adc.c -Accumulative=ON -[Source3] -Geometry=25, 25, 754, 790 -Window=Normal -DispStart=97 -CaretPos=217,0 -Mode=Normal -DispFile=pm.c -Accumulative=ON [Assemble] Geometry=282, 92, 968, 626 Window=Hide @@ -280,8 +264,8 @@ Window=Normal Boundary=13762687 Mode=Proper [Sfr] -Geometry=255, 105, 596, 915 -Window=Hide +Geometry=39, -4, 596, 915 +Window=Normal Address1= Address2= Address3= @@ -298,8 +282,8 @@ Address13= Address14= Address15= Address16= -Boundary=0, 0 -Mode=Hex +Boundary=202, 89 +Mode=Bin Attribute=Show Sort=Unsort Pickup=OFF @@ -838,7 +822,7 @@ L529=IICWL1 L530=IICWH1 L531=SVA1 [Local Variable] -Geometry=908, 594, 353, 335 +Geometry=908, 407, 353, 335 Window=Normal Boundary=11468964 Mode=Proper @@ -898,7 +882,7 @@ Pickup=OFF Name=Functional Register Bank=0 RP0=1 -RP1=5 +RP1=1 RP2=1 RP3=1 PC=1 @@ -981,72 +965,74 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=854, -3, 441, 595 +Geometry=835, -4, 441, 425 Window=Normal Boundary=18088086 -0=.p4.3,P,S,A,+,1 -1=.P2.4,P,S,A,+,1 -2=.bt_chg_ready,P,N,A,+,1 -3=.temp_zone_charge_enable,P,N,A,+,1 -4=.P5.1,P,S,A,+,1 -5=.vreg_ctr,P,N,A,+,1 -6=.P5.3,P,S,A,+,1 -7=.heikinka_h,P,N,A,+,1 -8=.system_status,.,N,A,+,1 -9=.battery_manufacturer,P,N,A,+,1 -10=.bt_comp,.,N,A,+,1 -11=.raw_adc_temperature,P,N,A,+,1 -12=.P1,B,S,A,+,1 -13=.bt_checked,P,N,A,+,1 -14=.TDR06,P,S,A,+,1 -15=.LED_dim_status,P,N,A,+,1 -Line=16 +0=.TDR06,P,S,A,+,1 +1=+LED_dim_status_sleep,.,N,A,-,1 +2=.frame_sleep,P,N,A,+,1 +3=.PM20,B,S,A,+,1 +4=.P20,P,S,A,+,1 +5=.pu20,B,S,A,+,1 +6=.work_vr_vol,.,N,A,+,1 +7=.vol_data_ctr_tmp,P,N,A,+,1 +8=.vol_data_ctr,P,N,A,+,1 +9=.last_modifyer,P,N,A,+,1 +10=.sent_index,P,N,A,+,1 +11=.vreg_ctr,P,N,A,+,1 +12=.system_status,.,N,A,+,1 +13=.battery_manufacturer,P,N,A,+,1 +14=.bt_comp,.,N,A,+,1 +15=.ADM,H,S,A,+,1 +16=.ADCRH,P,S,A,+,1 +17=.adc_data,P,N,A,+,1 +18=.adc_raw_vol,P,N,A,+,1 +19=.new_val,P,N,A,+,1 +20=.work_vr_vol,.,N,A,+,1 +21=.ADS,P,S,A,+,1 +Line=22 [Quick Watch] -0=temp16,P,A,1 -1=SW_pow_count,P,A,1 -2=bt_checked,P,A,1 -3=P1,B,A,1 -4=PM1,B,A,1 -5=bt_param_sent,P,A,1 -6=P5.3,P,A,1 -7=bt_chg_ready,P,A,1 -8=temp_zone_charge_enable,P,A,1 -9=heikinka_h,P,A,1 -10=P2.4,P,A,1 -11=P5.1,P,A,1 -12=raw_adc_temperature,P,A,1 -13=LED_dim_status,P,A,1 -14=LED_duty_pow_blu,P,A,1 +0=ADS,P,A,1 +1=adc_data,P,A,1 +2=work_vr_vol,P,A,1 +3=vol_data_ctr_tmp,P,A,1 +4=vol_data_ctr,P,A,1 +5=adc_raw_vol,P,A,1 +6=ADCRH,P,A,1 +7=ADM0,P,A,1 +8=ADM,P,A,1 +9=pu20,B,A,1 +10=P20,P,A,1 +11=PM20,P,A,1 +12=pu6,P,A,1 +13=frame_sleep,P,A,1 +14=LED_dim_status_sleep,P,A,1 15=TDR06,P,A,1 [Software Break] -Geometry=792, 551, 445, 260 +Geometry=799, 616, 445, 260 Window=Normal Width=150 30 200 100 Name0=Swb00002 -Address0=pm.c#_BT_get_left+0x129 +Address0=adc.c#_adc_filter+0x70 Window0=ASM Status0=ON -Name1=Swb00005 -Address1=pm.c#_BT_get_left+0xd0 +Name1=Swb00003 +Address1=adc.c#_adc_filter+0x89 Window1=ASM Status1=ON -Name2=Swb00007 -Address2=pm.c#_BT_get_left+0x10f +Name2=Swb00006 +Address2=adc.c#_adc_filter+0x1f Window2=ASM Status2=ON Name3=Swb00001 -Address3=task_sys.c#_tsk_sys+0x222 +Address3=led.c#_led_pow_sleep+0x15 Window3=ASM -Status3=ON -Name4=Swb00003 -Address4=led.c#_led_pow_sleep+0x24 +Status3=OFF +Name4=Swb00004 +Address4=led.c#_led_pow_normal+0x7 Window4=ASM Status4=ON -Name5=Swb00006 -Address5=pm.c#_tsk_batt+0x69 -Window5=ASM -Status5=ON -Count=6 +Count=5 [Reset] Debugger=ON Symbol=OFF diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 36b73db..538e38d 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -6,14 +6,14 @@ FrameCX=1299 FrameCY=1044 OpenFile1=ProjectWindow PrjPos=0,2,754,3,253 -OpenFile2=config.h,0,294,66,1538,823,18,42,29,0 -OpenFile3=main.c,0,125,195,1104,832,35,73,34,0 -OpenFile4=task_sys.c,0,220,220,1464,977,0,137,31,0 -OpenFile5=self_flash.c,0,176,176,1144,801,8,348,13,0 -OpenFile6=task_misc.c,0,198,198,1166,823,48,91,48,0 -OpenFile7=pedo_alg_thre_det2.c,0,220,220,1188,845,0,58,0,0 -OpenFile8=pm.c,0,6,96,1250,853,26,208,0,0 -OpenFile9=led.c,0,242,242,1210,867,0,348,0,0 +OpenFile2=main.c,0,125,195,1104,832,35,73,34,0 +OpenFile3=task_sys.c,0,220,220,1464,977,0,137,31,0 +OpenFile4=task_misc.c,0,198,198,1166,823,48,91,48,0 +OpenFile5=pedo_alg_thre_det2.c,0,220,220,1188,845,0,58,0,0 +OpenFile6=led.c,0,242,242,1210,867,0,348,0,0 +OpenFile7=adc.c,0,264,264,1508,1021,2,100,5,0 +OpenFile8=self_flash.c,0,176,176,1144,801,0,348,0,0 +OpenFile9=config.h,0,294,66,1538,823,0,37,0,0 OpenFile10=OutputWindow OutputPos=0,36,981,694,1556 ActivePRJ=yav_mcu_bsr.prj diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index b89f877..45bc342 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4c3198b9 +T=4c3d4c95 1=incs_loader.h 2=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 3=fsl_user.h @@ -12,7 +12,7 @@ T=4c3198b9 8=reboot.h 9=magic.h [pm.c] -T=4c3c0c4e +T=4c3cf836 1=incs.h 2=adc.h 3=led.h @@ -36,13 +36,13 @@ T=4c3c0229 7=adc.h 8=pool.h [magic.c] -T=4c3c2c86 +T=4c3d4d32 1=config.h [WDT.c] T=4bf0d1e1 1=incs_loader.h [i2c_mcu.c] -T=4c2acd5a +T=4c3c5d1f 1=incs_loader.h 2=i2c_mcu.h [i2c_twl.c] @@ -52,14 +52,14 @@ T=4c29c700 3=i2c_twl_defs.h 4=i2c_twl.h [led.c] -T=4c3c31b3 +T=4c3d4d20 1=incs.h 2=led.h [rtc.c] -T=4c3c10bc -1=incs_loader.h +T=4c3c5fb0 +1=incs.h [vreg_ctr.c] -T=4c3afe1f +T=4c3d0fee 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -77,7 +77,7 @@ T=4c3af447 4=vreg_twl.h 5=vreg_ctr.h [adc.c] -T=4c3b0f6d +T=4c3d4cd9 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=4c2aacdb +T=4c3d5398 1=config.h 2=incs.h 3=..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] -T=4c356ee9 +T=4c3d4266 1=incs_loader.h 2=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 3=fsl_user.h @@ -116,12 +116,12 @@ T=4c3ad20e 6=rtc.h 7=sw.h [task_debug.c] -T=4c2aacdb +T=4c3d42f7 1=incs.h 2=renge\renge.h 3=pm.h [task_misc.c] -T=4c3aede4 +T=4c3c5c5b 1=incs.h 2=renge\renge.h 3=pm.h @@ -130,7 +130,7 @@ T=4c3aede4 6=i2c_mcu.h 7=led.h [task_sys.c] -T=4c3c0229 +T=4c3d1dac 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -175,9 +175,9 @@ T=4c119cde T=4c075832 1=config.h [config.h] -T=4c3ae216 +T=4c3d4d1d [user_define.h] -T=4c2856fa +T=4c3d1d39 [bsr_system.h] T=4c3ac965 [renge\renge.h] @@ -197,7 +197,7 @@ T=4c072cf1 [loader.h] T=4c318e0f [i2c_mcu.h] -T=4c2aacdb +T=4c3c5d1f [WDT.h] T=4c319dfc [fsl_user.h] @@ -243,7 +243,7 @@ T=4c36b4fc [i2c_twl_defs.h] T=4bf0d1e1 [renge\renge_task_intval.h] -T=4c072cf1 +T=4c3d4113 1=renge\renge_defs.h [i2c_twl.h] T=4bf4e29e