diff --git a/branches/sim/VCProj/bsr_trunk.sdf b/branches/sim/VCProj/bsr_trunk.sdf index 7e11756..b0defd5 100644 Binary files a/branches/sim/VCProj/bsr_trunk.sdf and b/branches/sim/VCProj/bsr_trunk.sdf differ diff --git a/branches/sim/VCProj/bsr_trunk.suo b/branches/sim/VCProj/bsr_trunk.suo index ccd7641..c6f6301 100644 Binary files a/branches/sim/VCProj/bsr_trunk.suo and b/branches/sim/VCProj/bsr_trunk.suo differ diff --git a/branches/sim/adc.c b/branches/sim/adc.c index 20769fa..93a1a91 100644 --- a/branches/sim/adc.c +++ b/branches/sim/adc.c @@ -254,67 +254,6 @@ static void update_twl_vol( u8 sent_index ) } -/* ======================================================== -　過去３つのminでもMAXでもない値を返す - 　突発的なノイズを除く。 - 　運が悪いと振動するよ -======================================================== */ -static u8 getmean3( u8 * hist ) -{ -/* -// これは大きくて遅かった - u16 temp = 0; - u8 min = 255; - u8 max = 0; - u8 i; - - for( i=0; i!= 3; i++ ) - { - temp += *(hist+i); - if( min > *(hist+i) ){ min = *(hist+i); } - if( max < *(hist+i) ){ max = *(hist+i); } - } - return (u8)(temp - min - max); -*/ - - if( *hist > *( hist + 1 ) ) - { - if( *hist > *( hist + 2 ) ) - { - if( *( hist + 1 ) > *( hist + 2 ) ) - { - return( *( hist + 1 ) ); - } - else - { - return( *( hist + 2 ) ); - } - } - else - { - return( *hist ); - } - - }else{ - if( *hist > *( hist + 2 ) ) - { - return( *hist ); - } - else - { - if( *( hist + 1 ) < *( hist + 2 ) ) - { - return( *( hist + 1 ) ); - } - else - { - return( *( hist + 2 ) ); - } - } - } -} - - /* ======================================================== 　自前で次のチャンネル @@ -322,11 +261,7 @@ static u8 getmean3( u8 * hist ) ======================================================== */ __interrupt void int_adc( ) { - static u8 index; - - volatile u8 adc_data; - - adc_data = ADCRH; + volatile u8 adc_data = ADCRH; switch ( ADS ) { @@ -390,11 +325,6 @@ case ( ADC_SEL_AMB_BRIT ): // { ADCEN = 0; // 止めてしまう adc_updated = true; - - if( ++index > 2 ) // ノイズ取りの配列インデックス - { - index = 0; - } } ADIF = 0; // ←これをしないと、いっこ前のチャンネルのデータの完了で直後に割り込む可能性がある } diff --git a/branches/sim/batt_params.c b/branches/sim/batt_params.c new file mode 100644 index 0000000..74d87df --- /dev/null +++ b/branches/sim/batt_params.c @@ -0,0 +1,84 @@ +#include "jhl_defs.h" + +#include "batt_params.h" + +/* ======================================================== + 各社バッテリーパラメータ + ======================================================== */ +const bt_param_ bt_param[ _BT_PARAM_NUM_ ] = +{ + // ctr //////////////////////////////////////////////// + // BT_PARAM_CTR_MAXELL + { + { + 0xAE, 0xF0, 0xB4, 0x30, 0xB7, 0x40, 0xBA, 0x30, + 0xBB, 0x50, 0xBB, 0xB0, 0xBC, 0x50, 0xBD, 0x10, + 0xBD, 0x60, 0xBD, 0xB0, 0xBF, 0xE0, 0xC2, 0xB0, + 0xC4, 0x20, 0xC7, 0xB0, 0xCA, 0xE0, 0xCE, 0x10, + 0x01, 0xF0, 0x14, 0x10, 0x14, 0x20, 0x06, 0x30, + 0x63, 0x90, 0x49, 0x00, 0x6E, 0x00, 0x77, 0x70, + 0x7B, 0x00, 0x19, 0x00, 0x19, 0x00, 0x17, 0xF0, + 0x1C, 0x60, 0x12, 0x00, 0x12, 0x00, 0x12, 0x00 + }, + 2, + { 92, (u8)(-256* 0.79), (u8)(-256* 4.35) }, + 0xD800, + { 0xEA, 0xE8 } + }, + + // BT_PARAM_CTR_PANA + { + { + 0x8C, 0x30, 0x9C, 0x10, 0xA5, 0xE0, 0xB0, 0x40, + 0xB1, 0xC0, 0xB2, 0x00, 0xB2, 0x50, 0xB3, 0x10, + 0xB4, 0x90, 0xB6, 0x20, 0xB8, 0x60, 0xBA, 0x50, + 0xBF, 0xA0, 0xC6, 0xB0, 0xCE, 0x90, 0xD0, 0x20, + 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, + 0x7B, 0x30, 0x68, 0x60, 0x20, 0x00, 0x17, 0x00, + 0x17, 0x30, 0x12, 0xF0, 0x0D, 0xE0, 0x07, 0xF0, + 0x07, 0x00, 0x09, 0x30, 0x01, 0xC0, 0x01, 0xC0 + }, + 1, + { 171, (u8)(-256* 1.00), (u8)(-256* 2.60) }, + 0xDA20, + { 0x69, 0x67 }, + }, + + // spfl /////////////////////////////////////////////// + // BT_PARAM_SPFL_MAXELL + { + { + 0xA1, 0x20, 0xB7, 0x50, 0xB9, 0xD0, 0xBB, 0x00, + 0xBC, 0x30, 0xBC, 0x60, 0xBC, 0xA0, 0xBD, 0x10, + 0xBD, 0xC0, 0xBE, 0x70, 0xBF, 0xD0, 0xC2, 0xA0, + 0xC4, 0x00, 0xC8, 0x50, 0xCC, 0x80, 0xD0, 0xB0, + 0x01, 0xA0, 0x25, 0x10, 0x18, 0xB0, 0x17, 0xC0, + 0x95, 0x20, 0x6F, 0xE0, 0x7C, 0x60, 0x35, 0x10, + 0x35, 0x00, 0x37, 0xF0, 0x16, 0xF0, 0x1C, 0xA0, + 0x17, 0x30, 0x11, 0xD0, 0x11, 0xF0, 0x11, 0xF0 + }, + 2, + { 94, (u8)(-256* 0.35), (u8)(-256* 3.85) }, + 0xDAB0, + { 0xF5, 0xF3 } + }, + + // BT_PARAM_SPFL_PANA !!dummy!! + { + { + 0x8C, 0x30, 0x9C, 0x10, 0xA5, 0xE0, 0xB0, 0x40, + 0xB1, 0xC0, 0xB2, 0x00, 0xB2, 0x50, 0xB3, 0x10, + 0xB4, 0x90, 0xB6, 0x20, 0xB8, 0x60, 0xBA, 0x50, + 0xBF, 0xA0, 0xC6, 0xB0, 0xCE, 0x90, 0xD0, 0x20, + 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, + 0x7B, 0x30, 0x68, 0x60, 0x20, 0x00, 0x17, 0x00, + 0x17, 0x30, 0x12, 0xF0, 0x0D, 0xE0, 0x07, 0xF0, + 0x07, 0x00, 0x09, 0x30, 0x01, 0xC0, 0x01, 0xC0 + }, + 1, + { 171, (u8)(-256* 1.00), (u8)(-256* 2.60) }, + 0xDA20, + { 0x69, 0x67 }, + } +}; + diff --git a/branches/sim/batt_params.h b/branches/sim/batt_params.h index 3807441..343b3f4 100644 --- a/branches/sim/batt_params.h +++ b/branches/sim/batt_params.h @@ -36,7 +36,7 @@ typedef struct u8 hi,low; } verify_; - typedef struct +typedef struct { u8 mg_param[64]; u8 v_scale; @@ -46,87 +46,4 @@ typedef struct } bt_param_; - - -/* ======================================================== - 各社バッテリーパラメータ - ======================================================== */ -const bt_param_ bt_param[ _BT_PARAM_NUM_ ] = -{ - // ctr //////////////////////////////////////////////// - // BT_PARAM_CTR_MAXELL - { - { - 0xAE, 0xF0, 0xB4, 0x30, 0xB7, 0x40, 0xBA, 0x30, - 0xBB, 0x50, 0xBB, 0xB0, 0xBC, 0x50, 0xBD, 0x10, - 0xBD, 0x60, 0xBD, 0xB0, 0xBF, 0xE0, 0xC2, 0xB0, - 0xC4, 0x20, 0xC7, 0xB0, 0xCA, 0xE0, 0xCE, 0x10, - 0x01, 0xF0, 0x14, 0x10, 0x14, 0x20, 0x06, 0x30, - 0x63, 0x90, 0x49, 0x00, 0x6E, 0x00, 0x77, 0x70, - 0x7B, 0x00, 0x19, 0x00, 0x19, 0x00, 0x17, 0xF0, - 0x1C, 0x60, 0x12, 0x00, 0x12, 0x00, 0x12, 0x00 - }, - 2, - { 92, (u8)(-256* 0.79), (u8)(-256* 4.35) }, - 0xD800, - { 0xEA, 0xE8 } - }, - - // BT_PARAM_CTR_PANA - { - { - 0x8C, 0x30, 0x9C, 0x10, 0xA5, 0xE0, 0xB0, 0x40, - 0xB1, 0xC0, 0xB2, 0x00, 0xB2, 0x50, 0xB3, 0x10, - 0xB4, 0x90, 0xB6, 0x20, 0xB8, 0x60, 0xBA, 0x50, - 0xBF, 0xA0, 0xC6, 0xB0, 0xCE, 0x90, 0xD0, 0x20, - 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, - 0x7B, 0x30, 0x68, 0x60, 0x20, 0x00, 0x17, 0x00, - 0x17, 0x30, 0x12, 0xF0, 0x0D, 0xE0, 0x07, 0xF0, - 0x07, 0x00, 0x09, 0x30, 0x01, 0xC0, 0x01, 0xC0 - }, - 1, - { 171, (u8)(-256* 1.00), (u8)(-256* 2.60) }, - 0xDA20, - { 0x69, 0x67 }, - }, - - // spfl /////////////////////////////////////////////// - // BT_PARAM_SPFL_MAXELL - { - { - 0xA1, 0x20, 0xB7, 0x50, 0xB9, 0xD0, 0xBB, 0x00, - 0xBC, 0x30, 0xBC, 0x60, 0xBC, 0xA0, 0xBD, 0x10, - 0xBD, 0xC0, 0xBE, 0x70, 0xBF, 0xD0, 0xC2, 0xA0, - 0xC4, 0x00, 0xC8, 0x50, 0xCC, 0x80, 0xD0, 0xB0, - 0x01, 0xA0, 0x25, 0x10, 0x18, 0xB0, 0x17, 0xC0, - 0x95, 0x20, 0x6F, 0xE0, 0x7C, 0x60, 0x35, 0x10, - 0x35, 0x00, 0x37, 0xF0, 0x16, 0xF0, 0x1C, 0xA0, - 0x17, 0x30, 0x11, 0xD0, 0x11, 0xF0, 0x11, 0xF0 - }, - 2, - { 94, (u8)(-256* 0.35), (u8)(-256* 3.85) }, - 0xDAB0, - { 0xF5, 0xF3 } - }, - - // BT_PARAM_SPFL_PANA !!dummy!! - { - { - 0x8C, 0x30, 0x9C, 0x10, 0xA5, 0xE0, 0xB0, 0x40, - 0xB1, 0xC0, 0xB2, 0x00, 0xB2, 0x50, 0xB3, 0x10, - 0xB4, 0x90, 0xB6, 0x20, 0xB8, 0x60, 0xBA, 0x50, - 0xBF, 0xA0, 0xC6, 0xB0, 0xCE, 0x90, 0xD0, 0x20, - 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, - 0x7B, 0x30, 0x68, 0x60, 0x20, 0x00, 0x17, 0x00, - 0x17, 0x30, 0x12, 0xF0, 0x0D, 0xE0, 0x07, 0xF0, - 0x07, 0x00, 0x09, 0x30, 0x01, 0xC0, 0x01, 0xC0 - }, - 1, - { 171, (u8)(-256* 1.00), (u8)(-256* 2.60) }, - 0xDA20, - { 0x69, 0x67 }, - } -}; - - #endif diff --git a/branches/sim/bsr.hex b/branches/sim/bsr.hex index 8ce4a7e..8763fc8 100644 --- a/branches/sim/bsr.hex +++ b/branches/sim/bsr.hex @@ -1,18 +1,18 @@ :02000000660D8B -:0400100079497B4966 -:02001C003B4B5C -:02002400884B07 -:02002A00D34BB6 -:08003400FB4C9E4CF74C2D4ED5 -:02004A007D49EE -:02005A00B849A3 -:02006200B14D9E +:0400100036493849EC +:02001C00F84AA0 +:02002400454B4A +:02002A00904BF9 +:08003400B84C5B4CB44CDE4DEE +:02004A003A4931 +:02005A007549E6 +:02006200624DED :0400C0007EFBFF04C0 :0A00C4001B339499E033F240BFAA09 :1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A -:1000DE00D8710014F98EA89C018C015C10D1DD0A38 -:1000EE007110BCFB710014F9EF0B8C015C80D161B7 -:1000FE00E8710014F98F14F931030EF6B1BBF661F5 +:1000DE00D8710016F98EA89C018C015C10D1DD0A36 +:1000EE007110BEFB710016F9EF0B8C015C80D161B3 +:1000FE00E8710016F98F16F931030EF6B1BBF661F1 :10010E004900DD05618900EFF5FDD401FD2801FDF3 :10011E008001FD6402EFAEC0C6D7C7360000674C43 :10012E0009DE3F318E04F60FC1317B9EFDC411896D @@ -20,13 +20,13 @@ :10014E00E660610667318E124900207267318E04B7 :10015E00F64F14896142DF03F6EF01E66061068710 :10016E00EFBC40F84F3A61E88666D161E8FDDE06E5 -:10017E00C6D751105B0C319E609F16F94016F901DF -:10018E00DF05CD3205EF03CD32078F14F95CE39F07 -:10019E0014F951035B04318EE7240000DD1023DDDA -:1001AE000823DF0E712014F9D7713014F9D771407E -:1001BE0014F9D7717BFACEA010CEA180E5F300CE54 -:1001CE00A408F5AAFFD78F14F9310508CD0003CD89 -:1001DE000307EF03CD030ECE23F88F14F931030B73 +:10017E00C6D751105B0C319E609F18F94018F901DB +:10018E00DF05CD2F05EF03CD2F078F16F95CE39F0B +:10019E0016F951035B04318EE7240000DD1023DDD8 +:1001AE000823DF0E712016F9D7713016F9D771407A +:1001BE0016F9D7717BFACEA010CEA180E5F300CE52 +:1001CE00A408F5AAFFD78F16F9310508CD0003CD87 +:1001DE000307EF03CD030ECE23F88F16F931030B71 :1001EE00CD0408CD0508F690BFB401CF1105F8F582 :1001FE0021FFCE22E9CE24F3CE25FACE26FCCE2741 :10020E005FCE2EFCCF120511CF350002CF3700196D @@ -34,34 +34,34 @@ :10022E00050A308700BF1801BF1A01BF1C01BF1E8F :10023E0001D7C7C1C1FBF8FFCEABAC8C02D1DD122A :10024E00616902305C03BBF6614900DDEE61890035 -:10025E00EFF51004C6D7F50CFCF50EFCCF14FCFF21 -:10026E00CF10FCFFCF11FCFFFD6D2FFD9938FDCE99 -:10027E0004717AFAFDB123F512F98F14F9310513D1 -:10028E005003FD5A2B625C01D161E8CF12F902CF07 -:10029E00C5FB64FD4D30FD2645710261712BE7FDF6 -:1002AE009C38FD3B3961EDEFF6D7D7C7F616FDCE7C -:1002BE0004717BFA31225F0871225F717AFAEF0BBB +:10025E00EFF51004C6D7F50EFCF510FCCF16FCFF1B +:10026E00CF12FCFFCF13FCFFFD6D2FFD5238FDCEDC +:10027E0004717AFAFDB123F514F98F16F9310513CD +:10028E005003FD5A2B625C01D161E8CF14F902CF05 +:10029E00C7FB64FD4D30FDE34471025F712BE7FD3A +:1002AE005538FDF43861EDEFF6D7D7C7F616FDCE0B +:1002BE0004717BFA31225D0871225D717AFAEF0BBF :1002CE00717AFAA7F647DFE9E2EF01F2C6D7C7C1A6 :1002DE00C1FBF8FF17A1C1E0C18C0A70C18C02707E -:1002EE00FD04031006D2DF04F439EF03CD39028C7E +:1002EE00FD04031006D2DF04F437EF03CD37028C82 :1002FE0001721004C6D7C7C1FBF8FFFDB902D2DDEB -:10030E0003E2EF618B70FD2204D2DD0771235F5291 +:10030E0003E2EF618B70FD2204D2DD0771235D5293 :10031E0002EF528C0870FD3704FD82048B6C017065 :10032E00FD3704300400BF2401301740BF1C0130DC :10033E000400BF22018C0A91DF04F6BF2A01710B63 :10034E00E2CE44FF3182E202EFFAAC0C148E4499F5 :10035E0061790C61690A8C0AD1DFDAFDAB04710B8D -:10036E00E271235FF2C0C6D7C7C1FBF8FFFDB90229 +:10036E00E271235DF2C0C6D7C7C1FBF8FFFDB9022B :10037E00D2DD03E2EF25710AE68B70FD2204D2DD99 -:10038E000771235F5202EF138C0870FD37048C0A3D -:10039E0070FD3704FDAB0471235FF2C0C6D7C7C131 +:10038E000771235D5202EF138C0870FD37048C0A3F +:10039E0070FD3704FDAB0471235DF2C0C6D7C7C133 :1003AE00FBF8FFFDB902D2DD03E2EF65710AE671DB -:1003BE000BE28B70FD2204D2DD0771235F5202EF38 -:1003CE0050710BE231125F39C73430FBAC0C165250 +:1003BE000BE28B70FD2204D2DD0771235D5202EF3A +:1003CE0050710BE231125D39C73432FBAC0C165250 :1003DE00048B99A5A792DFF9C63184BD02EFFA719D -:1003EE007ABDCEB144CBB430FB8C0A318EBEB8CEC2 +:1003EE007ABDCEB144CBB432FB8C0A318EBEB8CEC0 :1003FE00BB48714BE1714BE5710ABD8C089E44EF11 -:10040E000F710BE68C089E448C0A9D38AC0CBD36E1 +:10040E000F710BE68C089E448C0A9D36AC0CBD34E5 :10041E00F2C0C6D7C716FD5A0417FD3704D2DD0643 :10042E00FDAB04E2EF01F2C6D7C716710AE6710BF7 :10043E00E2669E443182E202EFFAF6420401DD09E1 @@ -73,22 +73,22 @@ :10049E00085CFB08BF2A01FDB802ED5A04300400C7 :1004AE00BF2401F6BF2A01300B0BBF2801FDB80295 :1004BE00300B0FBF2801FDB802300F0FBF2801D738 -:1004CE0031345F01D771225F710BBD0000717BBDAE +:1004CE0031345D01D771225D710BBD0000717BBDB2 :1004DE006A0E03713B25713B23500AFD40027120C9 :1004EE00F000FDB802F6BF26015024BF1401CB4424 -:1004FE000014300F0FBF280171135F710BE2710AE8 +:1004FE000014300F0FBF280171135D710BE2710AEA :10050E00E6FD5A04CE44FF3182E202EFFAFDAB045F -:10051E00AF0401BF0C0171235F71325FD731245FCD +:10051E00AF0401BF0C0171235D71325DD731245DD3 :10052E0002EFFAFD8204713A25713A235A0EFC71DC -:10053E0028F00071335FD7C7880616FDB902D2DDE9 +:10053E0028F00071335DD7C7880616FDB902D2DDEB :10054E0003E2EF38710AE650A4FD2204D2DD0771F2 -:10055E00235F5202EF2617FD37046770FD3704FD47 -:10056E00820450A4FD37045020FD3704D934FBFD1E -:10057E003704A034FBFDAB0471235FF2C6D7C7204E +:10055E00235D5202EF2617FD37046770FD3704FD49 +:10056E00820450A4FD37045020FD3704D936FBFD1C +:10057E003704A036FBFDAB0471235DF2C6D7C7204E :10058E0008FBF8FFFDDC085014C15008FD0E08C032 :10059E00CC07048C074C14DE0C8C07318EFD480AF8 :1005AE00615907EFEECC07048C074C1461C8ED7A45 -:1005BE0006CC06008C064C0461C8ED59063018F9BD +:1005BE0006CC06008C064C0461C8ED5906301AF9BB :1005CE00BC02F6BBCEABAC31B2D109C73641057118 :1005DE0084C6DEF3F1C73641057184C661DC9C0525 :1005EE00713BD1AC02148F40059971505005617961 @@ -117,8 +117,8 @@ :10075E002BC05013FD4002500FC1E0FD492BC0CEFF :10076E00ABAC6159018C0191DD068C014C03DF03AA :10077E00E6EF01F66061FB7151018C014C0861F8E6 -:10078E00CC010031320705A042FCEF03F542FC40DC -:10079E0042FC11DC0DF542FCF0C15003FD492BC0AB +:10078E00CC010031320705A044FCEF03F544FC40D8 +:10079E0044FC11DC0DF544FCF0C15003FD492BC0A7 :1007AE00EF12E6BC02F6614902DDB4000000006102 :1007BE007902EFF1CE3708CBE4FFFFCBE6FFF7CEA1 :1007CE00D4FFCF370008F5120561FDF5ABFFFDDC58 @@ -131,35 +131,35 @@ :10083E00C8EDD708CEABACCC05068C0B318EFD4483 :10084E000AD2DD158C0B318EFD480A6169058C05C7 :10085E00D1DFE7FD0A08E2EF71CC0A008C0A4C04E6 -:10086E00DE54F6BC023018F9BBAC06148C089EFDA3 +:10086E00DE54F6BC02301AF9BBAC06148C089EFDA1 :10087E00118972AB146299AC06A1BC066179006154 :10088E007902F0E1614902DFE05040C18C0B318EFC :10089E0031AD128C0A318E318D03BDD831FFBDDAE8 :1008AE00DADAADD8FD140DC0D2DD06FD0A08E2EF8E :1008BE001961590AEFA68C0B318EFD4C0AD2DD035D :1008CE00E2EF0761590BED2B08F2100EC6D7C77178 -:1008DE007B9D717BFAFDF1073018F9FDF70AFD8259 +:1008DE007B9D717BFAFDF107301AF9FDF70AFD8257 :1008EE000AC6D7FDDC08FDD10BFD0A08F5ABFFF2F9 -:1008FE00D7C7316462067110C9FBEF047118C9FBCA -:10090E008FC9FB7FEAFC76D1DD5C8FC9FB9FEAFCC9 -:10091E004012F903DF22665C10D1DD1C8FC9FB5C2F -:10092E0010D1DD0B5080C15011FDA434C0EF095021 -:10093E0040C15011FDA434C04012F903DD0640122F -:10094E00F904DF22665C02D1DD1C8FC9FB5C02D18B -:10095E00DD0B5040C15010FDA434C0EF095020C132 -:10096E005010FDA434C0C6D7C78F0CFC768F0DFC7B -:10097E0077665C80D1DD10675C80D1DF0571136214 -:10098E00EF0B711262EF06710407711162665C4023 -:10099E00D1DD10675C40D1DF05712362EF0B712250 -:1009AE0062EF06711405712162665C01D1DD10677C -:1009BE005C01D1DF05713362EF0B713262EF0671AC -:1009CE003407713162665C02D1DD10675C02D1DFE3 -:1009DE0005714362EF1D714262EF184015F901DF98 -:1009EE0008710402714162EF0AC736100571C4C660 -:1009FE00714162665C04D1DD10675C04D1DF057164 -:100A0E005362EF0B715262EF0671440771516266C9 -:100A1E005C08D1DD10675C08D1DF05716362EF0BF6 -:100A2E00716262EF06711407716162665C10D161CA +:1008FE00D7C7316460067110CBFBEF047118CBFBC8 +:10090E008FCBFB7FECFC76D1DD5C8FCBFB9FECFCC1 +:10091E004014F903DF22665C10D1DD1C8FCBFB5C2B +:10092E0010D1DD0B5080C15011FDA534C0EF095020 +:10093E0040C15011FDA534C04014F903DD0640142A +:10094E00F904DF22665C02D1DD1C8FCBFB5C02D189 +:10095E00DD0B5040C15010FDA534C0EF095020C131 +:10096E005010FDA534C0C6D7C78F0EFC768F0FFC76 +:10097E0077665C80D1DD10675C80D1DF0571136016 +:10098E00EF0B711260EF06710407711160665C4027 +:10099E00D1DD10675C40D1DF05712360EF0B712252 +:1009AE0060EF06711405712160665C01D1DD106780 +:1009BE005C01D1DF05713360EF0B713260EF0671B0 +:1009CE003407713160665C02D1DD10675C02D1DFE5 +:1009DE0005714360EF1D714260EF184017F901DF9A +:1009EE0008710402714160EF0AC736100571C4C662 +:1009FE00714160665C04D1DD10675C04D1DF057166 +:100A0E005360EF0B715260EF0671440771516066CF +:100A1E005C08D1DD10675C08D1DF05716360EF0BF8 +:100A2E00716260EF06711407716160665C10D161CE :060A3E00E8715AD1C6D791 :100A44005208EF065203EF025206FEE600FE1B00B8 :100A5400DC16089F03088F0408089F040862FE241C @@ -174,7 +174,7 @@ :100AE40006086F31FD9F0608C0EE0400CF0608001B :100AF400F8E3D75200EF025202FE3700CF30FD0078 :100B0400CF060800BF0408C716629F000841001101 -:100B14008F22229B4100118F23229F0108C651007E +:100B14008F5A209B4100118F5B209F0108C6510012 :100B2400FE62FFEF025205CF060800C1510CFE0A17 :100B340000C0D7C1511DFE0200C0D761DD717BFA30 :100B440070CEC0A59EC47CFF9EC4609EC461CDD7F8 @@ -214,10 +214,10 @@ :020D6400C3FDCD :100D660061CF5100718C7109FECBF800FEFCC10108 :100D760000F6BF00F953C0F693935820FEDFF94101 -:100D860000363E4E34F4FCEF05118B99A7A51744A7 -:100D96006C4EDFF53602F930F4FCEF04CC0000A708 -:100DA60047DFF94100366C4E3420FEEF05118B9972 -:100DB600A7A51744744EDFF53628FE305EFEEF0415 +:100D86000036EE4D34F6FCEF05118B99A7A51744F6 +:100D96001A4EDFF53602F930F6FCEF04CC0000A758 +:100DA60047DFF94100361A4E3420FEEF05118B99C4 +:100DB600A7A51744224EDFF53628FE305CFEEF0469 :100DC600CC0000A747DFF9FCCE0000EFFE61DD7125 :100DD6007BFABEF0ADD8BEF200AEF661CDD7C361E8 :100DE600DD717BFABEF0ADD8BEF200DBF6FFADDCFE @@ -250,90 +250,90 @@ :100F9600F9B4DADFF4BDD813BDDAC2C0D746D8DD5E :100FA6000771FF7177D971C0D75BDB9DDB605BDAB8 :100FB6009DDAADDC5BD9085BD808BDD8D7C3C7F3CB -:100FC600728EFDC162314C410036344E1161A07201 +:100FC600728EFDC162314C410036E44D1161A07252 :070FD600C09EFD62C6C2D7F8 -:0A0FF60031373A33363A313100004A -:0A20000031373A33363A313100002F -:10200A00AEF0B430B740BA30BB50BBB0BC50BD1014 -:10201A00BD60BDB0BFE0C2B0C420C7B0CAE0CE1038 -:10202A0001F0141014200630639049006E00777096 -:10203A007B001900190017F01C6012001200120030 -:10204A0002005C003600A70000D8EAE88C309C1039 -:10205A00A5E0B040B1C0B200B250B310B490B620FF -:10206A00B860BA50BFA0C6B0CE90D02000200020E1 -:10207A00002000207B30686020001700173012F023 -:10208A000DE007F00700093001C001C00100AB00F4 -:10209A000000670020DA6967A120B750B9D0BB00F9 -:1020AA00BC30BC60BCA0BD10BDC0BE70BFD0C2A059 -:1020BA00C400C850CC80D0B001A0251018B017C0F9 -:1020CA0095206FE07C603510350037F016F01CA0C3 -:1020DA00173011D011F011F002005E00A70027009E -:1020EA00B0DAF5F38C309C10A5E0B040B1C0B20074 -:1020FA00B250B310B490B620B860BA50BFA0C6B000 -:10210A00CE90D02000200020002000207B30686084 -:10211A0020001700173012F00DE007F00700093011 -:10212A0001C001C00100AB000000670020DA696746 -:10213A000000000000000000000000000000000095 -:10214A000000000000000000000000000000000085 -:10215A000000000000000000000000000000000075 -:10216A000000000000000000000000000000000065 -:10217A000000000000000000000000000000000055 -:10218A000000000000000000000000000000000045 -:10219A000000000000000000000000000000000035 -:1021AA000000000000000000000000000000000025 -:1021BA000000000000000000000000000000000015 -:1021CA00000000000000000005214F7B9EC5E900C9 -:1021DA007F7E7D7C7A7978777675747271706F6E8E -:1021EA006D6C6A6968676665646261605F5E5D5CA2 -:1021FA005A5958575655535251504F4E4D4B4A49BA -:10220A004948474645434241403F3E3D3B3A3938BB -:10221A000104080D12171C1F080101020203030220 -:10222A0000FEFBF7F3F0F0F3FA041225384D5F6E67 -:10223A00777A776E5F4D38251204FAF3F0F0F3F7E8 -:10224A00FBFE000203030202010000001F003B0024 -:10225A005A0078009700B500D400F300110130014C -:10226A004E011926344453626E777D80807D776EE5 -:10227A00625344342619100A08080808080808088E -:02228A000A1038 -:10228C00D512F9DF04F42AEF0D8FF4FCB0F4FCD175 -:10229C00DF4DCFF4FC1EFD4A23FDEC2231325E0DE6 -:1022AC0031045E0931126205713304EF037132049B -:1022BC00FD232331225E05714202EF03714302D4E8 -:1022CC002ADD05B42A714202314402067140C9FB71 -:1022DC00EF047148C9FB4012F90161E8FD1826D7DB -:1022EC004A284BDC134A28B9DE0E4004F928DE04D8 -:1022FC00A004F9D771335ED74A283EDC054A28BDC5 -:10230C00DC0E4005F928DE04A005F9D771325ED742 -:10231C00F504F9F505F9D73122620E4006F902DE13 -:10232C0004A006F9D771235ED73132040A40C5FBED -:10233C003CDE0471235ED771225EF506F9D7C7C166 -:10234C00FBF8FF71445E711762DE577114627141C4 -:10235C005E311262127130C9FB5002C15011FDA4E2 -:10236C0034C0CD2A32EF3B7138C9FBE0C15011FDAE -:10237C00A434C0F42A17C15002FD312BC0D2DF0D9A +:0A0FF60031393A35313A3135000047 +:0A20000031393A35313A313500002C +:10200A0005214F7B9EC5E9007F7E7D7C7A797877B2 +:10201A007675747271706F6E6D6C6A6968676665E1 +:10202A00646261605F5E5D5C5A59585756555352F7 +:10203A0051504F4E4D4B4A49494847464543424104 +:10204A00403F3E3D3B3A39380104080D12171C1F28 +:10205A00080101020203030200FEFBF7F3F0F0F3AA +:10206A00FA041225384D5F6E777A776E5F4D382500 +:10207A001204FAF3F0F0F3F7FBFE00020303020284 +:10208A00010000001F003B005A0078009700B500CD +:10209A00D400F300110130014E0119263444536271 +:1020AA006E777D80807D776E625344342619100ADC +:1020BA0008080808080808080A10AEF0B430B74043 +:1020CA00BA30BB50BBB0BC50BD10BD60BDB0BFE0A4 +:1020DA00C2B0C420C7B0CAE0CE1001F01410142058 +:1020EA000630639049006E0077707B001900190072 +:1020FA0017F01C6012001200120002005C00360089 +:10210A00A70000D8EAE88C309C10A5E0B040B1C026 +:10211A00B200B250B310B490B620B860BA50BFA0A3 +:10212A00C6B0CE90D02000200020002000207B30B6 +:10213A00686020001700173012F00DE007F0070062 +:10214A00093001C001C00100AB000000670020DABD +:10215A006967A120B750B9D0BB00BC30BC60BCA035 +:10216A00BD10BDC0BE70BFD0C2A0C400C850CC80D4 +:10217A00D0B001A0251018B017C095206FE07C6080 +:10218A003510350037F016F01CA0173011D011F0B9 +:10219A0011F002005E00A7002700B0DAF5F38C30D8 +:1021AA009C10A5E0B040B1C0B200B250B310B490D8 +:1021BA00B620B860BA50BFA0C6B0CE90D0200020DA +:1021CA000020002000207B306860200017001730B4 +:1021DA0012F00DE007F00700093001C001C001004C +:1021EA00AB000000670020DA696700000000000009 +:1021FA0000000000000000000000000000000000D5 +:10220A0000000000000000000000000000000000C4 +:10221A0000000000000000000000000000000000B4 +:10222A0000000000000000000000000000000000A4 +:10223A000000000000000000000000000000000094 +:10224A000000000000000000000000000000000084 +:10225A000000000000000000000000000000000074 +:10226A000000000000000000000000000000000064 +:10227A000000000000000000000000000000000054 +:02228A00000052 +:10228C00D514F9DF04F42AEF0D8F04F9B004F9D159 +:10229C00DF4DCF04F91EFD4A23FDEC2231325C0DDB +:1022AC0031045C0931126005713304EF037132049F +:1022BC00FD232331225C05714202EF03714302D4EA +:1022CC002ADD05B42A714202314402067140CBFB6F +:1022DC00EF047148CBFB4014F90161E8FD1826D7D7 +:1022EC004A284BDC134A28B9DE0E4005F928DE04D7 +:1022FC00A005F9D771335CD74A283EDC054A28BDC6 +:10230C00DC0E4006F928DE04A006F9D771325CD742 +:10231C00F505F9F506F9D73122600E4007F902DE12 +:10232C0004A007F9D771235CD73132040A40C7FBEC +:10233C003CDE0471235CD771225CF507F9D7C7C169 +:10234C00FBF8FF71445C711760DE577114607141CA +:10235C005C311260127130CBFB5002C15011FDA5E3 +:10236C0034C0CD2A32EF3B7138CBFBE0C15011FDAC +:10237C00A534C0F42A17C15002FD312BC0D2DF0D99 :10238C008B318E318D080E01081C00BD2CAD2C44F8 -:10239C00009BDC05D5C5FBDF095020C15011FDA405 +:10239C00009BDC05D5C7FBDF095020C15011FDA502 :1023AC0034C0C0C6D7C78D2076FDF323FD652BD571 -:1023BC0015F9DD0571035EEF2C664B2061F8315485 -:1023CC005E1A71535EFDCE04664C07DD0381DF0996 -:1023DC008F14F9310303FD7C24FD902471025E30CF -:1023EC006C25FDF138C6D7C77162017172015005B9 -:1023FC00FD40025008FD6E37629D285009FD6E3776 -:10240C006276716301711814F94A28F1DC05E5153F -:10241C00F9EF224A2804DE1ACF15F9025008C150F0 -:10242C006CFDDC02C092DF0DD439DF09711014F998 -:10243C00EF03F515F94015F901DF05710A22EF06D6 +:1023BC0017F9DD0571035CEF2C664B2061F8315485 +:1023CC005C1A71535CFDCE04664C07DD0381DF099A +:1023DC008F16F9310303FD7C24FD902471025C30CF +:1023EC006C25FDAA38C6D7C7716201717201500500 +:1023FC00FD40025008FD2737629D285009FD273704 +:10240C006276716301711816F94A28F1DC05E5173B +:10241C00F9EF224A2804DE1ACF17F9025008C150EE +:10242C006CFDDC02C092DF0DD437DF09711016F998 +:10243C00EF03F517F94017F901DF05710A22EF06D2 :10244C00710B22710302CD20075700674C08DE1078 -:10245C007309D221614EDC05679D20EF0387EFEBFA -:10246C004A2007DF09D515F961F8CF15F903C6D74E +:10245C0073090A20614EDC05679D20EF0387EFEBC3 +:10246C004A2007DF09D517F961F8CF17F903C6D74A :10247C00500AFD4002304000C15006FD142BC050E4 -:10248C0096ED4002C72006FBF8FFD515F961E8ED83 +:10248C0096ED4002C72006FBF8FFD517F961E8ED81 :10249C006825304A57C1503EFD142BC0D2DD077160 -:1024AC0000C8FBED68257108C8FB17A1C15004C119 +:1024AC0000CAFBED68257108CAFB17A1C15004C115 :1024BC00500CC1506CFD04031006EA30AA48318D53 :1024CC0012AA48318E616B08616A08C1500EFD1466 :1024DC002BC0F690C1500CFD142BC0CC00008B4CC3 -:1024EC0004DE2631245F02EFFA71125FEA308B5062 +:1024EC0004DE2631245D02EFFA71125DEA308B5066 :1024FC0010D605C15010C18BD6044000C1506CFDE4 :10250C00AC031006615900EFD550A5FD4002EA302E :10251C00AA48318D12AA48318E616B08616A08C1D4 @@ -341,54 +341,54 @@ :10253C00FDDC02C0629C05EA308A4B4E0561C30487 :10254C008A4A4E0517A1C15004C1500CC1506CFDF4 :10255C00AC031006F6C1503EFD142BC01006C6D7B6 -:10256C00C78F07F94B2861F8ED15264009F928DECD -:10257C0006A009F9ED1526F509F98D289F07F98DA7 +:10256C00C78F08F94B2861F8ED1526400AF928DECB +:10257C0006A00AF9ED1526F50AF98D289F08F98DA4 :10258C00285070D612307351230480001231FF3161 -:10259C008E039F08F99FC4FBF68F08F97C804C953D -:1025AC00DC1C8F08F9318F241400EA30BDD8AA4402 -:1025BC00FDD30D1231FF318E03318F16EF1A8F08B8 +:10259C008E039F09F99FC6FBF68F09F97C804C9539 +:1025AC00DC1C8F09F9318F241400EA30BDD8AA4401 +:1025BC00FDD30D1231FF318E03318F16EF1A8F09B7 :1025CC00F9318F241400EA30BDD8AA46FDD30D1280 :1025DC0031FF318E03318F16EA308A427217F303C2 :1025EC001644000171FE61C836FF001701DE02F6C9 -:1025FC001617BD50C7500CFD142BC0D2DF078D2809 -:10260C009F07F9EF047100C8FBF2C6D7C72008FB7F -:10261C00F8FF4015F901DD064015F902DF1C17041F +:1025FC001617BD4EC7500CFD142BC0D2DF078D280B +:10260C009F08F9EF047100CAFBF2C6D7C72008FB7C +:10261C00F8FF4017F901DD064017F902DF1C17041B :10262C000600FD0C2CD2DF0A8C069C058C079C0442 :10263C00EF4ACC0563CC0400EF4217040600FD0CF6 -:10264C002CD2DD0F7100C8FB71035ECC050071024A -:10265C005FEF298C06318E318D080E07081C00BBEC +:10264C002CD2DD0F7100CAFB71035CCC050071024A +:10265C005DEF298C06318E318D080E07081C00BBEE :10266C00EA308A4072ABFD260FBB8C019C05D1DF92 :10267C0008CC0501CC0400EF038B9C041704060066 -:10268C00FD292CD2DD06CC06C8CC07008C069FC7D2 +:10268C00FD292CD2DD06CC06C8CC07008C069FC9D0 :10269C00FB8C06318E318D080E07081C00BD2CAD4D -:1026AC002C4401A5DC09CC0364F6BF0AF9EF52AD4A -:1026BC002C220AF94401A0DC09CC031EF6BF0AF94E +:1026AC002C4401A5DC09CC0364F6BF0CF9EF52AD48 +:1026BC002C220CF94401A0DC09CC031EF6BF0CF94A :1026CC00EF3FAD2C44819DDC0BCC030A30F401BFF1 -:1026DC000AF9EF2DAD2C44019BDC0BCC030530F437 -:1026EC0001BF0AF9EF1BAD2C440191DC0BCC0300AC -:1026FC0030F401BF0AF9EF0971025F30F401BF0A2F -:10270C00F93132040C31245E08CC0564CC0400EFA2 +:1026DC000CF9EF2DAD2C44019BDC0BCC030530F435 +:1026EC0001BF0CF9EF1BAD2C440191DC0BCC0300AA +:1026FC0030F401BF0CF9EF0971025D30F401BF0C2D +:10270C00F93132040C31245C08CC0564CC0400EFA4 :10271C000D8C034E05DE078C039C05CC04008C0548 -:10272C009FC5FB8C049FC6FBFD992B8F0CF94E05A6 -:10273C00DD2B40C5FB0BDE06400CF90BDE1640C54D -:10274C00FB06DE06400CF906DE0AD5C5FBDF0ED50E -:10275C000CF9DD095020C15011FDA434C08FC5FB0C -:10276C009F0CF9FDD62B1008C6D7C7D832C1500222 -:10277C00FD492BC04016F90161F87120100550126B -:10278C00FD40028D326C0870C15002FD492BC050C7 -:10279C0003FD40028D326C1870C15002FD492BC0F4 +:10272C009FC7FB8C049FC8FBFD992B8F0EF94E05A0 +:10273C00DD2B40C7FB0BDE06400EF90BDE1640C747 +:10274C00FB06DE06400EF906DE0AD5C7FBDF0ED50A +:10275C000EF9DD095020C15011FDA534C08FC7FB07 +:10276C009F0EF9FDD62B1008C6D7C7D82FC1500223 +:10277C00FD492BC04018F90161F871201005501269 +:10278C00FD40028D2F6C0870C15002FD492BC050CA +:10279C0003FD40028D2F6C1870C15002FD492BC0F7 :1027AC005016FD40025003FD5A2B625C01D1DD1026 -:1027BC007170C9FB5002C15013FDA434C0F2EF017B +:1027BC007170CBFB5002C15013FDA534C0F2EF0178 :1027CC00E2C6D7C75004FD5A2B625C03D1DD4050E2 -:1027DC0014FD662834C9FB895C9F998A0C7CFF50D8 -:1027EC00FF5C14D1DD228A0C7CFF5C147234CDFBAF +:1027DC0014FD662834CBFB895C9F998A0C7CFF50D6 +:1027EC00FF5C14D1DD228A0C7CFF5C147234CFFBAD :1027FC0089616A997162075600316207058666D154 -:10280C00DFF7716307716B2734DCFB895CEB997123 -:10281C002810055002FD5A2BD2DD354016F901DF88 -:10282C0005500AFD40028D326C1070C15002FD49FA -:10283C002BC0E0FD4002D832C15002FD492BC050E4 -:10284C0033FD4002F0C15002FD492BC07178C9FB29 -:10285C00E0C15013FDA434C0C6D7C7C12004FBF897 +:10280C00DFF7716307716B2734DEFB895CEB997121 +:10281C002810055002FD5A2BD2DD354018F901DF86 +:10282C0005500AFD40028D2F6C1070C15002FD49FD +:10283C002BC0E0FD4002D82FC15002FD492BC050E7 +:10284C0033FD4002F0C15002FD492BC07178CBFB27 +:10285C00E0C15013FDA534C0C6D7C7C12004FBF896 :10286C00FFCC02005004FD5A2B629C038C045C20AC :10287C00D1DD0E8C036C019C038C026C209C02EF4E :10288C00138C045C10D1DD0C8C035CFE9C038C025D @@ -396,13 +396,13 @@ :1028AC00038C026C089C02EF138C045C04D1DD0CCD :1028BC008C035CFD9C038C026C049C028C03D1DDAC :1028CC0005501AFD40028C0370C15004FD492BC009 -:1028DC008FC9FB5C9F728C03318E316D148C03316C -:1028EC008E314D616D08616C5C606162629FC9FBE9 -:1028FC008FD5FB7CFF50FF5E02D1DD278FD5FB7C93 -:10290C00FF5E027234CDFB89616A99716207CC015A +:1028DC008FCBFB5C9F728C03318E316D148C03316A +:1028EC008E314D616D08616C5C606162629FCBFBE7 +:1028FC008FD7FB7CFF50FF5E02D1DD278FD7FB7C8F +:10290C00FF5E027234CFFB89616A99716207CC0158 :10291C0000316207086159018C01D1DFF471630742 -:10292C00716B27F21006C6D7D9BDFBC15006FD4905 -:10293C002BC0D9BEFBC15007FD492BC0D7FD342994 +:10292C00716B27F21006C6D7D9BFFBC15006FD4903 +:10293C002BC0D9C0FBC15007FD492BC0D7FD342992 :10294C00F2D7C7711300711B20710303710205E0EC :10295C00C15003FD492BC05013FD4002F0C150057E :10296C00FD492BC0500FC1E0FD492BC0500AFD4062 @@ -416,41 +416,41 @@ :1029EC007103035014FD4002F0C1E0FD492BC0F00F :1029FC00C15003FD492BC0D7C72004FBF8FFCC0204 :102A0C00008D299C035010C150A4FDDC02C0629DB6 -:102A1C0029D439DD04F2EDCE2A8C037B295C08D154 +:102A1C0029D437DD04F2EDCE2A8C037B295C08D156 :102A2C00DD0F8D295C08D1DF05CC0210EF03CC0241 :102A3C00208C037B295C04D1DD158D295C04D1DF4E :102A4C00088C026C049C02EF068C026C089C028FB2 -:102A5C00C8FB5CF3728D295C0C6162629FC8FB8FB2 -:102A6C00D4FB7CFF50FF5E029C02D1DD1F34CCFBFB +:102A5C00CAFB5CF3728D295C0C6162629FCAFB8FAE +:102A6C00D6FB7CFF50FF5E029C02D1DD1F34CEFBF7 :102A7C00896E0299716207CC0100316207086159B5 :102A8C00018C01D1DFF4716307716B278D295C40D8 -:102A9C00D1DD095002C15012FDA434C08D295C0156 -:102AAC00D1DD08E0C15012FDA434C0717AFA8D2931 +:102A9C00D1DD095002C15012FDA534C08D295C0155 +:102AAC00D1DD08E0C15012FDA534C0717AFA8D2930 :102ABC005C41D1DD0C5A29BED829C15010FD450509 :102ACC00C0F21004C6D7FD7627F2D7FDCF27F2D778 -:102ADC00C78FDCFB7617FD6628664FDCFBDFF2F553 -:102AEC00DCFBF2C6D75064FD4002FD412C6261FB59 -:102AFC0071115EF171145E61DC70C15012FD4505FF -:102B0C00C0FD4A36CD3F03D7C7C1C1FBF8FFAC0AA5 +:102ADC00C78FDEFB7617FD6628664FDEFBDFF2F54F +:102AEC00DEFBF2C6D75064FD4002FD412C6261FB57 +:102AFC0071115CF171145C61DC70C15012FD450503 +:102B0C00C0FD4B36CD3D03D7C7C1C1FBF8FFAC0AA6 :102B1C00BB17C15002C18C0270C1506CFDAC0310CC :102B2C00061004C6D7C7C1FBF8FFAC08C15002C1E0 :102B3C008B70C1506CFD04031006C0C6D7C7880645 :102B4C00166770C1C75084FD76031004C6D7C7162C :102B5C00C75084FDDC02C0C6D7C74A2004DE045629 -:102B6C0000EF0256014016F901DF048686EF0A4099 -:102B7C0016F902DF045104610666318F12504CD6EF -:102B8C0033514CD6610A040A20BD30C6D740C5FB70 -:102B9C0051DC05CF1CFC0FD740C5FB33DC05CF1C2B -:102BAC00FC0BD740C5FB0BDC05CF1CFC07D740C585 -:102BBC00FB0661D831320405CF1CFC03D7D5C5FB0D -:102BCC00DD04E51CFCD7F51CFCD7D512F9DF04712C -:102BDC00635ED7FD412C6261FB71715E71145E7195 -:102BEC00775E61C831625E1771625E71745E7111DD -:102BFC005EF171745E61DC70C15012FD4505C0D789 -:102C0C00C7164010FCFFDD0C8F10FC9B1714CA017B +:102B6C0000EF0256014018F901DF048686EF0A4097 +:102B7C0018F902DF045104610666318F12504CD6ED +:102B8C0033514CD6610A04C420BD30C6D740C7FBB4 +:102B9C0051DC05CF1EFC0FD740C7FB33DC05CF1E25 +:102BAC00FC0BD740C7FB0BDC05CF1EFC07D740C77F +:102BBC00FB0661D831320405CF1EFC03D7D5C7FB09 +:102BCC00DD04E51EFCD7F51EFCD7D514F9DF047126 +:102BDC00635CD7FD412C6261FB71715C71145C719B +:102BEC00775C61C831625C1771625C71745C7111E5 +:102BFC005CF171745C61DC70C15012FD4505C0D78D +:102C0C00C7164012FCFFDD0C8F12FC9B1714CA0177 :102C1C0000F2EF07C75004FD312BC0C6D7C71640D2 -:102C2C0011FCFFDD078F11FC9BF2EF07C75002FD73 -:102C3C00312BC0C6D740C5FB0BDE02E2D7F2D771F1 +:102C2C0013FCFFDD078F13FC9BF2EF07C75002FD6F +:102C3C00312BC0C6D740C7FB0BDE02E2D7F2D771EF :102C4C0000010571785005713AD5713BD1713BD9B2 :102C5C008F10055CFC9F1005CF54054AE5420571A9 :102C6C0010420571004205714850057130500571D4 @@ -465,7 +465,7 @@ :102CFC003002D7717830027148F000D7C7880616B9 :102D0C0066614FDD0967614EDE0396EF01866672E0 :102D1C00C6D7C7161714AA0412A943DD29AA041290 -:102D2C00A923FD744EC3AC02FD744E13C2BDD8135F +:102D2C00A923FD224EC3AC02FD224E13C2BDD81303 :102D3C00FDA30FDE0C1714AA0212AA0403BA04EFA7 :102D4C00051714A9BA04AC041231FF319E03317F6C :102D5C00087208C6D77100F200304400BFB60130CB @@ -473,536 +473,531 @@ :102D7C0001BF9801BF9601BF9401BF9201F53CFFC2 :102D8C0030FE00BFBE01F6BFBC01BFB80150EEBFA4 :102D9C00BA01A1BFB201C918FE00F6BE6EBE64BE78 -:102DAC006A7123047153078F14F9310507F5E3FB9E -:102DBC00CB6CFF0071535F71425FD730EF00BFB433 +:102DAC006A7123047153078F16F9310507F5E5FB9A +:102DBC00CB6CFF0071535D71425DD730EF00BFB437 :102DCC0001F6BFBA017108F2007123047153077147 -:102DDC00435FD78F9AFBB09AFBD1DF7331D4D10606 -:102DEC00715BD1E59CFBD59CFBDD347140C8FBD9F4 -:102DFC009BFBF1E734020023DD0625DD0325DF050F -:102E0C00F6BE66EF06D9E2FBF1BE66A09BFB409BCB -:102E1C00FB20DF06F59BFBB09CFBCF9AFB19D7CFB1 -:102E2C009AFB1E7148C8FBD5E4FBDF04F6BE66D7DF -:102E3C00D9E2FBF14266FFDD16D9E2FBF112AE6678 -:102E4C0043DE05A266FFEF03B266FFCF9AFB03D702 +:102DDC00435DD78F9CFBB09CFBD1DF7331D4D10604 +:102DEC00715BD1E59EFBD59EFBDD347140CAFBD9EE +:102DFC009DFBF1E734020023DD0625DD0325DF050D +:102E0C00F6BE66EF06D9E4FBF1BE66A09DFB409DC5 +:102E1C00FB20DF06F59DFBB09EFBCF9CFB19D7CFAB +:102E2C009CFB1E7148CAFBD5E6FBDF04F6BE66D7D9 +:102E3C00D9E4FBF14266FFDD16D9E4FBF112AE6674 +:102E4C0043DE05A266FFEF03B266FFCF9CFB03D700 :102E5C00C7161714F6B9AA0412F6231231FF31AEB5 :102E6C0003316FBA02C6D7C7C1FBF8FF8C0850807C -:102E7C00D612AB1413B9AB14AA0412A92312D93766 +:102E7C00D612AB1413B9AB14AA0412A92312D93964 :102E8C00FBF133BDD813FD0F0EBA02C0C6D73164A7 -:102E9C005F01D74012F902DF10F6BE64BE6EBE6A47 -:102EAC00BFA4FBBFAAFBBFB0FB31545F1530A0FB26 -:102EBC00FD5C2E30A6FBFD5C2E30ACFBFD5C2EEDDC -:102ECC004E2F31745F0F71735F7108E8FBF59EFB39 -:102EDC00F59DFBEF6DD59DFBDF658F36FB9F9DFB55 -:102EEC00409EFB1FDC1A7100E8FB4038FBFFDD2223 -:102EFC00A09FFB8F38FB4F9FFBDE17F59EFBEF125D -:102F0C00D99EFBF1A1605C1F9F9EFB7108E8FBF54D -:102F1C009FFBE99EFB093AFB70C130A0FBFD732EB1 -:102F2C00C0E99EFB095AFB70C130A6FBFD732EC095 -:102F3C00E99EFB097AFB70C130ACFBFD732EC0B06F -:102F4C009DFB30A0FBFD1E2DF313BE6E30A6FBFDCA -:102F5C001E2DF313BE6A30ACFBFD1E2DF313BE64A5 +:102E9C005D01D74014F902DF10F6BE64BE6EBE6A47 +:102EAC00BFA6FBBFACFBBFB2FB31545D1530A2FB20 +:102EBC00FD5C2E30A8FBFD5C2E30AEFBFD5C2EEDD8 +:102ECC004E2F31745D0F71735D7108EAFBF5A0FB39 +:102EDC00F59FFBEF6DD59FFBDF658F38FB9F9FFB4D +:102EEC0040A0FB1FDC1A7100EAFB403AFBFFDD221D +:102EFC00A0A1FB8F3AFB4FA1FBDE17F5A0FBEF1255 +:102F0C00D9A0FBF1A1605C1F9FA0FB7108EAFBF547 +:102F1C00A1FBE9A0FB093CFB70C130A2FBFD732EA9 +:102F2C00C0E9A0FB095CFB70C130A8FBFD732EC08F +:102F3C00E9A0FB097CFB70C130AEFBFD732EC0B069 +:102F4C009FFB30A2FBFD1E2DF313BE6E30A8FBFDC4 +:102F5C001E2DF313BE6A30AEFBFD1E2DF313BE64A3 :102F6C00D7C736F00071F4DC297170F000CE9D08E3 :102F7C00CE9EC0CE9F80F594FFF593FFF592FFE5B2 :102F8C0097FFE596FFE595FFE598FFCE9C7F7100D6 -:102F9C00BCFB711BE3712BE3711AE7712BE7717AA0 -:102FAC009D710A9E31929E02EFFA710B9E71036025 -:102FBC00711360712360C6D7C73102601E71026045 -:102FCC00710A9E31929E02EFFA34EAFB3692FF525E +:102F9C00BEFB711BE3712BE3711AE7712BE7717A9E +:102FAC009D710A9E31929E02EFFA710B9E71035E27 +:102FBC0071135E71235EC6D7C731025E1E71025E4D +:102FCC00710A9E31929E02EFFA34ECFB3692FF525C :102FDC00078B99A5A792DFF9710B9EC6D7C78806F8 -:102FEC001631126015711260C734B2FB3092FF16A5 -:102FFC0052078B99A5A792DFF9C666736718B2FBC7 -:10300C00C6D7C77103603114601E711360710A9EBC -:10301C0031929E02EFFA3492FF36B2FB52078B9933 -:10302C00A5A792DFF9710B9E312460137123607197 -:10303C007B9E8FF2FB9E9A8FF3FB9E9B717A9EC6B2 -:10304C00D7CFBDFB5CCFBEFB5FCFDEFB5DCF12FCF1 -:10305C0036CF13FCC9E5E9FBD7C7CFBAFB12F5BBDA -:10306C00FBCFE2FBFFF5E3FBF5E4FBF5E5FBF5E657 -:10307C00FB5600664C64DE08723836FB0086EFF3B4 -:10308C00C6D7C788061617F1E73403002361E3EDB2 -:10309C00D4332361F8ED7F31B12361E3ED89312520 -:1030AC0061F8ED9831B1240D0061D8EDD433240BC7 -:1030BC000061F8EDB9312361F8ED00322361F8EDD0 -:1030CC00CD312361F8ED983324060061F8ED6932B7 -:1030DC00B12561D8ED853224000061F8ED923223E0 -:1030EC0061F8EDD4332361F8EDB233B12361E3ED34 -:1030FC00B5322361F8EDC6322361F8EDD732236186 -:10310C00F8EDC6322361F8EDE8322361F8EDF932BF -:10311C002361F8ED08332361F8ED2A332361F8EDD0 -:10312C0036332361F8ED42332361F8ED4B3324023F -:10313C00002361E3EDD43324020061F8ED54332312 -:10314C0061F8ED61332561F8ED6D33B12406006152 -:10315C00D8EDD43324000061F8EDD7332561F8EDB8 -:10316C00793324120061F8ED93332361F8ED843345 -:10317C00EDD83334BCFB89615F99EDE533304929D7 -:10318C00FDF13866736718BAFBEDE53340BFFB6A97 -:10319C00DF1440C0FB68DF0E674C6CDF09304C421B -:1031AC00FDF138713AD5679FC1FBEDE53367D1DD91 -:1031BC000D30323DFDF13834DAFB89616F99EDE564 -:1031CC0033675C02D1DD0830D22AFDF138EF0C6791 -:1031DC005C01D1DD0630D72AFDF138675C3CD1DDCE -:1031EC001030DC2AFDF138675C3C7266736218BAE9 -:1031FC00FBEDE53367D1DD625C01D1DD0530080004 -:10320C00EF01F6609F19FC675C02D1DD03E6EF016C -:10321C00F63419FC89616899675C04D1DD04E6A178 -:10322C00EF01F63419FC89616899675C08D1DD05FA -:10323C00302000EF01F63419FC89616899675C1045 -:10324C00D1DD05301000EF01F63419FC8961689965 -:10325C00675C20D161E8716019FCEDE533D434DF93 -:10326C0008679FE3FBA434EF0D4A3405DE08E8340D -:10327C0067181DFDA434EDE533675C0F726673624D -:10328C0018BAFBEDE5334A3464DE1B4A3401DF0621 -:10329C0067D161F85701E834671836FBA4344A3417 -:1032AC000561C871725FEDE533675C7F70C117F122 -:1032BC00243000FDE92FC0EDE533675C3F70C1178A -:1032CC00F1243000FDE92FC0EDE533675C0770C1D8 -:1032DC0017F1243000FDE92FC0EDE533675C1F705A -:1032EC00C117F1243000FDE92FC0EDE5336770C143 -:1032FC0017F1243000FDE92FC0EDE533CEABAC71F6 -:10330C000A9E31929E02EFFAD592FFDF05710B9E59 -:10331C00EFED679E99710B9E9FF1FBEDE5337122EA -:10332C0060675C7F9FF2FBEDE533712260675C3F69 -:10333C009FF3FBEDE533675C3F9FF4FBEDE53367F3 -:10334C005C1F9FF5FBEDE53330FE3AFDF138679FCE -:10335C00FAFBEDE53330B93AFDF138679FFBFBEF33 -:10336C007830DB3AFDF138679FFEFBEF6C675C0150 -:10337C00D161E8FD2645EF614A3AC8DE08E83A67B4 -:10338C001868FAA43AEF52679D3AEF4D67318E24D4 -:10339C007000DD0D240200DF4030F108FDF138EF44 -:1033AC0038FD2044EF33675C01D1DD05711202EF6B -:1033BC0003711302675C02D1DD05712202EF037108 -:1033CC002302679FE9FBEF1100EF0E00664C5BDEFA -:1033DC0007736718BAFBEF0100C6D7C716664C30E7 -:1033EC00DC094C37DE05FDC42FEF6E664C02DF1F87 -:1033FC008FBCFB5C03728F1BFC5C03318E316D0840 -:10340C00616A08128F1BFC5C80312A6162EF59667D -:10341C004C3DDF0AAE90BF16FCF916FCEF4A664C29 -:10342C003EDF05F917FCEF40664C4FDF05FD4E45BE -:10343C00EF36664C61DF08E83A0968FA72EF2966E4 -:10344C004C7FDF05FDA83DEF1F664C4EDF0B316452 -:10345C0061045210EF12F2EF0F664C5BDC0452FF6A -:10346C00EF06667309BAFB72C6D7C788061617F142 -:10347C00241000240500DC07244C00DD17EF177125 -:10348C007BFA17F104BAFB1489617F99717AFA718E -:10349C003260EF02A43AC6D7C7C1C1FBF8FF401295 -:1034AC00F903DD064012F904DF2F8C027309C2FB0D -:1034BC005E0AD1DF248C02318E04BAFB14896E0AA9 -:1034CC0099716207CC0100316207086159018C01C6 -:1034DC00D1DFF4716307716B271004C6D7CF1BFCC7 -:1034EC0003F519FCF51DFCF51FFCD7C7880616174C -:1034FC00F1E734020025DD3D23DD1725DD1C23DD3E -:10350C000523DD2BEF3B716260679F1EFCCD3F03F3 -:10351C00EF2F675C839F1BFCEF27675C039F1DFCF1 -:10352C00675C034C0261F8710262FD4147EF126760 -:10353C009F1FFCEF0C6791DF08E0C15012FDA43413 -:10354C00C0C6D7C71617F1E7240000DD2A23DD1EFD -:10355C00240300DD0724FB00DD24EF253112620576 -:10356C00308000EF01F6086F1CFC7208EF198F1900 -:10357C00FCF519FC72EF107142615235EF09F2EF54 -:10358C000666730918FC72C6D7C71617F1E7240034 -:10359C0000DD38241000DD1C23DD1C23DD30240E5F -:1035AC0000DD18241100DD1B240F00DD1224300077 -:1035BC00DD15EF1EE2EF1D5202EF195204EF15520A -:1035CC0006EF115205EF0D5207EF09F2EF06520309 -:1035DC00EF0252FFC6D7C7314460377143608D3E4E -:1035EC009FC2FB8D3D9FE1FB36FCFCC7D83DFD9F88 -:1035FC0037618A70618AFDE437C0D842F1312F609F -:10360C009D418D3C4B41DD0A7152608D419D3CCDFD -:10361C003F034A3F05DE09305436FDF138CD3F6B90 -:10362C00B43F7150F000CE300BCF170006CE3106F0 -:10363C00FDB802717A30710BE3710BE7C6D78D417F -:10364C009D3C8D419FC3FBD74012F903DF0640120E -:10365C00F904DF02F2D73154600D7153607173605D -:10366C008D419F28FCEF3831646023716360717267 -:10367C0060D51EFCDF05F529FCEF0B8F1EFC5002FC -:10368C00D6A1609F29FC8F29FC9F28FCEF11317477 -:10369C0060088F29FC9F28FCEF058D419F28FC8F2B -:1036AC0028FC9FC3FBD928FCFDC736E928FC09DAA6 -:1036BC002170C15013FD4505C0F2D7C7C1C1FBF83D -:1036CC00FF8C02D1DF05F51EFCEF1A8C024C05DED7 -:1036DC0006CF1EFC02EF0E8C02318E1231FE03312E -:1036EC001F609F1EFC8F2AFC4F1EFCDD29CC011F86 -:1036FC008F1EFC9F2AFCCC00008B4C08DE148B73B5 -:10370C00091A224F1EFCDC058B9C01EF0561590048 -:10371C00EFE78C019D401004C6D7C7168B728C0145 -:10372C00614ADE1F8B728C02614ADE138C01728C33 -:10373C0002614ADE058C0172EF268C0272EF218B3E -:10374C0072EF1D8B728C02614ADE048B72EF118C4E -:10375C0001728C026142DE058C0172EF038C0272E5 -:10376C00C6D7C716710AE7710BE37150F000CE3063 -:10377C000BCF170006669E31FDB802717A30710BC3 -:10378C00E33182E302EFFA8D1F7158F000710BE701 -:10379C0072C6D7C7C1C1FBF8FF8F12FC4E02DC0307 -:1037AC00F2EF318C024F13FCDC0452FFEF268C023B -:1037BC002F12FC706131318D128F13FC2F12FC70A3 -:1037CC00613133BDD813FD310EBB440001DC03F66F -:1037DC0090BB8B721004C6D7C7C1FBF8FFAC0814A2 -:1037EC00A91489708B6128706131FD744E134403E8 -:1037FC000071FEDC23AC08148A04819A04AC081412 -:10380C008A044C11DC10A9148B99AC0814CA020060 -:10381C00AC0814CA0310EF72AC0814CA0400AC084C -:10382C0014A914894DDE0AAC08148A02819A02EF9D -:10383C0012AC0814A914894D61D308AC08148A027F -:10384C00919A02AC08148A03919A03D1DF3CAC081C -:10385C00148A024C10DF10A91489318EA112AC0805 -:10386C0014A9146299EF17AC08148A024CF0DF0EFD -:10387C00A91489318EB112AC0814A9146299AC0840 -:10388C0014CA0200AC0814CA0310C0C6D7EDDC3849 -:10389C00717BFAC7D44461F83104612E71046171F3 -:1038AC002161710361D444DD05B444CEABAC717AB3 -:1038BC00FA5600664C0ADD1272F3311C7902FDCE09 -:1038CC00FC0061CAFD3B3986EFE9717AFAF2C6D782 -:1038DC00C75600664C0ADE0BF0317E12F6782CFCD3 -:1038EC0086EFF0C6D7C7C1C1FBF8FFCC01008C0135 -:1038FC004C0ADE36717BFA8C01F0317E042CFC1400 -:10390C00A96168DF09AC02B9717AFAF2EF1D8C017A -:10391C00F0317E12792CFC614902DF06717AFAE2F1 -:10392C00EF09717AFA615901EFC4E21004C6D7C7E6 -:10393C002004FBF8FFF6422CFC61F8ED1D3A717B7C -:10394C00FA9C038C034C0ADE3C8C03F0317E042C75 -:10395C00FC14A96168DF05717AFAEF29717AFA8C87 -:10396C000372F3311C792CFCCEFC0061CA629C0200 -:10397C00D1DF0A8C03F0317E12E6782CFC717BFAD5 -:10398C00615903EFBECC0200CC01018C02F0317EF8 -:10399C00042CFC14A96168DD788C02F0317E12795C -:1039AC002CFCE743DF658C014C0ADE5F8C01F031A7 -:1039BC007E12792CFCE743DD4D717BFA8C01F031E2 -:1039CC007E042CFC14A96168DF186169018C01F07C -:1039DC00317E12F6782CFC8C024E01DCED717AFAF9 -:1039EC00EF2F8C01F0317E042CFC14A9128C02F008 -:1039FC00317E33782CFC8C01F0317E12E6782CFC75 -:103A0C00615902717AFA615901EF9B615902ED9784 -:103A1C003900F21004C6D7C7200CFBF8FF170406B8 -:103A2C0000C15006C150A8C15030FD04031006D28D -:103A3C00DD1DA040FC4040FC08DE03E2EF6B34FAD5 -:103A4C00FB895CFC99FDFE3A7110C8FBF2EF5A3011 -:103A5C000600C117040600C130FFFBFD7C4E1004AC -:103A6C00F540FC8FFAFB5C01D1DD264012F903DF37 -:103A7C00205010C180FDA434C0C736100571D4C6C7 -:103A8C00DE0F17C15006C150A8C15030FD04031001 -:103A9C00064012F901DD114012F905DD0B8FFAFB1E -:103AAC005C02D161E8FD5142F2100CC6D7D9FBFB88 -:103ABC00C15030FDDC02C0629FFEFB7130CBFB8F2E -:103ACC00D3FB5C08D1DF06716307716B27F2D7D982 -:103ADC00FEFBC1D9FDFBC15030FD760310047130E3 -:103AEC00CBFB8FD3FB5C08D1DF06716307716B27AF -:103AFC00F2D7C7200AFBF8FF500FC15030FDDC0293 -:103B0C00C04A3902DF077110C8FBF2EF5F7118C8A9 -:103B1C00FBCC07004015F901DF05CC0802EF03CC04 -:103B2C000810CC09808FFAFB5C03D1DF08717AD5C1 -:103B3C00CC0607EF06717BD5CC062F17040600C107 -:103B4C005004C150A0C15030FDAC031006C7361054 -:103B5C000571D4C6DE154012F903DF0F17C15006EC -:103B6C00C150A8C15030FD04031006F2100AC6D78C -:103B7C00D512F9DF06F6BD46F544FCD544FCDD0450 -:103B8C00B044FCD7CF44FC048F12F9318FE723DD0E -:103B9C000B24020024030061C8EDA13C8F14F93101 -:103BAC00233E301B004646DF0AE0C15010FDA43412 -:103BBC00C0EF1D3077014646DF165002C15010FD94 -:103BCC00A434C0F6464CDF088FDEFB5010D6BD4C3B -:103BDC00F6464CDD36B64C464CDF3071025FEF2BAF -:103BEC00301B004646DF13F6464EDF18E0C150107E -:103BFC00FDA434C0C94E5307EF0A30770146466125 -:103C0C00F871025FF6464E61E8B64E3134620871C7 -:103C1C003361F6BD46EF1431346105F6BD46EF0B4A -:103C2C00A646F6464661F8C946FFFF314262194A7C -:103C3C004805DE16A4484A4805DF0FA4485004C1C5 -:103C4C005010FDA434C0EF02F448314462194A4AC2 -:103C5C0005DE16A44A4A4A05DF0FA44A5008C15093 -:103C6C0010FDA434C0EF02F44AD44BDD03B44BD79F -:103C7C00315262174A4905DE14A4494A4905DF0D41 -:103C8C00A4495010C1FDA434C0EF02F4494A4906BE -:103C9C0061F8CD4B25D7C736100571D4DE0730231C -:103CAC003AFDF138D24012F903DF1D3122070630FC -:103CBC00042AFDF1383144610C7143615080C150CC -:103CCC0012FDA434C0FDD93CFD043DC6D78F1BFCAE -:103CDC005C01D1DD22D547FCDD04B047FCD7CF47D2 -:103CEC00FC098D404F46FCDD0E8D409F46FC50403C -:103CFC00C15012FDA434C0D74012F903DD04F6BD47 -:103D0C001AD7D5E6FBDF08F6461ADD19B61AD7D94D -:103D1C00E2FBF1461ADD0ED9E2FB12AD1A43DE03CB -:103D2C00A61AD7B61AD7717BFAC78FDAFB76F5DAF3 -:103D3C00FB717AFA5C10D161E8715261665C0FD14B -:103D4C00DD57665C01D1DD05F512F9EF4C665C02BE -:103D5C00D1DD11E0C15003FD492BC0711300711B63 -:103D6C0020710303665C04D1DD11711300711B20FB -:103D7C00D51BFC61F8710303FDE934665C08D16165 -:103D8C00E87103035005FD40027102035003C1FDAD -:103D9C00492BC0711A20FDF12AF2C6D7C72014FB9B -:103DAC00F8FF4A3413DC0552FFEDB73E8F14F9319E -:103DBC001505300400EF0F8F14F93145053005005F -:103DCC00EF04D915F9F1609C018D2E9C028D209C7D -:103DDC00038F02F99C048F03F99C058D509C068D72 -:103DEC00289C0771345EE661301271045E61DC312F -:103DFC00196162629C08CC09018F16F99C0AF17159 -:103E0C00240461DC9C0BAE6C609C0CAD1A609C0DA8 -:103E1C00AE6E609C0EAE6A609C0FAE64609C10F13E -:103E2C0071540761DC9C11AE66609C123114020562 -:103E3C00308000EF01F6C131246205304000EF0103 -:103E4C00F6C2616B08616A08C13134040530200088 -:103E5C00EF01F6C2616B08616A08C13124020530BA -:103E6C000800EF01F6C2616B08616A08C131546247 -:103E7C0005300400EF01F6C2616B08616A08C131BC -:103E8C00446204E6A1EF01F6C2616B08616A08C1E5 -:103E9C0031346203E6EF01F6C2616B08616A9C1370 -:103EAC00A434D834F1B107A11489721014C6D7C741 -:103EBC00FD76098F12F9318FE724000061F8ED8649 -:103ECC004023DD1B2361F8ED903F2361F8ED0C409E -:103EDC002361F8ED55402361F8ED3541ED83404009 -:103EEC0013F901DF29F64646DD05F516FDEF03A0B3 -:103EFC0016FD4016FD65DC0CF6BD46F512F9710297 -:103F0C0061EDC541AD4644020061D8EDC541713249 -:103F1C0061FDCE0471535EFDB1234015F903DF0939 -:103F2C00710261F512F9EDC541FD182640C7FB9BE6 -:103F3C00DE09710261F512F9EDC541714A27714034 -:103F4C00110571301105713A22715A227150110507 -:103F5C00FD4E29D2DD09710261F512F9EDC54171F1 -:103F6C00103500CF37001D714012054013F901DFE9 -:103F7C0005F5E3FBEF04CFE3FB03CF12F902FD34AD -:103F8C0029EDC541FD4B2CFDAA2C714A9DFDE93450 -:103F9C00FD6530F537FF712BE0F513F9710261CB3C -:103FAC00E43FEFCBE6F6F0FDCE04713BD471120288 -:103FBC007123028F14F93105285004FD5A2B625CD1 -:103FCC0003318E315D34C9FB896168995002FD5A09 -:103FDC002BD2DD067170C9FBEF047178C9FBFDB102 -:103FEC0023FD612D710814F9CF12F9038FBCFB5C12 -:103FFC0002D1DD095080C15010FDA434C0EDC54183 -:10400C00FDC7413154612FA452D452DD0831A4E0D4 -:10401C000A31020C06712BE0FD3D4231A4E0173150 -:10402C00040C13712BE05027C15005FD492BC0CF58 -:10403C0012F904710261FD32428F14F931250731F6 -:10404C00146203F512F9EDC541FDC74131020C14A0 -:10405C00F0C15005FD492BC05005FD4002FD3D420D -:10406C00CF12F903FD32428F14F931250731146256 -:10407C0003F512F9EDC541F512F9CFE3FB03F5E4B5 -:10408C00FBF5E6FB71525FF6426CFF61E8EDC54152 -:10409C00F6BD4C71035FF5FAFBFDFE3AFDC72DFD35 -:1040AC00A12CFDFF2C714B9D711302712302F5CADB -:1040BC00FBF5CBFBF5CCFBF5CDFB31245F02EFFA26 -:1040CC00CE3708CBE4BFFFCBE6FFF3CED4FFCF3720 -:1040DC00000971481205F6BEE0BEE2BED0716A2737 -:1040EC00FDC629714307714B2771481005714811A2 -:1040FC00057138100571381105713302713B22714D -:10410C005302715B227158100571581105CF12F9C9 -:10411C0005713261F6BD46F50CFCF50EFCCF14FCB6 -:10412C00FFCF10FCFFCF11FCFFF513F9F516FD3195 -:10413C0012622EFDB123AD4644030061C8E512F9AD -:10414C00D515F961E8FD2B058F14F9312511F50E04 -:10415C00FCF50CFC502EFD4002E513F9E512F9EFCD -:10416C0058D42ADF54FD2B05FD4A2371730171329B -:10417C000471430271035E71525E31949E02EFFA38 -:10418C00712AE7CEA409F5F3003114620261FDF443 -:10419C0044FD7609E5F300CEA40831126206CF1275 -:1041AC00F905EF09713361E513F9E512F9712BE7A4 -:1041BC008F14F9312503F512F9C6D7D548FCDF1A4F -:1041CC00310200155003FD5A2B625C01D1DF07F55B -:1041DC0012F9710261D7E548FCD74048FCF0DF08C2 -:1041EC0031040041F548FCD74048FCC8DF0BF51200 -:1041FC00F9710261CF48FCF0D73102000A4048FC4B -:10420C00FFDD22A048FCD7F0C15004FD492BC08F24 -:10421C00C9FB5C9F9FC9FB7110DAFB30323DFDF18D -:10422C0038CF48FCF0D731045F06F512F971026102 -:10423C00D7715361F452717207FDB802717307D7CD -:10424C00FD8C05F2D7717BFAC7200CFBF8FF8F00B1 -:10425C00FCF0F9FFFBF303FD744E13BC048F02FC5E -:10426C00F0F901FCF303FD744E13BC028F04FCF057 -:10427C00F903FCF303FD744E13BB717AFAAC04BD65 -:10428C00D8F6BDDAAC04311EBDDCF6BDDEFDE40DA6 -:10429C00ADD8BDDCADDABDDEAC02BDD8F6BDDAAC56 -:1042AC0002311EDADCC3DADEC3BDDCF6BDDEFDE4B2 -:1042BC000DC0BDDEC0BDDCADDEFD5A0FADD8BDDC22 -:1042CC00ADDABDDEABBDD8F6BDDAAB311EDADCC380 -:1042DC00DADEC3BDDCF6BDDEFDE40DC0BDDEC0BD67 -:1042EC00DCADDEFD5A0FDADAADD8FD3C46C3C58F26 -:1042FC00E2FC5C3FF0317E0462FC14C2C0B9A0E267 -:10430C00FCF6BC08BC0A9C078C074C2EDD3E8FE2E9 -:10431C00FC0E0770F161DC605C3FF0317E1279625B -:10432C00FCBDD8F6BDDA8C0773092422318FBDDCB5 -:10433C0070BDDEFDE40DAC08BDDCAC0AFD5A0FAD62 -:10434C00DABC0AADD8BC08615907EFBCAC08BDD8C3 -:10435C00AC0ABDDAC9DC0004F6FDAE0EC9DCFFFF09 -:10436C00F6FDAF0FADD8BF5CFCAF56FC425CFCDD7C -:10437C0012AF58FCBF5AFCAF56FCBF58FCAF5CFCEC -:10438C00BF56FCAF58FC425AFCDC50AF56FC4258AE -:10439C00FCDE48AF18FD4256FCDE40401CFD16DC2E -:1043AC001F401CFDA0DE168F5EFC4F1CFDDE0EAF09 -:1043BC0056FC2260FC44691061C8FD2044F51CFDCC -:1043CC00AF56FC445146DC0BAF56FC241027BF1AE9 -:1043DC00FDEF1130F82ABF1AFDEF09401CFDFF61FB -:1043EC00E8A01CFDAF5AFC4258FCDC1BAF58FC4249 -:1043FC0056FCDE13AF56FC421AFDDE0BF55EFCAF2D -:10440C0056FCBF60FCEF09405EFCFF61E8A05EFC5F -:10441C00100CC6D7717BFAC7710A9E31929E02EFBF -:10442C00FA8E949F50FC8E969F51FC8E979F52FC57 -:10443C008E989F53FC8E939F54FC8E929F55FC71CB -:10444C000B9E717AFA8F53FCFDC30F76FDBA4513A0 -:10445C00BD58D505FCDF0AD506FCDF05D507FCDD0C -:10446C0025F6B14658DF11C9583722665C0391DF37 -:10447C00060A58181A59009617FDDD4613FDF84424 -:10448C0031646102EF61520692926950FC684AFCF9 -:10449C00DFF6AD58BD56F854F3311C7918F944FECB -:1044AC00FFDD44D854F1010418F914A944FFFFDFCF -:1044BC0004E6B9EF0BD854F1010418F914A9A1B909 -:1044CC00717BFAA005FCD505FCDF1CA006FCD5060B -:1044DC00FCDF14A007FCD507FCDF0CCF05FCFFCFDD -:1044EC0006FCFFCF07FCFFC6717AFAD7C716D85463 -:1044FC00F10744A800DC05716261EF1CF647DD187A -:10450C00A4544A54A8DC05716261EF0CF854F331E1 -:10451C001CF67818F9B7EFE4C6D7C756A89666F01C -:10452C00317E12F6B17818F966D1DFF1717BFAF5AC -:10453C0005FCF506FCF507FCF454716361C6717A51 -:10454C00FAD7C72004FBF8FFD434DF178D549FE350 -:10455C00FC717BFA52069292694AFC68E4FCDFF625 -:10456C00717AFA4A3406DE0EE83409E4FC9C03A4A2 -:10457C00348C0372EF34F9E3FCF3311C7918F9BB7A -:10458C00317261058B9C03EF128C019C03D5E3FC0B -:10459C00DF06CFE3FCA7EF03B0E3FC71807177611A -:1045AC0061DC61FB7171618C03721004C6D7C7208A -:1045BC0008FBF8FF8F53FCFDC30F9C078F52FCFDCB -:1045CC00C30F9C068F51FCFDC30F9C058F50FCFD47 -:1045DC00C30F9C048F54FC9C038F55FC9C028C06CF -:1045EC00318E0112795222BB8C075C03D1DF098C0E -:1045FC00064C0361C86179008C05318EB1610900EC -:10460C00BB313D120103BB8B0E04708C011C00BB33 -:10461C008F0AFC4E03DC0E8C034F0AFCDC0B8C0265 -:10462C004F0BFCDC04AB12EF03ABB1121008C6D776 -:10463C00C7C3C12008FBF8FFF661490A61F861495C -:10464C0008DF07F7340000EDD946E6BC04F6BC06DB -:10465C00AC0ABC02AC08BBAC06614902AC0461F804 -:10466C00614900DE28AC04BDD8AC06BDDAE1FD69B9 -:10467C000FADDABC06ADD8BC04ABBDD8AC02BDDA0C -:10468C00E1FD840FADDABC02ADD8BBEFCAAC06BC01 -:10469C0002AC04BBAC08BDD8AC0ABDDAAC04BDDCC2 -:1046AC00AC06FDE70EAC04BDDCAC06FD5A0FE1FD1B -:1046BC00840FADDABC06ADD8BC04AC06614902ACC3 -:1046CC000461F8614900DCC5AC0214AB12100CC6D5 -:1046DC00D7C7C12004FBF8FF8F4DFCFDC30F9C0313 -:1046EC004E04DF1CAD564658DE07AD58265612EF69 -:1046FC0040F64658DF074656DD03E7EF34F7EF3157 -:10470C008C04318EB1128C03318E43DF1830382279 -:10471C0026560658BB8C045C0391DF05AB041800CD -:10472C00BBAB12EF0C8C034E04DE0532A900EF017B -:10473C00F71006C6D7717BFA31026209F6465ADDCC -:10474C0004B65AEF7C710362717AFA4012F904DFF5 -:10475C0007715307F424EF69D9E5FBF1E724000056 -:10476C00DD0F23DD1A23DD1023DD5323DD2723DDAD -:10477C0038715307F424EF49715207F424EF42D4F3 -:10478C0024DF07715207E424EF05715307F424C9A1 -:10479C005AFA00EF2CD424DF0B715207E424C95AC7 -:1047AC00FA00EF1DF5E5FBEF18D424DF0B7153076E -:1047BC00E424C95AFA00EF09CFE5FB02EF03FDCE62 -:1047CC0047D7D91DFCF1E7240000DD0923DD2123A7 -:1047DC00DD0923EF1B715307F424D7D424DF0771B1 -:1047EC005207E424EF05715307F424C95A2D01D75D -:1047FC00715207E424D731425F01D771635FD9E36B -:10480C00FBF1E7240000DD1223DD1923DD1123DD8C -:10481C002623DD3423DD3923DD3FFD8E48EF3DFDBE -:10482C00AF48EF38D9E2FBC1AE6CFD082DC0F313D5 -:10483C00BE6C712304EF25F0C1AE6CFD082DC0F3E6 -:10484C0013BE6C712304EF14F6BE6C712204EF0CD2 -:10485C00CB6CFF00712304EF03FD23494012F905D3 -:10486C00DD064012F901DF0671230471635F3164C8 -:10487C005F0FF6BE64BE6A31220402EF02F690BEF0 -:10488C006ED7CD2647F45CAE6C317DBFF0FCFDF8E5 -:10489C0048D2DF0ED9E2FBC1AE6CFD082DC0F3137C -:1048AC00BE6CD7FDF848D2DD0DCD2647F45CAE6C5E -:1048BC00317DBFF0FCD7E85C096C225080D6BFEC90 -:1048CC00FC22F0FCBDD8304700FD0F0EBFEEFC30D3 -:1048DC00ECFCFD1E2DF313BE6CB426D426DF0CCDE0 -:1048EC002647A45C4A5C1F61C8F45CD740C5FB0B2F -:1048FC00DC05712304F2D740C5FB0661D831225E7A -:10490C0011F0C1AE6CFD082DC0F313BE6C71220406 -:10491C00EF03FD2349E2D771625FF0C1AE6CFD0875 -:10492C002DC0F313BE6CA0F2FC40F2FC40DC3DF554 -:10493C00F2FCD9F3FCF1313F041EFD14D9F3FCF168 -:10494C00BDD85008FD5E0E087208E6D2DD04019257 -:10495C00DFFC896158D1DD05712204EF037123045A -:0D496C00A0F3FC40F3FC2061C8F5F3FCD77C -:1049790061FC61FCC1C3C5C7520C929269D4FEC1E6 -:10498900DFF88EFD708EFCC1717AFA4012F903DFEF -:104999000630042AFDF138C09EFC609EFD34D4FE29 -:1049A9005206C0B9A5A592DFF9C6C4C2C061FC61AF -:1049B900DF520C929269D4FEC1DFF88EFD708EFC35 -:1049C900C18F4105775C04D1DD06675C01D1DD50FB -:1049D900313460367162077133608FCAFB5FD2FB75 -:1049E900D1DF1B8FCBFB5FD3FBD1DF128FCCFB5FFA -:1049F900D4FBD1DF098FCDFB5FD5FBD1DD0C316253 -:104A09000702EFFA716307716B27717361FD0E304D -:104A1900F4227148500571605005717AFAED274BFF -:104A2900675C02D1DD17D422DD134A2202DD0E00B4 -:104A3900F4227148500571605005717AFA717AFA59 -:104A49008D22318FE7240000DD0823DD1423DD31B9 -:104A5900EF50F4347140500571505005E422ED27B0 -:104A69004B8F40059F0EF9715050058F0EF99F101D -:104A7900F9D90EF9FDE733629F0FF9CD2202ED272F -:104A89004B675C02D1DD18675C10D1DD05CD2203CF -:104A9900EF107148500571605005F422ED274BCD98 -:104AA90022044A2203DF138F0FF99F4005D90FF91A -:104AB900C1D90EF9FD7634C0EF228F4005768F0EED -:104AC900F901DC06400EF902DE0671605005EF4E71 -:104AD900C7D90EF9FD8E30C071505005D910F9F1C2 -:104AE900242900DD2A240400DD25242200DD2024D8 -:104AF9001100DD0C240100DD16241E00DD11EF0C70 -:104B0900400EF960DF09CF0EF961EF03A00EF94AF3 -:104B19002203DF0AD90EF9FDE733629F0FF9C09E20 -:104B2900FC609EFD34D4FE5206C0B9A5A592DFF9FA -:104B390061FCC1C7717AFA714AE5717BBD51405F69 -:104B49000401D1DD06F616A747DFF2300400BF24C1 -:104B590001F6BF2A01300B0BBF280100000000003D -:104B6900000000510FBF28010000000000000000F4 -:104B7900500FBF2801710AE671235FC6C061FCC1ED -:104B8900C5717AFAD438DD0BEA36899E44A636B463 -:104B990038EF33710AE6300400BF2401F6BF2A0159 -:104BA900300B0BBF28010000000000000000510F6E -:104BB900BF28010000000000000000500FBF2801BD -:104BC90071135F71235FC4C061FC61EF520C929253 -:104BD90069D4FEC1DFF88EFD708EFCC12006FBF89A -:104BE900FF71503002CEABACCC0100F6BC0231B241 -:104BF900E20F617902F6614902DFF371603002EF79 -:104C09007E8E519B713BE28B5C02D1DD1D8B5C0872 -:104C1900D1DF0971503002CC0100EFCF8C0570FD56 -:104C29004F35629E50CC0102EFC18B5C03D1DF404E -:104C39008E509C04715030028C01D1DF0E8C0470AF -:104C4900FD9535629C05CC0101EF318C014C02DFE9 -:104C59000671603002EF28CF34025A716030028C3D -:104C69000470C18C0570FDF734C0CF34024AEF0FD0 -:104C79008B5C01D1DD0671603002EF03EDF44B105E -:104C890006C09EFC609EFD34D4FE5206C0B9A5A59F -:104C990092DFF961FCC1C3C5C7520C929269D4FE77 -:104CA900C1DFF88EFD708EFCC1710A9E31929E02A1 -:104CB900EFFA8FF4FB4F96FFDF198FF5FB4F97FF44 -:104CC900DF118FF6FB4F98FFDF095004C15011FD2A -:104CD900A434C0710B9EC09EFC609EFD34D4FE526C -:104CE90006C0B9A5A592DFF9C6C4C2C061FCA44437 -:104CF90061FCC1C3C5C7520C929269D4FEC1DFF8E9 -:104D09008EFD708EFCC1C1FBF8FF8D1F9C018E3199 -:104D1900318EE7240600DD0823DD0E23DD22EF4E68 -:104D2900717AFA8C019D3EEF45717AFA4015F901C5 -:104D3900DF068C019D3DEF3651FF2E019D3DEF2E83 -:104D4900717AFA4014FCFFDF068C019D28EF058F6C -:104D590014FC9D288FC8FB5C01D1DF124012F903B6 -:104D6900DD064012F904DF06306C25FDF1384031CB -:104D7900FF09DE05A031FFEF137158F000714260A1 -:104D8900A02BFC402BFC0361C8F52BFC710BE3C085 -:104D9900C09EFC609EFD34D4FE5206C0B9A5A59202 -:104DA900DFF9C6C4C2C061FC61FF520C929269D49A -:104DB900FEC1DFF88EFD708EFCC1717AFA8FFAFBA5 -:104DC9005C03D1DD194012F903DD064012F904DF55 -:104DD9000D36100571D4DE0630233AFDF138C09E38 -:104DE900FC609EFD34D4FE5206C0B9A5A592DFF938 -:104DF90061FC61FC61FC61FC61FC61FC61FC61FCC2 -:104E090061FC61FC61FC61FC61FC61FC61FC61FCB1 -:104E190061FC61FC61FC61FC61FC61FC61FC61FCA1 -:0A4E290061FC61FC61FC61FC61FCAE -:0A4E340000060C12181E242A303666 -:104E3E000000C2FB0000000042FE000000007C3BB0 -:104E4E00E2358C220248DF2D9A2E4147A23CFF0804 -:0E4E5E00BB3E0000983AF82AFF005555555506 -:084E6C00FF00000000004700F8 -:104E7400317503F7332312D714AEF8C716AC0612F4 -:104E8400C5AC0416F643DD078B99A7A5B3EFF5C2AD -:024E9400C6D77F -:024FF4000200B9 -:0A4FF60031373A33363A313100000A +:102FEC001631125E1571125EC734B4FB3092FF16A7 +:102FFC0052078B99A5A792DFF9C666736718B4FBC5 +:10300C00C6D7C771035E31145E1E71135E710A9EC2 +:10301C0031929E02EFFA3492FF36B4FB52078B9931 +:10302C00A5A792DFF9710B9E31245E1371235E719B +:10303C007B9E8FF4FB9E9A8FF5FB9E9B717A9EC6AE +:10304C00D7CFBFFB5CCFC0FB5FCFE0FB5DCF14FCE9 +:10305C0036CF15FCC9E5EBFBD7C7CFBCFB12CFBDF8 +:10306C00FB02CFE4FBFFF5E5FBF5E6FBF5E7FBF533 +:10307C00E8FB5600664C64DE08723838FB0086EFBD +:10308C00F3C6D7C788061617F1E73403002361E3AC +:10309C00EDD5332361F8ED8031B12361E3ED8A3155 +:1030AC002561F8ED9931B1240D0061D8EDD53324AB +:1030BC000B0061F8EDBA312361F8ED01322361F8B0 +:1030CC00EDCE312361F8ED993324060061F8ED6AF9 +:1030DC0032B12561D8ED863224000061F8ED9332CF +:1030EC002361F8EDD5332361F8EDB333B12361E3FC +:1030FC00EDB6322361F8EDC7322361F8EDD83223F7 +:10310C0061F8EDC7322361F8EDE9322361F8EDFA8D +:10311C00322361F8ED09332361F8ED2B332361F889 +:10312C00ED37332361F8ED43332361F8ED4C332451 +:10313C0002002361E3EDD53324020061F8ED553331 +:10314C002361F8ED62332561F8ED6E33B12406008E +:10315C0061D8EDD53324000061F8EDD8332561F842 +:10316C00ED7A3324120061F8ED94332361F8ED8588 +:10317C0033EDD93334BEFB89615F99EDE6333049C9 +:10318C0029FDAA3866736718BCFBEDE63340C1FB1A +:10319C006ADF1440C2FB68DF0E674C6CDF09300934 +:1031AC0042FDAA38713AD5679FC3FBEDE63367D170 +:1031BC00DD0D30E83CFDAA3834DCFB89616F99EDFC +:1031CC00E633675C02D1DD0830D22AFDAA38EF0C59 +:1031DC00675C01D1DD0630D72AFDAA38675C3CD18B +:1031EC00DD1030DC2AFDAA38675C3C72667362180D +:1031FC00BCFBEDE63367D1DD625C01D1DD05300847 +:10320C0000EF01F6609F1BFC675C02D1DD03E6EF6B +:10321C0001F6341BFC89616899675C04D1DD04E616 +:10322C00A1EF01F6341BFC89616899675C08D1DD5C +:10323C0005302000EF01F6341BFC89616899675C4E +:10324C0010D1DD05301000EF01F6341BFC896168EC +:10325C0099675C20D161E871601BFCEDE633D432D8 +:10326C00DF08679FE5FBA432EF0D4A3205DE08E864 +:10327C003267181DFDA432EDE633675C0F7266737E +:10328C006218BCFBEDE6334A3264DE1B4A3201DFC6 +:10329C000667D161F85701E832671838FBA4324A47 +:1032AC00320561C871725DEDE633675C7F70C117E2 +:1032BC00F1243000FDE92FC0EDE633675C3F70C1AF +:1032CC0017F1243000FDE92FC0EDE633675C077081 +:1032DC00C117F1243000FDE92FC0EDE633675C1F08 +:1032EC0070C117F1243000FDE92FC0EDE633677093 +:1032FC00C117F1243000FDE92FC0EDE633CEABACA5 +:10330C00710A9E31929E02EFFAD592FFDF05710B86 +:10331C009EEFED679E99710B9E9FF3FBEDE633716B +:10332C00225E675C7F9FF4FBEDE63371225E675C87 +:10333C003F9FF5FBEDE633675C3F9FF6FBEDE63315 +:10334C00675C1F9FF7FBEDE63330B73AFDAA386791 +:10335C009FFCFBEDE63330723AFDAA38679FFDFB0C +:10336C00EF7830943AFDAA38679F00FCEF6C675CED +:10337C0001D161E8FDE344EF614A38C8DE08E83862 +:10338C0067186AFAA438EF52679D38EF4D67318E93 +:10339C00247000DD0D240200DF4030F108FDAA3856 +:1033AC00EF38FDDD43EF33675C01D1DD05711202AF +:1033BC00EF03711302675C02D1DD05712202EF038A +:1033CC00712302679FEBFBEF1100EF0E00664C5B65 +:1033DC00DE07736718BCFBEF0100C6D7C716664C37 +:1033EC0030DC094C37DE05FDC42FEF6E664C02DF76 +:1033FC001F8FBEFB5C03728F1DFC5C03318E316D25 +:10340C0008616A08128F1DFC5C80312A6162EF59D9 +:10341C00664C3DDF0AAE90BF18FCF918FCEF4A660B +:10342C004C3EDF05F919FCEF40664C4FDF05FD0BF8 +:10343C0045EF36664C61DF08E838096AFA72EF2905 +:10344C00664C7FDF05FD5E3DEF1F664C4EDF0B319A +:10345C00645F045210EF12F2EF0F664C5BDC045207 +:10346C00FFEF06667309BCFB72C6D7C78806161732 +:10347C00F1241000240500DC07244C00DD17EF17A5 +:10348C00717BFA17F104BCFB1489617F99717AFA8C +:10349C0071325EEF02A438C6D7C7C1C1FBF8FF403A +:1034AC0014F903DD064014F904DF2F8C027309C4F0 +:1034BC00FB5E0AD1DF248C02318E04BCFB14896EB6 +:1034CC000A99716207CC0100316207086159018CBD +:1034DC0001D1DFF4716307716B271004C6D7CF1DC0 +:1034EC00FC03F51BFCF51FFCF521FCD7C788061661 +:1034FC0017F1E734020025DD3D23DD1725DD1C2304 +:10350C00DD0523DD2BEF3B71625E679F20FCCD3D1B +:10351C0003EF2F675C839F1DFCEF27675C039F1FE6 +:10352C00FC675C034C0261F8710260FDFE46EF1211 +:10353C00679F21FCEF0C6791DF08E0C15012FDA5DD +:10354C0034C0C6D7C71617F1E7240000DD2A23DDE7 +:10355C001E240300DD0724FB00DD24EF253112605F +:10356C0005308000EF01F6086F1EFC7208EF198F12 +:10357C001BFCF51BFC72EF1071425F5235EF09F228 +:10358C00EF066673091AFC72C6D7C71617F1E72443 +:10359C000000DD38241000DD1C23DD1C23DD30246D +:1035AC000E00DD18241100DD1B240F00DD12243069 +:1035BC0000DD15EF1EE2EF1D5202EF195204EF155C +:1035CC005206EF115205EF0D5207EF09F2EF0652BA +:1035DC0003EF0252FFC6D7C731445E3771435E8D8D +:1035EC003C9FC4FB8D3B9FE3FB36FCFCC7D83BFDEB +:1035FC005837618A70618AFD9D37C0D840F1312FF0 +:10360C00609D3F8D3A4B3FDD0A71525E8D3F9D3A76 +:10361C00CD3D034A3D05DE09305536FDAA38CD3D7A +:10362C006BB43D7150F000CE300BCF170006CE318D +:10363C0006FDB802717A30710BE3710BE7C6D78DBA +:10364C003F9D3A8D3F9FC5FBD74014F903DF0640E1 +:10365C0014F904DF02F2D731545E0D71535E7173AD +:10366C005E8D3F9F2AFCEF3831645E2371635E717F +:10367C00725ED520FCDF05F52BFCEF0B8F20FC5088 +:10368C0002D6A1609F2BFC8F2BFC9F2AFCEF1131E3 +:10369C00745E088F2BFC9F2AFCEF058D3F9F2AFC44 +:1036AC008F2AFC9FC5FBD92AFCFDC836E92AFC09E8 +:1036BC00122070C15013FD4505C0F2D7C7C1C1FB24 +:1036CC00F8FF8C02D1DF05F520FCEF1A8C024C05BB +:1036DC00DE06CF20FC02EF0E8C02318E1231FE037F +:1036EC00311F609F20FC8F2CFC4F20FCDD29CC016E +:1036FC001F8F20FC9F2CFCCC00008B4C08DE148B05 +:10370C00730952204F20FCDC058B9C01EF0561599D +:10371C0000EFE78C019D3E1004C6D7C716710AE76F +:10372C00710BE37150F000CE300BCF170006669E84 +:10373C0031FDB802717A30710BE33182E302EFFA9A +:10374C008D1F7158F000710BE772C6D7C7C1C1FB52 +:10375C00F8FF8F14FC4E02DC03F2EF318C024F1594 +:10376C00FCDC0452FFEF268C022F14FC706131310B +:10377C008D128F15FC2F14FC70613133BDD813FDE5 +:10378C00310EBB440001DC03F690BB8B721004C6F7 +:10379C00D7C7C1FBF8FFAC0814A91489708B61283A +:1037AC00706131FD224E1344030071FEDC23AC0822 +:1037BC00148A04819A04AC08148A044C11DC10A9F4 +:1037CC00148B99AC0814CA0200AC0814CA0310EF8D +:1037DC0072AC0814CA0400AC0814A914894DDE0A92 +:1037EC00AC08148A02819A02EF12AC0814A914894D +:1037FC004D61D308AC08148A02919A02AC08148A61 +:10380C0003919A03D1DF3CAC08148A024C10DF10F0 +:10381C00A91489318EA112AC0814A9146299EF175E +:10382C00AC08148A024CF0DF0EA91489318EB11247 +:10383C00AC0814A9146299AC0814CA0200AC0814A0 +:10384C00CA0310C0C6D7ED9538717BFAC7D4426154 +:10385C00F831045F2E71045F71215F71035FD442F4 +:10386C00DD05B442CEABAC717AFA5600664C0ADD7B +:10387C001272F3311C7902FDCEFC0061CAFDF438E2 +:10388C0086EFE9717AFAF2C6D7C75600664C0ADEA3 +:10389C000BF0317E12F6782EFC86EFF0C6D7C7C13E +:1038AC00C1FBF8FFCC01008C014C0ADE36717BFAAF +:1038BC008C01F0317E042EFC14A96168DF09AC0286 +:1038CC00B9717AFAF2EF1D8C01F0317E12792EFC6F +:1038DC00614902DF06717AFAE2EF09717AFA6159ED +:1038EC0001EFC4E21004C6D7C72004FBF8FFF64270 +:1038FC002EFC61F8EDD639717BFA9C038C034C0AD3 +:10390C00DE3C8C03F0317E042EFC14A96168DF05CB +:10391C00717AFAEF29717AFA8C0372F3311C792ED1 +:10392C00FCCEFC0061CA629C02D1DF0A8C03F03130 +:10393C007E12E6782EFC717BFA615903EFBECC0245 +:10394C0000CC01018C02F0317E042EFC14A96168BC +:10395C00DD788C02F0317E12792EFCE743DF658C2A +:10396C00014C0ADE5F8C01F0317E12792EFCE743AC +:10397C00DD4D717BFA8C01F0317E042EFC14A961B3 +:10398C0068DF186169018C01F0317E12F6782EFC2B +:10399C008C024E01DCED717AFAEF2F8C01F0317E46 +:1039AC00042EFC14A9128C02F0317E33782EFC8C80 +:1039BC0001F0317E12E6782EFC615902717AFA61BF +:1039CC005901EF9B615902ED503900F21004C6D732 +:1039DC00C7200CFBF8FF17040600C15006C150A805 +:1039EC00C15030FD04031006D2DD1DA042FC404244 +:1039FC00FC08DE03E2EF6B34FCFB895CFC99FDB741 +:103A0C003A7110CAFBF2EF5A300600C117040600D7 +:103A1C00C13001FCFD2A4E1004F542FC8FFCFB5C0E +:103A2C0001D1DD264014F903DF205010C180FDA523 +:103A3C0034C0C736100571D4C6DE0F17C15006C18D +:103A4C0050A8C15030FD040310064014F901DD11DB +:103A5C004014F905DD0B8FFCFB5C02D161E8FD0E17 +:103A6C0042F2100CC6D7D9FDFBC15030FDDC02C0B0 +:103A7C00629F00FC7130CDFB8FD5FB5C08D1DF065B +:103A8C00716307716B27F2D7D900FCC1D9FFFBC159 +:103A9C005030FD760310047130CDFB8FD5FB5C08E4 +:103AAC00D1DF06716307716B27F2D7C7200AFBF8C9 +:103ABC00FF500FC15030FDDC02C04A3702DF0771E6 +:103ACC0010CAFBF2EF5F7118CAFBCC07004017F964 +:103ADC0001DF05CC0802EF03CC0810CC09808FFC69 +:103AEC00FB5C03D1DF08717AD5CC0607EF06717B3E +:103AFC00D5CC062F17040600C15004C150A0C150EC +:103B0C0030FDAC031006C736100571D4C6DE154067 +:103B1C0014F903DF0F17C15006C150A8C15030FD76 +:103B2C0004031006F2100AC6D7D514F9DF03F6BD4C +:103B3C0044D546FCDD04B046FCD7CF46FC038F14BD +:103B4C00F9318FE723DD0B24020024030061C8ED5B +:103B5C00573C8F16F931233E301B004644DF0AE0F8 +:103B6C00C15010FDA534C0EF1D3077014644DF165F +:103B7C005002C15010FDA534C0F6464ADF088FE054 +:103B8C00FB5010D6BD4AF6464ADD36B64A464ADFE9 +:103B9C003071025DEF2B301B004644DF13F6464CB0 +:103BAC00DF18E0C15010FDA534C0C94C5307EF0A13 +:103BBC00307701464461F871025DF6464C61E8B617 +:103BCC004C3134600871335FF6BD44EF1431345F0F +:103BDC0005F6BD44EF0BA644F6464461F8C944FF14 +:103BEC00FF314260194A4605DE16A4464A4605DFF7 +:103BFC000FA4465004C15010FDA534C0EF02F4468A +:103C0C00314460194A4805DE16A4484A4805DF0FBE +:103C1C00A4485008C15010FDA534C0EF02F448D49C +:103C2C0049DD03B449D7315260174A4705DE14A465 +:103C3C00474A4705DF0DA4475010C1FDA534C0EF1E +:103C4C0002F4474A470661F8CD4925D7C736100517 +:103C5C0071D4DE0730DC39FDAA38D24014F903DF09 +:103C6C001D3122070630042AFDAA3831445F0C713D +:103C7C00435F5080C15012FDA534C0FD8F3CFDBA8E +:103C8C003CC6D78F1DFC5C01D1DD22D549FCDD047F +:103C9C00B049FCD7CF49FC098D3E4F48FCDD0E8D59 +:103CAC003E9F48FC5040C15012FDA534C0D7401473 +:103CBC00F903DD04F6BD1AD7D5E8FBDF08F6461A82 +:103CCC00DD19B61AD7D9E4FBF1461ADD0ED9E4FB9F +:103CDC0012AD1A43DE03A61AD7B61AD7717BFAC7F0 +:103CEC008FDCFB76F5DCFB717AFA5C10D161E87144 +:103CFC00525F665C0FD1DD57665C01D1DD05F514B2 +:103D0C00F9EF4C665C02D1DD11E0C15003FD492B8B +:103D1C00C0711300711B20710303665C04D1DD11AB +:103D2C00711300711B20D51DFC61F8710303FDEAB2 +:103D3C0034665C08D161E87103035005FD400271E3 +:103D4C0002035003C1FD492BC0711A20FDF12AF268 +:103D5C00C6D7C72014FBF8FF4A3213DC0552FFED1F +:103D6C006D3E8F16F9311505300400EF0F8F16F9E3 +:103D7C00314505300500EF04D917F9F1609C018D30 +:103D8C002E9C028D209C038F02F99C048F03F99CBE +:103D9C00058D4E9C068D289C0771345CE6613012B3 +:103DAC0071045C61DC31196162629C08CC09018F81 +:103DBC0018F99C0AF171240461DC9C0BAE6C609CBC +:103DCC000CAD1A609C0DAE6E609C0EAE6A609C0FC2 +:103DDC00AE64609C10F171540761DC9C11AE66609E +:103DEC009C1231140205308000EF01F6C1312460C1 +:103DFC0005304000EF01F6C2616B08616A08C13101 +:103E0C00340405302000EF01F6C2616B08616A08CA +:103E1C00C131240205300800EF01F6C2616B086164 +:103E2C006A08C131546005300400EF01F6C2616BC1 +:103E3C0008616A08C131446004E6A1EF01F6C26171 +:103E4C006B08616A08C131346003E6EF01F6C261A8 +:103E5C006B08616A9C13A432D832F1B107A11489A2 +:103E6C00721014C6D7C7FD76098F14F9318FE72469 +:103E7C00000061F8ED424023DD1B2361F8ED4C3F5F +:103E8C002361F8EDC83F2361F8ED11402361F8ED93 +:103E9C00F140ED3F404015F901DF29F64644DD05C0 +:103EAC00F516FDEF03A016FD4016FD65DC0CF6BD06 +:103EBC0044F514F971025FED8241AD444402006196 +:103ECC00D8ED824171325FFDCE0471535CFDB1239C +:103EDC004017F903DF0971025FF514F9ED8241FD1A +:103EEC00182640C9FB9BDE0971025FF514F9ED82BF +:103EFC0041714A277140110571301105713A2271D7 +:103F0C005A2271501105FD4E29D2DD0971025FF55F +:103F1C0014F9ED824171103500CF37001D7140123C +:103F2C00054015F901DD064015F903DF05F5E5FB44 +:103F3C00EF04CFE5FB03CF14F902FD3429ED8241E8 +:103F4C00FD4B2CFDAA2C714A9DFDEA34FD6530F524 +:103F5C0037FF712BE0F515F971025FCBE43FEFCB26 +:103F6C00E6F6F0FDCE04713BD47112027123028F80 +:103F7C0016F93105285004FD5A2B625C03318E3141 +:103F8C005D34CBFB896168995002FD5A2BD2DD065A +:103F9C007170CBFBEF047178CBFBFDB123FD612D70 +:103FAC00710816F9CF14F9038FBEFB5C02D1DD0941 +:103FBC005080C15010FDA534C0ED8241FD844131CB +:103FCC00545F2FA450D450DD0831A4E00A31020C08 +:103FDC0006712BE0FDFA4131A4E01731040C13718A +:103FEC002BE05027C15005FD492BC0CF14F90471AB +:103FFC00025FFDEF418F16F931250731146003F58F +:10400C0014F9ED8241FD844131020C14F0C15005CC +:10401C00FD492BC05005FD4002FDFA41CF14F903B8 +:10402C00FDEF418F16F931250731146003F514F9B2 +:10403C00ED8241F514F9CFE5FB03F5E6FBF5E8FB62 +:10404C0071525DF6426CFF61E8ED8241F6BD4A713A +:10405C00035DF5FCFBFDB73AFDC72DFDA12CFDFF63 +:10406C002C714B9D711302712302F5CCFBF5CDFB2A +:10407C00F5CEFBF5CFFB31245D02EFFACE3708CB42 +:10408C00E4BFFFCBE6FFF3CED4FFCF370009714876 +:10409C001205F6BEE0BEE2BED0716A27FDC62971DC +:1040AC004307714B27714810057148110571381081 +:1040BC000571381105713302713B22715302715B2A +:1040CC00227158100571581105CF14F90571325F22 +:1040DC00F6BD44F50EFCF510FCCF16FCFFCF12FC20 +:1040EC00FFCF13FCFFF515F9F516FD3112602FFD0E +:1040FC00B123AD4444030061C8E514F9D517F96147 +:10410C00E8FD2B058F16F9312512F510FCF50EFC88 +:10411C00502EFD4002CF15F903E514F9EF58D42ABF +:10412C00DF54FD2B05FD4A23717301713204714379 +:10413C000271035C71525C31949E02EFFA712AE7B2 +:10414C00CEA409F5F3003114600261FDF442FD7652 +:10415C0009E5F300CEA40831126006CF14F905EF7F +:10416C000971335FE515F9E514F9712BE78F16F931 +:10417C00312503F514F9C6D7D54AFCDF1A310200F4 +:10418C00155003FD5A2B625C01D1DF07F514F97150 +:10419C00025FD7E54AFCD7404AFCF0DF0831040047 +:1041AC0041F54AFCD7404AFCC8DF0BF514F9710203 +:1041BC005FCF4AFCF0D73102000A404AFCFFDD22F7 +:1041CC00A04AFCD7F0C15004FD492BC08FCBFB5C3F +:1041DC009F9FCBFB7110DCFB30E83CFDAA38CF4A2B +:1041EC00FCF0D731045D06F514F971025FD77153F9 +:1041FC005FF450717207FDB802717307D7FD8C051F +:10420C00F2D7717BFAC7200CFBF8FF8F02FCF0F998 +:10421C0001FCF303FD224E13BC048F04FCF0F903E4 +:10422C00FCF303FD224E13BC028F06FCF0F905FCD7 +:10423C00F303FD224E13BB717AFAAC04BDD8F6BD64 +:10424C00DAAC04311EBDDCF6BDDEFDE40DADD8BD2F +:10425C00DCADDABDDEAC02BDD8F6BDDAAC02311E87 +:10426C00DADCC3DADEC3BDDCF6BDDEFDE40DC0BDB9 +:10427C00DEC0BDDCADDEFD5A0FADD8BDDCADDABDA8 +:10428C00DEABBDD8F6BDDAAB311EDADCC3DADEC389 +:10429C00BDDCF6BDDEFDE40DC0BDDEC0BDDCADDEBB +:1042AC00FD5A0FDADAADD8FDF945C3C58FE4FC5CD5 +:1042BC003FF0317E0464FC14C2C0B9A0E4FCF6BC2F +:1042CC0008BC0A9C078C074C2EDD3E8FE4FC0E07C5 +:1042DC0070F161DC605C3FF0317E127964FCBDD81A +:1042EC00F6BDDA8C0773095C20318FBDDC70BDDE46 +:1042FC00FDE40DAC08BDDCAC0AFD5A0FADDABC0A0E +:10430C00ADD8BC08615907EFBCAC08BDD8AC0ABD30 +:10431C00DAC9DC0004F6FDAE0EC9DCFFFFF6FDAF1A +:10432C000FADD8BF5EFCAF58FC425EFCDD12AF5A3D +:10433C00FCBF5CFCAF58FCBF5AFCAF5EFCBF58FC2A +:10434C00AF5AFC425CFCDC50AF58FC425AFCDE48D5 +:10435C00AF18FD4258FCDE40401CFD16DC1F401C13 +:10436C00FDA0DE168F60FC4F1CFDDE0EAF58FC224C +:10437C0062FC44691061C8FDDD43F51CFDAF58FCBF +:10438C00445146DC0BAF58FC241027BF1AFDEF112B +:10439C0030F82ABF1AFDEF09401CFDFF61E8A01C94 +:1043AC00FDAF5CFC425AFCDC1BAF5AFC4258FCDEF5 +:1043BC0013AF58FC421AFDDE0BF560FCAF58FCBF86 +:1043CC0062FCEF094060FCFF61E8A060FC100CC6C9 +:1043DC00D7717BFAC7710A9E31929E02EFFA8E94C6 +:1043EC009F52FC8E969F53FC8E979F54FC8E989FE9 +:1043FC0055FC8E939F56FC8E929F57FC710B9E71B1 +:10440C007AFA8F55FCFDC30F76FD774513BD56D553 +:10441C0007FCDF0AD508FCDF05D509FCDD25F6B164 +:10442C004656DF11C9563722665C0391DF060A56E1 +:10443C00181A57009617FD9A4613FDB54431645F60 +:10444C0002EF61520692926952FC684CFCDFF6ADA9 +:10445C0056BD54F852F3311C791AF944FEFFDD4471 +:10446C00D852F101041AF914A944FFFFDF04E6B98C +:10447C00EF0BD852F101041AF914A9A1B9717BFA06 +:10448C00A007FCD507FCDF1CA008FCD508FCDF143A +:10449C00A009FCD509FCDF0CCF07FCFFCF08FCFF03 +:1044AC00CF09FCFFC6717AFAD7C716D852F1074468 +:1044BC00A800DC0571625FEF1CF647DD18A4524AB8 +:1044CC0052A8DC0571625FEF0CF852F3311CF678E0 +:1044DC001AF9B7EFE4C6D7C756A89666F0317E1224 +:1044EC00F6B1781AF966D1DFF1717BFAF507FCF5B4 +:1044FC0008FCF509FCF45271635FC6717AFAD7C7F0 +:10450C002004FBF8FFD432DF178D529FE5FC717B42 +:10451C00FA52069292694CFC68E6FCDFF6717AFA64 +:10452C004A3206DE0EE83209E6FC9C03A4328C0308 +:10453C0072EF34F9E5FCF3311C791AF9BB31725F77 +:10454C00058B9C03EF128C019C03D5E5FCDF06CF99 +:10455C00E5FCA7EF03B0E5FC718071775F61DC616E +:10456C00FB71715F8C03721004C6D7C72008FBF86F +:10457C00FF8F55FCFDC30F9C078F54FCFDC30F9C94 +:10458C00068F53FCFDC30F9C058F52FCFDC30F9C83 +:10459C00048F56FC9C038F57FC9C028C06318E01B9 +:1045AC0012798A20BB8C075C03D1DF098C064C0383 +:1045BC0061C86179008C05318EB1610900BB313D58 +:1045CC00120103BB8B0E04708C011C00BB8F0CFC06 +:1045DC004E03DC0E8C034F0CFCDC0B8C024F0DFCE1 +:1045EC00DC04AB12EF03ABB1121008C6D7C7C3C1C2 +:1045FC002008FBF8FFF661490A61F8614908DF07FA +:10460C00F7340000ED9646E6BC04F6BC06AC0ABCDA +:10461C0002AC08BBAC06614902AC0461F86149000C +:10462C00DE28AC04BDD8AC06BDDAE1FD690FADDA0D +:10463C00BC06ADD8BC04ABBDD8AC02BDDAE1FD8480 +:10464C000FADDABC02ADD8BBEFCAAC06BC02AC04F1 +:10465C00BBAC08BDD8AC0ABDDAAC04BDDCAC06FD05 +:10466C00E70EAC04BDDCAC06FD5A0FE1FD840FADCA +:10467C00DABC06ADD8BC04AC06614902AC0461F8E6 +:10468C00614900DCC5AC0214AB12100CC6D7C7C113 +:10469C002004FBF8FF8F4FFCFDC30F9C034E04DF7F +:1046AC001CAD544656DE07AD56265412EF40F64666 +:1046BC0056DF074654DD03E7EF34F7EF318C043156 +:1046CC008EB1128C03318E43DF18303822265406FB +:1046DC0056BB8C045C0391DF05AB041800BBAB121A +:1046EC00EF0C8C034E04DE0532A900EF01F7100627 +:1046FC00C6D7717BFA31026009F64658DD04B6580C +:10470C00EF7C710360717AFA4014F904DF0771537E +:10471C0007F424EF69D9E7FBF1E7240000DD0F2350 +:10472C00DD1A23DD1023DD5323DD2723DD38715300 +:10473C0007F424EF49715207F424EF42D424DF0725 +:10474C00715207E424EF05715307F424C958FA0099 +:10475C00EF2CD424DF0B715207E424C958FA00EF74 +:10476C001DF5E7FBEF18D424DF0B715307E424C9C4 +:10477C0058FA00EF09CFE7FB02EF03FD8B47D7D9BF +:10478C001FFCF1E7240000DD0923DD2123DD0923D3 +:10479C00EF1B715307F424D7D424DF07715207E4BD +:1047AC0024EF05715307F424C9582D01D771520712 +:1047BC00E424D731425D01D771635DD9E5FBF1E7A4 +:1047CC00240000DD1223DD1923DD1123DD2623DD7A +:1047DC003423DD3923DD3FFD4B48EF3DFD6C48EFC5 +:1047EC0038D9E4FBC1AE6CFD082DC0F313BE6C715F +:1047FC002304EF25F0C1AE6CFD082DC0F313BE6C85 +:10480C00712304EF14F6BE6C712204EF0CCB6CFF19 +:10481C0000712304EF03FDE0484014F905DD064068 +:10482C0014F901DF0671230471635D31645D0FF6C9 +:10483C00BE64BE6A31220402EF02F690BE6ED7CD82 +:10484C002647F45AAE6C317DBFF2FCFDB548D2DF81 +:10485C000ED9E4FBC1AE6CFD082DC0F313BE6CD7B2 +:10486C00FDB548D2DD0DCD2647F45AAE6C317DBF77 +:10487C00F2FCD7E85A09A4205080D6BFEEFC22F2F5 +:10488C00FCBDD8304700FD0F0EBFF0FC30EEFCFD38 +:10489C001E2DF313BE6CB426D426DF0CCD2647A4F4 +:1048AC005A4A5A1F61C8F45AD740C7FB0BDC057132 +:1048BC002304F2D740C7FB0661D831225C11F0C14A +:1048CC00AE6CFD082DC0F313BE6C712204EF03FD1A +:1048DC00E048E2D771625DF0C1AE6CFD082DC0F30B +:1048EC0013BE6CA0F4FC40F4FC40DC3DF5F4FCD9A8 +:1048FC00F5FCF1313F041EFD14D9F5FCF1BDD85087 +:10490C0008FD5E0E087208E6D2DD040192DFFC8918 +:10491C006158D1DD05712204EF03712304A0F5FC6D +:0A492C0040F5FC2061C8F5F5FCD74A +:1049360061FC61FCC1C3C5C7520C929269D4FEC129 +:10494600DFF88EFD708EFCC1717AFA4014F903DF30 +:104956000630042AFDAA38C09EFC609EFD34D4FEB3 +:104966005206C0B9A5A592DFF9C6C4C2C061FC61F2 +:10497600DF520C929269D4FEC1DFF88EFD708EFC78 +:10498600C18F4105775C04D1DD06675C01D1DD503E +:1049960031345E3671620771335E8FCCFB5FD4FBB8 +:1049A600D1DF1B8FCDFB5FD5FBD1DF128FCEFB5F37 +:1049B600D6FBD1DF098FCFFB5FD7FBD1DD0C316290 +:1049C6000702EFFA716307716B2771735FFD0E3093 +:1049D600F4227148500571605005717AFAEDE44A87 +:1049E600675C02D1DD17D422DD134A2202DD0E00F8 +:1049F600F4227148500571605005717AFA717AFA9D +:104A06008D22318FE7240000DD0823DD1423DD31FC +:104A1600EF50F4327140500571505005E422EDE438 +:104A26004A8F40059F10F9715050058F10F99F125B +:104A3600F9D910F9FDE833629F11F9CD2202EDE4B0 +:104A46004A675C02D1DD18675C10D1DD05CD220313 +:104A5600EF107148500571605005F422EDE44ACD1F +:104A660022044A2203DF138F11F99F4005D911F959 +:104A7600C1D910F9FD7734C0EF228F4005768F102B +:104A8600F901DC064010F902DE0671605005EF4EB2 +:104A9600C7D910F9FD8F30C071505005D912F9F100 +:104AA600242900DD2A240400DD25242200DD20241B +:104AB6001100DD0C240100DD16241E00DD11EF0CB3 +:104AC6004010F960DF09CF10F961EF03A010F94A31 +:104AD6002203DF0AD910F9FDE833629F11F9C09E5F +:104AE600FC609EFD34D4FE5206C0B9A5A592DFF93E +:104AF60061FCC1C7717AFA714AE5717BBD51405FAD +:104B06000401D1DD06F616A747DFF2300400BF2404 +:104B160001F6BF2A01300B0BBF2801000000000080 +:104B2600000000510FBF2801000000000000000037 +:104B3600500FBF2801710AE671235DC6C061FCC132 +:104B4600C5717AFAD436DD0BEA34899E44A634B4AC +:104B560036EF33710AE6300400BF2401F6BF2A019E +:104B6600300B0BBF28010000000000000000510FB1 +:104B7600BF28010000000000000000500FBF280100 +:104B860071135D71235DC4C061FC61EF520C92929A +:104B960069D4FEC1DFF88EFD708EFCC12006FBF8DD +:104BA600FF71503002CEABACCC0100F6BC0231B284 +:104BB600E20F617902F6614902DFF371603002EFBC +:104BC6007E8E519B713BE28B5C02D1DD1D8B5C08B6 +:104BD600D1DF0971503002CC0100EFCF8C0570FD9A +:104BE6005035629E50CC0102EFC18B5C03D1DF4091 +:104BF6008E509C04715030028C01D1DF0E8C0470F3 +:104C0600FD9635629C05CC0101EF318C014C02DF2B +:104C16000671603002EF28CF34025A716030028C80 +:104C26000470C18C0570FDF834C0CF34024AEF0F12 +:104C36008B5C01D1DD0671603002EF03EDB14B10E4 +:104C460006C09EFC609EFD34D4FE5206C0B9A5A5E2 +:104C560092DFF961FCC1C3C5C7520C929269D4FEBA +:104C6600C1DFF88EFD708EFCC1710A9E31929E02E4 +:104C7600EFFA8FF6FB4F96FFDF198FF7FB4F97FF83 +:104C8600DF118FF8FB4F98FFDF095004C15011FD6B +:104C9600A534C0710B9EC09EFC609EFD34D4FE52AE +:104CA60006C0B9A5A592DFF9C6C4C2C061FCA4427C +:104CB60061FCC1C3C5C7520C929269D4FEC1DFF82C +:104CC6008EFD708EFCC1C1FBF8FF8D1F9C018E31DD +:104CD600318EE7240600DD0823DD0E23DD22EF4EAC +:104CE600717AFA8C019D3CEF45717AFA4017F90109 +:104CF600DF068C019D3BEF3651FF2E019D3BEF2ECB +:104D0600717AFA4016FCFFDF068C019D28EF058FAD +:104D160016FC9D288FCAFB5C01D1DF124014F903F3 +:104D2600DD064014F904DF06306C25FDAA38403153 +:104D3600FF09DE05A031FFEF077158F00071425EF2 +:104D4600710BE3C0C09EFC609EFD34D4FE5206C0CB +:104D5600B9A5A592DFF9C6C4C2C061FC61FF520CB9 +:104D6600929269D4FEC1DFF88EFD708EFCC1717A15 +:104D7600FA8FFCFB5C03D1DD194014F903DD064014 +:104D860014F904DF0D36100571D4DE0630DC39FD6A +:104D9600AA38C09EFC609EFD34D4FE5206C0B9A55A +:104DA600A592DFF961FC61FC61FC61FC61FC61FCC0 +:104DB60061FC61FC61FC61FC61FC61FC61FC61FC05 +:104DC60061FC61FC61FC61FC61FC61FC61FC61FCF5 +:0E4DD60061FC61FC61FC61FC61FC61FC61FC44 +:0A4DE40000060C12181E242A3036B7 +:104DEE00C4FB0000000040FE00000000353BE33530 +:104DFE008C22BF47DF2D9A2EFE46583CFF08713E8F +:0C4E0E000000983AF82AFF005555555551 +:084E1A00FF000000000047004A +:104E2200317503F7332312D714AEF8C716AC061246 +:104E3200C5AC0416F643DD078B99A7A5B3EFF5C2FF +:024E4200C6D7D1 +:024FF4000202B7 +:0A4FF60031393A35313A3135000007 :00000001FF  \ No newline at end of file diff --git a/branches/sim/bsr.lmf b/branches/sim/bsr.lmf index 47e7b7f..6e5c8e7 100644 Binary files a/branches/sim/bsr.lmf and b/branches/sim/bsr.lmf differ diff --git a/branches/sim/bsr_k0r.map b/branches/sim/bsr_k0r.map index 582d06f..671c929 100644 --- a/branches/sim/bsr_k0r.map +++ b/branches/sim/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.33 Date: 2 Aug 2011 Page: 1 +78K0R Linker W1.33 Date: 3 Aug 2011 Page: 1 Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - obsr.lmf ..\..\..\..\Program Files (x86)\NEC Electronics Tool @@ -9,12 +9,12 @@ Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - bsr_k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Elec tronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bc l0rm.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronic - s Tools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w0 loader.rel + s Tools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2 c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel r enge.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 ta - sk_status.rel led_cam.rel led_pow.rel hal.rel + sk_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map @@ -23,9 +23,9 @@ Direc-file:bsr_mcu.dr *** Link information *** - 67 output segment(s) - 3DE2H byte(s) real data - 6162 symbol(s) defined + 68 output segment(s) + 3D91H byte(s) real data + 6153 symbol(s) defined *** Memory map *** @@ -88,6 +88,8 @@ Direc-file:bsr_mcu.dr @@CODE 000C4H 00000H CSEG BASE @@CODE magic 000C4H 00000H @@CODE ini_VECT 000C4H 00000H + @@CODE batt_params + 000C4H 00000H LDR_CODL 000C4H 00000H CSEG LDR_CODL loader 000C4H 00000H LDR_CODL main 000C4H 00000H @@ -161,287 +163,303 @@ Direc-file:bsr_mcu.dr @@CNST 0200AH 00282H CSEG @@CNST @cstart 0200AH 00000H @@CNST loader 0200AH 00000H - @@CNST pm 0200AH 001D0H - @@CNST i2c_ctr 021DAH 00000H - @@CNST main 021DAH 00000H - @@CNST magic 021DAH 00000H - @@CNST WDT 021DAH 00000H - @@CNST i2c_mcu 021DAH 00000H - @@CNST i2c_twl 021DAH 00000H - @@CNST led 021DAH 00000H - @@CNST rtc 021DAH 00000H - @@CNST vreg_ctr 021DAH 00000H - @@CNST vreg_twl 021DAH 00000H - @@CNST adc 021DAH 00048H - @@CNST renge 02222H 00000H - @@CNST accero 02222H 00000H + @@CNST pm 0200AH 00008H + @@CNST i2c_ctr 02012H 00000H + @@CNST main 02012H 00000H + @@CNST magic 02012H 00000H + @@CNST WDT 02012H 00000H + @@CNST i2c_mcu 02012H 00000H + @@CNST i2c_twl 02012H 00000H + @@CNST led 02012H 00000H + @@CNST rtc 02012H 00000H + @@CNST vreg_ctr 02012H 00000H + @@CNST vreg_twl 02012H 00000H + @@CNST adc 02012H 00048H + @@CNST renge 0205AH 00000H + @@CNST accero 0205AH 00000H @@CNST self_flash - 02222H 00002H - @@CNST sw 02224H 00000H + 0205AH 00002H + @@CNST sw 0205CH 00000H @@CNST task_debug - 02224H 00000H + 0205CH 00000H @@CNST task_misc - 02224H 00000H - @@CNST task_sys 02224H 00000H + 0205CH 00000H + @@CNST task_sys 0205CH 00000H @@CNST pedo_alg_thre_det2 - 02224H 00048H - @@CNST ini_VECT 0226CH 00000H + 0205CH 00048H + @@CNST ini_VECT 020A4H 00000H @@CNST task_status - 0226CH 00000H - @@CNST led_cam 0226CH 00000H - @@CNST led_pow 0226CH 00020H - @@CNST hal 0228CH 00000H - ROM_CODE 0228CH 026EDH CSEG + 020A4H 00000H + @@CNST led_cam 020A4H 00000H + @@CNST led_pow 020A4H 00020H + @@CNST hal 020C4H 00000H + @@CNST batt_params + 020C4H 001C8H + ROM_CODE 0228CH 026AAH CSEG ROM_CODE pm 0228CH 009BFH ROM_CODE i2c_ctr 02C4BH 0005FH ROM_CODE i2c_twl 02CAAH 0005EH ROM_CODE led 02D08H 00265H ROM_CODE rtc 02F6DH 000E0H - ROM_CODE vreg_ctr 0304DH 0049CH - ROM_CODE vreg_twl 034E9H 000F9H - ROM_CODE adc 035E2H 002B7H - ROM_CODE renge 03899H 0018AH - ROM_CODE accero 03A23H 00159H - ROM_CODE sw 03B7CH 00126H + ROM_CODE vreg_ctr 0304DH 0049DH + ROM_CODE vreg_twl 034EAH 000F9H + ROM_CODE adc 035E3H 0026FH + ROM_CODE renge 03852H 0018AH + ROM_CODE accero 039DCH 00159H + ROM_CODE sw 03B35H 00123H ROM_CODE task_misc - 03CA2H 00219H - ROM_CODE task_sys 03EBBH 00396H + 03C58H 00219H + ROM_CODE task_sys 03E71H 0039DH ROM_CODE pedo_alg_thre_det2 - 04251H 004F0H - ROM_CODE led_cam 04741H 000C1H - ROM_CODE led_pow 04802H 00177H - @@BASE 04979H 004BAH CSEG BASE - @@BASE loader 04979H 00000H - @@BASE pm 04979H 0003FH - @@BASE i2c_ctr 049B8H 00183H - @@BASE main 04B3BH 00000H - @@BASE magic 04B3BH 00000H - @@BASE WDT 04B3BH 00000H - @@BASE i2c_mcu 04B3BH 00098H - @@BASE i2c_twl 04BD3H 000CBH - @@BASE led 04C9EH 00000H - @@BASE rtc 04C9EH 0005DH - @@BASE vreg_ctr 04CFBH 00000H - @@BASE vreg_twl 04CFBH 00000H - @@BASE adc 04CFBH 000B6H - @@BASE renge 04DB1H 00000H - @@BASE accero 04DB1H 0004AH + 0420EH 004F0H + ROM_CODE led_cam 046FEH 000C1H + ROM_CODE led_pow 047BFH 00177H + @@BASE 04936H 004AEH CSEG BASE + @@BASE loader 04936H 00000H + @@BASE pm 04936H 0003FH + @@BASE i2c_ctr 04975H 00183H + @@BASE main 04AF8H 00000H + @@BASE magic 04AF8H 00000H + @@BASE WDT 04AF8H 00000H + @@BASE i2c_mcu 04AF8H 00098H + @@BASE i2c_twl 04B90H 000CBH + @@BASE led 04C5BH 00000H + @@BASE rtc 04C5BH 0005DH + @@BASE vreg_ctr 04CB8H 00000H + @@BASE vreg_twl 04CB8H 00000H + @@BASE adc 04CB8H 000AAH + @@BASE renge 04D62H 00000H + @@BASE accero 04D62H 0004AH @@BASE self_flash - 04DFBH 00000H - @@BASE sw 04DFBH 00000H + 04DACH 00000H + @@BASE sw 04DACH 00000H @@BASE task_debug - 04DFBH 00000H + 04DACH 00000H @@BASE task_misc - 04DFBH 00000H - @@BASE task_sys 04DFBH 00000H + 04DACH 00000H + @@BASE task_sys 04DACH 00000H @@BASE pedo_alg_thre_det2 - 04DFBH 00000H - @@BASE ini_VECT 04DFBH 00038H + 04DACH 00000H + @@BASE ini_VECT 04DACH 00038H @@BASE task_status - 04E33H 00000H - @@BASE led_cam 04E33H 00000H - @@BASE led_pow 04E33H 00000H - @@BASE hal 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP - @@CNSTL @cstart 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP - @@CNSTL pm 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP - @@CNSTL led 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP - @@CNSTL rtc 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP - @@CNSTL adc 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP - @@CNSTL renge 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP - @@CNSTL accero 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP - @@CNSTL sw 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP + 04DE4H 00000H + @@BASE led_cam 04DE4H 00000H + @@BASE led_pow 04DE4H 00000H + @@BASE hal 04DE4H 00000H + @@BASE batt_params + 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL @cstart 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL pm 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL led 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL rtc 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL adc 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL renge 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL accero 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL sw 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP @@CNSTL task_misc - 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP - @@CNSTL task_sys 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP + 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL task_sys 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP - @@CNSTL led_cam 04E33H 00000H - @@CNSTL 04E33H 00000H CSEG PAGE64KP - @@CNSTL led_pow 04E33H 00000H - @@CALT 04E33H 00000H CSEG - @@CALT @cstart 04E33H 00000H - @@CALT loader 04E33H 00000H - @@CALT pm 04E33H 00000H - @@CALT i2c_ctr 04E33H 00000H - @@CALT main 04E33H 00000H - @@CALT magic 04E33H 00000H - @@CALT WDT 04E33H 00000H - @@CALT i2c_mcu 04E33H 00000H - @@CALT i2c_twl 04E33H 00000H - @@CALT led 04E33H 00000H - @@CALT rtc 04E33H 00000H - @@CALT vreg_ctr 04E33H 00000H - @@CALT vreg_twl 04E33H 00000H - @@CALT adc 04E33H 00000H - @@CALT renge 04E33H 00000H - @@CALT accero 04E33H 00000H - @@CALT self_flash - 04E33H 00000H - @@CALT sw 04E33H 00000H - @@CALT task_debug - 04E33H 00000H - @@CALT task_misc - 04E33H 00000H - @@CALT task_sys 04E33H 00000H - @@CALT pedo_alg_thre_det2 - 04E33H 00000H - @@CALT ini_VECT 04E33H 00000H - @@CALT task_status - 04E33H 00000H - @@CALT led_cam 04E33H 00000H - @@CALT led_pow 04E33H 00000H - @@CALT hal 04E33H 00000H - @@RLINIT 04E33H 00000H CSEG UNIT64KP - @@RLINIT loader 04E33H 00000H - @@RLINIT pm 04E33H 00000H - @@RLINIT i2c_ctr 04E33H 00000H - @@RLINIT main 04E33H 00000H - @@RLINIT magic 04E33H 00000H - @@RLINIT WDT 04E33H 00000H - @@RLINIT i2c_mcu 04E33H 00000H - @@RLINIT i2c_twl 04E33H 00000H - @@RLINIT led 04E33H 00000H - @@RLINIT rtc 04E33H 00000H - @@RLINIT vreg_ctr 04E33H 00000H - @@RLINIT vreg_twl 04E33H 00000H - @@RLINIT adc 04E33H 00000H - @@RLINIT renge 04E33H 00000H - @@RLINIT accero 04E33H 00000H - @@RLINIT self_flash - 04E33H 00000H - @@RLINIT sw 04E33H 00000H - @@RLINIT task_debug - 04E33H 00000H - @@RLINIT task_misc - 04E33H 00000H - @@RLINIT task_sys 04E33H 00000H - @@RLINIT pedo_alg_thre_det2 - 04E33H 00000H - @@RLINIT ini_VECT 04E33H 00000H - @@RLINIT task_status - 04E33H 00000H - @@RLINIT led_cam 04E33H 00000H - @@RLINIT led_pow 04E33H 00000H - @@RLINIT hal 04E33H 00000H - @@RLINIT @rom 04E33H 00000H - @@CODEL 04E33H 00000H CSEG - @@CODEL pm 04E33H 00000H - @@CODEL i2c_ctr 04E33H 00000H - @@CODEL magic 04E33H 00000H - @@CODEL i2c_twl 04E33H 00000H - @@CODEL led 04E33H 00000H - @@CODEL rtc 04E33H 00000H - @@CODEL vreg_ctr 04E33H 00000H - @@CODEL vreg_twl 04E33H 00000H - @@CODEL adc 04E33H 00000H - @@CODEL renge 04E33H 00000H - @@CODEL accero 04E33H 00000H - @@CODEL sw 04E33H 00000H - @@CODEL task_misc - 04E33H 00000H - @@CODEL task_sys 04E33H 00000H - @@CODEL pedo_alg_thre_det2 - 04E33H 00000H - @@CODEL ini_VECT 04E33H 00000H - @@CODEL led_cam 04E33H 00000H - @@CODEL led_pow 04E33H 00000H -* gap * 04E33H 00001H - @@CNSTL 04E34H 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04E34H 0000AH - @@R_INIT 04E3EH 0002EH CSEG UNIT64KP - @@R_INIT @cstart 04E3EH 00000H - @@R_INIT loader 04E3EH 00000H - @@R_INIT pm 04E3EH 00002H - @@R_INIT i2c_ctr 04E40H 00000H - @@R_INIT main 04E40H 00000H - @@R_INIT magic 04E40H 00000H - @@R_INIT WDT 04E40H 00000H - @@R_INIT i2c_mcu 04E40H 00000H - @@R_INIT i2c_twl 04E40H 00000H - @@R_INIT led 04E40H 00000H - @@R_INIT rtc 04E40H 00000H - @@R_INIT vreg_ctr 04E40H 00000H - @@R_INIT vreg_twl 04E40H 00000H - @@R_INIT adc 04E40H 0000CH - @@R_INIT renge 04E4CH 00014H - @@R_INIT accero 04E60H 00000H + 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL led_cam 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL led_pow 04DE4H 00000H + @@CNSTL 04DE4H 00000H CSEG PAGE64KP + @@CNSTL batt_params + 04DE4H 00000H + @@CNSTL 04DE4H 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04DE4H 0000AH + @@R_INIT 04DEEH 0002CH CSEG UNIT64KP + @@R_INIT @cstart 04DEEH 00000H + @@R_INIT loader 04DEEH 00000H + @@R_INIT pm 04DEEH 00000H + @@R_INIT i2c_ctr 04DEEH 00000H + @@R_INIT main 04DEEH 00000H + @@R_INIT magic 04DEEH 00000H + @@R_INIT WDT 04DEEH 00000H + @@R_INIT i2c_mcu 04DEEH 00000H + @@R_INIT i2c_twl 04DEEH 00000H + @@R_INIT led 04DEEH 00000H + @@R_INIT rtc 04DEEH 00000H + @@R_INIT vreg_ctr 04DEEH 00000H + @@R_INIT vreg_twl 04DEEH 00000H + @@R_INIT adc 04DEEH 0000CH + @@R_INIT renge 04DFAH 00014H + @@R_INIT accero 04E0EH 00000H @@R_INIT self_flash - 04E60H 00000H - @@R_INIT sw 04E60H 00000H + 04E0EH 00000H + @@R_INIT sw 04E0EH 00000H @@R_INIT task_debug - 04E60H 00000H + 04E0EH 00000H @@R_INIT task_misc - 04E60H 00000H - @@R_INIT task_sys 04E60H 00002H + 04E0EH 00000H + @@R_INIT task_sys 04E0EH 00002H @@R_INIT pedo_alg_thre_det2 - 04E62H 00006H - @@R_INIT ini_VECT 04E68H 00000H + 04E10H 00006H + @@R_INIT ini_VECT 04E16H 00000H @@R_INIT task_status - 04E68H 00000H - @@R_INIT led_cam 04E68H 00000H - @@R_INIT led_pow 04E68H 00004H - @@R_INIT hal 04E6CH 00000H - @@R_INIT @rom 04E6CH 00000H - @@R_INIS 04E6CH 00008H CSEG UNIT64KP - @@R_INIS @cstart 04E6CH 00000H - @@R_INIS loader 04E6CH 00000H - @@R_INIS pm 04E6CH 00002H - @@R_INIS i2c_ctr 04E6EH 00002H - @@R_INIS main 04E70H 00000H - @@R_INIS magic 04E70H 00000H - @@R_INIS WDT 04E70H 00000H - @@R_INIS i2c_mcu 04E70H 00000H - @@R_INIS i2c_twl 04E70H 00000H - @@R_INIS led 04E70H 00000H - @@R_INIS rtc 04E70H 00000H - @@R_INIS vreg_ctr 04E70H 00000H - @@R_INIS vreg_twl 04E70H 00000H - @@R_INIS adc 04E70H 00000H - @@R_INIS renge 04E70H 00000H - @@R_INIS accero 04E70H 00000H + 04E16H 00000H + @@R_INIT led_cam 04E16H 00000H + @@R_INIT led_pow 04E16H 00004H + @@R_INIT hal 04E1AH 00000H + @@R_INIT batt_params + 04E1AH 00000H + @@R_INIT @rom 04E1AH 00000H + @@R_INIS 04E1AH 00008H CSEG UNIT64KP + @@R_INIS @cstart 04E1AH 00000H + @@R_INIS loader 04E1AH 00000H + @@R_INIS pm 04E1AH 00002H + @@R_INIS i2c_ctr 04E1CH 00002H + @@R_INIS main 04E1EH 00000H + @@R_INIS magic 04E1EH 00000H + @@R_INIS WDT 04E1EH 00000H + @@R_INIS i2c_mcu 04E1EH 00000H + @@R_INIS i2c_twl 04E1EH 00000H + @@R_INIS led 04E1EH 00000H + @@R_INIS rtc 04E1EH 00000H + @@R_INIS vreg_ctr 04E1EH 00000H + @@R_INIS vreg_twl 04E1EH 00000H + @@R_INIS adc 04E1EH 00000H + @@R_INIS renge 04E1EH 00000H + @@R_INIS accero 04E1EH 00000H @@R_INIS self_flash - 04E70H 00000H - @@R_INIS sw 04E70H 00000H + 04E1EH 00000H + @@R_INIS sw 04E1EH 00000H @@R_INIS task_debug - 04E70H 00000H + 04E1EH 00000H @@R_INIS task_misc - 04E70H 00000H - @@R_INIS task_sys 04E70H 00000H + 04E1EH 00000H + @@R_INIS task_sys 04E1EH 00000H @@R_INIS pedo_alg_thre_det2 - 04E70H 00000H - @@R_INIS ini_VECT 04E70H 00000H + 04E1EH 00000H + @@R_INIS ini_VECT 04E1EH 00000H @@R_INIS task_status - 04E70H 00000H - @@R_INIS led_cam 04E70H 00002H - @@R_INIS led_pow 04E72H 00002H - @@R_INIS hal 04E74H 00000H - @@R_INIS @rom 04E74H 00000H - @@LCODEL 04E74H 00022H CSEG - @@LCODEL abs 04E74H 00008H - @@LCODEL memcpy_n 04E7CH 0001AH -* gap * 04E96H 0015EH + 04E1EH 00000H + @@R_INIS led_cam 04E1EH 00002H + @@R_INIS led_pow 04E20H 00002H + @@R_INIS hal 04E22H 00000H + @@R_INIS batt_params + 04E22H 00000H + @@R_INIS @rom 04E22H 00000H + @@CALT 04E22H 00000H CSEG + @@CALT @cstart 04E22H 00000H + @@CALT loader 04E22H 00000H + @@CALT pm 04E22H 00000H + @@CALT i2c_ctr 04E22H 00000H + @@CALT main 04E22H 00000H + @@CALT magic 04E22H 00000H + @@CALT WDT 04E22H 00000H + @@CALT i2c_mcu 04E22H 00000H + @@CALT i2c_twl 04E22H 00000H + @@CALT led 04E22H 00000H + @@CALT rtc 04E22H 00000H + @@CALT vreg_ctr 04E22H 00000H + @@CALT vreg_twl 04E22H 00000H + @@CALT adc 04E22H 00000H + @@CALT renge 04E22H 00000H + @@CALT accero 04E22H 00000H + @@CALT self_flash + 04E22H 00000H + @@CALT sw 04E22H 00000H + @@CALT task_debug + 04E22H 00000H + @@CALT task_misc + 04E22H 00000H + @@CALT task_sys 04E22H 00000H + @@CALT pedo_alg_thre_det2 + 04E22H 00000H + @@CALT ini_VECT 04E22H 00000H + @@CALT task_status + 04E22H 00000H + @@CALT led_cam 04E22H 00000H + @@CALT led_pow 04E22H 00000H + @@CALT hal 04E22H 00000H + @@CALT batt_params + 04E22H 00000H + @@RLINIT 04E22H 00000H CSEG UNIT64KP + @@RLINIT loader 04E22H 00000H + @@RLINIT pm 04E22H 00000H + @@RLINIT i2c_ctr 04E22H 00000H + @@RLINIT main 04E22H 00000H + @@RLINIT magic 04E22H 00000H + @@RLINIT WDT 04E22H 00000H + @@RLINIT i2c_mcu 04E22H 00000H + @@RLINIT i2c_twl 04E22H 00000H + @@RLINIT led 04E22H 00000H + @@RLINIT rtc 04E22H 00000H + @@RLINIT vreg_ctr 04E22H 00000H + @@RLINIT vreg_twl 04E22H 00000H + @@RLINIT adc 04E22H 00000H + @@RLINIT renge 04E22H 00000H + @@RLINIT accero 04E22H 00000H + @@RLINIT self_flash + 04E22H 00000H + @@RLINIT sw 04E22H 00000H + @@RLINIT task_debug + 04E22H 00000H + @@RLINIT task_misc + 04E22H 00000H + @@RLINIT task_sys 04E22H 00000H + @@RLINIT pedo_alg_thre_det2 + 04E22H 00000H + @@RLINIT ini_VECT 04E22H 00000H + @@RLINIT task_status + 04E22H 00000H + @@RLINIT led_cam 04E22H 00000H + @@RLINIT led_pow 04E22H 00000H + @@RLINIT hal 04E22H 00000H + @@RLINIT batt_params + 04E22H 00000H + @@RLINIT @rom 04E22H 00000H + @@CODEL 04E22H 00000H CSEG + @@CODEL pm 04E22H 00000H + @@CODEL i2c_ctr 04E22H 00000H + @@CODEL magic 04E22H 00000H + @@CODEL i2c_twl 04E22H 00000H + @@CODEL led 04E22H 00000H + @@CODEL rtc 04E22H 00000H + @@CODEL vreg_ctr 04E22H 00000H + @@CODEL vreg_twl 04E22H 00000H + @@CODEL adc 04E22H 00000H + @@CODEL renge 04E22H 00000H + @@CODEL accero 04E22H 00000H + @@CODEL sw 04E22H 00000H + @@CODEL task_misc + 04E22H 00000H + @@CODEL task_sys 04E22H 00000H + @@CODEL pedo_alg_thre_det2 + 04E22H 00000H + @@CODEL ini_VECT 04E22H 00000H + @@CODEL led_cam 04E22H 00000H + @@CODEL led_pow 04E22H 00000H + @@CODEL batt_params + 04E22H 00000H + @@LCODEL 04E22H 00022H CSEG + @@LCODEL abs 04E22H 00008H + @@LCODEL memcpy_n 04E2AH 0001AH +* gap * 04E44H 001B0H MGC_VER 04FF4H 00002H CSEG AT MGC_VER magic 04FF4H 00002H MGC_TAIL 04FF6H 0000AH CSEG AT @@ -451,44 +469,46 @@ Direc-file:bsr_mcu.dr BASE ADDRESS=FF900H SIZE=00500H OUTPUT INPUT INPUT BASE SIZE SEGMENT SEGMENT MODULE ADDRESS - @@DATA FF900H 003F4H DSEG BASEP + @@DATA FF900H 003F6H DSEG BASEP @@DATA @cstart FF900H 00002H @@DATA loader FF902H 00000H - @@DATA pm FF902H 0000CH - @@DATA i2c_ctr FF90EH 00004H - @@DATA main FF912H 0021EH - @@DATA magic FFB30H 00000H - @@DATA WDT FFB30H 00000H - @@DATA i2c_mcu FFB30H 00006H - @@DATA i2c_twl FFB36H 00000H - @@DATA led FFB36H 0007CH - @@DATA rtc FFBB2H 00008H - @@DATA vreg_ctr FFBBAH 0005EH - @@DATA vreg_twl FFC18H 00010H - @@DATA adc FFC28H 00004H - @@DATA renge FFC2CH 00014H - @@DATA accero FFC40H 00002H + @@DATA pm FF902H 0000EH + @@DATA i2c_ctr FF910H 00004H + @@DATA main FF914H 0021EH + @@DATA magic FFB32H 00000H + @@DATA WDT FFB32H 00000H + @@DATA i2c_mcu FFB32H 00006H + @@DATA i2c_twl FFB38H 00000H + @@DATA led FFB38H 0007CH + @@DATA rtc FFBB4H 00008H + @@DATA vreg_ctr FFBBCH 0005EH + @@DATA vreg_twl FFC1AH 00010H + @@DATA adc FFC2AH 00004H + @@DATA renge FFC2EH 00014H + @@DATA accero FFC42H 00002H @@DATA self_flash - FFC42H 00002H - @@DATA sw FFC44H 00002H + FFC44H 00002H + @@DATA sw FFC46H 00002H @@DATA task_debug - FFC46H 00000H + FFC48H 00000H @@DATA task_misc - FFC46H 00002H - @@DATA task_sys FFC48H 00002H + FFC48H 00002H + @@DATA task_sys FFC4AH 00002H @@DATA pedo_alg_thre_det2 - FFC4AH 000A0H - @@DATA ini_VECT FFCEAH 00000H + FFC4CH 000A0H + @@DATA ini_VECT FFCECH 00000H @@DATA task_status - FFCEAH 00002H - @@DATA led_cam FFCECH 00000H - @@DATA led_pow FFCECH 00008H - @@DATA hal FFCF4H 00000H - @@DATA @rom FFCF4H 00000H - @@INIT FFCF4H 0002EH DSEG BASEP - @@INIT @cstart FFCF4H 00000H - @@INIT loader FFCF4H 00000H - @@INIT pm FFCF4H 00002H + FFCECH 00002H + @@DATA led_cam FFCEEH 00000H + @@DATA led_pow FFCEEH 00008H + @@DATA hal FFCF6H 00000H + @@DATA batt_params + FFCF6H 00000H + @@DATA @rom FFCF6H 00000H + @@INIT FFCF6H 0002CH DSEG BASEP + @@INIT @cstart FFCF6H 00000H + @@INIT loader FFCF6H 00000H + @@INIT pm FFCF6H 00000H @@INIT i2c_ctr FFCF6H 00000H @@INIT main FFCF6H 00000H @@INIT magic FFCF6H 00000H @@ -518,6 +538,8 @@ Direc-file:bsr_mcu.dr @@INIT led_cam FFD1EH 00000H @@INIT led_pow FFD1EH 00004H @@INIT hal FFD22H 00000H + @@INIT batt_params + FFD22H 00000H @@INIT @rom FFD22H 00000H FSL_DATA FFD22H 00010H DSEG UNITP FSL_DATA fsl_common @@ -554,6 +576,8 @@ Direc-file:bsr_mcu.dr @@INITL led_cam FFD32H 00000H @@INITL led_pow FFD32H 00000H @@INITL hal FFD32H 00000H + @@INITL batt_params + FFD32H 00000H @@INITL @rom FFD32H 00000H @@DATAL FFD32H 00000H DSEG UNIT64KP @@DATAL loader FFD32H 00000H @@ -587,6 +611,8 @@ Direc-file:bsr_mcu.dr @@DATAL led_cam FFD32H 00000H @@DATAL led_pow FFD32H 00000H @@DATAL hal FFD32H 00000H + @@DATAL batt_params + FFD32H 00000H @@DATAL @rom FFD32H 00000H * gap * FFD32H 000CEH @@ -627,75 +653,81 @@ Direc-file:bsr_mcu.dr @@INIS led_cam FFE24H 00002H @@INIS led_pow FFE26H 00002H @@INIS hal FFE28H 00000H + @@INIS batt_params + FFE28H 00000H @@INIS @rom FFE28H 00000H - @@DATS FFE28H 00036H DSEG SADDRP + @@DATS FFE28H 00034H DSEG SADDRP @@DATS @cstart FFE28H 00000H @@DATS loader FFE28H 00000H - @@DATS pm FFE28H 0000CH - @@DATS i2c_ctr FFE34H 00002H - @@DATS main FFE36H 00000H - @@DATS magic FFE36H 00000H - @@DATS WDT FFE36H 00000H - @@DATS i2c_mcu FFE36H 00004H - @@DATS i2c_twl FFE3AH 00000H - @@DATS led FFE3AH 00000H - @@DATS rtc FFE3AH 00000H - @@DATS vreg_ctr FFE3AH 00002H - @@DATS vreg_twl FFE3CH 00000H - @@DATS adc FFE3CH 00008H - @@DATS renge FFE44H 00002H - @@DATS accero FFE46H 00000H + @@DATS pm FFE28H 0000AH + @@DATS i2c_ctr FFE32H 00002H + @@DATS main FFE34H 00000H + @@DATS magic FFE34H 00000H + @@DATS WDT FFE34H 00000H + @@DATS i2c_mcu FFE34H 00004H + @@DATS i2c_twl FFE38H 00000H + @@DATS led FFE38H 00000H + @@DATS rtc FFE38H 00000H + @@DATS vreg_ctr FFE38H 00002H + @@DATS vreg_twl FFE3AH 00000H + @@DATS adc FFE3AH 00008H + @@DATS renge FFE42H 00002H + @@DATS accero FFE44H 00000H @@DATS self_flash - FFE46H 00000H - @@DATS sw FFE46H 0000AH + FFE44H 00000H + @@DATS sw FFE44H 0000AH @@DATS task_debug - FFE50H 00000H + FFE4EH 00000H @@DATS task_misc - FFE50H 00002H - @@DATS task_sys FFE52H 00002H + FFE4EH 00002H + @@DATS task_sys FFE50H 00002H @@DATS pedo_alg_thre_det2 - FFE54H 00006H - @@DATS ini_VECT FFE5AH 00000H + FFE52H 00006H + @@DATS ini_VECT FFE58H 00000H @@DATS task_status - FFE5AH 00000H - @@DATS led_cam FFE5AH 00002H - @@DATS led_pow FFE5CH 00002H - @@DATS hal FFE5EH 00000H - @@DATS @rom FFE5EH 00000H - @@BITS FFE5EH 00005H BSEG - @@BITS @cstart FFE5EH.0 00000H.0 - @@BITS loader FFE5EH.0 00000H.0 - @@BITS pm FFE5EH.0 00001H.0 - @@BITS i2c_ctr FFE5FH.0 00000H.0 - @@BITS main FFE5FH.0 00000H.1 - @@BITS magic FFE5FH.1 00000H.0 - @@BITS WDT FFE5FH.1 00000H.0 - @@BITS i2c_mcu FFE5FH.1 00000H.3 - @@BITS i2c_twl FFE5FH.4 00000H.0 - @@BITS led FFE5FH.4 00000H.4 - @@BITS rtc FFE60H.0 00000H.3 - @@BITS vreg_ctr FFE60H.3 00000H.1 - @@BITS vreg_twl FFE60H.4 00000H.0 - @@BITS adc FFE60H.4 00000H.4 - @@BITS renge FFE61H.0 00000H.3 - @@BITS accero FFE61H.3 00000H.0 + FFE58H 00000H + @@DATS led_cam FFE58H 00002H + @@DATS led_pow FFE5AH 00002H + @@DATS hal FFE5CH 00000H + @@DATS batt_params + FFE5CH 00000H + @@DATS @rom FFE5CH 00000H + @@BITS FFE5CH 00005H BSEG + @@BITS @cstart FFE5CH.0 00000H.0 + @@BITS loader FFE5CH.0 00000H.0 + @@BITS pm FFE5CH.0 00001H.0 + @@BITS i2c_ctr FFE5DH.0 00000H.0 + @@BITS main FFE5DH.0 00000H.1 + @@BITS magic FFE5DH.1 00000H.0 + @@BITS WDT FFE5DH.1 00000H.0 + @@BITS i2c_mcu FFE5DH.1 00000H.3 + @@BITS i2c_twl FFE5DH.4 00000H.0 + @@BITS led FFE5DH.4 00000H.4 + @@BITS rtc FFE5EH.0 00000H.3 + @@BITS vreg_ctr FFE5EH.3 00000H.1 + @@BITS vreg_twl FFE5EH.4 00000H.0 + @@BITS adc FFE5EH.4 00000H.4 + @@BITS renge FFE5FH.0 00000H.3 + @@BITS accero FFE5FH.3 00000H.0 @@BITS self_flash - FFE61H.3 00000H.0 - @@BITS sw FFE61H.3 00000H.1 + FFE5FH.3 00000H.0 + @@BITS sw FFE5FH.3 00000H.1 @@BITS task_debug - FFE61H.4 00000H.0 + FFE5FH.4 00000H.0 @@BITS task_misc - FFE61H.4 00000H.2 - @@BITS task_sys FFE61H.6 00000H.0 + FFE5FH.4 00000H.2 + @@BITS task_sys FFE5FH.6 00000H.0 @@BITS pedo_alg_thre_det2 - FFE61H.6 00000H.2 - @@BITS ini_VECT FFE62H.0 00000H.0 + FFE5FH.6 00000H.2 + @@BITS ini_VECT FFE60H.0 00000H.0 @@BITS task_status - FFE62H.0 00000H.0 - @@BITS led_cam FFE62H.0 00000H.1 - @@BITS led_pow FFE62H.1 00000H.0 - @@BITS hal FFE62H.1 00000H.6 -* gap * FFE63H 00071H + FFE60H.0 00000H.0 + @@BITS led_cam FFE60H.0 00000H.1 + @@BITS led_pow FFE60H.1 00000H.0 + @@BITS hal FFE60H.1 00000H.6 + @@BITS batt_params + FFE60H.7 00000H.0 +* gap * FFE61H 00073H @@SEGREG FFED4H 00004H DSEG AT @@SEGREG @SEGREG FFED4H 00004H @@RTARG0 FFED8H 00008H DSEG AT diff --git a/branches/sim/bsr_mcu.dr b/branches/sim/bsr_mcu.dr index bd8099c..06b758e 100644 --- a/branches/sim/bsr_mcu.dr +++ b/branches/sim/bsr_mcu.dr @@ -40,9 +40,15 @@ MERGE @@R_INIT: =ROM ; ROM ; RAM1,RAM2領域はユーザープログラムで使用しても良いですが、セルフプログラム時は ; セルフプログラムのライブラリが使用するため、値は破壊されます。 ; -memory RAM2 : (0FFE20H, 00C0H) ; セルフプログラム時、使用禁止領域 -;memory SLF_RAM : (0FFE00H, 0020H) ; Slef Program予約領域[使用禁止] memory RAM : (0FF900H, 0500H) ; ユーザーＲＡＭ領域 ;memory SLF_RAM : (0FF900H, 0020H) ; Slef Program予約領域[使用禁止] +memory RAM2 : (0FFE20H, 00C0H) ; セルフプログラム時、使用禁止領域 +;memory SLF_RAM : (0FFE00H, 0020H) ; Slef Program予約領域[使用禁止] +;MERGE @@DATA:=RAM +;MERGE @@INIT:=RAM +;MERGE @@INITL:=RAM +;MERGE @@DATAL:=RAM +;MERGE FSL_DATA:=RAM +;;MERGE DKANA:=RAM diff --git a/branches/sim/bsr_system.h b/branches/sim/bsr_system.h index 54d2b75..bb6105f 100644 --- a/branches/sim/bsr_system.h +++ b/branches/sim/bsr_system.h @@ -19,7 +19,7 @@ enum poweron_reason_ NONE = 0, RSN_PWSW, RSN_RTC_ALARM, - RSN_RSV3, + RSN_TRIAL, // 体験台 RSN_RSV4, RSN_RSV5 }; diff --git a/branches/sim/config.h b/branches/sim/config.h index 5335532..31ff516 100644 --- a/branches/sim/config.h +++ b/branches/sim/config.h @@ -3,7 +3,7 @@ #define MCU_VER_MAJOR 0x02 -#define MCU_VER_MINOR 0x00 +#define MCU_VER_MINOR 0x02 // デバッグ向けスイッチ diff --git a/branches/sim/hoge.bin b/branches/sim/hoge.bin index 8af9301..c06bc3f 100644 Binary files a/branches/sim/hoge.bin and b/branches/sim/hoge.bin differ diff --git a/branches/sim/led_cam.c b/branches/sim/led_cam.c index 5e1c76e..6e0d28a 100644 --- a/branches/sim/led_cam.c +++ b/branches/sim/led_cam.c @@ -39,7 +39,8 @@ void tsk_led_cam( ) return; } } - cam_led_update = false; // TWL のブリンク設定（一発だけ点灯）のため + + cam_led_update = false; // TWL のブリンク設定（一発だけ点灯）のため EI(); if( system_status.pwr_state == SLEEP ) // sleep中、強制消灯 diff --git a/branches/sim/pm.c b/branches/sim/pm.c index d86e7e1..b05dd2a 100644 --- a/branches/sim/pm.c +++ b/branches/sim/pm.c @@ -24,33 +24,27 @@ // ======================================================== -u8 raw_adc_temperature; -BT_VENDER battery_manufacturer = BT_VENDER_NOT_CHECKED; -static u8 ntr_pm_reg_shadow; // NTR PMIC レジスタミラー -bit bt_authorized; // バッテリパラメータ送信済。充電開始許可 -u8 chg_led_override; // アダプタ差したとき、充電するしないに関わらずしばらく点灯させる +u8 raw_adc_temperature; +BT_VENDER battery_manufacturer = BT_VENDER_NOT_CHECKED; +static u8 ntr_pm_reg_shadow; // NTR PMIC レジスタミラー +bit bt_authorized; // バッテリパラメータ送信済。充電開始許可 +u8 chg_led_override; // アダプタ差したとき、充電するしないに関わらずしばらく点灯させる -static u16 bt_volt16; +static u16 bt_volt16; -static bit ntr_pm_bt_low_old; -bit BT_IN_CHG_delayed_n; +static bit ntr_pm_bt_low_old; -bit temp_zone_charge_disable; // 温度で充電停止する時にヒステリシスを付けるため +bit BT_IN_CHG_delayed_n; +bit temp_zone_charge_disable; // 温度で充電停止する時にヒステリシスを付けるため -u8 pmic_version; -u8 mgic_version[2]; +u8 pmic_version; +u8 mgic_version[2]; -static bt_param_* p_bt_param; +u8 pm_reg_bit_vddlcd; -static err send_cmd_mgic_2B( u8 reg, u16 dat ); -static err read_mgic_2B( u8 reg, u8* dat ); +static bt_param_* p_bt_param; +extern const bt_param_ bt_param[]; -static err read_BT_SOC( u8* dest ); -static err read_BT_voltage( u8* dest ); - -static u8 conv_ctr_bt_to_twl_bt(); - -u8 pm_reg_bit_vddlcd; // ======================================================== @@ -63,6 +57,13 @@ static void bt_param_select(); static void bt_batt_update_twl(); static void bt_batt_update_ntr(); +// ラッパー +static err send_cmd_mgic_2B( u8 reg, u16 dat ); +static err read_mgic_2B( u8 reg, u8* dat ); +static err read_BT_SOC( u8* dest ); +static err read_BT_voltage( u8* dest ); +static u8 conv_ctr_bt_to_twl_bt(); + // ======================================================== @@ -76,6 +77,7 @@ const u8 BT_MANUF_BORDER[] = { }; + /* ======================================================== 電池の管理 @@ -97,10 +99,10 @@ const u8 BT_MANUF_BORDER[] = { void tsk_batt( ) { - static u8 task_interval = 0; + static u8 task_interval; if( system_status.pwr_state == OFF_TRIG ) // OFF_TRIGは一回しかこないので - { // 満充電のに刺した瞬間電源切ると、5sec電源再投入できず不便。消しちゃう + { // 満充電のに刺した瞬間電源切ると、3sec電源再投入できず不便。消しちゃう chg_led_override = 0; } else diff --git a/branches/sim/sw.c b/branches/sim/sw.c index caf5c9b..03314d9 100644 --- a/branches/sim/sw.c +++ b/branches/sim/sw.c @@ -20,13 +20,13 @@ //========================================================= /* vreg_ctrから読みたいのでヘッダへ -#define INTERVAL_TSK_SW 8 -#define CLICK_THRESHOLD 2 +#define INTERVAL_TSK_SW +#define CLICK_THRESHOLD -#define HOLD_THREASHOLD (u8)( 2000 / INTERVAL_TSK_SW ) -#define FORCEOFF_THREASHOLD (u8)( 4000 / INTERVAL_TSK_SW ) +#define HOLD_THREASHOLD +#define FORCEOFF_THREASHOLD */ -#define TIME_MUKAN (u8)( 300 / INTERVAL_TSK_SW ) +#define TIME_MUKAN ( u8)( 300 / INTERVAL_TSK_SW ) #define TIME_MUKAN_PWSW_RED_TRIAL (u16)( 15000 / INTERVAL_TSK_SW ) // 試遊台、homeマスク時間 //========================================================= @@ -90,7 +90,7 @@ void tsk_sw( ) if( system_status.pwr_state == OFF_TRIG ) { SW_pow_count = 0; // 電源投入に備えてクリア - task_interval = 0; +// task_interval = 0; } if( task_interval != 0 ) @@ -100,8 +100,8 @@ void tsk_sw( ) // おしまい } - task_interval = (u8)( INTERVAL_TSK_SW / SYS_INTERVAL_TICK );// プリスケーラ代わりに使ってますね… - + task_interval = (u8)( INTERVAL_TSK_SW / SYS_INTERVAL_TICK ) -1; // プリスケーラ代わりに使ってますね… + // -1はポストデクリメントのための調整 // 8ms 毎にきます switch ( system_status.pwr_state ) { @@ -181,3 +181,4 @@ void tsk_sw( ) } } } + diff --git a/branches/sim/task_sys.c b/branches/sim/task_sys.c index 6ee6b32..58690c3 100644 --- a/branches/sim/task_sys.c +++ b/branches/sim/task_sys.c @@ -145,7 +145,8 @@ void tsk_sys( ) PU7 = bits8(0,0,0,1, 1,1,0,1); // 4:SW_WIFI 3:SW_PWSW 2:PM_IRQ 0:PM_EXTDC_n PU_SW_HOME_n_JIKKI = 1; // SW_HOME - if( system_status.poweron_reason == RSN_PWSW ) + if( system_status.poweron_reason == RSN_PWSW || + system_status.poweron_reason == RSN_TRIAL ) { // 電源ボタンでのonの時は、LEDを点灯させる vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_AUTO; @@ -403,7 +404,7 @@ void tsk_sys( ) vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] = vreg_ctr[ VREG_C_HAL_OVW_CONT1 ] = 0; // 電源投入 wait_ms(46); // pmicの電源再投入仕様のため - system_status.poweron_reason = RSN_PWSW; + system_status.poweron_reason = RSN_TRIAL; system_status.pwr_state = ON_CHECK; } } diff --git a/branches/sim/vreg_ctr.h b/branches/sim/vreg_ctr.h index 2340bc2..a7ba785 100644 --- a/branches/sim/vreg_ctr.h +++ b/branches/sim/vreg_ctr.h @@ -265,8 +265,8 @@ enum VREG_C_ADRS VREG_C_HAL_OVW_CONT0 = 0x52, VREG_C_HAL_OVW_DAT0, - VREG_C_HAL_OVW_CONT1, - VREG_C_HAL_OVW_DAT1, + VREG_C_HAL_OVW_CONT1, // reserved + VREG_C_HAL_OVW_DAT1, // reserved VREG_C_HAL_OVW_BT_FUEL = 0x56, VREG_C_HAL_OVW_BT_VOLTAGE, diff --git a/branches/sim/yav_mcu_bsr.plg b/branches/sim/yav_mcu_bsr.plg index b7f4bea..189beb7 100644 --- a/branches/sim/yav_mcu_bsr.plg +++ b/branches/sim/yav_mcu_bsr.plg @@ -1,165 +1,40 @@ C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no loader.c -loader.c(141) : CC78K0R warning W0401: Conversion may lose significant digits -loader.c(142) : CC78K0R warning W0401: Conversion may lose significant digits -loader.c(174) : CC78K0R warning W0401: Conversion may lose significant digits +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -w2 -no magic.c +magic.c(16) : CC78K0R warning W0871: Data aligned after 'MGC_HEADdN' in 'MGC_MIMI section' +magic.c(24) : CC78K0R warning W0871: Data aligned after 'MGC_TAILd' in 'MGC_TAIL section' +magic.c(12) : CC78K0R warning W0871: Data aligned after 'MGC_LOADd' in 'MGC_LOAD section' Compilation complete, 0 error(s) and 3 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\loader.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no pm.c -pm.c(493) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(784) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(788) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(818) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(839) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(905) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(914) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1117) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1119) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 9 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\pm.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no i2c_ctr.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\i2c_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no main.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\main.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no magic.c -Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no WDT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\WDT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no i2c_mcu.c -i2c_mcu.c(210) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\i2c_mcu.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no i2c_twl.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\i2c_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no led.c -led.c(82) : CC78K0R warning W0745: Expected function prototype -led.c(332) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\led.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no rtc.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\rtc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no vreg_ctr.c -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(167) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(169) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(170) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(218) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(218) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(223) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(223) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(227) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(227) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(231) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(231) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(235) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 14 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\vreg_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no vreg_twl.c -vreg_twl.c(55) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_twl.c(59) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\vreg_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no adc.c -adc.c(101) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(182) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(228) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(352) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(474) : CC78K0R warning W0745: Expected function prototype -adc.c(503) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(508) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 7 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\adc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no renge\renge.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\renge.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no accero.c -accero.c(105) : CC78K0R warning W0745: Expected function prototype -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\accero.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no self_flash.c -self_flash.c(280) : CC78K0R warning W0401: Conversion may lose significant digits -self_flash.c(281) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\self_flash.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no sw.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\sw.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no task_debug.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\task_debug.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no task_misc.c -task_misc.c(296) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(303) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(308) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(309) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(310) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(311) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(312) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(314) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(325) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 9 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\task_misc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no task_sys.c -task_sys.c(208) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(584) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\task_sys.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c -pedo_alg_thre_det2.c(97) : CC78K0R warning W0745: Expected function prototype -pedo_alg_thre_det2.c(113) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\pedo_alg_thre_det2.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no task_status.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\task_status.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no led_cam.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\led_cam.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no led_pow.c -led_pow.c(99) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(104) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(155) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(215) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(244) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 5 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\led_pow.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no hal.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\hal.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -obsr.lmf "..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -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 led_cam.rel led_pow.rel hal.rel -Link complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -obsr.lmf "..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel +RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K' + Read Device File Directory : C:\PROGRAM FILES (X86)\NEC ELECTRONICS TOOLS\DEV\ +RA78K0R warning W3420: File 'pm.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'i2c_ctr.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'main.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'WDT.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'i2c_mcu.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'i2c_twl.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'led.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'rtc.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'vreg_ctr.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'vreg_twl.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'adc.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'renge.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'accero.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'self_flash.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'sw.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'task_debug.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'task_misc.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'task_sys.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'pedo_alg_thre_det2.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'task_status.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'led_cam.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'led_pow.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'hal.rel' already has had error(s)/warning(s) by 'CC78K' +RA78K0R warning W3420: File 'batt_params.rel' already has had error(s)/warning(s) by 'CC78K' + +Link complete, 0 error(s) and 25 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\oc78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf Object Conversion Complete, 0 error(s) and 0 warning(s) found. C:\Windows\system32\cmd.exe /c ruby nec_s_2_bsrbin2.rb bsr.hex @@ -168,4 +43,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 59 +Build Total error(s) : 0 Total warning(s) : 28 diff --git a/branches/sim/yav_mcu_bsr.pri b/branches/sim/yav_mcu_bsr.pri index d15dfe8..0755cf5 100644 --- a/branches/sim/yav_mcu_bsr.pri +++ b/branches/sim/yav_mcu_bsr.pri @@ -22,8 +22,8 @@ SubClock=None [Mapping] Count=0 [Main] -Geometry=198, 198, 960, 728 -Window=Max +Geometry=44, 44, 1214, 1108 +Window=Normal MDI_MAX=OFF Button=ON Mode=Auto @@ -58,7 +58,7 @@ Symbol Reset1=ON Dir=\\tsclient\C\78k_data\yav-mcu-basara\branches\sim\ Filter=Source [Debugger Option] -Source Path="\\tsclient\C\78k_data\yav-mcu-basara\branches\sim\renge" +Source Path="" Symbol Size=Byte Symbol Format=Hex Register Name=Func @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=29, 167, 923, 884 +Geometry=0, 0, 750, 991 Window=Normal -DispStart=75 -CaretPos=76,0 +DispStart=479 +CaretPos=480,0 Mode=Normal DispFile= Address1= @@ -139,27 +139,11 @@ SaveRange=Screen SaveStart= SaveEnd= Accumulative=ON -[Source1] -Geometry=230, 86, 923, 884 -Window=Normal -DispStart=85 -CaretPos=420,0 -Mode=Normal -DispFile=\\tsclient\C\78k_data\yav-mcu-basara\branches\sim\vreg_ctr.c -Accumulative=ON -[Source2] -Geometry=426, 148, 923, 884 -Window=Normal -DispStart=183 -CaretPos=244,0 -Mode=Normal -DispFile=\\tsclient\C\78k_data\yav-mcu-basara\branches\sim\i2c_ctr.c -Accumulative=ON [Assemble] -Geometry=75, 75, 712, 548 -Window=Normal -DispStart=6880 -CaretPos=3440,0 +Geometry=0, 0, 0, 0 +Window=Hide +DispStart=847627264 +CaretPos=0,0 Address1= Address2= Address3= @@ -201,18 +185,18 @@ SaveRange=Screen SaveStart= SaveEnd= [Memory] -Geometry=672, -2, 665, 836 -Window=Normal -Boundary=163 +Geometry=0, 0, 0, 0 +Window=Hide +Boundary=0 Format=Hex Mode=Byte -Endian=Little +Endian= Ascii=OFF Idtag=OFF Address= -DispStart=000FFAE0 -CaretPosData=44, 65490 -CaretPosAscii=0, 65424 +DispStart=FFFFFFFF +CaretPosData=0, 0 +CaretPosAscii=0, 0 Address1= Address2= Address3= @@ -267,9 +251,9 @@ Destination=0 [I/O Port] Line=0 [Stack] -Geometry=0, 0, 400, 300 -Window=Normal -Boundary=13762687 +Geometry=0, 0, 0, 0 +Window=Hide +Boundary=0 Mode=Proper [Sfr] Geometry=0, 0, 0, 0 @@ -882,10 +866,10 @@ SaveRange=Screen SaveStart= SaveEnd= [Register] -Geometry=1328, 14, 250, 303 -Window=Normal +Geometry=0, 0, 0, 0 +Window=Hide Mode=Hex -Boundary=110 +Boundary=0 Pickup=OFF Name=Functional Register Bank=0 @@ -973,27 +957,21 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=1097, 414, 440, 666 -Window=Normal -Boundary=13762700 -0=.pwsw_timeout,D,N,A,+,1 -1=.krmk,P,S,A,+,1 -2=.0xffd32,P,L,A,+,1 -3=.task_interval,P,N,A,+,1 -4=.SW_pow_count,P,N,A,+,1 -5=+system_status,.,N,A,-,1 -Line=6 +Geometry=0, 0, 0, 0 +Window=Hide +Boundary=0 +Line=0 [Quick Watch] -0=system_status,P,A,1 -1=tasks,P,A,1 -2=0xFD32,P,A,1 -3=0fd32h,P,A,1 -4=0xffd32,P,A,1 -5=mrmk,P,A,1 -6=krmk,P,A,1 -7=pwsw_timeout,P,A,1 -8=SW_pow_count,P,A,1 -9=task_interval,P,A,1 +0= +1= +2= +3= +4= +5= +6= +7= +8= +9= 10= 11= 12= @@ -1005,40 +983,22 @@ Geometry=0, 0, 0, 0 Window=Hide Width=150 30 200 100 Name0=Swb00001 -Address0=task_sys.c#_tsk_sys+0x2e2 +Address0=sw.c#_tsk_sw+0x36 Window0=ASM Status0=ON Name1=Swb00002 -Address1=task_sys.c#_tsk_sys+0xa7 +Address1=sw.c#_tsk_sw+0x47 Window1=ASM Status1=ON Name2=Swb00003 -Address2=task_sys.c#_tsk_sys+0x83 +Address2=sw.c#_tsk_sw+0x6b Window2=ASM Status2=ON -Name3=Swb00004 -Address3=task_sys.c#_tsk_sys+0x49 -Window3=ASM -Status3=ON -Name4=Swb00007 -Address4=task_sys.c#_tsk_sys+0x5f -Window4=ASM -Status4=ON -Name5=Swb00005 -Address5=vreg_ctr.c#_vreg_ctr_write+0x353 -Window5=ASM -Status5=ON -Name6=Swb00006 -Address6=vreg_ctr.c#_vreg_ctr_write+0x343 -Window6=ASM -Status6=ON -Count=7 +Count=3 [Reset] Debugger=ON Symbol=OFF Target CPU=OFF -[Symbol] -Data1=9F , 16 [Extended Option] OnClick Software Break=ON TraceTimetag=x1 diff --git a/branches/sim/yav_mcu_bsr.prj b/branches/sim/yav_mcu_bsr.prj index 85b660b..10df544 100644 --- a/branches/sim/yav_mcu_bsr.prj +++ b/branches/sim/yav_mcu_bsr.prj @@ -231,73 +231,6 @@ Tool1=CC78K0R|W2.13 Tool2=RA78K0R|W1.33 Tool3=SK78K0R|V3.10 Tool4=ID78K0R-QB|V3.61 -[SrcFile] -Source1=loader.c -Source2=pm.c -Source3=i2c_ctr.c -Source4=main.c -Source5=magic.c -Source6=WDT.c -Source7=i2c_mcu.c -Source8=i2c_twl.c -Source9=led.c -Source10=rtc.c -Source11=vreg_ctr.c -Source12=vreg_twl.c -Source13=adc.c -Source14=renge\renge.c -Source15=accero.c -Source16=self_flash.c -Source17=sw.c -Source18=task_debug.c -Source19=task_misc.c -Source20=task_sys.c -Source21=pedo_alg_thre_det2.c -Source22=ini_VECT.c -Source23=task_status.c -Source24=led_cam.c -Source25=led_pow.c -Source26=hal.c -[IncFile] -Include1=incs_loader.h -Include2=jhl_defs.h -Include3=config.h -Include4=user_define.h -Include5=bsr_system.h -Include6=renge\renge.h -Include7=renge\renge_defs.h -Include8=renge\renge_task_immediate.h -Include9=vreg_ctr.h -Include10=vreg_twl.h -Include11=loader.h -Include12=i2c_mcu.h -Include13=WDT.h -Include14=fsl_user.h -Include15=i2c_ctr.h -Include16=pm.h -Include17=rtc.h -Include18=reboot.h -Include19=magic.h -Include20=incs.h -Include21=i2c_twl.h -Include22=accero.h -Include23=pedometer.h -Include24=sw.h -Include25=adc.h -Include26=led.h -Include27=batt_params.h -Include28=pool.h -Include29=i2c_twl_defs.h -Include30=voltable.h -Include31=renge\renge_task_intval.h -Include32=self_flash.h -Include33=pedo_lpf_coeff.h -Include34=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h -Include35=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h -Include36=sim\simOnWin.h -Include37=sim\sfrAlias.h -Include38=hal.h -Include39=sim\sim_interrupt_decrare.c [Options.CC78K0R 0] Version=210 Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r @@ -511,7 +444,7 @@ Intunexpand=1 Kanjicode=1210 Verbose=0 CommandFile=0 -Warninglevel=1 +Warninglevel=2 Startupchk=1 Fixation=0 FarROMization=0 @@ -767,6 +700,74 @@ VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 VF78K0Rvs= +[SrcFile] +Source1=loader.c +Source2=pm.c +Source3=i2c_ctr.c +Source4=main.c +Source5=magic.c +Source6=WDT.c +Source7=i2c_mcu.c +Source8=i2c_twl.c +Source9=led.c +Source10=rtc.c +Source11=vreg_ctr.c +Source12=vreg_twl.c +Source13=adc.c +Source14=renge\renge.c +Source15=accero.c +Source16=self_flash.c +Source17=sw.c +Source18=task_debug.c +Source19=task_misc.c +Source20=task_sys.c +Source21=pedo_alg_thre_det2.c +Source22=ini_VECT.c +Source23=task_status.c +Source24=led_cam.c +Source25=led_pow.c +Source26=hal.c +Source27=batt_params.c +[IncFile] +Include1=incs_loader.h +Include2=jhl_defs.h +Include3=config.h +Include4=user_define.h +Include5=bsr_system.h +Include6=renge\renge.h +Include7=renge\renge_defs.h +Include8=renge\renge_task_immediate.h +Include9=vreg_ctr.h +Include10=vreg_twl.h +Include11=loader.h +Include12=i2c_mcu.h +Include13=WDT.h +Include14=fsl_user.h +Include15=i2c_ctr.h +Include16=pm.h +Include17=rtc.h +Include18=reboot.h +Include19=magic.h +Include20=incs.h +Include21=i2c_twl.h +Include22=accero.h +Include23=pedometer.h +Include24=sw.h +Include25=adc.h +Include26=led.h +Include27=batt_params.h +Include28=pool.h +Include29=i2c_twl_defs.h +Include30=voltable.h +Include31=renge\renge_task_intval.h +Include32=self_flash.h +Include33=pedo_lpf_coeff.h +Include34=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +Include35=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h +Include36=sim\simOnWin.h +Include37=sim\sfrAlias.h +Include38=hal.h +Include39=sim\sim_interrupt_decrare.c [Options.LK78K0R 0] Version=100 O0=bsr_k0r.lmf @@ -878,7 +879,7 @@ B1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.l D0=bsr_mcu.dr D1=user_area.dr S=1 -W=0 +W=2 SELFCheck=0 SELF=0 ZB= diff --git a/branches/sim/yav_mcu_bsr.prk b/branches/sim/yav_mcu_bsr.prk index 6c71169..a5cedde 100644 --- a/branches/sim/yav_mcu_bsr.prk +++ b/branches/sim/yav_mcu_bsr.prk @@ -1,15 +1,20 @@ [ProjectManager] -FrameMax=0 -FrameX=402 -FrameY=228 +FrameMax=1 +FrameX=1868 +FrameY=184 FrameCX=1440 FrameCY=895 -OpenFile1=ProjectWindow +OpenFile1=task_sys.c,0,225,225,1395,726,0,369,0,0 +OpenFile2=i2c_mcu.c,0,100,100,1346,822,0,213,0,0 +OpenFile3=i2c_twl.c,0,175,175,1421,897,38,129,47,0 +OpenFile4=sw.c,0,200,200,1446,922,0,103,0,0 +OpenFile5=config.h,0,168,41,1338,542,24,24,24,0 +OpenFile6=main.c,0,225,225,1471,947,0,15,0,0 +OpenFile7=ProjectWindow PrjPos=0,0,706,0,291 -OpenFile2=task_sys.c,0,225,225,1395,726,0,369,0,0 -OpenFile3=config.h,0,0,0,1170,501,24,24,24,0 -OpenFile4=OutputWindow -OutputPos=0,16,707,587,1440 +OpenFile8=kanaria.c,0,250,250,1496,972,0,3,20,0 +OpenFile9=OutputWindow +OutputPos=0,203,894,244,1482 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/branches/sim/yav_mcu_bsr.sdb b/branches/sim/yav_mcu_bsr.sdb index 72a55dd..f4d82b3 100644 --- a/branches/sim/yav_mcu_bsr.sdb +++ b/branches/sim/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4e0a86c1 +T=4e27babf 1=incs_loader.h 2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 3=fsl_user.h @@ -12,7 +12,7 @@ T=4e0a86c1 8=reboot.h 9=magic.h [pm.c] -T=4e1c1434 +T=4e38d6f0 1=incs.h 2=adc.h 3=led.h @@ -22,11 +22,11 @@ T=4e1c1434 7=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 8=fsl_user.h [i2c_ctr.c] -T=4e1d54ae +T=4e36767a 1=config.h 2=incs.h [main.c] -T=4e0af952 +T=4e38f73a 1=incs_loader.h 2=WDT.h 3=rtc.h @@ -36,31 +36,31 @@ T=4e0af952 7=adc.h 8=pool.h [magic.c] -T=4e1d56d9 +T=4e38f186 1=config.h 2=magic.h [WDT.c] -T=4dfae637 +T=4e310743 1=incs_loader.h [i2c_mcu.c] -T=4e1d47dd +T=4e310743 1=incs_loader.h 2=i2c_mcu.h [i2c_twl.c] -T=4e0c1e90 +T=4e37b65b 1=config.h 2=incs.h 3=i2c_twl_defs.h 4=i2c_twl.h [led.c] -T=4dfafb99 +T=4e310743 1=incs.h 2=led.h [rtc.c] -T=4dfb0204 +T=4e27d06d 1=incs.h [vreg_ctr.c] -T=4e1a3d56 +T=4e367ae2 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -71,14 +71,14 @@ T=4e1a3d56 8=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 9=fsl_user.h [vreg_twl.c] -T=4df868b8 +T=4e310743 1=incs.h 2=jhl_defs.h 3=led.h 4=vreg_twl.h 5=vreg_ctr.h [adc.c] -T=4e1c11e5 +T=4e38d553 1=incs.h 2=adc.h 3=pm.h @@ -86,7 +86,7 @@ T=4e1c11e5 5=vreg_twl.h 6=voltable.h [renge\renge.c] -T=4e093f8f +T=4e30b6fd 1=renge\renge.h 2=renge\renge_task_intval.h 3=renge\renge_task_immediate.h @@ -96,12 +96,12 @@ T=4e093f8f 7=sim\simOnWin.h 8=bsr_system.h [accero.c] -T=4dff0001 +T=4e2fd5bb 1=config.h 2=incs.h 3=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h [self_flash.c] -T=4e166b67 +T=4e310743 1=incs_loader.h 2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 3=fsl_user.h @@ -110,7 +110,7 @@ T=4e166b67 6=magic.h 7=pm.h [sw.c] -T=4e166bf3 +T=4e38e66f 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -119,13 +119,13 @@ T=4e166bf3 6=rtc.h 7=sw.h [task_debug.c] -T=4dfae637 +T=4e27b472 1=incs_loader.h 2=renge\renge.h 3=pm.h 4=accero.h [task_misc.c] -T=4e1c12df +T=4e3757a4 1=incs.h 2=renge\renge.h 3=pm.h @@ -135,7 +135,7 @@ T=4e1c12df 7=led.h 8=vreg_twl.h [task_sys.c] -T=4e1a935d +T=4e37c2b5 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -147,7 +147,7 @@ T=4e1a935d 9=adc.h 10=self_flash.h [pedo_alg_thre_det2.c] -T=4e1a3cda +T=4e311180 1=incs.h 2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h 3=accero.h @@ -155,10 +155,11 @@ T=4e1a3cda 5=pedo_lpf_coeff.h 6=pool.h [ini_VECT.c] -T=4dfaf66c +T=4e310743 1=config.h +2=sim\sim_interrupt_decrare.c [task_status.c] -T=4e1abbad +T=4e310743 1=incs_loader.h 2=renge\renge.h 3=hal.h @@ -168,18 +169,24 @@ T=4e1abbad 7=i2c_mcu.h 8=led.h [led_cam.c] -T=4dfae24c +T=4e310744 1=incs.h 2=led.h [led_pow.c] -T=4dfae637 +T=4e310743 1=incs.h 2=led.h [hal.c] -T=4e1d5591 +T=4e38e58f 1=incs_loader.h +[batt_params.c] +T=4e38d716 +1=jhl_defs.h +2=batt_params.h +[kanaria.c] +T=4e38ee27 [incs_loader.h] -T=4e156766 +T=4e310744 1=sim\simOnWin.h 2=jhl_defs.h 3=user_define.h @@ -192,48 +199,48 @@ T=4e156766 10=i2c_mcu.h 11=WDT.h [jhl_defs.h] -T=4df868b8 +T=4e310743 1=config.h [config.h] -T=4e16b88c +T=4e37bcf7 [user_define.h] -T=4e169edd +T=4e37b6dc [bsr_system.h] -T=4df868b8 +T=4e37befa [renge\renge.h] -T=4df868b6 +T=4e310740 1=renge\renge_defs.h 2=renge\renge_task_immediate.h [renge\renge_defs.h] -T=4dfae85a +T=4e310740 [renge\renge_task_immediate.h] -T=4df868b6 +T=4e310740 1=renge\renge_defs.h [vreg_ctr.h] -T=4e1c100c +T=4e37dd7e 1=config.h [vreg_twl.h] -T=4df868b8 +T=4e310743 [loader.h] -T=4df868b8 +T=4e310743 [i2c_mcu.h] -T=4df868b8 +T=4e310743 [WDT.h] -T=4df868b8 +T=4e310743 [fsl_user.h] -T=4dfea7e9 +T=4e310743 [i2c_ctr.h] -T=4df868b9 +T=4e310743 [pm.h] -T=4dfef02d +T=4e3786d0 [rtc.h] -T=4df868b9 +T=4e310743 [reboot.h] -T=4df868b8 +T=4e310743 [magic.h] -T=4df868b8 +T=4e310743 [incs.h] -T=4e15675d +T=4e310743 1=sim\simOnWin.h 2=jhl_defs.h 3=user_define.h @@ -252,47 +259,49 @@ T=4e15675d 16=adc.h 17=WDT.h [i2c_twl.h] -T=4df868b8 +T=4e310743 [accero.h] -T=4df868b8 +T=4e310743 1=jhl_defs.h 2=pedometer.h [pedometer.h] -T=4e1a3cda +T=4e310743 [sw.h] -T=4df868b8 +T=4e310743 1=config.h [adc.h] -T=4df868b8 +T=4e310743 1=jhl_defs.h [led.h] -T=4e169c84 +T=4e310744 [batt_params.h] -T=4df868b9 +T=4e38d70d 1=jhl_defs.h [pool.h] -T=4df868b8 +T=4e310743 1=pedometer.h [i2c_twl_defs.h] -T=4df868b8 +T=4e310743 [voltable.h] -T=4df868b8 +T=4e310743 [renge\renge_task_intval.h] -T=4df868b6 +T=4e310740 1=renge\renge_defs.h [self_flash.h] -T=4df868b8 +T=4e310743 [pedo_lpf_coeff.h] -T=4df868b9 +T=4e310743 [..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h] T=49a3bd4e [..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h] T=45f12258 [sim\simOnWin.h] -T=4e0014e7 +T=4e31073f 1=sim\sfrAlias.h [sim\sfrAlias.h] -T=4e169edd +T=4e37b6f2 1=config.h [hal.h] -T=4e16a2b4 +T=4e310744 +[sim\sim_interrupt_decrare.c] +T=4e31073f