diff --git a/trunk/adc.c b/trunk/adc.c index f43d7bd..2cea7a5 100644 --- a/trunk/adc.c +++ b/trunk/adc.c @@ -284,17 +284,20 @@ __interrupt void int_adc( ) switch ( ADS ) { /* -case ( ADC_SEL_AMB_BRIT ): // 環境明るさ + case ( ADC_SEL_AMB_BRIT ): + // 環境明るさ // vreg_ctr[ VREG_C_AMBIENT_BRIGHTNESS ] = adc_data; break; */ - case ( ADC_SEL_3D ): - EI(); + case ( ADC_SEL_3D ): + // 3Dボリューム // + EI(); adc_raw_dep = adc_data; break; case ( ADC_SEL_VOL ): + // 音量スライダ // EI(); if( system_status.model == MODEL_TS_BOARD ) { @@ -308,7 +311,8 @@ case ( ADC_SEL_AMB_BRIT ): // break; case ( ADC_SEL_BATT_TEMP ): - EI(); + // バッテリ温度 // + EI(); #ifdef _ENABLE_HAL_ if( vreg_ctr[ VREG_C_HAL_OVW_TEMPERATURE ] == 0xFF ) // HAL無効 #else @@ -334,6 +338,7 @@ case ( ADC_SEL_AMB_BRIT ): // /* 呼ばれません case ( ADC_SEL_BATT_DET ): + // バッテリメーカー識別 // break; */ } diff --git a/trunk/bsr.hex b/trunk/bsr.hex index fed659d..c635183 100644 --- a/trunk/bsr.hex +++ b/trunk/bsr.hex @@ -1,13 +1,13 @@ :02000000F10C01 -:0400100039473B47EA -:02001C00E748B3 -:020024008E4903 -:02002A00D949B2 -:08003400064BA94A024B474D9F -:02004A003D4730 -:02005A007747E6 -:02006200054D4A -:060080009A4BD34B1D4C0E +:040010006A476C4788 +:02001C00184981 +:02002400BF49D2 +:02002A000A4A80 +:08003400374BDA4A334B784DDB +:02004A006E47FF +:02005A00A847B5 +:02006200364D19 +:06008000CB4B044C4E4C7A :0400C0007EFBFF04C0 :0A00C4001B339499E033F240BFAA09 :1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A @@ -15,7 +15,7 @@ :1000EE007110A6FB710006F9EF0B8C015C80D161DB :1000FE00E8710006F98F06F931030EF6B1BBF66111 :10010E004900DD05618900EFF5FDDF01FD3101FDDF -:10011E008901FD9809FDCF08FD772FFD752CEFA500 +:10011E008901FD9809FDCF08FD892FFD872CEFA5DC :10012E00C0C6D7C7360000674C09DE3F318E04F6D5 :10013E000FC1317B9EFDC411897267318E04F64F5B :10014E0014896142DF03F6EF01E660610667318EC6 @@ -108,11 +108,11 @@ :1006BE0001617902EFBB40F67FFF61F86159018C51 :1006CE0001D161F8ED6907CC0100717AFAFD6A0477 :1006DE00711300711B20710303710205E0C15003F9 -:1006EE00FD362BC05013FDAB09500FC1E0FD362B6C +:1006EE00FD482BC05013FDAB09500FC1E0FD482B48 :1006FE00C0CEABAC6159018C0191DD068C014C036F :10070E00DF03E6EF01F66061FB7121048C014C08FA :10071E0061F8CC010031320705A024FCEF03F5246B -:10072E00FC4024FC11DC22F524FCF0C15003FD3604 +:10072E00FC4024FC11DC22F524FCF0C15003FD48F2 :10073E002BC0CE3708CBE4FFFFCBE6FFF7CED4FFBE :10074E00CF370008F5120561FDE6BC02F6614902DD :10075E00DD9F00000000617902EFF1FD6B08D2DF32 @@ -137,7 +137,7 @@ :10088E00C7310497067110B3FBEF047118B3FB8FD9 :10089E00B3FB7B8A76D1DD278FB3FB9D8A665C0224 :1008AE00D1DD1C8FB3FB5C02D1DD0B5040C150106B -:1008BE00FD8634C0EF095020C15010FD8634C0C6ED +:1008BE00FD9834C0EF095020C15010FD9834C0C6C9 :1008CE00D7C7360000665C80D1DD10675C80D1DF53 :1008DE0005713396EF0B713296EF06710407713185 :1008EE0096665C40D1DD10675C40D1DF05714396A2 @@ -160,13 +160,13 @@ :1009EF0000089F0408EEBF00EEBA00C1C514410E07 :1009FF0011D9D0FF118FD1FF312E45C4C0D7F2319D :100A0F00A2C401E2D79DE261DD4C09DF12717BFACE -:100A1F00C18F06089F25FDC0CF060800EE270031C5 +:100A1F00C18F06089F27FDC0CF060800EE270031C3 :100A2F00F2FA04CF0608004C00DF05D50008DD16EA :100A3F0061DD717BFAD50608DD0ACDE31F61CD615B :100A4F00CDEE160061CDFED40061FFFE9A00FCF8DA :100A5F00FF0EFEB20061CDFED5004C09DF0EC18F37 -:100A6F0006086F25FD9F0608C0EE0400CF0608009C -:100A7F00F8E3D75200EF025202FE3700CF24FD00F9 +:100A6F0006086F27FD9F0608C0EE0400CF0608009A +:100A7F00F8E3D75200EF025202FE3700CF26FD00F7 :100A8F00CF060800BF0408C716629F000841001177 :100A9F008F1A209B4100118F1B209F0108C6510008 :100AAF00FE62FFEF025205CF060800C1510CFE0A8D @@ -174,28 +174,28 @@ :100ACF0070CEC0A59EC47CFF9EC4609EC461CDD76E :100ADF0061DD717BFAC18EC45C1BFED6FFCF0608A9 :100AEF0001FED7FFC061CDD731F2FA1AC1AEE4BF14 -:100AFF0016FDAEE6BF18FDAED4BF1AFD30FFFFBE28 -:100B0F00E4BEE6BED4C0D731F2FA11C1AF16FDBEB6 -:100B1F00E4AF18FDBEE6AF1AFDBED4C0D7C1BF1CEF -:100B2F00FD13BF1EFD15BF20FD17BF22FDC0D7AFA0 -:100B3F001CFDDB1EFDEB20FDFB22FDD7534B30527E +:100AFF0018FDAEE6BF1AFDAED4BF1CFD30FFFFBE22 +:100B0F00E4BEE6BED4C0D731F2FA11C1AF18FDBEB4 +:100B1F00E4AF1AFDBEE6AF1CFDBED4C0D7C1BF1EE9 +:100B2F00FD13BF20FD15BF22FD17BF24FDC0D7AF9A +:100B3F001EFDDB20FDEB22FDFB24FDD7534B305276 :100B4F005430324E323030475631323000FFC150C0 :100B5F00FEFEAB0061DD717BFACF060800FE0A00D6 -:100B6F00FEA4FF61CDF8E3EECF00C7FB0408BF166C -:100B7F00FD8FC0009C05C5C337040600BF18FD35A7 +:100B6F00FEA4FF61CDF8E3EECF00C7FB0408BF186A +:100B7F00FD8FC0009C05C5C337040600BF1AFD35A5 :100B8F0036C10B300000522BFE6600C2C4C6306F58 -:100B9F000BB800300000B8022004AF18FDB80030C9 -:100BAF000F00B802AF16FD61FF520AFE3AFFECF8D4 +:100B9F000BB800300000B8022004AF1AFDB80030C7 +:100BAF000F00B802AF18FD61FF520AFE3AFFECF8D2 :100BBF00FF0E717BFAC1C7FB04088C05C65C80FE73 :100BCF000200C0D761DD717BFA70CFC0FFA59FC057 :100BDF00007CFF9FC000609FC00061CDD7618BFE7E :100BEF00E2FF717BBE410011FB000017CEFC0061DC :100BFF00CB089EFDF31161C999A58392DFF7D7FE4C -:100C0F00B1FED524FDDF23C1CF0308035109FEF444 +:100C0F00B1FED526FDDF23C1CF0308035109FEF442 :100C1F00FDC0D2DF37FE3800A20408CF030807510A :100C2F0009FEE1FDD2B20408DF22C7FB04083183BD -:100C3F0002C6D7C6510AFECCFD624C1FDF06CF2479 -:100C4F00FD01EF04CF24FD00C0EE5BFEC0EE55FEAC +:100C3F0002C6D7C6510AFECCFD624C1FDF06CF2677 +:100C4F00FD01EF04CF26FD00C0EE5BFEC0EE55FEAA :100C5F00C7C1FB04088B31196C0161589BC0C6D703 :100C6F00717BFAFE4DFEAF0408040600C11436D3A3 :100C7F000B300000522DF3FE77FF8FC000FE2BFECE @@ -208,10 +208,10 @@ :020CEF00C3FD43 :100CF10061CF5100718C7109FECBF800FEFCC90176 :100D010000F6BF00F953C0F693935820FEDFF94176 -:100D11000036584D34CCFCEF05118B99A7A517442B -:100D2100A24DDFF53602F930CCFCEF04CC0000A770 -:100D310047DFF9410036A24D3420FEEF05118B99B2 -:100D4100A7A51744B24DDFF53630FE3092FEEF0411 +:100D11000036884D34CCFCEF05118B99A7A51744FB +:100D2100D44DDFF53602F930CCFCEF04CC0000A73E +:100D310047DFF9410036D44D3420FEEF05118B9980 +:100D4100A7A51744E44DDFF53630FE3092FEEF04DF :100D5100CC0000A747DFF9FCCE0000EFFE61DD719A :100D61007BFABEF0ADD8BEF200AEF661CDD7C3615D :100D7100DD717BFABEF0ADD8BEF200DBF6FFADDC73 @@ -244,10 +244,10 @@ :100F2100F9B4DADFF4BDD813BDDAC2C0D746D8DDD3 :100F31000771FF7177D971C0D75BDB9DDB605BDA2D :100F41009DDAADDC5BD9085BD808BDD8D7C3C7F340 -:100F5100728EFDC162314C4100364E4D1161A0725D +:100F5100728EFDC162314C4100367E4D1161A0722D :070F6100C09EFD62C6C2D76D -:0A0FF60031373A31343A333200004B -:0A20000031373A31343A3332000030 +:0A0FF60031303A31383A3337000049 +:0A20000031303A31383A333700002E :10200A0005214F7B9EC5E9000104080D12171C1F0C :10201A00080100001F003B005A0078009700B50035 :10202A00D400F300110130014E01192634445362E1 @@ -291,7 +291,7 @@ :02228A00010051 :10228C008D3AB43AD1DF26CD3A1EFD3E23FDE12234 :10229C003132920D3104920931329605713304EFCB -:1022AC0003713204FD1223FDBA22FD0F26D77153A0 +:1022AC0003713204FD1223FDBA22FD1526D771539A :1022BC0092D432DD05B432715292312292037152B2 :1022CC0092715492714102314402057140B3FBD7B3 :1022DC007148B3FBD74A304BDC114A30B9DE0C4A9B @@ -302,689 +302,692 @@ :10232C008FB2FB5C01D1DF04712392D7712292F43E :10233C003DD7C7C1FBF8FF313296067130B3FBEFC6 :10234C00047138B3FB714492713796DE4F71349639 -:10235C007141923132960E5002C15011FD8634C03B -:10236C00CD3229EF37E0C15011FD8634C0F432175D -:10237C00C15002FD1E2BC0D2DF0D8B318E318D086A +:10235C007141923132960E5002C15011FD9834C029 +:10236C00CD3229EF37E0C15011FD9834C0F432174B +:10237C00C15002FD302BC0D2DF0D8B318E318D0858 :10238C000E01081C00BD34AD3444009BDC05D5AFF8 -:10239C00FBDF095020C15011FD8634C0C0C6D78D5B -:1023AC00209D3EFDED23FD522BD507F9DD04710375 +:10239C00FBDF095020C15011FD9834C0C0C6D78D49 +:1023AC00209D3EFDED23FD642BD507F9DD04710363 :1023BC0092D78D3E4B2061F83164921C716392FD73 :1023CC006A044A3E07DD054A3EFFDF098F06F931F4 -:1023DC000303FD7624FD8A24710292306D256194ED +:1023DC000303FD7C24FD90247102923073256194DB :1023EC00D7C77162017172015003FDAB095008FD32 -:1023FC000337629D305009FD0337627671630171BA -:10240C001806F94A30F1DC05E507F9EF224A3004E9 -:10241C00DE1ACF07F9025008C1506CFD6A02C09257 -:10242C00DF0DD450DF09711006F9EF03F507F94001 -:10243C0007F901DF05710A22EF06710B2271030205 -:10244C00CD20075700674C08DE1073090A20614E37 -:10245C00DC05679D20EF0387EFEB4A2007DF09D5EA -:10246C0007F961F8CF07F903C6D7500AFDAB09305D -:10247C004000C15006FD012BC05096EDAB09C720A2 -:10248C0006FBF8FFD507F961E8ED6925304A57C11D -:10249C00503EFD012BC0D2DD077100B2FBED69256A -:1024AC007108B2FB17040200C15004C1500CC1509A -:1024BC006CFD8B021006EA38AA48318D12AA4831FD -:1024CC008E616B08616A08C1500EFD012BC0F6903D -:1024DC00C1500CFD012BC0CC01008C014C04DE283A -:1024EC0031349302EFFA712293EA388C015010D6F2 -:1024FC0005C15010C18C01D6044000C1506CFD3593 -:10250C00031006615901EFD250A5FDAB09EA38AAB8 -:10251C0048318D12AA48318E616B08616A08C1502E -:10252C000EFD012BC050A5FDAB095004C1506CFD34 -:10253C006A02C0629C01EA388A4B4E0161C3048A6C -:10254C004A4E0117040200C15004C1500CC1506C1A -:10255C00FD35031006F6C1503EFD012BC01006C61A -:10256C00D7C78D3F4B3061F8ED0C264A4128DE056C -:10257C00A441ED0C26F4418D309D3F8D305070D62A -:10258C0012307351230480001231FF318E039D40B1 -:10259C009FAEFBF68D407C804C95DC1B8D40318FC3 -:1025AC00241400EA38BDD8AA44FD5E0D1231FF3167 -:1025BC008E03318F16EF198D40318F241400EA38B9 -:1025CC00BDD8AA46FD5E0D1231FF318E03318F1638 -:1025DC00EA388A427217F3031644000171FE61C88F -:1025EC0036FF001701DE02F61617BD78C7500CFD3A -:1025FC00012BC0D2DF068D309D3FEF047100B2FB82 -:10260C00F2C6D7C72008FBF8FF4007F901DD0640EA -:10261C0007F902DF1C17040600FDF92BD2DF0A8C28 -:10262C00069C058C079C04EF4ECC0563CC0400EF94 -:10263C004617040600FDF92BD2DD0F7100B2FB71B9 -:10264C000392CC0500711293EF2D7108B2FB8C062E -:10265C00318E318D080E07081C00BBEA388A407297 -:10266C00ABFDB10EBB8C019C05D1DF08CC0501CCB8 -:10267C000400EF038B9C0417040600FD042CD2DD30 -:10268C0006CC06C8CC07008C069FB1FB8C06318E9D -:10269C00318D080E07081C00BD34AD344401A5DC97 -:1026AC0008CC0364F6BD42EF48AD3426424401A089 -:1026BC00DC08CC031EF6BD42EF37AD3444819DDC03 -:1026CC0009CC030AC942F401EF27AD3444019BDC69 -:1026DC0009CC0305C942F401EF17AD34440191DC78 -:1026EC0009CC0300C942F401EF07711293C942F4FB -:1026FC00013132040C31249208CC0564CC0400EF77 -:10270C000D8C034E05DE078C039C05CC04008C0558 -:10271C009FAFFB8C049FB0FBFD862B8D444E05DDDB -:10272C002840AFFB0BDE054A440BDE1440AFFB0622 -:10273C00DE054A4406DE09D5AFFBDF0DD444DD09C6 -:10274C005020C15011FD8634C08FAFFB9D44FDC39A -:10275C002B1008C6D7C75601D837C15002FD362BEF -:10276C00C04008F90161F8712010055012FDAB0949 -:10277C008D376C0870C15002FD362BC05003FDAB79 -:10278C00098D376C1870C15002FD362BC05016FDE8 -:10279C00AB095003FD472B625C01D1DD0F7170B3A7 -:1027AC00FB5002C15013FD8634C056006672C6D76A -:1027BC00C75004FD472B625C03D1DD405014FD5320 -:1027CC002834B3FB895C9F998A0C7CFF50FF5C1406 -:1027DC00D1DD228A0C7CFF5C147234B7FB89616AF0 -:1027EC00997162075600316207058666D1DFF77171 -:1027FC006307716B2734C6FB895CEB997128100554 -:10280C005002FD472BD2DD354008F901DF05500A97 -:10281C00FDAB098D376C1070C15002FD362BC0E03A -:10282C00FDAB09D837C15002FD362BC05033FDAB80 -:10283C0009F0C15002FD362BC07178B3FBE0C150DA -:10284C0013FD8634C0C6D7C7C12004FBF8FFCC02E9 -:10285C00005004FD472B629C038C045C20D1DD0EE0 -:10286C008C036C019C038C026C209C02EF138C0477 -:10287C005C10D1DD0C8C035CFE9C038C026C109CF8 -:10288C00028C045C08D1DD0E8C036C029C038C0260 -:10289C006C089C02EF138C045C04D1DD0C8C035C83 -:1028AC00FD9C038C026C049C028C03D1DD05501A38 -:1028BC00FDAB098C0370C15004FD362BC08FB3FBEC -:1028CC005C9F728C03318E316D148C03318E314DC3 -:1028DC00616D08616C5C606162629FB3FB8FBFFBD2 -:1028EC007CFF50FF5E02D1DD278FBFFB7CFF5E02B9 -:1028FC007234B7FB89616A99716207CC010031624D -:10290C0007086159018C01D1DFF4716307716B27E2 -:10291C00F21006C6D7D9A7FBC15006FD362BC0D97D -:10292C00A8FBC15007FD362BC0D7FD2129F2D7C714 -:10293C00711300711B20710303710205E0C1500378 -:10294C00FD362BC05013FDAB09F0C15005FD362BE5 -:10295C00C0500FC1E0FD362BC0500AFDAB0971030E -:10296C00055008FDAB09501FC1E0FD362BC05012BD -:10297C00FDAB095003FD472B625C01D1DF03E2EF95 -:10298C0024F0FD472B629D363602F9C75008FD1E18 -:10299C002BC05003C1FD362BC0710203711A20FDF0 -:1029AC00DE2AF431F2C6D75003FD472B625C01D10D -:1029BC00DD155014FD5328FDBC275014FDAB09E068 -:1029CC00C15003FD362BC0711300711B2071030322 -:1029DC005014FDAB09F0C1E0FD362BC0F0C1500323 -:1029EC00FD362BC0D7C72004FBF8FFCC02008D317D -:1029FC009C035010C150A4FD6A02C0629D31D4509A -:102A0C00DD04F2EDBB2A8C037B315C08D1DD0F8D2C -:102A1C00315C08D1DF05CC0210EF03CC02208C0313 -:102A2C007B315C04D1DD158D315C04D1DF088C0267 -:102A3C006C049C02EF068C026C089C028FB2FB5C4F -:102A4C00F3728D315C0C6162629FB2FB8FBEFB7CBA -:102A5C00FF50FF5E029C02D1DD1F34B6FB896E0273 -:102A6C0099716207CC0100316207086159018C0130 -:102A7C00D1DFF4716307716B278D315C40D1DD09B7 -:102A8C005002C15012FD8634C08D315C01D1DD087D -:102A9C00E0C15012FD8634C0717AFA8D315C41D19F -:102AAC00DD0C5A31BED831C15010FDD804C0F21023 -:102ABC0004C6D7FD6127F2D7FDBC27F2D7C78FC656 -:102ACC00FB7617FD5328664FC6FBDFF2F5C6FBF20B -:102ADC00C6D75064FDAB09FD0F2C6261FB711192DE -:102AEC00F171149261DC70C15012FDD804C0FD3438 -:102AFC0036CD5F03D7C7C1C1FBF8FFAC0ABB17C10A -:102B0C005002C18C0270C1506CFD350310061004CC -:102B1C00C6D7C7C1FBF8FFAC08C15002C18B70C14E -:102B2C00506CFD8B021006C0C6D7C788061667709E -:102B3C00C1C75084FDFE021004C6D7C716C7508407 -:102B4C00FD6A02C0C6D7C74A2004DE045600EF0255 -:102B5C0056014008F901DF048686EF0A4008F902A5 -:102B6C00DF045104610666318F12504CD633514C40 -:102B7C00D6610A045420BD38C6D740AFFB3DDC05F6 -:102B8C00CF04FC0FD740AFFB1FDC05CF04FC0BD7E9 -:102B9C0040AFFB0BDC05CF04FC07D740AFFB066155 -:102BAC00D831320405CF04FC03D7D5AFFBDD04E5E7 -:102BBC0004FCD7F504FCD7D504F9DF04717392D764 -:102BCC00FD0F2C6261FB710193711492710793617B -:102BDC00C831729217717292710493711192F171E2 -:102BEC00049361DC70C15012FDD804C0D7C716C75E -:102BFC005004FD1E2BC0C6D7C716C75002FD1E2B96 -:102C0C00C0C6D740AFFB0BDE02E2D7F2D771000192 -:102C1C000571785005713AD5713BD18F10055CFC6C -:102C2C009F1005CF54054AE542057110420571000D -:102C3C004205714850057130500571205005CF5335 -:102C4C000505CF52050A7130510571205105713BB4 -:102C5C00D5717050058F11055CFC9F1105F422D7BE -:102C6C007178500571080105D7FD2E38FD6A047185 -:102C7C007AFAFDAB23F504F98F06F931051B5003E5 -:102C8C00FD472B625C01D161E8CF04F902CFAFFBA9 -:102C9C0064710407714192EF10F671040761101210 -:102CAC00F6B1236061FB714192FD5730FDDD42713D -:102CBC002295712BE7618461A461EDEFF8D7714027 -:102CCC00F00071783002713AE6713BE2713BEA71C7 -:102CDC003BEE8F10055CFC9F1005CF34024AE55289 -:102CEC00FF711A52710A5271483002713030027100 -:102CFC00203002CF330205CF32020A71303102711B -:102D0C003BE6717030028F11055CFC9F1105716000 -:102D1C003002D7717830027148F000D7C788061698 -:102D2C0066614FDD0967614EDE0396EF01866672C0 -:102D3C00C6D7C7161714AA0412A943DD29AA041270 -:102D4C00A923FDB24DC3AC02FDB24D13C2BDD813C5 -:102D5C00FD2E0FDE0C1714AA0212AA0403BA04EFFC -:102D6C00051714A9BA04AC041231FF319E03317F4C -:102D7C00087208C6D77100F200304400BFB60130AB -:102D8C000188BF9001300984BF9E01BF9C01BF9A8E -:102D9C0001BF9801BF9601BF9401BF9201F53CFFA2 -:102DAC0030FE00BFBE01F6BFBC01BFB80150EEBF84 -:102DBC00BA01A1BFB201C918FE008F06F93105078F -:102DCC00F5CDFBCB6CFF00717393716293D730EF31 -:102DDC0000BFB401F6BFBA017108F200712304718F -:102DEC005307BE6EBE64BE6A712304715307715BD8 -:102DFC00D1F453F452716393D78D54B454D1DF6929 -:102E0C0031D4D105715BD1E453D453DD2E7140B272 -:102E1C00FBD852F1E734020023DD0625DD0325DF64 -:102E2C0005F6BE66EF06D9CCFBF1BE66A4524A523B -:102E3C0020DF04F452B453CD5419D7CD541E71482D -:102E4C00B2FBD5CEFBDF04F6BE66D7D9CCFBF14284 -:102E5C0066FFDD15D9CCFBF112AE6643DE05A2662A -:102E6C00FFEF03B266FFCD5403D7C7161714F6B99C -:102E7C00AA0412F6231231FF31AE03316FBA02C627 -:102E8C00D7C7C1FBF8FF8C085080D612AB1413B90E -:102E9C00AB14AA0412A92312D927FBF133BDD81302 -:102EAC00FD9A0DBA02C0C6D731049401D74004F97B -:102EBC0002DF10F6BE64BE6EBE6ABF8EFBBF94FB13 -:102ECC00BF9AFB31749314308AFBFD762E3090FB45 -:102EDC00FD762E3096FBFD762EEF713114940D712C -:102EEC0013947108D2FBF456F455EF60D455DF5AA5 -:102EFC008F26FB9D554A561FDC177100D2FB4028CC -:102F0C00FBFFDD1CA4578F28FB4B57DE13F456EF49 -:102F1C000FD856F1A1605C1F9D567108D2FBF45777 -:102F2C00E856092AFB70C1308AFBFD8D2EC0E8568D -:102F3C00094AFB70C13090FBFD8D2EC0E856096A22 -:102F4C00FB70C13096FBFD8D2EC0B455308AFBFD55 -:102F5C003E2DF313BE6E3090FBFD3E2DF313BE6A77 -:102F6C003096FBFD3E2DF313BE64D7C736F00071CF -:102F7C00F4DC297170F000CE9D08CE9EC0CE9F80EF -:102F8C00F594FFF593FFF592FFE597FFE596FFE5C6 -:102F9C0095FFE598FFCE9C7F7100A6FB711BE3713A -:102FAC002BE3711AE7712BE7717A9D710A9E3192AE -:102FBC009E02EFFA710B9E712394713394714394BA -:102FCC00C6D7C73122941E712294710A9E31929EEB -:102FDC0002EFFA34D4FB3692FF52078B99A5A792D5 -:102FEC00DFF9710B9EC6D7C788061631329415715E -:102FFC003294C7349CFB3092FF1652078B99A5A7CD -:10300C0092DFF9C6667367189CFBC6D7C771239409 -:10301C003134941E713394710A9E31929E02EFFAF0 -:10302C003492FF369CFB52078B99A5A792DFF9715E -:10303C000B9E31449413714394717B9E8FDCFB9EE9 -:10304C009A8FDDFB9E9B717A9EC6D7CFA7FB5CCF78 -:10305C00A8FB5FCFC8FB5DCFFCFB36CFFDFBC9E502 -:10306C00D3FBD7C7CFA4FB12CFA5FB0FCFCCFBFF55 -:10307C00F5CDFBF5CEFBF5CFFBF5D0FB5600664C42 -:10308C0064DE08723826FB0086EFF3C6D7C78806C5 -:10309C001617F1E73403002361E3EDBE332361F827 -:1030AC00ED8A31B12361E3ED94312561F8EDA23164 -:1030BC00B1240D0061D8EDBE33240B0061F8EDC2D4 -:1030CC00312361F8ED05322361F8EDD5312361F838 -:1030DC00EDB93324060061F8ED6E32B12561D8EDFF -:1030EC008A3224000061F8ED97322361F8EDBE338B -:1030FC002361F8ED9733B12361E3EDBA322361F824 -:10310C00EDCB322361F8EDDC322361F8EDCB3223C9 -:10311C0061F8EDED322361F8EDFE322361F8ED0D2F -:10312C00332361F8ED2F332361F8ED3B332361F842 -:10313C00ED47332361F8ED4F332402002361E3EDB7 -:10314C00BE3324020061F8ED57332361F8ED62338E -:10315C002561F8ED6D33B124060061D8EDBE332442 -:10316C00000061F8EDC0332561F8ED7833241200CE -:10317C0061F8ED92332361F8ED8333EDC03334A65F -:10318C00FB89615F99EDCA333036296194667367A8 -:10319C0018A4FBEDCA3340A9FB6ADF1340AAFB68F5 -:1031AC00DF0D674C6CDF08301A406194713AD567BB -:1031BC009FABFBEDCA3367D1DD0C304A3B619434D5 -:1031CC00C4FB89616F99EDCA33675C02D1DD0730AE -:1031DC00BF2A6194EF0B675C01D1DD0530C42A6115 -:1031EC0094675C3CD1DD0F30C92A6194675C3C72FA -:1031FC0066736218A4FBEDCA3367D1DD625C01D142 -:10320C00DD05300800EF01F6609F01FC675C02D120 -:10321C00DD03E6EF01F63401FC89616899675C0413 -:10322C00D1DD04E6A1EF01F63401FC8961689967F0 -:10323C005C08D1DD05302000EF01F63401FC89611A -:10324C006899675C10D1DD05301000EF01F6340190 -:10325C00FC89616899675C20D161E8716001FCEDC3 -:10326C00CA33D446DF08679FCDFBA446EF0D4A4610 -:10327C0005DE08E846671811FDA446EDCA33675C05 -:10328C000F7266736218A4FBEDCA334A4664DE1BE8 -:10329C004A4601DF0667D161F85701E846671826F0 -:1032AC00FBA4464A460561C8711294EDCA33675CAB -:1032BC007F70C117F1243000FDF32FC0EDCA3367C6 -:1032CC005C3F70C117F1243000FDF32FC0EDCA3301 -:1032DC00675C0770C117F1243000FDF32FC0EDCAF5 -:1032EC0033675C1F70C117F1243000FDF32FC0ED64 -:1032FC00CA336770C117F1243000FDF32FC0EDCA3B -:10330C0033CEABAC710A9E31929E02EFFAD592FF8E -:10331C00DF05710B9EEFED679E99710B9E9FDBFB9A -:10332C00EDCA33714294675C7F9FDCFBEDCA33714D -:10333C004294675C3F9FDDFBEDCA33675C3F9FDEC9 -:10334C00FBEF7B675C1F9FDFFBEF73300A396194E7 -:10335C00679FE4FBEF6830D7386194679FE5FBEF1C -:10336C005D30F0386194679FE8FBEF52675C01D1E8 -:10337C00DD4CFDDD42EF474A58C8DE42E85867187D -:10338C005AFAA458EF38679D58EF33675C01D1DDCA -:10339C0005711202EF03711302675C02D1DD057136 -:1033AC002202EF03712302679FD3FBEF1167318E6B -:1033BC00EF0CEF0A664C5BDE05736718A4FBC6D7EF -:1033CC00C716664C30DC094C37DE05FDCE2FEF6B93 -:1033DC00664C02DF1F8FA6FB5C03728F03FC5C0341 -:1033EC00318E316D08616A08128F03FC5C80312AC2 -:1033FC006162EF56664C3DDF08AE90BD5AF85AEF4D -:10340C0049664C3EDF04F85BEF40664C4FDF05FD30 -:10341C000543EF36664C61DF08E858095AFA72EF3B -:10342C0029664C7FDF05FDC03BEF1F664C4EDF0B62 -:10343C00310496045210EF12F2EF0F664C5BDC0471 -:10344C0052FFEF06667309A4FB72C6D7C78806162F -:10345C0017F1241000240500DC07244C00DD17EFC5 -:10346C0017717BFA17F104A4FB1489617F99717AA7 -:10347C00FA715294EF02A458C6D7C7C1C1FBF8FF2A -:10348C004004F903DD064004F904DF38717BFA8C43 -:10349C00027309ACFB5E0AD1DF278C02318E04A4C7 -:1034AC00FB14896E0A99716207717AFACC010031AA -:1034BC006207086159018C01D1DFF4716307716BEC -:1034CC0027717AFA1004C6D7CF03FC03F501FCF57B -:1034DC0005FCF507FCD7C788061617F1E734020080 -:1034EC0025DD3D23DD1725DD1C23DD0523DD2BEF3D -:1034FC003B710295679F06FCCD5F03EF2F675C83E2 -:10350C009F03FCEF27675C039F05FC675C034C0281 -:10351C0061F8712296FDF344EF12679F07FCEF0CE4 -:10352C006791DF08E0C15012FD8634C0C6D7C716BC -:10353C0017F1E7240000DD2A23DD1E240300DD073C -:10354C0024FB00DD24EF2531329605308000EF019D -:10355C00F6086F04FC7208EF198F01FCF501FC7280 -:10356C00EF107152955235EF09F2EF0666730900B0 -:10357C00FC72C6D7C71617F1E7240000DD382410FB -:10358C0000DD1C23DD1C23DD30240E00DD1824118E -:10359C0000DD1B240F00DD12243000DD15EF1EE2D0 -:1035AC00EF1D5202EF195204EF155206EF1152059E -:1035BC00EF0D5207EF09F2EF065203EF0252FFC66E -:1035CC00D7C7316494377163948D5E9FACFB8D5D6E -:1035DC009FCBFB36D2FCC7D85DFD3437618A706156 -:1035EC008AFD7937C0D862F1312F609D618D5C4BBB -:1035FC0061DD0A7172948D619D5CCD5F034A5F053C -:10360C00DE08303E366194CD5F6BB45F7150F000D4 -:10361C00CE300BCF170006CE3106FD4502717A3045 -:10362C00710BE3710BE7C6D78D619D5C8D619FAD0E -:10363C00FBD74004F903DF064004F904DF02F2D79C -:10364C003174940C7173947113958D619D63EF318A -:10365C003104951F710395711295D506FCDF04F4A6 -:10366C0064EF0A8F06FC5002D6A1609D648D649DA8 -:10367C0063EF0E311495068D649D63EF048D619D8F -:10368C00638D639FADFBD863FDA636E863091C22EE -:10369C0070C15013FDD804C0F2D7C7C1C1FBF8FFED -:1036AC008C02D1DF05F506FCEF1A8C024C05DE0608 -:1036BC00CF06FC02EF0E8C02318E1231FE03311F4D -:1036CC00609F06FC8D654F06FCDD28CC011F8F0624 -:1036DC00FC9D65CC00008B4C08DE148B730912200A -:1036EC004F06FCDC058B9C01EF05615900EFE78C64 -:1036FC00019D601004C6D7C716710AE7710BE37100 -:10370C0050F000CE300BCF170006669E31FD4502FF -:10371C00717A30710BE33182E302EFFA8D1F71582D -:10372C00F000710BE772C6D7C7C1C1FBF8FF8FFC65 -:10373C00FB4E02DC03F2EF318C024FFDFBDC04523A -:10374C00FFEF268C022FFCFB706131318D128FFD47 -:10375C00FB2FFCFB70613133BDD813FDBC0DBB449A -:10376C000001DC03F690BB8B721004C6D7C7C1FBFB -:10377C00F8FFAC0814A91489708B6128706131FDB5 -:10378C00B24D1344030071FEDC23AC08148A04818F -:10379C009A04AC08148A044C11DC10A9148B99AC53 -:1037AC000814CA0200AC0814CA0310EF72AC081457 -:1037BC00CA0400AC0814A914894DDE0AAC08148A9A -:1037CC0002819A02EF12AC0814A914894D61D30836 -:1037DC00AC08148A02919A02AC08148A03919A03D9 -:1037EC00D1DF3CAC08148A024C10DF10A9148931CB -:1037FC008EA112AC0814A9146299EF17AC08148AA4 -:10380C00024CF0DF0EA91489318EB112AC0814A948 -:10381C00146299AC0814CA0200AC0814CA0310C094 -:10382C00C6D7ED3138C75600664C0ADE0BF0317E38 -:10383C0012F67810FC86EFF0C6D7C7200CFBF8FF09 -:10384C0017040600C15006C150A8C15030FD8B02B0 -:10385C001006D2DD1B4A6804DE05A468E2EF68346A -:10386C00E4FB895CFC99FD0A397110B2FBF2EF574D -:10387C00717BFA300600C117040600C130E9FBFD6C -:10388C00BA4D1004717AFAF4688FE4FB5C01D1DD57 -:10389C00264004F903DF205010C180FD8634C0C7D8 -:1038AC0036100571D4C6DE0F17C15006C150A8C121 -:1038BC005030FD8B0210064004F903DD064004F97C -:1038CC000461F8FD1F40F2100CC6D7D9E5FBC150BE -:1038DC0030FD6A02C0629FE8FB5008C15011FD86A2 -:1038EC0034C0F2D7D9E8FBC1D9E7FBC15030FDFE9B -:1038FC000210045008C15011FD8634C0F2D7C72005 -:10390C000CFBF8FFCC09004007F901DF05CC0A02DB -:10391C00EF03CC0A10CC0B808FE4FB5C039C07D12B -:10392C00DF08717AD5CC0807EF06717BD5CC082F50 -:10393C0017040800C15004C150A0C15030FD35031C -:10394C001006624C02DF077110B2FBF2EF357118F2 -:10395C00B2FBF468C736100571D4C6DE164004F904 -:10396C0003DF1017A1C15006C150A8C15030FD8B08 -:10397C00021006717BFA8FE4FB5C034E07DD03E259 -:10398C00EF01F2100CC6D7D504F9DF03F6BD6A407F -:10399C0004F901DD0AD474DD03B474D7CD74038F3C -:1039AC0004F9318FE723DD0B24020024030061C8E6 -:1039BC00EDB83A8F06F931233E301B00466ADF0A18 -:1039CC00E0C15010FD8634C0EF1D307701466ADF30 -:1039DC00165002C15010FD8634C0F64670DF088FB9 -:1039EC00C8FB5010D6BD70F64670DD36B67046700A -:1039FC00DF30711293EF2B301B00466ADF13F64653 -:103A0C0072DF18E0C15010FD8634C0C9725307EF45 -:103A1C000A307701466A61F8711293F6467261E8D2 -:103A2C00B67231549608714395F6BD6AEF14314461 -:103A3C009505F6BD6AEF0BA66AF6466A61F8C96A87 -:103A4C00FFFF316296194A6C05DE16A46C4A6C05B0 -:103A5C00DF0FA46C5004C15010FD8634C0EF02F48B -:103A6C006C316496194A6E05DE16A46E4A6E05DF3B -:103A7C000FA46E5008C15010FD8634C0EF02F46ED6 -:103A8C00D46FDD03B46FD7317296174A6D05DE140F -:103A9C00A46D4A6D05DF0DA46D5010C1FD8634C0B8 -:103AAC00EF02F46D4A6D0661F8CD6F25D7C736105D -:103ABC000571D4DE0E8FB2FB5C02D1DF06304638C6 -:103ACC006194D24004F903DF1C3122070530F1293F -:103ADC0061943154950C7153955080C15012FD86F0 -:103AEC0034C0FDF63AFD1C3BC6D78F03FC5C01D1FC -:103AFC00DD1DD477DD03B477D7CD77098D604B7698 -:103B0C00DD0D8D609D765040C15012FD8634C0D7BE -:103B1C004004F903DD04F6BD1AD7D5D0FBDF08F657 -:103B2C00461ADD19B61AD7D9CCFBF1461ADD0ED9D7 -:103B3C00CCFB12AD1A43DE03A61AD7B61AD7717B8B -:103B4C00FAC78FC4FB76F5C4FB717AFA5C10D161AD -:103B5C00E8716295665C0FD1DD57665C01D1DD05BD -:103B6C00F504F9EF4C665C02D1DD11E0C15003FDA8 -:103B7C00362BC0711300711B20710303665C04D1DA -:103B8C00DD11711300711B20D503FC61F871030367 -:103B9C00FDD434665C08D161E87103035005FDABBC -:103BAC00097102035003C1FD362BC0711A20FDDED2 -:103BBC002AF2C6D7C756FF4A461361C8ED9A3C8F06 -:103BCC0006F9311505300400EF0F8F06F931450564 -:103BDC00300500EF04D907F9F1609F28FC8D789F20 -:103BEC0029FC713492E661301271049261DC311956 -:103BFC006162629F2AFCE52BFC31140205308000C7 -:103C0C00EF01F6C131449605304000EF01F6C26178 -:103C1C006B08616A08C131340405302000EF01F6ED -:103C2C00C2616B08616A08C131240205300800EFDB -:103C3C0001F6C2616B08616A08C1317496053004E3 -:103C4C0000EF01F6C2616B08616A08C13164960429 -:103C5C00E6A1EF01F6C2616B08616A08C1315496A6 -:103C6C0003E6EF01F6C2616B08616A9F2CFCF171EF -:103C7C00240461DC9F26FCF171540761DC9F27FC56 -:103C8C00D846F10104ECFC14A9148976A44666729A -:103C9C00C6D7C7FDCF088F04F9318FE72400006128 -:103CAC00F8ED783E23DD1B2361F8ED823D2361F8AE -:103CBC00EDFE3D2361F8ED473E2361F8ED1B3FED32 -:103CCC00753EF6BD707113934005F901DF2C31344C -:103CDC00961B466ADD04F424EF02A4244A2465DC16 -:103CEC000FF6BD6AF504F9712295ED9D3FFDAB23EE -:103CFC00AD6A440A0061D8ED9D3F714295FD6A049E -:103D0C00716392FDAB234007F903DF09712295F52E -:103D1C0004F9ED9D3FFD0F2640B1FB9BDE0971229E -:103D2C0095F504F9ED9D3F714A27714011057130ED -:103D3C001105713A22715A2271501105FD3B29D29D -:103D4C00DD09712295F504F9ED9D3F71103500CF19 -:103D5C0037001D714012054005F901DD064005F9DB -:103D6C0003DF05F5CDFBEF04CFCDFB03CF04F90248 -:103D7C00FD2129ED9D3FFD192CFDCA2C714A9DFD9D -:103D8C00D434FD6F30F537FF712BE0F505F9712256 -:103D9C0095CBE43FEFCBE6F6F0FD6A04713BD471B2 -:103DAC0012027123028F06F93105285004FD472BAE -:103DBC00625C03318E315D34B3FB896168995002CA -:103DCC00FD472BD2DD067170B3FBEF047178B3FBAA -:103DDC00FDAB23FD812D710806F9CF04F9038FA6E5 -:103DEC00FB5C02D1DD095080C15010FD8634C0ED62 -:103DFC009D3FFD9F3F3164952FA47AD47ADD083125 -:103E0C00A4E00A31020C06712BE0FD0B4031A4E05A -:103E1C001731040C13712BE05027C15005FD362BC4 -:103E2C00C0CF04F904712295FD00408F06F93125AD -:103E3C000731349603F504F9ED9D3FFD9F3F3102A8 -:103E4C000C14F0C15005FD362BC05005FDAB09FD1F -:103E5C000B40CF04F903FD00408F06F931250731E3 -:103E6C00349603F504F9ED9D3FF504F9CFCDFB0332 -:103E7C00F5CEFBF5D0FB717293F6426CFF61E8ED69 -:103E8C009D3FF6BD70711393F5E4FBFD0A39717A11 -:103E9C00FAFDDA2DFD6C2CFD1F2D714B9D7113025B -:103EAC0071230231349302EFFACE3708CBE4BFFF13 -:103EBC00CBE6FFF3CED4FFF5B4FBF5B5FBF5B6FBC3 -:103ECC00F5B7FBCF37000971481205F6BEE0BEE22C -:103EDC00BED0716A27FDB329714307714B27714816 -:103EEC0010057148110571381005713811057133C1 -:103EFC0002713B22715302715B227158100571588B -:103F0C001105CF04F905714295F6BD6AFD9809F5C6 -:103F1C0005F9F42431349604D432DD20E505F9E5B5 -:103F2C0004F98F06F9312569F5F8FBF5F6FB502EEF -:103F3C00FDAB09CF05F903E504F9EF55FDBE04FD12 -:103F4C003E237173017132047143027103927162E9 -:103F5C009231949E02EFFA712AE7CEA409F5F30090 -:103F6C003104070261FDCFF30080F466FDCF08CE6B -:103F7C00A40831329606CF04F905EF09714395E593 -:103F8C0005F9E504F9712BE78F06F9312503F504E2 -:103F9C00F9C6D7D47BDF19310200585003FD472BEB -:103FAC00625C01D1DF07F504F9712295D7E47BD768 -:103FBC004A7BF0DF073104003AF47BD74A7BC8DF39 -:103FCC000AF504F9712295CD7BF0D7310200084A2D -:103FDC007BFFDD1FA47BD7F0C15004FD362BC08FB7 -:103FEC00B3FB5C9F9FB3FB7110C4FB304A3B6194E5 -:103FFC00CD7BF0D731149306F504F9712295D77166 -:10400C006395F47A717207FD4502717307D7FD1E33 -:10401C0005F2D7717BFAC7200CFBF8FF8FEAFBF097 -:10402C00F9E9FBF303FDB24D13BC048FECFBF0F983 -:10403C00EBFBF303FDB24D13BC028FEEFBF0F9ED7D -:10404C00FBF303FDB24D13BB717AFAAC04BDD8F689 -:10405C00BDDAAC04311EBDDCF6BDDEFD6F0DADD896 -:10406C00BDDCADDABDDEAC02BDD8F6BDDAAC0231DA -:10407C001EDADCC3DADEC3BDDCF6BDDEFD6F0DC0BF -:10408C00BDDEC0BDDCADDEFDE50EADD8BDDCADDA10 -:10409C00BDDEABBDD8F6BDDAAB311EDADCC3DADE81 -:1040AC00C3BDDCF6BDDEFD6F0DC0BDDEC0BDDCAD3D -:1040BC00DEFDE50EDADAADD8FDEE43C3C58D885CC6 -:1040CC003FF0317E0440FC14C2C0B9A488F6BC0891 -:1040DC00BC0A9C078C074C2EDD3D8D880E0770F1B9 -:1040EC0061DC605C3FF0317E127940FCBDD8F6BDDE -:1040FC00DA8C0773095C22318FBDDC70BDDEFD6F7D -:10410C000DAC08BDDCAC0AFDE50EADDABC0AADD8D1 -:10411C00BC08615907EFBDAC08BDD8AC0ABDDAC903 -:10412C00DC0004F6FD390EC9DCFFFFF6FD3A0FADDD -:10413C00D8BD82AF3AFC4682DD11AF3CFCBF3EFCE1 -:10414C00AF3AFCBF3CFCAD82BF3AFCAF3CFC423EFC -:10415C00FCDC46AF3AFC423CFCDE3EAD26423AFC6F -:10416C00DE374A2A16DC1A4A2AA0DE138D844B2A23 -:10417C00DE0DAF3AFC268644691061C8FDD741F4C8 -:10418C002AAF3AFC445146DC0AAF3AFC241027BD56 -:10419C0028EF0DC928F82AEF074A2AFF61E8A42A5C -:1041AC00AF3EFC423CFCDC18AF3CFC423AFCDE105F -:1041BC00AF3AFC4628DE09F484AF3AFCBD86EF0723 -:1041CC004A84FF61E8A484100CC6D7717BFAC771CE -:1041DC000A9E31929E02EFFA8E949F34FC8E969F2B -:1041EC0035FC8E979F36FC8E989F37FC8E939F38AC -:1041FC00FC8E929F39FC710B9E717AFA8F37FCFD05 -:10420C004E0F76FD6C4313BD80D5EFFBDF0AD5F066 -:10421C00FBDF05D5F1FBDD25F6B14680DF11C9804A -:10422C003722665C0391DF060A80181A8100961704 -:10423C00FD8F4413FDAF4231049602EF615206929A -:10424C00926934FC682EFCDFF6AD80BD7EF87CF301 -:10425C00311C790AF944FEFFDD44D87CF101040AD3 -:10426C00F914A944FFFFDF04E6B9EF0BD87CF10188 -:10427C00040AF914A9A1B9717BFAA0EFFBD5EFFBE5 -:10428C00DF1CA0F0FBD5F0FBDF14A0F1FBD5F1FB9C -:10429C00DF0CCFEFFBFFCFF0FBFFCFF1FBFFC671C5 -:1042AC007AFAD7C716D87CF10744A800DC0571024E -:1042BC0096EF1CF647DD18A47C4A7CA8DC0571023D -:1042CC0096EF0CF87CF3311CF6780AF9B7EFE4C6DC -:1042DC00D7C756A89666F0317E12F6B1780AF96601 -:1042EC00D1DFF1717BFAF5EFFBF5F0FBF5F1FBF4A7 -:1042FC007C710396C6717AFAD7C72004FBF8FFD4F9 -:10430C0046DF168D7C9D89717BFA52069292692E3E -:10431C00FC68C0FCDFF6717AFA4A4606DE0EE84607 -:10432C0009C0FC9C03A4468C0372EF30F889F3316E -:10433C001C790AF9BB311296058B9C03EF0F8C018B -:10434C009C03D489DF05CD89A7EF02B489718071F4 -:10435C00179661DC61FB7111968C03721004C6D741 -:10436C00C72008FBF8FF8F37FCFD4E0F9C078F36DC -:10437C00FCFD4E0F9C068F35FCFD4E0F9C058F34BB -:10438C00FCFD4E0F9C048F38FC9C038F39FC9C0267 -:10439C008C06318E0112791A20BB8C075C03D1DF9D -:1043AC00098C064C0361C86179008C05318EB161B2 -:1043BC000900BB313D120103BB8B0E04708C011C38 -:1043CC0000BB8FF4FB4E03DC0E8C034FF4FBDC0BB9 -:1043DC008C024FF5FBDC04AB12EF03ABB1121008EF -:1043EC00C6D7C7C3C12008FBF8FFF661490A61F8BC -:1043FC00614908DF07F7340000ED8B44E6BC04F696 -:10440C00BC06AC0ABC02AC08BBAC06614902AC04ED -:10441C0061F8614900DE28AC04BDD8AC06BDDAE118 -:10442C00FDF40EADDABC06ADD8BC04ABBDD8AC0205 -:10443C00BDDAE1FD0F0FADDABC02ADD8BBEFCAACF3 -:10444C0006BC02AC04BBAC08BDD8AC0ABDDAAC04EB -:10445C00BDDCAC06FD720EAC04BDDCAC06FDE50E9D -:10446C00E1FD0F0FADDABC06ADD8BC04AC0661495A -:10447C0002AC0461F8614900DCC5AC0214AB12104B -:10448C000CC6D7C7C12004FBF8FF8F31FCFD4E0FC3 -:10449C009C034E04DF1CAD7E4680DE07AD80267E7D -:1044AC0012EF40F64680DF07467EDD03E7EF34F778 -:1044BC00EF318C04318EB1128C03318E43DF183006 -:1044CC003822267E0680BB8C045C0391DF05AB048E -:1044DC001800BBAB12EF0C8C034E04DE0532A900A6 -:1044EC00EF01F71006C6D7717BFA3122960CF6460F -:1044FC008CDD07B68C717AFAEF7C712396717AFA9F -:10450C004004F904DF07715307F42CEF69D9CFFB92 -:10451C00F1E7240000DD0F23DD1A23DD1023DD532A -:10452C0023DD2723DD38715307F42CEF4971520733 -:10453C00F42CEF42D42CDF07715207E42CEF0571F9 -:10454C005307F42CC98CFA00EF2CD42CDF0B7152CE -:10455C0007E42CC98CFA00EF1DF5CFFBEF18D42C17 -:10456C00DF0B715307E42CC98CFA00EF09CFCFFB9A -:10457C0002EF03FD8345D7D905FCF1E7240000DDEC -:10458C000923DD2123DD0923EF1B715307F42CD7FD -:10459C00D42CDF07715207E42CEF05715307F42C70 -:1045AC00C98C2D01D7715207E42CD731629301D7F6 -:1045BC00710394D9CDFBF1E7240000DD1223DD1942 -:1045CC0023DD1123DD2623DD3423DD3923DD3FFDFF -:1045DC004346EF3DFD6446EF38D9CCFBC1AE6CFDD4 -:1045EC00282DC0F313BE6C712304EF25F0C1AE6C03 -:1045FC00FD282DC0F313BE6C712304EF14F6BE6CB2 -:10460C00712204EF0CCB6CFF00712304EF03FDD877 -:10461C00464004F905DD064004F901DF0671230468 -:10462C007103943104940FF6BE64BE6A3122040205 -:10463C00EF02F690BE6ED7CD2E47F48EAE6C317D68 -:10464C00BFCAFCFDAD46D2DF0ED9CCFBC1AE6CFDB2 -:10465C00282DC0F313BE6CD7FDAD46D2DD0DCD2E8B -:10466C0047F48EAE6C317DBFCAFCD7E88E0934207E -:10467C005080D6BFC6FC22CAFCBDD8304700FD9A7C -:10468C000DBFC8FC30C6FCFD3E2DF313BE6CB42E22 -:10469C00D42EDF0CCD2E47A48E4A8E1F61C8F48E0B -:1046AC00D740AFFB0BDC05712304F2D740AFFB0600 -:1046BC0061D831229211F0C1AE6CFD282DC0F313DC -:1046CC00BE6C712204EF03FDD846E2D7710294F060 -:1046DC00C1AE6CFD282DC0F313BE6CA48F4A8F4065 -:1046EC00DC37F48FD890F1313F0412FD14D890F1DF -:1046FC00BDD85008FDE90D087208E6D2DD04019220 -:10470C00DFFC896158D1DD05712204EF03712304AC -:10471C00A4904A902061C8F490D7C73026FDC6D724 -:0D472C007180717DFADE035201D75200D773 -:1047390061FC61FCC1C3C5C7520C929269D4FEC128 -:10474900DFF88EFD708EFCC1717AFA4004F903DF3F -:104759000530F1296194C09EFC609EFD34D4FE525F -:1047690006C0B9A5A592DFF9C6C4C2C061FC61DF64 -:10477900520C929269D4FEC1DFF88EFD708EFCC195 -:104789008F4105775C04D1DD06675C01D1DD5031CD -:104799005494367162077153948FB4FB5FBCFBD19B -:1047A900DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE91 -:1047B900FBD1DF098FB7FB5FBFFBD1DD0C3162078E -:1047C90002EFFA716307716B27711396FD1830F4C4 -:1047D900227148500571605005717AFAEDD3486726 -:1047E9005C02D1DD16D422DD124A2202DD0DF4224B -:1047F9007148500571605005717AFA717AFA8D2203 -:10480900318FE7240000DD0823DD1423DD2CEF4A76 -:10481900F4467140500571505005E422EDD3488F9C -:1048290040059D47715050058D479D49D847FDCC9E -:1048390033629D48CD2202EDD348675C02D1DD1772 -:10484900675C10D1DD05CD2203EF0F71485005716A -:10485900605005F422EF73CD22044A2203DF108D44 -:10486900489F4005D848C1D847FD5834C0EF1F8F2D -:10487900400576717447DC054A4702DE06716050CF -:1048890005EF47C7D847FD9930C071505005D84941 -:10489900F1242900DD27240400DD22242200DD1D66 -:1048A900241100DD0C240100DD13241E00DD0EEFB0 -:1048B9000A4A4760DF07CD4761EF02A4474A22034E -:1048C900DF08D847FDCC33629D48C09EFC609EFD41 -:1048D90034D4FE5206C0B9A5A592DFF961FCC1C363 -:1048E900C5C7520C929269D4FEC1DFF88EFD708E55 -:1048F900FCC1717AFA51405F0401D1DD06F616A7B1 -:1049090047DFF2300400BF2401F6BF2A01300B0B48 -:10491900BF2801FD4502300B0FBF2801FD450230BC -:104929000F0FBF2801710AE6F6420C01DD33AF040F -:1049390001BF0C0131529329715293710BE2D84D89 -:10494900FDB7033184BD02EFFACBB422FBD84FF196 -:10495900BEB8714BE1714BE5710ABD8D4E9E44EFB6 -:104969000C715393714AE5717BBD713393C09EFC01 -:10497900609EFD34D4FE5206C0B9A5A592DFF9C6E2 -:10498900C4C2C061FCC1C5717AFAD44CDD0BEA4AD4 -:10499900899E44A64AB44CEF33710AE6300400BF3D -:1049A9002401F6BF2A01300B0BBF280100000000CB -:1049B90000000000510FBF280100000000000000A6 -:1049C90000500FBF2801712393713393C4C061FC58 -:1049D90061EF520C929269D4FEC1DFF88EFD708EA0 -:1049E900FCC12006FBF8FF71503002CEABACCC0401 -:1049F90000F6BB31B2E210617900F6614900DFF3DC -:104A090071603002ED934A8E519C03713BE28C0335 -:104A19005C02D1DD1E8C035C08D1DF0971503002C4 -:104A2900CC0400EFCC8C0570FD3A35629E50CC0465 -:104A390002EFBE8C035C03D1DF408E509C027150A3 -:104A490030028C04D1DF0E8C0270FD8035629C052A -:104A5900CC0401EF328C044C02DF0671603002EFA6 -:104A690029CF34025A716030028C0270C18C0570F2 -:104A7900FDE234C0CF34024AEF108C035C01D1DD72 -:104A89000671603002EF03EDFA491006C09EFC6022 -:104A99009EFD34D4FE5206C0B9A5A592DFF961FC8A -:104AA900C1C3C5C7520C929269D4FEC1DFF88EFD0D -:104AB900708EFCC1710A9E31929E02EFFA8FDEFB65 -:104AC9004F96FFDF198FDFFB4F97FFDF118FE0FB59 -:104AD9004F98FFDF095004C15011FD8634C0710B96 -:104AE9009EC09EFC609EFD34D4FE5206C0B9A5A5A9 -:104AF90092DFF9C6C4C2C061FCE46661FCC1C3C5EA -:104B0900C7520C929269D4FEC1DFF88EFD708EFCFB -:104B1900C1C1FBF8FF8D1F9C018E31318EE7240640 -:104B290000DD0823DD0E23DD22EF38717AFA8C01CE -:104B39009D5EEF2F717AFA4007F901DF068C019D1E -:104B49005DEF2051FF2E019D5DEF18717AFA8C01FE -:104B59009D304004F903DD064004F904DF05306D9A -:104B69002561944031FF09DE05A031FFEF07715837 -:104B7900F000716294710BE3C0C09EFC609EFD342D -:104B8900D4FE5206C0B9A5A592DFF9C6C4C2C06158 -:104B9900FC717BFAC7D46661F83124952771239596 -:104BA900D466DD05B466CEABAC717AFA5600664CB4 -:104BB9000ADD1172F3311C79D8FCCEFC0061CA619F -:104BC900A486EFEA717AFAF2C6D7C7C1C1FBF8FF2A -:104BD900CC01008C014C0ADE36717BFA8C01F03174 -:104BE9007E0410FC14A96168DF09AC02B9717AFA74 -:104BF900F2EF1D8C01F0317E127910FC614902DF60 -:104C090006717AFAE2EF09717AFA615901EFC4E2A1 -:104C19001004C6D7C72004FBF8FFF64210FC61F860 -:104C2900EDFF4C717BFA9C038C034C0ADE3C8C0330 -:104C3900F0317E0410FC14A96168DF05717AFAEF7E -:104C490029717AFA8C0372F3311C7910FCCEFC00BD -:104C590061CA629C02D1DF0A8C03F0317E12E678C8 -:104C690010FC717BFA615903EFBECC0200CC010143 -:104C79008C02F0317E0410FC14A96168DD788C0285 -:104C8900F0317E127910FCE743DF658C014C0ADEB6 -:104C99005F8C01F0317E127910FCE743DD4D717BA9 -:104CA900FA8C01F0317E0410FC14A96168DF1861E7 -:104CB90069018C01F0317E12F67810FC8C024E01EC -:104CC900DCED717AFAEF2F8C01F0317E0410FC14BF -:104CD900A9128C02F0317E337810FC8C01F0317E00 -:104CE90012E67810FC615902717AFA615901EF9B59 -:104CF900615902ED794C00F21004C6D761FF520CDC -:104D0900929269D4FEC1DFF88EFD708EFCC1717A72 -:104D1900FA8FE4FB5C03D1DD114004F903DD0640A1 -:104D290004F904DF053046386194C09EFC609EFD9D -:104D390034D4FE5206C0B9A5A592DFF961FC61FC25 -:044D490061FC61FCAC -:0A4D4E0000060C12181E242A30364D -:104D5800ACFB0000000062FE000000009339CD3576 -:104D68008C22B745052EB42EF344B93A8E089E3CE2 -:104D780028FC36FE20FE02F903F929FC30FE2AFC45 -:104D88002BFC08F926FC6CFF1AFF6EFF6AFF64FF14 -:0A4D980027FC66FF2CFC555555550D -:104DA200FF0000000000983AF82AFF0000004700C8 -:104DB200317503F7332312D714AEF8C716AC0612B7 -:104DC200C5AC0416F643DD078B99A7A5B3EFF5C270 -:024DD200C6D742 -:024FF400323F4A -:0A4FF60031373A31343A333200000B +:1023FC001537629D305009FD153762767163017196 +:10240C001806F94A30F1DC0BE507F9F508F9CD3778 +:10241C0007EF224A3004DE1ACF07F9025008C150E8 +:10242C006CFD6A02C092DF0DD450DF09711006F901 +:10243C00EF03F507F94007F901DF05710A22EF06F2 +:10244C00710B22710302CD20075700674C08DE1078 +:10245C0073090A20614EDC05679D20EF0387EFEBC3 +:10246C004A2007DF09D507F961F8CF07F903C6D76A +:10247C00500AFDAB09304000C15006FD132BC05073 +:10248C0096EDAB09C72006FBF8FFD507F961E8ED1F +:10249C006F25304A57C1503EFD132BC0D2DD07715A +:1024AC0000B2FBED6F257108B2FB17040200C1509E +:1024BC0004C1500CC1506CFD8B021006EA38AA48BE +:1024CC00318D12AA48318E616B08616A08C1500EB9 +:1024DC00FD132BC0F690C1500CFD132BC0CC01008A +:1024EC008C014C04DE2831349302EFFA712293EA0A +:1024FC00388C015010D605C15010C18C01D6044047 +:10250C0000C1506CFD35031006615901EFD250A586 +:10251C00FDAB09EA38AA48318D12AA48318E616B9D +:10252C0008616A08C1500EFD132BC050A5FDAB0904 +:10253C005004C1506CFD6A02C0629C01EA388A4B9F +:10254C004E0161C3048A4A4E0117040200C15004B3 +:10255C00C1500CC1506CFD35031006F6C1503EFD48 +:10256C00132BC01006C6D7C78D3F4B3061F8ED1248 +:10257C00264A4128DE05A441ED1226F4418D309DFA +:10258C003F8D305070D612307351230480001231BD +:10259C00FF318E039D409FAEFBF68D407C804C95A9 +:1025AC00DC1B8D40318F241400EA38BDD8AA44FDC1 +:1025BC005E0D1231FF318E03318F16EF198D4031C4 +:1025CC008F241400EA38BDD8AA46FD5E0D1231FFE7 +:1025DC00318E03318F16EA388A427217F303164490 +:1025EC00000171FE61C836FF001701DE02F61617F6 +:1025FC00BD78C7500CFD132BC0D2DF068D309D3F2C +:10260C00EF047100B2FBF2C6D7C72008FBF8FF40FD +:10261C0007F901DD064007F902DF1C17040600FD6F +:10262C000B2CD2DF0A8C069C058C079C04EF4ECC3D +:10263C000563CC0400EF4617040600FD0B2CD2DD1D +:10264C000F7100B2FB710392CC0500711293EF2D48 +:10265C007108B2FB8C06318E318D080E07081C00F8 +:10266C00BBEA388A4072ABFDB10EBB8C019C05D124 +:10267C00DF08CC0501CC0400EF038B9C0417040687 +:10268C0000FD162CD2DD06CC06C8CC07008C069FAC +:10269C00B1FB8C06318E318D080E07081C00BD3441 +:1026AC00AD344401A5DC08CC0364F6BD42EF48AD63 +:1026BC003426424401A0DC08CC031EF6BD42EF37A1 +:1026CC00AD3444819DDC09CC030AC942F401EF27E7 +:1026DC00AD3444019BDC09CC0305C942F401EF176E +:1026EC00AD34440191DC09CC0300C942F401EF077D +:1026FC00711293C942F4013132040C31249208CC8A +:10270C000564CC0400EF0D8C034E05DE078C039C96 +:10271C0005CC04008C059FAFFB8C049FB0FBFD988F +:10272C002B8D444E05DD2840AFFB0BDE054A440BD8 +:10273C00DE1440AFFB06DE054A4406DE09D5AFFBCE +:10274C00DF0DD444DD095020C15011FD9834C08FE9 +:10275C00AFFB9D44FDD52B1008C6D7C75601D83703 +:10276C00C15002FD482BC04008F901DF10500AFD92 +:10277C00AB09712010055008FDAB09EF055012FD97 +:10278C00AB098D376C0870C15002FD482BC050034B +:10279C00FDAB098D376C1870C15002FD482BC05031 +:1027AC0016FDAB095003FD592B625C01D1DD0F7195 +:1027BC0070B3FB5002C15013FD9834C056006672C2 +:1027CC00C6D7C75004FD592B625C03D1DD405014B1 +:1027DC00FD652834B3FB895C9F998A0C7CFF50FF04 +:1027EC005C14D1DD228A0C7CFF5C147234B7FB893B +:1027FC00616A997162075600316207058666D1DFFE +:10280C00F7716307716B2734C6FB895CEB99500237 +:10281C00FD592BD2DD398D376C1070C15002FD483B +:10282C002BC0E0FDAB09D837C15002FD482BC0507E +:10283C0033FDAB094008F901DF0971281005500A76 +:10284C00FDAB09F0C15002FD482BC07178B3FBE021 +:10285C00C15013FD9834C0C6D7C7C12004FBF8FF84 +:10286C00CC02005004FD592B629C038C045C20D1DB +:10287C00DD0E8C036C019C038C026C209C02EF130C +:10288C008C045C10D1DD0C8C035CFE9C038C026C04 +:10289C00109C028C045C08D1DD0E8C036C029C0332 +:1028AC008C026C089C02EF138C045C04D1DD0C8C44 +:1028BC00035CFD9C038C026C049C028C03D1DD0533 +:1028CC00501AFDAB098C0370C15004FD482BC08F0E +:1028DC00B3FB5C9F728C03318E316D148C03318E83 +:1028EC00314D616D08616C5C606162629FB3FB8FFE +:1028FC00BFFB7CFF50FF5E02D1DD278FBFFB7CFF4F +:10290C005E027234B7FB89616A99716207CC01006F +:10291C00316207086159018C01D1DFF471630771D1 +:10292C006B27F21006C6D7D9A7FBC15006FD482B62 +:10293C00C0D9A8FBC15007FD482BC0D7FD3329F2E5 +:10294C00D7C7711300711B20710303710205E0C11D +:10295C005003FD482BC05013FDAB09F0C15005FDD1 +:10296C00482BC0500FC1E0FD482BC0500AFDAB09ED +:10297C007103055008FDAB09501FC1E0FD482BC089 +:10298C005012FDAB095003FD592B625C01D1DF03E2 +:10299C00E2EF24F0FD592B629D363602F9C7500840 +:1029AC00FD302BC05003C1FD482BC0710203711ABE +:1029BC0020FDF02AF431F2C6D75003FD592B625C8E +:1029CC0001D1DD155014FD6528FDCE275014FDAB4B +:1029DC0009E0C15003FD482BC0711300711B20711D +:1029EC0003035014FDAB09F0C1E0FD482BC0F0C14E +:1029FC005003FD482BC0D7C72004FBF8FFCC0200C6 +:102A0C008D319C035010C150A4FD6A02C0629D31EF +:102A1C00D450DD04F2EDCD2A8C037B315C08D1DD82 +:102A2C000F8D315C08D1DF05CC0210EF03CC0220F6 +:102A3C008C037B315C04D1DD158D315C04D1DF0856 +:102A4C008C026C049C02EF068C026C089C028FB208 +:102A5C00FB5CF3728D315C0C6162629FB2FB8FBECA +:102A6C00FB7CFF50FF5E029C02D1DD1F34B6FB895C +:102A7C006E0299716207CC0100316207086159013D +:102A8C008C01D1DFF4716307716B278D315C40D100 +:102A9C00DD095002C15012FD9834C08D315C01D15A +:102AAC00DD08E0C15012FD9834C0717AFA8D315CAA +:102ABC0041D1DD0C5A31BED831C15010FDD804C003 +:102ACC00F21004C6D7FD6727F2D7FDCE27F2D7C781 +:102ADC008FC6FB7617FD6528664FC6FBDFF2F5C681 +:102AEC00FBF2C6D75064FDAB09FD212C6261FB7172 +:102AFC001192F171149261DC70C15012FDD804C0B6 +:102B0C00FD4636CD5F03D7C7C1C1FBF8FFAC0ABB8E +:102B1C0017C15002C18C0270C1506CFD35031006F8 +:102B2C001004C6D7C7C1FBF8FFAC08C15002C18B5B +:102B3C0070C1506CFD8B021006C0C6D7C788061634 +:102B4C006770C1C75084FDFE021004C6D7C716C7F4 +:102B5C005084FD6A02C0C6D7C74A2004DE04560062 +:102B6C00EF0256014008F901DF048686EF0A40089F +:102B7C00F902DF045104610666318F12504CD633D2 +:102B8C00514CD6610A045420BD38C6D740AFFB3D2A +:102B9C00DC05CF04FC0FD740AFFB1FDC05CF04FCDA +:102BAC000BD740AFFB0BDC05CF04FC07D740AFFBCA +:102BBC000661D831320405CF04FC03D7D5AFFBDD59 +:102BCC0004E504FCD7F504FCD7D504F9DF047173D4 +:102BDC0092D7FD212C6261FB7101937114927107E4 +:102BEC009361C83172921771729271049371119240 +:102BFC00F171049361DC70C15012FDD804C0D7C7C9 +:102C0C0016C75004FD302BC0C6D7C716C75002FDDF +:102C1C00302BC0C6D740AFFB0BDE02E2D7F2D77128 +:102C2C0000010571785005713AD5713BD18F1005B3 +:102C3C005CFC9F1005CF54054AE542057110420516 +:102C4C0071004205714850057130500571205005D6 +:102C5C00CF530505CF52050A71305105712051052E +:102C6C00713BD5717050058F11055CFC9F1105F4FB +:102C7C0022D77178500571080105D7FD4038FD6ADF +:102C8C0004717AFAFDAB23F504F98F06F931051BB3 +:102C9C005003FD592B625C01D161E8CF04F902CFDE +:102CAC00AFFB64710407714192EF10F67104076178 +:102CBC001012F6B1236061FB714192FD6930FD0E7B +:102CCC0043712295712BE7618461A461EDEFF8D714 +:102CDC007140F00071783002713AE6713BE2713B61 +:102CEC00EA713BEE8F10055CFC9F1005CF34024A55 +:102CFC00E552FF711A52710A52714830027130302C +:102D0C000271203002CF330205CF32020A7130310A +:102D1C0002713BE6717030028F11055CFC9F11054E +:102D2C0071603002D7717830027148F000D7C788D3 +:102D3C00061666614FDD0967614EDE0396EF01866C +:102D4C006672C6D7C7161714AA0412A943DD29AA9E +:102D5C000412A923FDE44DC3AC02FDE44D13C2BD26 +:102D6C00D813FD2E0FDE0C1714AA0212AA0403BAF4 +:102D7C0004EF051714A9BA04AC041231FF319E03F9 +:102D8C00317F087208C6D77100F200304400BFB61C +:102D9C0001300188BF9001300984BF9E01BF9C01A6 +:102DAC00BF9A01BF9801BF9601BF9401BF9201F574 +:102DBC003CFF30FE00BFBE01F6BFBC01BFB80150E6 +:102DCC00EEBFBA01A1BFB201C918FE008F06F931DE +:102DDC000507F5CDFBCB6CFF00717393716293D734 +:102DEC0030EF00BFB401F6BFBA017108F2007123D5 +:102DFC0004715307BE6EBE64BE6A7123047153071F +:102E0C00715BD1F453F452716393D78D54B454D194 +:102E1C00DF6931D4D105715BD1E453D453DD2E710C +:102E2C0040B2FBD852F1E734020023DD0625DD0366 +:102E3C0025DF05F6BE66EF06D9CCFBF1BE66A452C3 +:102E4C004A5220DF04F452B453CD5419D7CD541E3A +:102E5C007148B2FBD5CEFBDF04F6BE66D7D9CCFBEE +:102E6C00F14266FFDD15D9CCFBF112AE6643DE05EF +:102E7C00A266FFEF03B266FFCD5403D7C716171433 +:102E8C00F6B9AA0412F6231231FF31AE03316FBA30 +:102E9C0002C6D7C7C1FBF8FF8C085080D612AB1402 +:102EAC0013B9AB14AA0412A92312D927FBF133BD11 +:102EBC00D813FD9A0DBA02C0C6D731049401D7407D +:102ECC0004F902DF10F6BE64BE6EBE6ABF8EFBBF95 +:102EDC0094FBBF9AFB31749314308AFBFD882E301F +:102EEC0090FBFD882E3096FBFD882EEF71311494EB +:102EFC000D7113947108D2FBF456F455EF60D45550 +:102F0C00DF5A8F26FB9D554A561FDC177100D2FBEA +:102F1C004028FBFFDD1CA4578F28FB4B57DE13F416 +:102F2C0056EF0FD856F1A1605C1F9D567108D2FB6D +:102F3C00F457E856092AFB70C1308AFBFD9F2EC05E +:102F4C00E856094AFB70C13090FBFD9F2EC0E85635 +:102F5C00096AFB70C13096FBFD9F2EC0B455308AB8 +:102F6C00FBFD502DF313BE6E3090FBFD502DF31373 +:102F7C00BE6A3096FBFD502DF313BE64D7C736F0F6 +:102F8C000071F4DC297170F000CE9D08CE9EC0CE8D +:102F9C009F80F594FFF593FFF592FFE597FFE5967B +:102FAC00FFE595FFE598FFCE9C7F7100A6FB711B9A +:102FBC00E3712BE3711AE7712BE7717A9D710A9E0D +:102FCC0031929E02EFFA710B9E71239471339471BE +:102FDC004394C6D7C73122941E712294710A9E3134 +:102FEC00929E02EFFA34D4FB3692FF52078B99A5CE +:102FFC00A792DFF9710B9EC6D7C78806163132949B +:10300C0015713294C7349CFB3092FF1652078B9982 +:10301C00A5A792DFF9C6667367189CFBC6D7C77164 +:10302C0023943134941E713394710A9E31929E0212 +:10303C00EFFA3492FF369CFB52078B99A5A792DFCF +:10304C00F9710B9E31449413714394717B9E8FDC08 +:10305C00FB9E9A8FDDFB9E9B717A9EC6D7CFA7FBFA +:10306C005CCFA8FB5FCFC8FB5DCFFCFB36CFFDFB75 +:10307C00C9E5D3FBD7C7CFA4FB12CFA5FB10CFCC90 +:10308C00FBFFF5CDFBF5CEFBF5CFFBF5D0FB5600EA +:10309C00664C64DE08723826FB0086EFF3C6D7C791 +:1030AC0088061617F1E73403002361E3EDD03323D0 +:1030BC0061F8ED9C31B12361E3EDA6312561F8EDAA +:1030CC00B431B1240D0061D8EDD033240B0061F87C +:1030DC00EDD4312361F8ED17322361F8EDE731239C +:1030EC0061F8EDCB3324060061F8ED8032B1256137 +:1030FC00D8ED9C3224000061F8EDA9322361F8ED83 +:10310C00D0332361F8EDA933B12361E3EDCC322345 +:10311C0061F8EDDD322361F8EDEE322361F8EDDD7F +:10312C00322361F8EDFF322361F8ED10332361F89F +:10313C00ED1F332361F8ED41332361F8ED4D33235B +:10314C0061F8ED59332361F8ED61332402002361FA +:10315C00E3EDD03324020061F8ED69332361F8ED1F +:10316C0074332561F8ED7F33B124060061D8EDD0BE +:10317C003324000061F8EDD2332561F8ED8A332455 +:10318C00120061F8EDA4332361F8ED9533EDD233E1 +:10319C0034A6FB89615F99EDDC3330482961946674 +:1031AC00736718A4FBEDDC3340A9FB6ADF1340AA5C +:1031BC00FB68DF0D674C6CDF08304B406194713A53 +:1031CC00D5679FABFBEDDC3367D1DD0C305C3B612D +:1031DC009434C4FB89616F99EDDC33675C02D1DDFB +:1031EC000730D12A6194EF0B675C01D1DD0530D635 +:1031FC002A6194675C3CD1DD0F30DB2A6194675CFB +:10320C003C7266736218A4FBEDDC3367D1DD625C43 +:10321C0001D1DD05300800EF01F6609F01FC675C11 +:10322C0002D1DD03E6EF01F63401FC896168996790 +:10323C005C04D1DD04E6A1EF01F63401FC89616880 +:10324C0099675C08D1DD05302000EF01F63401FCF4 +:10325C0089616899675C10D1DD05301000EF01F6CB +:10326C003401FC89616899675C20D161E871600167 +:10327C00FCEDDC33D446DF08679FCDFBA446EF0D95 +:10328C004A4605DE08E846671813FDA446EDDC3314 +:10329C00675C0F7266736218A4FBEDDC334A4664FC +:1032AC00DE1B4A4601DF0667D161F85701E8466725 +:1032BC001826FBA4464A460561C8711294EDDC330E +:1032CC00675C7F70C117F1243000FD0530C0EDDC68 +:1032DC0033675C3F70C117F1243000FD0530C0ED41 +:1032EC00DC33675C0770C117F1243000FD0530C07A +:1032FC00EDDC33675C1F70C117F1243000FD053025 +:10330C00C0EDDC336770C117F1243000FD0530C00F +:10331C00EDDC33CEABAC710A9E31929E02EFFAD546 +:10332C0092FFDF05710B9EEFED679E99710B9E9FCF +:10333C00DBFBEDDC33714294675C7F9FDCFBEDDCE7 +:10334C0033714294675C3F9FDDFBEDDC33675C3F80 +:10335C009FDEFBEF7B675C1F9FDFFBEF73301C393D +:10336C006194679FE4FBEF6830E9386194679FE5EF +:10337C00FBEF5D3002396194679FE8FBEF52675CAD +:10338C0001D1DD4CFD0E43EF474A58C8DE42E858E8 +:10339C0067185AFAA458EF38679D58EF33675C01E9 +:1033AC00D1DD05711202EF03711302675C02D1DDEE +:1033BC0005712202EF03712302679FD3FBEF1167A4 +:1033CC00318EEF0CEF0A664C5BDE05736718A4FBBD +:1033DC00C6D7C716664C30DC094C37DE05FDE02F2E +:1033EC00EF6B664C02DF1F8FA6FB5C03728F03FC36 +:1033FC005C03318E316D08616A08128F03FC5C80AE +:10340C00312A6162EF56664C3DDF08AE90BD5AF82A +:10341C005AEF49664C3EDF04F85BEF40664C4FDFD9 +:10342C0005FD3643EF36664C61DF08E858095AFA59 +:10343C0072EF29664C7FDF05FDD23BEF1F664C4EC9 +:10344C00DF0B310496045210EF12F2EF0F664C5B57 +:10345C00DC0452FFEF06667309A4FB72C6D7C7885B +:10346C00061617F1241000240500DC07244C00DD9F +:10347C0017EF17717BFA17F104A4FB1489617F997C +:10348C00717AFA715294EF02A458C6D7C7C1C1FB26 +:10349C00F8FF4004F903DD064004F904DF38717BC2 +:1034AC00FA8C027309ACFB5E0AD1DF278C02318ED9 +:1034BC0004A4FB14896E0A99716207717AFACC0123 +:1034CC0000316207086159018C01D1DFF471630787 +:1034DC00716B27717AFA1004C6D7CF03FC03F50180 +:1034EC00FCF505FCF507FCD7C788061617F1E73481 +:1034FC00020025DD3D23DD1725DD1C23DD0523DD45 +:10350C002BEF3B710295679F06FCCD5F03EF2F6796 +:10351C005C839F03FCEF27675C039F05FC675C03E0 +:10352C004C0261F8712296FD2445EF12679F07FC4F +:10353C00EF0C6791DF08E0C15012FD9834C0C6D77C +:10354C00C71617F1E7240000DD2A23DD1E24030033 +:10355C00DD0724FB00DD24EF253132960530800099 +:10356C00EF01F6086F04FC7208EF198F01FCF501EE +:10357C00FC72EF107152955235EF09F2EF0666733B +:10358C000900FC72C6D7C71617F1E7240000DD3816 +:10359C00241000DD1C23DD1C23DD30240E00DD187F +:1035AC00241100DD1B240F00DD12243000DD15EF8B +:1035BC001EE2EF1D5202EF195204EF155206EF11E5 +:1035CC005205EF0D5207EF09F2EF065203EF0252CC +:1035DC00FFC6D7C7316494377163948D5E9FACFB83 +:1035EC008D5D9FCBFB36D2FCC7D85DFD4637618A1B +:1035FC0070618AFD8B37C0D862F1312F609D618D6F +:10360C005C4B61DD0A7172948D619D5CCD5F034AE8 +:10361C005F05DE083050366194CD5F6BB45F71503E +:10362C00F000CE300BCF170006CE3106FD450271EF +:10363C007A30710BE3710BE7C6D78D619D5C8D61A0 +:10364C009FADFBD74004F903DF064004F904DF0209 +:10365C00F2D73174940C7173947113958D619D63D1 +:10366C00EF313104951F710395711295D506FCDF6E +:10367C0004F464EF0A8F06FC5002D6A1609D648DA1 +:10368C00649D63EF0E311495068D649D63EF048D7C +:10369C00619D638D639FADFBD863FDB836E863090C +:1036AC001C2270C15013FDD804C0F2D7C7C1C1FB96 +:1036BC00F8FF8C02D1DF05F506FCEF1A8C024C05E5 +:1036CC00DE06CF06FC02EF0E8C02318E1231FE03A9 +:1036DC00311F609F06FC8D654F06FCDD28CC011F59 +:1036EC008F06FC9D65CC00008B4C08DE148B730997 +:1036FC0012204F06FCDC058B9C01EF05615900EF95 +:10370C00E78C019D601004C6D7C716710AE7710BD0 +:10371C00E37150F000CE300BCF170006669E31FDE2 +:10372C004502717A30710BE33182E302EFFA8D1F9F +:10373C007158F000710BE772C6D7C7C1C1FBF8FF17 +:10374C008FFCFB4E02DC03F2EF318C024FFDFBDCF5 +:10375C000452FFEF268C022FFCFB706131318D126D +:10376C008FFDFB2FFCFB70613133BDD813FDBC0DFD +:10377C00BB440001DC03F690BB8B721004C6D7C7A8 +:10378C00C1FBF8FFAC0814A91489708B6128706117 +:10379C0031FDE44D1344030071FEDC23AC08148AA4 +:1037AC0004819A04AC08148A044C11DC10A9148B03 +:1037BC0099AC0814CA0200AC0814CA0310EF72AC1E +:1037CC000814CA0400AC0814A914894DDE0AAC080C +:1037DC00148A02819A02EF12AC0814A914894D6163 +:1037EC00D308AC08148A02919A02AC08148A03918B +:1037FC009A03D1DF3CAC08148A024C10DF10A914D8 +:10380C0089318EA112AC0814A9146299EF17AC0877 +:10381C00148A024CF0DF0EA91489318EB112AC0857 +:10382C0014A9146299AC0814CA0200AC0814CA0397 +:10383C0010C0C6D7ED4338C75600664C0ADE0BF0F5 +:10384C00317E12F67810FC86EFF0C6D7C7200CFB41 +:10385C00F8FF17040600C15006C150A8C15030FD36 +:10386C008B021006D2DD1B4A6804DE05A468E2EF69 +:10387C006834E4FB895CFC99FD1C397110B2FBF2D5 +:10388C00EF57717BFA300600C117040600C130E90E +:10389C00FBFDEC4D1004717AFAF4688FE4FB5C01CB +:1038AC00D1DD264004F903DF205010C180FD98348F +:1038BC00C0C736100571D4C6DE0F17C15006C150F3 +:1038CC00A8C15030FD8B0210064004F903DD064000 +:1038DC0004F90461F8FD5040F2100CC6D7D9E5FB91 +:1038EC00C15030FD6A02C0629FE8FB5008C1501104 +:1038FC00FD9834C0F2D7D9E8FBC1D9E7FBC15030F1 +:10390C00FDFE0210045008C15011FD9834C0F2D7CE +:10391C00C7200CFBF8FFCC09004007F901DF05CCF0 +:10392C000A02EF03CC0A10CC0B808FE4FB5C039CE7 +:10393C0007D1DF08717AD5CC0807EF06717BD5CC9F +:10394C00082F17040800C15004C150A0C15030FD0D +:10395C0035031006624C02DF077110B2FBF2EF3533 +:10396C007118B2FBF468C736100571D4C6DE164068 +:10397C0004F903DF1017A1C15006C150A8C1503083 +:10398C00FD8B021006717BFA8FE4FB5C034E07DDA6 +:10399C0003E2EF01F2100CC6D7D504F9DF03F6BD34 +:1039AC006A4004F901DD0AD474DD03B474D7CD7414 +:1039BC00038F04F9318FE723DD0B2402002403006D +:1039CC0061C8EDCA3A8F06F931233E301B00466AB6 +:1039DC00DF0AE0C15010FD9834C0EF1D307701466E +:1039EC006ADF165002C15010FD9834C0F64670DFE5 +:1039FC00088FC8FB5010D6BD70F64670DD36B67019 +:103A0C004670DF30711293EF2B301B00466ADF13C8 +:103A1C00F64672DF18E0C15010FD9834C0C97253DD +:103A2C0007EF0A307701466A61F8711293F6467215 +:103A3C0061E8B67231549608714395F6BD6AEF147D +:103A4C0031449505F6BD6AEF0BA66AF6466A61F835 +:103A5C00C96AFFFF316296194A6C05DE16A46C4ADE +:103A6C006C05DF0FA46C5004C15010FD9834C0EFEE +:103A7C0002F46C316496194A6E05DE16A46E4A6E19 +:103A8C0005DF0FA46E5008C15010FD9834C0EF0232 +:103A9C00F46ED46FDD03B46FD7317296174A6D058F +:103AAC00DE14A46D4A6D05DF0DA46D5010C1FD9898 +:103ABC0034C0EF02F46D4A6D0661F8CD6F25D7C79F +:103ACC0036100571D4DE0E8FB2FB5C02D1DF0630EE +:103ADC0058386194D24004F903DF1C3122070530B9 +:103AEC00032A61943154950C7153955080C1501236 +:103AFC00FD9834C0FD083BFD2E3BC6D78F03FC5C04 +:103B0C0001D1DD1DD477DD03B477D7CD77098D6076 +:103B1C004B76DD0D8D609D765040C15012FD983472 +:103B2C00C0D74004F903DD04F6BD1AD7D5D0FBDFAE +:103B3C0008F6461ADD19B61AD7D9CCFBF1461ADDB0 +:103B4C000ED9CCFB12AD1A43DE03A61AD7B61AD780 +:103B5C00717BFAC78FC4FB76F5C4FB717AFA5C10E3 +:103B6C00D161E8716295665C0FD1DD57665C01D15D +:103B7C00DD05F504F9EF4C665C02D1DD11E0C150B6 +:103B8C0003FD482BC0711300711B20710303665C8D +:103B9C0004D1DD11711300711B20D503FC61F87188 +:103BAC000303FDE634665C08D161E871030350053C +:103BBC00FDAB097102035003C1FD482BC0711A20E3 +:103BCC00FDF02AF2C6D7C756FF4A461461C8EDCBA2 +:103BDC003C8F06F9311505300400EF0F8F06F931D3 +:103BEC004505300500EF04D907F9F1609F28FC8DDD +:103BFC00789F29FC713492E661301271049261DC79 +:103C0C0031196162629F2AFCE52BFC3114020530EC +:103C1C008000EF01F6C131449605304000EF01F60B +:103C2C00C2616B08616A08C131340405302000EFB1 +:103C3C0001F6C2616B08616A08C1312402053008C3 +:103C4C0000EF01F6C2616B08616A08C13174960518 +:103C5C00300400EF01F6C2616B08616A08C131647F +:103C6C009604E6A1EF01F6C2616B08616A08C131E6 +:103C7C00549603E6EF01F6C2616B08616A9F2CFC57 +:103C8C008F06F9312503E6EF01F6C18F06F93135C0 +:103C9C0004E6A1EF01F6C2616B08616A9F2DFCF18D +:103CAC0071240461DC9F26FCF171540761DC9F27B1 +:103CBC00FCD846F10104ECFC14A9148976A44666E0 +:103CCC0072C6D7C7FDCF088F04F9318FE7240000E7 +:103CDC0061F8EDA93E23DD1B2361F8EDB33D2361B3 +:103CEC00F8ED2F3E2361F8ED783E2361F8ED4C3F63 +:103CFC00EDA63EF6BD707113934005F901DF2C3132 +:103D0C0034961B466ADD04F424EF02A4244A24658D +:103D1C00DC0FF6BD6AF504F9712295EDCE3FFDABD3 +:103D2C0023AD6A440A0061D8EDCE3F714295FD6A1D +:103D3C0004716392FDAB234007F903DF09712295EF +:103D4C00F504F9EDCE3FFD152640B1FB9BDE097164 +:103D5C002295F504F9EDCE3F714A2771401105719A +:103D6C00301105713A22715A2271501105FD4D29FD +:103D7C00D2DD09712295F504F9EDCE3F71103500B5 +:103D8C00CF37001D714012054005F901DD064005D5 +:103D9C00F903DF05F5CDFBEF04CFCDFB03CF04F921 +:103DAC0002FD3329EDCE3FFD2B2CFDDC2C714A9D01 +:103DBC00FDE634FD8130F537FF712BE0F505F97127 +:103DCC002295CBE43FEFCBE6F6F0FD6A04713BD4D1 +:103DDC007112027123028F06F93105285004FD5926 +:103DEC002B625C03318E315D34B3FB896168995071 +:103DFC0002FD592BD2DD067170B3FBEF047178B361 +:103E0C00FBFDAB23FD932D710806F9CF04F9038F4D +:103E1C00A6FB5C02D1DD095080C15010FD9834C066 +:103E2C00EDCE3FFDD03F3164952FA47AD47ADD08D6 +:103E3C0031A4E00A31020C06712BE0FD3C4031A4A8 +:103E4C00E01731040C13712BE05027C15005FD48CD +:103E5C002BC0CF04F904712295FD31408F06F93146 +:103E6C00250731349603F504F9EDCE3FFDD03F31F3 +:103E7C00020C14F0C15005FD482BC05005FDAB09D8 +:103E8C00FD3C40CF04F903FD31408F06F931250785 +:103E9C0031349603F504F9EDCE3FF504F9CFCDFBA3 +:103EAC0003F5CEFBF5D0FB717293F6426CFF61E823 +:103EBC00EDCE3FF6BD70711393F5E4FBFD1C39712B +:103ECC007AFAFDEC2DFD7E2CFD312D714B9D71137D +:103EDC000271230231349302EFFACE3708CBE4BFE0 +:103EEC00FFCBE6FFF3CED4FFF5B4FBF5B5FBF5B68F +:103EFC00FBF5B7FBCF37000971481205F6BEE0BEE3 +:103F0C00E2BED0716A27FDC529714307714B277139 +:103F1C00481005714811057138100571381105717B +:103F2C003302713B22715302715B2271581005717F +:103F3C00581105CF04F905714295F6BD6AFD980933 +:103F4C00F505F9F42431349604D432DD20E505F975 +:103F5C00E504F98F06F9312569F5F8FBF5F6FB5008 +:103F6C002EFDAB09CF05F903E504F9EF55FDBE04B1 +:103F7C00FD3E23717301713204714302710392711E +:103F8C00629231949E02EFFA712AE7CEA409F5F3FE +:103F9C00003104070261FDCFF30080F466FDCF0809 +:103FAC00CEA40831329606CF04F905EF097143957A +:103FBC00E505F9E504F9712BE78F06F9312503F5D1 +:103FCC0004F9C6D7D47BDF19310200585003FD59D0 +:103FDC002B625C01D1DF07F504F9712295D7E47BE4 +:103FEC00D74A7BF0DF073104003AF47BD74A7BC811 +:103FFC00DF0AF504F9712295CD7BF0D73102000868 +:10400C004A7BFFDD1FA47BD7F0C15004FD482BC0B9 +:10401C008FB3FB5C9F9FB3FB7110C4FB305C3B61A7 +:10402C0094CD7BF0D731149306F504F9712295D712 +:10403C00716395F47A717207FD4502717307D7FDB0 +:10404C001E05F2D7717BFAC7200CFBF8FF8FEAFB39 +:10405C00F0F9E9FBF303FDE44D13BC048FECFBF02A +:10406C00F9EBFBF303FDE44D13BC028FEEFBF0F90F +:10407C00EDFBF303FDE44D13BB717AFAAC04BDD830 +:10408C00F6BDDAAC04311EBDDCF6BDDEFD6F0DAD48 +:10409C00D8BDDCADDABDDEAC02BDD8F6BDDAAC0203 +:1040AC00311EDADCC3DADEC3BDDCF6BDDEFD6F0D1E +:1040BC00C0BDDEC0BDDCADDEFDE50EADD8BDDCADFA +:1040CC00DABDDEABBDD8F6BDDAAB311EDADCC3DA55 +:1040DC00DEC3BDDCF6BDDEFD6F0DC0BDDEC0BDDCDC +:1040EC00ADDEFDE50EDADAADD8FD1F44C3C58D8813 +:1040FC005C3FF0317E0440FC14C2C0B9A488F6BC0D +:10410C0008BC0A9C078C074C2EDD3D8D880E077071 +:10411C00F161DC605C3FF0317E127940FCBDD8F679 +:10412C00BDDA8C0773095C22318FBDDC70BDDEFDFE +:10413C006F0DAC08BDDCAC0AFDE50EADDABC0AAD0A +:10414C00D8BC08615907EFBDAC08BDD8AC0ABDDAC4 +:10415C00C9DC0004F6FD390EC9DCFFFFF6FD3A0F91 +:10416C00ADD8BD82AF3AFC4682DD11AF3CFCBF3E00 +:10417C00FCAF3AFCBF3CFCAD82BF3AFCAF3CFC420E +:10418C003EFCDC46AF3AFC423CFCDE3EAD26423AFD +:10419C00FCDE374A2A16DC1A4A2AA0DE138D844B21 +:1041AC002ADE0DAF3AFC268644691061C8FD084230 +:1041BC00F42AAF3AFC445146DC0AAF3AFC241027EF +:1041CC00BD28EF0DC928F82AEF074A2AFF61E8A499 +:1041DC002AAF3EFC423CFCDC18AF3CFC423AFCDE15 +:1041EC0010AF3AFC4628DE09F484AF3AFCBD86EFEA +:1041FC00074A84FF61E8A484100CC6D7717BFAC708 +:10420C00710A9E31929E02EFFA8E949F34FC8E9628 +:10421C009F35FC8E979F36FC8E989F37FC8E939F14 +:10422C0038FC8E929F39FC710B9E717AFA8F37FC99 +:10423C00FD4E0F76FD9D4313BD80D5EFFBDF0AD5F8 +:10424C00F0FBDF05D5F1FBDD25F6B14680DF11C9AA +:10425C00803722665C0391DF060A80181A8100966B +:10426C0017FDC04413FDE04231049602EF61520683 +:10427C0092926934FC682EFCDFF6AD80BD7EF87C32 +:10428C00F3311C790AF944FEFFDD44D87CF10104BA +:10429C000AF914A944FFFFDF04E6B9EF0BD87CF14F +:1042AC0001040AF914A9A1B9717BFAA0EFFBD5EFAF +:1042BC00FBDF1CA0F0FBD5F0FBDF14A0F1FBD5F16C +:1042CC00FBDF0CCFEFFBFFCFF0FBFFCFF1FBFFC60B +:1042DC00717AFAD7C716D87CF10744A800DC0571AF +:1042EC000296EF1CF647DD18A47C4A7CA8DC05710D +:1042FC000296EF0CF87CF3311CF6780AF9B7EFE470 +:10430C00C6D7C756A89666F0317E12F6B1780AF970 +:10431C0066D1DFF1717BFAF5EFFBF5F0FBF5F1FB04 +:10432C00F47C710396C6717AFAD7C72004FBF8FFA8 +:10433C00D446DF168D7C9D89717BFA520692926968 +:10434C002EFC68C0FCDFF6717AFA4A4606DE0EE8EF +:10435C004609C0FC9C03A4468C0372EF30F889F329 +:10436C00311C790AF9BB311296058B9C03EF0F8C2B +:10437C00019C03D489DF05CD89A7EF02B489718034 +:10438C0071179661DC61FB7111968C03721004C677 +:10439C00D7C72008FBF8FF8F37FCFD4E0F9C078F0B +:1043AC0036FCFD4E0F9C068F35FCFD4E0F9C058F89 +:1043BC0034FCFD4E0F9C048F38FC9C038F39FC9C05 +:1043CC00028C06318E0112791A20BB8C075C03D14A +:1043DC00DF098C064C0361C86179008C05318EB104 +:1043EC00610900BB313D120103BB8B0E04708C01C3 +:1043FC001C00BB8FF4FB4E03DC0E8C034FF4FBDC78 +:10440C000B8C024FF5FBDC04AB12EF03ABB11210BB +:10441C0008C6D7C7C3C12008FBF8FFF661490A617B +:10442C00F8614908DF07F7340000EDBC44E6BC0432 +:10443C00F6BC06AC0ABC02AC08BBAC06614902ACCB +:10444C000461F8614900DE28AC04BDD8AC06BDDAC5 +:10445C00E1FDF40EADDABC06ADD8BC04ABBDD8ACF6 +:10446C0002BDDAE1FD0F0FADDABC02ADD8BBEFCA6D +:10447C00AC06BC02AC04BBAC08BDD8AC0ABDDAAC13 +:10448C0004BDDCAC06FD720EAC04BDDCAC06FDE577 +:10449C000EE1FD0F0FADDABC06ADD8BC04AC066165 +:1044AC004902AC0461F8614900DCC5AC0214AB12E2 +:1044BC00100CC6D7C7C12004FBF8FF8F31FCFD4E92 +:1044CC000F9C034E04DF1CAD7E4680DE07AD8026BC +:1044DC007E12EF40F64680DF07467EDD03E7EF34C1 +:1044EC00F7EF318C04318EB1128C03318E43DF180F +:1044FC00303822267E0680BB8C045C0391DF05AB32 +:10450C00041800BBAB12EF0C8C034E04DE0532A971 +:10451C0000EF01F71006C6D7717BFA3122960CF624 +:10452C00468CDD07B68C717AFAEF7C712396717A22 +:10453C00FA4004F904DF07715307F42CEF69D9CF63 +:10454C00FBF1E7240000DD0F23DD1A23DD1023DD52 +:10455C005323DD2723DD38715307F42CEF497152B7 +:10456C0007F42CEF42D42CDF07715207E42CEF0533 +:10457C00715307F42CC98CFA00EF2CD42CDF0B717F +:10458C005207E42CC98CFA00EF1DF5CFFBEF18D4C1 +:10459C002CDF0B715307E42CC98CFA00EF09CFCF39 +:1045AC00FB02EF03FDB445D7D905FCF1E72400006D +:1045BC00DD0923DD2123DD0923EF1B715307F42CC7 +:1045CC00D7D42CDF07715207E42CEF05715307F495 +:1045DC002CC98C2D01D7715207E42CD73162930171 +:1045EC00D7710394D9CDFBF1E7240000DD1223DD54 +:1045FC001923DD1123DD2623DD3423DD3923DD3FB3 +:10460C00FD7446EF3DFD9546EF38D9CCFBC1AE6C41 +:10461C00FD3A2DC0F313BE6C712304EF25F0C1AE2F +:10462C006CFD3A2DC0F313BE6C712304EF14F6BE6F +:10463C006C712204EF0CCB6CFF00712304EF03FDB3 +:10464C0009474004F905DD064004F901DF06712332 +:10465C00047103943104940FF6BE64BE6A312204D3 +:10466C0002EF02F690BE6ED7CD2E47F48EAE6C31B3 +:10467C007DBFCAFCFDDE46D2DF0ED9CCFBC1AE6CD1 +:10468C00FD3A2DC0F313BE6CD7FDDE46D2DD0DCD49 +:10469C002E47F48EAE6C317DBFCAFCD7E88E093440 +:1046AC00205080D6BFC6FC22CAFCBDD8304700FDC6 +:1046BC009A0DBFC8FC30C6FCFD502DF313BE6CB474 +:1046CC002ED42EDF0CCD2E47A48E4A8E1F61C8F43B +:1046DC008ED740AFFB0BDC05712304F2D740AFFB48 +:1046EC000661D831229211F0C1AE6CFD3A2DC0F3A7 +:1046FC0013BE6C712204EF03FD0947E2D7710294DB +:10470C00F0C1AE6CFD3A2DC0F313BE6CA48F4A8F72 +:10471C0040DC37F48FD890F1313F0414FD14D8905D +:10472C00F1BDD85008FDE90D087208E6D2DD040190 +:10473C0092DFFC896158D1DD05712204EF037123EE +:10474C0004A4904A902061C8F490D7C73028FDC6C5 +:0E475C00D77180717DFADE035201D75200D76B +:10476A0061FC61FCC1C3C5C7520C929269D4FEC1F7 +:10477A00DFF88EFD708EFCC1717AFA4004F903DF0E +:10478A000530032A6194C09EFC609EFD34D4FE521B +:10479A0006C0B9A5A592DFF9C6C4C2C061FC61DF33 +:1047AA00520C929269D4FEC1DFF88EFD708EFCC164 +:1047BA008F4105775C04D1DD06675C01D1DD50319C +:1047CA005494367162077153948FB4FB5FBCFBD16A +:1047DA00DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE60 +:1047EA00FBD1DF098FB7FB5FBFFBD1DD0C3162075D +:1047FA0002EFFA716307716B27711396FD2A30F481 +:10480A00227148500571605005717AFAED044967C2 +:10481A005C02D1DD16D422DD124A2202DD0DF42219 +:10482A007148500571605005717AFA717AFA8D22D1 +:10483A00318FE7240000DD0823DD1423DD2CEF4A45 +:10484A00F4467140500571505005E422ED04498F39 +:10485A0040059D47715050058D479D49D847FDDE5B +:10486A0033629D48CD2202ED0449675C02D1DD170F +:10487A00675C10D1DD05CD2203EF0F714850057139 +:10488A00605005F422EF73CD22044A2203DF108D13 +:10489A00489F4005D848C1D847FD6A34C0EF1F8FEA +:1048AA00400576717447DC054A4702DE067160509E +:1048BA0005EF47C7D847FDAB30C071505005D849FE +:1048CA00F1242900DD27240400DD22242200DD1D35 +:1048DA00241100DD0C240100DD13241E00DD0EEF7F +:1048EA000A4A4760DF07CD4761EF02A4474A22031D +:1048FA00DF08D847FDDE33629D48C09EFC609EFDFE +:10490A0034D4FE5206C0B9A5A592DFF961FCC1C331 +:10491A00C5C7520C929269D4FEC1DFF88EFD708E23 +:10492A00FCC1717AFA51405F0401D1DD06F616A77F +:10493A0047DFF2300400BF2401F6BF2A01300B0B17 +:10494A00BF2801FD4502300B0FBF2801FD4502308B +:10495A000F0FBF2801710AE6F6420C01DD33AF04DE +:10496A0001BF0C0131529329715293710BE2D84D58 +:10497A00FDB7033184BD02EFFACBB422FBD84FF165 +:10498A00BEB8714BE1714BE5710ABD8D4E9E44EF85 +:10499A000C715393714AE5717BBD713393C09EFCD0 +:1049AA00609EFD34D4FE5206C0B9A5A592DFF9C6B1 +:1049BA00C4C2C061FCC1C5717AFAD44CDD0BEA4AA3 +:1049CA00899E44A64AB44CEF33710AE6300400BF0C +:1049DA002401F6BF2A01300B0BBF2801000000009A +:1049EA0000000000510FBF28010000000000000075 +:1049FA0000500FBF2801712393713393C4C061FC27 +:104A0A0061EF520C929269D4FEC1DFF88EFD708E6E +:104A1A00FCC12006FBF8FF71503002CEABACCC04CF +:104A2A0000F6BB31B2E210617900F6614900DFF3AA +:104A3A0071603002EDC44A8E519C03713BE28C03D3 +:104A4A005C02D1DD1E8C035C08D1DF097150300293 +:104A5A00CC0400EFCC8C0570FD4C35629E50CC0422 +:104A6A0002EFBE8C035C03D1DF408E509C02715072 +:104A7A0030028C04D1DF0E8C0270FD9235629C05E7 +:104A8A00CC0401EF328C044C02DF0671603002EF75 +:104A9A0029CF34025A716030028C0270C18C0570C1 +:104AAA00FDF434C0CF34024AEF108C035C01D1DD2F +:104ABA000671603002EF03ED2B4A1006C09EFC60BF +:104ACA009EFD34D4FE5206C0B9A5A592DFF961FC59 +:104ADA00C1C3C5C7520C929269D4FEC1DFF88EFDDC +:104AEA00708EFCC1710A9E31929E02EFFA8FDEFB34 +:104AFA004F96FFDF198FDFFB4F97FFDF118FE0FB28 +:104B0A004F98FFDF095004C15011FD9834C0710B52 +:104B1A009EC09EFC609EFD34D4FE5206C0B9A5A577 +:104B2A0092DFF9C6C4C2C061FCE46661FCC1C3C5B8 +:104B3A00C7520C929269D4FEC1DFF88EFD708EFCCA +:104B4A00C1C1FBF8FF8D1F9C018E31318EE724060F +:104B5A0000DD0823DD0E23DD22EF38717AFA8C019D +:104B6A009D5EEF2F717AFA4007F901DF068C019DED +:104B7A005DEF2051FF2E019D5DEF18717AFA8C01CD +:104B8A009D304004F903DD064004F904DF05307363 +:104B9A002561944031FF09DE05A031FFEF07715806 +:104BAA00F000716294710BE3C0C09EFC609EFD34FC +:104BBA00D4FE5206C0B9A5A592DFF9C6C4C2C06127 +:104BCA00FC717BFAC7D46661F83124952771239565 +:104BDA00D466DD05B466CEABAC717AFA5600664C83 +:104BEA000ADD1172F3311C79D8FCCEFC0061CA616E +:104BFA00A486EFEA717AFAF2C6D7C7C1C1FBF8FFF9 +:104C0A00CC01008C014C0ADE36717BFA8C01F03142 +:104C1A007E0410FC14A96168DF09AC02B9717AFA42 +:104C2A00F2EF1D8C01F0317E127910FC614902DF2E +:104C3A0006717AFAE2EF09717AFA615901EFC4E270 +:104C4A001004C6D7C72004FBF8FFF64210FC61F82F +:104C5A00ED304D717BFA9C038C034C0ADE3C8C03CD +:104C6A00F0317E0410FC14A96168DF05717AFAEF4D +:104C7A0029717AFA8C0372F3311C7910FCCEFC008C +:104C8A0061CA629C02D1DF0A8C03F0317E12E67897 +:104C9A0010FC717BFA615903EFBECC0200CC010112 +:104CAA008C02F0317E0410FC14A96168DD788C0254 +:104CBA00F0317E127910FCE743DF658C014C0ADE85 +:104CCA005F8C01F0317E127910FCE743DD4D717B78 +:104CDA00FA8C01F0317E0410FC14A96168DF1861B6 +:104CEA0069018C01F0317E12F67810FC8C024E01BB +:104CFA00DCED717AFAEF2F8C01F0317E0410FC148E +:104D0A00A9128C02F0317E337810FC8C01F0317ECE +:104D1A0012E67810FC615902717AFA615901EF9B27 +:104D2A00615902EDAA4C00F21004C6D761FF520C79 +:104D3A00929269D4FEC1DFF88EFD708EFCC1717A41 +:104D4A00FA8FE4FB5C03D1DD114004F903DD064070 +:104D5A0004F904DF053058386194C09EFC609EFD5A +:104D6A0034D4FE5206C0B9A5A592DFF961FC61FCF4 +:044D7A0061FC61FC7B +:0A4D7E0000060C12181E242A30361D +:104D8800ACFB0000000062FE00000000A539DF3522 +:104D98008C22E845172EC62E2445CB3A8E08CF3CE8 +:104DA80028FC36FE20FE02F903F929FC30FE2AFC15 +:104DB8002BFC08F926FC6CFF1AFF6EFF6AFF64FFE4 +:0C4DC80027FC66FF2CFC2DFC55555555B2 +:104DD400FF0000000000983AF82AFF000000470096 +:104DE400317503F7332312D714AEF8C716AC061285 +:104DF400C5AC0416F643DD078B99A7A5B3EFF5C23E +:024E0400C6D70F +:024FF400324049 +:0A4FF60031303A31383A3337000009 :00000001FF  \ No newline at end of file diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index 4e46c24..55d8846 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 30feb62..8d57672 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.33 Date: 8 Sep 2011 Page: 1 +78K0R Linker W1.33 Date:16 Sep 2011 Page: 1 Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C @@ -26,8 +26,8 @@ Direc-file:bsr_mcu.dr *** Link information *** 72 output segment(s) - 3CB1H byte(s) real data - 6072 symbol(s) defined + 3CE4H byte(s) real data + 6076 symbol(s) defined *** Memory map *** @@ -250,288 +250,287 @@ Direc-file:bsr_mcu.dr 0228CH 00000H @@CNST util_funcs 0228CH 00000H - ROM_CODE 0228CH 024ADH CSEG - ROM_CODE pm 0228CH 0098DH - ROM_CODE i2c_ctr 02C19H 0005CH - ROM_CODE main 02C75H 00055H - ROM_CODE i2c_twl 02CCAH 0005EH - ROM_CODE led 02D28H 0024FH - ROM_CODE rtc 02F77H 000E0H - ROM_CODE vreg_ctr 03057H 0047DH - ROM_CODE vreg_twl 034D4H 000F9H - ROM_CODE adc 035CDH 00261H - ROM_CODE renge 0382EH 00018H - ROM_CODE accero 03846H 0014DH - ROM_CODE sw 03993H 00126H + ROM_CODE 0228CH 024DEH CSEG + ROM_CODE pm 0228CH 0099FH + ROM_CODE i2c_ctr 02C2BH 0005CH + ROM_CODE main 02C87H 00055H + ROM_CODE i2c_twl 02CDCH 0005EH + ROM_CODE led 02D3AH 0024FH + ROM_CODE rtc 02F89H 000E0H + ROM_CODE vreg_ctr 03069H 0047DH + ROM_CODE vreg_twl 034E6H 000F9H + ROM_CODE adc 035DFH 00261H + ROM_CODE renge 03840H 00018H + ROM_CODE accero 03858H 0014DH + ROM_CODE sw 039A5H 00126H ROM_CODE task_misc - 03AB9H 001E5H - ROM_CODE task_sys 03C9EH 00381H + 03ACBH 00204H + ROM_CODE task_sys 03CCFH 00381H ROM_CODE pedo_alg_thre_det2 - 0401FH 004D4H - ROM_CODE led_cam 044F3H 000C4H - ROM_CODE led_pow 045B7H 0016FH - ROM_CODE voltable 04726H 00000H + 04050H 004D4H + ROM_CODE led_cam 04524H 000C4H + ROM_CODE led_pow 045E8H 0016FH + ROM_CODE voltable 04757H 00000H ROM_CODE pedo_lpf_coeff - 04726H 00000H + 04757H 00000H ROM_CODE kanaria_c - 04726H 00006H - ROM_CODE get_ei 0472CH 0000DH - @@BASE 04739H 00614H CSEG BASE - @@BASE loader 04739H 00000H - @@BASE pm 04739H 0003EH - @@BASE i2c_ctr 04777H 00170H - @@BASE main 048E7H 00000H - @@BASE magic 048E7H 00000H - @@BASE WDT 048E7H 00000H - @@BASE i2c_mcu 048E7H 000F2H - @@BASE i2c_twl 049D9H 000D0H - @@BASE led 04AA9H 00000H - @@BASE rtc 04AA9H 0005DH - @@BASE vreg_ctr 04B06H 00000H - @@BASE vreg_twl 04B06H 00000H - @@BASE adc 04B06H 00094H - @@BASE renge 04B9AH 0016BH - @@BASE accero 04D05H 00042H + 04757H 00006H + ROM_CODE get_ei 0475DH 0000DH + @@BASE 0476AH 00614H CSEG BASE + @@BASE loader 0476AH 00000H + @@BASE pm 0476AH 0003EH + @@BASE i2c_ctr 047A8H 00170H + @@BASE main 04918H 00000H + @@BASE magic 04918H 00000H + @@BASE WDT 04918H 00000H + @@BASE i2c_mcu 04918H 000F2H + @@BASE i2c_twl 04A0AH 000D0H + @@BASE led 04ADAH 00000H + @@BASE rtc 04ADAH 0005DH + @@BASE vreg_ctr 04B37H 00000H + @@BASE vreg_twl 04B37H 00000H + @@BASE adc 04B37H 00094H + @@BASE renge 04BCBH 0016BH + @@BASE accero 04D36H 00042H @@BASE self_flash - 04D47H 00000H - @@BASE sw 04D47H 00000H + 04D78H 00000H + @@BASE sw 04D78H 00000H @@BASE task_debug - 04D47H 00000H + 04D78H 00000H @@BASE task_misc - 04D47H 00000H - @@BASE task_sys 04D47H 00000H + 04D78H 00000H + @@BASE task_sys 04D78H 00000H @@BASE pedo_alg_thre_det2 - 04D47H 00000H - @@BASE ini_VECT 04D47H 00006H + 04D78H 00000H + @@BASE ini_VECT 04D78H 00006H @@BASE task_status - 04D4DH 00000H - @@BASE led_cam 04D4DH 00000H - @@BASE led_pow 04D4DH 00000H - @@BASE hal 04D4DH 00000H + 04D7EH 00000H + @@BASE led_cam 04D7EH 00000H + @@BASE led_pow 04D7EH 00000H + @@BASE hal 04D7EH 00000H @@BASE batt_params - 04D4DH 00000H - @@BASE voltable 04D4DH 00000H + 04D7EH 00000H + @@BASE voltable 04D7EH 00000H @@BASE pedo_lpf_coeff - 04D4DH 00000H + 04D7EH 00000H @@BASE kanaria_c - 04D4DH 00000H + 04D7EH 00000H @@BASE util_funcs - 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL @cstart 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL pm 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL main 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL led 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL rtc 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL adc 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL renge 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL accero 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL sw 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP + 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL @cstart 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL pm 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL main 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL led 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL rtc 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL adc 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL renge 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL accero 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL sw 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP @@CNSTL task_misc - 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL task_sys 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP + 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL task_sys 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL led_cam 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL led_pow 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP + 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL led_cam 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL led_pow 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP @@CNSTL batt_params - 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP - @@CNSTL voltable 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP + 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP + @@CNSTL voltable 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP @@CNSTL pedo_lpf_coeff - 04D4DH 00000H - @@CNSTL 04D4DH 00000H CSEG PAGE64KP + 04D7EH 00000H + @@CNSTL 04D7EH 00000H CSEG PAGE64KP @@CNSTL kanaria_c - 04D4DH 00000H - @@RLINIT 04D4DH 00000H CSEG UNIT64KP - @@RLINIT loader 04D4DH 00000H - @@RLINIT pm 04D4DH 00000H - @@RLINIT i2c_ctr 04D4DH 00000H - @@RLINIT main 04D4DH 00000H - @@RLINIT magic 04D4DH 00000H - @@RLINIT WDT 04D4DH 00000H - @@RLINIT i2c_mcu 04D4DH 00000H - @@RLINIT i2c_twl 04D4DH 00000H - @@RLINIT led 04D4DH 00000H - @@RLINIT rtc 04D4DH 00000H - @@RLINIT vreg_ctr 04D4DH 00000H - @@RLINIT vreg_twl 04D4DH 00000H - @@RLINIT adc 04D4DH 00000H - @@RLINIT renge 04D4DH 00000H - @@RLINIT accero 04D4DH 00000H - @@RLINIT self_flash - 04D4DH 00000H - @@RLINIT sw 04D4DH 00000H - @@RLINIT task_debug - 04D4DH 00000H - @@RLINIT task_misc - 04D4DH 00000H - @@RLINIT task_sys 04D4DH 00000H - @@RLINIT pedo_alg_thre_det2 - 04D4DH 00000H - @@RLINIT ini_VECT 04D4DH 00000H - @@RLINIT task_status - 04D4DH 00000H - @@RLINIT led_cam 04D4DH 00000H - @@RLINIT led_pow 04D4DH 00000H - @@RLINIT hal 04D4DH 00000H - @@RLINIT batt_params - 04D4DH 00000H - @@RLINIT voltable 04D4DH 00000H - @@RLINIT pedo_lpf_coeff - 04D4DH 00000H - @@RLINIT kanaria_c - 04D4DH 00000H - @@RLINIT util_funcs - 04D4DH 00000H - @@RLINIT @rom 04D4DH 00000H - @@CODEL 04D4DH 00000H CSEG - @@CODEL pm 04D4DH 00000H - @@CODEL i2c_ctr 04D4DH 00000H - @@CODEL main 04D4DH 00000H - @@CODEL magic 04D4DH 00000H - @@CODEL i2c_twl 04D4DH 00000H - @@CODEL led 04D4DH 00000H - @@CODEL rtc 04D4DH 00000H - @@CODEL vreg_ctr 04D4DH 00000H - @@CODEL vreg_twl 04D4DH 00000H - @@CODEL adc 04D4DH 00000H - @@CODEL renge 04D4DH 00000H - @@CODEL accero 04D4DH 00000H - @@CODEL sw 04D4DH 00000H - @@CODEL task_misc - 04D4DH 00000H - @@CODEL task_sys 04D4DH 00000H - @@CODEL pedo_alg_thre_det2 - 04D4DH 00000H - @@CODEL ini_VECT 04D4DH 00000H - @@CODEL led_cam 04D4DH 00000H - @@CODEL led_pow 04D4DH 00000H - @@CODEL batt_params - 04D4DH 00000H - @@CODEL voltable 04D4DH 00000H - @@CODEL pedo_lpf_coeff - 04D4DH 00000H - @@CODEL kanaria_c - 04D4DH 00000H -* gap * 04D4DH 00001H - @@CNSTL 04D4EH 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04D4EH 0000AH - @@R_INIT 04D58H 0004AH CSEG UNIT64KP - @@R_INIT @cstart 04D58H 00000H - @@R_INIT loader 04D58H 00000H - @@R_INIT pm 04D58H 00000H - @@R_INIT i2c_ctr 04D58H 00000H - @@R_INIT main 04D58H 00000H - @@R_INIT magic 04D58H 00000H - @@R_INIT WDT 04D58H 00000H - @@R_INIT i2c_mcu 04D58H 00000H - @@R_INIT i2c_twl 04D58H 00000H - @@R_INIT led 04D58H 00000H - @@R_INIT rtc 04D58H 00000H - @@R_INIT vreg_ctr 04D58H 00000H - @@R_INIT vreg_twl 04D58H 00000H - @@R_INIT adc 04D58H 0000CH - @@R_INIT renge 04D64H 00014H - @@R_INIT accero 04D78H 00000H + 04D7EH 00000H + @@CNSTL 04D7EH 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04D7EH 0000AH + @@R_INIT 04D88H 0004CH CSEG UNIT64KP + @@R_INIT @cstart 04D88H 00000H + @@R_INIT loader 04D88H 00000H + @@R_INIT pm 04D88H 00000H + @@R_INIT i2c_ctr 04D88H 00000H + @@R_INIT main 04D88H 00000H + @@R_INIT magic 04D88H 00000H + @@R_INIT WDT 04D88H 00000H + @@R_INIT i2c_mcu 04D88H 00000H + @@R_INIT i2c_twl 04D88H 00000H + @@R_INIT led 04D88H 00000H + @@R_INIT rtc 04D88H 00000H + @@R_INIT vreg_ctr 04D88H 00000H + @@R_INIT vreg_twl 04D88H 00000H + @@R_INIT adc 04D88H 0000CH + @@R_INIT renge 04D94H 00014H + @@R_INIT accero 04DA8H 00000H @@R_INIT self_flash - 04D78H 00000H - @@R_INIT sw 04D78H 00000H + 04DA8H 00000H + @@R_INIT sw 04DA8H 00000H @@R_INIT task_debug - 04D78H 00000H + 04DA8H 00000H @@R_INIT task_misc - 04D78H 00026H - @@R_INIT task_sys 04D9EH 00000H + 04DA8H 00028H + @@R_INIT task_sys 04DD0H 00000H @@R_INIT pedo_alg_thre_det2 - 04D9EH 00000H - @@R_INIT ini_VECT 04D9EH 00000H + 04DD0H 00000H + @@R_INIT ini_VECT 04DD0H 00000H @@R_INIT task_status - 04D9EH 00000H - @@R_INIT led_cam 04D9EH 00000H - @@R_INIT led_pow 04D9EH 00004H - @@R_INIT hal 04DA2H 00000H + 04DD0H 00000H + @@R_INIT led_cam 04DD0H 00000H + @@R_INIT led_pow 04DD0H 00004H + @@R_INIT hal 04DD4H 00000H @@R_INIT batt_params - 04DA2H 00000H - @@R_INIT voltable 04DA2H 00000H + 04DD4H 00000H + @@R_INIT voltable 04DD4H 00000H @@R_INIT pedo_lpf_coeff - 04DA2H 00000H + 04DD4H 00000H @@R_INIT kanaria_c - 04DA2H 00000H + 04DD4H 00000H @@R_INIT util_funcs - 04DA2H 00000H - @@R_INIT @rom 04DA2H 00000H - @@R_INIS 04DA2H 00010H CSEG UNIT64KP - @@R_INIS @cstart 04DA2H 00000H - @@R_INIS loader 04DA2H 00000H - @@R_INIS pm 04DA2H 00002H - @@R_INIS i2c_ctr 04DA4H 00002H - @@R_INIS main 04DA6H 00000H - @@R_INIS magic 04DA6H 00000H - @@R_INIS WDT 04DA6H 00000H - @@R_INIS i2c_mcu 04DA6H 00000H - @@R_INIS i2c_twl 04DA6H 00000H - @@R_INIS led 04DA6H 00000H - @@R_INIS rtc 04DA6H 00000H - @@R_INIS vreg_ctr 04DA6H 00000H - @@R_INIS vreg_twl 04DA6H 00000H - @@R_INIS adc 04DA6H 00000H - @@R_INIS renge 04DA6H 00000H - @@R_INIS accero 04DA6H 00000H + 04DD4H 00000H + @@R_INIT @rom 04DD4H 00000H + @@R_INIS 04DD4H 00010H CSEG UNIT64KP + @@R_INIS @cstart 04DD4H 00000H + @@R_INIS loader 04DD4H 00000H + @@R_INIS pm 04DD4H 00002H + @@R_INIS i2c_ctr 04DD6H 00002H + @@R_INIS main 04DD8H 00000H + @@R_INIS magic 04DD8H 00000H + @@R_INIS WDT 04DD8H 00000H + @@R_INIS i2c_mcu 04DD8H 00000H + @@R_INIS i2c_twl 04DD8H 00000H + @@R_INIS led 04DD8H 00000H + @@R_INIS rtc 04DD8H 00000H + @@R_INIS vreg_ctr 04DD8H 00000H + @@R_INIS vreg_twl 04DD8H 00000H + @@R_INIS adc 04DD8H 00000H + @@R_INIS renge 04DD8H 00000H + @@R_INIS accero 04DD8H 00000H @@R_INIS self_flash - 04DA6H 00000H - @@R_INIS sw 04DA6H 00000H + 04DD8H 00000H + @@R_INIS sw 04DD8H 00000H @@R_INIS task_debug - 04DA6H 00000H + 04DD8H 00000H @@R_INIS task_misc - 04DA6H 00000H - @@R_INIS task_sys 04DA6H 00002H + 04DD8H 00000H + @@R_INIS task_sys 04DD8H 00002H @@R_INIS pedo_alg_thre_det2 - 04DA8H 00006H - @@R_INIS ini_VECT 04DAEH 00000H + 04DDAH 00006H + @@R_INIS ini_VECT 04DE0H 00000H @@R_INIS task_status - 04DAEH 00000H - @@R_INIS led_cam 04DAEH 00002H - @@R_INIS led_pow 04DB0H 00002H - @@R_INIS hal 04DB2H 00000H + 04DE0H 00000H + @@R_INIS led_cam 04DE0H 00002H + @@R_INIS led_pow 04DE2H 00002H + @@R_INIS hal 04DE4H 00000H @@R_INIS batt_params - 04DB2H 00000H - @@R_INIS voltable 04DB2H 00000H + 04DE4H 00000H + @@R_INIS voltable 04DE4H 00000H @@R_INIS pedo_lpf_coeff - 04DB2H 00000H + 04DE4H 00000H @@R_INIS kanaria_c - 04DB2H 00000H + 04DE4H 00000H @@R_INIS util_funcs - 04DB2H 00000H - @@R_INIS @rom 04DB2H 00000H - @@LCODEL 04DB2H 00022H CSEG - @@LCODEL abs 04DB2H 00008H - @@LCODEL memcpy_n 04DBAH 0001AH -* gap * 04DD4H 00220H + 04DE4H 00000H + @@R_INIS @rom 04DE4H 00000H + @@RLINIT 04DE4H 00000H CSEG UNIT64KP + @@RLINIT loader 04DE4H 00000H + @@RLINIT pm 04DE4H 00000H + @@RLINIT i2c_ctr 04DE4H 00000H + @@RLINIT main 04DE4H 00000H + @@RLINIT magic 04DE4H 00000H + @@RLINIT WDT 04DE4H 00000H + @@RLINIT i2c_mcu 04DE4H 00000H + @@RLINIT i2c_twl 04DE4H 00000H + @@RLINIT led 04DE4H 00000H + @@RLINIT rtc 04DE4H 00000H + @@RLINIT vreg_ctr 04DE4H 00000H + @@RLINIT vreg_twl 04DE4H 00000H + @@RLINIT adc 04DE4H 00000H + @@RLINIT renge 04DE4H 00000H + @@RLINIT accero 04DE4H 00000H + @@RLINIT self_flash + 04DE4H 00000H + @@RLINIT sw 04DE4H 00000H + @@RLINIT task_debug + 04DE4H 00000H + @@RLINIT task_misc + 04DE4H 00000H + @@RLINIT task_sys 04DE4H 00000H + @@RLINIT pedo_alg_thre_det2 + 04DE4H 00000H + @@RLINIT ini_VECT 04DE4H 00000H + @@RLINIT task_status + 04DE4H 00000H + @@RLINIT led_cam 04DE4H 00000H + @@RLINIT led_pow 04DE4H 00000H + @@RLINIT hal 04DE4H 00000H + @@RLINIT batt_params + 04DE4H 00000H + @@RLINIT voltable 04DE4H 00000H + @@RLINIT pedo_lpf_coeff + 04DE4H 00000H + @@RLINIT kanaria_c + 04DE4H 00000H + @@RLINIT util_funcs + 04DE4H 00000H + @@RLINIT @rom 04DE4H 00000H + @@CODEL 04DE4H 00000H CSEG + @@CODEL pm 04DE4H 00000H + @@CODEL i2c_ctr 04DE4H 00000H + @@CODEL main 04DE4H 00000H + @@CODEL magic 04DE4H 00000H + @@CODEL i2c_twl 04DE4H 00000H + @@CODEL led 04DE4H 00000H + @@CODEL rtc 04DE4H 00000H + @@CODEL vreg_ctr 04DE4H 00000H + @@CODEL vreg_twl 04DE4H 00000H + @@CODEL adc 04DE4H 00000H + @@CODEL renge 04DE4H 00000H + @@CODEL accero 04DE4H 00000H + @@CODEL sw 04DE4H 00000H + @@CODEL task_misc + 04DE4H 00000H + @@CODEL task_sys 04DE4H 00000H + @@CODEL pedo_alg_thre_det2 + 04DE4H 00000H + @@CODEL ini_VECT 04DE4H 00000H + @@CODEL led_cam 04DE4H 00000H + @@CODEL led_pow 04DE4H 00000H + @@CODEL batt_params + 04DE4H 00000H + @@CODEL voltable 04DE4H 00000H + @@CODEL pedo_lpf_coeff + 04DE4H 00000H + @@CODEL kanaria_c + 04DE4H 00000H + @@LCODEL 04DE4H 00022H CSEG + @@LCODEL abs 04DE4H 00008H + @@LCODEL memcpy_n 04DECH 0001AH +* gap * 04E06H 001EEH MGC_VER 04FF4H 00002H CSEG AT MGC_VER magic 04FF4H 00002H MGC_TAIL 04FF6H 0000AH CSEG AT @@ -585,7 +584,7 @@ Direc-file:bsr_mcu.dr @@DATA util_funcs FFCCCH 00000H @@DATA @rom FFCCCH 00000H - @@INIT FFCCCH 0004AH DSEG BASEP + @@INIT FFCCCH 0004CH DSEG BASEP @@INIT @cstart FFCCCH 00000H @@INIT loader FFCCCH 00000H @@INIT pm FFCCCH 00000H @@ -608,117 +607,117 @@ Direc-file:bsr_mcu.dr @@INIT task_debug FFCECH 00000H @@INIT task_misc - FFCECH 00026H - @@INIT task_sys FFD12H 00000H + FFCECH 00028H + @@INIT task_sys FFD14H 00000H @@INIT pedo_alg_thre_det2 - FFD12H 00000H - @@INIT ini_VECT FFD12H 00000H + FFD14H 00000H + @@INIT ini_VECT FFD14H 00000H @@INIT task_status - FFD12H 00000H - @@INIT led_cam FFD12H 00000H - @@INIT led_pow FFD12H 00004H - @@INIT hal FFD16H 00000H + FFD14H 00000H + @@INIT led_cam FFD14H 00000H + @@INIT led_pow FFD14H 00004H + @@INIT hal FFD18H 00000H @@INIT batt_params - FFD16H 00000H - @@INIT voltable FFD16H 00000H + FFD18H 00000H + @@INIT voltable FFD18H 00000H @@INIT pedo_lpf_coeff - FFD16H 00000H - @@INIT kanaria FFD16H 00000H + FFD18H 00000H + @@INIT kanaria FFD18H 00000H @@INIT kanaria_c - FFD16H 00000H + FFD18H 00000H @@INIT util_funcs - FFD16H 00000H - @@INIT @rom FFD16H 00000H - FSL_DATA FFD16H 00010H DSEG UNITP + FFD18H 00000H + @@INIT @rom FFD18H 00000H + FSL_DATA FFD18H 00010H DSEG UNITP FSL_DATA fsl_common - FFD16H 00010H - @@INITL FFD26H 00000H DSEG UNIT64KP - @@INITL loader FFD26H 00000H - @@INITL pm FFD26H 00000H - @@INITL i2c_ctr FFD26H 00000H - @@INITL main FFD26H 00000H - @@INITL magic FFD26H 00000H - @@INITL WDT FFD26H 00000H - @@INITL i2c_mcu FFD26H 00000H - @@INITL i2c_twl FFD26H 00000H - @@INITL led FFD26H 00000H - @@INITL rtc FFD26H 00000H - @@INITL vreg_ctr FFD26H 00000H - @@INITL vreg_twl FFD26H 00000H - @@INITL adc FFD26H 00000H - @@INITL renge FFD26H 00000H - @@INITL accero FFD26H 00000H + FFD18H 00010H + @@INITL FFD28H 00000H DSEG UNIT64KP + @@INITL loader FFD28H 00000H + @@INITL pm FFD28H 00000H + @@INITL i2c_ctr FFD28H 00000H + @@INITL main FFD28H 00000H + @@INITL magic FFD28H 00000H + @@INITL WDT FFD28H 00000H + @@INITL i2c_mcu FFD28H 00000H + @@INITL i2c_twl FFD28H 00000H + @@INITL led FFD28H 00000H + @@INITL rtc FFD28H 00000H + @@INITL vreg_ctr FFD28H 00000H + @@INITL vreg_twl FFD28H 00000H + @@INITL adc FFD28H 00000H + @@INITL renge FFD28H 00000H + @@INITL accero FFD28H 00000H @@INITL self_flash - FFD26H 00000H - @@INITL sw FFD26H 00000H + FFD28H 00000H + @@INITL sw FFD28H 00000H @@INITL task_debug - FFD26H 00000H + FFD28H 00000H @@INITL task_misc - FFD26H 00000H - @@INITL task_sys FFD26H 00000H + FFD28H 00000H + @@INITL task_sys FFD28H 00000H @@INITL pedo_alg_thre_det2 - FFD26H 00000H - @@INITL ini_VECT FFD26H 00000H + FFD28H 00000H + @@INITL ini_VECT FFD28H 00000H @@INITL task_status - FFD26H 00000H - @@INITL led_cam FFD26H 00000H - @@INITL led_pow FFD26H 00000H - @@INITL hal FFD26H 00000H + FFD28H 00000H + @@INITL led_cam FFD28H 00000H + @@INITL led_pow FFD28H 00000H + @@INITL hal FFD28H 00000H @@INITL batt_params - FFD26H 00000H - @@INITL voltable FFD26H 00000H + FFD28H 00000H + @@INITL voltable FFD28H 00000H @@INITL pedo_lpf_coeff - FFD26H 00000H - @@INITL kanaria FFD26H 00000H + FFD28H 00000H + @@INITL kanaria FFD28H 00000H @@INITL kanaria_c - FFD26H 00000H + FFD28H 00000H @@INITL util_funcs - FFD26H 00000H - @@INITL @rom FFD26H 00000H - @@DATAL FFD26H 00000H DSEG UNIT64KP - @@DATAL loader FFD26H 00000H - @@DATAL pm FFD26H 00000H - @@DATAL i2c_ctr FFD26H 00000H - @@DATAL main FFD26H 00000H - @@DATAL magic FFD26H 00000H - @@DATAL WDT FFD26H 00000H - @@DATAL i2c_mcu FFD26H 00000H - @@DATAL i2c_twl FFD26H 00000H - @@DATAL led FFD26H 00000H - @@DATAL rtc FFD26H 00000H - @@DATAL vreg_ctr FFD26H 00000H - @@DATAL vreg_twl FFD26H 00000H - @@DATAL adc FFD26H 00000H - @@DATAL renge FFD26H 00000H - @@DATAL accero FFD26H 00000H + FFD28H 00000H + @@INITL @rom FFD28H 00000H + @@DATAL FFD28H 00000H DSEG UNIT64KP + @@DATAL loader FFD28H 00000H + @@DATAL pm FFD28H 00000H + @@DATAL i2c_ctr FFD28H 00000H + @@DATAL main FFD28H 00000H + @@DATAL magic FFD28H 00000H + @@DATAL WDT FFD28H 00000H + @@DATAL i2c_mcu FFD28H 00000H + @@DATAL i2c_twl FFD28H 00000H + @@DATAL led FFD28H 00000H + @@DATAL rtc FFD28H 00000H + @@DATAL vreg_ctr FFD28H 00000H + @@DATAL vreg_twl FFD28H 00000H + @@DATAL adc FFD28H 00000H + @@DATAL renge FFD28H 00000H + @@DATAL accero FFD28H 00000H @@DATAL self_flash - FFD26H 00000H - @@DATAL sw FFD26H 00000H + FFD28H 00000H + @@DATAL sw FFD28H 00000H @@DATAL task_debug - FFD26H 00000H + FFD28H 00000H @@DATAL task_misc - FFD26H 00000H - @@DATAL task_sys FFD26H 00000H + FFD28H 00000H + @@DATAL task_sys FFD28H 00000H @@DATAL pedo_alg_thre_det2 - FFD26H 00000H - @@DATAL ini_VECT FFD26H 00000H + FFD28H 00000H + @@DATAL ini_VECT FFD28H 00000H @@DATAL task_status - FFD26H 00000H - @@DATAL led_cam FFD26H 00000H - @@DATAL led_pow FFD26H 00000H - @@DATAL hal FFD26H 00000H + FFD28H 00000H + @@DATAL led_cam FFD28H 00000H + @@DATAL led_pow FFD28H 00000H + @@DATAL hal FFD28H 00000H @@DATAL batt_params - FFD26H 00000H - @@DATAL voltable FFD26H 00000H + FFD28H 00000H + @@DATAL voltable FFD28H 00000H @@DATAL pedo_lpf_coeff - FFD26H 00000H - @@DATAL kanaria FFD26H 00000H + FFD28H 00000H + @@DATAL kanaria FFD28H 00000H @@DATAL kanaria_c - FFD26H 00000H + FFD28H 00000H @@DATAL util_funcs - FFD26H 00000H - @@DATAL @rom FFD26H 00000H -* gap * FFD26H 000DAH + FFD28H 00000H + @@DATAL @rom FFD28H 00000H +* gap * FFD28H 000D8H MEMORY=RAM2 BASE ADDRESS=FFE20H SIZE=000C0H diff --git a/trunk/config.h b/trunk/config.h index f1c14ad..1922eb6 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -3,7 +3,7 @@ #define MCU_VER_MAJOR 0x02 -#define MCU_VER_MINOR 0x0F +#define MCU_VER_MINOR 0x10 // デバッグ向けスイッチ diff --git a/trunk/hoge.bin b/trunk/hoge.bin index 88579b1..03b9034 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/loader.c b/trunk/loader.c index 88686a6..29ff17a 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -198,7 +198,7 @@ static void chk_firm_broke() void chk_platform_type() { // ●CTRファミリ // - system_status.family = (enum family_)( DEV_DET >> 1 ); /// あぁ... + system_status.family = (enum family_)( DEV_DET >> 1 ); /// あぁ... CTR TS がSPFLと誤判定するが、後で上書き if( system_status.family == FAMILY_SPFL ) { pm_reg_bit_vddlcd = PM_REG_BIT_VDDLCD_AMO; diff --git a/trunk/pm.c b/trunk/pm.c index 3ef97c2..3ba1032 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -384,13 +384,15 @@ void BT_model_detect() temp = get_adc( ADC_SEL_BATT_DET ); BT_DET_P = 0; - system_status.captureBox = 0; + system_status.captureBox = false; // プラットフォーム判定 // if( raw_adc_temperature > 0xF0 ) { // TS // system_status.model = MODEL_TS_BOARD; - } + system_status.family = FAMILY_CTR; // 旧回路での誤判定を上書き + pm_reg_bit_vddlcd = PM_REG_BIT_VDDLCD_CGS; + } else if( raw_adc_temperature < 4 ) { // 白箱 // @@ -400,7 +402,7 @@ void BT_model_detect() if(( iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VERSION ) == 0x01 ) && ( iic_mcu_result == I2C_ERR_OK )) { - system_status.captureBox = 1; + system_status.captureBox = true; } } else @@ -456,6 +458,7 @@ void BT_model_detect() +#define MGIC_CMD_QUICKSTART 0x4000 /********************************************//** MGICクイックスタート（主にバグ対策） ***********************************************/ @@ -464,7 +467,7 @@ static void BT_mgic_quick_start() wait_ms( 10 ); // MGICの起動に掛かる // 0. バッテリ残量IC クイックスタート - send_cmd_mgic_2B( BT_GAUGE_REG_MODE, swap_endian_16( 0x4000 ) ); + send_cmd_mgic_2B( BT_GAUGE_REG_MODE, swap_endian_16( MGIC_CMD_QUICKSTART ) ); wait_ms( 150 ); } @@ -816,14 +819,20 @@ err PM_LCD_on( ) { err rv = ERR_ERR; - PM_VDDLCD_on( ); + PM_VDDLCD_on( ); // 内部で CGS と AMO 切り替えてます if( system_status.family == FAMILY_SPFL ) { + // SPFL ならアモルファスHV on を間に挟む + wait_ms( 10 ); SPFL_LCD_AMOL_HV_CONT = 1; + wait_ms( DELAY_PM_TSS_50B_AND_TCOM - 10 ); } - - wait_ms( DELAY_PM_TSS_50B_AND_TCOM ); + else + { + // CTR 時 + wait_ms( DELAY_PM_TSS_50B_AND_TCOM ); + } PM_TCOM_on( ); @@ -867,22 +876,21 @@ void PM_LCD_off() } - // 液晶電源切る // - SPFL_LCD_AMOL_HV_CONT = 0; // 他のファミリでもL縛りなので弊害なし - // 50msとか待つし、確認しましょうかね… if( read_pmic( PM_REG_ADRS_VDD_LCD ) != 0 ) { - if( system_status.family == FAMILY_SPFL ) - { - wait_ms( 10 ); // アモルファス15Vを切ったときのウェイト。 - } - PM_TCOM_off(); wait_ms( 1 ); PM_TCOM_VCS_off( ); wait_ms( DELAY_PM_LCD_OFF ); + if( system_status.family == FAMILY_SPFL ) + { + // 液晶電源切る // + SPFL_LCD_AMOL_HV_CONT = 0; // 他のファミリでもL縛りなので弊害なし + wait_ms( 10 ); // アモルファス15Vを切ったときのウェイト。 + } + PM_VDDLCD_off( ); // 残ってたの全部止めます。 vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW; } @@ -1113,7 +1121,7 @@ __interrupt void intp6_PM_irq( ) /********************************************//** - PMICからの割り込みを受けて、NTR PMIC互換レジスタからリード + CODECからの割り込みを受けて、NTR PMIC互換レジスタからリード ***********************************************/ task_status_immed tski_ntr_pmic_comm( ) { diff --git a/trunk/task_misc.c b/trunk/task_misc.c index 30b821a..2d196d6 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -318,33 +318,34 @@ extern bit bt_authorized; -#define KOUMOKU 19 +#define KOUMOKU 20 static u8 infos_bits[2]; -static u8 infos_temp[5]; +static u8 infos_temp[6]; static const u8 *infos_table[] = { - &infos_temp[0], /* 0 */ - &pmic_version, - (u8*)&battery_manufacturer, - &mgic_version[0], - &mgic_version[1], - &infos_temp[1], /* 5 */ - &raw_adc_temperature, - &infos_temp[2], - &infos_temp[3], - (u8*)&system_status.family, -// LED_pow_red, /* 10 */ + &infos_temp[0], // 0 プラットフォーム */ + &pmic_version, // 1 PMIC バージョン + (u8*)&battery_manufacturer, // 2 電池メーカー + &mgic_version[0], // 3 MGIC Ver(MSB) + &mgic_version[1], // 4 〃 LSB + &infos_temp[1], // 5 ( rcomp & 0xFF ) + &raw_adc_temperature, // 6 サーミスタ ADC 値 + &infos_temp[2], // 7 ( !temp_zone_charge_disable | ( bt_authorized << 1 ) ) + &infos_temp[3], // 8 お知らせLEDはフルカラー？ + (u8*)&system_status.family, // 9 system_status.family +// LED_pow_red, ↓　bit型のポインタは不可 /* 10 */ &infos_bits[0], (u8*)&LED_duty_pow_blu, (u8*)&LED_duty_3d, (u8*)&LED_duty_notify_red, (u8*)&LED_duty_notify_grn, - (u8*)&LED_duty_notify_blu, /* 15 */ + (u8*)&LED_duty_notify_blu, // 15 +// &LED_CAM, ↓ &infos_bits[1], -// &LED_CAM, (u8*)&LED_duty_WiFi, - &infos_temp[4] /* 18 */ + &infos_temp[4], // 18 ioピン状態（コード参照） + &infos_temp[5] // 19 特殊実機？（コード参照） /* 項目足すときは KOUMOKU に注意 */ }; @@ -355,16 +356,26 @@ static const u8 *infos_table[] = { 出てくる順場は、 - - 1) プラットフォーム - - 2) PMIC バージョン - - 3) 電池メーカー - - 4) ガスゲージバージョン - - 5) 〃 - - 6) ( rcomp & 0xFF ) - - 7) raw_adc_temperature - - 8) ( !temp_zone_charge_disable | ( bt_authorized << 1 ) ) - - 9) お知らせLEDはフルカラー？ + - 1) プラットフォーム + - 2) PMIC バージョン + - 3) 電池メーカー + - 4) ガスゲージバージョン + - 5) 〃 + - 6) ( rcomp & 0xFF ) + - 7) raw_adc_temperature + - 8) ( !temp_zone_charge_disable | ( bt_authorized << 1 ) ) + - 9) お知らせLEDはフルカラー？ - 10) system_status.family + - 11) LED_pow_red, + - 12) (u8*)&LED_duty_pow_blu, + - 13) (u8*)&LED_duty_3d, + - 14) (u8*)&LED_duty_notify_red, + - 15) (u8*)&LED_duty_notify_grn, + - 16) (u8*)&LED_duty_notify_blu, + - 17) &LED_CAM, ↓ + - 18) (u8*)&LED_duty_WiFi, + - 19) ioピン状態 + - 20) 特殊実機？ ***********************************************/ u8 extinfo_read(void) { @@ -393,6 +404,8 @@ u8 extinfo_read(void) | ( SW_WIFI_n ? REG_BIT_HAL0_SW_WIFI_n : 0 ) | ( SW_HOME_n ? REG_BIT_HAL0_SW_HOME_n : 0 ) | ( SW_POW_n ? REG_BIT_HAL0_SW_POW_n : 0 ); + infos_temp[5] = ( system_status.taikendai ? 1 <<0 : 0 ) + |( system_status.taikendai_nbd ? 1 <<1 : 0 ); infos_bits[0] = (u8)LED_pow_red; infos_bits[1] = (u8)LED_CAM; diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index dfc5940..0eb728e 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,9 +1,9 @@ [ProjectManager] FrameMax=0 -FrameX=25 -FrameY=25 -FrameCX=1440 -FrameCY=850 +FrameX=350 +FrameY=182 +FrameCX=1022 +FrameCY=722 OpenFile1=i2c_ctr.c,0,655,120,1628,751,0,1,0,0 OpenFile2=kanaria_c.c,0,68,138,763,769,8,5,8,0 OpenFile3=pm.c,0,373,197,1346,828,35,374,32,0 @@ -15,10 +15,10 @@ OpenFile8=i2c_mcu.c,0,175,175,1036,939,1,453,1,0 OpenFile9=main.c,0,402,105,1713,812,0,68,0,0 OpenFile10=magic.c,0,192,199,1387,680,19,11,0,0 OpenFile11=config.h,0,75,75,902,478,0,15,0,0 -OpenFile12=OutputWindow -OutputPos=0,228,679,379,1256 -OpenFile13=ProjectWindow +OpenFile12=ProjectWindow PrjPos=0,0,706,0,291 +OpenFile13=OutputWindow +OutputPos=0,80,531,104,981 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 051af38..225e2cb 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -13,7 +13,7 @@ T=4e647ac1 9=WDT.h 10=magic.h [pm.c] -T=4e6489a3 +T=4e71bd3f 1=incs.h 2=adc.h 3=led.h @@ -40,7 +40,7 @@ T=4e647b08 7=i2c_mcu.h 8=pool.h [magic.c] -T=4e68758c +T=4e71764f 1=magic.h 2=config.h [WDT.c] @@ -88,7 +88,7 @@ T=4e6491f4 4=vreg_twl.h 5=adc.h [adc.c] -T=4e648e7a +T=4e6dc5ed 1=incs.h 2=adc.h 3=pm.h @@ -107,7 +107,7 @@ T=4e6872a9 8=sim\simOnWin.h 9=bsr_system.h [accero.c] -T=4e687584 +T=4e687ab8 1=incs.h 2=accero.h 3=i2c_mcu.h @@ -164,7 +164,7 @@ T=4e6865dd 11=i2c_mcu.h 12=vreg_twl.h [pedo_alg_thre_det2.c] -T=4e687272 +T=4e687ba7 1=incs.h 2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h 3=accero.h @@ -234,7 +234,7 @@ T=4e559884 T=4e5b0fa2 1=config.h [config.h] -T=4e686baa +T=4e71764b [jhl_defs.h] T=4e647343 [user_define.h]