diff --git a/trunk/adc.c b/trunk/adc.c index fdb7de0..43fa5c8 100644 --- a/trunk/adc.c +++ b/trunk/adc.c @@ -22,9 +22,13 @@ bit vol_changed_by_ctr; bit vol_changed_by_twl; u8 vol_old; + u8 adc_raw_vol; u8 adc_raw_dep; +u8 vol_polling; + + typedef struct filter_work { @@ -69,61 +73,49 @@ static u8 adc_scaling( u8 ); 関係ありそうですが別のところで管理しています ・PM_BT_DET,_P BT_chk - - ・8tics毎に呼ばれ、３チャンネル分取り込むとADCを停止します。 - 　タスク起動時、レジスタには前回の取り込み値が入っています。 ======================================================== */ - - - - void tsk_adc( ) { static u8 old_tune; static u8 sndvol_codec; static u8 bt_temp_old; -/* - これやると、Volスライダの反応が劇悪になるので注意 - static u8 task_interval = 0; - if( task_interval-- != 0 ) - { - return; - } - else - { - task_interval = (u8)( INTERVAL_TSK_ADC / SYS_INTERVAL_TICK ); - } -*/ if( adc_updated ) { adc_updated = false; - if( system_status.pwr_state == ON ) + // 3D ///////////////////////////////////////// + vreg_ctr[ VREG_C_TUNE ] = adc_raw_dep; // 生値 + + // Volume ///////////////////////////////////// { - // 3D ///////////////////////////////////////// - vreg_ctr[ VREG_C_TUNE ] = adc_raw_dep; // 生値 + vreg_ctr[ VREG_C_VOL_ADC_RAW ] = adc_raw_vol; - // Volume ///////////////////////////////////// + adc_filter( adc_scaling( adc_raw_vol ), &work_vr_vol ); // 結果は*work_vr_volから指されるvol_data_ctr 読みにくい... + vol_data_ctr = vol_data_ctr_tmp / 4; + + if( vol_old != vol_data_ctr ) { - vreg_ctr[ VREG_C_VOL_ADC_RAW ] = adc_raw_vol; - - adc_filter( adc_scaling( adc_raw_vol ), &work_vr_vol ); // 結果は*work_vr_volから指されるvol_data_ctr 読みにくい... - vol_data_ctr = vol_data_ctr_tmp / 4; - - if( vol_old != vol_data_ctr ) - { - vol_changed_by_ctr = true; - vol_old = vol_data_ctr; - renge_task_immed_add( tski_vol_update ); // 2ms後でいいでしょう... - } + vol_changed_by_ctr = true; + vol_old = vol_data_ctr; + vol_polling = 3; +// renge_task_immed_add( tski_vol_update ); ↓で登録 } - - // バッテリ識別 /////////////////////////// - /* 呼ばれません */ } + + // バッテリ識別 /////////////////////////// + /* 呼ばれません */ } + // 書き忘れがあるといやなのでポーリング orz + if( vol_polling < 5 ) + { + renge_task_immed_add( tski_vol_update ); + vol_polling = 200 / SYS_INTERVAL_TICK + 5; // 5回/sec + } + vol_polling -= 1; + + ADCEN = 1; ADM = 0b00001011; // セレクトモード、昇圧、fCLK/6 ///ここから ↓ @@ -200,19 +192,18 @@ task_status_immed tski_vol_update() sent_index_twl = vreg_twl[ REG_TWL_INT_ADRS_VOL ] *2 +1; } sent_index = sent_index_twl; - set_irq( VREG_C_IRQ2, REG_BIT_TWL_SNDVOL_CHANGE ); } else { // force_sliderを0にしたとき & 書きまくるとき // スライダかTWLの最後にセットした方をセット - if( !last_modifyer_is_twl ) + if( last_modifyer_is_twl ) { - sent_index = sent_index_slider; + sent_index = sent_index_twl; } else { - sent_index = sent_index_twl; + sent_index = sent_index_slider; } } @@ -239,7 +230,7 @@ task_status_immed tski_vol_update() iic_mcu_write_a_byte_codec( CODEC_REG_VOL, slider_to_codec[ sent_index ] ); // set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE ); // 割り込み廃止 - return( ERR_FINISED ); + return( ERR_FINISED ); } diff --git a/trunk/adc.h b/trunk/adc.h index 88dde07..1b48731 100644 --- a/trunk/adc.h +++ b/trunk/adc.h @@ -34,6 +34,8 @@ /////////////////////////////////////// +extern u8 vol_polling; + /////////////////////////////////////// diff --git a/trunk/batt_params.h b/trunk/batt_params.h index 59b20a4..1356f41 100644 --- a/trunk/batt_params.h +++ b/trunk/batt_params.h @@ -93,20 +93,20 @@ typedef struct _st_bt_comp // 電池残量補正パラメータ const st_bt_comp BT_COMP[] = { -// rcomp R_co_up R_co_down - { 92, -256* 0.79, -256* 4.35 }, // maxell - { 92, -256* 0.79, -256* 4.35 }, // dummy(M ) - { 92, -256* 0.79, -256* 4.35 }, // dummy(M ) - { 171, -256* 1.00, -256* 2.60 }, // dummy( P) - { 171, -256* 1.00, -256* 2.60 }, // dummy( P) - { 171, -256* 1.00, -256* 2.60 }, // panasonic - { 171, -256* 1.00, -256* 2.60 } // dummy( P) +// rcomp R_co_up R_co_down + { 92, (u8)(-256* 0.79), (u8)(-256* 4.35) }, // maxell + { 92, (u8)(-256* 0.79), (u8)(-256* 4.35) }, // dummy(M ) + { 92, (u8)(-256* 0.79), (u8)(-256* 4.35) }, // dummy(M ) + { 171, (u8)(-256* 1.00), (u8)(-256* 2.60) }, // dummy( P) + { 171, (u8)(-256* 1.00), (u8)(-256* 2.60) }, // dummy( P) + { 171, (u8)(-256* 1.00), (u8)(-256* 2.60) }, // panasonic + { 171, (u8)(-256* 1.00), (u8)(-256* 2.60) } // dummy( P) }; const u16 BT_OCV[] = { { 0xD800 }, { 0xD800 }, { 0xD800 }, // maxell, dummy, dummy, - { 0xDA20 }, { 0xDA20 }, { 0xDA20 }, { 0xDA20 } // dummy, dummy, panaso, dummy + { 0xDA20 }, { 0xDA20 }, { 0xDA20 }, { 0xDA20 } // dummy, dummy, panaso, dummy }; const u8 BT_VERIFY_H[] = { diff --git a/trunk/bsr.hex b/trunk/bsr.hex index e39446d..511e87e 100644 --- a/trunk/bsr.hex +++ b/trunk/bsr.hex @@ -1,13 +1,13 @@ -:020000000E0DE3 -:04001000E449E64990 -:02001C00BB4BDC -:02002400274C67 -:02002A00944CF4 -:08003400B14D5F4DAC4DE04EF3 -:02004A00E84983 -:02005A00234A37 -:02006200644EEA -:0400C0006EFBFF04D0 +:020000000D0DE4 +:04001000ED49EF497E +:02001C00C44BD3 +:02002400304C5E +:02002A009D4CEB +:08003400BA4D684DB54DE94ECF +:02004A00F1497A +:02005A002C4A2E +:020062006D4EE1 +:0400C0007EFBFF04C0 :0A00C4001B339499E033F240BFAA09 :1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A :1000DE00D8710020F98EA89C018C015C10D1DD0A2C @@ -39,30 +39,30 @@ :10027E00F5300271080105F55005F5BCFFF5BDFF1F :10028E00F5A5FFF5A6FFD7C7C1C1FBF8FFCEABACF6 :10029E008C02D1DD12616902305C03BBF66149004C -:1002AE00DDEE618900EFF51004C6D7FDF732FD2BA8 -:1002BE003CFD1D05717AFAFDAE23F51EF98F20F96E +:1002AE00DDEE618900EFF51004C6D7FDC832FD0002 +:1002BE003CFD1D05717AFAFDC223F51EF98F20F95A :1002CE003105175003C15084FD2603C0625C01D175 -:1002DE0061E8CF1EF902CFDFFB64FDD733FDE9479E -:1002EE00716222712BE7CEABACFD2E3CFDC73C619B -:1002FE00EDEFF3D7D7C7F616FD1D05717BFA3172F8 -:10030E002005717220EF0B717AFAA7F647DFECE247 +:1002DE0061E8CF1EF902CFDFFB64FDA833FDF247C4 +:1002EE00717222712BE7CEABACFD033CFD9C3C61E1 +:1002FE00EDEFF3D7D7C7F616FD1D05717BFA310268 +:10030E002105710221EF0B717AFAA7F647DFECE2B5 :10031E00EF04717AFAF2C6D7C7C1C1FBF8FF17A175 :10032E00C1E0C18C0A70C18C0270FD50031006D260 :10033E00DF05F541FBEF04CF41FB028C0172100487 :10034E00C6D7C7C1FBF8FFFD0303D2DD03E2EF61A1 -:10035E008B70FD7004D2DD077173205202EF528C48 +:10035E008B70FD7004D2DD077103215202EF528CB7 :10036E000870FD8504FDD1048B6C0170FD85043091 :10037E000400BF2401301740BF1C01300400BF220F :10038E00018C0A91DF04F6BF2A01710BE2CE44FF05 :10039E003182E202EFFAAC0C148E449961790C6151 -:1003AE00690A8C0AD1DFDAFDFA04710BE27173204F +:1003AE00690A8C0AD1DFDAFDFA04710BE2710321BE :1003BE00F2C0C6D7C7C1FBF8FFFD0303D2DD03E2CF -:1003CE00EF25710AE68B70FD7004D2DD0771732084 +:1003CE00EF25710AE68B70FD7004D2DD07710321F3 :1003DE005202EF138C0870FD85048C0A70FD8504A3 -:1003EE00FDFA04717320F2C0C6D7C7C1FBF8FFFD3A +:1003EE00FDFA04710321F2C0C6D7C7C1FBF8FFFDA9 :1003FE000303D2DD03E2EF67710AE6710BE28B7045 -:10040E00FD7004D2DD077173205202EF52710BE2C0 -:10041E0031622039C7343AFBAC0C1652048B99A5C5 +:10040E00FD7004D2DD077103215202EF52710BE22F +:10041E0031722039C7343AFBAC0C1652048B99A5B5 :10042E00A792DFF9C63184BD02EFFA717ABDCEB163 :10043E0044CBB43AFB8C0A318EBEB8CEBB48714B5E :10044E00E1714BE5710ABD8C089E44EF11710BE60C @@ -78,41 +78,41 @@ :1004EE005CFB08BF2A01FD0203EDA904300400BF26 :1004FE002401F6BF2A01300B0BBF2801FD02033089 :10050E000B0FBF2801FD0203300F0FBF2801D7319B -:10051E00042101D7717220710BBD0000717BBD717A +:10051E00142101D7710221710BBD0000717BBD71D9 :10052E003A25713A236A0E03713205713B257132F9 :10053E0003713B23500AFD95027120F000FD02036A :10054E00F6BF26015024BF1401CB440014300F0F08 -:10055E00BF2801716320710BE2710AE6FDA904CE7A +:10055E00BF2801717320710BE2710AE6FDA904CE6A :10056E0044FF3182E202EFFAFDFA04AF0401BF0C40 -:10057E0001717320710221D731742002EFFAFDD17F +:10057E0001710321711221D731042102EFFAFDD14D :10058E0004713A25713A235A0EFC713305713B25DD -:10059E00713303713B237128F000710321D7C78893 +:10059E00713303713B237128F000711321D7C78883 :1005AE000616FD0303D2DD03E2EF38710AE650A40E -:1005BE00FD7004D2DD077173205202EF2617FD8500 +:1005BE00FD7004D2DD077103215202EF2617FD856F :1005CE00046770FD8504FDD10450A4FD8504502000 :1005DE00FD8504D942FBFD8504A042FBFDFA0471A2 -:1005EE007320F2C6D7C72008FBF8FFFD430950144D +:1005EE000321F2C6D7C72008FBF8FFFD43095014BC :1005FE00C15008FD8108C0CC07048C074C14DE0CDA -:10060E008C07318EFDF009615907EFEECC07048C93 +:10060E008C07318EFDEF09615907EFEECC07048C94 :10061E00074C1461C8EDE106CC06008C064C046153 :10062E00C8EDC0063022F9BC02F6BB31B2D109C703 -:10063E003641057184C6DEF3713BD1AC02148F4096 -:10064E00059971505005617902617900CEABACF11C -:10065E00C73641057184C661DC9C05F0E161490035 +:10063E003641057184C6DEF3F1C73641057184C6B5 +:10064E0061DC9C05713BD1AC02148F400599715051 +:10065E005005617902617900CEABACF0E1614900E1 :10066E00DD09C73641057184C6DEC0F1C7364105C6 :10067E007184C661DC0E059C055040C18C07318E1D :10068E0031AD128C06318E318D03BDD831FFBDDAFE -:10069E00DADAADD8FDBC0CC0D2DD0C5008C1501456 -:1006AE00FD8108C0FD790B8C05D1DF06615906ED81 -:1006BE0029068C07318EFDF409D2DD0C5008C1508D -:1006CE0014FD8108C0FD790B8C05D1DF0661590739 +:10069E00DADAADD8FDBB0CC0D2DD0C5008C1501457 +:1006AE00FD8108C0FD780B8C05D1DF06615906ED82 +:1006BE0029068C07318EFDF309D2DD0C5008C1508E +:1006CE0014FD8108C0FD780B8C05D1DF066159073A :1006DE00ED1D0671605005CC0400CC05008C054C58 :1006EE0009DE2B8C05318E04F61FC1317B9EFDC4B5 :1006FE001189728C05318E04F64F14896142DF0325 :10070E00F6EF01E6600E049C04615905EFCF41003F :10071E001140F81F3A61E86159048C04D1DF08FDDD -:10072E007A0BFD8C0CEF0C5008C15014FD8108C0E3 -:10073E00FD790B1008C6D7C72004FBF8FF715B21AB +:10072E00790BFD8B0CEF0C5008C15014FD8108C0E5 +:10073E00FD780B1008C6D7C72004FBF8FF715B21AC :10074E00CC0100F6BC02AC02440900DE3EAC020451 :10075E00F60F144100118972AC020C5014896142DB :10076E00DF03F6EF01E6600E019C01AC02124900B8 @@ -124,133 +124,133 @@ :1007CE009502500FC1E0C15084FDC2031004CEABA0 :1007DE00AC6159018C0191DD068C014C03DF03E6FF :1007EE00EF01F66061FB7151018C014C0861F8CC90 -:1007FE00010031320705A078FCEF03F578FC407854 -:10080E00FC11DC11F578FCF0C15003C15084FDC21F +:1007FE00010031320705A07AFCEF03F57AFC407A4E +:10080E00FC11DC11F57AFCF0C15003C15084FDC21D :10081E00031004EF12E6BC02F6614902DDB00000DF :10082E000000617902EFF1CE3708CBE4FFFFCBE693 :10083E00FFF7CED4FFCF370008F5120561FDF5ABFB :10084E00FFFD4309D25008C15014FD8108C0D2FDEE -:10085E00790B1004C6D73184BD02EFFA717BBDCB84 +:10085E00780B1004C6D73184BD02EFFA717BBDCB85 :10086E00E4FFFFCBE6FFFFCBD4FFFF717ABED7715B :10087E007BBED7C7C1200AFBF8FF8C0A318E31AD83 :10088E00C1317B9DD4C0BC048DD49C068C129C09B6 :10089E008C12318E040C00128C09318EBDD813FDD2 -:1008AE004B0F61C8ED3E09CEABAC8C09318EFDEC21 -:1008BE0009D2DD098C09318EFDF009EFEDCC08006F +:1008AE004A0F61C8ED3E09CEABAC8C09318EFDEB23 +:1008BE0009D2DD098C09318EFDEF09EFEDCC080070 :1008CE008C084C04DE57CEABACF6BC023022F9BB22 :1008DE00AC04148C069EFD118972AB146299AC04A3 :1008EE00A1BC04617900617902F0E1614902DFE0A7 :1008FE005040C18C09318E31AD128C08318E318D44 -:10090E0003BDD831FFBDDADADAADD8FDBC0CC0D2EA +:10090E0003BDD831FFBDDADADAADD8FDBB0CC0D2EB :10091E00DD06FD7D08E2EF19615908EFA38C093160 -:10092E008EFDF409D2DD03E2EF07615909ED9E0851 +:10092E008EFDF309D2DD03E2EF07615909ED9E0852 :10093E00F2100CC6D7C7717B9D717BFAFD6408302F -:10094E0022F9FD9F0AFD2A0AC6D7FD4309FD790B40 -:10095E00FD7D08F2D7D7C7D560FDDD05B060FDEF90 -:10096E007BCF60FD02311407067110E3FBEF0471BB -:10097E0018E3FB8FE3FB7F24FD76D1DD5F8FE3FB76 -:10098E009F24FD401EF903DF25665C10D1DD1F712B -:10099E0012208FE3FB5C10D1DD0B5080C15011FD96 -:1009AE000E38C0EF095040C15011FD0E38C0401E28 -:1009BE00F903DD06401EF904DF22665C02D1DD1C60 -:1009CE008FE3FB5C02D1DD0B5040C15010FD0E38A1 -:0E09DE00C0EF095020C15010FD0E38C0C6D722 -:1009EC005208EF065203EF025206FEE600FE1B0011 -:1009FC00DC16089F03088F0408089F040862FE2475 -:100A0C0000089F0408EEBF00EEBA00C1C514410EE9 -:100A1C0011D9D0FF118FD1FF312E45C4C0D7F2317F -:100A2C00A2C401E2D79DE261DD4C09DF12717BFAB1 -:100A3C00C18F06089F71FDC0CF060800EE2700315C -:100A4C00F2FA04CF0608004C00DF05D50008DD16CD -:100A5C0061DD717BFAD50608DD0ACDE31F61CD613E -:100A6C00CDEE160061CDFED40061FFFE9A00FCF8BD -:100A7C00FF0EFEB20061CDFED5004C09DF0EC18F1A -:100A8C0006086F71FD9F0608C0EE0400CF06080033 -:100A9C00F8E3D75200EF025202FE3700CF70FD0090 -:100AAC00CF060800BF0408C716629F00084100115A -:100ABC008F78229B4100118F79229F0108C651002B -:100ACC00FE62FFEF025205CF060800C1510CFE0A70 -:100ADC0000C0D7C1511DFE0200C0D761DD717BFA89 -:100AEC0070CEC0A59EC47CFF9EC4609EC461CDD751 -:100AFC0061DD717BFAC18EC45C1BFED6FFCF06088C -:100B0C0001FED7FFC061CDD731F2FA1AC1AEE4BFF6 -:100B1C0062FDAEE6BF64FDAED4BF66FD30FFFFBE26 -:100B2C00E4BEE6BED4C0D731F2FA11C1AF62FDBE4D -:100B3C00E4AF64FDBEE6AF66FDBED4C0D7C1BF68EE -:100B4C00FD13BF6AFD15BF6CFD17BF6EFDC0D7AF9F -:100B5C0068FDDB6AFDEB6CFDFB6EFDD7534B305231 -:100B6C005430324E323030475631323000FFC150A3 -:100B7C00FEFEAB0061DD717BFACF060800FE0A00B9 -:100B8C00FEA4FF61CDF8E3EECF00C7FB0408BF6203 -:100B9C00FD8FC0009C05C5C337040600BF64FD353E -:100BAC0036DE0B300000522BFE6600C2C4C6308C01 -:100BBC000BB800300000B8022004AF64FDB8003060 -:100BCC000F00B802AF62FD61FF520AFE3AFFECF86B -:100BDC00FF0E717BFAC1C7FB04088C05C65C80FE56 -:100BEC000200C0D761DD717BFA70CFC0FFA59FC03A -:100BFC00007CFF9FC000609FC00061CDD7618BFE61 -:100C0C00E2FF717BBE410011FB000017CEFC0061BE -:100C1C00CB089EFDF31161C999A58392DFF7D7FE2E -:100C2C00B1FED570FDDF23C1CF0308035109FEF4DB -:100C3C00FDC0D2DF37FE3800A20408CF03080751ED -:100C4C0009FEE1FDD2B20408DF22C7FB04083183A0 -:100C5C0002C6D7C6510AFECCFD624C1FDF06CF7010 -:100C6C00FD01EF04CF70FD00C0EE5BFEC0EE55FE43 -:100C7C00C7C1FB04088B31196C0161589BC0C6D7E6 -:100C8C00717BFAFE4DFEAF0408040600C11436F069 -:100C9C000B300000522DF3FE77FF8FC000FE2BFEB1 -:100CAC0061CF5C807C8073C0041900CEFC0F61CBDB -:100CBC00C55404EF03C55417FE18FEC7360008BB15 -:100CCC00629C0288089C03D1DD334C41DE2F70F10D -:100CDC00312DB161090033081C000851FF612A4114 -:100CEC000E118FD0FF613B118FD1FF6138DC0E8B61 -:100CFC005C03DF0964C6C4FE2BFDEECAFDC6C4EE60 -:020D0C00C3FD25 -:100D0E0061CF5100718C7109FECBF800FEFC86019B -:100D1E0000F6BF00F953C0F693935820FEDFF94159 -:100D2E000036004F3426FDEF05118B99A7A5174409 -:100D3E003C4FDFF53602F93026FDEF04CC0000A75C -:100D4E0047DFF94100363C4F3462FDEF05118B99B8 -:100D5E00A7A517443C4FDFF53662FD3062FDEF0468 -:100D6E00CC0000A747DFF9FCCE0000EFFE61DD717D -:100D7E007BFABEF0ADD8BEF200AEF661CDD7C36140 -:100D8E00DD717BFABEF0ADD8BEF200DBF6FFADDC56 -:100D9E00BEF000AEF6BDD8AEF40312ADDABEF20070 -:100DAE00AEF661CD03BDDAC2D7C3F33174D9088371 -:100DBE00C1F626D8BDD8C031750683C312F623C23C -:100DCE00FDD90D93DF0312F623C2D7440000DD26B2 -:100DDE0061DD717BFACFE80080BEF6F6BEF4BEF29E -:100DEE00ADD8BEF0CFE800818FE8003103FAAEF047 -:100DFE00F5E80061CDD7B1D7C3F33174D90883C1FB -:100E0E00F626D8BDD8C0317505C312F623C2FD270C -:100E1E000E93DF0312F623C2D7440000DD2761DDF7 -:100E2E00717BFACFE80080BEF6F6BEF4BEF2ADD806 -:100E3E00BEF0CFE800818FE8003103FAAFE000F595 -:100E4E00E80061CDD7ADD8D7C3F33174DB0F83C1C2 -:100E5E00F626D8BDD861317026DABDDAC031750DEF -:100E6E0083C312F626DCBDDC61317023C2FD8F0E0A -:100E7E0093DF0CF626D8BDD861317026DABDDAC202 -:100E8E00D7C161686BDC6BDDC0DD2F61DD717BFA74 -:100E9E00CFE80080BEF4ADDCBEF6ADD8BEF0ADDA64 -:100EAE00BEF2CFE800818FE8003103FAAEF0BDD874 -:100EBE00AEF2BDDAF5E80061CDD7F6BDD8BDDAD712 -:100ECE008292DD2B61DD717BFACFE80080BEF0F6F9 -:100EDE00BEF2BEF46208BEF6CFE800818FE80031A4 -:100EEE0003FAAFE0006072AEF0F5E80061CDD760B6 -:100EFE0072F6B1D706DABDDAADDC06D8BDD861D848 -:100F0E00A6DAD7D1DD17C1C3DAD89DD8ADDA311C38 -:100F1E0061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDCB -:100F2E001BC1C3DADA9DDAADD8311E33311E3371EF -:100F3E00F9B4DADFF4BDD813BDDAC2C0D746D8DDB6 -:100F4E000771FF7177D971C0D746DADF08C1ADDC02 -:100F5E0046D8C0DD077177DB71FF71C0D75BDB9DB3 -:100F6E00DB605BDA9DDAADDC5BD9085BD808BDD8F7 -:100F7E00D7C3C7F3728EFDC162314C410036E64EC7 -:100F8E001161A072C09EFD62C6C2D7C3C7F3728E36 -:100F9E00FDC1625C0F0C000FFE00314C410036F0BB -:0F0FAE004E1161800FFE0073C09EFD63C6C2D757 -:0A0FF60031303A31333A3431000053 -:0A20000031303A31333A3431000038 +:10094E0022F9FD9E0AFD290AC6D7FD4309FD780B43 +:10095E00FD7D08F2D7C7D564FDDD05B064FDEF7BE4 +:10096E00CF64FD02311407067110E3FBEF0471181A +:10097E00E3FB8FE3FB7F2AFD76D1DD5F8FE3FB9FE9 +:10098E002AFD401EF903DF25665C10D1DD1F7122A2 +:10099E00208FE3FB5C10D1DD0B5080C15011FDDDCB +:1009AE0037C0EF095040C15011FDDD37C0401EF970 +:1009BE0003DD06401EF904DF22665C02D1DD1C8FCA +:1009CE00E3FB5C02D1DD0B5040C15010FDDD37C0A2 +:0D09DE00EF095020C15010FDDD37C0C6D715 +:1009EB005208EF065203EF025206FEE600FE1B0012 +:1009FB00DC16089F03088F0408089F040862FE2476 +:100A0B0000089F0408EEBF00EEBA00C1C514410EEA +:100A1B0011D9D0FF118FD1FF312E45C4C0D7F23180 +:100A2B00A2C401E2D79DE261DD4C09DF12717BFAB2 +:100A3B00C18F06089F75FDC0CF060800EE27003159 +:100A4B00F2FA04CF0608004C00DF05D50008DD16CE +:100A5B0061DD717BFAD50608DD0ACDE31F61CD613F +:100A6B00CDEE160061CDFED40061FFFE9A00FCF8BE +:100A7B00FF0EFEB20061CDFED5004C09DF0EC18F1B +:100A8B0006086F75FD9F0608C0EE0400CF06080030 +:100A9B00F8E3D75200EF025202FE3700CF74FD008D +:100AAB00CF060800BF0408C716629F00084100115B +:100ABB008F84229B4100118F85229F0108C6510014 +:100ACB00FE62FFEF025205CF060800C1510CFE0A71 +:100ADB0000C0D7C1511DFE0200C0D761DD717BFA8A +:100AEB0070CEC0A59EC47CFF9EC4609EC461CDD752 +:100AFB0061DD717BFAC18EC45C1BFED6FFCF06088D +:100B0B0001FED7FFC061CDD731F2FA1AC1AEE4BFF7 +:100B1B0066FDAEE6BF68FDAED4BF6AFD30FFFFBE1B +:100B2B00E4BEE6BED4C0D731F2FA11C1AF66FDBE4A +:100B3B00E4AF68FDBEE6AF6AFDBED4C0D7C1BF6CE3 +:100B4B00FD13BF6EFD15BF70FD17BF72FDC0D7AF94 +:100B5B006CFDDB6EFDEB70FDFB72FDD7534B305222 +:100B6B005430324E323030475631323000FFC150A4 +:100B7B00FEFEAB0061DD717BFACF060800FE0A00BA +:100B8B00FEA4FF61CDF8E3EECF00C7FB0408BF6600 +:100B9B00FD8FC0009C05C5C337040600BF68FD353B +:100BAB0036DD0B300000522BFE6600C2C4C6308B04 +:100BBB000BB800300000B8022004AF68FDB800305D +:100BCB000F00B802AF66FD61FF520AFE3AFFECF868 +:100BDB00FF0E717BFAC1C7FB04088C05C65C80FE57 +:100BEB000200C0D761DD717BFA70CFC0FFA59FC03B +:100BFB00007CFF9FC000609FC00061CDD7618BFE62 +:100C0B00E2FF717BBE410011FB000017CEFC0061BF +:100C1B00CB089EFDF31161C999A58392DFF7D7FE2F +:100C2B00B1FED574FDDF23C1CF0308035109FEF4D8 +:100C3B00FDC0D2DF37FE3800A20408CF03080751EE +:100C4B0009FEE1FDD2B20408DF22C7FB04083183A1 +:100C5B0002C6D7C6510AFECCFD624C1FDF06CF740D +:100C6B00FD01EF04CF74FD00C0EE5BFEC0EE55FE40 +:100C7B00C7C1FB04088B31196C0161589BC0C6D7E7 +:100C8B00717BFAFE4DFEAF0408040600C11436EF6B +:100C9B000B300000522DF3FE77FF8FC000FE2BFEB2 +:100CAB0061CF5C807C8073C0041900CEFC0F61CBDC +:100CBB00C55404EF03C55417FE18FEC7360008BB16 +:100CCB00629C0288089C03D1DD334C41DE2F70F10E +:100CDB00312DB161090033081C000851FF612A4115 +:100CEB000E118FD0FF613B118FD1FF6138DC0E8B62 +:100CFB005C03DF0964C6C4FE2BFDEECAFDC6C4EE61 +:020D0B00C3FD26 +:100D0D0061CF5100718C7109FECBF800FEFC86019C +:100D1D0000F6BF00F953C0F693935820FEDFF9415A +:100D2D0000360A4F342CFDEF05118B99A7A51744FA +:100D3D00444FDFF53602F9302CFDEF04CC0000A74F +:100D4D0047DFF9410036EF4E3466FDEF05118B9903 +:100D5D00A7A51744EF4EDFF53666FD3066FDEF04AF +:100D6D00CC0000A747DFF9FCCE0000EFFE61DD717E +:100D7D007BFABEF0ADD8BEF200AEF661CDD7C36141 +:100D8D00DD717BFABEF0ADD8BEF200DBF6FFADDC57 +:100D9D00BEF000AEF6BDD8AEF40312ADDABEF20071 +:100DAD00AEF661CD03BDDAC2D7C3F33174D9088372 +:100DBD00C1F626D8BDD8C031750683C312F623C23D +:100DCD00FDD80D93DF0312F623C2D7440000DD26B4 +:100DDD0061DD717BFACFE80080BEF6F6BEF4BEF29F +:100DED00ADD8BEF0CFE800818FE8003103FAAEF048 +:100DFD00F5E80061CDD7B1D7C3F33174D90883C1FC +:100E0D00F626D8BDD8C0317505C312F623C2FD260E +:100E1D000E93DF0312F623C2D7440000DD2761DDF8 +:100E2D00717BFACFE80080BEF6F6BEF4BEF2ADD807 +:100E3D00BEF0CFE800818FE8003103FAAFE000F596 +:100E4D00E80061CDD7ADD8D7C3F33174DB0F83C1C3 +:100E5D00F626D8BDD861317026DABDDAC031750DF0 +:100E6D0083C312F626DCBDDC61317023C2FD8E0E0C +:100E7D0093DF0CF626D8BDD861317026DABDDAC203 +:100E8D00D7C161686BDC6BDDC0DD2F61DD717BFA75 +:100E9D00CFE80080BEF4ADDCBEF6ADD8BEF0ADDA65 +:100EAD00BEF2CFE800818FE8003103FAAEF0BDD875 +:100EBD00AEF2BDDAF5E80061CDD7F6BDD8BDDAD713 +:100ECD008292DD2B61DD717BFACFE80080BEF0F6FA +:100EDD00BEF2BEF46208BEF6CFE800818FE80031A5 +:100EED0003FAAFE0006072AEF0F5E80061CDD760B7 +:100EFD0072F6B1D706DABDDAADDC06D8BDD861D849 +:100F0D00A6DAD7D1DD17C1C3DAD89DD8ADDA311C39 +:100F1D0061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDCC +:100F2D001BC1C3DADA9DDAADD8311E33311E3371F0 +:100F3D00F9B4DADFF4BDD813BDDAC2C0D746D8DDB7 +:100F4D000771FF7177D971C0D746DADF08C1ADDC03 +:100F5D0046D8C0DD077177DB71FF71C0D75BDB9DB4 +:100F6D00DB605BDA9DDAADDC5BD9085BD808BDD8F8 +:100F7D00D7C3C7F3728EFDC162314C410036F04EBE +:100F8D001161A072C09EFD62C6C2D7C3C7F3728E37 +:100F9D00FDC1625C0F0C000FFE00314C410036FAB2 +:0F0FAD004E1161800FFE0073C09EFD63C6C2D758 +:0A0FF60031303A33323A3037000050 +:0A20000031303A33323A3037000035 :10200A00AEF0B430B740BA30BB50BBB0BC50BD1014 :10201A00BD60BDB0BFE0C2B0C420C7B0CAE0CE1038 :10202A0001F0141014200630639049006E00777096 @@ -279,736 +279,737 @@ :10219A00B490B620B860BA50BFA0C6B0CE90D020D6 :1021AA0000200020002000207B30686020001700FB :1021BA00173012F00DE007F00700093001C001C026 -:1021CA005C0036FFA7FB5C0036FFA7FB5C0036FF0E -:1021DA00A7FBAB0000FF67FDAB0000FF67FDAB008C -:1021EA0000FF67FDAB0000FF67FD00D800D800D8EC +:1021CA005C003600A7005C003600A7005C00360001 +:1021DA00A700AB0000006700AB0000006700AB007F +:1021EA0000006700AB000000670000D800D800D8E4 :1021FA0020DA20DA20DA20DAEAEAEA69696969E8A3 -:10220A00E8E867676767020202010101010019260F -:10221A00344453626E777D80807D776E6253443496 -:10222A002619100A08080808080808080A107F7EF4 -:10223A007D7C7A7978777675747271706F6E6D6C51 -:10224A006A6968676665646261605F5E5D5C5A5967 -:10225A0058575655535251504F4E4D4B4A4949487B -:10226A00474645434241403F3E3D3B3A39380801E3 -:10227A0001020203030200FEFBF7F3F0F0F3FA0493 -:10228A001225384D5F6E777A776E5F4D38251204C6 -:10229A00FAF3F0F0F3F7FBFE000203030202010077 -:1022AA00000000001F003B005A0078009700B500AC -:0A22BA00D400F300110130014E01C1 -:1022C400C7D51EF9DD108F27FDB027FDD161E8EDDC -:1022D4007123CF27FD33FD73234002F94BDC1640F5 -:1022E40002F9B9DE10400DF928DE05A00DF9EF273B -:1022F400712320EF224002F93EDC064002F9BDDCE6 -:1023040010400EF928DE05A00EF9EF0B712220EF24 -:1023140006F50DF9F50EF93122200D3104200931AD -:10232400020705713304EF03713204711405E66189 -:102334003060D1DF0CF50FF97148E3FB714302EF14 -:1023440012400FF902DE05A00FF9EF077140E3FB1D -:10235400714202D50BF9DD06B00BF9714202401E41 -:10236400F901DD09401EF90561E8FD0827C6D7C754 -:10237400710407E6613060768F10F9614EDD2966DD -:102384009F10F9D1DD137130E3FB5002C15011FDF0 -:102394000E38C0CF0BF91EEF0F7138E3FBE0C150CC -:1023A40011FD0E38C0F50BF9C6D7C78F26FD76FD93 -:1023B400EF23D521F9DD05710320EF2D664F26FDAE -:1023C40061F83134201A713320FD1D05664C07DD98 -:1023D4000381DF098F20F9310303FDA024FDC52407 -:1023E400710220304A26FD7D3CC6D7C77162017157 -:1023F4007201E0FD95025008FDFA3A629F02F9501D -:1024040009FDFA3A6276716301713820F94002F9E4 -:10241400F1DC05E521F9EF244002F904DE1BCF21AC -:10242400F9025008C1506CFD2603C092DF0ED5415D -:10243400FBDF09713020F9EF03F521F9664CEADC82 -:1024440006CF26FD07EF44664CC6DC06CF26FD0604 -:10245400EF39664C9FDC06CF26FD05EF2E664C7CDB -:10246400DC06CF26FD04EF23664C50DC06CF26FDA8 -:1024740003EF18664C22DC06CF26FD02EF0D664CF6 -:1024840006DC05E526FDEF03F526FD4026FD07DF06 -:1024940009D521F961F8CF21F903C6D7C7C1FBF8E3 -:1024A400FF500AFD9502304000BB17C15002C150D5 -:1024B40006C1506CFDF80310065096FD9502C0C687 -:1024C400D7C72008FBF8FF8F26FD5006D604CA2183 -:1024D40014F7500689A54804F9A390DFF7D521F92C -:1024E40061E8ED4626304A57BB17C15002C1503E41 -:1024F400C1506CFDF8031006D2DD077100E2FBED5C -:1025040046267108E2FB17040300C15004C1500CB5 -:10251400C1506CFD50031006D926FDF10104F421CD -:1025240014A9318D12A9318E616B08616A08BB1739 -:10253400C15002C1500EC1506CFDF8031006F69054 -:10254400BB17C15002C1500CC1506CFDF8031006FA -:1025540031742002EFFA7162208F26FDF0312E04CF -:102564000A20C15010C15040C1506CFDF803100640 -:1025740031742002EFFA7162208F26FDF0312E04AF -:102584001A20C15010C15050C1506CFDF803100600 -:1025940031742002EFFA7162208F26FDF0312E048F -:1025A4002A20C15010C15060C1506CFDF8031006C0 -:1025B40031742002EFFA7162208F26FDF0312E046F -:1025C4003A20C15010C15070C1506CFDF803100680 -:1025D40050A5FD9502D926FDF10104F42114A93179 -:1025E4008D12A9318E616B08616A08BB17C1500254 -:1025F400C1500EC1506CFDF803100650A5FD9502A4 -:102604005004C1506CFD2603C0629C07E926FD09F5 -:1026140009224E0761C308E926FD0902224E071765 -:10262400040300C15004C1500CC1506CFDF80310E8 -:1026340006F6BB17C15002C1503EC1506CFDF803F1 -:1026440010061008C6D7C7C1FBF8FF8F11F94F0257 -:10265400F961F8ED04274013F928DE06A013F9ED1B -:102664000427F513F98F02F99F11F98F02F95070BD -:10267400D612307351230480001231FF318E039F30 -:1026840012F99FDEFBF6BB8F12F97C804C95DC1BA4 -:102694008F12F9318F241400BDD8AF06F9FD7B0DDC -:1026A4001231FF318E03318FBBEF198F12F9318F45 -:1026B400241400BDD8AF08F9FD7B0D1231FF318E13 -:1026C40003318FBBD904F9F1610900BB44000171E6 -:1026D400FEDC03F690BB8C0101DE02F6BBABABBFA4 -:1026E40080FC17C15002C1500CC1506CFDF803109E -:1026F40006D2DF088F02F99F11F9EF047100E2FBA3 -:10270400F2C0C6D7C72008FBF8FF4021F901DF0B50 -:10271400CFDFFB63CFE1FBC8ED7B284021F902DF6B -:102724002C17040600C15002C15004C1506CFD5066 -:10273400031006D2DD06CFDFFB63EF0A8C069FDFB2 -:10274400FB8C079FE0FBCFE1FBC8ED7B2817040659 -:1027540000C15002C15004C1506CFD50031006D298 -:10276400DD117100E2FB710320F5DFFB712020F91C -:10277400ED50288C06318E318D080E07081C00BBE5 -:10278400D926FDF1041022148972ABFDCE0EBB8C48 -:10279400019C068B9C0717040400C15002C1C15060 -:1027A4006CFD50031006D261E8ED50288C049FE1C3 -:1027B400FB8C04318E318D080E05081C00BBBDD87E -:1027C400F6BDDAC9DC01A5FD570FDC09CC0364F6BC -:1027D400BF14F9EF77ABBDD8F6BDDAAF14F9BDDCA1 -:1027E400F6BDDEADD8C1ADDAC1C9D800A0F6BDDAF8 -:1027F400ADDEFD020FADD8BDDCADDABDDEC0BDDAA5 -:10280400C0BDD8ADDEFD570F61D309CC031EF6BFA2 -:1028140014F9EF38ABBDD8F6BDDAC9DC819DFD579C -:102824000FDC0BCC030A30F401BF14F9EF1EABBD6F -:10283400D8F6BDDAC9DC019BFD570FDC0BCC0305D0 -:1028440030F401BF14F9EF04712020F93132040D82 -:1028540031140509CFDFFB64F5E0FBEF1A8C064E5B -:1028640003DE0C8C069FDFFB8C079FE0FBEF088CDC -:10287400039FDFFBF5E0FBD51EF961F8CF16F96481 -:102884008F16F94FDFFB61F8311420447113204097 -:10289400DFFB51DC06CF36FC0FEF3540DFFB33DCCA -:1028A40006CF36FC0BEF2940DFFB0BDC06CF36FCF2 -:1028B40007EF1D40DFFB0661D831320406CF36FC3A -:1028C40003EF0DD5DFFBDD05E536FCEF03F536FC44 -:1028D40040DFFB0BDE064016F90BDE1640DFFB067D -:1028E400DE064016F906DE0AD5DFFBDF0ED516F943 -:1028F400DD095020C15011FD0E38C08FDFFB9F163B -:10290400F9D51EF9DF05714320EF3940DFFB0BDEFB -:1029140003E6EF01F66061FB715120F1715420610F -:10292400DC4F0CF961F83142201A714220F17154E4 -:102934002061DC9F0CF9F171542061DC70C15012EC -:10294400FDAC05C01008C6D7C75007C15002C1501E -:1029540084FDC20310045012FD9502500FC15002B1 -:10296400C15084FDC20310045003FD9502501FC1E1 -:102974005002C15084FDC20310045016FD9502504C -:1029840003C15084FD2603C0625C01D1DD10717067 -:10299400E3FB5002C15013FD0E38C0E2EF01F2C652 -:1029A400D7C75004C15084FD2603C0625C03D1DD47 -:1029B400405014FD3E2A34E3FB895C9F998A0C7CC9 -:1029C400FF50FF5C14D1DD228A0C7CFF5C1472344E -:1029D400E7FB89616A9971620756003162070586CF -:1029E40066D1DFF7716307716B2734F6FB895CEB03 -:1029F400995002C15084FD2603C0D2DD335017C163 -:102A04005002C15084FDC2031004E0FD950250073A -:102A1400C15002C15084FDC20310045033FD95021D -:102A2400F0C15002C15084FDC20310047178E3FB6D -:102A3400E0C15013FD0E38C0C6D7C7C12004FBF84F -:102A4400FFCC02005004C15084FD2603C0629C03E5 -:102A54008C045C20D1DD0E8C036C019C038C026C15 -:102A6400209C02EF138C045C10D1DD0C8C035CFE03 -:102A74009C038C026C109C028C045C08D1DD0E8CCF -:102A8400036C029C038C026C089C02EF138C045CA4 -:102A940004D1DD0C8C035CFD9C038C026C049C0251 -:102AA4008C03D1DD05501AFD95028C0370C15004CE -:102AB400C15084FDC20310048FE3FB5C9F728C033E -:102AC400318E316D148C03318E314D616D08616C22 -:102AD4005C606162629FE3FB8FEFFB7CFF50FF5EF3 -:102AE40002D1DD278FEFFB7CFF5E027234E7FB89A6 -:102AF400616A99716207CC0100316207086159016A -:102B04008C01D1DFF4716307716B27F21006C6D70D -:102B1400D9D7FBC15006C15084FDC2031004D9D8D3 -:102B2400FBC15007C15084FDC2031004D7FD142B10 -:102B3400F2D7711300711B20710303710205E0C108 -:102B44005003C15084FDC20310045013FD9502F0DC -:102B5400C15005C15084FDC2031004500FC1E0C12F -:102B64005084FDC2031004500AFD95027103055000 -:102B740008FD9502501FC1E0C15084FDC20310043A -:102B84005012FD95025003C15084FD2603C0625CBF -:102B940001D1DF02E2D75003C1C15084FDC203104A -:102BA40004710203711A20FDF92CF50AF9F2D750C9 -:102BB40003C15084FD2603C0625C01D1DD195014A9 -:102BC400FD3E2AFDA5295014FD9502E0C15003C124 -:102BD4005084FDC2031004711300711B20710303A0 -:102BE400F0C1E0C15084FDC2031004F0C15003C120 -:102BF4005084FDC2031004D7C72004FBF8FFCC02A5 -:102C0400008F0AF99C035010C150A4FD2603C06232 -:102C14009F0AF9D541FBDD04F2EDD62C8C037F0A23 -:102C2400F95C08D1DD108F0AF95C08D1DF05CC020C -:102C340010EF03CC02208C037F0AF95C04D1DD166B -:102C44008F0AF95C04D1DF088C026C049C02EF0645 -:102C54008C026C089C028FE2FB5CF3728F0AF95CB5 -:102C64000C6162629FE2FB8FEEFB7CFF50FF5E0211 -:102C74009C02D1DD1F34E6FB896E0299716207CC98 -:102C84000100316207086159018C01D1DFF47163DD -:102C940007716B278F0AF95C40D1DD095002C150DE -:102CA40012FD0E38C08F0AF95C01D1DD08E0C15075 -:102CB40012FD0E38C0717AFA8F0AF95C41D1DD1128 -:102CC400340AF9895CBE99D90AF9C15010FDAC05E2 -:102CD400C0F21004C6D7FD4C29F2D7FDA529F2D7BE -:102CE400C78FF6FB7617FD3E2A664FF6FBDFF2F53B -:102CF400F6FBF2C6D75064FD950240DFFB0BDE0302 -:102D0400E6EF01F6609F0CF9D90CF9C15012FDAC45 -:102D140005C0FDD63930E339ED7D3C710001057104 -:102D2400785005713AD5713BD1713ADD713BD98F39 -:102D340010055CFC9F1005CF54054AE5420571104F -:102D440042057100420571485005713050057120EB -:102D54005005CF530505CF52050A71305105712036 -:102D64005105713BD5717050058F11055CFC9F11A5 -:102D740005D77178500571080105D77140F00071CD -:102D8400783002713AE6713BE2713BEA713BEE8FB7 -:102D940010055CFC9F1005CF34024AE552FF711AFE -:102DA40052710A527148300271303002712030027F -:102DB400CF330205CF32020A71303102713BE67122 -:102DC4007030028F11055CFC9F110571603002D7D1 -:102DD400717830027148F000D7C788061666614FD3 -:102DE400DD0967614EDE0396EF01866672C6D7C7BA -:102DF400161714AA0412A943DD29AA0412A923FD53 -:102E04003C4FC3AC02FD3C4F13C2BDD813FD4B0F66 -:102E1400DE0C1714AA0212AA0403BA04EF0517144D -:102E2400A9BA04AC041231FF319E03317F08720841 -:102E3400C6D7C771201205712011057100F2003048 -:102E44004400BFB601300188BF9001300984BF9EA1 -:102E540001BF9C01BF9A01BF9801BF9601BF9401B5 -:102E6400BF9201F53CFF30FE00BFBE01F6BFBC01BE -:102E7400BFB80150EEBFBA01A1BFB201C918FE002C -:102E8400711020F94021F901DF06711820F9EF0BC8 -:102E940036100571A461D8711820F97128100571D4 -:102EA400281105F6BE6EBE64BE6A71230471530711 -:102EB4008F20F9310507F5FDFBCB6CFF0071232151 -:102EC400C6D730EF00BFB401F6BFBA017108F200F3 -:102ED400712304715307715301D7713321D9FDFB59 -:102EE400F1E7240000DD1223DD1923DD1123DD26A3 -:102EF40023DD3423DD3923DD3FFD792FEF3DFD9CB8 -:102F04002FEF38D9FCFBC1AE6CFDDD2DC0F313BE31 -:102F14006C711321EF25F0C1AE6CFDDD2DC0F313F0 -:102F2400BE6C711321EF14F6BE6C711221EF0CCB41 -:102F34006CFF00711321EF03FD19308F20F9311557 -:102F440008711421712104EF0671142171510131AA -:102F54003421218F20F9311510F6BE64BE6A311474 -:102F6400210390EF01F6BE6ED731142104F690EFE1 -:102F740001F6BE6AD7CF2EFD47F5A8FBAE6C317DB6 -:102F8400BFAEFBFDEE2FD2DF0ED9FCFBC1AE6CFD54 -:102F9400DD2DC0F313BE6CD7FDEE2FD2DD0FCF2E87 -:102FA400FD47F5A8FBAE6C317DBFAEFBD7E9A8FBAE -:102FB4000918225080D6BFAAFB22AEFBBDD83047E9 -:102FC40000FDB70DBFACFB30AAFBFDF32DF313BE20 -:102FD4006CB02EFDD52EFDDF10CF2EFD47A0A8FB33 -:102FE40040A8FB1F61C8F5A8FBD740DFFB0BDC053D -:102FF400711321F2D740DFFB0661D831120511F0BD -:10300400C1AE6CFDDD2DC0F313BE6C711221EF0354 -:10301400FD1930E2D7713221F0C1AE6CFDDD2DC057 -:10302400F313BE6CA0B0FB40B0FB40DC3DF5B0FB3D -:10303400D9B1FBF1313F042AFD14D9B1FBF1BDD85C -:103044005008FD060E087208E6D2DD040192DFFC8A -:10305400896158D1DD05711221EF03711321A0B1EB -:10306400FB40B1FB2061C8F5B1FBD78FB2FBB0B216 -:10307400FBD1DF7331D4D106715BD1E5B4FBD5B498 -:10308400FBDD347140E2FBD9B3FBF1E734020023EA -:10309400DD0625DD0325DF05F6BE66EF06D9FCFB5C -:1030A400F1BE66A0B3FB40B3FB20DF06F5B3FBB073 -:1030B400B4FBCFB2FB19D7CFB2FB1E7148E2FBD5EC -:1030C400FEFBDF04F6BE66D7D9FCFBF14266FFDDEA -:1030D40016D9FCFBF112AE6643DE05A266FFEF03D0 -:1030E400B266FFCFB2FB03D731342101D7401EF9BA -:1030F40002DF10F6BE64BE6EBE6ABFBCFBBFC2FB7D -:10310400BFC8FB31242139F6BFB8FBBFBEFBBFC427 -:10311400FB22BCFB1231FF31AE03316FBFBAFBF6A9 -:1031240022C2FB1231FF31AE03316FBFC0FBF62266 -:10313400C8FB1231FF31AE03316FBFC6FBEDFE3168 -:1031440031542110715321710802FCF5B6FBF5B519 -:10315400FBEDFE31D5B5FB61E8EDFB318F44FB9F00 -:10316400B5FB40B6FB1FDC1A710002FC4046FBFFB6 -:10317400DD22A0B7FB8F46FB4FB7FBDE17F5B6FB8E -:10318400EF12D9B6FBF1A1605C1F9FB6FB71080278 -:10319400FCF5B7FBE9B6FB0948FB5080D6BFB8FB8A -:1031A400E9B6FB0968FB5080D6BFBEFBE9B6FB0954 -:1031B40088FB5080D6BFC4FBAFB8FB22BCFB12D93E -:1031C40045FBF133BDD813FDB70DBFBAFBAFBEFB52 -:1031D40022C2FB12D945FBF133BDD813FDB70DBF95 -:1031E400C0FBAFC4FB22C8FB12D945FBF133BDD8E9 -:1031F40013FDB70DBFC6FBB0B5FB8F20F931151F0A -:1032040030C4FBFDF32DF313BE6430B8FBFDF32D86 -:10321400F313BE6E30BEFBFDF32DF313BE6AD7303D -:10322400C4FBFDF32DF313BE6AD7C73142210BD57E -:10323400CAFBDD06B0CAFBEDF532714321D9FFFBB1 -:10324400F1E7240000DD0F23DD1B23DD1123DD570F -:1032540023DD2923DD3B5600F52FFDEDE132560138 -:10326400F52FFDEF78D52FFDDF075601E52FFDEF94 -:10327400055600F52FFDCFCAFBFAEF61D52FFDDF10 -:103284000B5601E52FFDCFCAFBFAEF51F5FFFBEF1B -:103294004CD52FFDDF0B5600E52FFDCFCAFBFAEF0F -:1032A4003CCFFFFB02EF36D937FCF1E7240000DD09 -:1032B4000923DD2423DD0A23EF1E5600F52FFDEF3D -:1032C4001CD52FFDDF075601E52FFDEF055600F550 -:1032D4002FFDCFCAFBFAEF055601E52FFD8F20F92C -:1032E4003115086661FB715107EF066661FB7101D8 -:1032F40001C6D7C736F00071F4DC297170F000CE36 -:103304009D08CE9EC0CE9F80F594FFF593FFF59265 -:10331400FFE597FFE596FFCE9506F598FFCE9C7FD7 -:103324007100D6FB711BE3712BE3711AE7712BE774 -:10333400717A9D710A9E31929E02EFFA710B9E7111 -:103344006321717321710322C6D7C73162211E71B3 -:103354006221710A9E31929E02EFFA3404FC369285 -:10336400FF52078B99A5A792DFF9710B9EC6D7C7A9 -:1033740088061631722115717221C734CCFB309244 -:10338400FF1652078B99A5A792DFF9C666736718D3 -:10339400CCFBC6D7C77163213174211E71732171AF -:1033A4000A9E31929E02EFFA3492FF36CCFB52070A -:1033B4008B99A5A792DFF9710B9E31042213710337 -:1033C40022717B9E8F0CFC9E9A8F0DFC9E9B717AC2 -:1033D4009EC6D7CFD7FB5CCFD8FB5FCFF8FB32D7E5 -:1033E400C7CFD4FB11CFD5FB08CFFCFBFFF5FDFB0A -:1033F400F5FEFBF5FFFBF500FCCFF9FB20F5FAFB2E -:10340400CF2CFC36CF2DFCC95600664C64DE087206 -:103414003844FB0086EFF3C6D7C788061617F1E7D2 -:103424003403002361E3ED52372361F8ED0135B134 -:103434002361E3ED08352561F8ED173524070024F1 -:10344400070061D8ED5237240B0061F8ED383523BD -:1034540061F8ED7F352361F8ED4C352361F8ED28F3 -:10346400372561F8ED3C372561F8EDE835B1256184 -:10347400D8ED0C3624000061F8ED19362361F8ED1F -:1034840052372402002361E3ED3E362361F8ED5008 -:10349400362361F8ED62362361F8ED50362361F886 -:1034A400ED74362361F8ED86362361F8ED96362304 -:1034B40061F8EDB8362361F8EDC4362361F8EDD038 -:1034C400362361F8EDD9362402002361E3ED523747 -:1034D40024020061F8EDE1362361F8EDED36256153 -:1034E400F8EDF936240A0061F8ED0537241200617D -:1034F400F8ED22372361F8ED1037ED5437679FD686 -:10350400FBED5E3730312BFD7D3C66736718D4FBD1 -:10351400ED5E3740D9FB6ADF1440DAFB68DF0E67E3 -:103524004C6CDF0930E144FD7D3C713AD5679FDB8B -:10353400FBED5E3767D1DD06306340FD7D3C34F43E -:10354400FB89616F99ED5E37675C02D1DD0830DA83 -:103554002CFD7D3CEF0C675C01D1DD0630DF2CFDDA -:103564007D3C675C3CD1DD1030E42CFD7D3C675C28 -:103574003C7266736218D4FBED5E3767D1DD625C22 -:1035840001D1DD05300800EF01F6609F33FC675C74 -:1035940002D1DD03E6EF01F63433FC8961689967F3 -:1035A4005C04D1DD04E6A1EF01F63433FC896168E3 -:1035B40099675C08D1DD05302000EF01F63433FC57 -:1035C40089616899675C10D1DD05301000EF01F660 -:1035D4003433FC89616899675C20D161E871603398 -:1035E400FCED5E37D518F9DF09679FFDFBA018F9DC -:1035F400EF134018F905DE0DD918F9F1B112674837 -:103604002AFDA018F9ED5E37675C0F7266736218C5 -:10361400D4FBED5E374018F964DE1F4018F901DF72 -:103624000667D161F85701E918F9671844FBA01837 -:10363400F94018F90561C8715221675C7F318EC168 -:1036440017F1243000FD7333C0ED5E37675C3F3102 -:103654008EC117F1243000FD7333C0ED5E37675C13 -:1036640007318EC117F1243000FD7333C0ED5E378E -:10367400675C1F318EC117F1243000FD7333C0ED38 -:103684005E3767318EC117F1243000FD7333C0ED0E -:103694005E37CEABAC710A9E31929E02EFFAD592A0 -:1036A400FFDF05710B9EEFED679E99710B9E9F0BDB -:1036B400FCED5E37710222675C7F9F0CFCED5E3788 -:1036C400710222675C3F9F0DFCED5E37675C3F9F94 -:1036D4000EFCED5E37675C1F9F0FFCEF7D307B3E79 -:1036E400FD7D3C679F14FCEF7130363EFD7D3C67E9 -:1036F4009F15FCEF6530583EFD7D3C679F18FCEF3D -:1037040059675C01D1DD53FDE947EF4E402EFCC8FB -:10371400DE48E92EFC671872FAA02EFCEF3C679F86 -:103724002EFCEF3667318E247200DF06305809FD17 -:103734007D3C679FF7FBEF228FFAFB617F5C10D122 -:10374400DD0630E339FD7D3C679FFAFBEF0CEF0AA1 -:10375400664C5ADE05736718D4FBC6D7C716664C89 -:1037640030DC094C37DE05FD4E33EF67664C02DF73 -:103774001F8FD6FB5C03728F35FC5C03318E316D79 -:1037840008616A08128F35FC5C80312A6162EF4956 -:10379400664C3DDF0AAE90BF30FCF930FCEF3A6670 -:1037A4004C3EDF05F931FCEF30664C4FDF05FD0D73 -:1037B40048EF26664C61DF09E92EFC0972FA72EFC4 -:1037C40018664C7FDF0D30DD40FD7D3C713AD552EB -:1037D4004AEF06667309D4FB72C6D7C78806161764 -:1037E400F1241000240500DC07244C00DD17EF1839 -:1037F400717BFA17F104D4FB1489617F99717AFA09 -:10380400711222EF03A02EFCC6D7C7C1C1FBF8FF7B -:10381400401EF903DD06401EF904DF2F8C027309F4 -:10382400DCFB5E0AD1DF248C02318E04D4FB1489C4 -:103834006E0A99716207CC0100316207086159016F -:103844008C01D1DFF4716307716B271004C6D7CFE5 -:1038540035FC03F533FCF537FCF539FCD7C788068E -:103864001617F1E734020025DD4023DD1A25DD1F9C -:1038740023DD0523DD2EEF3E714222679F38FC30A5 -:10388400E339FD7D3CEF2F675C839F35FCEF2767B1 -:103894005C039F37FC675C034C0261F8714221FDB5 -:1038A4002E32EF12679F39FCEF0C6791DF08E0C1FD -:1038B4005012FD0E38C0C6D7C71617F1E724000012 -:1038C400DD4723DD23240300DD0C240200DD222454 -:1038D400F900DD3CEF3D31020705308000EF01F6D1 -:1038E400086F36FC7208EF318F33FCF533FC72EF4E -:1038F4002840DDFB01DD0FD9DDFBF11231FE033180 -:103904001F087208EF13E2EF107122235235EF09FA -:10391400F2EF0666730932FC72C6D7C71617F1E7D1 -:10392400240000DD38241000DD1C23DD1C23DD30E1 -:10393400240E00DD18241100DD1B240F00DD1224E9 -:103944003000DD15EF1EE2EF1D5202EF195204EFB5 -:10395400155206EF115205EF0D5207EF09F2EF066B -:103964005203EF0252FFC6D7C731242249712322E2 -:10397400401EF903DF408F44FC9FDCFB8F43FC9F18 -:10398400FBFB3636FDC7D943FCFD2B3B618A7061D6 -:103994008AFD703BC0D946FCF1312F609F45FC8FF6 -:1039A40042FC4F45FCDD0F7132228F45FC9F42FCE7 -:1039B40030E339FD7D3C7150F000CE300BCF170061 -:1039C40006CE3106FD0203717A30710BE3710BE709 -:1039D400C6D78F45FC9F42FC8F45FC9FDDFBD7403B -:1039E4001EF903DF06401EF904DF02F2D78FFAFB4B -:1039F4005C10D1DD0C8F45FC9F4AFC7148FAFBEF4B -:103A04006A313422247133227153228FFAFB5C040D -:103A1400D1DD088FF9FB9F4BFCEF068F45FC9F4BD4 -:103A2400FC8F4BFC9F4AFCEF423144222C71432211 -:103A3400715222D538FCDF05F54CFCEF0B8F38FCB6 -:103A44005002D6A1609F4CFC8F4CFC9F4AFC504016 -:103A5400C15012FD0E38C0EF12315222088F4BFCB8 -:103A64009F4AFCEF068F4CFC9F4AFC8F4AFC9FDD6B -:103A7400FB404AFC01DF05E538FCEF0ED94AFCF1B6 -:103A84001231FE03311F609F38FC8FFAFB5C01D1B9 -:103A9400DD02F2D7E94AFC09382270C15013FDACAB -:103AA40005C0F2D7C7168B728C01614ADE248B7273 -:103AB4008C02614ADE188C01728C02614ADE068C2B -:103AC40001318EEF048C02318E087208EF268B725E -:103AD400EF228B728C02614ADE048B72EF168C012A -:103AE400728C026142DE068C01318EEF048C02314D -:103AF4008E087208C6D7C716710AE7710BE37150B6 -:103B0400F000CE300BCF170006669E31FD02037124 -:103B14007A30710BE33182E302EFFA8D1F7158F0B2 -:103B240000710BE772C6D7C7C1C1FBF8FF8F2CFC2D -:103B34004E02DC03F2EF318C024F2DFCDC0452FF09 -:103B4400EF268C022F2CFC706131318D128F2DFCED -:103B54002F2CFC70613133BDD813FDD90DBB44004B -:103B640001DC03F690BB8B721004C6D7C7C1C1FB3E -:103B7400F8FFAC0A14A91489708C026128706131B1 -:103B8400FD3C4F1344030071FEDC24AC0A148A0488 -:103B9400819A04AC0A148A044C11DC11A9148C0215 -:103BA40099AC0A14CA0200AC0A14CA0310EF74AC2C -:103BB4000A14CA0400AC0A14A914894E02DE0AAC21 -:103BC4000A148A02819A02EF13AC0A14A914894ECA -:103BD4000261D308AC0A148A02919A02AC0A148ACC -:103BE40003919A03D1DF3CAC0A148A024C10DF1013 -:103BF400A91489318EA112AC0A14A9146299EF1781 -:103C0400AC0A148A024CF0DF0EA91489318EB11269 -:103C1400AC0A14A9146299AC0A14CA0200AC0A14BE -:103C2400CA03101004C6D7ED683C717BFAC7D55897 -:103C3400FC61F831642227716322D558FC61E8B035 -:103C440058FC717AFA5600664C0BDD1272F3311C83 -:103C5400793CFDCEFC0061CAFDC73C86EFE9717A70 -:103C6400FAF2C6D7C75600664C0EDE0BF0317E1250 -:103C7400F6785AFC86EFF0C6D7C7C1C1FBF8FFCC73 -:103C840001008C014C0EDE36717BFA8C01F0317E22 -:103C9400045AFC14A96168DF09AC02B9717AFAF21A -:103CA400EF1D8C01F0317E12795AFC614902DF0666 -:103CB400717AFAE2EF09717AFA615901EFC4E210FC -:103CC40004C6D7C72004FBF8FFF6425AFC61F8ED9E -:103CD400AC3D717BFA9C038C034C0EDE3C8C03F0F0 -:103CE400317E045AFC14A96168DF05717AFAEF2960 -:103CF400717AFA8C0372F3311C795AFCCEFC0061A0 -:103D0400CA629C02D1DF0A8C03F0317E12E6785A33 -:103D1400FC717BFA615903EFBECC0200CC01018C2B -:103D240002F0317E045AFC14A96168DD7B8C02F038 -:103D3400317E12795AFCE743DF688C014C0EDE6257 -:103D44008C01F0317E12795AFCE743DD50717BFA25 -:103D54008C01F0317E045AFC14A96168DF1B61698F -:103D640001717BFA8C01F0317E12F6785AFC717A7B -:103D7400FA8C024E01DCE7EF2F8C01F0317E045AFD -:103D8400FC14A9128C02F0317E33785AFC8C01F0B9 -:103D9400317E12E6785AFC615902717AFA6159014E -:103DA400EF98615902ED233D00F21004C6D7C720F5 -:103DB40006FBF8FF3419FCC55006C150A8C15030A9 -:103DC400FD50031006D2DD1DA076FC4076FC08DE13 -:103DD40003E2EF5A3414FC895CFC99FD7B3E7110BC -:103DE400E2FBF2EF49F576FC8F14FC5C01D1DD2691 -:103DF400401EF903DF205010C180FD0E38C0C736C5 -:103E0400100571D4C6DE0F17C15006C150A8C150A9 -:103E140030FD50031006401EF901DD11401EF90566 -:103E2400DD0B8F14FC5C02D161E8FDE644F2100660 -:103E3400C6D7D915FCC15030FD2603C0629F18FCBB -:103E44007130E5FB8FEDFB5C08D1DF067163077110 -:103E54006B27F2D7D918FCC1D917FCC15030FDC269 -:103E64000310047130E5FB8FEDFB5C08D1DF0671B4 -:103E74006307716B27F2D7C7200AFBF8FF500FC105 -:103E84005030FD2603C04041FB02DF077110E2FB06 -:103E9400F2EF547118E2FBCC0700CC0812CC098075 -:103EA4008F14FC5C03D1DF08717AD5CC0607EF06CA -:103EB400717BD5CC062F17040600C15004C150A055 -:103EC400C15030FDF8031006C736100571D4C6DEA4 -:103ED40015401EF903DF0F17C15006C150A8C15089 -:103EE40030FD50031006F2100AC6D7C7401EF9026F -:103EF400DF04F6BF7AFC8F52FDB052FDD161E8EDCC -:103F04000040CF52FD048F1EF9318FE723DD0B24CF -:103F1400020024030061C8ED0040302700427AFC0F -:103F2400DF0AE0C15010FD0E38C0EF2530C000425A -:103F34007AFCDF0B5002C15010FD0E38C0EF128F17 -:103F4400F8FB5009D6048000427AFC61D871202025 -:103F5400F931340709710323F6BF7AFCEF173104F2 -:103F64002306F6BF7AFCEF0DA27AFCF6427AFCDF58 -:103F74000490BF7AFC8F21F9318FE7240000DD061D -:103F840023DD0D23DF1236100571C4711123EF0BED -:103F9400710402711123EF037112233112231A40A9 -:103FA4007CFC0361D8A07CFC407CFC02DF0E500446 -:103FB400C15010FD0E38C0EF03F57CFC3114231AF8 -:103FC400407EFC0361D8A07EFC407EFC02DF0E50E4 -:103FD40008C15010FD0E38C0EF03F57EFC314207D6 -:103FE40018407DFC0361D8A07DFC407DFC02DF0C01 -:103FF4005010C1FD0E38C0EF03F57DFCC6D7C7369F -:10400400100571D4DE0730B23DFD7D3CD2401EF96F -:1040140003DF1A3122070630FC2BFD7D3C312423BB -:104024000C7123235080C15012FD0E38C0401EF97C -:1040340003DD05F6BD1AEF25D500FCDF09F6461AA7 -:10404400DD1BB61AEF17D9FCFBF1461ADD0FD9FCBC -:10405400FB12AD1A43DE04A61AEF02B61AC6D7C77E -:104064008FF4FB76F5F4FB5C10D161E871322366C2 -:104074005C0FD1DD61665C01D1DD05F51EF9EF56FB -:10408400665C02D1DD15E0C15003C15084FDC2035A -:104094001004711300711B20710303665C08D1DDE9 -:1040A40005710303EF17665C04D1DD117113007110 -:1040B4001B20D535FC61F8710303F535FC5005FD73 -:1040C40095027102035003C1C15084FDC203100460 -:1040D400711A20FDF92CF2C6D7C7364105718461E7 -:1040E400D8ED81413641057194DE0771405005CE0B -:1040F400ABAC31B2D104E2ED9041713BD1CEABAC6B -:104104004018F909DE77D518F9DF618F20F93133CA -:10411400088F21F99F4005EF04CF400504F0C150FA -:1041240084FD2603C0629F82FC8F26FD9F83FC369C -:1041340084FCC75002C15008C1506CFD50031006E6 -:104144008F80FC9F86FC8F02F99F87FC712420E6F8 -:1041540061301271042061DC31196162629F88FC54 -:104164008F20F93169317A9F89FCEF0BD918F9F165 -:10417400124981FC9F4005A018F9E2EF0F716050CD -:104184000571485005713BD5F518F9F2C6D7C78FAC -:104194001EF9318FE724000061F8ED494323DD1B4C -:1041A4002361F8ED6A422361F8EDE8422361F8EDFA -:1041B40024432361F8EDE343ED4943D51FF9DF2B95 -:1041C400F6427AFCDD05F554FDEF03A054FD40549E -:1041D400FD65DC09F51EF9716222ED5244AF7AFCEB -:1041E400440A0061D8ED5244E51FF9710223F554E5 -:1041F400FDF5F7FBFD1D05713320FDAE234021F9CC -:1042040003DF09716222F51EF9ED5244FD082740CF -:10421400E1FB9BDE09716222F51EF9ED5244714AFD -:10422400277140110571301105713A22715A2271BA -:104234001A2EFD362BD2DD09716222F51EF9ED52DC -:104244004471103500CF37001D71401205401FF92D -:1042540001DF05F5FDFBEF04CFFDFB03CF1EF902E3 -:10426400FD142BED5244FD1F2DFD7F2D714A9DFD44 -:104274005338FDE433F537FF712BE0F51FF9716214 -:1042840022CBE43FEFCBE6F6F0FD1D05713BD48F66 -:1042940020F93105305004C15084FD2603C0625C0E -:1042A40003318E315D34E3FB896168995002C1505A -:1042B40084FD2603C0D2DD067170E3FBEF04717840 -:1042C400E3FBFDAE23FD362E710820F9CF1EF90362 -:1042D4008FD6FB5C02D1DD095080C15010FD0E3831 -:1042E400C0ED5244FD544431A4E020712BE031026E -:1042F4000C05FDCE44EF145027C15005C15084FD78 -:10430400C2031004CF1EF9047162223134230BA0BE -:104314008CFCD58CFC61F8FDCE44FDC144ED5244C7 -:10432400FD544431020C18F0C15005C15084FDC243 -:104334000310045005FD9502FDCE44CF1EF903FD84 -:10434400C144ED5244CFFDFB03F5FEFBF500FC71C7 -:104354002221F6426CFF61E8ED5244712820F9F500 -:1043640014FCFD7B3EFDC62EFD762DFDD42D714B38 -:104374009DF5E4FBF5E5FBF5E6FBF5E7FB31742081 -:1043840002EFFACE3708CBE4BFFFCBE6FFF1CED481 -:10439400FFCF37000971481205F6BEE0BEE2BED079 -:1043A400716A27FDB32B714307714B2771481005C0 -:1043B4007148110571381005713811057133027196 -:1043C4003B22715302715B2271130E711B2EFD8609 -:1043D40005F554FDCF1EF905710223F6BF7AFC31B1 -:1043E40002071BFDAE23AF7AFC440A00DC06E51F7E -:1043F400F9E51EF9D521F9DD55FD8605EF50D50BFC -:10440400F9DF4B713404714123F51FF9FD8605FD75 -:10441400732371730171320431120502EFFA71438F -:104424000271032071322031949E02EFFA712AE75F -:10443400CEA409F5F30071330461FD31040703715F -:104444000323E5F300CEA408712BE7E51EF9C6D7D4 -:10445400D58DFCDF1E310200195003C15084FD26A6 -:1044640003C0625C01D1DF07F51EF9716222D7E552 -:104474008DFCD7408DFCF0DF083104003FF58DFC46 -:10448400D7408DFCC8DF0BF51EF9716222CF8DFC7D -:10449400F0D731020004A08DFCD7F0C15004C15004 -:1044A40084FDC20310048FE3FB5C9F9FE3FB711048 -:1044B400F4FB306340FD7D3CCF8DFCF0D78F20F9B9 -:1044C400312506F51EF9716222D7713323F58CFC70 -:1044D400717207FD0203FD0203717307D7FDF30533 -:1044E400F2D7C7200CFBF8FF8F1AFCF0F919FCF384 -:1044F40003FD3C4F13BC048F1CFCF0F91BFCF303BD -:10450400FD3C4F13BC028F1EFCF0F91DFCF303FDB0 -:104514003C4F13BBAC04BDD8F6BDDAAC04311EBDB0 -:10452400DCF6BDDEFD8C0DADD8BDDCADDABDDEAC98 -:1045340002BDD8F6BDDAAC02311EDADCC3DADEC362 -:10454400BDDCF6BDDEFD8C0DC0BDDEC0BDDCADDE68 -:10455400FD020FADD8BDDCADDABDDEABBDD8F6BD16 -:10456400DAAB311EDADCC3DADEC3BDDCF6BDDEFD58 -:104574008C0DC0BDDEC0BDDCADDEFD020FDADAADF0 -:10458400D8FD4349C3C58F1AFD5C3FF0317E049AC0 -:10459400FC14C2C0B9A01AFDF6BC08BC0A9C078C66 -:1045A400074C2EDD3E8F1AFD0E0770F161DC605C56 -:1045B4003FF0317E12799AFCBDD8F6BDDA8C0773D0 -:1045C400097A22318FBDDC70BDDEFD8C0DAC08BDD7 -:1045D400DCAC0AFD020FADDABC0AADD8BC086159E7 -:1045E40007EFBCAC08BDD8AC0ABDDAC9DC0004F6E0 -:1045F400FD560EC9DCFFFFF6FD6B0FADD8BF94FC72 -:10460400AF8EFC4294FCDD12AF90FCBF92FCAF8EE7 -:10461400FCBF90FCAF94FCBF8EFCAF90FC4292FCBC -:10462400DC50AF8EFC4290FCDE48AF56FD428EFC5F -:10463400DE40405AFD16DC1F405AFDA0DE168F9660 -:10464400FC4F5AFDDE0EAF8EFC2298FC44691061CB -:10465400C8FDBF46F55AFDAF8EFC445146DC0BAF96 -:104664008EFC241027BF58FDEF1930F82ABF58FDDF -:10467400EF11405AFDFFDD03E6EF01F6345AFD89E0 -:10468400610899AF92FC4290FCDC1BAF90FC428E17 -:10469400FCDE13AF8EFC4258FDDE0BF596FCAF8EAC -:1046A400FCBF98FCEF114096FCFFDD03E6EF01F63A -:1046B4003496FC89610899100CC6D7C72006FBF80C -:1046C400FFA01FFCD51FFCDF1CA020FCD520FCDFB5 -:1046D40014A021FCD521FCDF0CCF1FFCFFCF20FC54 -:1046E400FFCF21FCFF717BFA710A9E31929E02EF8B -:1046F400FA8E98FD7F0F9C039F1EFD8E949F5BFD99 -:104704008E969F5CFD8E979F5DFD8E939F1CFD8E04 -:10471400929F1DFDFDA04813BC04BDD8F6BDDA462A -:10472400DADF03B146D8DF198C035C0391DF03E6BB -:10473400EF01F6046D01313D120103B1BC0461695E -:10474400038F5EFD4E03DF12AF20FD614904DE409E -:10475400AC042220FDFDC147EF368C03318EB1122B -:10476400D95EFDF143DF1E8C035C0391DF03E6EFAA -:1047740001F6046D01313D1201032220FD6109049B -:10478400FDC147EF0B8F5EFD4E03DE04F6FDC1470E -:104794008C039F5EFDAC04BF20FDD91BFDF1010419 -:1047A40022F9BB14A944FFFFDF04E6B9EF0BAB14F5 -:1047B400A944FEFFDD03A9A1B91006C6D7C7161781 -:1047C40044A90061C836A800A01BFD401BFDA861D8 -:1047D400C8F51BFDF91BFDF3311CF67822F9B7F679 -:1047E40047DFE5C6D7C756A89666F0317E12F6B104 -:1047F4007822F966D1DFF1F51FFCF520FCF521FCE8 -:10480400F51BFDC6D7715323D7C72004FBF8FFD986 -:1048140018F9F1E7240000DD1123DD1C23DD212339 -:10482400DD2623DD2F23DD34EF3A8F1BFD9F22FD90 -:10483400A018F9F95BFDEF60A018F9F95CFDEF58D9 -:10484400A018F9F95DFDEF50A018F98F1EFDFD9930 -:104854000F72EF44A018F9F91CFDEF3CA018F9F908 -:104864001DFDEF34F922FDF3311C7922F9BB3152DD -:1048740023058B9C03EF128C019C03D522FDDF06DC -:10488400CF22FDA7EF03B022FD718071572361DCB5 -:1048940061FB7151238C03721004C6D7C72008FB37 -:1048A400F8FF8E989C058E979C048E969C038E949C -:1048B4009C028E939C018E929B710B9E717AFA8C52 -:1048C40005FD7F0F9C058C04FD7F0F9C048C03FD6C -:1048D4007F0F9C038C02FD7F0F9C028C04F0317EC1 -:1048E4001279AA22BC068C055C03D1DF158C044C1A -:1048F40003DE0C8C044C02DF098C034C1D61F8614F -:1049040079068C03318EB1610906BC06313D120172 -:1049140003BC068C060E02708C071C00BC068F2498 -:10492400FC4E01DC0D8C014F24FCDC0B8F25FC4D6F -:10493400DE05AC0612EF04AC06B1121008C6D7C7E8 -:10494400C3C12008FBF8FFF661490A61F861490810 -:10495400DF07F7340000EDE049E6BC04F6BC06AC22 -:104964000ABC02AC08BBAC06614902AC0461F86144 -:104974004900DE28AC04BDD8AC06BDDAE1FD110F58 -:10498400ADDABC06ADD8BC04ABBDD8AC02BDDAE12F -:10499400FD2C0FADDABC02ADD8BBEFCAAC06BC022D -:1049A400AC04BBAC08BDD8AC0ABDDAAC04BDDCAC0D -:1049B40006FD8F0EAC04BDDCAC06FD020FE1FD2C40 -:1049C4000FADDABC06ADD8BC04AC06614902AC0438 -:1049D40061F8614900DCC5AC0214AB12100CC6D7F7 -:1049E40061FC61FCC1C3C5C7520C929269D4FEC17B -:1049F400DFF88EFD708EFCC1717AFA401EF903DF78 -:104A04000630FC2BFD7D3CC09EFC609EFD34D4FE34 -:104A14005206C0B9A5A592DFF9C6C4C2C061FC6143 -:104A2400DF520C929269D4FEC1DFF88EFD708EFCC9 -:104A3400C1717AFAC736410571A4C6DC51F528FD67 -:104A44007148500571605005311422367162077146 -:104A540013228FE4FB5FECFBD1DF1B8FE5FB5FEDE3 -:104A6400FBD1DF128FE6FB5FEEFBD1DF098FE7FBA3 -:104A74005FEFFBD1DD0C31620702EFFA716307715E -:104A84006B27FD0948FD9833F518F9EDA74BC73698 -:104A940041057184C6DE0DF528FD71485005FD9869 -:104AA40033EDA74BC73641057194C6DE154028FD8A -:104AB40003DD0C4028FD04DD064028FD0161F8F506 -:104AC40028FDD928FDF1E7240000DD0823DD1323A8 -:104AD400DD39EF6071405005E528FD71505005ED5A -:104AE400A74B8F40059F19F99F1CF9D919F9FD604F -:104AF40037629F1BF94019F97FDD06CF28FD02EFCD -:104B040003F528FD71505005EDA74BC736410571DB -:104B140094C6DE1CC736410571C4C6DE06CF28FD27 -:104B240003EF11F528FD7148500571605005EF73CE -:104B3400CF28FD044028FD03DF138F1BF99F400598 -:104B4400D91BF9C1D919F9FDDF37C0EF108F400522 -:104B540076C7D919F9FD1D34C071505005D91CF917 -:104B6400F1242900DD2D240400DD28242200DD2386 -:104B7400241100DD0C240100DD19241E00DD14EFD6 -:104B84000C4019F960DF0CCF19F961EF06F518F93B -:104B9400A019F94028FD03DF0AD919F9FD6037622D -:104BA4009F1BF9C09EFC609EFD34D4FE5206C0B922 -:104BB400A5A592DFF961FCC1C3C5C7520C929269E5 -:104BC400D4FEC1DFF88EFD708EFCC1F616717AFA40 -:104BD400714AE5717BBD51405F0401D1DD05A7F643 -:104BE40047DFF3300400BF2401F6BF2A01300B0B6A -:104BF400BF2801FD0203300B0FBF2801FD02033063 -:104C04000F0FBF2801710AE6717320C09EFC609EDD -:104C1400FD34D4FE5206C0B9A5A592DFF9C6C4C2BC -:104C2400C061FCC1C3C5C7520C929269D4FEC1DFF6 -:104C3400F88EFD708EFCC1717AFAD540FBDD0EEB67 -:104C44003EFB899E44A23EFBB040FBEF2B710AE67B -:104C5400300400BF2401F6BF2A01300B0BBF28012A -:104C6400FD0203300B0FBF2801FD0203300F0FBFFD -:104C74002801716320717320C09EFC609EFD34D4B2 -:104C8400FE5206C0B9A5A592DFF9C6C4C2C061FC34 -:104C940061EF520C929269D4FEC1DFF88EFD708EE2 -:104CA400FCC12008FBF8FF71503002CEABACCC0144 -:104CB40000F6BC0231B2E20F617902F6614902DF0B -:104CC400F371603002EF7E8E519B713BE28B5C028C -:104CD400D1DD1D8B5C08D1DF0971503002CC01009D -:104CE400EFCF8C0770FDBC38629E50CC0102EFC13F -:104CF4008B5C03D1DF408E509C05715030028C01D7 -:104D0400D1DF0E8C0570FD1F39629C07CC0101EFC9 -:104D1400318C014C02DF0671603002EF28CF34027F -:104D24005A716030028C0570C18C0770FD6138C007 -:104D3400CF34024AEF0F8B5C01D1DD067160300283 -:104D4400EF03EDB54C1008C09EFC609EFD34D4FE0C -:104D54005206C0B9A5A592DFF961FCC1710A9E3162 -:104D6400929E02EFFA8F0EFC4F96FFDF358F0FFCF9 -:104D74004F97FFDF2D8F10FC4F98FFDF258FEDFB42 -:104D84005C04D1DF1D7120E5FB716307716B274063 -:104D94001EF905DD06401EF901DF07CF1FF902E504 -:104DA4001EF9710B9EC061FCA058FC61FCC1C3C517 -:104DB400C7520C929269D4FEC1DFF88EFD708EFC4E -:104DC400C1C1FBF8FF8D1F9C018E31318EE7240693 -:104DD40000DD0823DD0F23DD25EF45717AFA8C0110 -:104DE4009F44FCEF3B717AFA4021F901DF078C0103 -:104DF4009F43FCEF2B51FF2E019F43FCEF22717A5E -:104E0400FA8C019F02F98FE2FB5C01D1DF12401E94 -:104E1400F903DD06401EF904DF06304A26FD7D3C19 -:104E24004031FF09DE05A031FFEF197158F0007120 -:104E340022224057FC02DF03F6EF05D957FCF1A10B -:104E4400609F57FC710BE3C0C09EFC609EFD34D490 -:104E5400FE5206C0B9A5A592DFF9C6C4C2C061FC62 -:104E640061FF520C929269D4FEC1DFF88EFD708E00 -:104E7400FCC1717AFA8F14FC5C03D1DD19401EF970 -:104E840003DD06401EF904DF0D36100571D4DE067D -:104E940030B23DFD7D3CC09EFC609EFD34D4FE528C -:104EA40006C0B9A5A592DFF961FC61FC61FC61FC57 -:104EB40061FC61FC61FC61FC61FC61FC61FC61FC06 -:104EC40061FC61FC61FC61FC61FC61FC61FC61FCF6 -:104ED40061FC61FC61FC61FC61FC61FC61FC61FCE6 -:024EE40061FC6F -:0A4EE60000060C12181E242A3036B4 -:104EF0000016324864809612284460769208244056 -:104F0000FF000000555555554700DCFB0000000030 -:104F100046FC00000000EF3E6C39C422DE2E6F30EC -:104F2000EC302E3202406409630992410000000017 -:0C4F3000983AF82AFF2330129900000084 -:084F3C00317503F7332312D78E -:0A4FF60031303A31333A3431000013 +:10220A00E8E8676767670202020101010105214FD9 +:10221A007B9EC5E950320A050000192634445362F0 +:10222A006E777D80807D776E625344342619100A5A +:10223A0008080808080808080A107F7E7D7C7A7951 +:10224A0078777675747271706F6E6D6C6A6968678B +:10225A006665646261605F5E5D5C5A59585756559F +:10226A00535251504F4E4D4B4A49494847464543B0 +:10227A004241403F3E3D3B3A3938080100010C16C5 +:10228A00202A343E01020203030200FEFBF7F3F0A8 +:10229A00F0F3FA041225384D5F6E777A776E5F4D48 +:1022AA0038251204FAF3F0F0F3F7FBFE00020303F9 +:1022BA0002020100000000001F003B005A007800E3 +:0E22CA009700B500D400F300110130014E0161 +:1022D800C7D51EF9DD108F2DFDB02DFDD161E8EDBC +:1022E8008523CF2DFD33FD87234002F94BDC1640B3 +:1022F80002F9B9DE10400CF928DE05A00CF9EF2729 +:10230800713320EF224002F93EDC064002F9BDDCC1 +:1023180010400DF928DE05A00DF9EF0B713220EF02 +:1023280006F50CF9F50DF93132200D31042009318B +:10233800020705713304EF03713204711405E66175 +:102348003060D1DF0CF50EF97148E3FB714302EF01 +:1023580012400EF902DE05A00EF9EF077140E3FB0B +:10236800714202D50BF9DD06B00BF9714202401E2D +:10237800F901DD09401EF90561E8FDE526C6D7C764 +:10238800710407E6613060768F0FF9614EDD2966CA +:102398009F0FF9D1DD137130E3FB5002C15011FDDD +:1023A800DD37C0CF0BF91EEF0F7138E3FBE0C150EA +:1023B80011FDDD37C0F50BF9C6D7C78F2CFD76FDAB +:1023C8000324D521F9DD05710320EF2D664F2CFD7F +:1023D80061F83144201A714320FD1D05664C07DD64 +:1023E8000381DF098F20F9310303FD7D24FDA22439 +:1023F800710220302726FD523CC6D7C77162017191 +:102408007201E0FD95025008FDCF3A629F02F95033 +:1024180009FDCF3A6276716301713820F94002F9FB +:10242800F1DC05E521F9EF244002F904DE1BCF2198 +:10243800F9025008C1506CFD2603C092DF0ED54149 +:10244800FBDF09713020F9EF03F521F95700674CDC +:1024580007DE1173091722614EDC06679F2CFDEF1A +:102468000387EFEA402CFD07DF09D521F961F8CF92 +:1024780021F903C6D7C7C1FBF8FF500AFD95023002 +:102488004000BB17C15002C15006C1506CFDF80393 +:1024980010065096FD9502C0C6D7C72008FBF8FF66 +:1024A8008F2CFD5006D604CA2114F7500689A5487A +:1024B80004F9A390DFF7D521F961E8ED2326304A26 +:1024C80057BB17C15002C1503EC1506CFDF80310F4 +:1024D80006D2DD077100E2FBED23267108E2FB1747 +:1024E800040300C15004C1500CC1506CFD500310CE +:1024F80006D92CFDF10104F42114A9318D12A9315A +:102508008E616B08616A08BB17C15002C1500EC1C9 +:10251800506CFDF8031006F690BB17C15002C1506D +:102528000CC1506CFDF803100631042102EFFA715A +:1025380072208F2CFDF0312E040A20C15010C1509A +:1025480040C1506CFDF803100631042102EFFA7106 +:1025580072208F2CFDF0312E041A20C15010C1506A +:1025680050C1506CFDF803100631042102EFFA71D6 +:1025780072208F2CFDF0312E042A20C15010C1503A +:1025880060C1506CFDF803100631042102EFFA71A6 +:1025980072208F2CFDF0312E043A20C15010C1500A +:1025A80070C1506CFDF803100650A5FD9502D92C9A +:1025B800FDF10104F42114A9318D12A9318E616B4A +:1025C80008616A08BB17C15002C1500EC1506CFDAA +:1025D800F803100650A5FD95025004C1506CFD2665 +:1025E80003C0629C07E92CFD0909224E0761C30854 +:1025F800E92CFD0902224E0717040300C15004C14B +:10260800500CC1506CFDF8031006F6BB17C1500200 +:10261800C1503EC1506CFDF80310061008C6D7C75C +:10262800C1FBF8FF8F10F94F02F961F8EDE1264080 +:1026380012F928DE06A012F9EDE126F512F98F024B +:10264800F99F10F98F02F95070D612307351230494 +:1026580080001231FF318E039F11F99FDEFBF6BB1C +:102668008F11F97C804C95DC1B8F11F9318F241464 +:1026780000BDD8AF06F9FD7A0D1231FF318E033156 +:102688008FBBEF198F11F9318F241400BDD8AF0813 +:10269800F9FD7A0D1231FF318E03318FBBD904F960 +:1026A800F1610900BB44000171FEDC03F690BB8CAC +:1026B8000101DE02F6BBABABBF86FC17C15002C1FD +:1026C800500CC1506CFDF8031006D2DF088F02F9D8 +:1026D8009F10F9EF047100E2FBF2C0C6D7C72008CB +:1026E800FBF8FF4021F901DF0BCFDFFB63CFE1FBF4 +:1026F800C8ED58284021F902DF2C17040600C15004 +:1027080002C15004C1506CFD50031006D2DD06CF43 +:10271800DFFB63EF0A8C069FDFFB8C079FE0FBCF94 +:10272800E1FBC8ED582817040600C15002C1500447 +:10273800C1506CFD50031006D2DD117100E2FB712F +:102748000320F5DFFB712020F9ED2D288C06318E52 +:10275800318D080E07081C00BBD92CFDF10410228E +:10276800148972ABFDCD0EBB8C019C068B9C0717A0 +:10277800040400C15002C1C1506CFD50031006D2C0 +:1027880061E8ED2D288C049FE1FB8C04318E318D9E +:10279800080E05081C00BBBDD8F6BDDAC9DC01A5CA +:1027A800FD560FDC09CC0364F6BF14F9EF77ABBD17 +:1027B800D8F6BDDAAF14F9BDDCF6BDDEADD8C1ADD3 +:1027C800DAC1C9D800A0F6BDDAADDEFD010FADD87B +:1027D800BDDCADDABDDEC0BDDAC0BDD8ADDEFD56AC +:1027E8000F61D309CC031EF6BF14F9EF38ABBDD87F +:1027F800F6BDDAC9DC819DFD560FDC0BCC030A302F +:10280800F401BF14F9EF1EABBDD8F6BDDAC9DC017F +:102818009BFD560FDC0BCC030530F401BF14F9EF18 +:1028280004712020F93132040D31140509CFDFFB82 +:1028380064F5E0FBEF1A8C064E03DE0C8C069FDF76 +:10284800FB8C079FE0FBEF088C039FDFFBF5E0FBA9 +:10285800D51EF961F8CF16F9648F16F94FDFFB61C1 +:10286800F831242034CC040F712320CC05008C05CA +:102878004C05DE168C0573091E224FDFFBDC068C27 +:1028880004311A9C04615905EFE4313204068C04C2 +:102898006C039C048C049F36FC40DFFB0BDE064077 +:1028A80016F90BDE1640DFFB06DE064016F906DEDB +:1028B8000AD5DFFBDF0ED516F9DD095020C150110E +:1028C800FDDD37C08FDFFB9F16F9D51EF9DF0571D7 +:1028D8005320EF3340DFFB0BDE03E6EF01F66061C8 +:1028E800FB71612071142071672061C83152201773 +:1028F800715220716420711120F171642061DC70C3 +:10290800C15012FDAC05C01008C6D7C75007C1504A +:1029180002C15084FDC20310045012FD9502500FED +:10292800C15002C15084FDC20310045003FD95023A +:10293800501FC15002C15084FDC20310045016FD3F +:1029480095025003C15084FD2603C0625C01D1DDAD +:10295800107170E3FB5002C15013FDDD37C0F2EF78 +:1029680001E2C6D7C75004C15084FD2603C0625C8B +:1029780003D1DD405014FD052A34E3FB895C9F999F +:102988008A0C7CFF50FF5C14D1DD228A0C7CFF5C32 +:10299800147234E7FB89616A9971620756003162E3 +:1029A80007058666D1DFF7716307716B2734F6FB7D +:1029B800895CEB995002C15084FD2603C0D2DD33F7 +:1029C8005017C15002C15084FDC2031004E0FD95A8 +:1029D800025007C15002C15084FDC2031004503395 +:1029E800FD9502F0C15002C15084FDC2031004716C +:1029F80078E3FBE0C15013FDDD37C0C6D7C7C1205F +:102A080004FBF8FFCC02005004C15084FD2603C02B +:102A1800629C038C045C20D1DD0E8C036C019C034A +:102A28008C026C209C02EF138C045C10D1DD0C8CA2 +:102A3800035CFE9C038C026C109C028C045C08D125 +:102A4800DD0E8C036C029C038C026C089C02EF1355 +:102A58008C045C04D1DD0C8C035CFD9C038C026C43 +:102A6800049C028C03D1DD05501AFD95028C03707D +:102A7800C15004C15084FDC20310048FE3FB5C9F66 +:102A8800728C03318E316D148C03318E314D616D32 +:102A980008616C5C606162629FE3FB8FEFFB7CFF07 +:102AA80050FF5E02D1DD278FEFFB7CFF5E027234A0 +:102AB800E7FB89616A99716207CC010031620708F6 +:102AC8006159018C01D1DFF4716307716B27F21032 +:102AD80006C6D7D9D7FBC15006C15084FDC2031022 +:102AE80004D9D8FBC15007C15084FDC2031004D7D4 +:102AF800FDDB2AF2D7711300711B207103037102E9 +:102B080005E0C15003C15084FDC20310045013FDF9 +:102B18009502F0C15005C15084FDC2031004500F46 +:102B2800C1E0C15084FDC2031004500AFD95027132 +:102B380003055008FD9502501FC1E0C15084FDC235 +:102B48000310045012FD95025003C15084FD260362 +:102B5800C0625C01D1DF02E2D75003C1C15084FDDD +:102B6800C2031004710203711A20FDC52CF50AF97D +:102B7800F2D75003C15084FD2603C0625C01D1DD49 +:102B8800195014FD052AFD6C295014FD9502E0C169 +:102B98005003C15084FDC2031004711300711B203F +:102BA8007103035014FD9502F0C1E0C15084FDC2C9 +:102BB800031004F0C15003C15084FDC2031004D7B0 +:102BC800C72004FBF8FFCC02008F0AF99C035010C1 +:102BD800C150A4FD2603C0629F0AF9D541FBDD045C +:102BE800F2EDA22C8C037F0AF95C08D1DD108F0A64 +:102BF800F95C08D1DF05CC0210EF03CC02208C036E +:102C08007F0AF95C04D1DD168F0AF95C04D1DF086C +:102C18008C026C049C02EF068C026C089C028FE20A +:102C2800FB5CF3728F0AF95C0C6162629FE2FB8FB6 +:102C3800EEFB7CFF50FF5E029C02D1DD1F34E6FBF9 +:102C4800896E0299716207CC0100316207086159E7 +:102C5800018C01D1DFF4716307716B278F0AF95C6E +:102C680040D1DD095002C15012FDDD37C08F0AF98D +:102C78005C01D1DD08E0C15012FDDD37C0717AFA80 +:102C88008F0AF95C41D1DD11340AF9895CBE99D902 +:102C98000AF9C15010FDAC05C0F21004C6D7FD13E7 +:102CA80029F2D7FD6C29F2D7C78FF6FB7617FD05F9 +:102CB8002A664FF6FBDFF2F5F6FBF2C6D75064FD45 +:102CC800950240DFFB0BDE03E6EF01F66061FB7166 +:102CD8001120F171142061DC70C15012FDAC05C0E7 +:102CE800FDB439CF45FC03D7710001057178500553 +:102CF800713AD5713BD1713ADD713BD98F10055CC2 +:102D0800FC9F1005CF54054AE54205711042057134 +:102D1800004205714850057130500571205005CFAB +:102D2800530505CF52050A713051057120510571BF +:102D38003BD5717050058F11055CFC9F1105D7714B +:102D480078500571080105D77140F000717830029C +:102D5800713AE6713BE2713BEA713BEE8F10055C1C +:102D6800FC9F1005CF34024AE552FF711A52710ACE +:102D780052714830027130300271203002CF330274 +:102D880005CF32020A71303102713BE671703002B0 +:102D98008F11055CFC9F110571603002D771783086 +:102DA800027148F000D7C788061666614FDD0967CB +:102DB800614EDE0396EF01866672C6D7C7161714F2 +:102DC800AA0412A943DD29AA0412A923FD444FC36A +:102DD800AC02FD444F13C2BDD813FD4A0FDE0C17D9 +:102DE80014AA0212AA0403BA04EF051714A9BA0414 +:102DF800AC041231FF319E03317F087208C6D7C771 +:102E080071201205712011057100F200304400BFD5 +:102E1800B601300188BF9001300984BF9E01BF9C74 +:102E280001BF9A01BF9801BF9601BF9401BF9201EB +:102E3800F53CFF30FE00BFBE01F6BFBC01BFB801C4 +:102E480050EEBFBA01A1BFB201C918FE007110202F +:102E5800F94021F901DF06711820F9EF0B3610054A +:102E680071A461D8711820F971281005712811050D +:102E7800F6BE6EBE64BE6A7123047153078F20F9D3 +:102E8800310507F5FDFBCB6CFF00713321C6D73048 +:102E9800EF00BFB401F6BFBA017108F20071230454 +:102EA800715307715301D7714321D9FDFBF1E72411 +:102EB8000000DD1223DD1923DD1123DD2623DD3497 +:102EC80023DD3923DD3FFD4A2FEF3DFD6D2FEF3820 +:102ED800D9FCFBC1AE6CFDAE2DC0F313BE6C7123E3 +:102EE80021EF25F0C1AE6CFDAE2DC0F313BE6C71A1 +:102EF8002321EF14F6BE6C712221EF0CCB6CFF007E +:102F0800712321EF03FDEA2F8F20F9311508712471 +:102F180021712104EF0671242171510131442121CD +:102F28008F20F9311510F6BE64BE6A312421039052 +:102F3800EF01F6BE6ED731242104F690EF01F6BEFC +:102F48006AD7CF34FD47F5A8FBAE6C317DBFAEFB29 +:102F5800FDBF2FD2DF0ED9FCFBC1AE6CFDAE2DC07C +:102F6800F313BE6CD7FDBF2FD2DD0FCF34FD47F56D +:102F7800A8FBAE6C317DBFAEFBD7E9A8FB092422C4 +:102F88005080D6BFAAFB22AEFBBDD8304700FDB6A5 +:102F98000DBFACFB30AAFBFDC42DF313BE6CB034DF +:102FA800FDD534FDDF10CF34FD47A0A8FB40A8FBBA +:102FB8001F61C8F5A8FBD740DFFB0BDC0571232197 +:102FC800F2D740DFFB0661D831120511F0C1AE6CB3 +:102FD800FDAE2DC0F313BE6C712221EF03FDEA2F65 +:102FE800E2D7714221F0C1AE6CFDAE2DC0F313BE25 +:102FF8006CA0B0FB40B0FB40DC3DF5B0FBD9B1FBA9 +:10300800F1313F0430FD14D9B1FBF1BDD85008FDB2 +:10301800050E087208E6D2DD040192DFFC896158CA +:10302800D1DD05712221EF03712321A0B1FB40B14D +:10303800FB2061C8F5B1FBD78FB2FBB0B2FBD1DF83 +:103048007331D4D106715BD1E5B4FBD5B4FBDD3463 +:103058007140E2FBD9B3FBF1E734020023DD06251A +:10306800DD0325DF05F6BE66EF06D9FCFBF1BE667B +:10307800A0B3FB40B3FB20DF06F5B3FBB0B4FBCF36 +:10308800B2FB19D7CFB2FB1E7148E2FBD5FEFBDFBE +:1030980004F6BE66D7D9FCFBF14266FFDD16D9FC03 +:1030A800FBF112AE6643DE05A266FFEF03B266FFD0 +:1030B800CFB2FB03D731442101D7401EF902DF10FC +:1030C800F6BE64BE6EBE6ABFBCFBBFC2FBBFC8FB18 +:1030D80031342139F6BFB8FBBFBEFBBFC4FB22BCED +:1030E800FB1231FF31AE03316FBFBAFBF622C2FBD0 +:1030F8001231FF31AE03316FBFC0FBF622C8FB129D +:1031080031FF31AE03316FBFC6FBEDCF31316421E2 +:1031180010716321710802FCF5B6FBF5B5FBEDCF24 +:1031280031D5B5FB61E8EDCC318F44FB9FB5FB4051 +:10313800B6FB1FDC1A710002FC4046FBFFDD22A033 +:10314800B7FB8F46FB4FB7FBDE17F5B6FBEF12D97F +:10315800B6FBF1A1605C1F9FB6FB710802FCF5B7D6 +:10316800FBE9B6FB0948FB5080D6BFB8FBE9B6FBC4 +:103178000968FB5080D6BFBEFBE9B6FB0988FB5047 +:1031880080D6BFC4FBAFB8FB22BCFB12D945FBF10C +:1031980033BDD813FDB60DBFBAFBAFBEFB22C2FBD1 +:1031A80012D945FBF133BDD813FDB60DBFC0FBAF37 +:1031B800C4FB22C8FB12D945FBF133BDD813FDB6B9 +:1031C8000DBFC6FBB0B5FB8F20F931151F30C4FB0E +:1031D800FDC42DF313BE6430B8FBFDC42DF313BE3C +:1031E8006E30BEFBFDC42DF313BE6AD730C4FBFDA1 +:1031F800C42DF313BE6AD7C73152210BD5CAFBDDE4 +:1032080006B0CAFBEDC632715321D9FFFBF1E724A2 +:103218000000DD0F23DD1B23DD1123DD5723DD290E +:1032280023DD3B5600F535FDEDB2325601F535FD8F +:10323800EF78D535FDDF075601E535FDEF0556007A +:10324800F535FDCFCAFBFAEF61D535FDDF0B560129 +:10325800E535FDCFCAFBFAEF51F5FFFBEF4CD5354D +:10326800FDDF0B5600E535FDCFCAFBFAEF3CCFFF7B +:10327800FB02EF36D937FCF1E7240000DD0923DD36 +:103288002423DD0A23EF1E5600F535FDEF1CD53546 +:10329800FDDF075601E535FDEF055600F535FDCF95 +:1032A800CAFBFAEF055601E535FD8F20F9311508FF +:1032B8006661FB715107EF066661FB710101C6D7B4 +:1032C800C736F00071F4DC297170F000CE9D08CE8D +:1032D8009EC0CE9F80F594FFF593FFF592FFE5978A +:1032E800FFE596FFCE9506F598FFCE9C7F7100D638 +:1032F800FB711BE3712BE3711AE7712BE7717A9D60 +:10330800710A9E31929E02EFFA710B9E71732171C0 +:103318000322711322C6D7C73172211E717221711F +:103328000A9E31929E02EFFA3404FC3692FF52074D +:103338008B99A5A792DFF9710B9EC6D7C788061689 +:1033480031022215710222C734CCFB3092FF16528B +:10335800078B99A5A792DFF9C666736718CCFBC6D9 +:10336800D7C77173213104221E710322710A9E315D +:10337800929E02EFFA3492FF36CCFB52078B99A546 +:10338800A792DFF9710B9E31142213711322717BFE +:103398009E8F0CFC9E9A8F0DFC9E9B717A9EC6D7C1 +:1033A800CFD7FB5CCFD8FB5FCFF8FB32D7C7CFD4E2 +:1033B800FB11CFD5FB09CFFCFBFFF5FDFBF5FEFBB1 +:1033C800F5FFFBF500FCCFF9FB20F5FAFBCF2CFC51 +:1033D80036CF2DFCC95600664C64DE08723844FBB3 +:1033E8000086EFF3C6D7C788061617F1E73403003F +:1033F8002361E3ED21372361F8EDD234B12361E392 +:10340800EDD9342561F8EDE834240700240700617C +:10341800D8ED2137240B0061F8ED09352361F8ED6B +:1034280050352361F8ED1D352361F8EDF936256136 +:10343800F8ED0D372561F8EDB935B12561D8EDDD29 +:103448003524000061F8EDEA352361F8ED213724D1 +:1034580002002361E3ED0F362361F8ED2136236185 +:10346800F8ED33362361F8ED21362361F8ED453662 +:103478002361F8ED57362361F8ED67362361F8EDDF +:1034880089362361F8ED95362361F8EDA13623617D +:10349800F8EDAA362402002361E3ED213724020067 +:1034A80061F8EDB2362361F8EDBE362561F8EDCA54 +:1034B80036240A0061F8EDD63624120061F8EDF3DF +:1034C800362361F8EDE136ED2337679FD6FBED2D06 +:1034D8003730F82AFD523C66736718D4FBED2D3758 +:1034E80040D9FB6ADF1440DAFB68DF0E674C6CDFFB +:1034F8000930EA44FD523C713AD5679FDBFBED2D5C +:103508003767D1DD06306F40FD523C34F4FB8961EA +:103518006F99ED2D37675C02D1DD0830A62CFD527E +:103528003CEF0C675C01D1DD0630AB2CFD523C67EB +:103538005C3CD1DD1030B02CFD523C675C3C7266BF +:10354800736218D4FBED2D3767D1DD625C01D1DDE4 +:1035580005300800EF01F6609F33FC675C02D1DD9F +:1035680003E6EF01F63433FC89616899675C04D19E +:10357800DD04E6A1EF01F63433FC89616899675CE4 +:1035880008D1DD05302000EF01F63433FC8961688D +:1035980099675C10D1DD05301000EF01F63433FC7B +:1035A80089616899675C20D161E8716033FCED2D11 +:1035B80037D518F9DF09679FFDFBA018F9EF13400D +:1035C80018F905DE0DD918F9F1B112674830FDA0D8 +:1035D80018F9ED2D37675C0F7266736218D4FBED2E +:1035E8002D374018F964DE1F4018F901DF0667D14E +:1035F80061F85701E918F9671844FBA018F9401851 +:10360800F90561C8716221675C7F318EC117F124A9 +:103618003000FD4433C0ED2D37675C3F318EC11754 +:10362800F1243000FD4433C0ED2D37675C07318E3F +:10363800C117F1243000FD4433C0ED2D37675C1FFE +:10364800318EC117F1243000FD4433C0ED2D3767AA +:10365800318EC117F1243000FD4433C0ED2D37CE33 +:10366800ABAC710A9E31929E02EFFAD592FFDF054C +:10367800710B9EEFED679E99710B9E9F0BFCED2DD4 +:1036880037711222675C7F9F0CFCED2D3771122277 +:10369800675C3F9F0DFCED2D37675C3F9F0EFCED8F +:1036A8002D37675C1F9F0FFCEF7B30503EFD523C6F +:1036B800679F14FCEF6F300B3EFD523C679F15FC73 +:1036C800EF63302D3EFD523C679F18FCEF57675C57 +:1036D80001D1DD51FDF247EF4C402EFCC8DE46E932 +:1036E8002EFC671872FAA02EFCEF3A679F2EFCEFAB +:1036F8003467318E247200DF06305809FD523C676A +:103708009FF7FBEF208FFAFB617F5C10D161E8CF58 +:1037180045FC03679FFAFBEF0CEF0A664C5ADE057F +:10372800736718D4FBC6D7C716664C30DC094C370C +:10373800DE05FD1F33EF67664C02DF1F8FD6FB5C8B +:1037480003728F35FC5C03318E316D08616A081293 +:103758008F35FC5C80312A6162EF49664C3DDF0A97 +:10376800AE90BF30FCF930FCEF3A664C3EDF05F90D +:1037780031FCEF30664C4FDF05FD1648EF26664CEE +:1037880061DF09E92EFC0972FA72EF18664C7FDFD7 +:103798000D30E940FD523C713AD5524AEF06667346 +:1037A80009D4FB72C6D7C788061617F1241000245F +:1037B8000500DC07244C00DD17EF18717BFA17F1C0 +:1037C80004D4FB1489617F99717AFA712222EF037C +:1037D800A02EFCC6D7C7C1C1FBF8FF401EF903DD08 +:1037E80006401EF904DF2F8C027309DCFB5E0AD148 +:1037F800DF248C02318E04D4FB14896E0A9971621D +:1038080007CC0100316207086159018C01D1DFF44E +:10381800716307716B271004C6D7CF35FC03F533E6 +:10382800FCF537FCF539FCD7C788061617F1E734DD +:10383800020025DD3E23DD1825DD1D23DD0523DD02 +:103848002CEF3C715222679F38FCCF45FC03EF2FC9 +:10385800675C839F35FCEF27675C039F37FC675CD9 +:10386800034C0261F8715221FDFF31EF12679F3955 +:10387800FCEF0C6791DF08E0C15012FDDD37C0C6D0 +:10388800D7C71617F1E7240000DD4D23DD232403F5 +:1038980000DD0C240200DD2224F900DD42EF433173 +:1038A800020705308000EF01F6086F36FC7208EF5A +:1038B800378F33FCF533FC72EF2E8FDDFB9F82FCD4 +:1038C80040DDFB01DD0FD9DDFBF11231FE03311FB5 +:1038D800087208EF13E2EF107132235235EF09F244 +:1038E800EF0666730932FC72C6D7C71617F1E724CC +:1038F8000000DD38241000DD1C23DD1C23DD30240E +:103908000E00DD18241100DD1B240F00DD12243009 +:1039180000DD15EF1EE2EF1D5202EF195204EF15FC +:103928005206EF115205EF0D5207EF09F2EF06525A +:1039380003EF0252FFC6D7C7313422417133228FB9 +:1039480044FC9FDCFB8F43FC9FFBFB363CFDC7D947 +:1039580043FCFD003B618A70618AFD453BC0D94745 +:10396800FCF1312F609F46FC8F42FC4F46FCDD0D79 +:103978007142228F46FC9F42FCCF45FC034045FC28 +:1039880005DE0A30C139FD523CCF45FC6BB045FC21 +:103998007150F000CE300BCF170006CE3106FD0275 +:1039A80003717A30710BE3710BE7C6D78F46FC9F22 +:1039B80042FC8F46FC9FDDFBD7401EF903DF064023 +:1039C8001EF904DF02F2D78FFAFB5C10D1DD0C8FF1 +:1039D80046FC9F4BFC7148FAFBEF6131442224718D +:1039E80043227163228FFAFB5C04D1DD088FF9FB57 +:1039F8009F4CFCEF068F46FC9F4CFC8F4CFC9F4B6A +:103A0800FCEF3931542223715322716222D538FCDC +:103A1800DF05F54DFCEF0B8F38FC5002D6A1609FF7 +:103A28004DFC8F4DFC9F4BFCEF12316422088F4DEB +:103A3800FC9F4BFCEF068F4CFC9F4BFC8F4BFC9F75 +:103A4800DDFB404BFC01DF05E538FCEF0ED94BFCF4 +:103A5800F11231FE03311F609F38FC8FFAFB5C01C5 +:103A6800D1DD02F2D7E94BFC09442270C15013FDA5 +:103A7800AC05C0F2D7C7168B728C01614ADE248B65 +:103A8800728C02614ADE188C01728C02614ADE0671 +:103A98008C01318EEF048C02318E087208EF268B70 +:103AA80072EF228B728C02614ADE048B72EF168CE5 +:103AB80001728C026142DE068C01318EEF048C02A9 +:103AC800318E087208C6D7C716710AE7710BE37101 +:103AD80050F000CE300BCF170006669E31FD020372 +:103AE800717A30710BE33182E302EFFA8D1F71585E +:103AF800F000710BE772C6D7C7C1C1FBF8FF8F2C66 +:103B0800FC4E02DC03F2EF318C024F2DFCDC045238 +:103B1800FFEF268C022F2CFC706131318D128F2D16 +:103B2800FC2F2CFC70613133BDD813FDD80DBB447C +:103B38000001DC03F690BB8B721004C6D7C7C1C165 +:103B4800FBF8FFAC0A14A91489708C026128706113 +:103B580031FD444F1344030071FEDC24AC0A148A7F +:103B680004819A04AC0A148A044C11DC11A9148C3F +:103B78000299AC0A14CA0200AC0A14CA0310EF7402 +:103B8800AC0A14CA0400AC0A14A914894E02DE0A4D +:103B9800AC0A148A02819A02EF13AC0A14A9148998 +:103BA8004E0261D308AC0A148A02919A02AC0A1434 +:103BB8008A03919A03D1DF3CAC0A148A024C10DFC5 +:103BC80010A91489318EA112AC0A14A9146299EFB4 +:103BD80017AC0A148A024CF0DF0EA91489318EB191 +:103BE80012AC0A14A9146299AC0A14CA0200AC0AED +:103BF80014CA03101004C6D7ED3D3C717BFAC7D533 +:103C08005AFC61F831742227717322D55AFC61E895 +:103C1800B05AFC717AFA5600664C0ADD1272F3311A +:103C28001C7942FDCEFC0061CAFD9C3C86EFE9711F +:103C38007AFAF2C6D7C75600664C0EDE0BF0317E14 +:103C480012F6785CFC86EFF0C6D7C7C1C1FBF8FF57 +:103C5800CC01008C014C0EDE36717BFA8C01F03100 +:103C68007E045CFC14A96168DF09AC02B9717AFAB8 +:103C7800F2EF1D8C01F0317E12795CFC614902DFA4 +:103C880006717AFAE2EF09717AFA615901EFC4E232 +:103C98001004C6D7C72004FBF8FFF6425CFC61F8A5 +:103CA800ED813D717BFA9C038C034C0EDE3C8C034A +:103CB800F0317E045CFC14A96168DF05717AFAEFC3 +:103CC80029717AFA8C0372F3311C795CFCCEFC0002 +:103CD80061CA629C02D1DF0A8C03F0317E12E67859 +:103CE8005CFC717BFA615903EFBECC0200CC010188 +:103CF8008C02F0317E045CFC14A96168DD7B8C02C7 +:103D0800F0317E12795CFCE743DF688C014C0EDEF3 +:103D1800628C01F0317E12795CFCE743DD50717BE7 +:103D2800FA8C01F0317E045CFC14A96168DF1B6128 +:103D38006901717BFA8C01F0317E12F6785CFC71B6 +:103D48007AFA8C024E01DCE7EF2F8C01F0317E0409 +:103D58005CFC14A9128C02F0317E33785CFC8C0177 +:103D6800F0317E12E6785CFC615902717AFA615989 +:103D780001EF98615902EDF83C00F21004C6D7C76C +:103D88002006FBF8FF3419FCC55006C150A8C150E5 +:103D980030FD50031006D2DD1DA078FC4078FC08E9 +:103DA800DE03E2EF5A3414FC895CFC99FD503E7145 +:103DB80010E2FBF2EF49F578FC8F14FC5C01D1DDD1 +:103DC80026401EF903DF205010C180FDDD37C0C733 +:103DD80036100571D4C6DE0F17C15006C150A8C1F0 +:103DE8005030FD50031006401EF901DD11401EF948 +:103DF80005DD0B8F14FC5C02D161E8FDEF44F21085 +:103E080006C6D7D915FCC15030FD2603C0629F18DD +:103E1800FC7130E5FB8FEDFB5C08D1DF06716307B1 +:103E2800716B27F2D7D918FCC1D917FCC15030FDE6 +:103E3800C20310047130E5FB8FEDFB5C08D1DF068F +:103E4800716307716B27F2D7C7200AFBF8FF500F81 +:103E5800C15030FD2603C04041FB02DF077110E26C +:103E6800FBF2EF547118E2FBCC0700CC0812CC0926 +:103E7800808F14FC5C03D1DF08717AD5CC0607EF7C +:103E880006717BD5CC062F17040600C15004C1501B +:103E9800A0C15030FDF8031006C736100571D4C60E +:103EA800DE15401EF903DF0F17C15006C150A8C127 +:103EB8005030FD50031006F2100AC6D7C7401EF94D +:103EC80002DF04F6BF7CFC8F56FDB056FDD161E8D9 +:103ED800EDD53FCF56FD048F1EF9318FE723DD0B5B +:103EE80024020024030061C8EDD53F302700427C3E +:103EF800FCDF0AE0C15010FDDD37C0EF2530C000FF +:103F0800427CFCDF0B5002C15010FDDD37C0EF12C0 +:103F18008FF8FB5009D6048000427CFC61D87120E0 +:103F280020F931340709711323F6BF7CFCEF1731F0 +:103F3800142306F6BF7CFCEF0DA27CFCF6427CFC49 +:103F4800DF0490BF7CFC8F21F9318FE7240000DD6E +:103F58000623DD0D23DF1236100571C4712123EF0E +:103F68000B710402712123EF037122233122231ADA +:103F7800407EFC0361D8A07EFC407EFC02DF0E5030 +:103F880004C15010FDDD37C0EF03F57EFC3124235A +:103F98001A4080FC0361D8A080FC4080FC02DF0E40 +:103FA8005008C15010FDDD37C0EF03F580FC3142E9 +:103FB8000718407FFC0361D8A07FFC407FFC02DF2C +:103FC8000C5010C1FDDD37C0EF03F57FFCC6D7C725 +:103FD800C736100571D4C6DE0730873DFD523CD286 +:103FE800401EF903DF4F3122070630C82BFD523C33 +:103FF8003134230C7133235080C15012FDDD37C09A +:104008008F82FC4F83FCDD2D8F82FC9F83FC560042 +:10401800664C08DE10730986224F82FCDC04667742 +:10402800EF0386EFEB8F84FC614FDD095040C150F0 +:1040380012FDDD37C0401EF903DD05F6BD1AEF2578 +:10404800D500FCDF09F6461ADD1BB61AEF17D9FCB6 +:10405800FBF1461ADD0FD9FCFB12AD1A43DE04A6AC +:104068001AEF02B61AC6D7C78FF4FB76F5F4FB5CD5 +:1040780010D161E8714223665C0FD1DD61665C0195 +:10408800D1DD05F51EF9EF56665C02D1DD15E0C1FC +:104098005003C15084FDC2031004711300711B202A +:1040A800710303665C08D1DD05710303EF17665CD5 +:1040B80004D1DD11711300711B20D535FC61F87135 +:1040C8000303F535FC5005FD95027102035003C149 +:1040D800C15084FDC2031004711A20FDC52CF2C61C +:1040E800D7C7364105718461D8ED8D4136410571D8 +:1040F80094DE0771405005CEABAC31B2D104E2ED8D +:104108009C41713BD1CEABAC4018F909DE77D5188C +:10411800F9DF618F20F93133088F21F99F4005EFCE +:1041280004CF400504F0C15084FD2603C0629F8877 +:10413800FC8F2CFD9F89FC368AFCC75002C15008B1 +:10414800C1506CFD500310068F86FC9F8CFC8F02BB +:10415800F99F8DFC713420E661301271042061DC16 +:1041680031196162629F8EFC8F20F93169317A9F23 +:104178008FFCEF0BD918F9F1124987FC9F4005A075 +:1041880018F9E2EF0F7160500571485005713BD581 +:10419800F518F9F2C6D7C78F1EF9318FE72400004A +:1041A80061F8ED554323DD1B2361F8ED7642236169 +:1041B800F8EDF4422361F8ED30432361F8EDEF4365 +:1041C800ED5543D51FF9DF2BF6427CFCDD05F5588C +:1041D800FDEF03A058FD4058FD65DC09F51EF97197 +:1041E8007222ED5E44AF7CFC440A0061D8ED5E4467 +:1041F800E51FF9711223F558FDF5F7FBFD1D057153 +:104208004320FDC2234021F903DF09717222F51E04 +:10421800F9ED5E44FDE52640E1FB9BDE0971722263 +:10422800F51EF9ED5E44714A277140110571301190 +:1042380005713A22715A22711A2EFDFD2AD2DD0922 +:10424800717222F51EF9ED5E4471103500CF37000A +:104258001D71401205401FF901DF05F5FDFBEF0454 +:10426800CFFDFB03CF1EF902FDDB2AED5E44FDF016 +:104278002CFD502D714A9DFD2238FDB533F537FFD1 +:10428800712BE0F51FF9717222CBE43FEFCBE6F614 +:10429800F0FD1D05713BD48F20F93105305004C164 +:1042A8005084FD2603C0625C03318E315D34E3FB2C +:1042B800896168995002C15084FD2603C0D2DD0689 +:1042C8007170E3FBEF047178E3FBFDC223FD072E59 +:1042D800710820F9CF1EF9038FD6FB5C02D1DD09E6 +:1042E8005080C15010FDDD37C0ED5E44FD604431A3 +:1042F800A4E020712BE031020C05FDDA44EF1450E4 +:1043080027C15005C15084FDC2031004CF1EF90413 +:104318007172223144230BA092FCD592FC61F8FD06 +:10432800DA44FDCD44ED5E44FD604431020C18F0E2 +:10433800C15005C15084FDC20310045005FD95020B +:10434800FDDA44CF1EF903FDCD44ED5E44CFFDFBFD +:1043580003F5FEFBF500FC713221F6426CFF61E8C3 +:10436800ED5E44712820F9F514FCFD503EFD972EB2 +:10437800FD472DFDA52D714B9DF5E4FBF5E5FBF5FE +:10438800E6FBF5E7FB31042102EFFACE3708CBE470 +:10439800BFFFCBE6FFF1CED4FFCF3700097148123B +:1043A80005F6BEE0BEE2BED0716A27FD7A2B7143E6 +:1043B80007714B27714810057148110571381005B0 +:1043C80071381105713302713B22715302715B22FE +:1043D80071130E711B2EFD8605F558FDCF1EF905CC +:1043E800711223F6BF7CFC3102071BFDC223AF7C90 +:1043F800FC440A00DC06E51FF9E51EF9D521F9DDC4 +:1044080055FD8605EF50D50BF9DF4B71340471511A +:1044180023F51FF9FD8605FD8723717301713204A9 +:1044280031120502EFFA7143027103207142203103 +:10443800949E02EFFA712AE7CEA409F5F3007133CE +:104448000461FD31040703711323E5F300CEA408CA +:10445800712BE7E51EF9C6D7D593FCDF1E310200A4 +:10446800195003C15084FD2603C0625C01D1DF07E7 +:10447800F51EF9717222D7E593FCD74093FCF0DF63 +:10448800083104003FF593FCD74093FCC8DF0BF5D7 +:104498001EF9717222CF93FCF0D731020004A09369 +:1044A800FCD7F0C15004C15084FDC20310048FE34F +:1044B800FB5C9F9FE3FB7110F4FB306F40FD523CA7 +:1044C800CF93FCF0D78F20F9312506F51EF97172CC +:1044D80022D7714323F592FC717207FD02037173B1 +:1044E80007D7FDF305F2D7C7200CFBF8FF8F1AFC9E +:1044F800F0F919FCF303FD444F13BC048F1CFCF0C6 +:10450800F91BFCF303FD444F13BC028F1EFCF0F9AA +:104518001DFCF303FD444F13BBAC04BDD8F6BDDA54 +:10452800AC04311EBDDCF6BDDEFD8B0DADD8BDDCA7 +:10453800ADDABDDEAC02BDD8F6BDDAAC02311EDAAA +:10454800DCC3DADEC3BDDCF6BDDEFD8B0DC0BDDE2F +:10455800C0BDDCADDEFD010FADD8BDDCADDABDDE22 +:10456800ABBDD8F6BDDAAB311EDADCC3DADEC3BDCB +:10457800DCF6BDDEFD8B0DC0BDDEC0BDDCADDEFDF5 +:10458800010FDADAADD8FD4C49C3C58F20FD5C3F79 +:10459800F0317E04A0FC14C2C0B9A020FDF6BC080E +:1045A800BC0A9C078C074C2EDD3E8F20FD0E077041 +:1045B800F161DC605C3FF0317E1279A0FCBDD8F679 +:1045C800BDDA8C0773098E22318FBDDC70BDDEFD2C +:1045D8008B0DAC08BDDCAC0AFD010FADDABC0AAD31 +:1045E800D8BC08615907EFBCAC08BDD8AC0ABDDA25 +:1045F800C9DC0004F6FD550EC9DCFFFFF6FD6A0FA5 +:10460800ADD8BF9AFCAF94FC429AFCDD12AF96FC81 +:10461800BF98FCAF94FCBF96FCAF9AFCBF94FCAF6C +:1046280096FC4298FCDC50AF94FC4296FCDE48AF06 +:104638005AFD4294FCDE40405EFD16DC1F405EFDE4 +:10464800A0DE168F9CFC4F5EFDDE0EAF94FC229E12 +:10465800FC44691061C8FDC846F55EFDAF94FC4492 +:104668005146DC0BAF94FC241027BF5CFDEF1930DA +:10467800F82ABF5CFDEF11405EFDFFDD03E6EF01A8 +:10468800F6345EFD89610899AF98FC4296FCDC1B04 +:10469800AF96FC4294FCDE13AF94FC425CFDDE0B4B +:1046A800F59CFCAF94FCBF9EFCEF11409CFCFFDD29 +:1046B80003E6EF01F6349CFC89610899100CC6D713 +:1046C800C72006FBF8FFA01FFCD51FFCDF1CA0209D +:1046D800FCD520FCDF14A021FCD521FCDF0CCF1F6A +:1046E800FCFFCF20FCFFCF21FCFF717BFA710A9EF3 +:1046F80031929E02EFFA8E98FD7E0F9C039F24FD57 +:104708008E949F5FFD8E969F60FD8E979F61FD8EB4 +:10471800939F22FD8E929F23FDFDA94813BC04BDE3 +:10472800D8F6BDDA46DADF03B146D8DF198C035C68 +:104738000391DF03E6EF01F6046D01313D12010339 +:10474800B1BC046169038F62FD4E03DF12AF26FD21 +:10475800614904DE40AC042226FDFDCA47EF368CD1 +:1047680003318EB112D962FDF143DF1E8C035C0365 +:1047780091DF03E6EF01F6046D01313D12010322DA +:1047880026FD610904FDCA47EF0B8F62FD4E03DE6B +:1047980004F6FDCA478C039F62FDAC04BF26FDD911 +:1047A80021FDF1010422F9BB14A944FFFFDF04E64F +:1047B800B9EF0BAB14A944FEFFDD03A9A1B910069C +:1047C800C6D7C7161744A90061C836A800A021FD9E +:1047D8004021FDA861C8F521FDF921FDF3311CF642 +:1047E8007822F9B7F647DFE5C6D7C756A89666F028 +:1047F800317E12F6B17822F966D1DFF1F51FFCF5AA +:1048080020FCF521FCF521FDC6D7716323D7C7200D +:1048180004FBF8FFD918F9F1E7240000DD1123DDC6 +:104828001C23DD2123DD2623DD2F23DD34EF3A8F02 +:1048380021FD9F28FDA018F9F95FFDEF60A018F988 +:10484800F960FDEF58A018F9F961FDEF50A018F9CB +:104858008F24FDFD980F72EF44A018F9F922FDEF9F +:104868003CA018F9F923FDEF34F928FDF3311C7940 +:1048780022F9BB316223058B9C03EF128C019C0348 +:10488800D528FDDF06CF28FDA7EF03B028FD7180EE +:1048980071672361DC61FB7161238C03721004C6AC +:1048A800D7C72008FBF8FF8E989C058E979C048E2E +:1048B800969C038E949C028E939C018E929B710B06 +:1048C8009E717AFA8C05FD7E0F9C058C04FD7E0F87 +:1048D8009C048C03FD7E0F9C038C02FD7E0F9C02C2 +:1048E8008C04F0317E1279BE22BC068C055C03D1A3 +:1048F800DF158C044C03DE0C8C044C02DF098C039E +:104908004C1D61F86179068C03318EB1610906BCD2 +:1049180006313D120103BC068C060E02708C071C82 +:1049280000BC068F24FC4E01DC0D8C014F24FCDCFE +:104938000B8F25FC4DDE05AC0612EF04AC06B11258 +:104948001008C6D7C7C3C12008FBF8FFF661490A9B +:1049580061F8614908DF07F7340000EDE949E6BC72 +:1049680004F6BC06AC0ABC02AC08BBAC0661490242 +:10497800AC0461F8614900DE28AC04BDD8AC06BDC2 +:10498800DAE1FD100FADDABC06ADD8BC04ABBDD87A +:10499800AC02BDDAE1FD2B0FADDABC02ADD8BBEF3E +:1049A800CAAC06BC02AC04BBAC08BDD8AC0ABDDAC4 +:1049B800AC04BDDCAC06FD8E0EAC04BDDCAC06FD63 +:1049C800010FE1FD2B0FADDABC06ADD8BC04AC0677 +:1049D800614902AC0461F8614900DCC5AC0214AB62 +:0549E80012100CC6D7FF +:1049ED0061FC61FCC1C3C5C7520C929269D4FEC172 +:1049FD00DFF88EFD708EFCC1717AFA401EF903DF6F +:104A0D000630C82BFD523CC09EFC609EFD34D4FE8A +:104A1D005206C0B9A5A592DFF9C6C4C2C061FC613A +:104A2D00DF520C929269D4FEC1DFF88EFD708EFCC0 +:104A3D00C1717AFAC736410571A4C6DC51F52EFD58 +:104A4D00714850057160500531242236716207712D +:104A5D0023228FE4FB5FECFBD1DF1B8FE5FB5FEDCA +:104A6D00FBD1DF128FE6FB5FEEFBD1DF098FE7FB9A +:104A7D005FEFFBD1DD0C31620702EFFA7163077155 +:104A8D006B27FD1248FD6933F518F9EDB04BC736AC +:104A9D0041057184C6DE0DF52EFD71485005FD6989 +:104AAD0033EDB04BC73641057194C6DE15402EFD72 +:104ABD0003DD0C402EFD04DD06402EFD0161F8F5F1 +:104ACD002EFDD92EFDF1E7240000DD0823DD132393 +:104ADD00DD39EF6071405005E52EFD71505005ED4B +:104AED00B04B8F40059F19F99F1CF9D919F9FD2F6E +:104AFD0037629F1BF94019F97FDD06CF2EFD02EFBE +:104B0D0003F52EFD71505005EDB04BC736410571C3 +:104B1D0094C6DE1CC736410571C4C6DE06CF2EFD18 +:104B2D0003EF11F52EFD7148500571605005EF73BF +:104B3D00CF2EFD04402EFD03DF138F1BF99F400583 +:104B4D00D91BF9C1D919F9FDAE37C0EF108F40054A +:104B5D0076C7D919F9FDEE33C071505005D91CF93E +:104B6D00F1242900DD2D240400DD28242200DD237D +:104B7D00241100DD0C240100DD19241E00DD14EFCD +:104B8D000C4019F960DF0CCF19F961EF06F518F932 +:104B9D00A019F9402EFD03DF0AD919F9FD2F37624F +:104BAD009F1BF9C09EFC609EFD34D4FE5206C0B919 +:104BBD00A5A592DFF961FCC1C3C5C7520C929269DC +:104BCD00D4FEC1DFF88EFD708EFCC1F616717AFA37 +:104BDD00714AE5717BBD51405F0401D1DD05A7F63A +:104BED0047DFF3300400BF2401F6BF2A01300B0B61 +:104BFD00BF2801FD0203300B0FBF2801FD0203305A +:104C0D000F0FBF2801710AE6710321C09EFC609E43 +:104C1D00FD34D4FE5206C0B9A5A592DFF9C6C4C2B3 +:104C2D00C061FCC1C3C5C7520C929269D4FEC1DFED +:104C3D00F88EFD708EFCC1717AFAD540FBDD0EEB5E +:104C4D003EFB899E44A23EFBB040FBEF2B710AE672 +:104C5D00300400BF2401F6BF2A01300B0BBF280121 +:104C6D00FD0203300B0FBF2801FD0203300F0FBFF4 +:104C7D002801717320710321C09EFC609EFD34D408 +:104C8D00FE5206C0B9A5A592DFF9C6C4C2C061FC2B +:104C9D0061EF520C929269D4FEC1DFF88EFD708ED9 +:104CAD00FCC12008FBF8FF71503002CEABACCC013B +:104CBD0000F6BC0231B2E20F617902F6614902DF02 +:104CCD00F371603002EF7E8E519B713BE28B5C0283 +:104CDD00D1DD1D8B5C08D1DF0971503002CC010094 +:104CED00EFCF8C0770FD8938629E50CC0102EFC169 +:104CFD008B5C03D1DF408E509C05715030028C01CE +:104D0D00D1DF0E8C0570FDF238629C07CC0101EFEE +:104D1D00318C014C02DF0671603002EF28CF340276 +:104D2D005A716030028C0570C18C0770FD3038C02F +:104D3D00CF34024AEF0F8B5C01D1DD06716030027A +:104D4D00EF03EDBE4C1008C09EFC609EFD34D4FEFA +:104D5D005206C0B9A5A592DFF961FCC1710A9E3159 +:104D6D00929E02EFFA8F0EFC4F96FFDF358F0FFCF0 +:104D7D004F97FFDF2D8F10FC4F98FFDF258FEDFB39 +:104D8D005C04D1DF1D7120E5FB716307716B27405A +:104D9D001EF905DD06401EF901DF07CF1FF902E5FB +:104DAD001EF9710B9EC061FCA05AFC61FCC1C3C50C +:104DBD00C7520C929269D4FEC1DFF88EFD708EFC45 +:104DCD00C1C1FBF8FF8D1F9C018E31318EE724068A +:104DDD0000DD0823DD0F23DD25EF45717AFA8C0107 +:104DED009F44FCEF3B717AFA4021F901DF078C01FA +:104DFD009F43FCEF2B51FF2E019F43FCEF22717A55 +:104E0D00FA8C019F02F98FE2FB5C01D1DF12401E8B +:104E1D00F903DD06401EF904DF06302726FD523C5E +:104E2D004031FF09DE05A031FFEF197158F0007117 +:104E3D0032224058FC02DF03F6EF05D958FCF1A1F0 +:104E4D00609F58FC710BE3C0C09EFC609EFD34D486 +:104E5D00FE5206C0B9A5A592DFF9C6C4C2C061FC59 +:104E6D0061FF520C929269D4FEC1DFF88EFD708EF7 +:104E7D00FCC1717AFA8F14FC5C03D1DD19401EF967 +:104E8D0003DD06401EF904DF0D36100571D4DE0674 +:104E9D0030873DFD523CC09EFC609EFD34D4FE52D9 +:104EAD0006C0B9A5A592DFF961FC61FC61FC61FC4E +:104EBD0061FC61FC61FC61FC61FC61FC61FC61FCFD +:104ECD0061FC61FC61FC61FC61FC61FC61FC61FCED +:104EDD0061FC61FC61FC61FC61FC61FC61FC61FCDD +:024EED0061FC66 +:0A4EF00000060C12181E242A3036AA +:104EFA00001632486480961228446076920824404C +:104F0A00FF000000555555554700DCFB0000000026 +:104F1A0047FC00000000C43E3F39D822AF2E403083 +:104F2A00BD30FF31D73F63099E4100000000983A27 +:0A4F3A00F82AFF233012990000004E +:084F4400317503F7332312D786 +:0A4FF60031303A33323A3037000010 :00000001FF  \ No newline at end of file diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index 4abd236..82b665a 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 2bf8908..f5b3542 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,12 +1,12 @@ -78K0R Linker W1.31 Date:30 Sep 2010 Page: 1 +78K0R Linker W1.31 Date:13 Oct 2010 Page: 1 Command: -yC:\Program Files\NEC Electronics Tools\DEV -_msgoff -obsr.l mf ..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10 \lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -pbsr_k0r.map -nk - d -gb6EFBFFh -bC:\Program Files\NEC Electronics Tools\FSL78K0 + d -gb7EFBFFh -bC:\Program Files\NEC Electronics Tools\FSL78K0 R_Type02ES\V1.20\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0rm.lib -b cl0rmf.lib -iC:\Program Files\NEC Electronics Tools\CC78K0R\W 2.10\lib78k0r -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.r @@ -23,8 +23,8 @@ Direc-file:bsr_mcu.dr *** Link information *** 64 output segment(s) - 3E6FH byte(s) real data - 5419 symbol(s) defined + 3E75H byte(s) real data + 5439 symbol(s) defined *** Memory map *** @@ -97,7 +97,7 @@ Direc-file:bsr_mcu.dr LDR_CODL task_status 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - LDR_CODE 000CEH 0091EH CSEG + LDR_CODE 000CEH 0091DH CSEG LDR_CODE loader 000CEH 001EBH LDR_CODE main 002B9H 00049H LDR_CODE WDT 00302H 00000H @@ -105,47 +105,47 @@ Direc-file:bsr_mcu.dr LDR_CODE self_flash 005F3H 00370H LDR_CODE task_debug - 00963H 00001H + 00963H 00000H LDR_CODE task_status - 00964H 00088H - FSL_CODE 009ECH 00322H CSEG + 00963H 00088H + FSL_CODE 009EBH 00322H CSEG FSL_CODE fsl_block_cmd - 009ECH 0002BH + 009EBH 0002BH FSL_CODE fsl_block_check - 00A17H 00013H + 00A16H 00013H FSL_CODE fsl_common - 00A2AH 0014FH + 00A29H 0014FH FSL_CODE fsl_reset - 00B79H 00001H + 00B78H 00001H FSL_CODE fsl_si_ibf - 00B7AH 00064H + 00B79H 00064H FSL_CODE fsl_phySwap - 00BDEH 0004DH + 00BDDH 0004DH FSL_CODE fsl_si_common - 00C2BH 00061H - FSL_CODE fsl_swap 00C8CH 00030H + 00C2AH 00061H + FSL_CODE fsl_swap 00C8BH 00030H FSL_CODE fsl_write - 00CBCH 00052H - @@LCODE 00D0EH 002AFH CSEG - @@LCODE @cstart 00D0EH 0006DH - @@LCODE @imul 00D7BH 00011H - @@LCODE @lumul 00D8CH 0002BH - @@LCODE @isdiv 00DB7H 00022H - @@LCODE @iudiv 00DD9H 0002DH - @@LCODE @isrem 00E06H 00021H - @@LCODE @iurem 00E27H 0002FH - @@LCODE @lsdiv 00E56H 00039H - @@LCODE @ludiv 00E8FH 0003FH - @@LCODE @divuw 00ECEH 00034H - @@LCODE @ladd 00F02H 0000FH - @@LCODE @llsh 00F11H 0001BH - @@LCODE @lursh 00F2CH 0001FH - @@LCODE @iscmp 00F4BH 0000CH - @@LCODE @lscmp 00F57H 00014H - @@LCODE @lband 00F6BH 00014H - @@LCODE @bcdtob 00F7FH 0001AH - @@LCODE @bbcd 00F99H 00024H -* gap * 00FBDH 00039H + 00CBBH 00052H + @@LCODE 00D0DH 002AFH CSEG + @@LCODE @cstart 00D0DH 0006DH + @@LCODE @imul 00D7AH 00011H + @@LCODE @lumul 00D8BH 0002BH + @@LCODE @isdiv 00DB6H 00022H + @@LCODE @iudiv 00DD8H 0002DH + @@LCODE @isrem 00E05H 00021H + @@LCODE @iurem 00E26H 0002FH + @@LCODE @lsdiv 00E55H 00039H + @@LCODE @ludiv 00E8EH 0003FH + @@LCODE @divuw 00ECDH 00034H + @@LCODE @ladd 00F01H 0000FH + @@LCODE @llsh 00F10H 0001BH + @@LCODE @lursh 00F2BH 0001FH + @@LCODE @iscmp 00F4AH 0000CH + @@LCODE @lscmp 00F56H 00014H + @@LCODE @lband 00F6AH 00014H + @@LCODE @bcdtob 00F7EH 0001AH + @@LCODE @bbcd 00F98H 00024H +* gap * 00FBCH 0003AH MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -155,264 +155,265 @@ Direc-file:bsr_mcu.dr SEGMENT SEGMENT MODULE ADDRESS MGC_MIMI 02000H 0000AH CSEG AT MGC_MIMI magic 02000H 0000AH - @@CNST 0200AH 002BAH CSEG + @@CNST 0200AH 002CEH CSEG @@CNST @cstart 0200AH 00000H @@CNST loader 0200AH 00000H - @@CNST pm 0200AH 0020EH - @@CNST i2c_ctr 02218H 00000H - @@CNST main 02218H 00000H - @@CNST magic 02218H 00000H - @@CNST WDT 02218H 00000H - @@CNST i2c_mcu 02218H 00000H - @@CNST i2c_twl 02218H 00000H - @@CNST led 02218H 00020H - @@CNST rtc 02238H 00000H - @@CNST vreg_ctr 02238H 00000H - @@CNST vreg_twl 02238H 00000H - @@CNST adc 02238H 00040H - @@CNST renge 02278H 00000H - @@CNST accero 02278H 00000H + @@CNST pm 0200AH 0021AH + @@CNST i2c_ctr 02224H 00000H + @@CNST main 02224H 00000H + @@CNST magic 02224H 00000H + @@CNST WDT 02224H 00000H + @@CNST i2c_mcu 02224H 00000H + @@CNST i2c_twl 02224H 00000H + @@CNST led 02224H 00020H + @@CNST rtc 02244H 00000H + @@CNST vreg_ctr 02244H 00000H + @@CNST vreg_twl 02244H 00000H + @@CNST adc 02244H 00040H + @@CNST renge 02284H 00000H + @@CNST accero 02284H 00000H @@CNST self_flash - 02278H 00002H - @@CNST sw 0227AH 00000H + 02284H 00002H + @@CNST sw 02286H 00000H @@CNST task_debug - 0227AH 00000H + 02286H 00000H @@CNST task_misc - 0227AH 00000H - @@CNST task_sys 0227AH 00000H + 02286H 00008H + @@CNST task_sys 0228EH 00000H @@CNST pedo_alg_thre_det2 - 0227AH 0004AH - @@CNST ini_VECT 022C4H 00000H + 0228EH 0004AH + @@CNST ini_VECT 022D8H 00000H @@CNST task_status - 022C4H 00000H - ROM_CODE 022C4H 02720H CSEG - ROM_CODE pm 022C4H 00A5BH - ROM_CODE i2c_ctr 02D1FH 00060H - ROM_CODE i2c_twl 02D7FH 0005EH - ROM_CODE led 02DDDH 0051AH - ROM_CODE rtc 032F7H 000E0H - ROM_CODE vreg_ctr 033D7H 0047CH - ROM_CODE vreg_twl 03853H 00119H - ROM_CODE adc 0396CH 002BFH - ROM_CODE renge 03C2BH 00187H - ROM_CODE accero 03DB2H 0013DH - ROM_CODE sw 03EEFH 00113H + 022D8H 00000H + ROM_CODE 022D8H 02715H CSEG + ROM_CODE pm 022D8H 00A18H + ROM_CODE i2c_ctr 02CF0H 00060H + ROM_CODE i2c_twl 02D50H 0005EH + ROM_CODE led 02DAEH 0051AH + ROM_CODE rtc 032C8H 000E0H + ROM_CODE vreg_ctr 033A8H 0047AH + ROM_CODE vreg_twl 03822H 0011DH + ROM_CODE adc 0393FH 002C1H + ROM_CODE renge 03C00H 00187H + ROM_CODE accero 03D87H 0013DH + ROM_CODE sw 03EC4H 00113H ROM_CODE task_misc - 04002H 00190H - ROM_CODE task_sys 04192H 00354H + 03FD7H 001C7H + ROM_CODE task_sys 0419EH 00351H ROM_CODE pedo_alg_thre_det2 - 044E6H 004FEH - @@BASE 049E4H 00502H CSEG BASE - @@BASE loader 049E4H 00000H - @@BASE pm 049E4H 0003FH - @@BASE i2c_ctr 04A23H 00198H - @@BASE main 04BBBH 00000H - @@BASE magic 04BBBH 00000H - @@BASE WDT 04BBBH 00000H - @@BASE i2c_mcu 04BBBH 000D9H - @@BASE i2c_twl 04C94H 000CBH - @@BASE led 04D5FH 00000H - @@BASE rtc 04D5FH 00052H - @@BASE vreg_ctr 04DB1H 00000H - @@BASE vreg_twl 04DB1H 00000H - @@BASE adc 04DB1H 000B3H - @@BASE renge 04E64H 00000H - @@BASE accero 04E64H 0004AH + 044EFH 004FEH + @@BASE 049EDH 00502H CSEG BASE + @@BASE loader 049EDH 00000H + @@BASE pm 049EDH 0003FH + @@BASE i2c_ctr 04A2CH 00198H + @@BASE main 04BC4H 00000H + @@BASE magic 04BC4H 00000H + @@BASE WDT 04BC4H 00000H + @@BASE i2c_mcu 04BC4H 000D9H + @@BASE i2c_twl 04C9DH 000CBH + @@BASE led 04D68H 00000H + @@BASE rtc 04D68H 00052H + @@BASE vreg_ctr 04DBAH 00000H + @@BASE vreg_twl 04DBAH 00000H + @@BASE adc 04DBAH 000B3H + @@BASE renge 04E6DH 00000H + @@BASE accero 04E6DH 0004AH @@BASE self_flash - 04EAEH 00000H - @@BASE sw 04EAEH 00000H + 04EB7H 00000H + @@BASE sw 04EB7H 00000H @@BASE task_debug - 04EAEH 00000H + 04EB7H 00000H @@BASE task_misc - 04EAEH 00000H - @@BASE task_sys 04EAEH 00000H + 04EB7H 00000H + @@BASE task_sys 04EB7H 00000H @@BASE pedo_alg_thre_det2 - 04EAEH 00000H - @@BASE ini_VECT 04EAEH 00038H + 04EB7H 00000H + @@BASE ini_VECT 04EB7H 00038H @@BASE task_status - 04EE6H 00000H - @@CNSTL 04EE6H 00000H CSEG PAGE64KP - @@CNSTL @cstart 04EE6H 00000H - @@CNSTL 04EE6H 00000H CSEG PAGE64KP - @@CNSTL pm 04EE6H 00000H - @@CNSTL 04EE6H 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04EE6H 00000H - @@CNSTL 04EE6H 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04EE6H 00000H - @@CNSTL 04EE6H 00000H CSEG PAGE64KP - @@CNSTL led 04EE6H 00000H - @@CNSTL 04EE6H 00000H CSEG PAGE64KP - @@CNSTL rtc 04EE6H 00000H - @@CNSTL 04EE6H 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04EE6H 00000H - @@CNSTL 04EE6H 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04EE6H 00000H - @@CNSTL 04EE6H 00000H CSEG PAGE64KP - @@CNSTL adc 04EE6H 00000H - @@CNSTL 04EE6H 00000H CSEG PAGE64KP - @@CNSTL renge 04EE6H 00000H - @@CNSTL 04EE6H 00000H CSEG PAGE64KP - @@CNSTL accero 04EE6H 00000H - @@CNSTL 04EE6H 00000H CSEG PAGE64KP - @@CNSTL sw 04EE6H 00000H - @@CNSTL 04EE6H 00000H CSEG PAGE64KP + 04EEFH 00000H + @@CNSTL 04EEFH 00000H CSEG PAGE64KP + @@CNSTL @cstart 04EEFH 00000H + @@CNSTL 04EEFH 00000H CSEG PAGE64KP + @@CNSTL pm 04EEFH 00000H + @@CNSTL 04EEFH 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04EEFH 00000H + @@CNSTL 04EEFH 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04EEFH 00000H + @@CNSTL 04EEFH 00000H CSEG PAGE64KP + @@CNSTL led 04EEFH 00000H + @@CNSTL 04EEFH 00000H CSEG PAGE64KP + @@CNSTL rtc 04EEFH 00000H + @@CNSTL 04EEFH 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04EEFH 00000H + @@CNSTL 04EEFH 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04EEFH 00000H + @@CNSTL 04EEFH 00000H CSEG PAGE64KP + @@CNSTL adc 04EEFH 00000H + @@CNSTL 04EEFH 00000H CSEG PAGE64KP + @@CNSTL renge 04EEFH 00000H + @@CNSTL 04EEFH 00000H CSEG PAGE64KP + @@CNSTL accero 04EEFH 00000H + @@CNSTL 04EEFH 00000H CSEG PAGE64KP + @@CNSTL sw 04EEFH 00000H + @@CNSTL 04EEFH 00000H CSEG PAGE64KP @@CNSTL task_misc - 04EE6H 00000H - @@CNSTL 04EE6H 00000H CSEG PAGE64KP - @@CNSTL task_sys 04EE6H 00000H - @@CNSTL 04EE6H 00000H CSEG PAGE64KP + 04EEFH 00000H + @@CNSTL 04EEFH 00000H CSEG PAGE64KP + @@CNSTL task_sys 04EEFH 00000H + @@CNSTL 04EEFH 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04EE6H 00000H - @@CNSTL 04EE6H 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04EE6H 00000H - @@CNSTL 04EE6H 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04EE6H 0000AH - @@CNSTL 04EF0H 00010H CSEG PAGE64KP - @@CNSTL @bbcd 04EF0H 00010H - @@R_INIT 04F00H 0003CH CSEG UNIT64KP - @@R_INIT @cstart 04F00H 00000H - @@R_INIT loader 04F00H 00000H - @@R_INIT pm 04F00H 00002H - @@R_INIT i2c_ctr 04F02H 00002H - @@R_INIT main 04F04H 00000H - @@R_INIT magic 04F04H 00000H - @@R_INIT WDT 04F04H 00000H - @@R_INIT i2c_mcu 04F04H 00000H - @@R_INIT i2c_twl 04F04H 00000H - @@R_INIT led 04F04H 00006H - @@R_INIT rtc 04F0AH 00000H - @@R_INIT vreg_ctr 04F0AH 00000H - @@R_INIT vreg_twl 04F0AH 00000H - @@R_INIT adc 04F0AH 0000CH - @@R_INIT renge 04F16H 00016H - @@R_INIT accero 04F2CH 00000H - @@R_INIT self_flash - 04F2CH 00000H - @@R_INIT sw 04F2CH 00002H - @@R_INIT task_debug - 04F2EH 00000H - @@R_INIT task_misc - 04F2EH 00000H - @@R_INIT task_sys 04F2EH 00002H - @@R_INIT pedo_alg_thre_det2 - 04F30H 0000AH - @@R_INIT ini_VECT 04F3AH 00000H - @@R_INIT task_status - 04F3AH 00002H - @@R_INIT @rom 04F3CH 00000H - @@R_INIS 04F3CH 00000H CSEG UNIT64KP - @@R_INIS @cstart 04F3CH 00000H - @@R_INIS loader 04F3CH 00000H - @@R_INIS pm 04F3CH 00000H - @@R_INIS i2c_ctr 04F3CH 00000H - @@R_INIS main 04F3CH 00000H - @@R_INIS magic 04F3CH 00000H - @@R_INIS WDT 04F3CH 00000H - @@R_INIS i2c_mcu 04F3CH 00000H - @@R_INIS i2c_twl 04F3CH 00000H - @@R_INIS led 04F3CH 00000H - @@R_INIS rtc 04F3CH 00000H - @@R_INIS vreg_ctr 04F3CH 00000H - @@R_INIS vreg_twl 04F3CH 00000H - @@R_INIS adc 04F3CH 00000H - @@R_INIS renge 04F3CH 00000H - @@R_INIS accero 04F3CH 00000H + 04EEFH 00000H + @@CNSTL 04EEFH 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04EEFH 00000H + @@R_INIS 04EEFH 00000H CSEG UNIT64KP + @@R_INIS @cstart 04EEFH 00000H + @@R_INIS loader 04EEFH 00000H + @@R_INIS pm 04EEFH 00000H + @@R_INIS i2c_ctr 04EEFH 00000H + @@R_INIS main 04EEFH 00000H + @@R_INIS magic 04EEFH 00000H + @@R_INIS WDT 04EEFH 00000H + @@R_INIS i2c_mcu 04EEFH 00000H + @@R_INIS i2c_twl 04EEFH 00000H + @@R_INIS led 04EEFH 00000H + @@R_INIS rtc 04EEFH 00000H + @@R_INIS vreg_ctr 04EEFH 00000H + @@R_INIS vreg_twl 04EEFH 00000H + @@R_INIS adc 04EEFH 00000H + @@R_INIS renge 04EEFH 00000H + @@R_INIS accero 04EEFH 00000H @@R_INIS self_flash - 04F3CH 00000H - @@R_INIS sw 04F3CH 00000H + 04EEFH 00000H + @@R_INIS sw 04EEFH 00000H @@R_INIS task_debug - 04F3CH 00000H + 04EEFH 00000H @@R_INIS task_misc - 04F3CH 00000H - @@R_INIS task_sys 04F3CH 00000H + 04EEFH 00000H + @@R_INIS task_sys 04EEFH 00000H @@R_INIS pedo_alg_thre_det2 - 04F3CH 00000H - @@R_INIS ini_VECT 04F3CH 00000H + 04EEFH 00000H + @@R_INIS ini_VECT 04EEFH 00000H @@R_INIS task_status - 04F3CH 00000H - @@R_INIS @rom 04F3CH 00000H - @@CALT 04F3CH 00000H CSEG - @@CALT @cstart 04F3CH 00000H - @@CALT loader 04F3CH 00000H - @@CALT pm 04F3CH 00000H - @@CALT i2c_ctr 04F3CH 00000H - @@CALT main 04F3CH 00000H - @@CALT magic 04F3CH 00000H - @@CALT WDT 04F3CH 00000H - @@CALT i2c_mcu 04F3CH 00000H - @@CALT i2c_twl 04F3CH 00000H - @@CALT led 04F3CH 00000H - @@CALT rtc 04F3CH 00000H - @@CALT vreg_ctr 04F3CH 00000H - @@CALT vreg_twl 04F3CH 00000H - @@CALT adc 04F3CH 00000H - @@CALT renge 04F3CH 00000H - @@CALT accero 04F3CH 00000H + 04EEFH 00000H + @@R_INIS @rom 04EEFH 00000H + @@CALT 04EEFH 00000H CSEG + @@CALT @cstart 04EEFH 00000H + @@CALT loader 04EEFH 00000H + @@CALT pm 04EEFH 00000H + @@CALT i2c_ctr 04EEFH 00000H + @@CALT main 04EEFH 00000H + @@CALT magic 04EEFH 00000H + @@CALT WDT 04EEFH 00000H + @@CALT i2c_mcu 04EEFH 00000H + @@CALT i2c_twl 04EEFH 00000H + @@CALT led 04EEFH 00000H + @@CALT rtc 04EEFH 00000H + @@CALT vreg_ctr 04EEFH 00000H + @@CALT vreg_twl 04EEFH 00000H + @@CALT adc 04EEFH 00000H + @@CALT renge 04EEFH 00000H + @@CALT accero 04EEFH 00000H @@CALT self_flash - 04F3CH 00000H - @@CALT sw 04F3CH 00000H + 04EEFH 00000H + @@CALT sw 04EEFH 00000H @@CALT task_debug - 04F3CH 00000H + 04EEFH 00000H @@CALT task_misc - 04F3CH 00000H - @@CALT task_sys 04F3CH 00000H + 04EEFH 00000H + @@CALT task_sys 04EEFH 00000H @@CALT pedo_alg_thre_det2 - 04F3CH 00000H - @@CALT ini_VECT 04F3CH 00000H + 04EEFH 00000H + @@CALT ini_VECT 04EEFH 00000H @@CALT task_status - 04F3CH 00000H - @@RLINIT 04F3CH 00000H CSEG UNIT64KP - @@RLINIT loader 04F3CH 00000H - @@RLINIT pm 04F3CH 00000H - @@RLINIT i2c_ctr 04F3CH 00000H - @@RLINIT main 04F3CH 00000H - @@RLINIT magic 04F3CH 00000H - @@RLINIT WDT 04F3CH 00000H - @@RLINIT i2c_mcu 04F3CH 00000H - @@RLINIT i2c_twl 04F3CH 00000H - @@RLINIT led 04F3CH 00000H - @@RLINIT rtc 04F3CH 00000H - @@RLINIT vreg_ctr 04F3CH 00000H - @@RLINIT vreg_twl 04F3CH 00000H - @@RLINIT adc 04F3CH 00000H - @@RLINIT renge 04F3CH 00000H - @@RLINIT accero 04F3CH 00000H + 04EEFH 00000H + @@RLINIT 04EEFH 00000H CSEG UNIT64KP + @@RLINIT loader 04EEFH 00000H + @@RLINIT pm 04EEFH 00000H + @@RLINIT i2c_ctr 04EEFH 00000H + @@RLINIT main 04EEFH 00000H + @@RLINIT magic 04EEFH 00000H + @@RLINIT WDT 04EEFH 00000H + @@RLINIT i2c_mcu 04EEFH 00000H + @@RLINIT i2c_twl 04EEFH 00000H + @@RLINIT led 04EEFH 00000H + @@RLINIT rtc 04EEFH 00000H + @@RLINIT vreg_ctr 04EEFH 00000H + @@RLINIT vreg_twl 04EEFH 00000H + @@RLINIT adc 04EEFH 00000H + @@RLINIT renge 04EEFH 00000H + @@RLINIT accero 04EEFH 00000H @@RLINIT self_flash - 04F3CH 00000H - @@RLINIT sw 04F3CH 00000H + 04EEFH 00000H + @@RLINIT sw 04EEFH 00000H @@RLINIT task_debug - 04F3CH 00000H + 04EEFH 00000H @@RLINIT task_misc - 04F3CH 00000H - @@RLINIT task_sys 04F3CH 00000H + 04EEFH 00000H + @@RLINIT task_sys 04EEFH 00000H @@RLINIT pedo_alg_thre_det2 - 04F3CH 00000H - @@RLINIT ini_VECT 04F3CH 00000H + 04EEFH 00000H + @@RLINIT ini_VECT 04EEFH 00000H @@RLINIT task_status - 04F3CH 00000H - @@RLINIT @rom 04F3CH 00000H - @@CODEL 04F3CH 00000H CSEG - @@CODEL pm 04F3CH 00000H - @@CODEL i2c_ctr 04F3CH 00000H - @@CODEL magic 04F3CH 00000H - @@CODEL i2c_twl 04F3CH 00000H - @@CODEL led 04F3CH 00000H - @@CODEL rtc 04F3CH 00000H - @@CODEL vreg_ctr 04F3CH 00000H - @@CODEL vreg_twl 04F3CH 00000H - @@CODEL adc 04F3CH 00000H - @@CODEL renge 04F3CH 00000H - @@CODEL accero 04F3CH 00000H - @@CODEL sw 04F3CH 00000H + 04EEFH 00000H + @@RLINIT @rom 04EEFH 00000H + @@CODEL 04EEFH 00000H CSEG + @@CODEL pm 04EEFH 00000H + @@CODEL i2c_ctr 04EEFH 00000H + @@CODEL magic 04EEFH 00000H + @@CODEL i2c_twl 04EEFH 00000H + @@CODEL led 04EEFH 00000H + @@CODEL rtc 04EEFH 00000H + @@CODEL vreg_ctr 04EEFH 00000H + @@CODEL vreg_twl 04EEFH 00000H + @@CODEL adc 04EEFH 00000H + @@CODEL renge 04EEFH 00000H + @@CODEL accero 04EEFH 00000H + @@CODEL sw 04EEFH 00000H @@CODEL task_misc - 04F3CH 00000H - @@CODEL task_sys 04F3CH 00000H + 04EEFH 00000H + @@CODEL task_sys 04EEFH 00000H @@CODEL pedo_alg_thre_det2 - 04F3CH 00000H - @@CODEL ini_VECT 04F3CH 00000H - @@LCODEL 04F3CH 00008H CSEG - @@LCODEL abs 04F3CH 00008H -* gap * 04F44H 000B2H + 04EEFH 00000H + @@CODEL ini_VECT 04EEFH 00000H +* gap * 04EEFH 00001H + @@CNSTL 04EF0H 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04EF0H 0000AH + @@CNSTL 04EFAH 00010H CSEG PAGE64KP + @@CNSTL @bbcd 04EFAH 00010H + @@R_INIT 04F0AH 0003AH CSEG UNIT64KP + @@R_INIT @cstart 04F0AH 00000H + @@R_INIT loader 04F0AH 00000H + @@R_INIT pm 04F0AH 00002H + @@R_INIT i2c_ctr 04F0CH 00002H + @@R_INIT main 04F0EH 00000H + @@R_INIT magic 04F0EH 00000H + @@R_INIT WDT 04F0EH 00000H + @@R_INIT i2c_mcu 04F0EH 00000H + @@R_INIT i2c_twl 04F0EH 00000H + @@R_INIT led 04F0EH 00006H + @@R_INIT rtc 04F14H 00000H + @@R_INIT vreg_ctr 04F14H 00000H + @@R_INIT vreg_twl 04F14H 00000H + @@R_INIT adc 04F14H 0000CH + @@R_INIT renge 04F20H 00014H + @@R_INIT accero 04F34H 00000H + @@R_INIT self_flash + 04F34H 00000H + @@R_INIT sw 04F34H 00002H + @@R_INIT task_debug + 04F36H 00000H + @@R_INIT task_misc + 04F36H 00000H + @@R_INIT task_sys 04F36H 00002H + @@R_INIT pedo_alg_thre_det2 + 04F38H 0000AH + @@R_INIT ini_VECT 04F42H 00000H + @@R_INIT task_status + 04F42H 00002H + @@R_INIT @rom 04F44H 00000H + @@LCODEL 04F44H 00008H CSEG + @@LCODEL abs 04F44H 00008H +* gap * 04F4CH 000AAH MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL magic 04FF6H 0000AH @@ -420,7 +421,7 @@ Direc-file:bsr_mcu.dr BASE ADDRESS=FF900H SIZE=00500H OUTPUT INPUT INPUT BASE SIZE SEGMENT SEGMENT MODULE ADDRESS - @@DATA FF900H 00426H DSEG BASEP + @@DATA FF900H 0042CH DSEG BASEP @@DATA @cstart FF900H 00002H @@DATA loader FF902H 00000H @@DATA pm FF902H 00016H @@ -434,180 +435,180 @@ Direc-file:bsr_mcu.dr @@DATA rtc FFBCCH 00008H @@DATA vreg_ctr FFBD4H 0005EH @@DATA vreg_twl FFC32H 00010H - @@DATA adc FFC42H 00016H - @@DATA renge FFC58H 0001EH - @@DATA accero FFC76H 00002H + @@DATA adc FFC42H 00018H + @@DATA renge FFC5AH 0001EH + @@DATA accero FFC78H 00002H @@DATA self_flash - FFC78H 00002H - @@DATA sw FFC7AH 00006H + FFC7AH 00002H + @@DATA sw FFC7CH 00006H @@DATA task_debug - FFC80H 00000H + FFC82H 00000H @@DATA task_misc - FFC80H 0000CH - @@DATA task_sys FFC8CH 00002H + FFC82H 00010H + @@DATA task_sys FFC92H 00002H @@DATA pedo_alg_thre_det2 - FFC8EH 00096H - @@DATA ini_VECT FFD24H 00000H + FFC94H 00096H + @@DATA ini_VECT FFD2AH 00000H @@DATA task_status - FFD24H 00002H - @@DATA @rom FFD26H 00000H - @@INIT FFD26H 0003CH DSEG BASEP - @@INIT @cstart FFD26H 00000H - @@INIT loader FFD26H 00000H - @@INIT pm FFD26H 00002H - @@INIT i2c_ctr FFD28H 00002H - @@INIT main FFD2AH 00000H - @@INIT magic FFD2AH 00000H - @@INIT WDT FFD2AH 00000H - @@INIT i2c_mcu FFD2AH 00000H - @@INIT i2c_twl FFD2AH 00000H - @@INIT led FFD2AH 00006H - @@INIT rtc FFD30H 00000H - @@INIT vreg_ctr FFD30H 00000H - @@INIT vreg_twl FFD30H 00000H - @@INIT adc FFD30H 0000CH - @@INIT renge FFD3CH 00016H - @@INIT accero FFD52H 00000H + FFD2AH 00002H + @@DATA @rom FFD2CH 00000H + @@INIT FFD2CH 0003AH DSEG BASEP + @@INIT @cstart FFD2CH 00000H + @@INIT loader FFD2CH 00000H + @@INIT pm FFD2CH 00002H + @@INIT i2c_ctr FFD2EH 00002H + @@INIT main FFD30H 00000H + @@INIT magic FFD30H 00000H + @@INIT WDT FFD30H 00000H + @@INIT i2c_mcu FFD30H 00000H + @@INIT i2c_twl FFD30H 00000H + @@INIT led FFD30H 00006H + @@INIT rtc FFD36H 00000H + @@INIT vreg_ctr FFD36H 00000H + @@INIT vreg_twl FFD36H 00000H + @@INIT adc FFD36H 0000CH + @@INIT renge FFD42H 00014H + @@INIT accero FFD56H 00000H @@INIT self_flash - FFD52H 00000H - @@INIT sw FFD52H 00002H + FFD56H 00000H + @@INIT sw FFD56H 00002H @@INIT task_debug - FFD54H 00000H + FFD58H 00000H @@INIT task_misc - FFD54H 00000H - @@INIT task_sys FFD54H 00002H + FFD58H 00000H + @@INIT task_sys FFD58H 00002H @@INIT pedo_alg_thre_det2 - FFD56H 0000AH - @@INIT ini_VECT FFD60H 00000H + FFD5AH 0000AH + @@INIT ini_VECT FFD64H 00000H @@INIT task_status - FFD60H 00002H - @@INIT @rom FFD62H 00000H - @@INIS FFD62H 00000H DSEG UNITP - @@INIS @cstart FFD62H 00000H - @@INIS loader FFD62H 00000H - @@INIS pm FFD62H 00000H - @@INIS i2c_ctr FFD62H 00000H - @@INIS main FFD62H 00000H - @@INIS magic FFD62H 00000H - @@INIS WDT FFD62H 00000H - @@INIS i2c_mcu FFD62H 00000H - @@INIS i2c_twl FFD62H 00000H - @@INIS led FFD62H 00000H - @@INIS rtc FFD62H 00000H - @@INIS vreg_ctr FFD62H 00000H - @@INIS vreg_twl FFD62H 00000H - @@INIS adc FFD62H 00000H - @@INIS renge FFD62H 00000H - @@INIS accero FFD62H 00000H + FFD64H 00002H + @@INIT @rom FFD66H 00000H + @@INIS FFD66H 00000H DSEG UNITP + @@INIS @cstart FFD66H 00000H + @@INIS loader FFD66H 00000H + @@INIS pm FFD66H 00000H + @@INIS i2c_ctr FFD66H 00000H + @@INIS main FFD66H 00000H + @@INIS magic FFD66H 00000H + @@INIS WDT FFD66H 00000H + @@INIS i2c_mcu FFD66H 00000H + @@INIS i2c_twl FFD66H 00000H + @@INIS led FFD66H 00000H + @@INIS rtc FFD66H 00000H + @@INIS vreg_ctr FFD66H 00000H + @@INIS vreg_twl FFD66H 00000H + @@INIS adc FFD66H 00000H + @@INIS renge FFD66H 00000H + @@INIS accero FFD66H 00000H @@INIS self_flash - FFD62H 00000H - @@INIS sw FFD62H 00000H + FFD66H 00000H + @@INIS sw FFD66H 00000H @@INIS task_debug - FFD62H 00000H + FFD66H 00000H @@INIS task_misc - FFD62H 00000H - @@INIS task_sys FFD62H 00000H + FFD66H 00000H + @@INIS task_sys FFD66H 00000H @@INIS pedo_alg_thre_det2 - FFD62H 00000H - @@INIS ini_VECT FFD62H 00000H + FFD66H 00000H + @@INIS ini_VECT FFD66H 00000H @@INIS task_status - FFD62H 00000H - @@INIS @rom FFD62H 00000H - @@DATS FFD62H 00000H DSEG UNITP - @@DATS @cstart FFD62H 00000H - @@DATS loader FFD62H 00000H - @@DATS pm FFD62H 00000H - @@DATS i2c_ctr FFD62H 00000H - @@DATS main FFD62H 00000H - @@DATS magic FFD62H 00000H - @@DATS WDT FFD62H 00000H - @@DATS i2c_mcu FFD62H 00000H - @@DATS i2c_twl FFD62H 00000H - @@DATS led FFD62H 00000H - @@DATS rtc FFD62H 00000H - @@DATS vreg_ctr FFD62H 00000H - @@DATS vreg_twl FFD62H 00000H - @@DATS adc FFD62H 00000H - @@DATS renge FFD62H 00000H - @@DATS accero FFD62H 00000H + FFD66H 00000H + @@INIS @rom FFD66H 00000H + @@DATS FFD66H 00000H DSEG UNITP + @@DATS @cstart FFD66H 00000H + @@DATS loader FFD66H 00000H + @@DATS pm FFD66H 00000H + @@DATS i2c_ctr FFD66H 00000H + @@DATS main FFD66H 00000H + @@DATS magic FFD66H 00000H + @@DATS WDT FFD66H 00000H + @@DATS i2c_mcu FFD66H 00000H + @@DATS i2c_twl FFD66H 00000H + @@DATS led FFD66H 00000H + @@DATS rtc FFD66H 00000H + @@DATS vreg_ctr FFD66H 00000H + @@DATS vreg_twl FFD66H 00000H + @@DATS adc FFD66H 00000H + @@DATS renge FFD66H 00000H + @@DATS accero FFD66H 00000H @@DATS self_flash - FFD62H 00000H - @@DATS sw FFD62H 00000H + FFD66H 00000H + @@DATS sw FFD66H 00000H @@DATS task_debug - FFD62H 00000H + FFD66H 00000H @@DATS task_misc - FFD62H 00000H - @@DATS task_sys FFD62H 00000H + FFD66H 00000H + @@DATS task_sys FFD66H 00000H @@DATS pedo_alg_thre_det2 - FFD62H 00000H - @@DATS ini_VECT FFD62H 00000H + FFD66H 00000H + @@DATS ini_VECT FFD66H 00000H @@DATS task_status - FFD62H 00000H - @@DATS @rom FFD62H 00000H - FSL_DATA FFD62H 00010H DSEG UNITP + FFD66H 00000H + @@DATS @rom FFD66H 00000H + FSL_DATA FFD66H 00010H DSEG UNITP FSL_DATA fsl_common - FFD62H 00010H - @@INITL FFD72H 00000H DSEG UNIT64KP - @@INITL loader FFD72H 00000H - @@INITL pm FFD72H 00000H - @@INITL i2c_ctr FFD72H 00000H - @@INITL main FFD72H 00000H - @@INITL magic FFD72H 00000H - @@INITL WDT FFD72H 00000H - @@INITL i2c_mcu FFD72H 00000H - @@INITL i2c_twl FFD72H 00000H - @@INITL led FFD72H 00000H - @@INITL rtc FFD72H 00000H - @@INITL vreg_ctr FFD72H 00000H - @@INITL vreg_twl FFD72H 00000H - @@INITL adc FFD72H 00000H - @@INITL renge FFD72H 00000H - @@INITL accero FFD72H 00000H + FFD66H 00010H + @@INITL FFD76H 00000H DSEG UNIT64KP + @@INITL loader FFD76H 00000H + @@INITL pm FFD76H 00000H + @@INITL i2c_ctr FFD76H 00000H + @@INITL main FFD76H 00000H + @@INITL magic FFD76H 00000H + @@INITL WDT FFD76H 00000H + @@INITL i2c_mcu FFD76H 00000H + @@INITL i2c_twl FFD76H 00000H + @@INITL led FFD76H 00000H + @@INITL rtc FFD76H 00000H + @@INITL vreg_ctr FFD76H 00000H + @@INITL vreg_twl FFD76H 00000H + @@INITL adc FFD76H 00000H + @@INITL renge FFD76H 00000H + @@INITL accero FFD76H 00000H @@INITL self_flash - FFD72H 00000H - @@INITL sw FFD72H 00000H + FFD76H 00000H + @@INITL sw FFD76H 00000H @@INITL task_debug - FFD72H 00000H + FFD76H 00000H @@INITL task_misc - FFD72H 00000H - @@INITL task_sys FFD72H 00000H + FFD76H 00000H + @@INITL task_sys FFD76H 00000H @@INITL pedo_alg_thre_det2 - FFD72H 00000H - @@INITL ini_VECT FFD72H 00000H + FFD76H 00000H + @@INITL ini_VECT FFD76H 00000H @@INITL task_status - FFD72H 00000H - @@INITL @rom FFD72H 00000H - @@DATAL FFD72H 00000H DSEG UNIT64KP - @@DATAL loader FFD72H 00000H - @@DATAL pm FFD72H 00000H - @@DATAL i2c_ctr FFD72H 00000H - @@DATAL main FFD72H 00000H - @@DATAL magic FFD72H 00000H - @@DATAL WDT FFD72H 00000H - @@DATAL i2c_mcu FFD72H 00000H - @@DATAL i2c_twl FFD72H 00000H - @@DATAL led FFD72H 00000H - @@DATAL rtc FFD72H 00000H - @@DATAL vreg_ctr FFD72H 00000H - @@DATAL vreg_twl FFD72H 00000H - @@DATAL adc FFD72H 00000H - @@DATAL renge FFD72H 00000H - @@DATAL accero FFD72H 00000H + FFD76H 00000H + @@INITL @rom FFD76H 00000H + @@DATAL FFD76H 00000H DSEG UNIT64KP + @@DATAL loader FFD76H 00000H + @@DATAL pm FFD76H 00000H + @@DATAL i2c_ctr FFD76H 00000H + @@DATAL main FFD76H 00000H + @@DATAL magic FFD76H 00000H + @@DATAL WDT FFD76H 00000H + @@DATAL i2c_mcu FFD76H 00000H + @@DATAL i2c_twl FFD76H 00000H + @@DATAL led FFD76H 00000H + @@DATAL rtc FFD76H 00000H + @@DATAL vreg_ctr FFD76H 00000H + @@DATAL vreg_twl FFD76H 00000H + @@DATAL adc FFD76H 00000H + @@DATAL renge FFD76H 00000H + @@DATAL accero FFD76H 00000H @@DATAL self_flash - FFD72H 00000H - @@DATAL sw FFD72H 00000H + FFD76H 00000H + @@DATAL sw FFD76H 00000H @@DATAL task_debug - FFD72H 00000H + FFD76H 00000H @@DATAL task_misc - FFD72H 00000H - @@DATAL task_sys FFD72H 00000H + FFD76H 00000H + @@DATAL task_sys FFD76H 00000H @@DATAL pedo_alg_thre_det2 - FFD72H 00000H - @@DATAL ini_VECT FFD72H 00000H + FFD76H 00000H + @@DATAL ini_VECT FFD76H 00000H @@DATAL task_status - FFD72H 00000H - @@DATAL @rom FFD72H 00000H -* gap * FFD72H 0008EH + FFD76H 00000H + @@DATAL @rom FFD76H 00000H +* gap * FFD76H 0008AH MEMORY=RAM2 BASE ADDRESS=FFE20H SIZE=000C0H @@ -616,33 +617,33 @@ Direc-file:bsr_mcu.dr @@BITS FFE20H 00004H BSEG @@BITS @cstart FFE20H.0 00000H.0 @@BITS loader FFE20H.0 00000H.0 - @@BITS pm FFE20H.0 00000H.6 - @@BITS i2c_ctr FFE20H.6 00000H.0 - @@BITS main FFE20H.6 00000H.0 - @@BITS magic FFE20H.6 00000H.0 - @@BITS WDT FFE20H.6 00000H.0 - @@BITS i2c_mcu FFE20H.6 00000H.3 - @@BITS i2c_twl FFE21H.1 00000H.0 - @@BITS led FFE21H.1 00000H.5 - @@BITS rtc FFE21H.6 00000H.3 - @@BITS vreg_ctr FFE22H.1 00000H.1 - @@BITS vreg_twl FFE22H.2 00000H.0 - @@BITS adc FFE22H.2 00000H.4 - @@BITS renge FFE22H.6 00000H.2 - @@BITS accero FFE23H.0 00000H.0 + @@BITS pm FFE20H.0 00000H.7 + @@BITS i2c_ctr FFE20H.7 00000H.0 + @@BITS main FFE20H.7 00000H.0 + @@BITS magic FFE20H.7 00000H.0 + @@BITS WDT FFE20H.7 00000H.0 + @@BITS i2c_mcu FFE20H.7 00000H.3 + @@BITS i2c_twl FFE21H.2 00000H.0 + @@BITS led FFE21H.2 00000H.5 + @@BITS rtc FFE21H.7 00000H.3 + @@BITS vreg_ctr FFE22H.2 00000H.1 + @@BITS vreg_twl FFE22H.3 00000H.0 + @@BITS adc FFE22H.3 00000H.4 + @@BITS renge FFE22H.7 00000H.2 + @@BITS accero FFE23H.1 00000H.0 @@BITS self_flash - FFE23H.0 00000H.0 - @@BITS sw FFE23H.0 00000H.2 + FFE23H.1 00000H.0 + @@BITS sw FFE23H.1 00000H.2 @@BITS task_debug - FFE23H.2 00000H.0 + FFE23H.3 00000H.0 @@BITS task_misc - FFE23H.2 00000H.2 - @@BITS task_sys FFE23H.4 00000H.1 + FFE23H.3 00000H.2 + @@BITS task_sys FFE23H.5 00000H.1 @@BITS pedo_alg_thre_det2 - FFE23H.5 00000H.1 - @@BITS ini_VECT FFE23H.6 00000H.0 + FFE23H.6 00000H.1 + @@BITS ini_VECT FFE23H.7 00000H.0 @@BITS task_status - FFE23H.6 00000H.0 + FFE23H.7 00000H.0 * gap * FFE24H 000B0H @@SEGREG FFED4H 00004H DSEG AT @@SEGREG @SEGREG FFED4H 00004H diff --git a/trunk/config.h b/trunk/config.h index 6839750..de4f9f3 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -13,9 +13,11 @@ //#define _TAIKENDAI_ #define MCU_VER_MAJOR 0x01 -#define MCU_VER_MINOR 0x08 +#define MCU_VER_MINOR 0x09 +#define _firm_format_v3_ + //#define _MODEL_TEG2_ // ↑TEG2 CPU ＋ Type-T diff --git a/trunk/hoge.bin b/trunk/hoge.bin index 34598b9..caa20a1 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/magic.c b/trunk/magic.c index 4ad5d92..509a538 100644 --- a/trunk/magic.c +++ b/trunk/magic.c @@ -10,14 +10,13 @@ #pragma section @@CNSTL MGC_LOAD AT 0x0FF6 __far const unsigned char MGC_LOADd[] = __TIME__; - -//#pragma section @@CNST MGC_MIMI AT 0x2100 +#ifdef _firm_format_v3_ #pragma section @@CNST MGC_MIMI AT 0x2000 -const unsigned char MGC_HEADd[] = __TIME__; +const unsigned char MGC_HEADdN[] = __TIME__; -#if 0 +#else #pragma section @@CNST MGC_MIM2 AT 0x2100 -const unsigned char MGC_HEA2d[] = __TIME__; +const unsigned char MGC_HEADd[] = __TIME__; #endif #pragma section @@CNST MGC_TAIL AT 0x4FF6 diff --git a/trunk/magic.h b/trunk/magic.h index 9280451..b80bfb2 100644 --- a/trunk/magic.h +++ b/trunk/magic.h @@ -4,13 +4,21 @@ // magic.c の記述と違わないように注意！ #define MGC_LOAD 0x0FF6 -#define MGC_HEAD 0x2000 -#define MGC_HEA2 0x2100 #define MGC_FOOT 0x4FF6 +#ifdef _firm_format_v3_ +#define MGC_HEAD 0x2000 +#else +#define MGC_HEAD 0x2100 +#endif + #define MGC_LOAD_BKUP 0x1FF6 -#define MGC_HEAD_BKUP 0x5000 -#define MGC_HEAD_BKUP2 0x5100 #define MGC_FOOT_BKUP 0x7FF6 +#ifdef _firm_format_v3_ +#define MGC_HEAD_BKUP 0x5000 +#else +#define MGC_HEAD_BKUP 0x5100 +#endif + #endif diff --git a/trunk/pedo_alg_thre_det2.c b/trunk/pedo_alg_thre_det2.c index 3772076..d43a8f3 100644 --- a/trunk/pedo_alg_thre_det2.c +++ b/trunk/pedo_alg_thre_det2.c @@ -475,8 +475,6 @@ u16 get_long_hour() } -// 拝借もと -// ttp://www001.upp.so-net.ne.jp/y_yutaka/labo/math_algo/math_algo.html unsigned long my_sqrt(unsigned long x) { unsigned long s, t; diff --git a/trunk/pm.c b/trunk/pm.c index 631c690..a9ea284 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -27,7 +27,7 @@ u8 reg_shadow; // NTR PMIC bit bt_chg_ready; // バッテリパラメータ送信済。充電開始許可 u8 chg_led_override; // アダプタ差したとき、充電するしないに関わらずしばらく点灯させる -u8 ntr_pm_bt_low_old; +bit ntr_pm_bt_low_old; bit BT_CHG_STAT_Change; @@ -43,6 +43,17 @@ static void BT_mgic_init(); +// ======================================================== +const u8 BT_MANUF_BORDER[] = { + 5, 33, 79, 123, 158, 197, 233 + }; + +const u8 TWL_BATT_LEFT_BOUNDARY[] = { + 80, 50, BATT_TH_LO, BATT_TH_EMPTY, 0 + }; + + + /* ======================================================== 電池の管理 @@ -135,7 +146,7 @@ void tsk_batt( ) static u8 anti_chatter; u8 temp_CHARGE; - temp_CHARGE = !BT_IN_CHG_n; // volatileのため。このピンはチャタらない。 + temp_CHARGE = (u8)!BT_IN_CHG_n; // volatileのため。このピンはチャタらない。 if( !temp_CHARGE ) { @@ -182,7 +193,7 @@ void pm_chk_adapter() static u8 pm_extdc_old; u8 temp_pm_extdc; - temp_pm_extdc = !PM_EXTDC_n; // volatileのため + temp_pm_extdc = (u8)!PM_EXTDC_n; // volatileのため if( pm_extdc_old != temp_pm_extdc ) { pm_extdc_old = temp_pm_extdc; @@ -297,22 +308,29 @@ void BT_model_detect() } // 電池メーカーの識別 // - if( temp > 233 ) - battery_manufacturer = BT_VENDER_OPEN; - else if( temp > 197 ) - battery_manufacturer = BT_VENDER_6; - else if( temp > 158 ) - battery_manufacturer = BT_VENDER_PANA; - else if( temp > 123 ) - battery_manufacturer = BT_VENDER_4; - else if( temp > 79 ) - battery_manufacturer = BT_VENDER_3; - else if( temp > 33 ) - battery_manufacturer = BT_VENDER_2; - else if( temp > 5 ) - battery_manufacturer = BT_VENDER_1; - else - battery_manufacturer = BT_VENDER_MAXELL; + { + BT_VENDER i; + + for(i=0; i<7; i++) + { + if( temp <= BT_MANUF_BORDER[ i ] ) + { + battery_manufacturer = i; + break; + /* + BT_VENDER_MAXELL; // = 0 + BT_VENDER_1; + BT_VENDER_2; + BT_VENDER_3; + BT_VENDER_4; + BT_VENDER_PANA; + BT_VENDER_6; + + BT_VENDER_OPEN; + */ + } + } + } if( ( battery_manufacturer == BT_VENDER_OPEN ) && @@ -474,7 +492,7 @@ task_status_immed tski_BT_temp_update( ) rawdat_old = raw_adc_temperature; // temperature = 81.45 - 111.9 * raw_adc_temperature/256.0; // それぞれ256倍してある - temperature = ( 20851 - 112 * raw_adc_temperature + (256/2) ) /256; + temperature = (u8)(( 20851 - 112 * raw_adc_temperature + (256/2) ) /256); vreg_ctr[VREG_C_BT_TEMP] = (u8)temperature; newrcomp = 0; @@ -574,8 +592,8 @@ void BT_get_left(){ // バッテリパラメータの関係でビットシフトが必要 temp16 = ( temp_fuel[0] << 8 ) + temp_fuel[1]; temp16 /= BT_RCOMP_SCALE[ battery_manufacturer ]; - temp_fuel[0] = ( temp16 >> 8 ) & 0xFF; - temp_fuel[1] = temp16 & 0xFF; + temp_fuel[0] = (u8)(( temp16 >> 8 ) & 0xFF); + temp_fuel[1] = (u8)(temp16 & 0xFF); // 電圧でキャップ if( iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VCELL, 2, temp_v ) == ERR_SUCCESS ) @@ -643,25 +661,27 @@ void BT_get_left(){ bt_remain_old_ctr = 100; } - // twlに教えてあげる(先にやらないと割り込みのタイミングがまずいかもしれない) + // twlのレジスタ更新　(先にやらないと割り込みのタイミングがまずいかもしれない) if(( bt_remain_old_ctr != vreg_ctr[ VREG_C_BT_REMAIN ] ) || BT_CHG_STAT_Change ) { + u8 i; + u8 temp_twl_bt_level = 0x0F; + BT_CHG_STAT_Change = false; - if( vreg_ctr[ VREG_C_BT_REMAIN ] > 80 ){ - vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x0F; - }else if( vreg_ctr[ VREG_C_BT_REMAIN ] > 50 ){ - vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x0B; - }else if( vreg_ctr[ VREG_C_BT_REMAIN ] > BATT_TH_LO ){ - vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x07; - }else if(( vreg_ctr[ VREG_C_BT_REMAIN ] > BATT_TH_EMPTY )|| - !BT_CHG_Ena_n ){ // アダプタの有無で底上げ - vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x03; - }else if( vreg_ctr[ VREG_C_BT_REMAIN ] > 0 ){ - vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x01; - }else{ - vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x00; + + for( i=0; i<=4; i++ ) + { + if( vreg_ctr[ VREG_C_BT_REMAIN ] <= TWL_BATT_LEFT_BOUNDARY[ i ] ) + { + temp_twl_bt_level >>= 1; + } } + if( !BT_CHG_Ena_n ) // アダプタが刺さってたら上げ底 + { + temp_twl_bt_level |= 3; + } + vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = temp_twl_bt_level; } // CTRに通知 @@ -695,7 +715,7 @@ void BT_get_left(){ { initialized = true; ntr_pm_bt_low_old = flag; - iic_mcu_write_a_byte_codec( CODEC_REG_BT, flag ); + iic_mcu_write_a_byte_codec( CODEC_REG_BT, (u8)flag ); } } } @@ -727,25 +747,22 @@ err PM_LCD_on( ) wait_ms( DELAY_PM_VCS_TO_BL ); - rv = PM_chk_LDSW( ); + rv = (u8)PM_chk_LDSW( ); - if( rv != 0 ) + if( rv != 0 ) // 正常パス { // 電源起動エラーなら電源も切れてしまう。ここではケアしない vreg_ctr[VREG_C_STATUS] |= REG_BIT_LCD_POW; set_irq( VREG_C_IRQ3, REG_BIT_LCD_ON ); - - SND_DEPOP_SND_ENABLE; - return ( ERR_ERR ); + return ( ERR_SUCCESS ); } - return ( ERR_SUCCESS ); + + return ( ERR_ERR ); } // BSR // void PM_LCD_off() { - SND_DEPOP_SND_MUTE; - // BLついてたら消す if( ( iic_mcu_read_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL ) & 0x03 ) != 0 ) { @@ -948,6 +965,8 @@ void PM_sys_pow_off( ) RESET2_ast; FCRAM_RST_ast; + wait_ms( 20 ); + PM_off( ); PM_LDSW_off( ); @@ -1153,9 +1172,10 @@ void codec_reg_init() { wait_ms( 100 ); - ntr_pm_bt_low_old = (( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO )? NTR_PM_BT_EMPTY: NTR_PM_BT_ENOUGH ); // 1で電池切れ - iic_mcu_write_a_byte_codec( CODEC_REG_BT, ntr_pm_bt_low_old ); // SoC から書けず + ntr_pm_bt_low_old = ( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO )? NTR_PM_BT_EMPTY: NTR_PM_BT_ENOUGH; // 1で電池切れ + iic_mcu_write_a_byte_codec( CODEC_REG_BT, (u8)ntr_pm_bt_low_old ); // SoC から書けず vol_reset(); - renge_task_immed_add( tski_vol_update ); +// renge_task_immed_add( tski_vol_update ); + vol_polling = 3; } diff --git a/trunk/renge/renge_task_intval.h b/trunk/renge/renge_task_intval.h index 6f9dd9d..9b0d9ea 100644 --- a/trunk/renge/renge_task_intval.h +++ b/trunk/renge/renge_task_intval.h @@ -7,7 +7,7 @@ enum TSK { - TSK_SW, TSK_ADC, TSK_BATT, TSK_LED_POW, TSK_LED_WIFI, TSK_LED_NOTIFY, TSK_LED_CAM, TSK_MISC, TSK_STATUS, TSK_DEBUG, TSK_SYS, TSK_LAST + TSK_SW, TSK_ADC, TSK_BATT, TSK_LED_POW, TSK_LED_WIFI, TSK_LED_NOTIFY, TSK_LED_CAM, TSK_MISC, TSK_STATUS, TSK_SYS, TSK_LAST }; extern void tsk_sw(); @@ -19,7 +19,6 @@ extern void tsk_led_notify(); extern void tsk_led_cam(); extern void tsk_misc(); extern void tsk_status(); -extern void tsk_debug(); extern void tsk_sys(); const void ( *tasks[ TSK_LAST ] )() = { @@ -32,7 +31,6 @@ const void ( *tasks[ TSK_LAST ] )() = { tsk_led_cam, tsk_misc, tsk_status, - tsk_debug, tsk_sys, }; diff --git a/trunk/task_debug.c b/trunk/task_debug.c index 5ee128c..acab320 100644 --- a/trunk/task_debug.c +++ b/trunk/task_debug.c @@ -16,6 +16,11 @@ // 7セグ 4バイト版 # define IIC_SLA_DBG_MONITOR 0x44 + +#if 0 + +注意！　タスクリストからも外してますので、使うなら復活させて下さい！ + void tsk_debug( ) { // u8 temp; @@ -79,7 +84,7 @@ void tsk_debug( ) */ } - +#endif #if 0 diff --git a/trunk/task_misc.c b/trunk/task_misc.c index 510b550..237cccd 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -49,10 +49,13 @@ bit twl_ver_read; bit going_to_sleep; -// ======================================================== -#define INTERVAL_TSK_MISC_STAT 4 - +u8 vol_soc_readed; // 最後にSoCが読んだVol。TWLとの不整合防止 +// twl の8段階volのリニア値からの境界　×2 (分解能が倍になっているので) +const u8 TWL_VOL_BOUNDARY[] = { +// 0, 4, 12, 22, 32, 42, 52, 62 // mute付近で気に入らない感じになるかも... + 0, 1, 12, 22, 32, 42, 52, 62 +}; /* ======================================================== @@ -60,22 +63,6 @@ bit going_to_sleep; ======================================================== */ void tsk_misc( ) { -/* - static u8 interval_task_misc = 0; - - if( interval_task_misc_stat != 0 ) - { - interval_task_misc_stat -= 1; - return; - } - else - { - interval_task_misc_stat = ( INTERVAL_TSK_MISC_STAT / SYS_INTERVAL_TICK ); - } -*/ - - //#ifdef _MCU_KE3_ - // KE3では必須です。 /* ======================================================== 加速度センサ割り込みピンがオリジナルマイコンには無いので ポーリングする。 @@ -83,36 +70,61 @@ void tsk_misc( ) BSRマイコンはaccero.cで割り込みルーチンからタスク登録します。 ======================================================== */ // 割り込みの取りこぼし？ -// if( ( vreg_ctr[VREG_C_ACC_CONFIG] & 0x03 ) != 0x00 ) + if( ACC_VALID ) { - if( ACC_VALID ) - { - if( renge_task_immed_add( tski_cbk_accero ) == ERR_SUCCESS ){ - // NOP(); - } + if( renge_task_immed_add( tski_cbk_accero ) == ERR_SUCCESS ){ + // NOP(); } } -//#endif if( system_status.pwr_state == ON ) { /* ======================================================== - PM互換レジスタへの書き込み - ポーリングしかしてない。割り込み？ - ======================================================== */ + PM互換レジスタへの書き込み + ポーリングしかしてない。割り込み？ + ======================================================== */ if( !PM_IRQ_n ){ renge_task_immed_add( tski_ntr_pmic_comm ); // NOP(); } /* ======================================================== - TWLランチャーが起動したことをCTRが知りたいらしい - ======================================================== */ + TWLランチャーが起動したことをCTRが知りたいらしい + ======================================================== */ if( twl_ver_read ) { twl_ver_read = false; set_irq( VREG_C_IRQ2, REG_BIT_TWL_VER_READ ); } + + /* ======================================================== + TWLがVolを書くのと、スライダの操作がバッティングすると + 不整合が起こる事があり、それを防ぐ + ======================================================== */ + { + static u8 vol_soc_readed_old; + static u8 vol_soc_readed_twl_level; + + if( vol_soc_readed != vol_soc_readed_old ) + { + u8 new_level; + u8 i; + + vol_soc_readed_old = vol_soc_readed; + for( i=0; i<=7; i++ ) + { + if( vol_soc_readed <= TWL_VOL_BOUNDARY[ i ] ) + { + new_level = i; + break; + } + } + if( vol_soc_readed_twl_level != new_level ) + { + set_irq( VREG_C_IRQ2, REG_BIT_SLIDE_VOL_ACROSS_TWL_BOUNDARY ); + } + } + } } // TUNE_LED /////////////////////////////////// diff --git a/trunk/task_sys.c b/trunk/task_sys.c index 40d389c..0d4f052 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -539,7 +539,7 @@ void send_getup_to_soc() #ifdef _MODEL_CTR_ SLP_ACK = 1; nop8(); - nop8(); +// nop8(); SLP_ACK = 0; #endif } diff --git a/trunk/user_define.h b/trunk/user_define.h index 343542d..f8564be 100644 --- a/trunk/user_define.h +++ b/trunk/user_define.h @@ -102,14 +102,6 @@ #define PM_IRQ_n P7.2 // INTP6 -#ifndef _MODEL_CTR_ -#define SND_DEPOP_SND_MUTE P7.7 = 1 -#define SND_DEPOP_SND_ENABLE P7.7 = 0 -#else -#define SND_DEPOP_SND_MUTE ; -#define SND_DEPOP_SND_ENABLE ; -#endif - // PM #define PM_EXTDC_n P7.0 // INTP7 diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index ea562d4..0da5ff4 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -23,7 +23,6 @@ extern u8 iic_burst_state; // extern bit info_led_pattern_updated; // お知らせLEDのパターンを先頭に戻す - // ******************************************************** #ifdef _DBG_PEDO_AUTO_ENABLE_ u8 vreg_ctr[VREG_C_ENDMARK_ + 16]; @@ -323,7 +322,8 @@ void vreg_ctr_write( u8 adrs, u8 data ) case ( VREG_C_VOL_OPTION ): if(( vreg_ctr[ VREG_C_VOL_OPTION ] ^ data ) & ( REG_BIT_VOL_UPDATE_TO_SLIDER )) { - renge_task_immed_add( tski_vol_update ); +// renge_task_immed_add( tski_vol_update ); + vol_polling = 3; } vreg_ctr[ VREG_C_VOL_OPTION ] = data; break; diff --git a/trunk/vreg_ctr.h b/trunk/vreg_ctr.h index 48c3d72..166e04d 100644 --- a/trunk/vreg_ctr.h +++ b/trunk/vreg_ctr.h @@ -51,7 +51,8 @@ // VREG_C_IRQ2 #define REG_BIT_TWL_VER_READ ( 1 << 7 ) -#define REG_BIT_TWL_SNDVOL_CHANGE ( 1 << 6 ) +//#define REG_BIT_TWL_SNDVOL_CHANGE ( 1 << 6 ) 廃止 +#define REG_BIT_SLIDE_VOL_ACROSS_TWL_BOUNDARY ( 1 << 6 ) #define REG_BIT_TWL_BL_U_ON ( 1 << 5 ) #define REG_BIT_TWL_BL_U_OFF ( 1 << 4 ) #define REG_BIT_TWL_BL_L_ON ( 1 << 3 ) diff --git a/trunk/vreg_twl.c b/trunk/vreg_twl.c index 8ce4f83..22d19d6 100644 --- a/trunk/vreg_twl.c +++ b/trunk/vreg_twl.c @@ -22,6 +22,7 @@ extern bit twl_ver_read; extern bit cam_led_update; extern bit vol_changed_by_twl; +extern u8 vol_soc_readed; // SoC が最後に読んだVol値 /* ======================================================== @@ -47,7 +48,8 @@ void vreg_twl_write( u8 adrs, u8 data ) { vol_changed_by_twl = true; vreg_twl[ REG_TWL_INT_ADRS_VOL ] = data; - renge_task_immed_add( tski_vol_update ); + //renge_task_immed_add( tski_vol_update ); + vol_polling = 3; break; } @@ -106,22 +108,7 @@ u8 vreg_twl_read( u8 phy_adrs ) switch( phy_adrs ){ // 10%以下で赤になる case( REG_TWL_INT_ADRS_POWER_INFO ): - /* - get_batt_left()に引っ越し - if( vreg_ctr[ VREG_C_BT_REMAIN ] > 80 ){ - vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x0F; - }else if( vreg_ctr[ VREG_C_BT_REMAIN ] > 50 ){ - vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x0B; - }else if( vreg_ctr[ VREG_C_BT_REMAIN ] > BATT_TH_LO ){ - vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x07; - }else if( vreg_ctr[ VREG_C_BT_REMAIN ] > BATT_TH_EMPTY ){ - vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x03; - }else if( vreg_ctr[ VREG_C_BT_REMAIN ] > 0 ){ - vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x01; - }else{ - vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x00; - } - */ + // レベルのセットは get_batt_left()内（処理が遅くて無理でした） return( vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] | ( !PM_EXTDC_n ? 0x80: 0x00 ) ); // アダプタbit(アダプタ有無) case( REG_TWL_INT_ADRS_IRQ ): @@ -130,6 +117,9 @@ u8 vreg_twl_read( u8 phy_adrs ) return( temp ); case( REG_TWL_INT_ADRS_VOL ): + // TWLとスライダと不整合が起きないように + vol_soc_readed = vreg_ctr[ VREG_C_SND_VOL ]; + if( vreg_ctr[ VREG_C_SND_VOL ] != 1 ){ return( vreg_ctr[ VREG_C_SND_VOL ] /2 ); } diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index 08428c1..872c3da 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -5,11 +5,154 @@ loader.c(122) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 2 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\loader.asm Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no pm.c +pm.c(267) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +pm.c(776) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(853) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(861) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1009) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +pm.c(1076) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1079) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 7 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pm.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_ctr.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_ctr.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no main.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\main.asm +Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no magic.c Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lk78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb6EFBFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r" -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no WDT.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\WDT.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_mcu.c +i2c_mcu.c(205) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 1 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_mcu.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_twl.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_twl.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no led.c +led.c(108) : CC78K0R warning W0745: Expected function prototype +led.c(250) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(255) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(317) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(376) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(402) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(578) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 7 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\led.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no rtc.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\rtc.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no vreg_ctr.c +vreg_ctr.c(109) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(118) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(128) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(138) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(142) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(149) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(159) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(160) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(162) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(165) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(269) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(274) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(279) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(309) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +vreg_ctr.c(436) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +Compilation complete, 0 error(s) and 16 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_ctr.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no vreg_twl.c +vreg_twl.c(57) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_twl.c(61) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_twl.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no adc.c +adc.c(95) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(113) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +adc.c(192) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(218) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(310) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(334) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +adc.c(353) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(431) : CC78K0R warning W0745: Expected function prototype +adc.c(460) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(465) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(114) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 11 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\adc.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no renge\renge.c +renge\renge.c(152) : CC78K0R warning W0411: Illegal pointer combination +renge\renge.c(160) : CC78K0R warning W0412: Illegal pointer combination in conditional expression +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\renge.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no accero.c +accero.c(242) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +Compilation complete, 0 error(s) and 1 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\accero.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no self_flash.c +self_flash.c(271) : CC78K0R warning W0401: Conversion may lose significant digits +self_flash.c(272) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\self_flash.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no sw.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\sw.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_debug.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_debug.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_misc.c +task_misc.c(75) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +task_misc.c(87) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +task_misc.c(308) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 3 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_misc.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_sys.c +task_sys.c(194) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(503) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(505) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' +Compilation complete, 0 error(s) and 3 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_sys.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c +pedo_alg_thre_det2.c(58) : CC78K0R warning W0745: Expected function prototype +pedo_alg_thre_det2.c(73) : CC78K0R warning W0401: Conversion may lose significant digits +pedo_alg_thre_det2.c(140) : CC78K0R warning W0401: Conversion may lose significant digits +pedo_alg_thre_det2.c(153) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 4 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pedo_alg_thre_det2.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no ini_VECT.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\ini_VECT.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_status.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_status.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lk78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r" -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel Link complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\oc78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf Object Conversion Complete, 0 error(s) and 0 warning(s) found. @@ -19,4 +162,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 2 +Build Total error(s) : 0 Total warning(s) : 61 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 58818d8..ad77496 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -50,7 +50,7 @@ LoadFilter1=5 Offset1=0 Object1=ON Symbol1=ON -Erase1=ON +Erase1=OFF HighSpeed1=OFF CPU Reset1=ON Symbol Reset1=ON @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=509, 120, 1021, 817 +Geometry=19, 18, 1021, 817 Window=Normal -DispStart=418 -CaretPos=419,0 +DispStart=70 +CaretPos=71,0 Mode=Normal DispFile= Address1= @@ -140,10 +140,10 @@ SaveStart= SaveEnd= Accumulative=ON [Assemble] -Geometry=124, 418, 968, 626 +Geometry=30, 440, 968, 626 Window=Normal -DispStart=17732 -CaretPos=17732,27 +DispStart=3351 +CaretPos=3351,27 Address1= Address2= Address3= @@ -195,8 +195,8 @@ Ascii=OFF Idtag=OFF Address= DispStart=000FFC80 -CaretPosData=36, 65512 -CaretPosAscii=53248, 256 +CaretPosData=0, 65480 +CaretPosAscii=3, 65480 Address1= Address2= Address3= @@ -894,17 +894,7 @@ Manager=ON Sort by=Unsort Detail=OFF Last Name= -Name0=chg_l001 -Status0=W -Access Size0=B -Address Range0=EQ -Address0= - <> -Mask Address0=00000000 -Data Range0=NC -Data0=<00000000> - <00000000> -Mask Data0=FFFFFFFF -Pass0=0001 -Count=1 +Count=0 [Event Link] Geometry=0, 0, 0, 0 Window=Hide @@ -920,10 +910,7 @@ Manager=ON Sort by=Unsort Detail=OFF Last Name= -Name0=chg_l002 -Element0=chg_l001 -Set0=ON -Count=1 +Count=0 [Trace] Geometry=0, 0, 0, 0 Window=Hide @@ -973,56 +960,58 @@ Count=0 Geometry=1075, 10, 441, 702 Window=Normal Boundary=18088086 -0=.chg_led_override,P,N,A,+,1 -1=.vreg_twl,P,N,A,+,1 -2=.infos,P,N,A,+,1 -3=.bt_remain_old_ctr,P,N,A,+,1 -4=.bt_remain_old_ntr,P,N,A,+,1 -5=.bt_remain_old_ntr,P,N,A,+,1 -6=.vreg_ctr,P,N,A,+,1 -7=.info_led_override,P,N,A,+,1 -8=.TDR07,P,S,A,+,1 -9=.PM4.2,P,S,A,+,1 -10=.P4.2,P,S,A,+,1 -11=.PM1.5,P,S,A,+,1 -12=.P1.5,P,S,A,+,1 -13=.SW_pow_count,P,N,A,+,1 -14=.battery_manufacturer,P,N,A,+,1 -15=.system_status,.,N,A,+,1 -16=.info_LED,.,N,A,+,1 -17=.time_to_next_frame,P,N,A,+,1 -Line=18 +0=.temp_twl_bt_level,P,N,A,+,1 +1=.bt_remain_old_ctr,P,N,A,+,1 +2=.chg_led_override,P,N,A,+,1 +3=.vreg_twl,P,N,A,+,1 +4=.infos,P,N,A,+,1 +5=.bt_remain_old_ctr,P,N,A,+,1 +6=.bt_remain_old_ntr,P,N,A,+,1 +7=.bt_remain_old_ntr,P,N,A,+,1 +8=.vreg_ctr,P,N,A,+,1 +9=.info_led_override,P,N,A,+,1 +10=.TDR07,P,S,A,+,1 +11=.PM4.2,P,S,A,+,1 +12=.P4.2,P,S,A,+,1 +13=.PM1.5,P,S,A,+,1 +14=.P1.5,P,S,A,+,1 +15=.SW_pow_count,P,N,A,+,1 +16=.battery_manufacturer,P,N,A,+,1 +17=.system_status,.,N,A,+,1 +18=.info_LED,.,N,A,+,1 +19=.time_to_next_frame,P,N,A,+,1 +Line=20 [Quick Watch] -0=system_status,P,A,1 -1=vreg_ctr,P,A,1 -2=P4.2,P,A,1 -3=PM4.2,P,A,1 -4=TDR07,P,A,1 -5=info_led_override,P,A,1 -6=P1.5,P,A,1 -7=PM1.6,P,A,1 -8=PM1.5,P,A,1 -9=SW_pow_count,P,A,1 -10=bt_remain_old_ntr,P,A,1 -11=bt_remain_old_ctr,P,A,1 -12=infos,P,A,1 -13=battery_manufacturer,P,A,1 -14=vreg_twl,P,A,1 -15=chg_led_override,P,A,1 +0=vreg_ctr,P,A,1 +1=P4.2,P,A,1 +2=PM4.2,P,A,1 +3=TDR07,P,A,1 +4=info_led_override,P,A,1 +5=P1.5,P,A,1 +6=PM1.6,P,A,1 +7=PM1.5,P,A,1 +8=SW_pow_count,P,A,1 +9=bt_remain_old_ntr,P,A,1 +10=infos,P,A,1 +11=battery_manufacturer,P,A,1 +12=vreg_twl,P,A,1 +13=chg_led_override,P,A,1 +14=bt_remain_old_ctr,P,A,1 +15=temp_twl_bt_level,P,A,1 [Software Break] Geometry=709, 826, 445, 260 Window=Normal Width=150 30 200 100 -Name0=Swb00002 -Address0=pm.c#_tsk_batt+0x9b +Name0=Swb00001 +Address0=loader.c#_main+0xac Window0=ASM Status0=ON -Name1=Swb00001 -Address1=pm.c#_pm_chk_adapter+0x24 +Name1=Swb00002 +Address1=loader.c#_main+0xaf Window1=ASM Status1=ON Name2=Swb00003 -Address2=task_sys.c#_tsk_sys+0x275 +Address2=loader.c#_main+0xa5 Window2=ASM Status2=ON Count=3 diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index bd5ee31..b744111 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -853,7 +853,7 @@ P2=flash.map P3=a.map MI=0 GB=1 -GBValue=6EFBFF +GBValue=7EFBFF KM=1 KD=0 KP=0 diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 09984f1..4022087 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -6,16 +6,19 @@ FrameCX=1299 FrameCY=1044 OpenFile1=jhl_defs.h,0,286,286,1530,1012,0,15,26,0 OpenFile2=i2c_mcu.c,0,330,330,1574,1056,24,552,28,0 -OpenFile3=batt_params.h,0,352,352,1596,1078,0,97,0,0 -OpenFile4=ProjectWindow +OpenFile3=ProjectWindow PrjPos=0,2,754,3,253 -OpenFile5=self_flash.c,0,352,352,1596,1078,0,142,5,0 -OpenFile6=ini_VECT.c,0,330,330,1574,1056,6,93,6,0 -OpenFile7=config.h,0,220,220,1464,946,29,16,29,0 -OpenFile8=magic.c,0,242,242,1486,968,0,11,0,0 -OpenFile9=renge\renge.c,0,348,332,1592,1058,31,143,54,0 -OpenFile10=OutputWindow -OutputPos=0,143,652,366,1571 +OpenFile4=self_flash.c,0,352,352,1596,1078,0,142,5,0 +OpenFile5=ini_VECT.c,0,330,330,1574,1056,6,93,6,0 +OpenFile6=config.h,0,220,220,1464,946,29,16,29,0 +OpenFile7=magic.c,0,242,242,1486,968,0,11,0,0 +OpenFile8=renge\renge.c,0,348,332,1592,1058,31,143,54,0 +OpenFile9=loader.c,0,264,264,1508,990,5,195,25,0 +OpenFile10=batt_params.h,0,352,352,1596,1078,0,83,0,0 +OpenFile11=pm.c,0,286,286,1530,1012,0,1078,0,0 +OpenFile12=vreg_ctr.c,0,308,308,1552,1034,9,148,64,0 +OpenFile13=OutputWindow +OutputPos=0,33,652,366,1571 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index cde3a94..e00c0dc 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4ca1cb9d +T=4caab88b 1=incs_loader.h 2=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 3=fsl_user.h @@ -12,7 +12,7 @@ T=4ca1cb9d 8=reboot.h 9=magic.h [pm.c] -T=4ca28964 +T=4caad662 1=incs.h 2=adc.h 3=led.h @@ -36,7 +36,7 @@ T=4ca2a231 7=adc.h 8=pool.h [magic.c] -T=4ca2bb4d +T=4caad66f 1=config.h 2=magic.h [WDT.c] @@ -60,7 +60,7 @@ T=4ca06b3d T=4ca28964 1=incs.h [vreg_ctr.c] -T=4ca289f9 +T=4cad1ada 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -71,14 +71,14 @@ T=4ca289f9 8=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 9=fsl_user.h [vreg_twl.c] -T=4c9c5c37 +T=4cad1ada 1=incs.h 2=jhl_defs.h 3=led.h 4=vreg_twl.h 5=vreg_ctr.h [adc.c] -T=4c9028d9 +T=4caa8d2c 1=incs.h 2=adc.h 3=pm.h @@ -99,7 +99,7 @@ T=4ca289f9 2=incs.h 3=..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] -T=4ca29983 +T=4ca3e63e 1=incs_loader.h 2=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 3=fsl_user.h @@ -117,13 +117,13 @@ T=4c8ed8d7 6=rtc.h 7=sw.h [task_debug.c] -T=4ca28964 +T=4caab3b3 1=incs_loader.h 2=renge\renge.h 3=pm.h 4=accero.h [task_misc.c] -T=4ca28964 +T=4cad15e4 1=incs.h 2=renge\renge.h 3=pm.h @@ -132,7 +132,7 @@ T=4ca28964 6=i2c_mcu.h 7=led.h [task_sys.c] -T=4ca28964 +T=4caab695 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -144,7 +144,7 @@ T=4ca28964 9=adc.h 10=self_flash.h [pedo_alg_thre_det2.c] -T=4c9031d9 +T=4caa8de2 1=incs.h 2=..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h 3=accero.h @@ -177,9 +177,9 @@ T=4c889601 T=4c8ed032 1=config.h [config.h] -T=4ca1dfb4 +T=4caab847 [user_define.h] -T=4ca058f7 +T=4ca534f7 [bsr_system.h] T=4c8f1e99 [renge\renge.h] @@ -192,7 +192,7 @@ T=4c073c5a T=4ca289f9 1=renge\renge_defs.h [vreg_ctr.h] -T=4c89d17c +T=4caa84b1 1=config.h [vreg_twl.h] T=4ca28964 @@ -236,16 +236,16 @@ T=4ca28964 [pedometer.h] T=4bfd1372 [adc.h] -T=4c3b0190 +T=4ca41ac8 1=jhl_defs.h [led.h] T=4c3c1235 [batt_params.h] -T=4c36b4fc +T=4caa826a [i2c_twl_defs.h] T=4bf0d1e1 [renge\renge_task_intval.h] -T=4c3d4113 +T=4caab3b3 1=renge\renge_defs.h [i2c_twl.h] T=4bf4e29e @@ -266,4 +266,4 @@ T=45f12258 [voltable.h] T=4c31be66 [magic.h] -T=4ca29858 +T=4caab849