diff --git a/trunk/accero.c b/trunk/accero.c index 505c300..652cfd7 100644 --- a/trunk/accero.c +++ b/trunk/accero.c @@ -72,12 +72,14 @@ #define ACC_RAW_DATA_SIZE 6 +// ======================================================== +static u8 acc_retry_count; // 加速度センサ読み出し時、エラーだったときリトライする。回数数える + + // ======================================================== task_status tsk_soft_int( ); -extern void DI_wt_chk(); - /********************************************//** @@ -90,16 +92,16 @@ extern void DI_wt_chk(); ***********************************************/ task_status_immed tski_cbk_accero( ) { // （疑似）isrから登録されます - static u8 err_count; u8 acc_dat_buff[ ACC_RAW_DATA_SIZE ]; // 加速度センサデータレジスタへの反映 if( iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | ACC_REG_FLG_BURST_ACCESS ), ACC_RAW_DATA_SIZE, acc_dat_buff ) != ERR_SUCCESS ) { - err_count ++; - if( err_count < 8 ) + // SLA NAK // + if( acc_retry_count < 4 ) { + acc_retry_count ++; // リトライ return( ERR_CONTINUE ); } @@ -114,10 +116,12 @@ task_status_immed tski_cbk_accero( ) } else { - memcpy( &vreg_ctr[VREG_C_ACC_XL], acc_dat_buff, ACC_RAW_DATA_SIZE ); - - err_count = 0; // 正常時パス // + DI_wt_chk(); + memcpy( &vreg_ctr[VREG_C_ACC_XL], acc_dat_buff, ACC_RAW_DATA_SIZE ); + EI(); + + acc_retry_count = 0; // 加速度更新＆割り込み if( (( vreg_ctr[VREG_C_ACC_CONFIG] & VREG_BITMASK_ACC_CONF_ACQ ) != 0 ) && ( system_status.pwr_state == ON ) @@ -176,68 +180,73 @@ task_status_immed tski_acc_setup( ) { // 加速度 on/off設定する + u8 str_send_buf[4]; + + str_send_buf[1] = 0x00; // ctrl2 HPF:normal, filterd, HPF for IRQ : dis/dis, HPF coeff:norm + + // ピン不足のため、TSとそれ以外（回路違い）を区別して設定 + if( system_status.model == MODEL_TS_BOARD ) { - u8 str_send_buf[4]; + str_send_buf[2] = bits8(0,0,0,0, 0,0,1,0); + } + else + { + str_send_buf[2] = bits8(0,0,0,1, 0,0,0,0); + } + str_send_buf[3] = 0x80; // ctrl3 block update:enable, MSB first, scale: +-2G(default), selftest: dis - str_send_buf[1] = 0x00; // ctrl2 HPF:normal, filterd, HPF for IRQ : dis/dis, HPF coeff:norm + { + u8 acc_setting_sent = ( vreg_ctr[VREG_C_ACC_CONFIG] & + ( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ )); - // ピン不足のため、TSとそれ以外（回路違い）を区別して設定 - if( system_status.model == MODEL_TS_BOARD ) + if( acc_setting_sent == 0 ) { - str_send_buf[2] = bits8(0,0,0,0, 0,0,1,0); + // 完全停止 + PMK23 = 1; + str_send_buf[0] = + ( ACC_BITS_PM_PDN << ACC_bP_PM0 | 0 << ACC_bP_DR0 | ACC_BITS_ALL_AXIS_ON ); } else { - str_send_buf[2] = bits8(0,0,0,1, 0,0,0,0); + // on 100Hz 自動取り込み + PMK23 = 0; + str_send_buf[0] = + ( ACC_BITS_PM_NORM << ACC_bP_PM0 + | ACC_BITS_DR_100Hz << ACC_bP_DR0 + | ACC_BITS_ALL_AXIS_ON ); } - str_send_buf[3] = 0x80; // ctrl3 block update:enable, MSB first, scale: +-2G(default), selftest: dis - - { - u8 acc_setting_sent = ( vreg_ctr[VREG_C_ACC_CONFIG] & - ( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ )); - - do{ - EI(); - if( acc_setting_sent == 0 ) - { - PMK23 = 1; - // 完全停止 - str_send_buf[0] = - ( ACC_BITS_PM_PDN << ACC_bP_PM0 | 0 << ACC_bP_DR0 | ACC_BITS_ALL_AXIS_ON ); - } - else - { - PMK23 = 0; - // 100Hz 自動取り込み - str_send_buf[0] = - ( ACC_BITS_PM_NORM << ACC_bP_PM0 - | ACC_BITS_DR_100Hz << ACC_bP_DR0 - | ACC_BITS_ALL_AXIS_ON ); - } - // 実書き込み兼、通信できたかフラグ更新 - if( iic_mcu_write( IIC_SLA_ACCEL, ( ACC_REG_CTRL1 | ACC_REG_FLG_BURST_ACCESS ), 4, str_send_buf ) == I2C_ERR_NOSLAVE ) - { - vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_ACCERO_ERR; - }else{ - vreg_ctr[ VREG_C_STATUS_1 ] &= ~REG_BIT_ACCERO_ERR; - } + // 実書き込み兼、通信できたかフラグ更新 + if( iic_mcu_write( IIC_SLA_ACCEL, ( ACC_REG_CTRL1 | ACC_REG_FLG_BURST_ACCESS ), 4, str_send_buf ) == I2C_ERR_NOSLAVE ) + { + // センサ反応無し。タスクは削除しなくてはならない。 + vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_ACCERO_ERR; + return ( ERR_FINISED ); + // おしまい + } + // else - // カラ読み。前回のゴミを読み捨て - if( ACC_VALID ) - { - if( system_status.pwr_state == ON ) - { - u8 temp[ACC_RAW_DATA_SIZE]; - iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | ACC_REG_FLG_BURST_ACCESS ), 6, temp ); - } - } + // センサ設定成功 正常パス + vreg_ctr[ VREG_C_STATUS_1 ] &= ~REG_BIT_ACCERO_ERR; + acc_retry_count = 0; - // センサに書きにいっている最中にSoCがまた書き換えてしまうかもしれない - DI_wt_chk(); - }while( acc_setting_sent != ( vreg_ctr[VREG_C_ACC_CONFIG] & - ( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ )) ); - + // 前回のゴミが有ればカラ読み + if( ACC_VALID ) + { + if( system_status.pwr_state == ON ) + { + u8 temp[ACC_RAW_DATA_SIZE]; + iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | ACC_REG_FLG_BURST_ACCESS ), 6, temp ); + } + } + + // センサに書きにいっている最中にSoCがまた書き換えてしまうかもしれない + DI_wt_chk(); + if( acc_setting_sent != ( vreg_ctr[VREG_C_ACC_CONFIG] & + ( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ ))) + { + // DI状態のまま帰る + return ( ERR_CONTINUE ); // ちょっと間をおいて再度書きにくる // もっとよい実装？ } } @@ -255,11 +264,12 @@ task_status_immed tski_acc_setup( ) __interrupt void intp23_ACC_ready( ) { EI(); - if( ( vreg_ctr[VREG_C_ACC_CONFIG] & 0x03 ) != 0x00 ) + if( ( vreg_ctr[VREG_C_ACC_CONFIG] & 0x03 ) != 0x00 ) { - if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP ) ) + // 加速度センサ on + if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP ) ) { - if( ACC_VALID ) +// if( ACC_VALID ) // 確認不要 { renge_task_immed_add( tski_cbk_accero ); } diff --git a/trunk/bsr.hex b/trunk/bsr.hex index a4a1192..fed659d 100644 --- a/trunk/bsr.hex +++ b/trunk/bsr.hex @@ -1,13 +1,13 @@ -:02000000F50CFD -:04001000214723471A -:02001C00CF48CB -:0200240076491B -:02002A00C149CA -:08003400EE4A914AEA4A694DC7 -:02004A00254748 -:02005A005F47FE -:02006200EE4C62 -:06008000824BBB4B054C56 +:02000000F10C01 +:0400100039473B47EA +:02001C00E748B3 +:020024008E4903 +:02002A00D949B2 +:08003400064BA94A024B474D9F +:02004A003D4730 +:02005A007747E6 +:02006200054D4A +:060080009A4BD34B1D4C0E :0400C0007EFBFF04C0 :0A00C4001B339499E033F240BFAA09 :1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A @@ -33,8 +33,8 @@ :10020E00275FCE2EFCCF1105F8CF120511CF35008A :10021E0002CF370019CF530006CBEEFEFFCE38319A :10022E00CE3970CF38050A308700BF1801BF1A01CA -:10023E00BF1C01BF1E01D7D7C7F616FD6A04FDCF3E -:10024E000931329308713293717AFAEF0C717AFA9E +:10023E00BF1C01BF1E01D7D7C7F616FD6A04717B1E +:10024E00FA31329308713293717AFAEF0C717AFAAD :10025E00A7F647DFE95203EF01F2C6D7C7C1C1FBCC :10026E00F8FF17A1C1E0C18C0A70C18C0270FD8B22 :10027E00021006629D508C01721004C6D7C7C1FBD6 @@ -81,7 +81,7 @@ :10050E00D851FDD303A451FD4704713393F2C6D7DE :10051E00C72008FBF8FFFD6B085014C15008FD9D65 :10052E0007C0CC07048C074C14DE0C8C07318EFDF3 -:10053E00D709615907EFEECC07048C074C1461C83C +:10053E00D309615907EFEECC07048C074C1461C840 :10054E00ED0C06CC06008C064C0461C8EDEB0530B4 :10055E000AF9BC02F6BBCEABAC31B2D109C73641FB :10056E00057184C6DEF3F1C73641057184C661DCC0 @@ -90,16 +90,16 @@ :10059E00057184C6DEC3F1C73641057184C661DCC0 :1005AE000E059C055040C18C07318E31AD128C0664 :1005BE00318E318D03BDD831FFBDDADADAADD8FD1B -:1005CE00A30CC0D2DD0C5008C15014FD9D07C0FD18 -:1005DE00600B8C05D1DF06615906ED54058C073191 -:1005EE008EFDDB09D2DD0C5008C15014FD9D07C0F5 -:1005FE00FD600B8C05D1DF06615907ED4805716072 +:1005CE009F0CC0D2DD0C5008C15014FD9D07C0FD1C +:1005DE005C0B8C05D1DF06615906ED54058C073195 +:1005EE008EFDD709D2DD0C5008C15014FD9D07C0F9 +:1005FE00FD5C0B8C05D1DF06615907ED4805716076 :10060E005005CC0400CC05008C054C09DE2B8C0566 :10061E00318E04F61FC1317B9EFDC41189728C058B :10062E00318E04F64F14896142DF03F6EF01E66066 :10063E000E049C04615905EFCF41001140F81F3A9A -:10064E0061E86159048C04D1DF08FD610BFD730C68 -:10065E00EF0C5008C15014FD9D07C0FD600B100833 +:10064E0061E86159048C04D1DF08FD5D0BFD6F0C70 +:10065E00EF0C5008C15014FD9D07C0FD5C0B100837 :10066E00C6D7C72004FBF8FF712B24CC0100F6BCC3 :10067E0002AC02440900DE3EAC0204F60F14410047 :10068E00118972AC020C5014896142DF03F6EF013E @@ -116,24 +116,24 @@ :10073E002BC0CE3708CBE4FFFFCBE6FFF7CED4FFBE :10074E00CF370008F5120561FDE6BC02F6614902DD :10075E00DD9F00000000617902EFF1FD6B08D2DF32 -:10076E00FA5008C15014FD9D07C0D2FD600B100455 +:10076E00FA5008C15014FD9D07C0D2FD5C0B100459 :10077E00C6D73184BD02EFFA717BBDCBE4FFFFCB50 :10078E00E6FFFFCBD4FFFF717ABED7717BBED7C712 :10079E00C1200CFBF8FF8C0C318E31ADC1317B9D2D :1007AE00D4C0BC068DD49C088C149C0B8C14318E3A -:1007BE00040C00128C0B318EBDD813FD320F61C8A4 -:1007CE00ED6608CEABACCC05068C0B318EFDD30995 -:1007DE00D2DD158C0B318EFDD7096169058C05D1E3 +:1007BE00040C00128C0B318EBDD813FD2E0F61C8A8 +:1007CE00ED6608CEABACCC05068C0B318EFDCF0999 +:1007DE00D2DD158C0B318EFDD3096169058C05D1E7 :1007EE00DFE7FD9907E2EF71CC0A008C0A4C04DEBC :1007FE0054F6BC02300AF9BBAC06148C089EFD11EF :10080E008972AB146299AC06A1BC0661790061795C :10081E0002F0E1614902DFE05040C18C0B318E31B4 :10082E00AD128C0A318E318D03BDD831FFBDDADAAF -:10083E00DAADD8FDA30CC0D2DD06FD9907E2EF19A3 -:10084E0061590AEFA68C0B318EFDDB09D2DD03E276 +:10083E00DAADD8FD9F0CC0D2DD06FD9907E2EF19A7 +:10084E0061590AEFA68C0B318EFDD709D2DD03E27A :10085E00EF0761590BEDBA07F2100EC6D7C7717BC1 -:10086E009D717BFAFD8007300AF9FD860AFD110A9B -:10087E00C6D7FD6B08FD600BFD9907F5ABFFF2D7F0 +:10086E009D717BFAFD8007300AF9FD820AFD0D0AA3 +:10087E00C6D7FD6B08FD5C0BFD9907F5ABFFF2D7F4 :10088E00C7310497067110B3FBEF047118B3FB8FD9 :10089E00B3FB7B8A76D1DD278FB3FB9D8A665C0224 :1008AE00D1DD1C8FB3FB5C02D1DD0B5040C150106B @@ -154,100 +154,100 @@ :10099E00CFFEFBFFCFFAFBFFCFFBFBFFD7C7C1C1DB :1009AE00FBF8FFCEABAC8C02D1DD12616902305C7C :1009BE0003BBF6614900DDEE618900EFF51004C658 -:0509CE00D7717BFAD790 -:1009D3005208EF065203EF025206FEE600FE1B002A -:1009E300DC16089F03088F0408089F040862FE248E -:1009F30000089F0408EEBF00EEBA00C1C514410E03 -:100A030011D9D0FF118FD1FF312E45C4C0D7F23198 -:100A1300A2C401E2D79DE261DD4C09DF12717BFACA -:100A2300C18F06089F25FDC0CF060800EE270031C1 -:100A3300F2FA04CF0608004C00DF05D50008DD16E6 -:100A430061DD717BFAD50608DD0ACDE31F61CD6157 -:100A5300CDEE160061CDFED40061FFFE9A00FCF8D6 -:100A6300FF0EFEB20061CDFED5004C09DF0EC18F33 -:100A730006086F25FD9F0608C0EE0400CF06080098 -:100A8300F8E3D75200EF025202FE3700CF24FD00F5 -:100A9300CF060800BF0408C716629F000841001173 -:100AA3008F1A209B4100118F1B209F0108C6510004 -:100AB300FE62FFEF025205CF060800C1510CFE0A89 -:100AC30000C0D7C1511DFE0200C0D761DD717BFAA2 -:100AD30070CEC0A59EC47CFF9EC4609EC461CDD76A -:100AE30061DD717BFAC18EC45C1BFED6FFCF0608A5 -:100AF30001FED7FFC061CDD731F2FA1AC1AEE4BF10 -:100B030016FDAEE6BF18FDAED4BF1AFD30FFFFBE23 -:100B1300E4BEE6BED4C0D731F2FA11C1AF16FDBEB2 -:100B2300E4AF18FDBEE6AF1AFDBED4C0D7C1BF1CEB -:100B3300FD13BF1EFD15BF20FD17BF22FDC0D7AF9C -:100B43001CFDDB1EFDEB20FDFB22FDD7534B30527A -:100B53005430324E323030475631323000FFC150BC -:100B6300FEFEAB0061DD717BFACF060800FE0A00D2 -:100B7300FEA4FF61CDF8E3EECF00C7FB0408BF1668 -:100B8300FD8FC0009C05C5C337040600BF18FD35A3 -:100B930036C50B300000522BFE6600C2C4C630734C -:100BA3000BB800300000B8022004AF18FDB80030C5 -:100BB3000F00B802AF16FD61FF520AFE3AFFECF8D0 -:100BC300FF0E717BFAC1C7FB04088C05C65C80FE6F -:100BD3000200C0D761DD717BFA70CFC0FFA59FC053 -:100BE300007CFF9FC000609FC00061CDD7618BFE7A -:100BF300E2FF717BBE410011FB000017CEFC0061D8 -:100C0300CB089EFDF31161C999A58392DFF7D7FE47 -:100C1300B1FED524FDDF23C1CF0308035109FEF440 -:100C2300FDC0D2DF37FE3800A20408CF0308075106 -:100C330009FEE1FDD2B20408DF22C7FB04083183B9 -:100C430002C6D7C6510AFECCFD624C1FDF06CF2475 -:100C5300FD01EF04CF24FD00C0EE5BFEC0EE55FEA8 -:100C6300C7C1FB04088B31196C0161589BC0C6D7FF -:100C7300717BFAFE4DFEAF0408040600C11436D79B -:100C83000B300000522DF3FE77FF8FC000FE2BFECA -:100C930061CF5C807C8073C0041900CEFC0F61CBF4 -:100CA300C55404EF03C55417FE18FEC7360008BB2E -:100CB300629C0288089C03D1DD334C41DE2F70F126 -:100CC300312DB161090033081C000851FF612A412D -:100CD3000E118FD0FF613B118FD1FF6138DC0E8B7A -:100CE3005C03DF0964C6C4FE2BFDEECAFDC6C4EE79 -:020CF300C3FD3F -:100CF50061CF5100718C7109FECBF800FEFCC90172 -:100D050000F6BF00F953C0F693935820FEDFF94172 -:100D150000367A4D34CCFCEF05118B99A7A5174405 -:100D2500C44DDFF53602F930CCFCEF04CC0000A74A -:100D350047DFF9410036C44D3420FEEF05118B998C -:100D4500A7A51744D44DDFF53630FE3092FEEF04EB -:100D5500CC0000A747DFF9FCCE0000EFFE61DD7196 -:100D65007BFABEF0ADD8BEF200AEF661CDD7C36159 -:100D7500DD717BFABEF0ADD8BEF200DBF6FFADDC6F -:100D8500BEF000AEF6BDD8AEF40312ADDABEF20089 -:100D9500AEF661CD03BDDAC2D7C3F33174D908838A -:100DA500C1F626D8BDD8C031750683C312F623C255 -:100DB500FDC00D93DF0312F623C2D7440000DD26E4 -:100DC50061DD717BFACFE80080BEF6F6BEF4BEF2B7 -:100DD500ADD8BEF0CFE800818FE8003103FAAEF060 -:100DE500F5E80061CDD7B1D7C3F33174D90883C114 -:100DF500F626D8BDD8C0317505C312F623C2FD0E3F -:100E05000E93DF0312F623C2D7440000DD2761DD10 -:100E1500717BFACFE80080BEF6F6BEF4BEF2ADD81F -:100E2500BEF0CFE800818FE8003103FAAFE000F5AE -:100E3500E80061CDD7ADD8D7C3F33174DB0F83C1DB -:100E4500F626D8BDD861317026DABDDAC031750D08 -:100E550083C312F626DCBDDC61317023C2FD760E3C -:100E650093DF0CF626D8BDD861317026DABDDAC21B -:100E7500D7C161686BDC6BDDC0DD2F61DD717BFA8D -:100E8500CFE80080BEF4ADDCBEF6ADD8BEF0ADDA7D -:100E9500BEF2CFE800818FE8003103FAAEF0BDD88D -:100EA500AEF2BDDAF5E80061CDD7F6BDD8BDDAD72B -:100EB5008292DD2B61DD717BFACFE80080BEF0F612 -:100EC500BEF2BEF46208BEF6CFE800818FE80031BD -:100ED50003FAAFE0006072AEF0F5E80061CDD760CF -:100EE50072F6B1D706DABDDAADDC06D8BDD861D861 -:100EF500A6DAD7D1DD17C1C3DAD89DD8ADDA311C52 -:100F050061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDE4 -:100F15001BC1C3DADA9DDAADD8311E33311E337108 -:100F2500F9B4DADFF4BDD813BDDAC2C0D746D8DDCF -:100F35000771FF7177D971C0D75BDB9DDB605BDA29 -:100F45009DDAADDC5BD9085BD808BDD8D7C3C7F33C -:100F5500728EFDC162314C410036704D1161A07237 -:070F6500C09EFD62C6C2D769 -:0A0FF60031383A31323A3536000046 -:0A20000031383A31323A353600002B +:0109CE00D751 +:1009CF005208EF065203EF025206FEE600FE1B002E +:1009DF00DC16089F03088F0408089F040862FE2492 +:1009EF0000089F0408EEBF00EEBA00C1C514410E07 +:1009FF0011D9D0FF118FD1FF312E45C4C0D7F2319D +:100A0F00A2C401E2D79DE261DD4C09DF12717BFACE +:100A1F00C18F06089F25FDC0CF060800EE270031C5 +:100A2F00F2FA04CF0608004C00DF05D50008DD16EA +:100A3F0061DD717BFAD50608DD0ACDE31F61CD615B +:100A4F00CDEE160061CDFED40061FFFE9A00FCF8DA +:100A5F00FF0EFEB20061CDFED5004C09DF0EC18F37 +:100A6F0006086F25FD9F0608C0EE0400CF0608009C +:100A7F00F8E3D75200EF025202FE3700CF24FD00F9 +:100A8F00CF060800BF0408C716629F000841001177 +:100A9F008F1A209B4100118F1B209F0108C6510008 +:100AAF00FE62FFEF025205CF060800C1510CFE0A8D +:100ABF0000C0D7C1511DFE0200C0D761DD717BFAA6 +:100ACF0070CEC0A59EC47CFF9EC4609EC461CDD76E +:100ADF0061DD717BFAC18EC45C1BFED6FFCF0608A9 +:100AEF0001FED7FFC061CDD731F2FA1AC1AEE4BF14 +:100AFF0016FDAEE6BF18FDAED4BF1AFD30FFFFBE28 +:100B0F00E4BEE6BED4C0D731F2FA11C1AF16FDBEB6 +:100B1F00E4AF18FDBEE6AF1AFDBED4C0D7C1BF1CEF +:100B2F00FD13BF1EFD15BF20FD17BF22FDC0D7AFA0 +:100B3F001CFDDB1EFDEB20FDFB22FDD7534B30527E +:100B4F005430324E323030475631323000FFC150C0 +:100B5F00FEFEAB0061DD717BFACF060800FE0A00D6 +:100B6F00FEA4FF61CDF8E3EECF00C7FB0408BF166C +:100B7F00FD8FC0009C05C5C337040600BF18FD35A7 +:100B8F0036C10B300000522BFE6600C2C4C6306F58 +:100B9F000BB800300000B8022004AF18FDB80030C9 +:100BAF000F00B802AF16FD61FF520AFE3AFFECF8D4 +:100BBF00FF0E717BFAC1C7FB04088C05C65C80FE73 +:100BCF000200C0D761DD717BFA70CFC0FFA59FC057 +:100BDF00007CFF9FC000609FC00061CDD7618BFE7E +:100BEF00E2FF717BBE410011FB000017CEFC0061DC +:100BFF00CB089EFDF31161C999A58392DFF7D7FE4C +:100C0F00B1FED524FDDF23C1CF0308035109FEF444 +:100C1F00FDC0D2DF37FE3800A20408CF030807510A +:100C2F0009FEE1FDD2B20408DF22C7FB04083183BD +:100C3F0002C6D7C6510AFECCFD624C1FDF06CF2479 +:100C4F00FD01EF04CF24FD00C0EE5BFEC0EE55FEAC +:100C5F00C7C1FB04088B31196C0161589BC0C6D703 +:100C6F00717BFAFE4DFEAF0408040600C11436D3A3 +:100C7F000B300000522DF3FE77FF8FC000FE2BFECE +:100C8F0061CF5C807C8073C0041900CEFC0F61CBF8 +:100C9F00C55404EF03C55417FE18FEC7360008BB32 +:100CAF00629C0288089C03D1DD334C41DE2F70F12A +:100CBF00312DB161090033081C000851FF612A4131 +:100CCF000E118FD0FF613B118FD1FF6138DC0E8B7E +:100CDF005C03DF0964C6C4FE2BFDEECAFDC6C4EE7D +:020CEF00C3FD43 +:100CF10061CF5100718C7109FECBF800FEFCC90176 +:100D010000F6BF00F953C0F693935820FEDFF94176 +:100D11000036584D34CCFCEF05118B99A7A517442B +:100D2100A24DDFF53602F930CCFCEF04CC0000A770 +:100D310047DFF9410036A24D3420FEEF05118B99B2 +:100D4100A7A51744B24DDFF53630FE3092FEEF0411 +:100D5100CC0000A747DFF9FCCE0000EFFE61DD719A +:100D61007BFABEF0ADD8BEF200AEF661CDD7C3615D +:100D7100DD717BFABEF0ADD8BEF200DBF6FFADDC73 +:100D8100BEF000AEF6BDD8AEF40312ADDABEF2008D +:100D9100AEF661CD03BDDAC2D7C3F33174D908838E +:100DA100C1F626D8BDD8C031750683C312F623C259 +:100DB100FDBC0D93DF0312F623C2D7440000DD26EC +:100DC10061DD717BFACFE80080BEF6F6BEF4BEF2BB +:100DD100ADD8BEF0CFE800818FE8003103FAAEF064 +:100DE100F5E80061CDD7B1D7C3F33174D90883C118 +:100DF100F626D8BDD8C0317505C312F623C2FD0A47 +:100E01000E93DF0312F623C2D7440000DD2761DD14 +:100E1100717BFACFE80080BEF6F6BEF4BEF2ADD823 +:100E2100BEF0CFE800818FE8003103FAAFE000F5B2 +:100E3100E80061CDD7ADD8D7C3F33174DB0F83C1DF +:100E4100F626D8BDD861317026DABDDAC031750D0C +:100E510083C312F626DCBDDC61317023C2FD720E44 +:100E610093DF0CF626D8BDD861317026DABDDAC21F +:100E7100D7C161686BDC6BDDC0DD2F61DD717BFA91 +:100E8100CFE80080BEF4ADDCBEF6ADD8BEF0ADDA81 +:100E9100BEF2CFE800818FE8003103FAAEF0BDD891 +:100EA100AEF2BDDAF5E80061CDD7F6BDD8BDDAD72F +:100EB1008292DD2B61DD717BFACFE80080BEF0F616 +:100EC100BEF2BEF46208BEF6CFE800818FE80031C1 +:100ED10003FAAFE0006072AEF0F5E80061CDD760D3 +:100EE10072F6B1D706DABDDAADDC06D8BDD861D865 +:100EF100A6DAD7D1DD17C1C3DAD89DD8ADDA311C56 +:100F010061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDE8 +:100F11001BC1C3DADA9DDAADD8311E33311E33710C +:100F2100F9B4DADFF4BDD813BDDAC2C0D746D8DDD3 +:100F31000771FF7177D971C0D75BDB9DDB605BDA2D +:100F41009DDAADDC5BD9085BD808BDD8D7C3C7F340 +:100F5100728EFDC162314C4100364E4D1161A0725D +:070F6100C09EFD62C6C2D76D +:0A0FF60031373A31343A333200004B +:0A20000031373A31343A3332000030 :10200A0005214F7B9EC5E9000104080D12171C1F0C :10201A00080100001F003B005A0078009700B50035 :10202A00D400F300110130014E01192634445362E1 @@ -339,9 +339,9 @@ :10257C00A441ED0C26F4418D309D3F8D305070D62A :10258C0012307351230480001231FF318E039D40B1 :10259C009FAEFBF68D407C804C95DC1B8D40318FC3 -:1025AC00241400EA38BDD8AA44FD620D1231FF3163 +:1025AC00241400EA38BDD8AA44FD5E0D1231FF3167 :1025BC008E03318F16EF198D40318F241400EA38B9 -:1025CC00BDD8AA46FD620D1231FF318E03318F1634 +:1025CC00BDD8AA46FD5E0D1231FF318E03318F1638 :1025DC00EA388A427217F3031644000171FE61C88F :1025EC0036FF001701DE02F61617BD78C7500CFD3A :1025FC00012BC0D2DF068D309D3FEF047100B2FB82 @@ -351,7 +351,7 @@ :10263C004617040600FDF92BD2DD0F7100B2FB71B9 :10264C000392CC0500711293EF2D7108B2FB8C062E :10265C00318E318D080E07081C00BBEA388A407297 -:10266C00ABFDB50EBB8C019C05D1DF08CC0501CCB4 +:10266C00ABFDB10EBB8C019C05D1DF08CC0501CCB8 :10267C000400EF038B9C0417040600FD042CD2DD30 :10268C0006CC06C8CC07008C069FB1FB8C06318E9D :10269C00318D080E07081C00BD34AD344401A5DC97 @@ -451,7 +451,7 @@ :102C7C007AFAFDAB23F504F98F06F931051B5003E5 :102C8C00FD472B625C01D161E8CF04F902CFAFFBA9 :102C9C0064710407714192EF10F671040761101210 -:102CAC00F6B1236061FB714192FD5730FDCE42714C +:102CAC00F6B1236061FB714192FD5730FDDD42713D :102CBC002295712BE7618461A461EDEFF8D7714027 :102CCC00F00071783002713AE6713BE2713BEA71C7 :102CDC003BEE8F10055CFC9F1005CF34024AE55289 @@ -461,8 +461,8 @@ :102D1C003002D7717830027148F000D7C788061698 :102D2C0066614FDD0967614EDE0396EF01866672C0 :102D3C00C6D7C7161714AA0412A943DD29AA041270 -:102D4C00A923FDD44DC3AC02FDD44D13C2BDD81381 -:102D5C00FD320FDE0C1714AA0212AA0403BA04EFF8 +:102D4C00A923FDB24DC3AC02FDB24D13C2BDD813C5 +:102D5C00FD2E0FDE0C1714AA0212AA0403BA04EFFC :102D6C00051714A9BA04AC041231FF319E03317F4C :102D7C00087208C6D77100F200304400BFB60130AB :102D8C000188BF9001300984BF9E01BF9C01BF9A8E @@ -483,7 +483,7 @@ :102E7C00AA0412F6231231FF31AE03316FBA02C627 :102E8C00D7C7C1FBF8FF8C085080D612AB1413B90E :102E9C00AB14AA0412A92312D927FBF133BDD81302 -:102EAC00FD9E0DBA02C0C6D731049401D74004F977 +:102EAC00FD9A0DBA02C0C6D731049401D74004F97B :102EBC0002DF10F6BE64BE6EBE6ABF8EFBBF94FB13 :102ECC00BF9AFB31749314308AFBFD762E3090FB45 :102EDC00FD762E3096FBFD762EEF713114940D712C @@ -511,7 +511,7 @@ :10303C000B9E31449413714394717B9E8FDCFB9EE9 :10304C009A8FDDFB9E9B717A9EC6D7CFA7FB5CCF78 :10305C00A8FB5FCFC8FB5DCFFCFB36CFFDFBC9E502 -:10306C00D3FBD7C7CFA4FB12CFA5FB0ECFCCFBFF56 +:10306C00D3FBD7C7CFA4FB12CFA5FB0FCFCCFBFF55 :10307C00F5CDFBF5CEFBF5CFFBF5D0FB5600664C42 :10308C0064DE08723826FB0086EFF3C6D7C78806C5 :10309C001617F1E73403002361E3EDBE332361F827 @@ -531,8 +531,8 @@ :10317C0061F8ED92332361F8ED8333EDC03334A65F :10318C00FB89615F99EDCA333036296194667367A8 :10319C0018A4FBEDCA3340A9FB6ADF1340AAFB68F5 -:1031AC00DF0D674C6CDF08300B406194713AD567CA -:1031BC009FABFBEDCA3367D1DD0C303B3B619434E4 +:1031AC00DF0D674C6CDF08301A406194713AD567BB +:1031BC009FABFBEDCA3367D1DD0C304A3B619434D5 :1031CC00C4FB89616F99EDCA33675C02D1DD0730AE :1031DC00BF2A6194EF0B675C01D1DD0530C42A6115 :1031EC0094675C3CD1DD0F30C92A6194675C3C72FA @@ -557,10 +557,10 @@ :10331C00DF05710B9EEFED679E99710B9E9FDBFB9A :10332C00EDCA33714294675C7F9FDCFBEDCA33714D :10333C004294675C3F9FDDFBEDCA33675C3F9FDEC9 -:10334C00FBEF7B675C1F9FDFFBEF733004396194ED -:10335C00679FE4FBEF6830D1386194679FE5FBEF22 -:10336C005D30EA386194679FE8FBEF52675C01D1EE -:10337C00DD4CFDCE42EF474A58C8DE42E85867188C +:10334C00FBEF7B675C1F9FDFFBEF73300A396194E7 +:10335C00679FE4FBEF6830D7386194679FE5FBEF1C +:10336C005D30F0386194679FE8FBEF52675C01D1E8 +:10337C00DD4CFDDD42EF474A58C8DE42E85867187D :10338C005AFAA458EF38679D58EF33675C01D1DDCA :10339C0005711202EF03711302675C02D1DD057136 :1033AC002202EF03712302679FD3FBEF1167318E6B @@ -570,12 +570,12 @@ :1033EC00318E316D08616A08128F03FC5C80312AC2 :1033FC006162EF56664C3DDF08AE90BD5AF85AEF4D :10340C0049664C3EDF04F85BEF40664C4FDF05FD30 -:10341C00F642EF36664C61DF08E858095AFA72EF4B -:10342C0029664C7FDF05FDB13BEF1F664C4EDF0B71 +:10341C000543EF36664C61DF08E858095AFA72EF3B +:10342C0029664C7FDF05FDC03BEF1F664C4EDF0B62 :10343C00310496045210EF12F2EF0F664C5BDC0471 :10344C0052FFEF06667309A4FB72C6D7C78806162F :10345C0017F1241000240500DC07244C00DD17EFC5 -:10346C0017FDCF0917F104A4FB1489617F99717AB8 +:10346C0017717BFA17F104A4FB1489617F99717AA7 :10347C00FA715294EF02A458C6D7C7C1C1FBF8FF2A :10348C004004F903DD064004F904DF38717BFA8C43 :10349C00027309ACFB5E0AD1DF278C02318E04A4C7 @@ -586,7 +586,7 @@ :1034EC0025DD3D23DD1725DD1C23DD0523DD2BEF3D :1034FC003B710295679F06FCCD5F03EF2F675C83E2 :10350C009F03FCEF27675C039F05FC675C034C0281 -:10351C0061F8712296FDE444EF12679F07FCEF0CF3 +:10351C0061F8712296FDF344EF12679F07FCEF0CE4 :10352C006791DF08E0C15012FD8634C0C6D7C716BC :10353C0017F1E7240000DD2A23DD1E240300DD073C :10354C0024FB00DD24EF2531329605308000EF019D @@ -622,10 +622,10 @@ :10372C00F000710BE772C6D7C7C1C1FBF8FF8FFC65 :10373C00FB4E02DC03F2EF318C024FFDFBDC04523A :10374C00FFEF268C022FFCFB706131318D128FFD47 -:10375C00FB2FFCFB70613133BDD813FDC00DBB4496 +:10375C00FB2FFCFB70613133BDD813FDBC0DBB449A :10376C000001DC03F690BB8B721004C6D7C7C1FBFB :10377C00F8FFAC0814A91489708B6128706131FDB5 -:10378C00D44D1344030071FEDC23AC08148A04816D +:10378C00B24D1344030071FEDC23AC08148A04818F :10379C009A04AC08148A044C11DC10A9148B99AC53 :1037AC000814CA0200AC0814CA0310EF72AC081457 :1037BC00CA0400AC0814A914894DDE0AAC08148A9A @@ -638,355 +638,353 @@ :10382C00C6D7ED3138C75600664C0ADE0BF0317E38 :10383C0012F67810FC86EFF0C6D7C7200CFBF8FF09 :10384C0017040600C15006C150A8C15030FD8B02B0 -:10385C001006D2DD1BA4684A6808DE03E2EF62346E -:10386C00E4FB895CFC99FD04397110B2FBF2EF5159 -:10387C00300600C117040600C130E9FBFDDC4D1019 -:10388C0004F4688FE4FB5C01D1DD264004F903DF0E -:10389C00205010C180FD8634C0C736100571D4C6C7 -:1038AC00DE0F17C15006C150A8C15030FD8B02105D -:1038BC00064004F903DD064004F90461F8FD1040EC -:1038CC00F2100CC6D7D9E5FBC15030FD6A02C062BC -:1038DC009FE8FB5008C15011FD8634C0F2D7D9E8DF -:1038EC00FBC1D9E7FBC15030FDFE0210045008C1EA -:1038FC005011FD8634C0F2D7C7200CFBF8FFCC0961 -:10390C00004007F901DF05CC0A02EF03CC0A10CC0A -:10391C000B808FE4FB5C039C07717AFA8C07D1DF78 -:10392C0008717AD5CC0807EF06717BD5CC082F1718 -:10393C00040800C15004C150A0C15030FD35031023 -:10394C0006624C02DF067110B2FBEF047118B2FB79 -:10395C00C736100571D4C6DE164004F903DF101704 -:10396C00A1C15006C150A8C15030FD8B021006FDFC -:10397C00CF098FE4FB5C034E07DF9EF2100CC6D719 -:10398C00D504F9DF03F6BD6A4004F901DD0AD474ED -:10399C00DD03B474D7CD74038F04F9318FE723DDC5 -:1039AC000B24020024030061C8EDB13A8F06F931F3 -:1039BC00233E301B00466ADF0AE0C15010FD8634FE -:1039CC00C0EF1D307701466ADF165002C15010FD62 -:1039DC008634C0F64670DF088FC8FB5010D6BD7019 -:1039EC00F64670DD36B6704670DF30711293EF2BF1 -:1039FC00301B00466ADF13F64672DF18E0C1501028 -:103A0C00FD8634C0C9725307EF0A307701466A61EC -:103A1C00F8711293F6467261E8B6723154960871D9 -:103A2C004395F6BD6AEF1431449505F6BD6AEF0B6C -:103A3C00A66AF6466A61F8C96AFFFF316296194AAE -:103A4C006C05DE16A46C4A6C05DF0FA46C5004C127 -:103A5C005010FD8634C0EF02F46C316496194A6E36 -:103A6C0005DE16A46E4A6E05DF0FA46E5008C15019 -:103A7C0010FD8634C0EF02F46ED46FDD03B46FD743 -:103A8C00317296174A6D05DE14A46D4A6D05DF0D73 -:103A9C00A46D5010C1FD8634C0EF02F46D4A6D0662 -:103AAC0061F8CD6F25D7C736100571D4DE063046C8 -:103ABC00386194D24004F903DF1C3122070530F140 -:103ACC002961943154950C7153955080C15012FD5D -:103ADC008634C0FDE73AFD0D3BC6D78F03FC5C0175 -:103AEC00D1DD1DD477DD03B477D7CD77098D604B4D -:103AFC0076DD0D8D609D765040C15012FD8634C030 -:103B0C00D74004F903DD04F6BD1AD7D5D0FBDF0886 -:103B1C00F6461ADD19B61AD7D9CCFBF1461ADD0ECA -:103B2C00D9CCFB12AD1A43DE03A61AD7B61AD7C7E7 -:103B3C00FDCF098FC4FB76F5C4FB717AFA5C10D10A -:103B4C0061E8716295665C0FD1DD57665C01D1DD71 -:103B5C0005F504F9EF4C665C02D1DD11E0C15003B0 -:103B6C00FD362BC0711300711B20710303665C04BE -:103B7C00D1DD11711300711B20D503FC61F87103A9 -:103B8C0003FDD434665C08D161E87103035005FD74 -:103B9C00AB097102035003C1FD362BC0711A20FD15 -:103BAC00DE2AF2C6D7C756FF4A461361C8ED8B3CD6 -:103BBC008F06F9311505300400EF0F8F06F93145EA -:103BCC0005300500EF04D907F9F1609F28FC8D78CA -:103BDC009F29FC713492E661301271049261DC31E0 -:103BEC00196162629F2AFCE52BFC311402053080BE -:103BFC0000EF01F6C131449605304000EF01F6C2EA -:103C0C00616B08616A08C131340405302000EF0192 -:103C1C00F6C2616B08616A08C131240205300800E4 -:103C2C00EF01F6C2616B08616A08C1317496053008 -:103C3C000400EF01F6C2616B08616A08C131649639 -:103C4C0004E6A1EF01F6C2616B08616A08C1315448 -:103C5C009603E6EF01F6C2616B08616A9F2CFCF1DA -:103C6C0071240461DC9F26FCF171540761DC9F27F1 -:103C7C00FCD846F10104ECFC14A9148976A4466620 -:103C8C0072C6D7C7FDCF088F04F9318FE724000027 -:103C9C0061F8ED693E23DD1B2361F8ED733D236173 -:103CAC00F8EDEF3D2361F8ED383E2361F8ED0C3F64 -:103CBC00ED663EF6BD707113934005F901DF2C31B2 -:103CCC0034961B466ADD04F424EF02A4244A2465CE -:103CDC00DC0FF6BD6AF504F9712295ED8E3FFDAB54 -:103CEC0023AD6A440A0061D8ED8E3F714295FD6A9E -:103CFC0004716392FDAB234007F903DF0971229530 -:103D0C00F504F9ED8E3FFD0F2640B1FB9BDE0971EA -:103D1C002295F504F9ED8E3F714A2771401105711A -:103D2C00301105713A22715A2271501105FD3B294F -:103D3C00D2DD09712295F504F9ED8E3F7110350035 -:103D4C00CF37001D714012054005F901DD06400515 -:103D5C00F903DF05F5CDFBEF04CFCDFB03CF04F961 -:103D6C0002FD2129ED8E3FFD192CFDCA2C714A9DB7 -:103D7C00FDD434FD6F30F537FF712BE0F505F9718B -:103D8C002295CBE43FEFCBE6F6F0FD6A04713BD411 -:103D9C007112027123028F06F93105285004FD4778 -:103DAC002B625C03318E315D34B3FB8961689950B1 -:103DBC0002FD472BD2DD067170B3FBEF047178B3B3 -:103DCC00FBFDAB23FD812D710806F9CF04F9038FA0 -:103DDC00A6FB5C02D1DD095080C15010FD8634C0B9 -:103DEC00ED8E3FFD903F3164952FA47AD47ADD0897 -:103DFC0031A4E00A31020C06712BE0FDFC3F31A42A -:103E0C00E01731040C13712BE05027C15005FD361F -:103E1C002BC0CF04F904712295FDF13F8F06F931C7 -:103E2C00250731349603F504F9ED8E3FFD903F31B3 -:103E3C00020C14F0C15005FD362BC05005FDAB092A -:103E4C00FDFC3FCF04F903FDF13F8F06F931250747 -:103E5C0031349603F504F9ED8E3FF504F9CFCDFB23 -:103E6C0003F5CEFBF5D0FB717293F6426CFF61E863 -:103E7C00ED8E3FF6BD70711393F5E4FBFD043971C3 -:103E8C007AFAFDDA2DFD6C2CFD1F2D714B9D7113F3 -:103E9C000271230231349302EFFACE3708CBE4BF20 -:103EAC00FFCBE6FFF3CED4FFF5B4FBF5B5FBF5B6CF -:103EBC00FBF5B7FBCF37000971481205F6BEE0BE23 -:103ECC00E2BED0716A27FDB329714307714B27718C -:103EDC0048100571481105713810057138110571BC -:103EEC003302713B22715302715B227158100571C0 -:103EFC00581105CF04F905714295F6BD6AFD980974 -:103F0C00F505F9F42431349604D432DD20E505F9B5 -:103F1C00E504F98F06F9312569F5F8FBF5F6FB5048 -:103F2C002EFDAB09CF05F903E504F9EF55FDBE04F1 -:103F3C00FD3E23717301713204714302710392715E -:103F4C00629231949E02EFFA712AE7CEA409F5F33E -:103F5C00003104070261FDCFF30080F466FDCF0849 -:103F6C00CEA40831329606CF04F905EF09714395BA -:103F7C00E505F9E504F9712BE78F06F9312503F511 -:103F8C0004F9C6D7D47BDF19310200585003FD4722 -:103F9C002B625C01D1DF07F504F9712295D7E47B24 -:103FAC00D74A7BF0DF073104003AF47BD74A7BC851 -:103FBC00DF0AF504F9712295CD7BF0D731020008A8 -:103FCC004A7BFFDD1FA47BD7F0C15004FD362BC00C -:103FDC008FB3FB5C9F9FB3FB7110C4FB303B3B6109 -:103FEC0094CD7BF0D731149306F504F9712295D753 -:103FFC00716395F47A717207FD4502717307D7FDF1 -:10400C001E05F2D7C7200CFBF8FFFDCF098FEAFB8A -:10401C00F0F9E9FBF303FDD44D13BC048FECFBF07A -:10402C00F9EBFBF303FDD44D13BC028FEEFBF0F95F -:10403C00EDFBF303FDD44D13BB717AFAAC04BDD880 -:10404C00F6BDDAAC04311EBDDCF6BDDEFD730DAD84 -:10405C00D8BDDCADDABDDEAC02BDD8F6BDDAAC0243 -:10406C00311EDADCC3DADEC3BDDCF6BDDEFD730D5A -:10407C00C0BDDEC0BDDCADDEFDE90EADD8BDDCAD36 -:10408C00DABDDEABBDD8F6BDDAAB311EDADCC3DA95 -:10409C00DEC3BDDCF6BDDEFD730DC0BDDEC0BDDC18 -:1040AC00ADDEFDE90EDADAADD8FDDF43C3C58D8890 -:1040BC005C3FF0317E0440FC14C2C0B9A488F6BC4D -:1040CC0008BC0A9C078C074C2EDD3D8D880E0770B2 -:1040DC00F161DC605C3FF0317E127940FCBDD8F6BA -:1040EC00BDDA8C0773095C22318FBDDC70BDDEFD3F -:1040FC00730DAC08BDDCAC0AFDE90EADDABC0AAD43 -:10410C00D8BC08615907EFBDAC08BDD8AC0ABDDA04 -:10411C00C9DC0004F6FD3D0EC9DCFFFFF6FD3E0FC9 -:10412C00ADD8BD82AF3AFC4682DD11AF3CFCBF3E40 -:10413C00FCAF3AFCBF3CFCAD82BF3AFCAF3CFC424E -:10414C003EFCDC46AF3AFC423CFCDE3EAD26423A3D -:10415C00FCDE374A2A16DC1A4A2AA0DE138D844B61 -:10416C002ADE0DAF3AFC268644691061C8FDC841B1 -:10417C00F42AAF3AFC445146DC0AAF3AFC2410272F -:10418C00BD28EF0DC928F82AEF074A2AFF61E8A4D9 -:10419C002AAF3EFC423CFCDC18AF3CFC423AFCDE55 -:1041AC0010AF3AFC4628DE09F484AF3AFCBD86EF2A -:1041BC00074A84FF61E8A484100CC6D7C7FDCF0959 -:1041CC00710A9E31929E02EFFA8E949F34FC8E9669 -:1041DC009F35FC8E979F36FC8E989F37FC8E939F55 -:1041EC0038FC8E929F39FC710B9E717AFA8F37FCDA -:1041FC00FD520F76FD5D4313BD80D5EFFBDF0AD575 -:10420C00F0FBDF05D5F1FBDD25F6B14680DF11C9EA -:10421C00803722665C0391DF060A80181A810096AB -:10422C0017FD804413FDA04231049602EF61520643 -:10423C0092926934FC682EFCDFF6AD80BD7EF87C72 -:10424C00F3311C790AF944FEFFDD44D87CF10104FA -:10425C000AF914A944FFFFDF04E6B9EF0BD87CF18F -:10426C0001040AF914A9A1B9FDCF09A0EFFBD5EF00 -:10427C00FBDF1CA0F0FBD5F0FBDF14A0F1FBD5F1AC -:10428C00FBDF0CCFEFFBFFCFF0FBFFCFF1FBFFC64B -:10429C00717AFAD7C716D87CF10744A800DC0571EF -:1042AC000296EF1CF647DD18A47C4A7CA8DC05714D -:1042BC000296EF0CF87CF3311CF6780AF9B7EFE4B0 -:1042CC00C6D7C756A89666F0317E12F6B1780AF9B1 -:1042DC0066D1DFF1FDCF09F5EFFBF5F0FBF5F1FB56 -:1042EC00F47C710396C6717AFAD7C72004FBF8FFE9 -:1042FC00D446DF168D7C9D89FDCF095206929269BA -:10430C002EFC68C0FCDFF6717AFA4A4606DE0EE82F -:10431C004609C0FC9C03A4468C0372EF30F889F369 -:10432C00311C790AF9BB311296058B9C03EF0F8C6B -:10433C00019C03D489DF05CD89A7EF02B489718074 -:10434C0071179661DC61FB7111968C03721004C6B7 -:10435C00D7C72008FBF8FF8F37FCFD520F9C078F47 -:10436C0036FCFD520F9C068F35FCFD520F9C058FC1 -:10437C0034FCFD520F9C048F38FC9C038F39FC9C41 -:10438C00028C06318E0112791A20BB8C075C03D18A -:10439C00DF098C064C0361C86179008C05318EB144 -:1043AC00610900BB313D120103BB8B0E04708C0103 -:1043BC001C00BB8FF4FB4E03DC0E8C034FF4FBDCB8 -:1043CC000B8C024FF5FBDC04AB12EF03ABB11210FC -:1043DC0008C6D7C7C3C12008FBF8FFF661490A61BC -:1043EC00F8614908DF07F7340000ED7C44E6BC04B3 -:1043FC00F6BC06AC0ABC02AC08BBAC06614902AC0C -:10440C000461F8614900DE28AC04BDD8AC06BDDA05 -:10441C00E1FDF80EADDABC06ADD8BC04ABBDD8AC32 -:10442C0002BDDAE1FD130FADDABC02ADD8BBEFCAA9 -:10443C00AC06BC02AC04BBAC08BDD8AC0ABDDAAC53 -:10444C0004BDDCAC06FD760EAC04BDDCAC06FDE9AF -:10445C000EE1FD130FADDABC06ADD8BC04AC0661A1 -:10446C004902AC0461F8614900DCC5AC0214AB1222 -:10447C00100CC6D7C7C12004FBF8FF8F31FCFD52CE -:10448C000F9C034E04DF1CAD7E4680DE07AD8026FC -:10449C007E12EF40F64680DF07467EDD03E7EF3401 -:1044AC00F7EF318C04318EB1128C03318E43DF184F -:1044BC00303822267E0680BB8C045C0391DF05AB72 -:1044CC00041800BBAB12EF0C8C034E04DE0532A9B2 -:1044DC0000EF01F71006C6D7FDCF093122960BF677 -:1044EC00468CDD06B68C717AFAD7712396717AFAFE -:1044FC004004F904DF06715307F42CD7D9CFFBF134 -:10450C00E7240000DD0F23DD1823DD0F23DD4C2312 -:10451C00DD2423DD33715307F42CD7715207F42CAF -:10452C00D7D42CDF07715207E42CEF05715307F435 -:10453C002CC98CFA00D7D42CDF0A715207E42CC991 -:10454C008CFA00D7F5CFFBD7D42CDF0A715307E4D4 -:10455C002CC98CFA00D7CFCFFB02D7FD6B45D7D92E -:10456C0005FCF1E7240000DD0923DD2123DD09230F -:10457C00EF1B715307F42CD7D42CDF07715207E4CF -:10458C002CEF05715307F42CC98C2D01D7715207F0 -:10459C00E42CD731629301D7710394D9CDFBF1E7A9 -:1045AC00240000DD1223DD1923DD1123DD2623DD9C -:1045BC003423DD3923DD3FFD2B46EF3DFD4C46EF2B -:1045CC0038D9CCFBC1AE6CFD282DC0F313BE6C7179 -:1045DC002304EF25F0C1AE6CFD282DC0F313BE6C87 -:1045EC00712304EF14F6BE6C712204EF0CCB6CFF3C -:1045FC0000712304EF03FDC0464004F905DD0640BD -:10460C0004F901DF067123047103943104940FF64D -:10461C00BE64BE6A31220402EF02F690BE6ED7CDA4 -:10462C002E47F48EAE6C317DBFCAFCFD9546D2DFB1 -:10463C000ED9CCFBC1AE6CFD282DC0F313BE6CD7CC -:10464C00FD9546D2DD0DCD2E47F48EAE6C317DBF7F -:10465C00CAFCD7E88E0934205080D6BFC6FC22CACB -:10466C00FCBDD8304700FD9E0DBFC8FC30C6FCFD1C -:10467C003E2DF313BE6CB42ED42EDF0CCD2E47A4DE -:10468C008E4A8E1F61C8F48ED740AFFB0BDC0571D0 -:10469C002304F2D740AFFB0661D831229211F0C14E -:1046AC00AE6CFD282DC0F313BE6C712204EF03FD1C -:1046BC00C046E2D7710294F0C1AE6CFD282DC0F358 -:1046CC0013BE6CA48F4A8F40DC37F48FD890F13135 -:1046DC003F0412FD14D890F1BDD85008FDED0D0823 -:1046EC007208E6D2DD040192DFFC896158D1DD0548 -:1046FC00712204EF03712304A4904A902061C8F442 -:10470C0090D7C73026FDC6D77180717DFADE035273 -:05471C0001D75200D797 -:1047210061FC61FCC1C3C5C7520C929269D4FEC140 -:10473100DFF88EFD708EFCC1717AFA4004F903DF57 -:104741000530F1296194C09EFC609EFD34D4FE5277 -:1047510006C0B9A5A592DFF9C6C4C2C061FC61DF7C -:10476100520C929269D4FEC1DFF88EFD708EFCC1AD -:104771008F4105775C04D1DD06675C01D1DD5031E5 -:104781005494367162077153948FB4FB5FBCFBD1B3 -:10479100DF1B8FB5FB5FBDFBD1DF128FB6FB5FBEA9 -:1047A100FBD1DF098FB7FB5FBFFBD1DD0C316207A6 -:1047B10002EFFA716307716B27711396FD1830F4DC -:1047C100227148500571605005717AFAEDBB486756 -:1047D1005C02D1DD16D422DD124A2202DD0DF42263 -:1047E1007148500571605005717AFA717AFA8D221B -:1047F100318FE7240000DD0823DD1423DD2CEF4A8F -:10480100F4467140500571505005E422EDBB488FCC -:1048110040059D47715050058D479D49D847FDCCB6 -:1048210033629D48CD2202EDBB48675C02D1DD17A2 -:10483100675C10D1DD05CD2203EF0F714850057182 -:10484100605005F422EF73CD22044A2203DF108D5C -:10485100489F4005D848C1D847FD5834C0EF1F8F45 -:10486100400576717447DC054A4702DE06716050E7 -:1048710005EF47C7D847FD9930C071505005D84959 -:10488100F1242900DD27240400DD22242200DD1D7E -:10489100241100DD0C240100DD13241E00DD0EEFC8 -:1048A1000A4A4760DF07CD4761EF02A4474A220366 -:1048B100DF08D847FDCC33629D48C09EFC609EFD59 -:1048C10034D4FE5206C0B9A5A592DFF961FCC1C37B -:1048D100C5C7520C929269D4FEC1DFF88EFD708E6D -:1048E100FCC1717AFA51405F0401D1DD06F616A7C9 -:1048F10047DFF2300400BF2401F6BF2A01300B0B61 -:10490100BF2801FD4502300B0FBF2801FD450230D4 -:104911000F0FBF2801710AE6F6420C01DD33AF0427 -:1049210001BF0C0131529329715293710BE2D84DA1 -:10493100FDB7033184BD02EFFACBB422FBD84FF1AE -:10494100BEB8714BE1714BE5710ABD8D4E9E44EFCE -:104951000C715393714AE5717BBD713393C09EFC19 -:10496100609EFD34D4FE5206C0B9A5A592DFF9C6FA -:10497100C4C2C061FCC1C5717AFAD44CDD0BEA4AEC -:10498100899E44A64AB44CEF33710AE6300400BF55 -:104991002401F6BF2A01300B0BBF280100000000E3 -:1049A10000000000510FBF280100000000000000BE -:1049B10000500FBF2801712393713393C4C061FC70 -:1049C10061EF520C929269D4FEC1DFF88EFD708EB8 -:1049D100FCC12006FBF8FF71503002CEABACCC0419 -:1049E10000F6BB31B2E210617900F6614900DFF3F4 -:1049F10071603002ED7B4A8E519C03713BE28C0366 -:104A01005C02D1DD1E8C035C08D1DF0971503002DC -:104A1100CC0400EFCC8C0570FD3A35629E50CC047D -:104A210002EFBE8C035C03D1DF408E509C027150BB -:104A310030028C04D1DF0E8C0270FD8035629C0542 -:104A4100CC0401EF328C044C02DF0671603002EFBE -:104A510029CF34025A716030028C0270C18C05700A -:104A6100FDE234C0CF34024AEF108C035C01D1DD8A -:104A71000671603002EF03EDE2491006C09EFC6052 -:104A81009EFD34D4FE5206C0B9A5A592DFF961FCA2 -:104A9100C1C3C5C7520C929269D4FEC1DFF88EFD25 -:104AA100708EFCC1710A9E31929E02EFFA8FDEFB7D -:104AB1004F96FFDF198FDFFB4F97FFDF118FE0FB71 -:104AC1004F98FFDF095004C15011FD8634C0710BAE -:104AD1009EC09EFC609EFD34D4FE5206C0B9A5A5C1 -:104AE10092DFF9C6C4C2C061FCE46661FCC1C3C502 -:104AF100C7520C929269D4FEC1DFF88EFD708EFC14 -:104B0100C1C1FBF8FF8D1F9C018E31318EE7240658 -:104B110000DD0823DD0E23DD22EF38717AFA8C01E6 -:104B21009D5EEF2F717AFA4007F901DF068C019D36 -:104B31005DEF2051FF2E019D5DEF18717AFA8C0116 -:104B41009D304004F903DD064004F904DF05306DB2 -:104B51002561944031FF09DE05A031FFEF0771584F -:104B6100F000716294710BE3C0C09EFC609EFD3445 -:104B7100D4FE5206C0B9A5A592DFF9C6C4C2C06170 -:104B8100FCC7FDCF09D46661F831249527712395BF -:104B9100D466DD05B466CEABAC717AFA5600664CCC -:104BA1000ADD1172F3311C79D8FCCEFC0061CA61B7 -:104BB100A486EFEA717AFAF2C6D7C7C1C1FBF8FF42 -:104BC100CC01008C014C0ADE36FDCF098C01F0319D -:104BD1007E0410FC14A96168DF09AC02B9717AFA8C -:104BE100F2EF1D8C01F0317E127910FC614902DF78 -:104BF10006717AFAE2EF09717AFA615901EFC4E2BA -:104C01001004C6D7C72004FBF8FFF64210FC61F878 -:104C1100EDE84CFDCF09CC03008C034C0ADE3C8C43 -:104C210003F0317E0410FC14A96168DF05717AFA82 -:104C3100EF29717AFA8C0372F3311C7910FCCEFCE6 -:104C41000061CA629C02D1DF0A8C03F0317E12E658 -:104C51007810FCFDCF09615903EFBECC0200CC01F5 -:104C6100018C02F0317E0410FC14A96168DD788C9E -:104C710002F0317E127910FCE743DF658C014C0AAA -:104C8100DE5F8C01F0317E127910FCE743DD4DFDD2 -:104C9100CF098C01F0317E0410FC14A96168DF1882 -:104CA1006169018C01F0317E12F67810FC8C024EA4 -:104CB10001DCED717AFAEF2F8C01F0317E0410FCEA -:104CC10014A9128C02F0317E337810FC8C01F03182 -:104CD1007E12E67810FC615902717AFA615901EF8E -:104CE1009B615902ED624C00F21004C6D761FF527C -:104CF1000C929269D4FEC1DFF88EFD708EFCC171F9 -:104D01007AFA8FE4FB5C03D1DD184004F903DD0678 -:104D11004004F904DF0C36100571D4DE0530463845 -:104D21006194C09EFC609EFD34D4FE5206C0B9A5BC -:104D3100A592DFF961FC61FC61FC61FC61FC61FC35 -:104D410061FC61FC61FC61FC61FC61FC61FC61FC7A -:104D510061FC61FC61FC61FC61FC61FC61FC61FC6A -:0E4D610061FC61FC61FC61FC61FC61FC61FCB9 -:0A4D700000060C12181E242A30362B -:104D7A00ACFB0000000062FE000000008C39CD355B -:104D8A008C229F45052EB42EE444B23A8E088F3CFD -:104D9A0028FC36FE20FE02F903F929FC30FE2AFC23 -:104DAA002BFC08F926FC6CFF1AFF6EFF6AFF64FFF2 -:0A4DBA0027FC66FF2CFC55555555EB -:104DC400FF0000000000983AF82AFF0000004700A6 -:104DD400317503F7332312D714AEF8C716AC061295 -:104DE400C5AC0416F643DD078B99A7A5B3EFF5C24E -:024DF400C6D720 -:024FF400323E4B -:0A4FF60031383A31323A3536000006 +:10385C001006D2DD1B4A6804DE05A468E2EF68346A +:10386C00E4FB895CFC99FD0A397110B2FBF2EF574D +:10387C00717BFA300600C117040600C130E9FBFD6C +:10388C00BA4D1004717AFAF4688FE4FB5C01D1DD57 +:10389C00264004F903DF205010C180FD8634C0C7D8 +:1038AC0036100571D4C6DE0F17C15006C150A8C121 +:1038BC005030FD8B0210064004F903DD064004F97C +:1038CC000461F8FD1F40F2100CC6D7D9E5FBC150BE +:1038DC0030FD6A02C0629FE8FB5008C15011FD86A2 +:1038EC0034C0F2D7D9E8FBC1D9E7FBC15030FDFE9B +:1038FC000210045008C15011FD8634C0F2D7C72005 +:10390C000CFBF8FFCC09004007F901DF05CC0A02DB +:10391C00EF03CC0A10CC0B808FE4FB5C039C07D12B +:10392C00DF08717AD5CC0807EF06717BD5CC082F50 +:10393C0017040800C15004C150A0C15030FD35031C +:10394C001006624C02DF077110B2FBF2EF357118F2 +:10395C00B2FBF468C736100571D4C6DE164004F904 +:10396C0003DF1017A1C15006C150A8C15030FD8B08 +:10397C00021006717BFA8FE4FB5C034E07DD03E259 +:10398C00EF01F2100CC6D7D504F9DF03F6BD6A407F +:10399C0004F901DD0AD474DD03B474D7CD74038F3C +:1039AC0004F9318FE723DD0B24020024030061C8E6 +:1039BC00EDB83A8F06F931233E301B00466ADF0A18 +:1039CC00E0C15010FD8634C0EF1D307701466ADF30 +:1039DC00165002C15010FD8634C0F64670DF088FB9 +:1039EC00C8FB5010D6BD70F64670DD36B67046700A +:1039FC00DF30711293EF2B301B00466ADF13F64653 +:103A0C0072DF18E0C15010FD8634C0C9725307EF45 +:103A1C000A307701466A61F8711293F6467261E8D2 +:103A2C00B67231549608714395F6BD6AEF14314461 +:103A3C009505F6BD6AEF0BA66AF6466A61F8C96A87 +:103A4C00FFFF316296194A6C05DE16A46C4A6C05B0 +:103A5C00DF0FA46C5004C15010FD8634C0EF02F48B +:103A6C006C316496194A6E05DE16A46E4A6E05DF3B +:103A7C000FA46E5008C15010FD8634C0EF02F46ED6 +:103A8C00D46FDD03B46FD7317296174A6D05DE140F +:103A9C00A46D4A6D05DF0DA46D5010C1FD8634C0B8 +:103AAC00EF02F46D4A6D0661F8CD6F25D7C736105D +:103ABC000571D4DE0E8FB2FB5C02D1DF06304638C6 +:103ACC006194D24004F903DF1C3122070530F1293F +:103ADC0061943154950C7153955080C15012FD86F0 +:103AEC0034C0FDF63AFD1C3BC6D78F03FC5C01D1FC +:103AFC00DD1DD477DD03B477D7CD77098D604B7698 +:103B0C00DD0D8D609D765040C15012FD8634C0D7BE +:103B1C004004F903DD04F6BD1AD7D5D0FBDF08F657 +:103B2C00461ADD19B61AD7D9CCFBF1461ADD0ED9D7 +:103B3C00CCFB12AD1A43DE03A61AD7B61AD7717B8B +:103B4C00FAC78FC4FB76F5C4FB717AFA5C10D161AD +:103B5C00E8716295665C0FD1DD57665C01D1DD05BD +:103B6C00F504F9EF4C665C02D1DD11E0C15003FDA8 +:103B7C00362BC0711300711B20710303665C04D1DA +:103B8C00DD11711300711B20D503FC61F871030367 +:103B9C00FDD434665C08D161E87103035005FDABBC +:103BAC00097102035003C1FD362BC0711A20FDDED2 +:103BBC002AF2C6D7C756FF4A461361C8ED9A3C8F06 +:103BCC0006F9311505300400EF0F8F06F931450564 +:103BDC00300500EF04D907F9F1609F28FC8D789F20 +:103BEC0029FC713492E661301271049261DC311956 +:103BFC006162629F2AFCE52BFC31140205308000C7 +:103C0C00EF01F6C131449605304000EF01F6C26178 +:103C1C006B08616A08C131340405302000EF01F6ED +:103C2C00C2616B08616A08C131240205300800EFDB +:103C3C0001F6C2616B08616A08C1317496053004E3 +:103C4C0000EF01F6C2616B08616A08C13164960429 +:103C5C00E6A1EF01F6C2616B08616A08C1315496A6 +:103C6C0003E6EF01F6C2616B08616A9F2CFCF171EF +:103C7C00240461DC9F26FCF171540761DC9F27FC56 +:103C8C00D846F10104ECFC14A9148976A44666729A +:103C9C00C6D7C7FDCF088F04F9318FE72400006128 +:103CAC00F8ED783E23DD1B2361F8ED823D2361F8AE +:103CBC00EDFE3D2361F8ED473E2361F8ED1B3FED32 +:103CCC00753EF6BD707113934005F901DF2C31344C +:103CDC00961B466ADD04F424EF02A4244A2465DC16 +:103CEC000FF6BD6AF504F9712295ED9D3FFDAB23EE +:103CFC00AD6A440A0061D8ED9D3F714295FD6A049E +:103D0C00716392FDAB234007F903DF09712295F52E +:103D1C0004F9ED9D3FFD0F2640B1FB9BDE0971229E +:103D2C0095F504F9ED9D3F714A27714011057130ED +:103D3C001105713A22715A2271501105FD3B29D29D +:103D4C00DD09712295F504F9ED9D3F71103500CF19 +:103D5C0037001D714012054005F901DD064005F9DB +:103D6C0003DF05F5CDFBEF04CFCDFB03CF04F90248 +:103D7C00FD2129ED9D3FFD192CFDCA2C714A9DFD9D +:103D8C00D434FD6F30F537FF712BE0F505F9712256 +:103D9C0095CBE43FEFCBE6F6F0FD6A04713BD471B2 +:103DAC0012027123028F06F93105285004FD472BAE +:103DBC00625C03318E315D34B3FB896168995002CA +:103DCC00FD472BD2DD067170B3FBEF047178B3FBAA +:103DDC00FDAB23FD812D710806F9CF04F9038FA6E5 +:103DEC00FB5C02D1DD095080C15010FD8634C0ED62 +:103DFC009D3FFD9F3F3164952FA47AD47ADD083125 +:103E0C00A4E00A31020C06712BE0FD0B4031A4E05A +:103E1C001731040C13712BE05027C15005FD362BC4 +:103E2C00C0CF04F904712295FD00408F06F93125AD +:103E3C000731349603F504F9ED9D3FFD9F3F3102A8 +:103E4C000C14F0C15005FD362BC05005FDAB09FD1F +:103E5C000B40CF04F903FD00408F06F931250731E3 +:103E6C00349603F504F9ED9D3FF504F9CFCDFB0332 +:103E7C00F5CEFBF5D0FB717293F6426CFF61E8ED69 +:103E8C009D3FF6BD70711393F5E4FBFD0A39717A11 +:103E9C00FAFDDA2DFD6C2CFD1F2D714B9D7113025B +:103EAC0071230231349302EFFACE3708CBE4BFFF13 +:103EBC00CBE6FFF3CED4FFF5B4FBF5B5FBF5B6FBC3 +:103ECC00F5B7FBCF37000971481205F6BEE0BEE22C +:103EDC00BED0716A27FDB329714307714B27714816 +:103EEC0010057148110571381005713811057133C1 +:103EFC0002713B22715302715B227158100571588B +:103F0C001105CF04F905714295F6BD6AFD9809F5C6 +:103F1C0005F9F42431349604D432DD20E505F9E5B5 +:103F2C0004F98F06F9312569F5F8FBF5F6FB502EEF +:103F3C00FDAB09CF05F903E504F9EF55FDBE04FD12 +:103F4C003E237173017132047143027103927162E9 +:103F5C009231949E02EFFA712AE7CEA409F5F30090 +:103F6C003104070261FDCFF30080F466FDCF08CE6B +:103F7C00A40831329606CF04F905EF09714395E593 +:103F8C0005F9E504F9712BE78F06F9312503F504E2 +:103F9C00F9C6D7D47BDF19310200585003FD472BEB +:103FAC00625C01D1DF07F504F9712295D7E47BD768 +:103FBC004A7BF0DF073104003AF47BD74A7BC8DF39 +:103FCC000AF504F9712295CD7BF0D7310200084A2D +:103FDC007BFFDD1FA47BD7F0C15004FD362BC08FB7 +:103FEC00B3FB5C9F9FB3FB7110C4FB304A3B6194E5 +:103FFC00CD7BF0D731149306F504F9712295D77166 +:10400C006395F47A717207FD4502717307D7FD1E33 +:10401C0005F2D7717BFAC7200CFBF8FF8FEAFBF097 +:10402C00F9E9FBF303FDB24D13BC048FECFBF0F983 +:10403C00EBFBF303FDB24D13BC028FEEFBF0F9ED7D +:10404C00FBF303FDB24D13BB717AFAAC04BDD8F689 +:10405C00BDDAAC04311EBDDCF6BDDEFD6F0DADD896 +:10406C00BDDCADDABDDEAC02BDD8F6BDDAAC0231DA +:10407C001EDADCC3DADEC3BDDCF6BDDEFD6F0DC0BF +:10408C00BDDEC0BDDCADDEFDE50EADD8BDDCADDA10 +:10409C00BDDEABBDD8F6BDDAAB311EDADCC3DADE81 +:1040AC00C3BDDCF6BDDEFD6F0DC0BDDEC0BDDCAD3D +:1040BC00DEFDE50EDADAADD8FDEE43C3C58D885CC6 +:1040CC003FF0317E0440FC14C2C0B9A488F6BC0891 +:1040DC00BC0A9C078C074C2EDD3D8D880E0770F1B9 +:1040EC0061DC605C3FF0317E127940FCBDD8F6BDDE +:1040FC00DA8C0773095C22318FBDDC70BDDEFD6F7D +:10410C000DAC08BDDCAC0AFDE50EADDABC0AADD8D1 +:10411C00BC08615907EFBDAC08BDD8AC0ABDDAC903 +:10412C00DC0004F6FD390EC9DCFFFFF6FD3A0FADDD +:10413C00D8BD82AF3AFC4682DD11AF3CFCBF3EFCE1 +:10414C00AF3AFCBF3CFCAD82BF3AFCAF3CFC423EFC +:10415C00FCDC46AF3AFC423CFCDE3EAD26423AFC6F +:10416C00DE374A2A16DC1A4A2AA0DE138D844B2A23 +:10417C00DE0DAF3AFC268644691061C8FDD741F4C8 +:10418C002AAF3AFC445146DC0AAF3AFC241027BD56 +:10419C0028EF0DC928F82AEF074A2AFF61E8A42A5C +:1041AC00AF3EFC423CFCDC18AF3CFC423AFCDE105F +:1041BC00AF3AFC4628DE09F484AF3AFCBD86EF0723 +:1041CC004A84FF61E8A484100CC6D7717BFAC771CE +:1041DC000A9E31929E02EFFA8E949F34FC8E969F2B +:1041EC0035FC8E979F36FC8E989F37FC8E939F38AC +:1041FC00FC8E929F39FC710B9E717AFA8F37FCFD05 +:10420C004E0F76FD6C4313BD80D5EFFBDF0AD5F066 +:10421C00FBDF05D5F1FBDD25F6B14680DF11C9804A +:10422C003722665C0391DF060A80181A8100961704 +:10423C00FD8F4413FDAF4231049602EF615206929A +:10424C00926934FC682EFCDFF6AD80BD7EF87CF301 +:10425C00311C790AF944FEFFDD44D87CF101040AD3 +:10426C00F914A944FFFFDF04E6B9EF0BD87CF10188 +:10427C00040AF914A9A1B9717BFAA0EFFBD5EFFBE5 +:10428C00DF1CA0F0FBD5F0FBDF14A0F1FBD5F1FB9C +:10429C00DF0CCFEFFBFFCFF0FBFFCFF1FBFFC671C5 +:1042AC007AFAD7C716D87CF10744A800DC0571024E +:1042BC0096EF1CF647DD18A47C4A7CA8DC0571023D +:1042CC0096EF0CF87CF3311CF6780AF9B7EFE4C6DC +:1042DC00D7C756A89666F0317E12F6B1780AF96601 +:1042EC00D1DFF1717BFAF5EFFBF5F0FBF5F1FBF4A7 +:1042FC007C710396C6717AFAD7C72004FBF8FFD4F9 +:10430C0046DF168D7C9D89717BFA52069292692E3E +:10431C00FC68C0FCDFF6717AFA4A4606DE0EE84607 +:10432C0009C0FC9C03A4468C0372EF30F889F3316E +:10433C001C790AF9BB311296058B9C03EF0F8C018B +:10434C009C03D489DF05CD89A7EF02B489718071F4 +:10435C00179661DC61FB7111968C03721004C6D741 +:10436C00C72008FBF8FF8F37FCFD4E0F9C078F36DC +:10437C00FCFD4E0F9C068F35FCFD4E0F9C058F34BB +:10438C00FCFD4E0F9C048F38FC9C038F39FC9C0267 +:10439C008C06318E0112791A20BB8C075C03D1DF9D +:1043AC00098C064C0361C86179008C05318EB161B2 +:1043BC000900BB313D120103BB8B0E04708C011C38 +:1043CC0000BB8FF4FB4E03DC0E8C034FF4FBDC0BB9 +:1043DC008C024FF5FBDC04AB12EF03ABB1121008EF +:1043EC00C6D7C7C3C12008FBF8FFF661490A61F8BC +:1043FC00614908DF07F7340000ED8B44E6BC04F696 +:10440C00BC06AC0ABC02AC08BBAC06614902AC04ED +:10441C0061F8614900DE28AC04BDD8AC06BDDAE118 +:10442C00FDF40EADDABC06ADD8BC04ABBDD8AC0205 +:10443C00BDDAE1FD0F0FADDABC02ADD8BBEFCAACF3 +:10444C0006BC02AC04BBAC08BDD8AC0ABDDAAC04EB +:10445C00BDDCAC06FD720EAC04BDDCAC06FDE50E9D +:10446C00E1FD0F0FADDABC06ADD8BC04AC0661495A +:10447C0002AC0461F8614900DCC5AC0214AB12104B +:10448C000CC6D7C7C12004FBF8FF8F31FCFD4E0FC3 +:10449C009C034E04DF1CAD7E4680DE07AD80267E7D +:1044AC0012EF40F64680DF07467EDD03E7EF34F778 +:1044BC00EF318C04318EB1128C03318E43DF183006 +:1044CC003822267E0680BB8C045C0391DF05AB048E +:1044DC001800BBAB12EF0C8C034E04DE0532A900A6 +:1044EC00EF01F71006C6D7717BFA3122960CF6460F +:1044FC008CDD07B68C717AFAEF7C712396717AFA9F +:10450C004004F904DF07715307F42CEF69D9CFFB92 +:10451C00F1E7240000DD0F23DD1A23DD1023DD532A +:10452C0023DD2723DD38715307F42CEF4971520733 +:10453C00F42CEF42D42CDF07715207E42CEF0571F9 +:10454C005307F42CC98CFA00EF2CD42CDF0B7152CE +:10455C0007E42CC98CFA00EF1DF5CFFBEF18D42C17 +:10456C00DF0B715307E42CC98CFA00EF09CFCFFB9A +:10457C0002EF03FD8345D7D905FCF1E7240000DDEC +:10458C000923DD2123DD0923EF1B715307F42CD7FD +:10459C00D42CDF07715207E42CEF05715307F42C70 +:1045AC00C98C2D01D7715207E42CD731629301D7F6 +:1045BC00710394D9CDFBF1E7240000DD1223DD1942 +:1045CC0023DD1123DD2623DD3423DD3923DD3FFDFF +:1045DC004346EF3DFD6446EF38D9CCFBC1AE6CFDD4 +:1045EC00282DC0F313BE6C712304EF25F0C1AE6C03 +:1045FC00FD282DC0F313BE6C712304EF14F6BE6CB2 +:10460C00712204EF0CCB6CFF00712304EF03FDD877 +:10461C00464004F905DD064004F901DF0671230468 +:10462C007103943104940FF6BE64BE6A3122040205 +:10463C00EF02F690BE6ED7CD2E47F48EAE6C317D68 +:10464C00BFCAFCFDAD46D2DF0ED9CCFBC1AE6CFDB2 +:10465C00282DC0F313BE6CD7FDAD46D2DD0DCD2E8B +:10466C0047F48EAE6C317DBFCAFCD7E88E0934207E +:10467C005080D6BFC6FC22CAFCBDD8304700FD9A7C +:10468C000DBFC8FC30C6FCFD3E2DF313BE6CB42E22 +:10469C00D42EDF0CCD2E47A48E4A8E1F61C8F48E0B +:1046AC00D740AFFB0BDC05712304F2D740AFFB0600 +:1046BC0061D831229211F0C1AE6CFD282DC0F313DC +:1046CC00BE6C712204EF03FDD846E2D7710294F060 +:1046DC00C1AE6CFD282DC0F313BE6CA48F4A8F4065 +:1046EC00DC37F48FD890F1313F0412FD14D890F1DF +:1046FC00BDD85008FDE90D087208E6D2DD04019220 +:10470C00DFFC896158D1DD05712204EF03712304AC +:10471C00A4904A902061C8F490D7C73026FDC6D724 +:0D472C007180717DFADE035201D75200D773 +:1047390061FC61FCC1C3C5C7520C929269D4FEC128 +:10474900DFF88EFD708EFCC1717AFA4004F903DF3F +:104759000530F1296194C09EFC609EFD34D4FE525F +:1047690006C0B9A5A592DFF9C6C4C2C061FC61DF64 +:10477900520C929269D4FEC1DFF88EFD708EFCC195 +:104789008F4105775C04D1DD06675C01D1DD5031CD +:104799005494367162077153948FB4FB5FBCFBD19B +:1047A900DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE91 +:1047B900FBD1DF098FB7FB5FBFFBD1DD0C3162078E +:1047C90002EFFA716307716B27711396FD1830F4C4 +:1047D900227148500571605005717AFAEDD3486726 +:1047E9005C02D1DD16D422DD124A2202DD0DF4224B +:1047F9007148500571605005717AFA717AFA8D2203 +:10480900318FE7240000DD0823DD1423DD2CEF4A76 +:10481900F4467140500571505005E422EDD3488F9C +:1048290040059D47715050058D479D49D847FDCC9E +:1048390033629D48CD2202EDD348675C02D1DD1772 +:10484900675C10D1DD05CD2203EF0F71485005716A +:10485900605005F422EF73CD22044A2203DF108D44 +:10486900489F4005D848C1D847FD5834C0EF1F8F2D +:10487900400576717447DC054A4702DE06716050CF +:1048890005EF47C7D847FD9930C071505005D84941 +:10489900F1242900DD27240400DD22242200DD1D66 +:1048A900241100DD0C240100DD13241E00DD0EEFB0 +:1048B9000A4A4760DF07CD4761EF02A4474A22034E +:1048C900DF08D847FDCC33629D48C09EFC609EFD41 +:1048D90034D4FE5206C0B9A5A592DFF961FCC1C363 +:1048E900C5C7520C929269D4FEC1DFF88EFD708E55 +:1048F900FCC1717AFA51405F0401D1DD06F616A7B1 +:1049090047DFF2300400BF2401F6BF2A01300B0B48 +:10491900BF2801FD4502300B0FBF2801FD450230BC +:104929000F0FBF2801710AE6F6420C01DD33AF040F +:1049390001BF0C0131529329715293710BE2D84D89 +:10494900FDB7033184BD02EFFACBB422FBD84FF196 +:10495900BEB8714BE1714BE5710ABD8D4E9E44EFB6 +:104969000C715393714AE5717BBD713393C09EFC01 +:10497900609EFD34D4FE5206C0B9A5A592DFF9C6E2 +:10498900C4C2C061FCC1C5717AFAD44CDD0BEA4AD4 +:10499900899E44A64AB44CEF33710AE6300400BF3D +:1049A9002401F6BF2A01300B0BBF280100000000CB +:1049B90000000000510FBF280100000000000000A6 +:1049C90000500FBF2801712393713393C4C061FC58 +:1049D90061EF520C929269D4FEC1DFF88EFD708EA0 +:1049E900FCC12006FBF8FF71503002CEABACCC0401 +:1049F90000F6BB31B2E210617900F6614900DFF3DC +:104A090071603002ED934A8E519C03713BE28C0335 +:104A19005C02D1DD1E8C035C08D1DF0971503002C4 +:104A2900CC0400EFCC8C0570FD3A35629E50CC0465 +:104A390002EFBE8C035C03D1DF408E509C027150A3 +:104A490030028C04D1DF0E8C0270FD8035629C052A +:104A5900CC0401EF328C044C02DF0671603002EFA6 +:104A690029CF34025A716030028C0270C18C0570F2 +:104A7900FDE234C0CF34024AEF108C035C01D1DD72 +:104A89000671603002EF03EDFA491006C09EFC6022 +:104A99009EFD34D4FE5206C0B9A5A592DFF961FC8A +:104AA900C1C3C5C7520C929269D4FEC1DFF88EFD0D +:104AB900708EFCC1710A9E31929E02EFFA8FDEFB65 +:104AC9004F96FFDF198FDFFB4F97FFDF118FE0FB59 +:104AD9004F98FFDF095004C15011FD8634C0710B96 +:104AE9009EC09EFC609EFD34D4FE5206C0B9A5A5A9 +:104AF90092DFF9C6C4C2C061FCE46661FCC1C3C5EA +:104B0900C7520C929269D4FEC1DFF88EFD708EFCFB +:104B1900C1C1FBF8FF8D1F9C018E31318EE7240640 +:104B290000DD0823DD0E23DD22EF38717AFA8C01CE +:104B39009D5EEF2F717AFA4007F901DF068C019D1E +:104B49005DEF2051FF2E019D5DEF18717AFA8C01FE +:104B59009D304004F903DD064004F904DF05306D9A +:104B69002561944031FF09DE05A031FFEF07715837 +:104B7900F000716294710BE3C0C09EFC609EFD342D +:104B8900D4FE5206C0B9A5A592DFF9C6C4C2C06158 +:104B9900FC717BFAC7D46661F83124952771239596 +:104BA900D466DD05B466CEABAC717AFA5600664CB4 +:104BB9000ADD1172F3311C79D8FCCEFC0061CA619F +:104BC900A486EFEA717AFAF2C6D7C7C1C1FBF8FF2A +:104BD900CC01008C014C0ADE36717BFA8C01F03174 +:104BE9007E0410FC14A96168DF09AC02B9717AFA74 +:104BF900F2EF1D8C01F0317E127910FC614902DF60 +:104C090006717AFAE2EF09717AFA615901EFC4E2A1 +:104C19001004C6D7C72004FBF8FFF64210FC61F860 +:104C2900EDFF4C717BFA9C038C034C0ADE3C8C0330 +:104C3900F0317E0410FC14A96168DF05717AFAEF7E +:104C490029717AFA8C0372F3311C7910FCCEFC00BD +:104C590061CA629C02D1DF0A8C03F0317E12E678C8 +:104C690010FC717BFA615903EFBECC0200CC010143 +:104C79008C02F0317E0410FC14A96168DD788C0285 +:104C8900F0317E127910FCE743DF658C014C0ADEB6 +:104C99005F8C01F0317E127910FCE743DD4D717BA9 +:104CA900FA8C01F0317E0410FC14A96168DF1861E7 +:104CB90069018C01F0317E12F67810FC8C024E01EC +:104CC900DCED717AFAEF2F8C01F0317E0410FC14BF +:104CD900A9128C02F0317E337810FC8C01F0317E00 +:104CE90012E67810FC615902717AFA615901EF9B59 +:104CF900615902ED794C00F21004C6D761FF520CDC +:104D0900929269D4FEC1DFF88EFD708EFCC1717A72 +:104D1900FA8FE4FB5C03D1DD114004F903DD0640A1 +:104D290004F904DF053046386194C09EFC609EFD9D +:104D390034D4FE5206C0B9A5A592DFF961FC61FC25 +:044D490061FC61FCAC +:0A4D4E0000060C12181E242A30364D +:104D5800ACFB0000000062FE000000009339CD3576 +:104D68008C22B745052EB42EF344B93A8E089E3CE2 +:104D780028FC36FE20FE02F903F929FC30FE2AFC45 +:104D88002BFC08F926FC6CFF1AFF6EFF6AFF64FF14 +:0A4D980027FC66FF2CFC555555550D +:104DA200FF0000000000983AF82AFF0000004700C8 +:104DB200317503F7332312D714AEF8C716AC0612B7 +:104DC200C5AC0416F643DD078B99A7A5B3EFF5C270 +:024DD200C6D742 +:024FF400323F4A +:0A4FF60031373A31343A333200000B :00000001FF  \ No newline at end of file diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index e011016..4e46c24 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 9983e94..30feb62 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.33 Date: 5 Sep 2011 Page: 1 +78K0R Linker W1.33 Date: 8 Sep 2011 Page: 1 Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C @@ -26,8 +26,8 @@ Direc-file:bsr_mcu.dr *** Link information *** 72 output segment(s) - 3CD7H byte(s) real data - 6236 symbol(s) defined + 3CB1H byte(s) real data + 6072 symbol(s) defined *** Memory map *** @@ -150,7 +150,7 @@ Direc-file:bsr_mcu.dr LDR_CODL util_funcs 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - LDR_CODE 000CEH 00905H CSEG + LDR_CODE 000CEH 00901H CSEG LDR_CODE loader 000CEH 00177H LDR_CODE WDT 00245H 00000H LDR_CODE i2c_mcu 00245H 002D9H @@ -162,43 +162,43 @@ Direc-file:bsr_mcu.dr 0088EH 00041H LDR_CODE hal 008CFH 000DCH LDR_CODE util_funcs - 009ABH 00028H - FSL_CODE 009D3H 00322H CSEG + 009ABH 00024H + FSL_CODE 009CFH 00322H CSEG FSL_CODE fsl_block_cmd - 009D3H 0002BH + 009CFH 0002BH FSL_CODE fsl_block_check - 009FEH 00013H + 009FAH 00013H FSL_CODE fsl_common - 00A11H 0014FH + 00A0DH 0014FH FSL_CODE fsl_reset - 00B60H 00001H + 00B5CH 00001H FSL_CODE fsl_si_ibf - 00B61H 00064H + 00B5DH 00064H FSL_CODE fsl_phySwap - 00BC5H 0004DH + 00BC1H 0004DH FSL_CODE fsl_si_common - 00C12H 00061H - FSL_CODE fsl_swap 00C73H 00030H + 00C0EH 00061H + FSL_CODE fsl_swap 00C6FH 00030H FSL_CODE fsl_write - 00CA3H 00052H - @@LCODE 00CF5H 00277H CSEG - @@LCODE @cstart 00CF5H 0006DH - @@LCODE @imul 00D62H 00011H - @@LCODE @lumul 00D73H 0002BH - @@LCODE @isdiv 00D9EH 00022H - @@LCODE @iudiv 00DC0H 0002DH - @@LCODE @isrem 00DEDH 00021H - @@LCODE @iurem 00E0EH 0002FH - @@LCODE @lsdiv 00E3DH 00039H - @@LCODE @ludiv 00E76H 0003FH - @@LCODE @divuw 00EB5H 00034H - @@LCODE @ladd 00EE9H 0000FH - @@LCODE @llsh 00EF8H 0001BH - @@LCODE @lursh 00F13H 0001FH - @@LCODE @iscmp 00F32H 0000CH - @@LCODE @lband 00F3EH 00014H - @@LCODE @bcdtob 00F52H 0001AH -* gap * 00F6CH 0008AH + 00C9FH 00052H + @@LCODE 00CF1H 00277H CSEG + @@LCODE @cstart 00CF1H 0006DH + @@LCODE @imul 00D5EH 00011H + @@LCODE @lumul 00D6FH 0002BH + @@LCODE @isdiv 00D9AH 00022H + @@LCODE @iudiv 00DBCH 0002DH + @@LCODE @isrem 00DE9H 00021H + @@LCODE @iurem 00E0AH 0002FH + @@LCODE @lsdiv 00E39H 00039H + @@LCODE @ludiv 00E72H 0003FH + @@LCODE @divuw 00EB1H 00034H + @@LCODE @ladd 00EE5H 0000FH + @@LCODE @llsh 00EF4H 0001BH + @@LCODE @lursh 00F0FH 0001FH + @@LCODE @iscmp 00F2EH 0000CH + @@LCODE @lband 00F3AH 00014H + @@LCODE @bcdtob 00F4EH 0001AH +* gap * 00F68H 0008EH MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -250,7 +250,7 @@ Direc-file:bsr_mcu.dr 0228CH 00000H @@CNST util_funcs 0228CH 00000H - ROM_CODE 0228CH 02495H CSEG + ROM_CODE 0228CH 024ADH CSEG ROM_CODE pm 0228CH 0098DH ROM_CODE i2c_ctr 02C19H 0005CH ROM_CODE main 02C75H 00055H @@ -261,277 +261,277 @@ Direc-file:bsr_mcu.dr ROM_CODE vreg_twl 034D4H 000F9H ROM_CODE adc 035CDH 00261H ROM_CODE renge 0382EH 00018H - ROM_CODE accero 03846H 00146H - ROM_CODE sw 0398CH 00126H + ROM_CODE accero 03846H 0014DH + ROM_CODE sw 03993H 00126H ROM_CODE task_misc - 03AB2H 001DDH - ROM_CODE task_sys 03C8FH 00381H + 03AB9H 001E5H + ROM_CODE task_sys 03C9EH 00381H ROM_CODE pedo_alg_thre_det2 - 04010H 004D4H - ROM_CODE led_cam 044E4H 000BBH - ROM_CODE led_pow 0459FH 0016FH - ROM_CODE voltable 0470EH 00000H + 0401FH 004D4H + ROM_CODE led_cam 044F3H 000C4H + ROM_CODE led_pow 045B7H 0016FH + ROM_CODE voltable 04726H 00000H ROM_CODE pedo_lpf_coeff - 0470EH 00000H + 04726H 00000H ROM_CODE kanaria_c - 0470EH 00006H - ROM_CODE get_ei 04714H 0000DH - @@BASE 04721H 0064EH CSEG BASE - @@BASE loader 04721H 00000H - @@BASE pm 04721H 0003EH - @@BASE i2c_ctr 0475FH 00170H - @@BASE main 048CFH 00000H - @@BASE magic 048CFH 00000H - @@BASE WDT 048CFH 00000H - @@BASE i2c_mcu 048CFH 000F2H - @@BASE i2c_twl 049C1H 000D0H - @@BASE led 04A91H 00000H - @@BASE rtc 04A91H 0005DH - @@BASE vreg_ctr 04AEEH 00000H - @@BASE vreg_twl 04AEEH 00000H - @@BASE adc 04AEEH 00094H - @@BASE renge 04B82H 0016CH - @@BASE accero 04CEEH 00049H + 04726H 00006H + ROM_CODE get_ei 0472CH 0000DH + @@BASE 04739H 00614H CSEG BASE + @@BASE loader 04739H 00000H + @@BASE pm 04739H 0003EH + @@BASE i2c_ctr 04777H 00170H + @@BASE main 048E7H 00000H + @@BASE magic 048E7H 00000H + @@BASE WDT 048E7H 00000H + @@BASE i2c_mcu 048E7H 000F2H + @@BASE i2c_twl 049D9H 000D0H + @@BASE led 04AA9H 00000H + @@BASE rtc 04AA9H 0005DH + @@BASE vreg_ctr 04B06H 00000H + @@BASE vreg_twl 04B06H 00000H + @@BASE adc 04B06H 00094H + @@BASE renge 04B9AH 0016BH + @@BASE accero 04D05H 00042H @@BASE self_flash - 04D37H 00000H - @@BASE sw 04D37H 00000H + 04D47H 00000H + @@BASE sw 04D47H 00000H @@BASE task_debug - 04D37H 00000H + 04D47H 00000H @@BASE task_misc - 04D37H 00000H - @@BASE task_sys 04D37H 00000H + 04D47H 00000H + @@BASE task_sys 04D47H 00000H @@BASE pedo_alg_thre_det2 - 04D37H 00000H - @@BASE ini_VECT 04D37H 00038H + 04D47H 00000H + @@BASE ini_VECT 04D47H 00006H @@BASE task_status - 04D6FH 00000H - @@BASE led_cam 04D6FH 00000H - @@BASE led_pow 04D6FH 00000H - @@BASE hal 04D6FH 00000H + 04D4DH 00000H + @@BASE led_cam 04D4DH 00000H + @@BASE led_pow 04D4DH 00000H + @@BASE hal 04D4DH 00000H @@BASE batt_params - 04D6FH 00000H - @@BASE voltable 04D6FH 00000H + 04D4DH 00000H + @@BASE voltable 04D4DH 00000H @@BASE pedo_lpf_coeff - 04D6FH 00000H + 04D4DH 00000H @@BASE kanaria_c - 04D6FH 00000H + 04D4DH 00000H @@BASE util_funcs - 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL @cstart 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL pm 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL main 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL led 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL rtc 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL adc 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL renge 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL accero 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL sw 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP + 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL @cstart 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL pm 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL main 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL led 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL rtc 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL adc 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL renge 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL accero 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL sw 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP @@CNSTL task_misc - 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL task_sys 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP + 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL task_sys 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL led_cam 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL led_pow 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP + 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL led_cam 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL led_pow 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP @@CNSTL batt_params - 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP - @@CNSTL voltable 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP + 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP + @@CNSTL voltable 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP @@CNSTL pedo_lpf_coeff - 04D6FH 00000H - @@CNSTL 04D6FH 00000H CSEG PAGE64KP + 04D4DH 00000H + @@CNSTL 04D4DH 00000H CSEG PAGE64KP @@CNSTL kanaria_c - 04D6FH 00000H - @@RLINIT 04D6FH 00000H CSEG UNIT64KP - @@RLINIT loader 04D6FH 00000H - @@RLINIT pm 04D6FH 00000H - @@RLINIT i2c_ctr 04D6FH 00000H - @@RLINIT main 04D6FH 00000H - @@RLINIT magic 04D6FH 00000H - @@RLINIT WDT 04D6FH 00000H - @@RLINIT i2c_mcu 04D6FH 00000H - @@RLINIT i2c_twl 04D6FH 00000H - @@RLINIT led 04D6FH 00000H - @@RLINIT rtc 04D6FH 00000H - @@RLINIT vreg_ctr 04D6FH 00000H - @@RLINIT vreg_twl 04D6FH 00000H - @@RLINIT adc 04D6FH 00000H - @@RLINIT renge 04D6FH 00000H - @@RLINIT accero 04D6FH 00000H + 04D4DH 00000H + @@RLINIT 04D4DH 00000H CSEG UNIT64KP + @@RLINIT loader 04D4DH 00000H + @@RLINIT pm 04D4DH 00000H + @@RLINIT i2c_ctr 04D4DH 00000H + @@RLINIT main 04D4DH 00000H + @@RLINIT magic 04D4DH 00000H + @@RLINIT WDT 04D4DH 00000H + @@RLINIT i2c_mcu 04D4DH 00000H + @@RLINIT i2c_twl 04D4DH 00000H + @@RLINIT led 04D4DH 00000H + @@RLINIT rtc 04D4DH 00000H + @@RLINIT vreg_ctr 04D4DH 00000H + @@RLINIT vreg_twl 04D4DH 00000H + @@RLINIT adc 04D4DH 00000H + @@RLINIT renge 04D4DH 00000H + @@RLINIT accero 04D4DH 00000H @@RLINIT self_flash - 04D6FH 00000H - @@RLINIT sw 04D6FH 00000H + 04D4DH 00000H + @@RLINIT sw 04D4DH 00000H @@RLINIT task_debug - 04D6FH 00000H + 04D4DH 00000H @@RLINIT task_misc - 04D6FH 00000H - @@RLINIT task_sys 04D6FH 00000H + 04D4DH 00000H + @@RLINIT task_sys 04D4DH 00000H @@RLINIT pedo_alg_thre_det2 - 04D6FH 00000H - @@RLINIT ini_VECT 04D6FH 00000H + 04D4DH 00000H + @@RLINIT ini_VECT 04D4DH 00000H @@RLINIT task_status - 04D6FH 00000H - @@RLINIT led_cam 04D6FH 00000H - @@RLINIT led_pow 04D6FH 00000H - @@RLINIT hal 04D6FH 00000H + 04D4DH 00000H + @@RLINIT led_cam 04D4DH 00000H + @@RLINIT led_pow 04D4DH 00000H + @@RLINIT hal 04D4DH 00000H @@RLINIT batt_params - 04D6FH 00000H - @@RLINIT voltable 04D6FH 00000H + 04D4DH 00000H + @@RLINIT voltable 04D4DH 00000H @@RLINIT pedo_lpf_coeff - 04D6FH 00000H + 04D4DH 00000H @@RLINIT kanaria_c - 04D6FH 00000H + 04D4DH 00000H @@RLINIT util_funcs - 04D6FH 00000H - @@RLINIT @rom 04D6FH 00000H - @@CODEL 04D6FH 00000H CSEG - @@CODEL pm 04D6FH 00000H - @@CODEL i2c_ctr 04D6FH 00000H - @@CODEL main 04D6FH 00000H - @@CODEL magic 04D6FH 00000H - @@CODEL i2c_twl 04D6FH 00000H - @@CODEL led 04D6FH 00000H - @@CODEL rtc 04D6FH 00000H - @@CODEL vreg_ctr 04D6FH 00000H - @@CODEL vreg_twl 04D6FH 00000H - @@CODEL adc 04D6FH 00000H - @@CODEL renge 04D6FH 00000H - @@CODEL accero 04D6FH 00000H - @@CODEL sw 04D6FH 00000H + 04D4DH 00000H + @@RLINIT @rom 04D4DH 00000H + @@CODEL 04D4DH 00000H CSEG + @@CODEL pm 04D4DH 00000H + @@CODEL i2c_ctr 04D4DH 00000H + @@CODEL main 04D4DH 00000H + @@CODEL magic 04D4DH 00000H + @@CODEL i2c_twl 04D4DH 00000H + @@CODEL led 04D4DH 00000H + @@CODEL rtc 04D4DH 00000H + @@CODEL vreg_ctr 04D4DH 00000H + @@CODEL vreg_twl 04D4DH 00000H + @@CODEL adc 04D4DH 00000H + @@CODEL renge 04D4DH 00000H + @@CODEL accero 04D4DH 00000H + @@CODEL sw 04D4DH 00000H @@CODEL task_misc - 04D6FH 00000H - @@CODEL task_sys 04D6FH 00000H + 04D4DH 00000H + @@CODEL task_sys 04D4DH 00000H @@CODEL pedo_alg_thre_det2 - 04D6FH 00000H - @@CODEL ini_VECT 04D6FH 00000H - @@CODEL led_cam 04D6FH 00000H - @@CODEL led_pow 04D6FH 00000H + 04D4DH 00000H + @@CODEL ini_VECT 04D4DH 00000H + @@CODEL led_cam 04D4DH 00000H + @@CODEL led_pow 04D4DH 00000H @@CODEL batt_params - 04D6FH 00000H - @@CODEL voltable 04D6FH 00000H + 04D4DH 00000H + @@CODEL voltable 04D4DH 00000H @@CODEL pedo_lpf_coeff - 04D6FH 00000H + 04D4DH 00000H @@CODEL kanaria_c - 04D6FH 00000H -* gap * 04D6FH 00001H - @@CNSTL 04D70H 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04D70H 0000AH - @@R_INIT 04D7AH 0004AH CSEG UNIT64KP - @@R_INIT @cstart 04D7AH 00000H - @@R_INIT loader 04D7AH 00000H - @@R_INIT pm 04D7AH 00000H - @@R_INIT i2c_ctr 04D7AH 00000H - @@R_INIT main 04D7AH 00000H - @@R_INIT magic 04D7AH 00000H - @@R_INIT WDT 04D7AH 00000H - @@R_INIT i2c_mcu 04D7AH 00000H - @@R_INIT i2c_twl 04D7AH 00000H - @@R_INIT led 04D7AH 00000H - @@R_INIT rtc 04D7AH 00000H - @@R_INIT vreg_ctr 04D7AH 00000H - @@R_INIT vreg_twl 04D7AH 00000H - @@R_INIT adc 04D7AH 0000CH - @@R_INIT renge 04D86H 00014H - @@R_INIT accero 04D9AH 00000H + 04D4DH 00000H +* gap * 04D4DH 00001H + @@CNSTL 04D4EH 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04D4EH 0000AH + @@R_INIT 04D58H 0004AH CSEG UNIT64KP + @@R_INIT @cstart 04D58H 00000H + @@R_INIT loader 04D58H 00000H + @@R_INIT pm 04D58H 00000H + @@R_INIT i2c_ctr 04D58H 00000H + @@R_INIT main 04D58H 00000H + @@R_INIT magic 04D58H 00000H + @@R_INIT WDT 04D58H 00000H + @@R_INIT i2c_mcu 04D58H 00000H + @@R_INIT i2c_twl 04D58H 00000H + @@R_INIT led 04D58H 00000H + @@R_INIT rtc 04D58H 00000H + @@R_INIT vreg_ctr 04D58H 00000H + @@R_INIT vreg_twl 04D58H 00000H + @@R_INIT adc 04D58H 0000CH + @@R_INIT renge 04D64H 00014H + @@R_INIT accero 04D78H 00000H @@R_INIT self_flash - 04D9AH 00000H - @@R_INIT sw 04D9AH 00000H + 04D78H 00000H + @@R_INIT sw 04D78H 00000H @@R_INIT task_debug - 04D9AH 00000H + 04D78H 00000H @@R_INIT task_misc - 04D9AH 00026H - @@R_INIT task_sys 04DC0H 00000H + 04D78H 00026H + @@R_INIT task_sys 04D9EH 00000H @@R_INIT pedo_alg_thre_det2 - 04DC0H 00000H - @@R_INIT ini_VECT 04DC0H 00000H + 04D9EH 00000H + @@R_INIT ini_VECT 04D9EH 00000H @@R_INIT task_status - 04DC0H 00000H - @@R_INIT led_cam 04DC0H 00000H - @@R_INIT led_pow 04DC0H 00004H - @@R_INIT hal 04DC4H 00000H + 04D9EH 00000H + @@R_INIT led_cam 04D9EH 00000H + @@R_INIT led_pow 04D9EH 00004H + @@R_INIT hal 04DA2H 00000H @@R_INIT batt_params - 04DC4H 00000H - @@R_INIT voltable 04DC4H 00000H + 04DA2H 00000H + @@R_INIT voltable 04DA2H 00000H @@R_INIT pedo_lpf_coeff - 04DC4H 00000H + 04DA2H 00000H @@R_INIT kanaria_c - 04DC4H 00000H + 04DA2H 00000H @@R_INIT util_funcs - 04DC4H 00000H - @@R_INIT @rom 04DC4H 00000H - @@R_INIS 04DC4H 00010H CSEG UNIT64KP - @@R_INIS @cstart 04DC4H 00000H - @@R_INIS loader 04DC4H 00000H - @@R_INIS pm 04DC4H 00002H - @@R_INIS i2c_ctr 04DC6H 00002H - @@R_INIS main 04DC8H 00000H - @@R_INIS magic 04DC8H 00000H - @@R_INIS WDT 04DC8H 00000H - @@R_INIS i2c_mcu 04DC8H 00000H - @@R_INIS i2c_twl 04DC8H 00000H - @@R_INIS led 04DC8H 00000H - @@R_INIS rtc 04DC8H 00000H - @@R_INIS vreg_ctr 04DC8H 00000H - @@R_INIS vreg_twl 04DC8H 00000H - @@R_INIS adc 04DC8H 00000H - @@R_INIS renge 04DC8H 00000H - @@R_INIS accero 04DC8H 00000H + 04DA2H 00000H + @@R_INIT @rom 04DA2H 00000H + @@R_INIS 04DA2H 00010H CSEG UNIT64KP + @@R_INIS @cstart 04DA2H 00000H + @@R_INIS loader 04DA2H 00000H + @@R_INIS pm 04DA2H 00002H + @@R_INIS i2c_ctr 04DA4H 00002H + @@R_INIS main 04DA6H 00000H + @@R_INIS magic 04DA6H 00000H + @@R_INIS WDT 04DA6H 00000H + @@R_INIS i2c_mcu 04DA6H 00000H + @@R_INIS i2c_twl 04DA6H 00000H + @@R_INIS led 04DA6H 00000H + @@R_INIS rtc 04DA6H 00000H + @@R_INIS vreg_ctr 04DA6H 00000H + @@R_INIS vreg_twl 04DA6H 00000H + @@R_INIS adc 04DA6H 00000H + @@R_INIS renge 04DA6H 00000H + @@R_INIS accero 04DA6H 00000H @@R_INIS self_flash - 04DC8H 00000H - @@R_INIS sw 04DC8H 00000H + 04DA6H 00000H + @@R_INIS sw 04DA6H 00000H @@R_INIS task_debug - 04DC8H 00000H + 04DA6H 00000H @@R_INIS task_misc - 04DC8H 00000H - @@R_INIS task_sys 04DC8H 00002H + 04DA6H 00000H + @@R_INIS task_sys 04DA6H 00002H @@R_INIS pedo_alg_thre_det2 - 04DCAH 00006H - @@R_INIS ini_VECT 04DD0H 00000H + 04DA8H 00006H + @@R_INIS ini_VECT 04DAEH 00000H @@R_INIS task_status - 04DD0H 00000H - @@R_INIS led_cam 04DD0H 00002H - @@R_INIS led_pow 04DD2H 00002H - @@R_INIS hal 04DD4H 00000H + 04DAEH 00000H + @@R_INIS led_cam 04DAEH 00002H + @@R_INIS led_pow 04DB0H 00002H + @@R_INIS hal 04DB2H 00000H @@R_INIS batt_params - 04DD4H 00000H - @@R_INIS voltable 04DD4H 00000H + 04DB2H 00000H + @@R_INIS voltable 04DB2H 00000H @@R_INIS pedo_lpf_coeff - 04DD4H 00000H + 04DB2H 00000H @@R_INIS kanaria_c - 04DD4H 00000H + 04DB2H 00000H @@R_INIS util_funcs - 04DD4H 00000H - @@R_INIS @rom 04DD4H 00000H - @@LCODEL 04DD4H 00022H CSEG - @@LCODEL abs 04DD4H 00008H - @@LCODEL memcpy_n 04DDCH 0001AH -* gap * 04DF6H 001FEH + 04DB2H 00000H + @@R_INIS @rom 04DB2H 00000H + @@LCODEL 04DB2H 00022H CSEG + @@LCODEL abs 04DB2H 00008H + @@LCODEL memcpy_n 04DBAH 0001AH +* gap * 04DD4H 00220H MGC_VER 04FF4H 00002H CSEG AT MGC_VER magic 04FF4H 00002H MGC_TAIL 04FF6H 0000AH CSEG AT diff --git a/trunk/config.h b/trunk/config.h index 2c861e3..f1c14ad 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -21,6 +21,9 @@ //#define _ENABLE_HAL_ // デバッグ用にHALを有効にする。コメントアウトでスルーになる。 //#define _ENABLE_PRESS_SEL_TO_WDT_ // SEL 長押しでWDT発動 +//#define _WDT_CHECK_ // WDTがかかったらしいので追跡したいときbreakおいて、コールスタック見る +// ↑ オプションバイトの1バイト目、bit7をセットする必要があります。 + //#define _DI_WITH_CHECK_ // 割り込み禁止を二重に掛けないかチェック #ifdef _DBG_NOP_ // コード上必要なNOPと区別するため diff --git a/trunk/hoge.bin b/trunk/hoge.bin index df25e08..88579b1 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 dfc6041..0a093e5 100644 --- a/trunk/i2c_mcu.c +++ b/trunk/i2c_mcu.c @@ -58,7 +58,6 @@ static void iic_mcu_send_re_st( ); static void iic_mcu_send_sp( ); static i2c_err iic_mcu_send_a_byte( u8 ); static i2c_err iic_mcu_call_slave( u8 slave ); -extern void DI_wt_chk(); @@ -407,7 +406,7 @@ __interrupt void int_dma1( ) SIO10 = last_reg_adrs; // 書きっぱなし！ 割り込みが発生してDMAスタート return; - // おしまい　またね！ // + // おしまい } else { diff --git a/trunk/ini_VECT.c b/trunk/ini_VECT.c index fd5fda8..84da25c 100644 --- a/trunk/ini_VECT.c +++ b/trunk/ini_VECT.c @@ -12,7 +12,11 @@ #include "config.h" #ifndef _WIN32 -//#pragma interrupt INTWDTI fn_intwdti // 未使用 + +#ifdef _WDT_CHECK_ +#pragma interrupt INTWDTI fn_intwdti // wdt debug +#endif + //#pragma interrupt INTLVI fn_intlvi // 未使用 //#pragma interrupt INTP0 intp0_slp // SLP (CPUより、要求) ポーリング @@ -84,72 +88,61 @@ /****************************************************/ /* 未使用時のダミー関数定義 */ /****************************************************/ +#ifdef _WDT_CHECK_ __interrupt void fn_intwdti( ) { -#ifdef _irq_debug_ - while( 1 ) + while( 1 ) { NOP(); } -#endif } +#endif +#ifdef _irq_debug_ __interrupt void fn_intlvi( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } __interrupt void fn_intp0(){ -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } __interrupt void fn_intp1( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } // __interrupt void fn_intp2( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif -} -__interrupt void fn_intp3( ) -{ -#ifdef _irq_debug_ - while( 1 ) - { - NOP(); - } -#endif } +__interrupt void fn_intp3( ) +{ + while( 1 ) + { + NOP(); + } +} __interrupt void intp21_RFTx( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } @@ -161,194 +154,160 @@ __interrupt void intp21_RFTx( ) __interrupt void fn_intcmp0( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } __interrupt void fn_intcmp1( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } __interrupt void fn_intdma0( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } //__interrupt void fn_intdma1(){} // i2c_mcu.cにある __interrupt void fn_intst0( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } /* __interrupt void fn_intcsi00(){} */ __interrupt void fn_intsr0( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } /* __interrupt void fn_intcsi01(){} */ __interrupt void fn_intsre0( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } __interrupt void fn_intst1( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } /* __interrupt void fn_intcsi10(){} */ //__interrupt void fn_intiic10(){ while(1){} } __interrupt void fn_intsr1( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } __interrupt void fn_intsre1( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } //__interrupt void fn_intiica(){} // i2c.cにある /* __interrupt void fn_inttm00(){} *//* sub.cにて定義 */ __interrupt void fn_inttm01( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } __interrupt void fn_inttm02( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } __interrupt void fn_inttm03( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } //__interrupt void fn_intad(){ while(1){} } // adc.c __interrupt void fn_intrtc( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } //__interrupt void int_rtcint(){} // rtc.cにある //__interrupt void fn_intkr(){} // main.c __interrupt void fn_intmd( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } __interrupt void fn_inttm04( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } __interrupt void fn_inttm05( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } __interrupt void fn_inttm06( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } __interrupt void fn_inttm07( ) { -#ifdef _irq_debug_ while( 1 ) { NOP(); } -#endif } +#endif + /* ======================================================== diff --git a/trunk/led_cam.c b/trunk/led_cam.c index 12dc020..7d4a1eb 100644 --- a/trunk/led_cam.c +++ b/trunk/led_cam.c @@ -28,7 +28,6 @@ bit cam_led_update; // ======================================================== static void cam_led_twl(); -extern void DI_wt_chk(); diff --git a/trunk/magic.c b/trunk/magic.c index c42b472..5cf42fa 100644 --- a/trunk/magic.c +++ b/trunk/magic.c @@ -8,6 +8,7 @@ $Id$ ***********************************************/ #include "magic.h" +#include "config.h" #ifndef _WIN32 diff --git a/trunk/pedo_alg_thre_det2.c b/trunk/pedo_alg_thre_det2.c index 001f7ec..4e69a04 100644 --- a/trunk/pedo_alg_thre_det2.c +++ b/trunk/pedo_alg_thre_det2.c @@ -43,7 +43,6 @@ typedef struct{ // ======================================================== static u16 get_long_hour(); static u16 calc_hours_spend( u8 ); -extern void DI_wt_chk(); diff --git a/trunk/renge/renge.c b/trunk/renge/renge.c index c7ad624..bab45cc 100644 --- a/trunk/renge/renge.c +++ b/trunk/renge/renge.c @@ -26,6 +26,8 @@ typedef unsigned char u8; #include "..\WDT.h" #include "..\config.h" #include "..\user_define.h" +#include "..\util_funcs.h" + #ifdef _WIN32 #include "../sim/simOnWin.h" @@ -53,7 +55,6 @@ static void renge_task_immed_del(); //****************************************************************************** task_status_immed ( *tasks_immed[ TASK_IMMED_RUN_LIST_MAX ] )(); -extern void DI_wt_chk(); diff --git a/trunk/task_misc.c b/trunk/task_misc.c index 59dfb7e..30b821a 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -72,7 +72,6 @@ bit reserve_pedo_increnent; // ======================================================== static void update_LED_3D(); static void check_twl_vol_irq(); -extern void DI_wt_chk(); @@ -89,7 +88,7 @@ extern void DI_wt_chk(); void tsk_misc( ) { // 割り込みの取りこぼし？ - if( ACC_VALID ) + if( ACC_VALID && ( ( vreg_ctr[ VREG_C_STATUS_1 ] & REG_BIT_ACCERO_ERR ) == 0 )) { if( renge_task_immed_add( tski_cbk_accero ) == ERR_SUCCESS ){ // dbg_nop(); diff --git a/trunk/task_sys.c b/trunk/task_sys.c index 3ecf00a..7b491f0 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -360,7 +360,7 @@ void tsk_sys( ) // irqマスク設定 KRM = ( KR_SW_POW ); // Mask ではなく、Modeなのだそうだ。紛らわしい - MK0 = ~( INT_MSK0_EXTDC ); + MK0 = ~( INT_MSK0_EXTDC | INT_MSK0_WDTI ); MK1 = ~( INT_MSK1_KR | INT_MSK1_RTCINTVAL ); // INT_MSK1_RTCALARM | RTCアラーム封印中 MK2L = 0xFF; diff --git a/trunk/user_define.h b/trunk/user_define.h index 1d0773a..15d426e 100644 --- a/trunk/user_define.h +++ b/trunk/user_define.h @@ -182,12 +182,17 @@ #define KR_SW_WIFI ( 1 << 4 ) /////////////////////////////////////////////////////////// +#ifdef _WDT_CHECK_ +# define INT_MSK0_WDTI 1<<15 +#else +# define INT_MSK0_WDTI 0 +#endif #define INT_MSK0_IIC_M_DMA 1<<12 #define INT_MSK0_SHELL 1<<7 #define INT_MSK0_EXTDC 1<<6 //#define INT_MSK0_SLP 1<<2 -#define INT_MSK0_RSV ~( INT_MSK0_IIC_M_DMA | INT_MSK0_SHELL | INT_MSK0_EXTDC ) +#define INT_MSK0_RSV ~( INT_MSK0_IIC_M_DMA | INT_MSK0_SHELL | INT_MSK0_EXTDC | INT_MSK0_WDTI ) #define INT_MSK1_KR 1<<11 #define INT_MSK1_RTCINTVAL 1<<10 diff --git a/trunk/util_funcs.c b/trunk/util_funcs.c new file mode 100644 index 0000000..2edea63 --- /dev/null +++ b/trunk/util_funcs.c @@ -0,0 +1,65 @@ +/* ======================================================== + util_funcs + + 雑多なユーティリティ関数 + + $Id$ + ======================================================== */ +#ifndef _WIN32 + +#pragma SFR +#pragma di +#pragma ei +#pragma nop +#pragma stop +#pragma halt +#pragma opc + +#endif +#include "incs_loader.h" +#include "wdt.h" + + + +/********************************************//** + 単位は ms + + NOPを回すだけ、指定時間CPUを *占有します* 。 + + 割り込みとか入るとその分遅れます。 + + 少し誤差あります。 + ***********************************************/ +void wait_ms( u8 ms ){ + u16 fine; + + WDT_Restart(); + while( ms != 0 ){ + ms--; + fine = 860; + while( fine != 0 ){ + fine --; + } + } +} + + + + +extern unsigned char get_ei(); + +#ifdef _DI_WITH_CHECK_ +/********************************************//** + すでに 割り込み禁止状態下チェックしてから割り込み禁止にする + + 評価の結果、現状、#ifdef でチェックせずに DI する + ***********************************************/ +void DI_wt_chk() +{ + if( !get_ei() ) + { + dbg_nop(); + } + DI(); +} +#endif // _DI_WITH_CHECK_ diff --git a/trunk/util_funcs.h b/trunk/util_funcs.h new file mode 100644 index 0000000..4229413 --- /dev/null +++ b/trunk/util_funcs.h @@ -0,0 +1,16 @@ +#ifndef _util_funcs_h_ +#define _util_funcs_h_ + + +void wait_ms( u8 ); + + +# ifdef _DI_WITH_CHECK_ +void DI_wt_chk(); +# else +# define DI_wt_chk() DI() +# endif /* _DI_WITH_CHECK_ */ + + +#endif + diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index 6b91ada..5d4b915 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -43,7 +43,6 @@ bit irq_readed; // AAA extern task_status_immed tski_firm_update(); extern task_status_immed tski_mcu_reset(); extern unsigned char get_ei(); -extern void DI_wt_chk(); diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index e0a28d8..ee56d42 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,181 +1,31 @@ C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no loader.c -loader.c(160) : CC78K0R warning W0401: Conversion may lose significant digits -loader.c(161) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\loader.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no pm.c -pm.c(528) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(828) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(832) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(860) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(881) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(948) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(957) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1161) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1163) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 9 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\pm.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_ctr.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no main.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\main.asm -Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no magic.c -magic.c(30) : CC78K0R error E0711: Undeclared 'MCU_VER_MAJOR' ; function '' -magic.c(30) : CC78K0R error E0711: Undeclared 'MCU_VER_MINOR' ; function '' -Compilation complete, 2 error(s) and 0 warning(s) found. +Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no WDT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\WDT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_mcu.c -i2c_mcu.c(184) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_mcu.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_twl.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no led.c -led.c(89) : CC78K0R warning W0745: Expected function prototype -led.c(354) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\led.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no rtc.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\rtc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2m -qvjl2w -sainter_asm -zpb -no vreg_ctr.c -vreg_ctr.c(177) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(178) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(180) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(182) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(183) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(231) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(231) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(236) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(236) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(240) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(240) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(244) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(244) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(248) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 14 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\vreg_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2m -qvjl2w -sainter_asm -zpb -no vreg_twl.c -vreg_twl.c(68) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_twl.c(72) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\vreg_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no adc.c -adc.c(104) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(190) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(241) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(305) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(429) : CC78K0R warning W0745: Expected function prototype -adc.c(458) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(463) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 7 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\adc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2m -qvjl2w -sainter_asm -zpb -no renge\renge.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\renge.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no accero.c -accero.c(117) : CC78K0R warning W0745: Expected function prototype -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\accero.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no self_flash.c -self_flash.c(289) : CC78K0R warning W0401: Conversion may lose significant digits -self_flash.c(290) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\self_flash.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no sw.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\sw.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_debug.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\task_debug.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_misc.c -task_misc.c(382) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(384) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(396) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 3 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\task_misc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_sys.c -task_sys.c(234) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(570) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\task_sys.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c -pedo_alg_thre_det2.c(105) : CC78K0R warning W0745: Expected function prototype -pedo_alg_thre_det2.c(121) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\pedo_alg_thre_det2.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no ini_VECT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\ini_VECT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_status.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\task_status.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no led_cam.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\led_cam.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no led_pow.c -led_pow.c(119) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(124) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(177) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(240) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(271) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 5 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\led_pow.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no hal.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\hal.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no batt_params.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\batt_params.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no voltable.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\voltable.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no pedo_lpf_coeff.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\pedo_lpf_coeff.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no kanaria_c.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\kanaria_c.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no util_funcs.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\util_funcs.asm -Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -obsr.lmf "..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel +RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K' + Read Device File Directory : C:\PROGRAM FILES (X86)\NEC ELECTRONICS TOOLS\DEV\ +RA78K0R warning W3420: File 'pm.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'i2c_mcu.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'led.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'vreg_ctr.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'vreg_twl.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'adc.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'accero.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'self_flash.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'task_misc.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'task_sys.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'pedo_alg_thre_det2.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'led_pow.rel' already has had error(s)/warning(s) by 'CC78K' + +Link complete, 0 error(s) and 13 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\oc78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf +Object Conversion Complete, 0 error(s) and 0 warning(s) found. +C:\Windows\system32\cmd.exe /c ruby nec_s_2_bsrbin2.rb bsr.hex +4 +intel-HEX to bsr bin converter + file converted! -Build Total error(s) : 2 Total warning(s) : 52 + +Build Total error(s) : 0 Total warning(s) : 13 diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 5e4590a..bb26148 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -1041,6 +1041,79 @@ VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 VF78K0Rvs= +[SrcFile] +Source1=loader.c +Source2=pm.c +Source3=i2c_ctr.c +Source4=main.c +Source5=magic.c +Source6=WDT.c +Source7=i2c_mcu.c +Source8=i2c_twl.c +Source9=led.c +Source10=rtc.c +Source11=vreg_ctr.c +Source12=vreg_twl.c +Source13=adc.c +Source14=renge\renge.c +Source15=accero.c +Source16=self_flash.c +Source17=sw.c +Source18=task_debug.c +Source19=task_misc.c +Source20=task_sys.c +Source21=pedo_alg_thre_det2.c +Source22=ini_VECT.c +Source23=task_status.c +Source24=led_cam.c +Source25=led_pow.c +Source26=hal.c +Source27=batt_params.c +Source28=voltable.c +Source29=pedo_lpf_coeff.c +Source30=kanaria.asm +Source31=kanaria_c.c +Source32=get_ei.asm +Source33=util_funcs.c +[IncFile] +Include1=incs_loader.h +Include2=sim\simOnWin.h +Include3=sim\sfrAlias.h +Include4=config.h +Include5=jhl_defs.h +Include6=user_define.h +Include7=hal.h +Include8=bsr_system.h +Include9=renge\renge.h +Include10=renge\renge_defs.h +Include11=renge\renge_task_immediate.h +Include12=vreg_ctr.h +Include13=vreg_twl.h +Include14=loader.h +Include15=i2c_mcu.h +Include16=WDT.h +Include17=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +Include18=fsl_user.h +Include19=i2c_ctr.h +Include20=pm.h +Include21=rtc.h +Include22=reboot.h +Include23=magic.h +Include24=incs.h +Include25=i2c_twl.h +Include26=accero.h +Include27=pedometer.h +Include28=sw.h +Include29=adc.h +Include30=led.h +Include31=batt_params.h +Include32=pool.h +Include33=i2c_twl_defs.h +Include34=renge\renge_task_intval.h +Include35=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h +Include36=self_flash.h +Include37=sim\sim_interrupt_decrare.c +Include38=util_funcs.h [Options.LK78K0R 0] Version=100 O0=bsr_k0r.lmf @@ -1334,76 +1407,3 @@ DefaultMode2=1 DefaultMode3=1 DefaultMode4=1 DefaultMode5=1 -[SrcFile] -Source1=loader.c -Source2=pm.c -Source3=i2c_ctr.c -Source4=main.c -Source5=magic.c -Source6=WDT.c -Source7=i2c_mcu.c -Source8=i2c_twl.c -Source9=led.c -Source10=rtc.c -Source11=vreg_ctr.c -Source12=vreg_twl.c -Source13=adc.c -Source14=renge\renge.c -Source15=accero.c -Source16=self_flash.c -Source17=sw.c -Source18=task_debug.c -Source19=task_misc.c -Source20=task_sys.c -Source21=pedo_alg_thre_det2.c -Source22=ini_VECT.c -Source23=task_status.c -Source24=led_cam.c -Source25=led_pow.c -Source26=hal.c -Source27=batt_params.c -Source28=voltable.c -Source29=pedo_lpf_coeff.c -Source30=kanaria.asm -Source31=kanaria_c.c -Source32=get_ei.asm -Source33=util_funcs.c -[IncFile] -Include1=incs_loader.h -Include2=sim\simOnWin.h -Include3=sim\sfrAlias.h -Include4=config.h -Include5=jhl_defs.h -Include6=user_define.h -Include7=hal.h -Include8=bsr_system.h -Include9=renge\renge.h -Include10=renge\renge_defs.h -Include11=renge\renge_task_immediate.h -Include12=vreg_ctr.h -Include13=vreg_twl.h -Include14=loader.h -Include15=i2c_mcu.h -Include16=WDT.h -Include17=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h -Include18=fsl_user.h -Include19=i2c_ctr.h -Include20=pm.h -Include21=rtc.h -Include22=reboot.h -Include23=magic.h -Include24=incs.h -Include25=i2c_twl.h -Include26=accero.h -Include27=pedometer.h -Include28=sw.h -Include29=adc.h -Include30=led.h -Include31=batt_params.h -Include32=pool.h -Include33=i2c_twl_defs.h -Include34=renge\renge_task_intval.h -Include35=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h -Include36=self_flash.h -Include37=sim\sim_interrupt_decrare.c -Include38=util_funcs.h diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 9f3d5b7..7d3f78e 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,9 +1,9 @@ [ProjectManager] FrameMax=0 -FrameX=562 -FrameY=3 -FrameCX=1191 -FrameCY=681 +FrameX=25 +FrameY=25 +FrameCX=1440 +FrameCY=850 OpenFile1=i2c_ctr.c,0,655,120,1628,751,0,1,0,0 OpenFile2=kanaria_c.c,0,68,138,763,769,8,5,8,0 OpenFile3=ProjectWindow @@ -17,7 +17,7 @@ OpenFile9=config.h,0,75,75,902,478,29,6,29,0 OpenFile10=i2c_mcu.c,0,175,175,1036,939,1,453,1,0 OpenFile11=main.c,0,402,105,1713,812,0,68,0,0 OpenFile12=OutputWindow -OutputPos=0,21,472,273,1150 +OutputPos=0,260,711,278,1155 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0