diff --git a/trunk/adc.c b/trunk/adc.c index 4acff1a..6acdbe0 100644 --- a/trunk/adc.c +++ b/trunk/adc.c @@ -9,9 +9,8 @@ #include "led.h" +#include "vreg_twl.h" -//#define _4db_ -//#define _15db_ #define _10db_ #include "voltable.h" @@ -51,6 +50,12 @@ filter_work work_vr_vol = { }; +// twl の8段階volのリニア値からの境界 +const u8 TWL_VOL_BOUNDARY[] = { +// 0, 2, 6, 11, 16, 21, 26, 31 + 0, 4, 8, 13, 18, 23, 28, 31 +}; + // ===================================================== // extern void nop8(); static void adc_filter( u8 new_val, filter_work* work ); @@ -217,6 +222,25 @@ task_status_immed tski_vol_update() { vreg_twl[ REG_TWL_INT_ADRS_VOL ] = sent_index/2 ; } + // 8段階のレベル化。　割り込みを入れるのに必要 + { + u8 new_level = 31; + u8 i; + + // 8段レベルに変換 + for( i=0; i<=7; i++ ) + { + if( vreg_twl[ REG_TWL_INT_ADRS_VOL ] <= TWL_VOL_BOUNDARY[ i ] ) + { + new_level = i; + break; + } + } + vol_level_twl = new_level; + } + + + // CODECに書きに行く？ if( vreg_ctr[ VREG_C_VOL_OPTION ] & REG_BIT_VOL_BY_SPI ) diff --git a/trunk/bsr.hex b/trunk/bsr.hex index 1bfe4af..10e0b10 100644 --- a/trunk/bsr.hex +++ b/trunk/bsr.hex @@ -1,12 +1,12 @@ :020000001B0DD6 -:04001000064A084A4A -:02001C00DD4BBA -:02002400494C45 -:02002A00B64CD2 -:08003400DF4D814DDA4D0E4F46 -:02004A000A4A60 -:02005A00454A15 -:02006200924EBC +:04001000FB49FD4962 +:02001C00D24BC5 +:020024003E4C50 +:02002A00AB4CDD +:08003400D44D764DCF4D034F72 +:02004A00FF496C +:02005A003A4A20 +:02006200874EC7 :0400C0007EFBFF04C0 :0A00C4001B339499E033F240BFAA09 :1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A @@ -40,11 +40,11 @@ :10028E000271080105F55005F5BCFFF5BDFFF5A59A :10029E00FFF5A6FFD7C7C1C1FBF8FFCEABAC8C02F2 :1002AE00D1DD12616902305C03BBF6614900DDEEFF -:1002BE00618900EFF51004C6D7FDC432FDE43BFDA5 +:1002BE00618900EFF51004C6D7FDC432FD053CFD83 :1002CE002805717AFAFDBA23F51EF98F20F931054A :1002DE00175003C15084FD3103C0625C01D161E847 -:1002EE00CF1EF902CFDFFB64FDA433FD17487172F8 -:1002FE0022712BE7FDE73BFD893C61EDEFF6D7D789 +:1002EE00CF1EF902CFDFFB64FDA433FD0C48717203 +:1002FE0022712BE7FD083CFDAA3C61EDEFF6D7D746 :10030E00C7F616FD2805717BFA310221057102210F :10031E00EF0B717AFAA7F647DFECE2EF04717AFA87 :10032E00F2C6D7C7C1C1FBF8FF17A1C1E0C18C0A45 @@ -125,8 +125,8 @@ :1007DE00E0C15084FDCD031004CEABAC6159018C49 :1007EE000191DD068C014C03DF03E6EF01F660613B :1007FE00FB7151018C014C0861F8CC0100313207BC -:10080E0005A07EFCEF03F57EFC407EFC11DC11F5AD -:10081E007EFCF0C15003C15084FDCD031004EF12D5 +:10080E0005A080FCEF03F580FC4080FC11DC11F5A7 +:10081E0080FCF0C15003C15084FDCD031004EF12D3 :10082E00E6BC02F6614902DDB0000000006179020B :10083E00EFF1CE3708CBE4FFFFCBE6FFF7CED4FFC8 :10084E00CF370008F5120561FDF5ABFFFD4E09D25D @@ -147,9 +147,9 @@ :10093E00DD03E2EF07615909EDA908F2100CC6D7E5 :10094E00C7717B9D717BFAFD6F083022F9FDAC0AF1 :10095E00FD370AC6D7FD4E09FD860BFD8808F5AB9F -:10096E00FFF2D7C7D568FDDD05B068FDEF7BCF6818 +:10096E00FFF2D7C7D566FDDD05B066FDEF7BCF661E :10097E00FD02311407067110E3FBEF047118E3FB5F -:10098E008FE3FB7F2EFD76D1DD5F8FE3FB9F2EFD88 +:10098E008FE3FB7F2CFD76D1DD5F8FE3FB9F2CFD8C :10099E00401EF903DF25665C10D1DD1F7122208F0A :1009AE00E3FB5C10D1DD0B5080C15011FDD437C07C :1009BE00EF095040C15011FDD437C0401EF903DD80 @@ -161,42 +161,42 @@ :100A190000089F0408EEBF00EEBA00C1C514410EDC :100A290011D9D0FF118FD1FF312E45C4C0D7F23172 :100A3900A2C401E2D79DE261DD4C09DF12717BFAA4 -:100A4900C18F06089F79FDC0CF060800EE27003147 +:100A4900C18F06089F77FDC0CF060800EE27003149 :100A5900F2FA04CF0608004C00DF05D50008DD16C0 :100A690061DD717BFAD50608DD0ACDE31F61CD6131 :100A7900CDEE160061CDFED40061FFFE9A00FCF8B0 :100A8900FF0EFEB20061CDFED5004C09DF0EC18F0D -:100A990006086F79FD9F0608C0EE0400CF0608001E -:100AA900F8E3D75200EF025202FE3700CF78FD007B +:100A990006086F77FD9F0608C0EE0400CF06080020 +:100AA900F8E3D75200EF025202FE3700CF76FD007D :100AB900CF060800BF0408C716629F00084100114D -:100AC9008F84229B4100118F85229F0108C6510006 +:100AC9008F8C229B4100118F8D229F0108C65100F6 :100AD900FE62FFEF025205CF060800C1510CFE0A63 :100AE90000C0D7C1511DFE0200C0D761DD717BFA7C :100AF90070CEC0A59EC47CFF9EC4609EC461CDD744 :100B090061DD717BFAC18EC45C1BFED6FFCF06087E :100B190001FED7FFC061CDD731F2FA1AC1AEE4BFE9 -:100B29006AFDAEE6BF6CFDAED4BF6EFD30FFFFBE01 -:100B3900E4BEE6BED4C0D731F2FA11C1AF6AFDBE38 -:100B4900E4AF6CFDBEE6AF6EFDBED4C0D7C1BF70C9 -:100B5900FD13BF72FD15BF74FD17BF76FDC0D7AF7A -:100B690070FDDB72FDEB74FDFB76FDD7534B305204 +:100B290068FDAEE6BF6AFDAED4BF6CFD30FFFFBE07 +:100B3900E4BEE6BED4C0D731F2FA11C1AF68FDBE3A +:100B4900E4AF6AFDBEE6AF6CFDBED4C0D7C1BF6ECF +:100B5900FD13BF70FD15BF72FD17BF74FDC0D7AF80 +:100B69006EFDDB70FDEB72FDFB74FDD7534B30520C :100B79005430324E323030475631323000FFC15096 :100B8900FEFEAB0061DD717BFACF060800FE0A00AC -:100B9900FEA4FF61CDF8E3EECF00C7FB0408BF6AEE -:100BA900FD8FC0009C05C5C337040600BF6CFD3529 +:100B9900FEA4FF61CDF8E3EECF00C7FB0408BF68F0 +:100BA900FD8FC0009C05C5C337040600BF6AFD352B :100BB90036EB0B300000522BFE6600C2C4C63099DA -:100BC9000BB800300000B8022004AF6CFDB800304B -:100BD9000F00B802AF6AFD61FF520AFE3AFFECF856 +:100BC9000BB800300000B8022004AF6AFDB800304D +:100BD9000F00B802AF68FD61FF520AFE3AFFECF858 :100BE900FF0E717BFAC1C7FB04088C05C65C80FE49 :100BF9000200C0D761DD717BFA70CFC0FFA59FC02D :100C0900007CFF9FC000609FC00061CDD7618BFE53 :100C1900E2FF717BBE410011FB000017CEFC0061B1 :100C2900CB089EFDF31161C999A58392DFF7D7FE21 -:100C3900B1FED578FDDF23C1CF0308035109FEF4C6 +:100C3900B1FED576FDDF23C1CF0308035109FEF4C8 :100C4900FDC0D2DF37FE3800A20408CF03080751E0 :100C590009FEE1FDD2B20408DF22C7FB0408318393 -:100C690002C6D7C6510AFECCFD624C1FDF06CF78FB -:100C7900FD01EF04CF78FD00C0EE5BFEC0EE55FE2E +:100C690002C6D7C6510AFECCFD624C1FDF06CF76FD +:100C7900FD01EF04CF76FD00C0EE5BFEC0EE55FE30 :100C8900C7C1FB04088B31196C0161589BC0C6D7D9 :100C9900717BFAFE4DFEAF0408040600C11436FD4F :100CA9000B300000522DF3FE77FF8FC000FE2BFEA4 @@ -209,10 +209,10 @@ :020D1900C3FD18 :100D1B0061CF5100718C7109FECBF800FEFC940180 :100D2B0000F6BF00F953C0F693935820FEDFF9414C -:100D3B0000362E4F3430FDEF05118B99A7A51744C4 -:100D4B00684FDFF53602F93030FDEF04CC0000A719 -:100D5B0047DFF9410036684F346AFDEF05118B9977 -:100D6B00A7A51744684FDFF5366AFD306AFDEF041F +:100D3B000036244F342EFDEF05118B99A7A51744D0 +:100D4B005E4FDFF53602F9302EFDEF04CC0000A725 +:100D5B0047DFF9410036094F3468FDEF05118B99D8 +:100D6B00A7A51744094FDFF53668FD3068FDEF0482 :100D7B00CC0000A747DFF9FCCE0000EFFE61DD7170 :100D8B007BFABEF0ADD8BEF200AEF661CDD7C36133 :100D9B00DD717BFABEF0ADD8BEF200DBF6FFADDC49 @@ -246,12 +246,12 @@ :100F5B000771FF7177D971C0D746DADF08C1ADDCF5 :100F6B0046D8C0DD077177DB71FF71C0D75BDB9DA6 :100F7B00DB605BDA9DDAADDC5BD9085BD808BDD8EA -:100F8B00D7C3C7F3728EFDC162314C410036144F8B +:100F8B00D7C3C7F3728EFDC162314C4100360A4F95 :100F9B001161A072C09EFD62C6C2D7C3C7F3728E29 -:100FAB00FDC1625C0F0C000FFE00314C4100361E80 +:100FAB00FDC1625C0F0C000FFE00314C410036148A :0F0FBB004F1161800FFE0073C09EFD63C6C2D749 -:0A0FF60030393A31393A3230000048 -:0A20000030393A31393A323000002D +:0A0FF60031333A31333A303900004C +:0A20000031333A31333A3039000031 :10200A00AEF0B430B740BA30BB50BBB0BC50BD1014 :10201A00BD60BDB0BFE0C2B0C420C7B0CAE0CE1038 :10202A0001F0141014200630639049006E00777096 @@ -291,14 +291,14 @@ :10224A0078777675747271706F6E6D6C6A6968678B :10225A006665646261605F5E5D5C5A59585756559F :10226A00535251504F4E4D4B4A49494847464543B0 -:10227A004241403F3E3D3B3A393808010002060BD5 -:10228A0010151A1F01020203030200FEFBF7F3F006 +:10227A004241403F3E3D3B3A39380004080D1217AF +:10228A001C1F080101020203030200FEFBF7F3F020 :10229A00F0F3FA041225384D5F6E777A776E5F4D48 :1022AA0038251204FAF3F0F0F3F7FBFE00020303F9 :1022BA0002020100000000001F003B005A007800E3 :0E22CA009700B500D400F300110130014E0161 -:1022D800D51EF9DD108F31FDB031FDD161E8ED7EFD -:1022E80023CF31FD33FD7F234002F94BDC1640023A +:1022D800D51EF9DD108F2FFDB02FFDD161E8ED7E01 +:1022E80023CF2FFD33FD7F234002F94BDC1640023C :1022F800F9B9DE10400CF928DE05A00CF9EF2771BA :102308003320EF224002F93EDC064002F9BDDC1022 :10231800400DF928DE05A00DF9EF0B713220EF060C @@ -311,42 +311,42 @@ :102388008F0FF9614EDD29669F0FF9D1DD1371308A :10239800E3FB5002C15011FDD437C0CF0BF91EEF3B :1023A8000F7138E3FBE0C15011FDD437C0F50BF9CC -:1023B800C6D7C78F30FD76FDFB23D521F9DD057122 -:1023C8000320EF2D664F30FD61F83144201A714328 +:1023B800C6D7C78F2EFD76FDFB23D521F9DD057124 +:1023C8000320EF2D664F2EFD61F83144201A71432A :1023D80020FD2805664C07DD0381DF098F20F931D0 -:1023E8000303FD7924FD9E24710220302326FD3F3E +:1023E8000303FD7924FD9E24710220302326FD601D :1023F8003CC6D7C7716201717201E0FDA3025008A3 -:10240800FDB33A629F02F95009FDB33A62767163EF +:10240800FDD43A629F02F95009FDD43A62767163AD :1024180001713820F94002F9F1DC05E521F9EF24D2 :102428004002F904DE1BCF21F9025008C1506CFDAF :102438003103C092DF0ED541FBDF09713020F9EF7F -:1024480003F521F9CF30FD075700674C08DE1173FB -:10245800091722614EDC06679F30FDEF0387EFEA1C -:102468004030FD07DF09D521F961F8CF21F903C60E +:1024480003F521F9CF2EFD075700674C08DE1173FD +:10245800091722614EDC06679F2EFDEF0387EFEA1E +:10246800402EFD07DF09D521F961F8CF21F903C610 :10247800D7C7C1FBF8FF500AFDA302304000BB17C5 :10248800C15002C15006C1506CFD0304100650969D -:10249800FDA302C0C6D7C72008FBF8FF8F30FD5048 +:10249800FDA302C0C6D7C72008FBF8FF8F2EFD504A :1024A80006D604CA2114F7500689A54804F9A39052 :1024B800DFF7D521F961E8ED1F26304A57BB17C170 :1024C8005002C1503EC1506CFD03041006D2DD0716 :1024D8007100E2FBED1F267108E2FB17040300C13F -:1024E8005004C1500CC1506CFD5B031006D930FD7F +:1024E8005004C1500CC1506CFD5B031006D92EFD81 :1024F800F10104F42114A9318D12A9318E616B0800 :10250800616A08BB17C15002C1500EC1506CFD036F :10251800041006F690BB17C15002C1500CC1506C94 -:10252800FD0304100631042102EFFA7172208F3086 +:10252800FD0304100631042102EFFA7172208F2E88 :10253800FDF0312E040A20C15010C15040C1506C2A -:10254800FD0304100631042102EFFA7172208F3066 +:10254800FD0304100631042102EFFA7172208F2E68 :10255800FDF0312E041A20C15010C15050C1506CEA -:10256800FD0304100631042102EFFA7172208F3046 +:10256800FD0304100631042102EFFA7172208F2E48 :10257800FDF0312E042A20C15010C15060C1506CAA -:10258800FD0304100631042102EFFA7172208F3026 +:10258800FD0304100631042102EFFA7172208F2E28 :10259800FDF0312E043A20C15010C15070C1506C6A -:1025A800FD0304100650A5FDA302D930FDF1010476 +:1025A800FD0304100650A5FDA302D92EFDF1010478 :1025B800F42114A9318D12A9318E616B08616A0862 :1025C800BB17C15002C1500EC1506CFD0304100668 :1025D80050A5FDA3025004C1506CFD3103C0629C9C -:1025E80007E930FD0909224E0761C308E930FD09F2 +:1025E80007E92EFD0909224E0761C308E92EFD09F6 :1025F80002224E0717040300C15004C1500CC150F9 :102608006CFD03041006F6BB17C15002C1503EC151 :10261800506CFD030410061008C6D7C7C1FBF8FFAD @@ -359,7 +359,7 @@ :102688008F11F9318F241400BDD8AF08F9FD880DDA :102698001231FF318E03318FBBD904F9F161090082 :1026A800BB44000171FEDC03F690BB8C0101DE0225 -:1026B800F6BBABABBF8AFC17C15002C1500CC1506E +:1026B800F6BBABABBF88FC17C15002C1500CC15070 :1026C8006CFD03041006D2DF088F02F99F10F9EFA2 :1026D800047100E2FBF2C0C6D7C72008FBF8FF4030 :1026E80021F901DF0BCFDFFB63CFE1FBC8ED5428F5 @@ -369,7 +369,7 @@ :10272800542817040600C15002C15004C1506CFD62 :102738005B031006D2DD117100E2FB710320F5DFA7 :10274800FB712020F9ED29288C06318E318D080E79 -:1027580007081C00BBD930FDF1041022148972ABA4 +:1027580007081C00BBD92EFDF1041022148972ABA6 :10276800FDDB0EBB8C019C068B9C0717040400C183 :102778005002C1C1506CFD5B031006D261E8ED291F :10278800288C049FE1FB8C04318E318D080E0508DE @@ -458,7 +458,7 @@ :102CB800FBDFF2F5F6FBF2C6D75064FDA30240DF56 :102CC800FB0BDE03E6EF01F66061FB711120F17189 :102CD800142061DC70C15012FDB705C0FD9839CFD2 -:102CE80045FC03D77100010571785005713AD5711B +:102CE80047FC03D77100010571785005713AD57119 :102CF8003BD1713ADD713BD98F10055CFC9F100503 :102D0800CF54054AE542057110420571004205712C :102D18004850057130500571205005CF530505CF37 @@ -472,7 +472,7 @@ :102D9800FC9F110571603002D7717830027148F0DC :102DA80000D7C788061666614FDD0967614EDE03E6 :102DB80096EF01866672C6D7C7161714AA0412A919 -:102DC80043DD29AA0412A923FD684FC3AC02FD689C +:102DC80043DD29AA0412A923FD5E4FC3AC02FD5EB0 :102DD8004F13C2BDD813FD580FDE0C1714AA0212E8 :102DE800AA0403BA04EF051714A9BA04AC041231F3 :102DF800FF319E03317F087208C6D7C771201205BC @@ -495,20 +495,20 @@ :102F080003FDE62F8F20F931150871242171210462 :102F1800EF06712421715101314421218F20F931AB :102F28001510F6BE64BE6A3124210390EF01F6BE87 -:102F38006ED731242104F690EF01F6BE6AD7CF3858 +:102F38006ED731242104F690EF01F6BE6AD7CF365A :102F4800FD47F5A8FBAE6C317DBFAEFBFDBB2FD2B4 :102F5800DF0ED9FCFBC1AE6CFDAA2DC0F313BE6C0D -:102F6800D7FDBB2FD2DD0FCF38FD47F5A8FBAE6CE0 +:102F6800D7FDBB2FD2DD0FCF36FD47F5A8FBAE6CE2 :102F7800317DBFAEFBD7E9A8FB0924225080D6BF1C :102F8800AAFB22AEFBBDD8304700FDC40DBFACFB89 -:102F980030AAFBFDC02DF313BE6CB038FDD538FD4B -:102FA800DF10CF38FD47A0A8FB40A8FB1F61C8F57C +:102F980030AAFBFDC02DF313BE6CB036FDD536FD4F +:102FA800DF10CF36FD47A0A8FB40A8FB1F61C8F57E :102FB800A8FBD740DFFB0BDC05712321F2D740DFEC :102FC800FB0661D831120511F0C1AE6CFDAA2DC007 :102FD800F313BE6C712221EF03FDE62FE2D7714295 :102FE80021F0C1AE6CFDAA2DC0F313BE6CA0B0FBDE :102FF80040B0FB40DC3DF5B0FBD9B1FBF1313F04FB -:1030080034FD14D9B1FBF1BDD85008FD130E087278 +:1030080032FD14D9B1FBF1BDD85008FD130E08727A :1030180008E6D2DD040192DFFC896158D1DD057133 :103028002221EF03712321A0B1FB40B1FB2061C82D :10303800F5B1FBD78FB2FBB0B2FBD1DF7331D4D17E @@ -542,15 +542,15 @@ :1031F800BE6AD7C73152210BD5CAFBDD06B0CAFB60 :10320800EDC232715321D9FFFBF1E7240000DD0F35 :1032180023DD1B23DD1123DD5723DD2923DD3B5669 -:1032280000F539FDEDAE325601F539FDEF78D539A7 -:10323800FDDF075601E539FDEF055600F539FDCFED -:10324800CAFBFAEF61D539FDDF0B5601E539FDCF31 -:10325800CAFBFAEF51F5FFFBEF4CD539FDDF0B56F2 -:1032680000E539FDCFCAFBFAEF3CCFFFFB02EF3692 +:1032280000F537FDEDAE325601F537FDEF78D537AD +:10323800FDDF075601E537FDEF055600F537FDCFF1 +:10324800CAFBFAEF61D537FDDF0B5601E537FDCF35 +:10325800CAFBFAEF51F5FFFBEF4CD537FDDF0B56F4 +:1032680000E537FDCFCAFBFAEF3CCFFFFB02EF3694 :10327800D937FCF1E7240000DD0923DD2423DD0A2A -:1032880023EF1E5600F539FDEF1CD539FDDF075633 -:1032980001E539FDEF055600F539FDCFCAFBFAEF18 -:1032A800055601E539FD8F20F93115086661FB7176 +:1032880023EF1E5600F537FDEF1CD537FDDF075637 +:1032980001E537FDEF055600F537FDCFCAFBFAEF1C +:1032A800055601E537FD8F20F93115086661FB7178 :1032B8005107EF066661FB710101C6D7C736F000FA :1032C80071F4DC297170F000CE9D08CE9EC0CE9FAF :1032D80080F594FFF593FFF592FFE597FFE596FFDC @@ -585,13 +585,13 @@ :1034A800362361F8EDB5362561F8EDC136240A00FA :1034B80061F8EDCD3624120061F8EDEA362361F8A3 :1034C800EDD836ED1A37679FD6FBED243730F42A4E -:1034D800FD3F3C66736718D4FBED243740D9FB6A7F -:1034E800DF1440DAFB68DF0E674C6CDF09300F45EC -:1034F800FD3F3C713AD5679FDBFBED243767D1DD93 -:1035080006306940FD3F3C34F4FB89616F99ED2436 -:1035180037675C02D1DD0830A22CFD3F3CEF0C6719 -:103528005C01D1DD0630A72CFD3F3C675C3CD1DD5A -:103538001030AC2CFD3F3C675C3C7266736218D45B +:1034D800FD603C66736718D4FBED243740D9FB6A5E +:1034E800DF1440DAFB68DF0E674C6CDF09300445F7 +:1034F800FD603C713AD5679FDBFBED243767D1DD72 +:1035080006305E40FD603C34F4FB89616F99ED2420 +:1035180037675C02D1DD0830A22CFD603CEF0C67F8 +:103528005C01D1DD0630A72CFD603C675C3CD1DD39 +:103538001030AC2CFD603C675C3C7266736218D43A :10354800FBED243767D1DD625C01D1DD0530080071 :10355800EF01F6609F33FC675C02D1DD03E6EF0103 :10356800F63433FC89616899675C04D1DD04E6A10F @@ -600,7 +600,7 @@ :10359800D1DD05301000EF01F63433FC89616899FC :1035A800675C20D161E8716033FCED2437D518F9E8 :1035B800DF09679FFDFBA018F9EF134018F905DE36 -:1035C8000DD918F9F1B112674834FDA018F9ED24A6 +:1035C8000DD918F9F1B112674832FDA018F9ED24A8 :1035D80037675C0F7266736218D4FBED24374018A6 :1035E800F964DE1F4018F901DF0667D161F8570159 :1035F800E918F9671844FBA018F94018F90561C8DB @@ -614,21 +614,21 @@ :103678000B9E9F0BFCED2437711222675C7F9F0C19 :10368800FCED2437711222675C3F9F0DFCED243757 :10369800675C3F9F0EFCED2437675C1F9F0FFCEFB4 -:1036A8007B303D3EFD3F3C679F14FCEF6F30F83D9B -:1036B800FD3F3C679F15FCEF63301A3EFD3F3C67BA -:1036C8009F18FCEF57675C01D1DD51FD1748EF4C9F +:1036A8007B305E3EFD603C679F14FCEF6F30193E37 +:1036B800FD603C679F15FCEF63303B3EFD603C6757 +:1036C8009F18FCEF57675C01D1DD51FD0C48EF4CAA :1036D800402EFCC8DE46E92EFC671872FAA02EFCC4 :1036E800EF3A679F2EFCEF3467318E247200DF06B5 -:1036F800306309FD3F3C679FF7FBEF208FFAFB61C2 -:103708007F5C10D161E8CF45FC03679FFAFBEF0CA3 +:1036F800306309FD603C679FF7FBEF208FFAFB61A1 +:103708007F5C10D161E8CF47FC03679FFAFBEF0CA1 :10371800EF0A664C5ADE05736718D4FBC6D7C7167E :10372800664C30DC094C37DE05FD1B33EF67664C11 :1037380002DF1F8FD6FB5C03728F35FC5C03318E72 :10374800316D08616A08128F35FC5C80312A61622C :10375800EF49664C3DDF0AAE90BF30FCF930FCEF14 :103768003A664C3EDF05F931FCEF30664C4FDF0519 -:10377800FD3B48EF26664C61DF09E92EFC0972FA29 -:1037880072EF18664C7FDF0D30E340FD3F3C713A25 +:10377800FD3048EF26664C61DF09E92EFC0972FA34 +:1037880072EF18664C7FDF0D30D840FD603C713A0F :10379800D5524AEF06667309D4FB72C6D7C78806A6 :1037A8001617F1241000240500DC07244C00DD174F :1037B800EF18717BFA17F104D4FB1489617F9971B2 @@ -640,378 +640,378 @@ :10381800D7CF35FC03F533FCF537FCF539FCD7C7B2 :1038280088061617F1E734020025DD3E23DD18254A :10383800DD1D23DD0523DD2CEF3C715222679F3807 -:10384800FCCF45FC03EF2F675C839F35FCEF2767B0 +:10384800FCCF47FC03EF2F675C839F35FCEF2767AE :103858005C039F37FC675C034C0261F8715221FDE1 :10386800FB31EF12679F39FCEF0C6791DF08E0C16D :103878005012FDD437C0C6D7C71617F1E724000089 :10388800DD3A23DD23240300DD0C240200DD22249D :10389800F900DD2FEF3031020705308000EF01F627 :1038A800086F36FC7208EF248F33FCF533FC72EF97 -:1038B8001B8F38FC9F86FCF986FCEF10714223525F +:1038B8001B8F41FC9F42FCF938FCEF1071422352E8 :1038C80035EF09F2EF0666730932FC72C6D7C716E0 :1038D80017F1E7240000DD38241000DD1C23DD1C6F :1038E80023DD30240E00DD18241100DD1B240F0019 :1038F800DD12243000DD15EF1EE2EF1D5202EF1934 :103908005204EF155206EF115205EF0D5207EF0959 :10391800F2EF065203EF0252FFC6D7C731342241F5 -:103928007133228F44FC9FDCFB8F43FC9FFBFB36EB -:1039380040FDC7D943FCFDE43A618A70618AFD29DC -:103948003BC0D947FCF1312F609F46FC8F42FC4FAA -:1039580046FCDD0D7142228F46FC9F42FCCF45FCA0 -:10396800034045FC05DE0A30A539FD3F3CCF45FC48 -:103978006BB045FC7150F000CE300BCF170006CE6F +:103928007133228F46FC9FDCFB8F45FC9FFBFB36E7 +:103938003EFDC7D945FCFD053B618A70618AFD4A99 +:103948003BC0D949FCF1312F609F48FC8F44FC4FA4 +:1039580048FCDD0D7142228F48FC9F44FCCF47FC98 +:10396800034047FC05DE0A30A539FD603CCF47FC23 +:103978006BB047FC7150F000CE300BCF170006CE6D :103988003106FD0D03717A30710BE3710BE7C6D771 -:103998008F46FC9F42FC8F46FC9FDDFBD7401EF9FB -:1039A80003DF06401EF904DF02F2D78FFAFB5C1032 -:1039B800D1DD0C8F46FC9F4BFC7148FAFBEF61315F -:1039C8004422247143227163228FFAFB5C04D1DD07 -:1039D800088FF9FB9F4CFCEF068F46FC9F4CFC8F31 -:1039E8004CFC9F4BFCEF39315422237153227162F6 -:1039F80022D538FCDF05F54DFCEF0B8F38FC500263 -:103A0800D6A1609F4DFC8F4DFC9F4BFCEF1231649B -:103A180022088F4DFC9F4BFCEF068F4CFC9F4BFC04 -:103A28008F4BFC9FDDFB404BFC01DF05E538FCEFCD -:103A38000ED94BFCF11231FE03311F609F38FC8F09 -:103A4800FAFB5C01D1DD02F2D7E94BFC0944227094 -:103A5800C15013FDB705C0F2D7C7168B728C016130 -:103A68004ADE248B728C02614ADE188C01728C0249 -:103A7800614ADE068C01318EEF048C02318E0872A9 -:103A880008EF268B72EF228B728C02614ADE048B60 -:103A980072EF168C01728C026142DE068C01318E47 -:103AA800EF048C02318E087208C6D7C716710AE770 -:103AB800710BE37150F000CE300BCF170006669EF5 -:103AC80031FD0D03717A30710BE33182E302EFFAB5 -:103AD8008D1F7158F000710BE772C6D7C7C1C1FBC3 -:103AE800F8FF8F2CFC4E02DC03F2EF318C024F2DD5 -:103AF800FCDC0452FFEF268C022F2CFC7061313164 -:103B08008D128F2DFC2F2CFC70613133BDD813FD25 -:103B1800E60DBB440001DC03F690BB8B721004C6B3 -:103B2800D7C7C1C1FBF8FFAC0A14A91489708C026D -:103B38006128706131FD684F1344030071FEDC2475 -:103B4800AC0A148A04819A04AC0A148A044C11DC65 -:103B580011A9148C0299AC0A14CA0200AC0A14CA3E -:103B68000310EF74AC0A14CA0400AC0A14A914892F -:103B78004E02DE0AAC0A148A02819A02EF13AC0ADA -:103B880014A914894E0261D308AC0A148A02919AC6 -:103B980002AC0A148A03919A03D1DF3CAC0A148A56 -:103BA800024C10DF10A91489318EA112AC0A14A995 -:103BB800146299EF17AC0A148A024CF0DF0EA914AC -:103BC80089318EB112AC0A14A9146299AC0A14CACC -:103BD8000200AC0A14CA03101004C6D7ED2A3C71BF -:103BE8007BFAC7D55AFC61F831742230717422719E -:103BF8001123717322CEABACD55AFC61E8B05AFCE4 -:103C0800717AFA5600664C0ADD1272F3311C794655 -:103C1800FDCEFC0061CAFD893C86EFE9717AFAF2B3 -:103C2800C6D7C75600664C10DE0BF0317E12F67808 -:103C38005CFC86EFF0C6D7C7C1C1FBF8FFCC01001A -:103C48008C014C10DE36717BFA8C01F0317E045CFD -:103C5800FC14A96168DF09AC02B9717AFAF2EF1DA8 -:103C68008C01F0317E12795CFC614902DF06717AC1 -:103C7800FAE2EF09717AFA615901EFC4E21004C659 -:103C8800D7C72004FBF8FFF6425CFC61F8ED6E3DF7 -:103C9800717BFA9C038C034C10DE3C8C03F0317E64 -:103CA800045CFC14A96168DF05717AFAEF29717A5E -:103CB800FA8C0372F3311C795CFCCEFC0061CA6299 -:103CC8009C02D1DF0A8C03F0317E12E6785CFC712D -:103CD8007BFA615903EFBECC0200CC01018C02F0E3 -:103CE800317E045CFC14A96168DD7B8C02F0317EB6 -:103CF80012795CFCE743DF688C014C10DE628C01B2 -:103D0800F0317E12795CFCE743DD50717BFA8C015F -:103D1800F0317E045CFC14A96168DF1B61690171E4 -:103D28007BFA8C01F0317E12F6785CFC717AFA8CA1 -:103D3800024E01DCE7EF2F8C01F0317E045CFC14AD -:103D4800A9128C02F0317E33785CFC8C01F0317E54 -:103D580012E6785CFC615902717AFA615901EF98B0 -:103D6800615902EDE53C00F21004C6D7C72006FBF6 -:103D7800F8FF3419FCC55006C150A8C15030FD5B8E -:103D8800031006D2DD1DA07CFC407CFC08DE03E2AB -:103D9800EF5A3414FC895CFC99FD3D3E7110E2FB3E -:103DA800F2EF49F57CFC8F14FC5C01D1DD26401E46 -:103DB800F903DF205010C180FDD437C0C736100585 -:103DC80071D4C6DE0F17C15006C150A8C15030FDCE -:103DD8005B031006401EF901DD11401EF905DD0BDD -:103DE8008F14FC5C02D161E8FD1445F21006C6D7B9 -:103DF800D915FCC15030FD3103C0629F18FC7130E9 -:103E0800E5FB8FEDFB5C08D1DF06716307716B275B -:103E1800F2D7D918FCC1D917FCC15030FDCD031019 -:103E2800047130E5FB8FEDFB5C08D1DF0671630799 -:103E3800716B27F2D7C7200AFBF8FF500FC150302B -:103E4800FD3103C04041FB02DF077110E2FBF2EFD6 -:103E5800547118E2FBCC0700CC0812CC09808F14EF -:103E6800FC5C03D1DF08717AD5CC0607EF06717BBD -:103E7800D5CC062F17040600C15004C150A0C1506C -:103E880030FD03041006C736100571D4C6DE154090 -:103E98001EF903DF0F17C15006C150A8C15030FDED -:103EA8005B031006F2100AC6D7C7401EF902DF04EA -:103EB800F6BF80FCB05AFDD55AFD61E8EDC13FCF91 -:103EC8005AFD048F1EF9318FE723DD0B24020024ED -:103ED800030061C8EDC13F3028004280FCDF0AE0E2 -:103EE800C15010FDD437C0EF2530FA004280FCDF06 -:103EF8000B5002C15010FDD437C0EF128FF8FB50A1 -:103F080010D604FA004280FC61D8712020F93134BF -:103F18000709712323F6BF80FCEF1731242306F627 -:103F2800BF80FCEF0DA280FCF64280FCDF04B1BF2D -:103F380080FC8F21F9318FE7240000DD0623DD0D99 -:103F480023DF1236100571C4713123EF0B7104029F -:103F5800713123EF037132233132231A4082FC037B -:103F680061D8A082FC4082FC02DF0E5004C15010D0 -:103F7800FDD437C0EF03F582FC3134231A4084FCAA -:103F88000361D8A084FC4084FC02DF0E5008C150B5 -:103F980010FDD437C0EF03F584FC31420718408385 -:103FA800FC0361D8A083FC4083FC02DF0C5010C1E5 -:103FB800FDD437C0EF03F583FCC6D7C7C736100555 -:103FC80071D4C6DE0730743DFD3F3CD2401EF90374 -:103FD800DF5D3122070630C42BFD3F3C3144230C02 -:103FE8007143235080C15012FDD437C0571FD58864 -:103FF800FCDD05B088FCEF37CF88FC048F35FC5C0E -:1040080001D1DD2B5600664C08DE10730986224F5D -:1040180038FCDC046677EF0386EFEB8F87FC614F93 -:10402800DD0D679F87FC5040C15012FDD437C0405A -:104038001EF903DD05F6BD1AEF25D500FCDF09F6EC -:10404800461ADD1BB61AEF17D9FCFBF1461ADD0F2D -:10405800D9FCFB12AD1A43DE04A61AEF02B61AC643 -:10406800D7C78FF4FB76F5F4FB5C10D161E8715289 -:1040780023665C0FD1DD61665C01D1DD05F51EF9B3 -:10408800EF56665C02D1DD15E0C15003C15084FDD6 -:10409800CD031004711300711B20710303665C08C3 -:1040A800D1DD05710303EF17665C04D1DD117113CF -:1040B80000711B20D535FC61F8710303F535FC5000 -:1040C80005FDA3027102035003C1C15084FDCD0355 -:1040D8001004711A20FDC12CF2C6D7C736410571EC -:1040E8008461D8ED87413641057194DE07714050EF -:1040F80005CEABAC31B2D104E2ED9641713BD1CEE5 -:10410800ABAC4018F909DE77D518F9DF618F20F9D3 -:104118003133088F21F99F4005EF04CF400504F0A3 -:10412800C15084FD3103C0629F8CFC8F30FD9F8D90 -:10413800FC368EFCC75002C15008C1506CFD5B03B1 -:1041480010068F8AFC9F90FC8F02F99F91FC7134B6 -:1041580020E661301271042061DC31196162629FCE -:1041680092FC8F20F93169317A9F93FCEF0BD918B3 -:10417800F9F112498BFC9F4005A018F9E2EF0F7185 -:1041880060500571485005713BD5F518F9F2C6D74E -:10419800C78F1EF9318FE724000061F8ED694323CA -:1041A800DD1B2361F8ED70422361F8EDEE422361D7 -:1041B800F8ED37432361F8ED0344ED6943D51FF962 -:1041C800DF2BF64280FCDD05F55CFDEF03A05CFD0E -:1041D800405CFD65DC09F51EF9717222ED8344AF80 -:1041E80080FC440A0061D8ED8344E51FF97122235D -:1041F800F55CFDF5F7FBFD2805714320FDBA23406A -:1042080021F903DF09717222F51EF9ED8344FDE1FE -:104218002640E1FB9BDE09717222F51EF9ED83440D -:10422800714A277140110571301105713A22715A8E -:1042380022711A2EFDF92AD2DD09717222F51EF9B2 -:10424800ED834471103500CF37001D7140120540D1 -:104258001FF901DF05F5FDFBEF04CFFDFB03CF1EC2 -:10426800F902FDD72AED8344FDEC2CFD4C2D714A53 -:104278009DFD1938FDB933F537FF712BE0F51FF9AE -:10428800717222CBE43FEFCBE6F6F0FD2805713BD7 -:10429800D48F20F93105305004C15084FD3103C05A -:1042A800625C03318E315D34E3FB896168995002A9 -:1042B800C15084FD3103C0D2DD067170E3FBEF0409 -:1042C8007178E3FBFDBA23FD032E710820F9CF1E98 -:1042D800F9038FD6FB5C02D1DD095080C15010FD77 -:1042E800D437C0ED8344FD854431A4E020712BE030 -:1042F80031020C05FDFF44EF145027C15005C15091 -:1043080084FDCD031004CF1EF904717222315423A9 -:104318000BA096FCD596FC61F8FDFF44FDF2448F96 -:1043280020F931450731040703F51EF9ED8344FDF3 -:10433800854431020C18F0C15005C15084FDCD03ED -:1043480010045005FDA302FDFF44CF1EF903FDF242 -:10435800448F20F931450731040703F51EF9ED8331 -:1043680044CFFDFB03F5FEFBF500FC713221F6425C -:104378006CFF61E8ED8344712820F9F514FCFD3DDC -:104388003EFD932EFD432DFDA12D714B9DF5E4FBC4 -:10439800F5E5FBF5E6FBF5E7FB31042102EFFACE84 -:1043A8003708CBE4BFFFCBE6FFF1CED4FFCF370011 -:1043B8000971481205F6BEE0BEE2BED0716A27FD5B -:1043C800762B714307714B27714810057148110509 -:1043D8007138100571381105713302713B22715320 -:1043E80002715B2271130E711B2EFD9105F55CFDA8 -:1043F800CF1EF905712223F6BF80FC3102072CFD80 -:10440800BA23AF80FC440A00DC06E51FF9E51EF973 -:10441800D521F961E8FD91058F20F931455D502ED0 -:10442800FDA302E51FF9E51EF9EF50D50BF9DF4BA7 -:10443800F51FF9FD9105FD7F237173017132043178 -:10444800120502EFFA714302710320714220319480 -:104458009E02EFFA712AE7CEA409F5F30061FD3157 -:10446800040703712323E5F300CEA408712BE7E5C5 -:104478001EF98F20F9314503F51EF9C6D7D597FCEB -:10448800DF1E310200195003C15084FD3103C062A0 -:104498005C01D1DF07F51EF9717222D7E597FCD7C9 -:1044A8004097FCF0DF083104003FF597FCD74097B0 -:1044B800FCC8DF0BF51EF9717222CF97FCF0D731DB -:1044C800020004A097FCD7F0C15004C15084FDCD70 -:1044D8000310048FE3FB5C9F9FE3FB7110F4FB3038 -:1044E8006940FD3F3CCF97FCF0D78F20F931250676 -:1044F800F51EF9717222D7715323F596FC71720774 -:10450800FD0D03717307D7FDFE05F2D7C7200CFB1D -:10451800F8FF8F1AFCF0F919FCF303FD684F13BC80 -:10452800048F1CFCF0F91BFCF303FD684F13BC025D -:104538008F1EFCF0F91DFCF303FD684F13BBAC04A0 -:10454800BDD8F6BDDAAC04311EBDDCF6BDDEFD9982 -:104558000DADD8BDDCADDABDDEAC02BDD8F6BDDA36 -:10456800AC02311EDADCC3DADEC3BDDCF6BDDEFD2B -:10457800990DC0BDDEC0BDDCADDEFD0F0FADD8BDF1 -:10458800DCADDABDDEABBDD8F6BDDAAB311EDADCA8 -:10459800C3DADEC3BDDCF6BDDEFD990DC0BDDEC0ED -:1045A800BDDCADDEFD0F0FDADAADD8FD6549C3C558 -:1045B8008F24FD5C3FF0317E04A4FC14C2C0B9A076 -:1045C80024FDF6BC08BC0A9C078C074C2EDD3E8FE8 -:1045D80024FD0E0770F161DC605C3FF0317E1279DA -:1045E800A4FCBDD8F6BDDA8C0773098E22318FBDC5 -:1045F800DC70BDDEFD990DAC08BDDCAC0AFD0F0F0B -:10460800ADDABC0AADD8BC08615907EFBCAC08BD2F -:10461800D8AC0ABDDAC9DC0004F6FD630EC9DCFFBC -:10462800FFF6FD780FADD8BF9EFCAF98FC429EFC0C -:10463800DD12AF9AFCBF9CFCAF98FCBF9AFCAF9E02 -:10464800FCBF98FCAF9AFC429CFCDC50AF98FC4243 -:104658009AFCDE48AF5EFD4298FCDE404062FD16E3 -:10466800DC1F4062FDA0DE168FA0FC4F62FDDE0E4F -:10467800AF98FC22A2FC44691061C8FDED46F562C2 -:10468800FDAF98FC445146DC0BAF98FC241027BFC3 -:1046980060FDEF1930F82ABF60FDEF114062FDFFA1 -:1046A800DD03E6EF01F63462FD89610899AF9CFCF1 -:1046B800429AFCDC1BAF9AFC4298FCDE13AF98FCD4 -:1046C8004260FDDE0BF5A0FCAF98FCBFA2FCEF1129 -:1046D80040A0FCFFDD03E6EF01F634A0FC89610889 -:1046E80099100CC6D7C72006FBF8FFA01FFCD51FE2 -:1046F800FCDF1CA020FCD520FCDF14A021FCD52168 -:10470800FCDF0CCF1FFCFFCF20FCFFCF21FCFF718B -:104718007BFA710A9E31929E02EFFA8E98FD8C0FF9 -:104728009C039F28FD8E949F63FD8E969F64FD8E4B -:10473800979F65FD8E939F26FD8E929F27FDFDCE48 -:104748004813BC04BDD8F6BDDA46DADF03B146D853 -:10475800DF198C035C0391DF03E6EF01F6046D01BA -:10476800313D120103B1BC046169038F66FD4E033C -:10477800DF12AF2AFD614904DE40AC04222AFDFDA8 -:10478800EF47EF368C03318EB112D966FDF143DF66 -:104798001E8C035C0391DF03E6EF01F6046D013123 -:1047A8003D120103222AFD610904FDEF47EF0B8F3B -:1047B80066FD4E03DE04F6FDEF478C039F66FDACF5 -:1047C80004BF2AFDD925FDF1010422F9BB14A9442F -:1047D800FFFFDF04E6B9EF0BAB14A944FEFFDD03CE -:1047E800A9A1B91006C6D7C7161744A90061C836CB -:1047F800A800A025FD4025FDA861C8F525FDF925DF -:10480800FDF3311CF67822F9B7F647DFE5C6D7C7BE -:1048180056A89666F0317E12F6B17822F966D1DF95 -:10482800F1F51FFCF520FCF521FCF525FDC6D77137 -:104838006323D7C72004FBF8FFD918F9F1E7240050 -:1048480000DD1123DD1C23DD2123DD2623DD2F23BD -:10485800DD34EF3A8F25FD9F2CFDA018F9F963FD93 -:10486800EF60A018F9F964FDEF58A018F9F965FD93 -:10487800EF50A018F98F28FDFDA60F72EF44A0187D -:10488800F9F926FDEF3CA018F9F927FDEF34F92CCA -:10489800FDF3311C7922F9BB316223058B9C03EFB0 -:1048A800128C019C03D52CFDDF06CF2CFDA7EF034E -:1048B800B02CFD718071672361DC61FB7161238C11 -:1048C80003721004C6D7C72008FBF8FF8E989C0512 -:1048D8008E979C048E969C038E949C028E939C01CA -:1048E8008E929B710B9E717AFA8C05FD8C0F9C053C -:1048F8008C04FD8C0F9C048C03FD8C0F9C038C0294 -:10490800FD8C0F9C028C04F0317E1279BE22BC060D -:104918008C055C03D1DF098C044C0361C8617906FE -:104928008C03318EB1610906BC06313D120103BC0E -:10493800068C060E02708C071C00BC068F24FC4EE9 -:1049480001DC0D8C014F24FCDC0B8F25FC4DDE05B2 -:10495800AC0612EF04AC06B1121008C6D7C7C3C123 -:104968002008FBF8FFF661490A61F8614908DF078A -:10497800F7340000ED024AE6BC04F6BC06AC0ABCFB -:1049880002AC08BBAC06614902AC0461F86149009D -:10499800DE28AC04BDD8AC06BDDAE1FD1E0FADDAE9 -:1049A800BC06ADD8BC04ABBDD8AC02BDDAE1FD395C -:1049B8000FADDABC02ADD8BBEFCAAC06BC02AC0482 -:1049C800BBAC08BDD8AC0ABDDAAC04BDDCAC06FD96 -:1049D8009C0EAC04BDDCAC06FD0F0FE1FD390FAD3C -:1049E800DABC06ADD8BC04AC06614902AC0461F877 -:0E49F800614900DCC5AC0214AB12100CC6D72E -:104A060061FC61FCC1C3C5C7520C929269D4FEC158 -:104A1600DFF88EFD708EFCC1717AFA401EF903DF55 -:104A26000630C42BFD3F3CC09EFC609EFD34D4FE88 -:104A36005206C0B9A5A592DFF9C6C4C2C061FC6121 -:104A4600DF520C929269D4FEC1DFF88EFD708EFCA7 -:104A5600C1717AFAC736410571A4C6DC51F532FD3B -:104A66007148500571605005312422367162077114 -:104A760023228FE4FB5FECFBD1DF1B8FE5FB5FEDB1 -:104A8600FBD1DF128FE6FB5FEEFBD1DF098FE7FB81 -:104A96005FEFFBD1DD0C31620702EFFA716307713C -:104AA6006B27FD3748FD6533F518F9EDC94BC73659 -:104AB60041057184C6DE0DF532FD71485005FD6570 -:104AC60033EDC94BC73641057194C6DE154032FD3C -:104AD60003DD0C4032FD04DD064032FD0161F8F5D0 -:104AE60032FDD932FDF1E7240000DD0823DD132372 -:104AF600DD39EF6071405005E532FD71505005ED2E -:104B0600C94B8F40059F19F99F1CF9D919F9FD2644 -:104B160037629F1BF94019F97FDD06CF32FD02EFA0 -:104B260003F532FD71505005EDC94BC7364105718D -:104B360094C6DE1CC736410571C4C6DE06CF32FDFB -:104B460003EF11F532FD7148500571605005EF73A2 -:104B5600CF32FD044032FD03DF138F1BF99F400562 -:104B6600D91BF9C1D919F9FDA537C0EF108F40053A -:104B760076C7D919F9FDEA33C071505005D91CF929 -:104B8600F1242900DD2D240400DD28242200DD2364 -:104B9600241100DD0C240100DD19241E00DD14EFB4 -:104BA6000C4019F960DF0CCF19F961EF06F518F919 -:104BB600A019F94032FD03DF0AD919F9FD2637623B -:104BC6009F1BF9C09EFC609EFD34D4FE5206C0B900 -:104BD600A5A592DFF961FCC1C3C5C7520C929269C3 -:104BE600D4FEC1DFF88EFD708EFCC1F616717AFA1E -:104BF600714AE5717BBD51405F0401D1DD05A7F621 -:104C060047DFF3300400BF2401F6BF2A01300B0B47 -:104C1600BF2801FD0D03300B0FBF2801FD0D03302A -:104C26000F0FBF2801710AE6710321C09EFC609E2A -:104C3600FD34D4FE5206C0B9A5A592DFF9C6C4C29A -:104C4600C061FCC1C3C5C7520C929269D4FEC1DFD4 -:104C5600F88EFD708EFCC1717AFAD540FBDD0EEB45 -:104C66003EFB899E44A23EFBB040FBEF2B710AE659 -:104C7600300400BF2401F6BF2A01300B0BBF280108 -:104C8600FD0D03300B0FBF2801FD0D03300F0FBFC5 -:104C96002801717320710321C09EFC609EFD34D4EF -:104CA600FE5206C0B9A5A592DFF9C6C4C2C061FC12 -:104CB60061EF520C929269D4FEC1DFF88EFD708EC0 -:104CC600FCC12008FBF8FF71503002CEABACCC0122 -:104CD60000F6BC0231B2E20F617902F6614902DFE9 -:104CE600F371603002EF7E8E519B713BE28B5C026A -:104CF600D1DD1D8B5C08D1DF0971503002CC01007B -:104D0600EFCF8C0770FD8038629E50CC0102EFC158 -:104D16008B5C03D1DF408E509C05715030028C01B4 -:104D2600D1DF0E8C0570FDD638629C07CC0101EFF1 -:104D3600318C014C02DF0671603002EF28CF34025D -:104D46005A716030028C0570C18C0770FD2738C01F -:104D5600CF34024AEF0F8B5C01D1DD067160300261 -:104D6600EF03EDD74C1008C09EFC609EFD34D4FEC8 -:104D76005206C0B9A5A592DFF961FCC1C3C5C752E9 -:104D86000C929269D4FEC1DFF88EFD708EFCC17163 -:104D96000A9E31929E02EFFA8F0EFC4F96FFDF19A4 -:104DA6008F0FFC4F97FFDF118F10FC4F98FFDF0925 -:104DB6005004C15011FDD437C0710B9EC09EFC60DB -:104DC6009EFD34D4FE5206C0B9A5A592DFF9C6C42D -:104DD600C2C061FCA05AFC61FCC1C3C5C7520C929B -:104DE6009269D4FEC1DFF88EFD708EFCC1C1FBF85E -:104DF600FF8D1F9C018E31318EE7240600DD0823CE -:104E0600DD0F23DD25EF45717AFA8C019F44FCEF17 -:104E16003B717AFA4021F901DF078C019F43FCEFD1 -:104E26002B51FF2E019F43FCEF22717AFA8C019FD2 -:104E360002F98FE2FB5C01D1DF12401EF903DD06A9 -:104E4600401EF904DF06302326FD3F3C4031FF09B2 -:104E5600DE05A031FFEF197158F00071322240587B -:104E6600FC02DF03F6EF05D958FCF1A1609F58FC60 -:104E7600710BE3C0C09EFC609EFD34D4FE5206C09A -:104E8600B9A5A592DFF9C6C4C2C061FC61FF520C88 -:104E9600929269D4FEC1DFF88EFD708EFCC1717AE4 -:104EA600FA8F14FC5C03D1DD19401EF903DD0640C0 -:104EB6001EF904DF0D36100571D4DE0630743DFD93 -:104EC6003F3CC09EFC609EFD34D4FE5206C0B9A590 -:104ED600A592DFF961FC61FC61FC61FC61FC61FC8F -:104EE60061FC61FC61FC61FC61FC61FC61FC61FCD4 -:104EF60061FC61FC61FC61FC61FC61FC61FC61FCC4 -:0E4F060061FC61FC61FC61FC61FC61FC61FC12 -:0A4F140000060C12181E242A303685 -:104F1E000016324864809612284460769208244027 -:104F2E00FF000000555555554700DCFB0000000002 -:104F3E0047FC00000000B13E2339D822AB2E3C3096 -:104F4E00B930FB31C33F7109984101000000983A16 -:0A4F5E00F82AFF233012990000002A -:084F6800317503F7332312D762 -:0A4FF60030393A31393A3230000008 +:103998008F48FC9F44FC8F48FC9FDDFBD7C7401E27 +:1039A800F903DF06401EF904DF04F2ED803A8FFACE +:1039B800FB5C10D1DD0C8F48FC9F4DFC7148FAFB75 +:1039C800EF61314422247143227163228FFAFB5C38 +:1039D80004D1DD088FF9FB9F4EFCEF068F48FC9F52 +:1039E8004EFC8F4EFC9F4DFCEF393154222371530E +:1039F80022716222D538FCDF05F54FFCEF0B8F38BA +:103A0800FC5002D6A1609F4FFC8F4FFC9F4DFCEFEE +:103A180012316422088F4FFC9F4DFCEF068F4EFC3D +:103A28009F4DFC8F4DFC9FDDFB404DFC01DF05E504 +:103A380038FCEF0ED94DFCF11231FE03311F609FA7 +:103A480038FC36001F664C08DE10730984224F3894 +:103A5800FCDC046677EF0386EFEB679F41FC8FFA87 +:103A6800FB5C01D1DD03F2EF0FE94DFC0944227044 +:103A7800C15013FDB705C0F2C6D7C7168B728C01AB +:103A8800614ADE248B728C02614ADE188C01728CCA +:103A980002614ADE068C01318EEF048C02318E08F9 +:103AA8007208EF268B72EF228B728C02614ADE0459 +:103AB8008B72EF168C01728C026142DE068C01312A +:103AC8008EEF048C02318E087208C6D7C716710AA9 +:103AD800E7710BE37150F000CE300BCF170006668C +:103AE8009E31FD0D03717A30710BE33182E302EFF1 +:103AF800FA8D1F7158F000710BE772C6D7C7C1C1A4 +:103B0800FBF8FF8F2CFC4E02DC03F2EF318C024FE6 +:103B18002DFCDC0452FFEF268C022F2CFC70613147 +:103B2800318D128F2DFC2F2CFC70613133BDD813D1 +:103B3800FDE60DBB440001DC03F690BB8B7210045C +:103B4800C6D7C7C1C1FBF8FFAC0A14A91489708C89 +:103B5800026128706131FD5E4F1344030071FEDC81 +:103B680024AC0A148A04819A04AC0A148A044C11FD +:103B7800DC11A9148C0299AC0A14CA0200AC0A140C +:103B8800CA0310EF74AC0A14CA0400AC0A14A914CE +:103B9800894E02DE0AAC0A148A02819A02EF13AC3B +:103BA8000A14A914894E0261D308AC0A148A029136 +:103BB8009A02AC0A148A03919A03D1DF3CAC0A1426 +:103BC8008A024C10DF10A91489318EA112AC0A1494 +:103BD800A9146299EF17AC0A148A024CF0DF0EA9F7 +:103BE8001489318EB112AC0A14A9146299AC0A1462 +:103BF800CA0200AC0A14CA03101004C6D7ED4B3C25 +:103C0800717BFAC7D55CFC61F8317422307174227B +:103C1800711123717322CEABACD55CFC61E8B05C4A +:103C2800FC717AFA5600664C0ADD1272F3311C797F +:103C380044FDCEFC0061CAFDAA3C86EFE9717AFA20 +:103C4800F2C6D7C75600664C10DE0BF0317E12F66E +:103C5800785EFC86EFF0C6D7C7C1C1FBF8FFCC0180 +:103C6800008C014C10DE36717BFA8C01F0317E0439 +:103C78005EFC14A96168DF09AC02B9717AFAF2EF47 +:103C88001D8C01F0317E12795EFC614902DF0671FC +:103C98007AFAE2EF09717AFA615901EFC4E2100485 +:103CA800C6D7C72004FBF8FFF6425EFC61F8ED8F2B +:103CB8003D717BFA9C038C034C10DE3C8C03F03185 +:103CC8007E045EFC14A96168DF05717AFAEF297138 +:103CD8007AFA8C0372F3311C795EFCCEFC0061CA5F +:103CE800629C02D1DF0A8C03F0317E12E6785EFC1A +:103CF800717BFA615903EFBECC0200CC01018C0242 +:103D0800F0317E045EFC14A96168DD7B8C02F03121 +:103D18007E12795EFCE743DF688C014C10DE628C12 +:103D280001F0317E12795EFCE743DD50717BFA8C3D +:103D380001F0317E045EFC14A96168DF1B61690132 +:103D4800717BFA8C01F0317E12F6785EFC717AFA9A +:103D58008C024E01DCE7EF2F8C01F0317E045EFC13 +:103D680014A9128C02F0317E33785EFC8C01F0319C +:103D78007E12E6785EFC615902717AFA615901EFA8 +:103D880098615902ED063D00F21004C6D7C7200617 +:103D9800FBF8FF3419FCC55006C150A8C15030FDCE +:103DA8005B031006D2DD1DA07EFC407EFC08DE030E +:103DB800E2EF5A3414FC895CFC99FD5E3E7110E216 +:103DC800FBF2EF49F57EFC8F14FC5C01D1DD264047 +:103DD8001EF903DF205010C180FDD437C0C736104C +:103DE8000571D4C6DE0F17C15006C150A8C15030A6 +:103DF800FD5B031006401EF901DD11401EF905DDCB +:103E08000B8F14FC5C02D161E8FD0945F21006C66F +:103E1800D7D915FCC15030FD3103C0629F18FC7121 +:103E280030E5FB8FEDFB5C08D1DF06716307716B32 +:103E380027F2D7D918FCC1D917FCC15030FDCD03E2 +:103E480010047130E5FB8FEDFB5C08D1DF06716370 +:103E580007716B27F2D7C7200AFBF8FF500FC15034 +:103E680030FD3103C04041FB02DF077110E2FBF275 +:103E7800EF547118E2FBCC0700CC0812CC09808FF4 +:103E880014FC5C03D1DF08717AD5CC0607EF067104 +:103E98007BD5CC062F17040600C15004C150A0C121 +:103EA8005030FD03041006C736100571D4C6DE1560 +:103EB800401EF903DF0F17C15006C150A8C150308A +:103EC800FD5B031006F2100AC6D7C7401EF902DFD1 +:103ED80004F6BF82FCB058FDD558FD61E8EDE23F1D +:103EE800CF58FD048F1EF9318FE723DD0B24020024 +:103EF80024030061C8EDE23F3028004282FCDF0A5B +:103F0800E0C15010FDD437C0EF2530FA004282FCE2 +:103F1800DF0B5002C15010FDD437C0EF128FF8FBF1 +:103F28005010D604FA004282FC61D8712020F93181 +:103F3800340709712323F6BF82FCEF1731242306C7 +:103F4800F6BF82FCEF0DA282FCF64282FCDF04B1D0 +:103F5800BF82FC8F21F9318FE7240000DD0623DDC5 +:103F68000D23DF1236100571C4713123EF0B710474 +:103F780002713123EF037132233132231A4084FC5A +:103F88000361D8A084FC4084FC02DF0E5004C150B9 +:103F980010FDD437C0EF03F584FC3134231A408672 +:103FA800FC0361D8A086FC4086FC02DF0E5008C1E5 +:103FB8005010FDD437C0EF03F586FC314207184096 +:103FC80085FC0361D8A085FC4085FC02DF0C5010FD +:103FD800C1FDD437C0EF03F585FCC6D7C736100539 +:103FE80071D4DE0730953DFD603CD2401EF903DFF9 +:103FF800333122070630C42BFD603C3144230C7159 +:1040080043235080C15012FDD437C08F35FC5C016A +:10401800D1DD118F41FC4F42FCDD095040C15012E7 +:10402800FDD437C0401EF903DD05F6BD1AEF25D5CE +:1040380000FCDF09F6461ADD1BB61AEF17D9FCFBA0 +:10404800F1461ADD0FD9FCFB12AD1A43DE04A61A9D +:10405800EF02B61AC6D7C78FF4FB76F5F4FB5C10EF +:10406800D161E8715223665C0FD1DD61665C01D1D4 +:10407800DD05F51EF9EF56665C02D1DD15E0C1508D +:1040880003C15084FDCD031004711300711B20710E +:104098000303665C08D1DD05710303EF17665C0452 +:1040A800D1DD11711300711B20D535FC61F8710346 +:1040B80003F535FC5005FDA3027102035003C1C18D +:1040C8005084FDCD031004711A20FDC12CF2C6D70F +:1040D800C7364105718461D8ED7C4136410571943C +:1040E800DE0771405005CEABAC31B2D104E2ED8BA6 +:1040F80041713BD1CEABAC4018F909DE77D518F940 +:10410800DF618F20F93133088F21F99F4005EF04D3 +:10411800CF400504F0C15084FD3103C0629F8AFC82 +:104128008F2EFD9F8BFC368CFCC75002C15008C1F6 +:10413800506CFD5B0310068F88FC9F8EFC8F02F984 +:104148009F8FFC713420E661301271042061DC31EC +:10415800196162629F90FC8F20F93169317A9F91D1 +:10416800FCEF0BD918F9F1124989FC9F4005A018FA +:10417800F9E2EF0F7160500571485005713BD5F5B4 +:1041880018F9F2C6D7C78F1EF9318FE724000061EE +:10419800F8ED5E4323DD1B2361F8ED65422361F8EA +:1041A800EDE3422361F8ED2C432361F8EDF843ED8C +:1041B8005E43D51FF9DF2BF64282FCDD05F55AFD7B +:1041C800EF03A05AFD405AFD65DC09F51EF971722E +:1041D80022ED7844AF82FC440A0061D8ED7844E5CA +:1041E8001FF9712223F55AFDF5F7FBFD28057143E8 +:1041F80020FDBA234021F903DF09717222F51EF967 +:10420800ED7844FDE12640E1FB9BDE09717222F561 +:104218001EF9ED7844714A27714011057130110576 +:10422800713A22715A22711A2EFDF92AD2DD0971CA +:104238007222F51EF9ED784471103500CF37001D54 +:1042480071401205401FF901DF05F5FDFBEF04CFB2 +:10425800FDFB03CF1EF902FDD72AED7844FDEC2CB7 +:10426800FD4C2D714A9DFD1938FDB933F537FF71A5 +:104278002BE0F51FF9717222CBE43FEFCBE6F6F0A5 +:10428800FD2805713BD48F20F93105305004C15009 +:1042980084FD3103C0625C03318E315D34E3FB89F8 +:1042A8006168995002C15084FD3103C0D2DD0671A6 +:1042B80070E3FBEF047178E3FBFDBA23FD032E7175 +:1042C8000820F9CF1EF9038FD6FB5C02D1DD095017 +:1042D80080C15010FDD437C0ED7844FD7A4431A434 +:1042E800E020712BE031020C05FDF444EF14502757 +:1042F800C15005C15084FDCD031004CF1EF90471CF +:1043080072223154230BA094FCD594FC61F8FDF47F +:1043180044FDE7448F20F931450731040703F51EB2 +:10432800F9ED7844FD7A4431020C18F0C15005C10A +:104338005084FDCD0310045005FDA302FDF444CFC5 +:104348001EF903FDE7448F20F931450731040703BF +:10435800F51EF9ED7844CFFDFB03F5FEFBF500FCF7 +:10436800713221F6426CFF61E8ED7844712820F93A +:10437800F514FCFD5E3EFD932EFD432DFDA12D7130 +:104388004B9DF5E4FBF5E5FBF5E6FBF5E7FB3104B2 +:104398002102EFFACE3708CBE4BFFFCBE6FFF1CE20 +:1043A800D4FFCF37000971481205F6BEE0BEE2BE61 +:1043B800D0716A27FD762B714307714B277148101E +:1043C80005714811057138100571381105713302EE +:1043D800713B22715302715B2271130E711B2EFD0A +:1043E8009105F55AFDCF1EF905712223F6BF82FC0F +:1043F8003102072CFDBA23AF82FC440A00DC06E533 +:104408001FF9E51EF9D521F961E8FD91058F20F91D +:1044180031455D502EFDA302E51FF9E51EF9EF5069 +:10442800D50BF9DF4BF51FF9FD9105FD7F2371735E +:104438000171320431120502EFFA7143027103204F +:1044480071422031949E02EFFA712AE7CEA409F551 +:10445800F30061FD31040703712323E5F300CEA4C3 +:1044680008712BE7E51EF98F20F9314503F51EF990 +:10447800C6D7D595FCDF1E310200195003C1508400 +:10448800FD3103C0625C01D1DF07F51EF9717222AC +:10449800D7E595FCD74095FCF0DF083104003FF5DF +:1044A80095FCD74095FCC8DF0BF51EF9717222CF39 +:1044B80095FCF0D731020004A095FCD7F0C1500458 +:1044C800C15084FDCD0310048FE3FB5C9F9FE3FB89 +:1044D8007110F4FB305E40FD603CCF95FCF0D78F47 +:1044E80020F9312506F51EF9717222D7715323F58B +:1044F80094FC717207FD0D03717307D7FDFE05F279 +:10450800D7C7200CFBF8FF8F1AFCF0F919FCF3034E +:10451800FD5E4F13BC048F1CFCF0F91BFCF303FD7C +:104528005E4F13BC028F1EFCF0F91DFCF303FD5E09 +:104538004F13BBAC04BDD8F6BDDAAC04311EBDDCEC +:10454800F6BDDEFD990DADD8BDDCADDABDDEAC0241 +:10455800BDD8F6BDDAAC02311EDADCC3DADEC3BD83 +:10456800DCF6BDDEFD990DC0BDDEC0BDDCADDEFDF7 +:104578000F0FADD8BDDCADDABDDEABBDD8F6BDDA08 +:10458800AB311EDADCC3DADEC3BDDCF6BDDEFD9975 +:104598000DC0BDDEC0BDDCADDEFD0F0FDADAADD873 +:1045A800FD5A49C3C58F22FD5C3FF0317E04A2FC51 +:1045B80014C2C0B9A022FDF6BC08BC0A9C078C072F +:1045C8004C2EDD3E8F22FD0E0770F161DC605C3FF2 +:1045D800F0317E1279A2FCBDD8F6BDDA8C077309DA +:1045E8008E22318FBDDC70BDDEFD990DAC08BDDCBF +:1045F800AC0AFD0F0FADDABC0AADD8BC086159078B +:10460800EFBCAC08BDD8AC0ABDDAC9DC0004F6FDC5 +:10461800630EC9DCFFFFF6FD780FADD8BF9CFCAF79 +:1046280096FC429CFCDD12AF98FCBF9AFCAF96FC4E +:10463800BF98FCAF9CFCBF96FCAF98FC429AFCDC90 +:1046480050AF96FC4298FCDE48AF5CFD4296FCDE1B +:10465800404060FD16DC1F4060FDA0DE168F9EFC0A +:104668004F60FDDE0EAF96FC22A0FC44691061C8C5 +:10467800FDE246F560FDAF96FC445146DC0BAF9673 +:10468800FC241027BF5EFDEF1930F82ABF5EFDEF4E +:10469800114060FDFFDD03E6EF01F63460FD89613E +:1046A8000899AF9AFC4298FCDC1BAF98FC4296FC38 +:1046B800DE13AF96FC425EFDDE0BF59EFCAF96FC6A +:1046C800BFA0FCEF11409EFCFFDD03E6EF01F634CE +:1046D8009EFC89610899100CC6D7C72006FBF8FF15 +:1046E800A01FFCD51FFCDF1CA020FCD520FCDF147C +:1046F800A021FCD521FCDF0CCF1FFCFFCF20FCFF45 +:10470800CF21FCFF717BFA710A9E31929E02EFFA6B +:104718008E98FD8C0F9C039F26FD8E949F61FD8EC5 +:10472800969F62FD8E979F63FD8E939F24FD8E92C8 +:104738009F25FDFDC34813BC04BDD8F6BDDA46DA93 +:10474800DF03B146D8DF198C035C0391DF03E6EF82 +:1047580001F6046D01313D120103B1BC0461690326 +:104768008F64FD4E03DF12AF28FD614904DE40ACC3 +:10477800042228FDFDE447EF368C03318EB112D9AF +:1047880064FDF143DF1E8C035C0391DF03E6EF0158 +:10479800F6046D01313D1201032228FD610904FD73 +:1047A800E447EF0B8F64FD4E03DE04F6FDE4478C0F +:1047B800039F64FDAC04BF28FDD923FDF101042249 +:1047C800F9BB14A944FFFFDF04E6B9EF0BAB14A94A +:1047D80044FEFFDD03A9A1B91006C6D7C7161744C2 +:1047E800A90061C836A800A023FD4023FDA861C820 +:1047F800F523FDF923FDF3311CF67822F9B7F647C6 +:10480800DFE5C6D7C756A89666F0317E12F6B178AE +:1048180022F966D1DFF1F51FFCF520FCF521FCF546 +:1048280023FDC6D7716323D7C72004FBF8FFD91827 +:10483800F9F1E7240000DD1123DD1C23DD2123DD50 +:104848002623DD2F23DD34EF3A8F23FD9F2AFDA099 +:1048580018F9F961FDEF60A018F9F962FDEF58A0A9 +:1048680018F9F963FDEF50A018F98F26FDFDA60F82 +:1048780072EF44A018F9F924FDEF3CA018F9F925C6 +:10488800FDEF34F92AFDF3311C7922F9BB3162239B +:10489800058B9C03EF128C019C03D52AFDDF06CF04 +:1048A8002AFDA7EF03B02AFD718071672361DC61DF +:1048B800FB7161238C03721004C6D7C72008FBF86C +:1048C800FF8E989C058E979C048E969C038E949CD4 +:1048D800028E939C018E929B710B9E717AFA8C05C5 +:1048E800FD8C0F9C058C04FD8C0F9C048C03FD8CA7 +:1048F8000F9C038C02FD8C0F9C028C04F0317E12FD +:1049080079BE22BC068C055C03D1DF098C044C03FC +:1049180061C86179068C03318EB1610906BC063124 +:104928003D120103BC068C060E02708C071C00BCED +:10493800068F24FC4E01DC0D8C014F24FCDC0B8F10 +:1049480025FC4DDE05AC0612EF04AC06B1121008CA +:10495800C6D7C7C3C12008FBF8FFF661490A61F84A +:10496800614908DF07F7340000EDF749E6BC04F6B3 +:10497800BC06AC0ABC02AC08BBAC06614902AC047C +:1049880061F8614900DE28AC04BDD8AC06BDDAE1A7 +:10499800FD1E0FADDABC06ADD8BC04ABBDD8AC0269 +:1049A800BDDAE1FD390FADDABC02ADD8BBEFCAAC58 +:1049B80006BC02AC04BBAC08BDD8AC0ABDDAAC047A +:1049C800BDDCAC06FD9C0EAC04BDDCAC06FD0F0FD7 +:1049D800E1FD390FADDABC06ADD8BC04AC066149BF +:1049E80002AC0461F8614900DCC5AC0214AB1210DA +:0349F8000CC6D713 +:1049FB0061FC61FCC1C3C5C7520C929269D4FEC164 +:104A0B00DFF88EFD708EFCC1717AFA401EF903DF60 +:104A1B000630C42BFD603CC09EFC609EFD34D4FE72 +:104A2B005206C0B9A5A592DFF9C6C4C2C061FC612C +:104A3B00DF520C929269D4FEC1DFF88EFD708EFCB2 +:104A4B00C1717AFAC736410571A4C6DC51F530FD48 +:104A5B00714850057160500531242236716207711F +:104A6B0023228FE4FB5FECFBD1DF1B8FE5FB5FEDBC +:104A7B00FBD1DF128FE6FB5FEEFBD1DF098FE7FB8C +:104A8B005FEFFBD1DD0C31620702EFFA7163077147 +:104A9B006B27FD2C48FD6533F518F9EDBE4BC7367A +:104AAB0041057184C6DE0DF530FD71485005FD657D +:104ABB0033EDBE4BC73641057194C6DE154030FD54 +:104ACB0003DD0C4030FD04DD064030FD0161F8F5DF +:104ADB0030FDD930FDF1E7240000DD0823DD132381 +:104AEB00DD39EF6071405005E530FD71505005ED3B +:104AFB00BE4B8F40059F19F99F1CF9D919F9FD265B +:104B0B0037629F1BF94019F97FDD06CF30FD02EFAD +:104B1B0003F530FD71505005EDBE4BC736410571A5 +:104B2B0094C6DE1CC736410571C4C6DE06CF30FD08 +:104B3B0003EF11F530FD7148500571605005EF73AF +:104B4B00CF30FD044030FD03DF138F1BF99F400571 +:104B5B00D91BF9C1D919F9FDA537C0EF108F400545 +:104B6B0076C7D919F9FDEA33C071505005D91CF934 +:104B7B00F1242900DD2D240400DD28242200DD236F +:104B8B00241100DD0C240100DD19241E00DD14EFBF +:104B9B000C4019F960DF0CCF19F961EF06F518F924 +:104BAB00A019F94030FD03DF0AD919F9FD26376248 +:104BBB009F1BF9C09EFC609EFD34D4FE5206C0B90B +:104BCB00A5A592DFF961FCC1C3C5C7520C929269CE +:104BDB00D4FEC1DFF88EFD708EFCC1F616717AFA29 +:104BEB00714AE5717BBD51405F0401D1DD05A7F62C +:104BFB0047DFF3300400BF2401F6BF2A01300B0B53 +:104C0B00BF2801FD0D03300B0FBF2801FD0D033035 +:104C1B000F0FBF2801710AE6710321C09EFC609E35 +:104C2B00FD34D4FE5206C0B9A5A592DFF9C6C4C2A5 +:104C3B00C061FCC1C3C5C7520C929269D4FEC1DFDF +:104C4B00F88EFD708EFCC1717AFAD540FBDD0EEB50 +:104C5B003EFB899E44A23EFBB040FBEF2B710AE664 +:104C6B00300400BF2401F6BF2A01300B0BBF280113 +:104C7B00FD0D03300B0FBF2801FD0D03300F0FBFD0 +:104C8B002801717320710321C09EFC609EFD34D4FA +:104C9B00FE5206C0B9A5A592DFF9C6C4C2C061FC1D +:104CAB0061EF520C929269D4FEC1DFF88EFD708ECB +:104CBB00FCC12008FBF8FF71503002CEABACCC012D +:104CCB0000F6BC0231B2E20F617902F6614902DFF4 +:104CDB00F371603002EF7E8E519B713BE28B5C0275 +:104CEB00D1DD1D8B5C08D1DF0971503002CC010086 +:104CFB00EFCF8C0770FD8038629E50CC0102EFC164 +:104D0B008B5C03D1DF408E509C05715030028C01BF +:104D1B00D1DF0E8C0570FDD638629C07CC0101EFFC +:104D2B00318C014C02DF0671603002EF28CF340268 +:104D3B005A716030028C0570C18C0770FD2738C02A +:104D4B00CF34024AEF0F8B5C01D1DD06716030026C +:104D5B00EF03EDCC4C1008C09EFC609EFD34D4FEDE +:104D6B005206C0B9A5A592DFF961FCC1C3C5C752F4 +:104D7B000C929269D4FEC1DFF88EFD708EFCC1716E +:104D8B000A9E31929E02EFFA8F0EFC4F96FFDF19AF +:104D9B008F0FFC4F97FFDF118F10FC4F98FFDF0930 +:104DAB005004C15011FDD437C0710B9EC09EFC60E6 +:104DBB009EFD34D4FE5206C0B9A5A592DFF9C6C438 +:104DCB00C2C061FCA05CFC61FCC1C3C5C7520C92A4 +:104DDB009269D4FEC1DFF88EFD708EFCC1C1FBF869 +:104DEB00FF8D1F9C018E31318EE7240600DD0823D9 +:104DFB00DD0F23DD25EF45717AFA8C019F46FCEF21 +:104E0B003B717AFA4021F901DF078C019F45FCEFDA +:104E1B002B51FF2E019F45FCEF22717AFA8C019FDB +:104E2B0002F98FE2FB5C01D1DF12401EF903DD06B4 +:104E3B00401EF904DF06302326FD603C4031FF099C +:104E4B00DE05A031FFEF197158F000713222405A84 +:104E5B00FC02DF03F6EF05D95AFCF1A1609F5AFC67 +:104E6B00710BE3C0C09EFC609EFD34D4FE5206C0A5 +:104E7B00B9A5A592DFF9C6C4C2C061FC61FF520C93 +:104E8B00929269D4FEC1DFF88EFD708EFCC1717AEF +:104E9B00FA8F14FC5C03D1DD19401EF903DD0640CB +:104EAB001EF904DF0D36100571D4DE0630953DFD7D +:104EBB00603CC09EFC609EFD34D4FE5206C0B9A57A +:104ECB00A592DFF961FC61FC61FC61FC61FC61FC9A +:104EDB0061FC61FC61FC61FC61FC61FC61FC61FCDF +:104EEB0061FC61FC61FC61FC61FC61FC61FC61FCCF +:0E4EFB0061FC61FC61FC61FC61FC61FC61FC1E +:0A4F0A0000060C12181E242A30368F +:104F14000016324864809612284460769208244031 +:104F2400FF000000555555554700DCFB000000000C +:104F340049FC00000000D23E2339D822AB2E3C307D +:104F4400B930FB31E43F71098D4101000000983A0A +:0A4F5400F82AFF2330129900000034 +:084F5E00317503F7332312D76C +:0A4FF60031333A31333A303900000C :00000001FF  \ No newline at end of file diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index 190ff77..e1bd03e 100644 Binary files a/trunk/bsr.lmf and b/trunk/bsr.lmf differ diff --git a/trunk/bsr_k0r.map b/trunk/bsr_k0r.map index e88afc8..1257dc3 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.31 Date:13 Oct 2010 Page: 1 +78K0R Linker W1.31 Date:22 Oct 2010 Page: 1 Command: -yC:\Program Files\NEC Electronics Tools\DEV -_msgoff -obsr.l mf ..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10 @@ -23,8 +23,8 @@ Direc-file:bsr_mcu.dr *** Link information *** 64 output segment(s) - 3EACH byte(s) real data - 5491 symbol(s) defined + 3E9DH byte(s) real data + 5401 symbol(s) defined *** Memory map *** @@ -97,55 +97,55 @@ Direc-file:bsr_mcu.dr LDR_CODL task_status 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - LDR_CODE 000CEH 00925H CSEG - LDR_CODE loader 000CEH 001F3H - LDR_CODE main 002C1H 00049H - LDR_CODE WDT 0030AH 00000H - LDR_CODE i2c_mcu 0030AH 002F1H + LDR_CODE 000CEH 0092BH CSEG + LDR_CODE loader 000CEH 001F9H + LDR_CODE main 002C7H 00046H + LDR_CODE WDT 0030DH 00000H + LDR_CODE i2c_mcu 0030DH 002F1H LDR_CODE self_flash - 005FBH 00370H + 005FEH 00373H LDR_CODE task_debug - 0096BH 00000H + 00971H 00000H LDR_CODE task_status - 0096BH 00088H - FSL_CODE 009F3H 00322H CSEG + 00971H 00088H + FSL_CODE 009F9H 00322H CSEG FSL_CODE fsl_block_cmd - 009F3H 0002BH + 009F9H 0002BH FSL_CODE fsl_block_check - 00A1EH 00013H + 00A24H 00013H FSL_CODE fsl_common - 00A31H 0014FH + 00A37H 0014FH FSL_CODE fsl_reset - 00B80H 00001H + 00B86H 00001H FSL_CODE fsl_si_ibf - 00B81H 00064H + 00B87H 00064H FSL_CODE fsl_phySwap - 00BE5H 0004DH + 00BEBH 0004DH FSL_CODE fsl_si_common - 00C32H 00061H - FSL_CODE fsl_swap 00C93H 00030H + 00C38H 00061H + FSL_CODE fsl_swap 00C99H 00030H FSL_CODE fsl_write - 00CC3H 00052H - @@LCODE 00D15H 002AFH CSEG - @@LCODE @cstart 00D15H 0006DH - @@LCODE @imul 00D82H 00011H - @@LCODE @lumul 00D93H 0002BH - @@LCODE @isdiv 00DBEH 00022H - @@LCODE @iudiv 00DE0H 0002DH - @@LCODE @isrem 00E0DH 00021H - @@LCODE @iurem 00E2EH 0002FH - @@LCODE @lsdiv 00E5DH 00039H - @@LCODE @ludiv 00E96H 0003FH - @@LCODE @divuw 00ED5H 00034H - @@LCODE @ladd 00F09H 0000FH - @@LCODE @llsh 00F18H 0001BH - @@LCODE @lursh 00F33H 0001FH - @@LCODE @iscmp 00F52H 0000CH - @@LCODE @lscmp 00F5EH 00014H - @@LCODE @lband 00F72H 00014H - @@LCODE @bcdtob 00F86H 0001AH - @@LCODE @bbcd 00FA0H 00024H -* gap * 00FC4H 00032H + 00CC9H 00052H + @@LCODE 00D1BH 002AFH CSEG + @@LCODE @cstart 00D1BH 0006DH + @@LCODE @imul 00D88H 00011H + @@LCODE @lumul 00D99H 0002BH + @@LCODE @isdiv 00DC4H 00022H + @@LCODE @iudiv 00DE6H 0002DH + @@LCODE @isrem 00E13H 00021H + @@LCODE @iurem 00E34H 0002FH + @@LCODE @lsdiv 00E63H 00039H + @@LCODE @ludiv 00E9CH 0003FH + @@LCODE @divuw 00EDBH 00034H + @@LCODE @ladd 00F0FH 0000FH + @@LCODE @llsh 00F1EH 0001BH + @@LCODE @lursh 00F39H 0001FH + @@LCODE @iscmp 00F58H 0000CH + @@LCODE @lscmp 00F64H 00014H + @@LCODE @lband 00F78H 00014H + @@LCODE @bcdtob 00F8CH 0001AH + @@LCODE @bbcd 00FA6H 00024H +* gap * 00FCAH 0002CH MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -169,250 +169,251 @@ Direc-file:bsr_mcu.dr @@CNST rtc 02244H 00000H @@CNST vreg_ctr 02244H 00000H @@CNST vreg_twl 02244H 00000H - @@CNST adc 02244H 00040H - @@CNST renge 02284H 00000H - @@CNST accero 02284H 00000H + @@CNST adc 02244H 00048H + @@CNST renge 0228CH 00000H + @@CNST accero 0228CH 00000H @@CNST self_flash - 02284H 00002H - @@CNST sw 02286H 00000H + 0228CH 00002H + @@CNST sw 0228EH 00000H @@CNST task_debug - 02286H 00000H + 0228EH 00000H @@CNST task_misc - 02286H 00008H + 0228EH 00000H @@CNST task_sys 0228EH 00000H @@CNST pedo_alg_thre_det2 0228EH 0004AH @@CNST ini_VECT 022D8H 00000H @@CNST task_status 022D8H 00000H - ROM_CODE 022D8H 02744H CSEG - ROM_CODE pm 022D8H 00A18H - ROM_CODE i2c_ctr 02CF0H 00060H - ROM_CODE i2c_twl 02D50H 0005EH - ROM_CODE led 02DAEH 0051AH - ROM_CODE rtc 032C8H 000E0H - ROM_CODE vreg_ctr 033A8H 00475H - ROM_CODE vreg_twl 0381DH 0011DH - ROM_CODE adc 0393AH 002C1H - ROM_CODE renge 03BFBH 00187H - ROM_CODE accero 03D82H 0013DH - ROM_CODE sw 03EBFH 00113H + ROM_CODE 022D8H 02723H CSEG + ROM_CODE pm 022D8H 00A14H + ROM_CODE i2c_ctr 02CECH 00060H + ROM_CODE i2c_twl 02D4CH 0005EH + ROM_CODE led 02DAAH 0051AH + ROM_CODE rtc 032C4H 000E0H + ROM_CODE vreg_ctr 033A4H 00475H + ROM_CODE vreg_twl 03819H 0010AH + ROM_CODE adc 03923H 002E2H + ROM_CODE renge 03C05H 00190H + ROM_CODE accero 03D95H 0013DH + ROM_CODE sw 03ED2H 00112H ROM_CODE task_misc - 03FD2H 001C7H - ROM_CODE task_sys 04199H 00385H + 03FE4H 001A9H + ROM_CODE task_sys 0418DH 0037CH ROM_CODE pedo_alg_thre_det2 - 0451EH 004FEH - @@BASE 04A1CH 00502H CSEG BASE - @@BASE loader 04A1CH 00000H - @@BASE pm 04A1CH 0003FH - @@BASE i2c_ctr 04A5BH 00198H - @@BASE main 04BF3H 00000H - @@BASE magic 04BF3H 00000H - @@BASE WDT 04BF3H 00000H - @@BASE i2c_mcu 04BF3H 000D9H - @@BASE i2c_twl 04CCCH 000CBH - @@BASE led 04D97H 00000H - @@BASE rtc 04D97H 00052H - @@BASE vreg_ctr 04DE9H 00000H - @@BASE vreg_twl 04DE9H 00000H - @@BASE adc 04DE9H 000B3H - @@BASE renge 04E9CH 00000H - @@BASE accero 04E9CH 0004AH + 04509H 004F2H + @@BASE 049FBH 0050EH CSEG BASE + @@BASE loader 049FBH 00000H + @@BASE pm 049FBH 0003FH + @@BASE i2c_ctr 04A3AH 00198H + @@BASE main 04BD2H 00000H + @@BASE magic 04BD2H 00000H + @@BASE WDT 04BD2H 00000H + @@BASE i2c_mcu 04BD2H 000D9H + @@BASE i2c_twl 04CABH 000CBH + @@BASE led 04D76H 00000H + @@BASE rtc 04D76H 0005EH + @@BASE vreg_ctr 04DD4H 00000H + @@BASE vreg_twl 04DD4H 00000H + @@BASE adc 04DD4H 000B3H + @@BASE renge 04E87H 00000H + @@BASE accero 04E87H 0004AH @@BASE self_flash - 04EE6H 00000H - @@BASE sw 04EE6H 00000H + 04ED1H 00000H + @@BASE sw 04ED1H 00000H @@BASE task_debug - 04EE6H 00000H + 04ED1H 00000H @@BASE task_misc - 04EE6H 00000H - @@BASE task_sys 04EE6H 00000H + 04ED1H 00000H + @@BASE task_sys 04ED1H 00000H @@BASE pedo_alg_thre_det2 - 04EE6H 00000H - @@BASE ini_VECT 04EE6H 00038H + 04ED1H 00000H + @@BASE ini_VECT 04ED1H 00038H @@BASE task_status - 04F1EH 00000H - @@CNSTL 04F1EH 00000H CSEG PAGE64KP - @@CNSTL @cstart 04F1EH 00000H - @@CNSTL 04F1EH 00000H CSEG PAGE64KP - @@CNSTL pm 04F1EH 00000H - @@CNSTL 04F1EH 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04F1EH 00000H - @@CNSTL 04F1EH 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04F1EH 00000H - @@CNSTL 04F1EH 00000H CSEG PAGE64KP - @@CNSTL led 04F1EH 00000H - @@CNSTL 04F1EH 00000H CSEG PAGE64KP - @@CNSTL rtc 04F1EH 00000H - @@CNSTL 04F1EH 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04F1EH 00000H - @@CNSTL 04F1EH 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04F1EH 00000H - @@CNSTL 04F1EH 00000H CSEG PAGE64KP - @@CNSTL adc 04F1EH 00000H - @@CNSTL 04F1EH 00000H CSEG PAGE64KP - @@CNSTL renge 04F1EH 00000H - @@CNSTL 04F1EH 00000H CSEG PAGE64KP - @@CNSTL accero 04F1EH 00000H - @@CNSTL 04F1EH 00000H CSEG PAGE64KP - @@CNSTL sw 04F1EH 00000H - @@CNSTL 04F1EH 00000H CSEG PAGE64KP + 04F09H 00000H + @@CNSTL 04F09H 00000H CSEG PAGE64KP + @@CNSTL @cstart 04F09H 00000H + @@CNSTL 04F09H 00000H CSEG PAGE64KP + @@CNSTL pm 04F09H 00000H + @@CNSTL 04F09H 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04F09H 00000H + @@CNSTL 04F09H 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04F09H 00000H + @@CNSTL 04F09H 00000H CSEG PAGE64KP + @@CNSTL led 04F09H 00000H + @@CNSTL 04F09H 00000H CSEG PAGE64KP + @@CNSTL rtc 04F09H 00000H + @@CNSTL 04F09H 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04F09H 00000H + @@CNSTL 04F09H 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04F09H 00000H + @@CNSTL 04F09H 00000H CSEG PAGE64KP + @@CNSTL adc 04F09H 00000H + @@CNSTL 04F09H 00000H CSEG PAGE64KP + @@CNSTL renge 04F09H 00000H + @@CNSTL 04F09H 00000H CSEG PAGE64KP + @@CNSTL accero 04F09H 00000H + @@CNSTL 04F09H 00000H CSEG PAGE64KP + @@CNSTL sw 04F09H 00000H + @@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL task_misc - 04F1EH 00000H - @@CNSTL 04F1EH 00000H CSEG PAGE64KP - @@CNSTL task_sys 04F1EH 00000H - @@CNSTL 04F1EH 00000H CSEG PAGE64KP + 04F09H 00000H + @@CNSTL 04F09H 00000H CSEG PAGE64KP + @@CNSTL task_sys 04F09H 00000H + @@CNSTL 04F09H 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04F1EH 00000H - @@CNSTL 04F1EH 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04F1EH 00000H - @@CNSTL 04F1EH 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04F1EH 0000AH - @@CNSTL 04F28H 00010H CSEG PAGE64KP - @@CNSTL @bbcd 04F28H 00010H - @@R_INIT 04F38H 0003AH CSEG UNIT64KP - @@R_INIT @cstart 04F38H 00000H - @@R_INIT loader 04F38H 00000H - @@R_INIT pm 04F38H 00002H - @@R_INIT i2c_ctr 04F3AH 00002H - @@R_INIT main 04F3CH 00000H - @@R_INIT magic 04F3CH 00000H - @@R_INIT WDT 04F3CH 00000H - @@R_INIT i2c_mcu 04F3CH 00000H - @@R_INIT i2c_twl 04F3CH 00000H - @@R_INIT led 04F3CH 00006H - @@R_INIT rtc 04F42H 00000H - @@R_INIT vreg_ctr 04F42H 00000H - @@R_INIT vreg_twl 04F42H 00000H - @@R_INIT adc 04F42H 0000CH - @@R_INIT renge 04F4EH 00014H - @@R_INIT accero 04F62H 00000H - @@R_INIT self_flash - 04F62H 00000H - @@R_INIT sw 04F62H 00002H - @@R_INIT task_debug - 04F64H 00000H - @@R_INIT task_misc - 04F64H 00000H - @@R_INIT task_sys 04F64H 00002H - @@R_INIT pedo_alg_thre_det2 - 04F66H 0000AH - @@R_INIT ini_VECT 04F70H 00000H - @@R_INIT task_status - 04F70H 00002H - @@R_INIT @rom 04F72H 00000H - @@R_INIS 04F72H 00000H CSEG UNIT64KP - @@R_INIS @cstart 04F72H 00000H - @@R_INIS loader 04F72H 00000H - @@R_INIS pm 04F72H 00000H - @@R_INIS i2c_ctr 04F72H 00000H - @@R_INIS main 04F72H 00000H - @@R_INIS magic 04F72H 00000H - @@R_INIS WDT 04F72H 00000H - @@R_INIS i2c_mcu 04F72H 00000H - @@R_INIS i2c_twl 04F72H 00000H - @@R_INIS led 04F72H 00000H - @@R_INIS rtc 04F72H 00000H - @@R_INIS vreg_ctr 04F72H 00000H - @@R_INIS vreg_twl 04F72H 00000H - @@R_INIS adc 04F72H 00000H - @@R_INIS renge 04F72H 00000H - @@R_INIS accero 04F72H 00000H + 04F09H 00000H + @@CNSTL 04F09H 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04F09H 00000H + @@R_INIS 04F09H 00000H CSEG UNIT64KP + @@R_INIS @cstart 04F09H 00000H + @@R_INIS loader 04F09H 00000H + @@R_INIS pm 04F09H 00000H + @@R_INIS i2c_ctr 04F09H 00000H + @@R_INIS main 04F09H 00000H + @@R_INIS magic 04F09H 00000H + @@R_INIS WDT 04F09H 00000H + @@R_INIS i2c_mcu 04F09H 00000H + @@R_INIS i2c_twl 04F09H 00000H + @@R_INIS led 04F09H 00000H + @@R_INIS rtc 04F09H 00000H + @@R_INIS vreg_ctr 04F09H 00000H + @@R_INIS vreg_twl 04F09H 00000H + @@R_INIS adc 04F09H 00000H + @@R_INIS renge 04F09H 00000H + @@R_INIS accero 04F09H 00000H @@R_INIS self_flash - 04F72H 00000H - @@R_INIS sw 04F72H 00000H + 04F09H 00000H + @@R_INIS sw 04F09H 00000H @@R_INIS task_debug - 04F72H 00000H + 04F09H 00000H @@R_INIS task_misc - 04F72H 00000H - @@R_INIS task_sys 04F72H 00000H + 04F09H 00000H + @@R_INIS task_sys 04F09H 00000H @@R_INIS pedo_alg_thre_det2 - 04F72H 00000H - @@R_INIS ini_VECT 04F72H 00000H + 04F09H 00000H + @@R_INIS ini_VECT 04F09H 00000H @@R_INIS task_status - 04F72H 00000H - @@R_INIS @rom 04F72H 00000H - @@CALT 04F72H 00000H CSEG - @@CALT @cstart 04F72H 00000H - @@CALT loader 04F72H 00000H - @@CALT pm 04F72H 00000H - @@CALT i2c_ctr 04F72H 00000H - @@CALT main 04F72H 00000H - @@CALT magic 04F72H 00000H - @@CALT WDT 04F72H 00000H - @@CALT i2c_mcu 04F72H 00000H - @@CALT i2c_twl 04F72H 00000H - @@CALT led 04F72H 00000H - @@CALT rtc 04F72H 00000H - @@CALT vreg_ctr 04F72H 00000H - @@CALT vreg_twl 04F72H 00000H - @@CALT adc 04F72H 00000H - @@CALT renge 04F72H 00000H - @@CALT accero 04F72H 00000H + 04F09H 00000H + @@R_INIS @rom 04F09H 00000H + @@CALT 04F09H 00000H CSEG + @@CALT @cstart 04F09H 00000H + @@CALT loader 04F09H 00000H + @@CALT pm 04F09H 00000H + @@CALT i2c_ctr 04F09H 00000H + @@CALT main 04F09H 00000H + @@CALT magic 04F09H 00000H + @@CALT WDT 04F09H 00000H + @@CALT i2c_mcu 04F09H 00000H + @@CALT i2c_twl 04F09H 00000H + @@CALT led 04F09H 00000H + @@CALT rtc 04F09H 00000H + @@CALT vreg_ctr 04F09H 00000H + @@CALT vreg_twl 04F09H 00000H + @@CALT adc 04F09H 00000H + @@CALT renge 04F09H 00000H + @@CALT accero 04F09H 00000H @@CALT self_flash - 04F72H 00000H - @@CALT sw 04F72H 00000H + 04F09H 00000H + @@CALT sw 04F09H 00000H @@CALT task_debug - 04F72H 00000H + 04F09H 00000H @@CALT task_misc - 04F72H 00000H - @@CALT task_sys 04F72H 00000H + 04F09H 00000H + @@CALT task_sys 04F09H 00000H @@CALT pedo_alg_thre_det2 - 04F72H 00000H - @@CALT ini_VECT 04F72H 00000H + 04F09H 00000H + @@CALT ini_VECT 04F09H 00000H @@CALT task_status - 04F72H 00000H - @@RLINIT 04F72H 00000H CSEG UNIT64KP - @@RLINIT loader 04F72H 00000H - @@RLINIT pm 04F72H 00000H - @@RLINIT i2c_ctr 04F72H 00000H - @@RLINIT main 04F72H 00000H - @@RLINIT magic 04F72H 00000H - @@RLINIT WDT 04F72H 00000H - @@RLINIT i2c_mcu 04F72H 00000H - @@RLINIT i2c_twl 04F72H 00000H - @@RLINIT led 04F72H 00000H - @@RLINIT rtc 04F72H 00000H - @@RLINIT vreg_ctr 04F72H 00000H - @@RLINIT vreg_twl 04F72H 00000H - @@RLINIT adc 04F72H 00000H - @@RLINIT renge 04F72H 00000H - @@RLINIT accero 04F72H 00000H + 04F09H 00000H + @@RLINIT 04F09H 00000H CSEG UNIT64KP + @@RLINIT loader 04F09H 00000H + @@RLINIT pm 04F09H 00000H + @@RLINIT i2c_ctr 04F09H 00000H + @@RLINIT main 04F09H 00000H + @@RLINIT magic 04F09H 00000H + @@RLINIT WDT 04F09H 00000H + @@RLINIT i2c_mcu 04F09H 00000H + @@RLINIT i2c_twl 04F09H 00000H + @@RLINIT led 04F09H 00000H + @@RLINIT rtc 04F09H 00000H + @@RLINIT vreg_ctr 04F09H 00000H + @@RLINIT vreg_twl 04F09H 00000H + @@RLINIT adc 04F09H 00000H + @@RLINIT renge 04F09H 00000H + @@RLINIT accero 04F09H 00000H @@RLINIT self_flash - 04F72H 00000H - @@RLINIT sw 04F72H 00000H + 04F09H 00000H + @@RLINIT sw 04F09H 00000H @@RLINIT task_debug - 04F72H 00000H + 04F09H 00000H @@RLINIT task_misc - 04F72H 00000H - @@RLINIT task_sys 04F72H 00000H + 04F09H 00000H + @@RLINIT task_sys 04F09H 00000H @@RLINIT pedo_alg_thre_det2 - 04F72H 00000H - @@RLINIT ini_VECT 04F72H 00000H + 04F09H 00000H + @@RLINIT ini_VECT 04F09H 00000H @@RLINIT task_status - 04F72H 00000H - @@RLINIT @rom 04F72H 00000H - @@CODEL 04F72H 00000H CSEG - @@CODEL pm 04F72H 00000H - @@CODEL i2c_ctr 04F72H 00000H - @@CODEL magic 04F72H 00000H - @@CODEL i2c_twl 04F72H 00000H - @@CODEL led 04F72H 00000H - @@CODEL rtc 04F72H 00000H - @@CODEL vreg_ctr 04F72H 00000H - @@CODEL vreg_twl 04F72H 00000H - @@CODEL adc 04F72H 00000H - @@CODEL renge 04F72H 00000H - @@CODEL accero 04F72H 00000H - @@CODEL sw 04F72H 00000H + 04F09H 00000H + @@RLINIT @rom 04F09H 00000H + @@CODEL 04F09H 00000H CSEG + @@CODEL pm 04F09H 00000H + @@CODEL i2c_ctr 04F09H 00000H + @@CODEL magic 04F09H 00000H + @@CODEL i2c_twl 04F09H 00000H + @@CODEL led 04F09H 00000H + @@CODEL rtc 04F09H 00000H + @@CODEL vreg_ctr 04F09H 00000H + @@CODEL vreg_twl 04F09H 00000H + @@CODEL adc 04F09H 00000H + @@CODEL renge 04F09H 00000H + @@CODEL accero 04F09H 00000H + @@CODEL sw 04F09H 00000H @@CODEL task_misc - 04F72H 00000H - @@CODEL task_sys 04F72H 00000H + 04F09H 00000H + @@CODEL task_sys 04F09H 00000H @@CODEL pedo_alg_thre_det2 - 04F72H 00000H - @@CODEL ini_VECT 04F72H 00000H - @@LCODEL 04F72H 00008H CSEG - @@LCODEL abs 04F72H 00008H -* gap * 04F7AH 0007CH + 04F09H 00000H + @@CODEL ini_VECT 04F09H 00000H +* gap * 04F09H 00001H + @@CNSTL 04F0AH 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04F0AH 0000AH + @@CNSTL 04F14H 00010H CSEG PAGE64KP + @@CNSTL @bbcd 04F14H 00010H + @@R_INIT 04F24H 0003AH CSEG UNIT64KP + @@R_INIT @cstart 04F24H 00000H + @@R_INIT loader 04F24H 00000H + @@R_INIT pm 04F24H 00002H + @@R_INIT i2c_ctr 04F26H 00002H + @@R_INIT main 04F28H 00000H + @@R_INIT magic 04F28H 00000H + @@R_INIT WDT 04F28H 00000H + @@R_INIT i2c_mcu 04F28H 00000H + @@R_INIT i2c_twl 04F28H 00000H + @@R_INIT led 04F28H 00006H + @@R_INIT rtc 04F2EH 00000H + @@R_INIT vreg_ctr 04F2EH 00000H + @@R_INIT vreg_twl 04F2EH 00000H + @@R_INIT adc 04F2EH 0000CH + @@R_INIT renge 04F3AH 00014H + @@R_INIT accero 04F4EH 00000H + @@R_INIT self_flash + 04F4EH 00000H + @@R_INIT sw 04F4EH 00002H + @@R_INIT task_debug + 04F50H 00000H + @@R_INIT task_misc + 04F50H 00000H + @@R_INIT task_sys 04F50H 00002H + @@R_INIT pedo_alg_thre_det2 + 04F52H 0000AH + @@R_INIT ini_VECT 04F5CH 00000H + @@R_INIT task_status + 04F5CH 00002H + @@R_INIT @rom 04F5EH 00000H + @@LCODEL 04F5EH 00008H CSEG + @@LCODEL abs 04F5EH 00008H +* gap * 04F66H 00090H MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL magic 04FF6H 0000AH @@ -420,7 +421,7 @@ Direc-file:bsr_mcu.dr BASE ADDRESS=FF900H SIZE=00500H OUTPUT INPUT INPUT BASE SIZE SEGMENT SEGMENT MODULE ADDRESS - @@DATA FF900H 0042CH DSEG BASEP + @@DATA FF900H 0042EH DSEG BASEP @@DATA @cstart FF900H 00002H @@DATA loader FF902H 00000H @@DATA pm FF902H 00016H @@ -433,181 +434,181 @@ Direc-file:bsr_mcu.dr @@DATA led FFB44H 00088H @@DATA rtc FFBCCH 00008H @@DATA vreg_ctr FFBD4H 0005EH - @@DATA vreg_twl FFC32H 00010H - @@DATA adc FFC42H 00018H - @@DATA renge FFC5AH 0001EH - @@DATA accero FFC78H 00002H + @@DATA vreg_twl FFC32H 00012H + @@DATA adc FFC44H 00018H + @@DATA renge FFC5CH 00022H + @@DATA accero FFC7EH 00002H @@DATA self_flash - FFC7AH 00002H - @@DATA sw FFC7CH 00006H + FFC80H 00002H + @@DATA sw FFC82H 00006H @@DATA task_debug - FFC82H 00000H + FFC88H 00000H @@DATA task_misc - FFC82H 00010H - @@DATA task_sys FFC92H 00002H + FFC88H 0000CH + @@DATA task_sys FFC94H 00002H @@DATA pedo_alg_thre_det2 - FFC94H 00096H - @@DATA ini_VECT FFD2AH 00000H + FFC96H 00096H + @@DATA ini_VECT FFD2CH 00000H @@DATA task_status - FFD2AH 00002H - @@DATA @rom FFD2CH 00000H - @@INIT FFD2CH 0003AH DSEG BASEP - @@INIT @cstart FFD2CH 00000H - @@INIT loader FFD2CH 00000H - @@INIT pm FFD2CH 00002H - @@INIT i2c_ctr FFD2EH 00002H - @@INIT main FFD30H 00000H - @@INIT magic FFD30H 00000H - @@INIT WDT FFD30H 00000H - @@INIT i2c_mcu FFD30H 00000H - @@INIT i2c_twl FFD30H 00000H - @@INIT led FFD30H 00006H - @@INIT rtc FFD36H 00000H - @@INIT vreg_ctr FFD36H 00000H - @@INIT vreg_twl FFD36H 00000H - @@INIT adc FFD36H 0000CH - @@INIT renge FFD42H 00014H - @@INIT accero FFD56H 00000H + FFD2CH 00002H + @@DATA @rom FFD2EH 00000H + @@INIT FFD2EH 0003AH DSEG BASEP + @@INIT @cstart FFD2EH 00000H + @@INIT loader FFD2EH 00000H + @@INIT pm FFD2EH 00002H + @@INIT i2c_ctr FFD30H 00002H + @@INIT main FFD32H 00000H + @@INIT magic FFD32H 00000H + @@INIT WDT FFD32H 00000H + @@INIT i2c_mcu FFD32H 00000H + @@INIT i2c_twl FFD32H 00000H + @@INIT led FFD32H 00006H + @@INIT rtc FFD38H 00000H + @@INIT vreg_ctr FFD38H 00000H + @@INIT vreg_twl FFD38H 00000H + @@INIT adc FFD38H 0000CH + @@INIT renge FFD44H 00014H + @@INIT accero FFD58H 00000H @@INIT self_flash - FFD56H 00000H - @@INIT sw FFD56H 00002H + FFD58H 00000H + @@INIT sw FFD58H 00002H @@INIT task_debug - FFD58H 00000H + FFD5AH 00000H @@INIT task_misc - FFD58H 00000H - @@INIT task_sys FFD58H 00002H + FFD5AH 00000H + @@INIT task_sys FFD5AH 00002H @@INIT pedo_alg_thre_det2 - FFD5AH 0000AH - @@INIT ini_VECT FFD64H 00000H + FFD5CH 0000AH + @@INIT ini_VECT FFD66H 00000H @@INIT task_status - FFD64H 00002H - @@INIT @rom FFD66H 00000H - @@INIS FFD66H 00000H DSEG UNITP - @@INIS @cstart FFD66H 00000H - @@INIS loader FFD66H 00000H - @@INIS pm FFD66H 00000H - @@INIS i2c_ctr FFD66H 00000H - @@INIS main FFD66H 00000H - @@INIS magic FFD66H 00000H - @@INIS WDT FFD66H 00000H - @@INIS i2c_mcu FFD66H 00000H - @@INIS i2c_twl FFD66H 00000H - @@INIS led FFD66H 00000H - @@INIS rtc FFD66H 00000H - @@INIS vreg_ctr FFD66H 00000H - @@INIS vreg_twl FFD66H 00000H - @@INIS adc FFD66H 00000H - @@INIS renge FFD66H 00000H - @@INIS accero FFD66H 00000H + FFD66H 00002H + @@INIT @rom FFD68H 00000H + @@INIS FFD68H 00000H DSEG UNITP + @@INIS @cstart FFD68H 00000H + @@INIS loader FFD68H 00000H + @@INIS pm FFD68H 00000H + @@INIS i2c_ctr FFD68H 00000H + @@INIS main FFD68H 00000H + @@INIS magic FFD68H 00000H + @@INIS WDT FFD68H 00000H + @@INIS i2c_mcu FFD68H 00000H + @@INIS i2c_twl FFD68H 00000H + @@INIS led FFD68H 00000H + @@INIS rtc FFD68H 00000H + @@INIS vreg_ctr FFD68H 00000H + @@INIS vreg_twl FFD68H 00000H + @@INIS adc FFD68H 00000H + @@INIS renge FFD68H 00000H + @@INIS accero FFD68H 00000H @@INIS self_flash - FFD66H 00000H - @@INIS sw FFD66H 00000H + FFD68H 00000H + @@INIS sw FFD68H 00000H @@INIS task_debug - FFD66H 00000H + FFD68H 00000H @@INIS task_misc - FFD66H 00000H - @@INIS task_sys FFD66H 00000H + FFD68H 00000H + @@INIS task_sys FFD68H 00000H @@INIS pedo_alg_thre_det2 - FFD66H 00000H - @@INIS ini_VECT FFD66H 00000H + FFD68H 00000H + @@INIS ini_VECT FFD68H 00000H @@INIS task_status - FFD66H 00000H - @@INIS @rom FFD66H 00000H - @@DATS FFD66H 00000H DSEG UNITP - @@DATS @cstart FFD66H 00000H - @@DATS loader FFD66H 00000H - @@DATS pm FFD66H 00000H - @@DATS i2c_ctr FFD66H 00000H - @@DATS main FFD66H 00000H - @@DATS magic FFD66H 00000H - @@DATS WDT FFD66H 00000H - @@DATS i2c_mcu FFD66H 00000H - @@DATS i2c_twl FFD66H 00000H - @@DATS led FFD66H 00000H - @@DATS rtc FFD66H 00000H - @@DATS vreg_ctr FFD66H 00000H - @@DATS vreg_twl FFD66H 00000H - @@DATS adc FFD66H 00000H - @@DATS renge FFD66H 00000H - @@DATS accero FFD66H 00000H + FFD68H 00000H + @@INIS @rom FFD68H 00000H + @@DATS FFD68H 00000H DSEG UNITP + @@DATS @cstart FFD68H 00000H + @@DATS loader FFD68H 00000H + @@DATS pm FFD68H 00000H + @@DATS i2c_ctr FFD68H 00000H + @@DATS main FFD68H 00000H + @@DATS magic FFD68H 00000H + @@DATS WDT FFD68H 00000H + @@DATS i2c_mcu FFD68H 00000H + @@DATS i2c_twl FFD68H 00000H + @@DATS led FFD68H 00000H + @@DATS rtc FFD68H 00000H + @@DATS vreg_ctr FFD68H 00000H + @@DATS vreg_twl FFD68H 00000H + @@DATS adc FFD68H 00000H + @@DATS renge FFD68H 00000H + @@DATS accero FFD68H 00000H @@DATS self_flash - FFD66H 00000H - @@DATS sw FFD66H 00000H + FFD68H 00000H + @@DATS sw FFD68H 00000H @@DATS task_debug - FFD66H 00000H + FFD68H 00000H @@DATS task_misc - FFD66H 00000H - @@DATS task_sys FFD66H 00000H + FFD68H 00000H + @@DATS task_sys FFD68H 00000H @@DATS pedo_alg_thre_det2 - FFD66H 00000H - @@DATS ini_VECT FFD66H 00000H + FFD68H 00000H + @@DATS ini_VECT FFD68H 00000H @@DATS task_status - FFD66H 00000H - @@DATS @rom FFD66H 00000H - FSL_DATA FFD66H 00010H DSEG UNITP + FFD68H 00000H + @@DATS @rom FFD68H 00000H + FSL_DATA FFD68H 00010H DSEG UNITP FSL_DATA fsl_common - FFD66H 00010H - @@INITL FFD76H 00000H DSEG UNIT64KP - @@INITL loader FFD76H 00000H - @@INITL pm FFD76H 00000H - @@INITL i2c_ctr FFD76H 00000H - @@INITL main FFD76H 00000H - @@INITL magic FFD76H 00000H - @@INITL WDT FFD76H 00000H - @@INITL i2c_mcu FFD76H 00000H - @@INITL i2c_twl FFD76H 00000H - @@INITL led FFD76H 00000H - @@INITL rtc FFD76H 00000H - @@INITL vreg_ctr FFD76H 00000H - @@INITL vreg_twl FFD76H 00000H - @@INITL adc FFD76H 00000H - @@INITL renge FFD76H 00000H - @@INITL accero FFD76H 00000H + FFD68H 00010H + @@INITL FFD78H 00000H DSEG UNIT64KP + @@INITL loader FFD78H 00000H + @@INITL pm FFD78H 00000H + @@INITL i2c_ctr FFD78H 00000H + @@INITL main FFD78H 00000H + @@INITL magic FFD78H 00000H + @@INITL WDT FFD78H 00000H + @@INITL i2c_mcu FFD78H 00000H + @@INITL i2c_twl FFD78H 00000H + @@INITL led FFD78H 00000H + @@INITL rtc FFD78H 00000H + @@INITL vreg_ctr FFD78H 00000H + @@INITL vreg_twl FFD78H 00000H + @@INITL adc FFD78H 00000H + @@INITL renge FFD78H 00000H + @@INITL accero FFD78H 00000H @@INITL self_flash - FFD76H 00000H - @@INITL sw FFD76H 00000H + FFD78H 00000H + @@INITL sw FFD78H 00000H @@INITL task_debug - FFD76H 00000H + FFD78H 00000H @@INITL task_misc - FFD76H 00000H - @@INITL task_sys FFD76H 00000H + FFD78H 00000H + @@INITL task_sys FFD78H 00000H @@INITL pedo_alg_thre_det2 - FFD76H 00000H - @@INITL ini_VECT FFD76H 00000H + FFD78H 00000H + @@INITL ini_VECT FFD78H 00000H @@INITL task_status - FFD76H 00000H - @@INITL @rom FFD76H 00000H - @@DATAL FFD76H 00000H DSEG UNIT64KP - @@DATAL loader FFD76H 00000H - @@DATAL pm FFD76H 00000H - @@DATAL i2c_ctr FFD76H 00000H - @@DATAL main FFD76H 00000H - @@DATAL magic FFD76H 00000H - @@DATAL WDT FFD76H 00000H - @@DATAL i2c_mcu FFD76H 00000H - @@DATAL i2c_twl FFD76H 00000H - @@DATAL led FFD76H 00000H - @@DATAL rtc FFD76H 00000H - @@DATAL vreg_ctr FFD76H 00000H - @@DATAL vreg_twl FFD76H 00000H - @@DATAL adc FFD76H 00000H - @@DATAL renge FFD76H 00000H - @@DATAL accero FFD76H 00000H + FFD78H 00000H + @@INITL @rom FFD78H 00000H + @@DATAL FFD78H 00000H DSEG UNIT64KP + @@DATAL loader FFD78H 00000H + @@DATAL pm FFD78H 00000H + @@DATAL i2c_ctr FFD78H 00000H + @@DATAL main FFD78H 00000H + @@DATAL magic FFD78H 00000H + @@DATAL WDT FFD78H 00000H + @@DATAL i2c_mcu FFD78H 00000H + @@DATAL i2c_twl FFD78H 00000H + @@DATAL led FFD78H 00000H + @@DATAL rtc FFD78H 00000H + @@DATAL vreg_ctr FFD78H 00000H + @@DATAL vreg_twl FFD78H 00000H + @@DATAL adc FFD78H 00000H + @@DATAL renge FFD78H 00000H + @@DATAL accero FFD78H 00000H @@DATAL self_flash - FFD76H 00000H - @@DATAL sw FFD76H 00000H + FFD78H 00000H + @@DATAL sw FFD78H 00000H @@DATAL task_debug - FFD76H 00000H + FFD78H 00000H @@DATAL task_misc - FFD76H 00000H - @@DATAL task_sys FFD76H 00000H + FFD78H 00000H + @@DATAL task_sys FFD78H 00000H @@DATAL pedo_alg_thre_det2 - FFD76H 00000H - @@DATAL ini_VECT FFD76H 00000H + FFD78H 00000H + @@DATAL ini_VECT FFD78H 00000H @@DATAL task_status - FFD76H 00000H - @@DATAL @rom FFD76H 00000H -* gap * FFD76H 0008AH + FFD78H 00000H + @@DATAL @rom FFD78H 00000H +* gap * FFD78H 00088H MEMORY=RAM2 BASE ADDRESS=FFE20H SIZE=000C0H @@ -628,16 +629,16 @@ Direc-file:bsr_mcu.dr @@BITS vreg_ctr FFE22H.2 00000H.1 @@BITS vreg_twl FFE22H.3 00000H.0 @@BITS adc FFE22H.3 00000H.4 - @@BITS renge FFE22H.7 00000H.2 - @@BITS accero FFE23H.1 00000H.0 + @@BITS renge FFE22H.7 00000H.3 + @@BITS accero FFE23H.2 00000H.0 @@BITS self_flash - FFE23H.1 00000H.0 - @@BITS sw FFE23H.1 00000H.2 + FFE23H.2 00000H.0 + @@BITS sw FFE23H.2 00000H.2 @@BITS task_debug - FFE23H.3 00000H.0 + FFE23H.4 00000H.0 @@BITS task_misc - FFE23H.3 00000H.2 - @@BITS task_sys FFE23H.5 00000H.1 + FFE23H.4 00000H.2 + @@BITS task_sys FFE23H.6 00000H.0 @@BITS pedo_alg_thre_det2 FFE23H.6 00000H.1 @@BITS ini_VECT FFE23H.7 00000H.0 diff --git a/trunk/hoge.bin b/trunk/hoge.bin index 318fcc9..07c8ac9 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/task_misc.c b/trunk/task_misc.c index e54c78f..0bcf4c7 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -11,6 +11,8 @@ #include "adc.h" #include "i2c_mcu.h" #include "led.h" +#include "vreg_twl.h" + #ifdef _MCU_BSR_ @@ -49,12 +51,6 @@ bit twl_ver_read; bit going_to_sleep; -u8 vol_twl_readed; // 最後にSoCが読んだVol。TWLとの不整合防止 - -// twl の8段階volのリニア値からの境界 -const u8 TWL_VOL_BOUNDARY[] = { - 0, 2, 6, 11, 16, 21, 26, 31 -}; /* ======================================================== @@ -102,9 +98,6 @@ void tsk_misc( ) TWLでは8通常時、押しボタンは8段階だった。それに合わせて割り込みを入れたい ======================================================== */ { - static u8 vol_level_old; - u8 new_level = 31; - u8 i; static u8 mabiki; if( mabiki != 0 ) @@ -115,27 +108,14 @@ void tsk_misc( ) { mabiki = 4; - if( is_TWL ) + if( is_TWL ) + { + if( vol_level_twl != vol_level_twl_readed ) { -// if( vol_twl_readed != vreg_twl[ REG_TWL_INT_ADRS_VOL ] ) - { - // 8段レベルに変換 - for( i=0; i<=7; i++ ) - { - if( vreg_twl[ REG_TWL_INT_ADRS_VOL ] <= TWL_VOL_BOUNDARY[ i ] ) - { - new_level = i; - break; - } - } - if( vol_level_old != new_level ) - { - vol_level_old = new_level; - set_irq( VREG_C_IRQ2, REG_BIT_SLIDE_VOL_ACROSS_TWL_BOUNDARY ); - } - } + set_irq( VREG_C_IRQ2, REG_BIT_SLIDE_VOL_ACROSS_TWL_BOUNDARY ); } } + } } } diff --git a/trunk/vreg_ctr.h b/trunk/vreg_ctr.h index 166e04d..d9ba124 100644 --- a/trunk/vreg_ctr.h +++ b/trunk/vreg_ctr.h @@ -255,6 +255,8 @@ enum VREG_C_ADRS // VREG_C_AMBIENT_BRIGHTNESS = 0xXX, + + /*============================================================================*/ void vreg_ctr_init( ); void vreg_ctr_reset( ); diff --git a/trunk/vreg_twl.c b/trunk/vreg_twl.c index 1a49fab..c920bf6 100644 --- a/trunk/vreg_twl.c +++ b/trunk/vreg_twl.c @@ -17,12 +17,12 @@ TWL // ======================================================== u8 vreg_twl[_REG_TWL_INT_ADRS_ENDMARK]; - extern bit twl_ver_read; extern bit cam_led_update; extern bit vol_changed_by_twl; -extern u8 vol_twl_readed; // SoC が最後に読んだVol値 +u8 vol_level_twl,vol_level_twl_readed; // SoC が最後に読んだVol値 + /* ======================================================== @@ -63,7 +63,7 @@ void vreg_twl_write( u8 adrs, u8 data ) { cam_led_update = true; } - tsk_led_cam(); // todo 大丈夫？ + tsk_led_cam(); break; case ( REG_TWL_INT_ADRS_TEMP0 ): @@ -117,8 +117,8 @@ u8 vreg_twl_read( u8 phy_adrs ) return( temp ); case( REG_TWL_INT_ADRS_VOL ): - vol_twl_readed = vreg_twl[ REG_TWL_INT_ADRS_VOL ]; // TWLとスライダと不整合が起きないように - return( vol_twl_readed ); + vol_level_twl_readed = vol_level_twl; // TWLとスライダと不整合が起きないように + return( vreg_twl[ REG_TWL_INT_ADRS_VOL ] ); case( REG_TWL_INT_ADRS_VER_INFO ): // set_irq( VREG_C_IRQ2, REG_BIT_TWL_VER_READ ); // 速度的に無理なので diff --git a/trunk/vreg_twl.h b/trunk/vreg_twl.h index 01e4fa9..cf08300 100644 --- a/trunk/vreg_twl.h +++ b/trunk/vreg_twl.h @@ -2,6 +2,7 @@ #define __vreg_twl__ /* ========================================================================= */ extern u8 vreg_twl[]; +extern u8 vol_level_twl,vol_level_twl_readed; // SoC が最後に読んだVol値 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 3e5b60a..0f69aaf 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -80,8 +80,8 @@ Kanji=SJIS [Source] Geometry=79, 64, 1021, 817 Window=Normal -DispStart=16 -CaretPos=69,0 +DispStart=15 +CaretPos=68,0 Mode=Normal DispFile= Address1= @@ -139,11 +139,27 @@ SaveRange=Screen SaveStart= SaveEnd= Accumulative=ON +[Source1] +Geometry=0, 0, 1021, 817 +Window=Normal +DispStart=91 +CaretPos=1,0 +Mode=Normal +DispFile=adc.c +Accumulative=ON +[Source2] +Geometry=25, 25, 1021, 817 +Window=Normal +DispStart=100 +CaretPos=123,21 +Mode=Normal +DispFile=task_misc.c +Accumulative=ON [Assemble] Geometry=30, 440, 968, 626 Window=Normal -DispStart=791 -CaretPos=791,27 +DispStart=788 +CaretPos=788,27 Address1= Address2= Address3= @@ -963,13 +979,13 @@ Boundary=18088086 0=.temp_twl_bt_level,P,N,A,+,1 1=.bt_remain_old_ctr,P,N,A,+,1 2=.chg_led_override,P,N,A,+,1 -3=.vreg_twl,P,N,A,+,1 +3=+vreg_twl,P,N,A,-,1 4=.infos,P,N,A,+,1 5=.vreg_ctr,P,N,A,+,1 6=.info_led_override,P,N,A,+,1 7=.battery_manufacturer,P,N,A,+,1 8=.battery_manufacturer,P,N,A,+,1 -9=.system_status,.,N,A,+,1 +9=+system_status,.,N,A,-,1 10=.info_LED,.,N,A,+,1 11=.time_to_next_frame,P,N,A,+,1 12=.vol_level_old,P,N,A,+,1 @@ -1001,7 +1017,7 @@ Geometry=709, 826, 445, 260 Window=Normal Width=150 30 200 100 Name0=Swb00001 -Address0=task_misc.c#_tsk_misc+0x6b +Address0=task_misc.c#_tsk_misc+0x5d Window0=ASM Status0=ON Count=1