diff --git a/snake_trunk/VCProj/Debug/bsr_trunk.log b/snake_trunk/VCProj/Debug/bsr_trunk.log index 5ea4767..b8d18e0 100644 --- a/snake_trunk/VCProj/Debug/bsr_trunk.log +++ b/snake_trunk/VCProj/Debug/bsr_trunk.log @@ -1,14 +1,13 @@ -2014/02/12 16:38:49 にビルドを開始しました。 +2014/02/21 13:25:32 にビルドを開始しました。 1>ノード 2 上のプロジェクト "C:\78k_data\yav-mcu-basara\snake_trunk\VCProj\bsr_trunk.vcxproj" (build ターゲット)。 1>InitializeBuildStatus: - "AlwaysCreate" が指定されたため "Debug\arr_trunk.unsuccessfulbuild" を作成しています。 + "Debug\arr_trunk.unsuccessfulbuild" のタッチ タスクを実行しています。 ClCompile: - c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /Zi /nologo /W1 /WX- /O2 /Oy- /D _MBCS /D _MBCS /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc100.pdb" /Gd /TC /analyze- /errorReport:prompt ..\accero.c ..\adc.c ..\batt_params.c ..\hal.c ..\i2c_ctr.c "..\i2c_mcu-sub.c" ..\i2c_mcu.c ..\i2c_twl.c ..\ini_VECT.c ..\kanaria_c.c ..\led.c ..\led_cam.c ..\led_pow.c ..\loader.c ..\magic.c ..\main.c ..\my_led.c ..\pedo_alg_thre_det2.c ..\pedo_lpf_coeff.c ..\pm.c ..\reboot.c ..\renge\renge.c ..\rtc.c ..\self_flash.c ..\sim\simFixture.c ..\sim\sim_interrupt_decrare.c ..\sw.c ..\task_debug.c ..\task_misc.c ..\task_status.c ..\task_sys.c ..\util_funcs.c ..\voltable.c ..\vreg_ctr.c ..\vreg_twl.c ..\WDT.c + c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /Zi /nologo /W1 /WX- /O2 /Oy- /D _MBCS /D _MBCS /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc100.pdb" /Gd /TC /analyze- /errorReport:prompt ..\accero.c ..\adc.c ..\hal.c ..\i2c_ctr.c "..\i2c_mcu-sub.c" ..\i2c_mcu.c ..\i2c_twl.c ..\ini_VECT.c ..\kanaria_c.c ..\led.c ..\led_cam.c ..\led_pow.c ..\loader.c ..\magic.c ..\main.c ..\my_led.c ..\pedo_alg_thre_det2.c ..\pedo_lpf_coeff.c ..\pm.c ..\reboot.c ..\renge\renge.c ..\rtc.c ..\self_flash.c ..\sim\simFixture.c ..\sim\sim_interrupt_decrare.c ..\sw.c ..\task_debug.c ..\task_misc.c ..\task_status.c ..\task_sys.c ..\util_funcs.c ..\voltable.c ..\vreg_ctr.c ..\vreg_twl.c ..\WDT.c accero.c 1>c:\78k_data\yav-mcu-basara\snake_trunk\incs.h(17): fatal error C1083: include ファイルを開けません。'sim/simOnWin.h': No such file or directory adc.c 1>c:\78k_data\yav-mcu-basara\snake_trunk\incs.h(17): fatal error C1083: include ファイルを開けません。'sim/simOnWin.h': No such file or directory - batt_params.c hal.c 1>c:\78k_data\yav-mcu-basara\snake_trunk\incs_loader.h(28): fatal error C1083: include ファイルを開けません。'sim/simOnWin.h': No such file or directory i2c_ctr.c @@ -42,11 +41,11 @@ 1>c:\78k_data\yav-mcu-basara\snake_trunk\incs.h(17): fatal error C1083: include ファイルを開けません。'sim/simOnWin.h': No such file or directory pm.c 1>c:\78k_data\yav-mcu-basara\snake_trunk\incs.h(17): fatal error C1083: include ファイルを開けません。'sim/simOnWin.h': No such file or directory - コードを生成中... - コンパイル中... reboot.c 1>..\reboot.c(8): warning C4068: 不明なプラグマがありました。 1>c:\78k_data\yav-mcu-basara\snake_trunk\incs_loader.h(28): fatal error C1083: include ファイルを開けません。'sim/simOnWin.h': No such file or directory + コードを生成中... + コンパイル中... renge.c 1>c:\78k_data\yav-mcu-basara\snake_trunk\renge\renge.h(16): error C2054: '__callt' の後に '(' が必要です。 1>c:\78k_data\yav-mcu-basara\snake_trunk\renge\renge.h(16): error C2085: 'renge_task_immed_run' : 仮パラメーター リスト内にありません。 @@ -101,4 +100,4 @@ ビルドに失敗しました。 -経過時間 00:00:05.19 +経過時間 00:00:04.22 diff --git a/snake_trunk/VCProj/bsr_trunk.sdf b/snake_trunk/VCProj/bsr_trunk.sdf index 507b30f..d0f2123 100644 Binary files a/snake_trunk/VCProj/bsr_trunk.sdf and b/snake_trunk/VCProj/bsr_trunk.sdf differ diff --git a/snake_trunk/VCProj/bsr_trunk.suo b/snake_trunk/VCProj/bsr_trunk.suo index eabbfa1..853df15 100644 Binary files a/snake_trunk/VCProj/bsr_trunk.suo and b/snake_trunk/VCProj/bsr_trunk.suo differ diff --git a/snake_trunk/bsr.hex b/snake_trunk/bsr.hex index 4c949b8..7cfef23 100644 --- a/snake_trunk/bsr.hex +++ b/snake_trunk/bsr.hex @@ -1,13 +1,13 @@ :02000000680D89 -:04001000B148B348F8 -:02001C005F4A39 -:02002400064B89 -:02002A00514B38 -:080034007E4C214C7A4CBF4EBA -:02004A00B548B7 -:02005A00EF486D -:020062007D4ED1 -:06008000124D4B4D954DA1 +:04001000B548B748F0 +:02001C00634A35 +:020024000A4B85 +:02002A00554B34 +:08003400824C254C7E4CC34EAA +:02004A00B948B3 +:02005A00F34869 +:02006200814ECD +:06008000164D4F4D994D95 :0400C0007EFBFF04C0 :0A00C4001B339499E033F240BFAA09 :1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A @@ -46,7 +46,7 @@ :1002DE0004300400BF2401301740BF1C013004005D :1002EE00BF22018C0A91DF04F6BF2A01710BE2CE08 :1002FE0044FF3182E202EFFAAC0C148E449961791C -:10030E000C61690A8C0AD1DFDA8B4CA461F8FD9F6F +:10030E000C61690A8C0AD1DFDA8B4CA461F8FDA36B :10031E0048FD7504710BE2713397F2C0C6D7C7C1A1 :10032E00FBF8FFFD6502D2DD045203EF25710AE6EC :10033E008B70FDE503D2DD077133975202EF138CFC @@ -215,10 +215,10 @@ :020D6600C3FDCB :100D680061CF5100718C7109FECBF800FEFCE801DF :100D780000F6BF00F953C0F693935820FEDFF941FF -:100D88000036D04E34CCFCEF05118B99A7A517443B -:100D98001A4FDFF53602F930CCFCEF04CC0000A77F -:100DA80047DFF94100361A4F3420FEEF05118B99C1 -:100DB800A7A517442A4FDFF53630FE3096FEEF041C +:100D88000036D44E34CCFCEF05118B99A7A5174437 +:100D98001E4FDFF53602F930CCFCEF04CC0000A77B +:100DA80047DFF94100361E4F3420FEEF05118B99BD +:100DB800A7A517442E4FDFF53630FE3096FEEF0418 :100DC800CC0000A747DFF9FCCE0000EFFE61DD7123 :100DD8007BFABEF0ADD8BEF200AEF661CDD7C361E6 :100DE800DD717BFABEF0ADD8BEF200DBF6FFADDCFC @@ -251,10 +251,10 @@ :100F9800F9B4DADFF4BDD813BDDAC2C0D746D8DD5C :100FA8000771FF7177D971C0D75BDB9DDB605BDAB6 :100FB8009DDAADDC5BD9085BD808BDD8D7C3C7F3C9 -:100FC800728EFDC162314C410036C64E1161A0726D +:100FC800728EFDC162314C410036CA4E1161A07269 :070FD800C09EFD62C6C2D7F6 -:0A0FF60030393A34323A3238000044 -:0A20000030393A34323A3238000029 +:0A0FF60030393A30363A3236000046 +:0A20000030393A30363A323600002B :10200A0005214F7B9EC5E9000104080D12171C1F0C :10201A00080100001F003B005A0078009700B50035 :10202A00D400F300110130014E01192634445362E1 @@ -435,11 +435,11 @@ :102B0C00DFF4716307716B278D315C40D1DD0950A7 :102B1C0002C15012FD4E35C08D315C01D1DD08E093 :102B2C00C15012FD4E35C0717AFA8D315C41D1DD48 -:102B3C000C5A31BED831C15010FDFC47C0F2100404 +:102B3C000C5A31BED831C15010FD0048C0F21004FF :102B4C00C6D7FDD027F2D7FD3728F2D7C78FC6FBE3 :102B5C007617FDCE28664FC6FBDFF2F5C6FBF2C634 :102B6C00D75064FD220AFDC92C6261FB711196F1EC -:102B7C0071149661DC70C15012FDFC47C0FDFC362F +:102B7C0071149661DC70C15012FD0048C0FDFC362A :102B8C00CD6303D7C7C1C1FBF8FFAC0ABB17C1505B :102B9C0002C18C0270C1506CFD630310061004C698 :102BAC00D7C7C1FBF8FFAC08C15002C18B70C15034 @@ -458,7 +458,7 @@ :102C7C00D7D504F9DF04717396D7FDC92C6261FBBB :102C8C0071019771149671079761C831729617711B :102C9C007296710497711196F171049761DC70C191 -:102CAC005012FDFC47C0D7C716C75004FDAD2BC052 +:102CAC005012FD0048C0D7C716C75004FDAD2BC04D :102CBC00C6D7C716C75002FDAD2BC0C6D740AFFB59 :102CCC000BDE02E2D7F2D7C75003FDD62B62318F51 :102CDC00085CFD70C15003FDC52BC0C6D771000147 @@ -471,11 +471,11 @@ :102D4C007AFAFDB123F504F98F06F931051B50030E :102D5C00FDD62B625C01D161E8CF04F902CFAFFB49 :102D6C0064710407714196EF10F67104076110123B -:102D7C00F6B1236061FB714196FDFE30FDA04371FD +:102D7C00F6B1236061FB714196FDFE30FDA44371F9 :102D8C002299712BE7618461A461EDEFF8D7C788B4 :102D9C00061666614FDD0967614EDE0396EF01860C :102DAC006672C6D7C7161714AA0412A943DD29AA3E -:102DBC000412A923FD2A4FC3AC02FD2A4F13C2BD36 +:102DBC000412A923FD2E4FC3AC02FD2E4F13C2BD2E :102DCC00D813FDA50FDE0C1714AA0212AA0403BA1D :102DDC0004EF051714A9BA04AC041231FF319E0399 :102DEC00317F087208C6D77100F200304400BFB6BC @@ -528,7 +528,7 @@ :1030DC0099A5A792DFF9710B9E314498137143980F :1030EC00717B9E8FDCFB9E9A8FDDFB9E9B717A9E83 :1030FC00C6D7CFA7FB5CCFA8FB5FCFC8FB5DCFFCCF -:10310C00FB36CFFDFBC9D7C7CFA4FB13CFA5FB372D +:10310C00FB36CFFDFBC9D7C7CFA4FB13CFA5FB382C :10311C00CFCCFBFFF5CDFBF5CEFBF5CFFBF5D0FB14 :10312C005600664C64DE08723826FB0086EFF3F519 :10313C00E3FB714A9D712B21710A20711A207102D7 @@ -547,7 +547,7 @@ :10320C00F8ED25342361F8ED30342561F8ED3B34CD :10321C00B124060061D8ED7B3424000061F8ED7D0B :10322C00342561F8ED463424120061F8ED003323A7 -:10323C0061F8EDF032ED7D3467D1DD0C30253C6169 +:10323C0061F8EDF032ED7D3467D1DD0C30293C6165 :10324C009434C4FB89616F99ED8734675C02D1DDDE :10325C0007304E2B6194EF0B675C01D1DD053053C9 :10326C002B6194675C3CD1DD0F30582B6194675C0B @@ -567,7 +567,7 @@ :10334C00711298ED873434A6FB89615F99ED87344F :10335C0030BF29619466736718A4FBED873440A9CC :10336C00FB6ADF1340AAFB68DF0D674C6CDF08308B -:10337C00DD406194713AD5679FABFBED8734675C98 +:10337C00E1406194713AD5679FABFBED8734675C94 :10338C007F70C117F1243000FD9A30C0ED8734678F :10339C005C3F70C117F1243000FD9A30C0ED8734CA :1033AC00675C0770C117F1243000FD9A30C0ED87BF @@ -580,7 +580,7 @@ :10341C006A675C1F9FDFFBEF6230DA396194679F4C :10342C00E4FBEF5730A7396194679FE5FBEF4C3015 :10343C00C0396194679FE8FBEF41675C01D1DD3BCC -:10344C00FDA043EF36675C02D1DD05712A21EF0642 +:10344C00FDA443EF36675C02D1DD05712A21EF063E :10345C00714A9D712B21675C01D1DD0671030071EE :10346C000B20679FE3FBEF1367318EEF0EEF0CEF32 :10347C000A664C5BDE05736718A4FBC6D7C71666D5 @@ -588,9 +588,9 @@ :10349C00DF1F8FA6FB5C03728F03FC5C03318E3144 :1034AC006D08616A08128F03FC5C80312A6162EF3F :1034BC0061664C3DDF08AE90BD5EF85EEF54664C25 -:1034CC003EDF04F85FEF4B664C4FDF05FDC843EF62 +:1034CC003EDF04F85FEF4B664C4FDF05FDCC43EF5E :1034DC0041664C61DF134A5CC8DC045700EF06E818 -:1034EC005C095AFA776772EF29664C7FDF05FD9607 +:1034EC005C095AFA776772EF29664C7FDF05FD9A03 :1034FC003CEF1F664C4EDF0B31049A045210EF1256 :10350C00F2EF0F664C5BDC0452FFEF06667309A406 :10351C00FB72C6D7C788061617F1241000240500C5 @@ -605,7 +605,7 @@ :1035AC00061617F1E734020025DD3D23DD1725DD76 :1035BC001C23DD0523DD2BEF3B710299679F06FC75 :1035CC00CD6303EF2F675C839F03FCEF27675C03DE -:1035DC009F05FC675C034C0261F871229AFDB645AD +:1035DC009F05FC675C034C0261F871229AFDBA45A9 :1035EC00EF12679F07FCEF0C6791DF08E0C15012E8 :1035FC00FD4E35C0C6D7C71617F1E7240000DD2AEB :10360C0023DD1E240300DD0724FB00DD24EF253120 @@ -629,7 +629,7 @@ :10372C001299D506FCDF04F468EF0A8F06FC5002F0 :10373C00D6A1609D688D689D67EF0E311499068D3A :10374C00689D67EF048D659D678D679FADFBD8679E -:10375C00FD6E37E867091C2270C15013FDFC47C091 +:10375C00FD6E37E867091C2270C15013FD0048C08C :10376C00F2D7C7C1C1FBF8FF8C02D1DF05F506FC0F :10377C00EF1A8C024C05DE06CF06FC02EF0E8C0213 :10378C00318E1231FE03311F609F06FC8D694F068E @@ -644,7 +644,7 @@ :10381C00706131318D128FFDFB2FFCFB70613133E8 :10382C00BDD813FD330EBB440001DC03F690BB8BFB :10383C00721004C6D7C7C1FBF8FFAC0814A91489D1 -:10384C00708B6128706131FD2A4F1344030071FEA7 +:10384C00708B6128706131FD2E4F1344030071FEA3 :10385C00DC23AC08148A04819A04AC08148A044C46 :10386C0011DC10A9148B99AC0814CA0200AC081412 :10387C00CA0310EF72AC0814CA0400AC0814A914E3 @@ -660,12 +660,12 @@ :10391C0050A8C15030FDB1021006D2DD1B4A6C0418 :10392C00DE05A46CE2EF7034E4FB895CFC99FDDAF3 :10393C00397110B2FBF2EF5F717BFA300600C117E0 -:10394C00040600C130E9FBFD324F1004717AFAF421 +:10394C00040600C130E9FBFD364F1004717AFAF41D :10395C006C8FE4FB5C01D1DD264004F903DF2050C1 :10396C0010C180FD4E35C0C736100571D4C6DE0FB0 :10397C0017C15006C150A8C15030FDB1021006400D :10398C0004F903DD064004F904DF0B8FE4FB5C0251 -:10399C00D161E8FDE240F2100CC6D7D9E5FBC1506D +:10399C00D161E8FDE640F2100CC6D7D9E5FBC15069 :1039AC0030FD8902C0629FE8FB5008C15011FD4EEA :1039BC0035C0F2D7D9E8FBC1D9E7FBC15030FD2C9B :1039CC000310045008C15011FD4E35C0F2D7C7206A @@ -680,342 +680,342 @@ :103A5C00EF01F2100CC6D7D504F9DF03F6BD6E40AA :103A6C0004F901DD0AD478DD03B478D7CD78038F5F :103A7C0004F9318FE723DD0B24020024030061C815 -:103A8C00ED933B8F06F9312349301B00466EDF1551 -:103A9C008FE3FB5C01D161E8F504F9E0C15010FD46 -:103AAC004E35C0EF1D307701466EDF165002C15007 -:103ABC0010FD4E35C0F64674DF088FC8FB5010D68B -:103ACC00BD74F64674DD36B6744674DF30711297E9 -:103ADC00EF2B301B00466EDF13F64676DF18E0C185 -:103AEC005010FD4E35C0C9765307EF0A30770146AA -:103AFC006E61F8711297F6467661E8B67631549A93 -:103B0C0008714399F6BD6EEF1431449905F6BD6EFC -:103B1C00EF0BA66EF6466E61F8C96EFFFF31629A26 -:103B2C00194A7005DE16A4704A7005DF0FA4705098 -:103B3C0004C15010FD4E35C0EF02F47031649A1977 -:103B4C004A7205DE16A4724A7205DF0FA472500881 -:103B5C00C15010FD4E35C0EF02F472D473DD03B4C6 -:103B6C0073D731729A174A7105DE14A4714A710524 -:103B7C00DF0DA4715010C1FD4E35C0EF02F4714A37 -:103B8C00710661F8CD7325D7C736100571D4DE0EDA -:103B9C008FB2FB5C02D1DF06300E396194D2400447 -:103BAC00F903DF1C3122070530802A6194315499C6 -:103BBC000C7153995080C15012FD4E35C0FDD13B54 -:103BCC00FDF73BC6D78F03FC5C01D1DD1DD47BDD3B -:103BDC0003B47BD7CD7B098D644B7ADD0D8D649D51 -:103BEC007A5040C15012FD4E35C0D74004F903DD68 -:103BFC0004F6BD1AD7D5D0FBDF08F6461ADD19B688 -:103C0C001AD7D9CCFBF1461ADD0ED9CCFB12AD1A62 -:103C1C0043DE03A61AD7B61AD7717BFAC78FC4FB3B -:103C2C0076F5C4FB717AFA5C10D161E87162996621 -:103C3C005C0FD1DD52665C01D1DD05F504F9EF476F -:103C4C00665C02D1DD0CFDD32C711300711B20714D -:103C5C000303665C04D1DD11711300711B20D503C5 -:103C6C00FC61F8710303FD9C35665C08D161E87159 -:103C7C0003035005FD220A7102035003C1FDC52B3D -:103C8C00C0711A20FD6D2BF2C6D7C756FF4A4A13D6 -:103C9C0061C8ED543D8F06F931150D3145053006DF -:103CAC0000EF14300400EF0F8F06F9314505300595 -:103CBC0000EF04D907F9F1609F28FC8D7C9F29FC4B -:103CCC00713496E661301271049661DC31196162CF -:103CDC00629F2AFCE52BFC31449A05304000EF0131 -:103CEC00F6C131340405302000EF01F6C2616B08D7 -:103CFC00616A08C131749A05300400EF01F6C261A3 -:103D0C006B08616A08C131649A04E6A1EF01F6C23E -:103D1C00616B08616A08C131549A03E6EF01F6C27F -:103D2C00616B08616A9F2CFCF171240461DC9F2695 -:103D3C00FCF171540761DC9F27FCD84AF10104ECBB -:103D4C00FC14A9148976A44A6672C6D7C7FD460925 -:103D5C008F04F9318FE724000061F8ED333F23DD48 -:103D6C001B2361F8ED3F3E2361F8EDB83E2361F86B -:103D7C00ED013F2361F8EDD33FED303FF6BD74719B -:103D8C0013974005F901DF2C31349A1B466EDD0484 -:103D9C00F424EF02A4244A2465DC0FF6BD6EF5046E -:103DAC00F9712299ED5840FDB123AD6E440A0061C2 -:103DBC00D8ED5840714299FD9804716396FDB1237A -:103DCC004007F903DF09712299F504F9ED5840FD1C -:103DDC007E2640B1FB9BDE09712299F504F9ED5862 -:103DEC0040714A277140110571301105713A2271E9 -:103DFC005A2271501105FDD829D2DD09712299F58D -:103E0C0004F9ED584071103500CF37001D71401288 -:103E1C0005FD3F2A4005F901DD064005F903DF05E4 -:103E2C00F5CDFBEF04CFCDFB03CF04F902FDAA299E -:103E3C00ED584071103500CF37001D71401205FD53 -:103E4C00E92CFD0605FD9C35FD1331F537FF712B73 -:103E5C00E0F505F9712299CBE43FEFCBE6F6F0FDE6 -:103E6C009804713BD48F06F93105225002FDD62BF4 -:103E7C00D261E87170B3FB5004FDD62B625C033148 -:103E8C008E315D34B3FB89616899FDB123FDF32D4F -:103E9C00710806F9CF04F9038FA6FB5C02D1DD098A -:103EAC005080C15010FD4E35C0ED5840FD5A403188 -:103EBC0064992FA47ED47EDD0831A4E00A31020C73 -:103ECC0006712BE0FDCE4031A4E01731040C1371C8 -:103EDC002BE05027C15005FDC52BC0CF04F9047150 -:103EEC002299FDC3408F06F931250731349A03F529 -:103EFC0004F9ED5840FD5A4031020C15D83AC15026 -:103F0C0005FDC52BC05005FD220AFDCE40CF04F99E -:103F1C0003FDC3408F06F931250731349A03F504AC -:103F2C00F9ED5840F504F9CFCDFB03F5CEFBF5D0F8 -:103F3C00FB717297F6426CFF61E8ED5840F6BD7468 -:103F4C00711397F5E4FBFDDA39717AFAFD712EFDE8 -:103F5C003C2DFD5805712B21714B9D31349702EF8F -:103F6C00FACE3708CBE4BFFFCBE6FFF3CED4FFF598 -:103F7C00B4FBF5B5FBF5B6FBF5B7FBCF3700097114 -:103F8C00481205F6BEE0BEE2BED0716A27FD522A89 -:103F9C00714307714B277148100571481105713831 -:103FAC00100571381105713302713B227153027186 -:103FBC005B227158100571581105CF04F905714237 -:103FCC0099F6BD6EFD0F0AF505F9F424712810055C -:103FDC0031349A04D432DD20E505F9E504F98F0675 -:103FEC00F9312568F5F8FBF5F6FB502EFD220ACFCA -:103FFC0005F903E504F9EF54FDEC04FD442371735A -:10400C000171320471430271039671629631949E70 -:10401C0002EFFA712AE7CEA409F5F3003104070286 -:10402C0061FDE5F300F46AFD4609CEA40831329A2D -:10403C0006CF04F905EF09714399E505F9E504F993 -:10404C00712BE78F06F9312503F504F9C6D78FE3F9 -:10405C00FB5C01D1DF60D47FDF19310200585003C3 -:10406C00FDD62B625C01D1DF07F504F9712299D7DB -:10407C00E47FD74A7FF0DF073104003AF47FD74A58 -:10408C007FC8DF0AF504F9712299CD7FF0D7310290 -:10409C0000084A7FFFDD1FA47FD7F0C15004FDC587 -:1040AC002BC08FB3FB5C9F9FB3FB7110C4FB3025FF -:1040BC003C6194CD7FF0D731149706F504F9712249 -:1040CC0099D7716399F47E717207FD64027173075D -:1040DC00D7FD6105F2D7717BFAC7200CFBF8FF8F77 -:1040EC00EAFBF0F9E9FBF303FD2A4F13BC048FEC58 -:1040FC00FBF0F9EBFBF303FD2A4F13BC028FEEFB35 -:10410C00F0F9EDFBF303FD2A4F13BB717AFAAC0403 -:10411C00BDD8F6BDDAAC04311EBDDCF6BDDEFDE665 -:10412C000DADD8BDDCADDABDDEAC02BDD8F6BDDA66 -:10413C00AC02311EDADCC3DADEC3BDDCF6BDDEFD5B -:10414C00E60DC0BDDEC0BDDCADDEFD5C0FADD8BD87 -:10415C00DCADDABDDEABBDD8F6BDDAAB311EDADCD8 -:10416C00C3DADEC3BDDCF6BDDEFDE60DC0BDDEC0D0 -:10417C00BDDCADDEFD5C0FDADAADD8FDB144C3C5F4 -:10418C008D8C5C3FF0317E0440FC14C2C0B9A48C11 -:10419C00F6BC08BC0A9C078C074C2EDD3D8D8C0EA2 -:1041AC000770F161DC605C3FF0317E127940FCBD40 -:1041BC00D8F6BDDA8C0773095C22318FBDDC70BD7B -:1041CC00DEFDE60DAC08BDDCAC0AFD5C0FADDABC67 -:1041DC000AADD8BC08615907EFBDAC08BDD8AC0A14 -:1041EC00BDDAC9DC0004F6FDB00EC9DCFFFFF6FD3C -:1041FC00B10FADD8BD86AF3AFC4686DD11AF3CFCA5 -:10420C00BF3EFCAF3AFCBF3CFCAD86BF3AFCAF3CBA -:10421C00FC423EFCDC46AF3AFC423CFCDE3EAD26AA -:10422C00423AFCDE374A2A16DC1A4A2AA0DE138DE3 -:10423C00884B2ADE0DAF3AFC268A44691061C8FD12 -:10424C009A42F42AAF3AFC445146DC0AAF3AFC24B9 -:10425C001027BD28EF0DC928F82AEF074A2AFF615D -:10426C00E8A42AAF3EFC423CFCDC18AF3CFC423AD2 -:10427C00FCDE10AF3AFC4628DE09F488AF3AFCBDF0 -:10428C008AEF074A88FF61E8A488100CC6D7717BB7 -:10429C00FAC7710A9E31929E02EFFA8E949F34FCFB -:1042AC008E969F35FC8E979F36FC8E989F37FC8E92 -:1042BC00939F38FC8E929F39FC710B9E717AFA8F0A -:1042CC0037FCFDC50F76FD2F4413BD84D5EFFBDF06 -:1042DC000AD5F0FBDF05D5F1FBDD25F6B14684DF11 -:1042EC0011C9843722665C0391DF060A84181A858B -:1042FC00009617FD524513FD724331049A02EF618B -:10430C00520692926934FC682EFCDFF6AD84BD82B5 -:10431C00F880F3311C790AF944FEFFDD44D880F1B2 -:10432C0001040AF914A944FFFFDF04E6B9EF0BD826 -:10433C0080F101040AF914A9A1B9717BFAA0EFFB71 -:10434C00D5EFFBDF1CA0F0FBD5F0FBDF14A0F1FBDD -:10435C00D5F1FBDF0CCFEFFBFFCFF0FBFFCFF1FB79 -:10436C00FFC6717AFAD7C716D880F10744A800DCCB -:10437C000571029AEF1CF647DD18A4804A80A8DC70 -:10438C000571029AEF0CF880F3311CF6780AF9B734 -:10439C00EFE4C6D7C756A89666F0317E12F6B17810 -:1043AC000AF966D1DFF1717BFAF5EFFBF5F0FBF55D -:1043BC00F1FBF48071039AC6717AFAD7C72004FB1B -:1043CC00F8FFD44ADF168D809D8D717BFA520692D0 -:1043DC0092692EFC68C0FCDFF6717AFA4A4A06DE56 -:1043EC000EE84A09C0FC9C03A44A8C0372EF30F817 -:1043FC008DF3311C790AF9BB31129A058B9C03EFB2 -:10440C000F8C019C03D48DDF05CD8DA7EF02B48DED -:10441C00718071179A61DC61FB71119A8C037210B7 -:10442C0004C6D7C72008FBF8FF8F37FCFDC50F9CCF -:10443C00078F36FCFDC50F9C068F35FCFDC50F9C08 -:10444C00058F34FCFDC50F9C048F38FC9C038F3901 -:10445C00FC9C028C06318E0112791A20BB8C075CF5 -:10446C0003D1DF098C064C0361C86179008C0531DE -:10447C008EB1610900BB313D120103BB8B0E047080 -:10448C008C011C00BB8FF4FB4E03DC0E8C034FF431 -:10449C00FBDC0B8C024FF5FBDC04AB12EF03ABB176 -:1044AC00121008C6D7C7C3C12008FBF8FFF6614934 -:1044BC000A61F8614908DF07F7340000ED4E45E664 -:1044CC00BC04F6BC06AC0ABC02AC08BBAC06614929 -:1044DC0002AC0461F8614900DE28AC04BDD8AC061E -:1044EC00BDDAE1FD6B0FADDABC06ADD8BC04ABBDDB -:1044FC00D8AC02BDDAE1FD860FADDABC02ADD8BB9B -:10450C00EFCAAC06BC02AC04BBAC08BDD8AC0ABD4F -:10451C00DAAC04BDDCAC06FDE90EAC04BDDCAC06CB -:10452C00FD5C0FE1FD860FADDABC06ADD8BC04AC6A -:10453C0006614902AC0461F8614900DCC5AC0214A7 -:10454C00AB12100CC6D7C7C12004FBF8FF8F31FC8F -:10455C00FDC50F9C034E04DF1CAD824684DE07AD07 -:10456C0084268212EF40F64684DF074682DD03E79D -:10457C00EF34F7EF318C04318EB1128C03318E4352 -:10458C00DF1830382226820684BB8C045C0391DF52 -:10459C0005AB041800BBAB12EF0C8C034E04DE050C -:1045AC0032A900EF01F71006C6D7717BFA31229AB7 -:1045BC000CF64690DD07B690717AFAEF7C71239A6F -:1045CC00717AFA4004F904DF07715307F42CEF6990 -:1045DC00D9CFFBF1E7240000DD0F23DD1A23DD101A -:1045EC0023DD5323DD2723DD38715307F42CEF49EA -:1045FC00715207F42CEF42D42CDF07715207E42CD4 -:10460C00EF05715307F42CC990FA00EF2CD42CDF72 -:10461C000B715207E42CC990FA00EF1DF5CFFBEF9C -:10462C0018D42CDF0B715307E42CC990FA00EF0956 -:10463C00CFCFFB02EF03FD4646D7D905FCF1E724AB -:10464C000000DD0923DD2123DD0923EF1B71530756 -:10465C00F42CD7D42CDF07715207E42CEF057153DF -:10466C0007F42CC9902D01D7715207E42CD7316275 -:10467C009701D7710398D9CDFBF1E7240000DD1227 -:10468C0023DD1923DD1123DD2623DD3423DD39233E -:10469C00DD3FFD0647EF3DFD2747EF38D9CCFBC189 -:1046AC00AE6CFD9A2DC0F313BE6C712304EF25F094 -:1046BC00C1AE6CFD9A2DC0F313BE6C712304EF14C4 -:1046CC00F6BE6C712204EF0CCB6CFF00712304EF6F -:1046DC0003FD9B474004F905DD064004F901DF06A4 -:1046EC007123047103983104980FF6BE64BE6A31CD -:1046FC00220402EF02F690BE6ED7CD2E47F492AE96 -:10470C006C317DBFCAFCFD7047D2DF0ED9CCFBC12A -:10471C00AE6CFD9A2DC0F313BE6CD7FD7047D2DD85 -:10472C000DCD2E47F492AE6C317DBFCAFCD7E8920A -:10473C000934205080D6BFC6FC22CAFCBDD83047F5 -:10474C0000FD110EBFC8FC30C6FCFDB02DF313BE2E -:10475C006CB42ED42EDF0CCD2E47A4924A921F613E -:10476C00C8F492D740AFFB0BDC05712304F2D740A1 -:10477C00AFFB0661D831229611F0C1AE6CFD9A2DBB -:10478C00C0F313BE6C712204EF03FD9B47E2D7719B -:10479C000298F0C1AE6CFD9A2DC0F313BE6CA493BD -:1047AC004A9340DC37F493D894F1313F0412FD1452 -:1047BC00D894F1BDD85008FD600E087208E6D2DD21 -:1047CC00040192DFFC896158D1DD05712204EF03ED -:1047DC00712304A4944A942061C8F494D7C730265A -:1047EC00FDC6D77180717DFADE035201D75200D716 -:1047FC00C7C12004FBF8FF17040300C1E0C150102F -:10480C00C150A4FDB1021006629C02D1DD058C02E0 -:10481C0072EF518C0C70C18C0470FD7448C0629C9A -:10482C0002D1DD058C0272EF3B8C035C7DD1DF0382 -:10483C00F2EF3117A1C1E0C15010C150A4FDB1027B -:10484C001006629C02D1DD058C0272EF178C015CA4 -:10485C007DD1DD03F2EF0D8C0370C15010FD744857 -:10486C00C0629C021006C6D7C7880616710AE650AD -:10487C00A4FDE503D2DD077133975202EF1317FD48 -:10488C0001046770FD0104FD9F48FD7504713397A9 -:10489C00F2C6D7FD4C0450A4FD01045020FD0104C8 -:0548AC0050AAED01041B -:1048B10061FC61FCC1C3C5C7520C929269D4FEC1AF -:1048C100DFF88EFD708EFCC1717AFA4004F903DFC6 -:1048D1000530802A6194C09EFC609EFD34D4FE5256 -:1048E10006C0B9A5A592DFF9C6C4C2C061FC61DFEB -:1048F100520C929269D4FEC1DFF88EFD708EFCC11C -:104901008F4105775C04D1DD06675C01D1DD503153 -:104911005498367162077153988FB4FB5FBCFBD119 -:10492100DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE17 -:10493100FBD1DF098FB7FB5FBFFBD1DD0C31620714 -:1049410002EFFA716307716B2771139AFDBF30F49F -:10495100227148500571605005717AFAED4B4A6732 -:104961005C02D1DD16D422DD124A2202DD0DF422D1 -:104971007148500571605005717AFA717AFA8D2289 -:10498100318FE7240000DD0823DD1423DD2CEF4AFD -:10499100F44A7140500571505005E422ED4B4A8FA5 -:1049A10040059D4B715050058D4B9D4DD84BFD8958 -:1049B10034629D4CCD2202ED4B4A675C02D1DD177A -:1049C100675C10D1DD05CD2203EF0F7148500571F1 -:1049D100605005F422EF73CD22044A2203DF108DCB -:1049E1004C9F4005D84CC1D84BFD2035C0EF1F8FDF -:1049F10040057671744BDC054A4B02DE067160504E -:104A010005EF47C7D84BFD4F31C071505005D84D08 -:104A1100F1242900DD27240400DD22242200DD1DEC -:104A2100241100DD0C240100DD13241E00DD0EEF36 -:104A31000A4A4B60DF07CD4B61EF02A44B4A2203C8 -:104A4100DF08D84BFD8934629D4CC09EFC609EFD01 -:104A510034D4FE5206C0B9A5A592DFF961FCC1C3E9 -:104A6100C5C7520C929269D4FEC1DFF88EFD708EDB -:104A7100FCC1717AFA51405F0401D1DD06F616A737 -:104A810047DFF2300400BF2401F6BF2A01300B0BCF -:104A9100BF2801FD6402300B0FBF2801FD64023005 -:104AA1000F0FBF2801710AE6F6420C01DD33AF0496 -:104AB10001BF0C0131529729715297710BE2D85104 -:104AC100FDE5033184BD02EFFACBB422FBD853F1EB -:104AD100BEB8714BE1714BE5710ABD8D529E44EF39 -:104AE1000C715397714AE5717BBD713397C09EFC80 -:104AF100609EFD34D4FE5206C0B9A5A592DFF9C669 -:104B0100C4C2C061FCC1C5717AFAD450DD0BEA4E52 -:104B1100899E44A64EB450EF33710AE6300400BFBB -:104B21002401F6BF2A01300B0BBF28010000000051 -:104B310000000000510FBF2801000000000000002C -:104B410000500FBF2801712397713397C4C061FCD6 -:104B510061EF520C929269D4FEC1DFF88EFD708E26 -:104B6100FCC12006FBF8FF71503002CEABACCC0487 -:104B710000F6BB31B2E210617900F6614900DFF362 -:104B810071603002ED0B4C8E519C03713BE28C0342 -:104B91005C02D1DD1E8C035C08D1DF09715030024B -:104BA100CC0400EFCC8C0570FD0236629E50CC0423 -:104BB10002EFBE8C035C03D1DF408E509C0271502A -:104BC10030028C04D1DF0E8C0270FD4836629C05E8 -:104BD100CC0401EF328C044C02DF0671603002EF2D -:104BE10029CF34025A716030028C0270C18C057079 -:104BF100FDAA35C0CF34024AEF108C035C01D1DD30 -:104C01000671603002EF03ED724B1006C09EFC602E -:104C11009EFD34D4FE5206C0B9A5A592DFF961FC10 -:104C2100C1C3C5C7520C929269D4FEC1DFF88EFD93 -:104C3100708EFCC1710A9E31929E02EFFA8FDEFBEB -:104C41004F96FFDF198FDFFB4F97FFDF118FE0FBDF -:104C51004F98FFDF095004C15011FD4E35C0710B53 -:104C61009EC09EFC609EFD34D4FE5206C0B9A5A52F -:104C710092DFF9C6C4C2C061FCE46A61FCC1C3C56C -:104C8100C7520C929269D4FEC1DFF88EFD708EFC82 -:104C9100C1C1FBF8FF8D1F9C018E31318EE72406C7 -:104CA10000DD0823DD0E23DD22EF38717AFA8C0155 -:104CB1009D62EF2F717AFA4007F901DF068C019DA1 -:104CC10061EF2051FF2E019D61EF18717AFA8C017D -:104CD1009D304004F903DD064004F904DF0530DCB2 -:104CE1002561944031FF09DE05A031FFEF077158BE -:104CF100F000716298710BE3C0C09EFC609EFD34B0 -:104D0100D4FE5206C0B9A5A592DFF9C6C4C2C061DE -:104D1100FC717BFAC7D46A61F83124992771239910 -:104D2100D46ADD05B46ACEABAC717AFA5600664C32 -:104D31000ADD1172F3311C79D8FCCEFC0061CA6125 -:104D4100A486EFEA717AFAF2C6D7C7C1C1FBF8FFB0 -:104D5100CC01008C014C0ADE36717BFA8C01F031FA -:104D61007E0410FC14A96168DF09AC02B9717AFAFA -:104D7100F2EF1D8C01F0317E127910FC614902DFE6 -:104D810006717AFAE2EF09717AFA615901EFC4E228 -:104D91001004C6D7C72004FBF8FFF64210FC61F8E7 -:104DA100ED774E717BFA9C038C034C0ADE3C8C033D -:104DB100F0317E0410FC14A96168DF05717AFAEF05 -:104DC10029717AFA8C0372F3311C7910FCCEFC0044 -:104DD10061CA629C02D1DF0A8C03F0317E12E6784F -:104DE10010FC717BFA615903EFBECC0200CC0101CA -:104DF1008C02F0317E0410FC14A96168DD788C020C -:104E0100F0317E127910FCE743DF658C014C0ADE3C -:104E11005F8C01F0317E127910FCE743DD4D717B2F -:104E2100FA8C01F0317E0410FC14A96168DF18616D -:104E310069018C01F0317E12F67810FC8C024E0172 -:104E4100DCED717AFAEF2F8C01F0317E0410FC1445 -:104E5100A9128C02F0317E337810FC8C01F0317E86 -:104E610012E67810FC615902717AFA615901EF9BDF -:104E7100615902EDF14D00F21004C6D761FF520CE9 -:104E8100929269D4FEC1DFF88EFD708EFCC1717AF9 -:104E9100FA8FE4FB5C03D1DD114004F903DD064028 -:104EA10004F904DF05300E396194C09EFC609EFD5B -:104EB10034D4FE5206C0B9A5A592DFF961FC61FCAC -:044EC10061FC61FC33 -:0A4EC60000060C12181E242A3036D4 -:104ED000ACFB0000000066FE00000000633A95365F -:104EE0008C227A469C2E5B2FB645943BD108583DC8 -:104EF00028FC36FE20FE02F903F929FC30FE2AFCCC -:104F00002BFC08F926FC6CFF1AFF6EFF6AFF64FF9A -:0A4F100027FC66FF2CFC5555555593 -:104F1A00FF0000000000983AF82AFF00000047004E -:104F2A00317503F7332312D714AEF8C716AC06123D -:104F3A00C5AC0416F643DD078B99A7A5B3EFF5C2F6 -:024F4A00C6D7C8 -:024FF400336721 -:0A4FF60030393A34323A3238000004 +:103A8C00ED973B8F06F931234D301B00466EDF1945 +:103A9C008FE3FB5C01D161E8F504F931049B27E06D +:103AAC00C15010FD4E35C0EF1D307701466EDF164C +:103ABC005002C15010FD4E35C0F64674DF088FC859 +:103ACC00FB5010D6BD74F64674DD36B6744674DF02 +:103ADC0030711297EF2B301B00466EDF13F64676D3 +:103AEC00DF18E0C15010FD4E35C0C9765307EF0A00 +:103AFC00307701466E61F8711297F6467661E8B63A +:103B0C007631549A08714399F6BD6EEF143144998D +:103B1C0005F6BD6EEF0BA66EF6466E61F8C96EFF2C +:103B2C00FF31629A194A7005DE16A4704A7005DFDF +:103B3C000FA4705004C15010FD4E35C0EF02F4704C +:103B4C0031649A194A7205DE16A4724A7205DF0FA7 +:103B5C00A4725008C15010FD4E35C0EF02F472D45F +:103B6C0073DD03B473D731729A174A7105DE14A44E +:103B7C00714A7105DF0DA4715010C1FD4E35C0EFB7 +:103B8C0002F4714A710661F8CD7325D7C73610055A +:103B9C0071D4DE0E8FB2FB5C02D1DF06300E3961C0 +:103BAC0094D24004F903DF1C3122070530802A61CE +:103BBC00943154990C7153995080C15012FD4E356B +:103BCC00C0FDD53BFDFB3BC6D78F03FC5C01D1DDB3 +:103BDC001DD47BDD03B47BD7CD7B098D644B7ADDA3 +:103BEC000D8D649D7A5040C15012FD4E35C0D740AA +:103BFC0004F903DD04F6BD1AD7D5D0FBDF08F64671 +:103C0C001ADD19B61AD7D9CCFBF1461ADD0ED9CC70 +:103C1C00FB12AD1A43DE03A61AD7B61AD7717BFA7C +:103C2C00C78FC4FB76F5C4FB717AFA5C10D161E8DE +:103C3C00716299665C0FD1DD52665C01D1DD05F5D0 +:103C4C0004F9EF47665C02D1DD0CFDD32C71130037 +:103C5C00711B20710303665C04D1DD1171130071BB +:103C6C001B20D503FC61F8710303FD9C35665C08D1 +:103C7C00D161E87103035005FD220A710203500360 +:103C8C00C1FDC52BC0711A20FD6D2BF2C6D7C756CE +:103C9C00FF4A4A1361C8ED583D8F06F931150D31B5 +:103CAC004505300600EF14300400EF0F8F06F93194 +:103CBC004505300500EF04D907F9F1609F28FC8D0C +:103CCC007C9F29FC713496E661301271049661DC9C +:103CDC0031196162629F2AFCE52BFC31449A053054 +:103CEC004000EF01F6C131340405302000EF01F63D +:103CFC00C2616B08616A08C131749A05300400EF27 +:103D0C0001F6C2616B08616A08C131649A04E6A1CC +:103D1C00EF01F6C2616B08616A08C131549A03E67F +:103D2C00EF01F6C2616B08616A9F2CFCF1712404EF +:103D3C0061DC9F26FCF171540761DC9F27FCD84A9B +:103D4C00F10104ECFC14A9148976A44A6672C6D756 +:103D5C00C7FD46098F04F9318FE724000061F8EDA7 +:103D6C00373F23DD1B2361F8ED433E2361F8EDBCA7 +:103D7C003E2361F8ED053F2361F8EDD73FED343F6D +:103D8C00F6BD747113974005F901DF2C31349A1B81 +:103D9C00466EDD04F424EF02A4244A2465DC0FF6FD +:103DAC00BD6EF504F9712299ED5C40FDB123AD6E49 +:103DBC00440A0061D8ED5C40714299FD980471632E +:103DCC0096FDB1234007F903DF09712299F504F937 +:103DDC00ED5C40FD7E2640B1FB9BDE09712299F51E +:103DEC0004F9ED5C40714A277140110571301105E1 +:103DFC00713A22715A2271501105FDD829D2DD0970 +:103E0C00712299F504F9ED5C4071103500CF370043 +:103E1C001D71401205FD3F2A4005F901DD064005E4 +:103E2C00F903DF05F5CDFBEF04CFCDFB03CF04F990 +:103E3C0002FDAA29ED5C4071103500CF37001D71D1 +:103E4C00401205FDE92CFD0605FD9C35FD1331F5F1 +:103E5C0037FF712BE0F505F9712299CBE43FEFCBDD +:103E6C00E6F6F0FD9804713BD48F06F9310522502B +:103E7C0002FDD62BD261E87170B3FB5004FDD62B3A +:103E8C00625C03318E315D34B3FB89616899FDB19D +:103E9C0023FDF32D710806F9CF04F9038FA6FB5C03 +:103EAC0002D1DD095080C15010FD4E35C0ED5C4093 +:103EBC00FD5E403164992FA47ED47EDD0831A4E0F0 +:103ECC000A31020C06712BE0FDD24031A4E017310F +:103EDC00040C13712BE05027C15005FDC52BC0CF2E +:103EEC0004F904712299FDC7408F06F93125073179 +:103EFC00349A03F504F9ED5C40FD5E4031020C157B +:103F0C00D83AC15005FDC52BC05005FD220AFDD283 +:103F1C0040CF04F903FDC7408F06F9312507313432 +:103F2C009A03F504F9ED5C40F504F9CFCDFB03F5EC +:103F3C00CEFBF5D0FB717297F6426CFF61E8ED5C3D +:103F4C0040F6BD74711397F5E4FBFDDA39717AFA1A +:103F5C00FD712EFD3C2DFD5805712B21714B9D31B2 +:103F6C00349702EFFACE3708CBE4BFFFCBE6FFF372 +:103F7C00CED4FFF5B4FBF5B5FBF5B6FBF5B7FBCF2F +:103F8C0037000971481205F6BEE0BEE2BED0716A78 +:103F9C0027FD522A714307714B2771481005714850 +:103FAC0011057138100571381105713302713B22FE +:103FBC00715302715B227158100571581105CF04B1 +:103FCC00F905714299F6BD6EFD0F0AF505F9F42459 +:103FDC007128100531349A04D432DD20E505F9E559 +:103FEC0004F98F06F9312568F5F8FBF5F6FB502E30 +:103FFC00FD220ACF05F903E504F9EF54FDEC04FDAD +:10400C00442371730171320471430271039671621E +:10401C009631949E02EFFA712AE7CEA409F5F300CB +:10402C003104070261FDE5F300F46AFD4609CEA4F4 +:10403C000831329A06CF04F905EF09714399E50569 +:10404C00F9E504F9712BE78F06F9312503F504F92D +:10405C00C6D78FE3FB5C01D1DF60D47FDF1931025F +:10406C0000585003FDD62B625C01D1DF07F504F933 +:10407C00712299D7E47FD74A7FF0DF073104003AE9 +:10408C00F47FD74A7FC8DF0AF504F9712299CD7FF6 +:10409C00F0D7310200084A7FFFDD1FA47FD7F0C1A3 +:1040AC005004FDC52BC08FB3FB5C9F9FB3FB7110FD +:1040BC00C4FB30293C6194CD7FF0D731149706F5C1 +:1040CC0004F9712299D7716399F47E717207FD64BA +:1040DC0002717307D7FD6105F2D7717BFAC7200C0B +:1040EC00FBF8FF8FEAFBF0F9E9FBF303FD2E4F130E +:1040FC00BC048FECFBF0F9EBFBF303FD2E4F13BC70 +:10410C00028FEEFBF0F9EDFBF303FD2E4F13BB71A9 +:10411C007AFAAC04BDD8F6BDDAAC04311EBDDCF6BF +:10412C00BDDEFDE60DADD8BDDCADDABDDEAC02BD4D +:10413C00D8F6BDDAAC02311EDADCC3DADEC3BDDC84 +:10414C00F6BDDEFDE60DC0BDDEC0BDDCADDEFD5C4A +:10415C000FADD8BDDCADDABDDEABBDD8F6BDDAAB8C +:10416C00311EDADCC3DADEC3BDDCF6BDDEFDE60DE6 +:10417C00C0BDDEC0BDDCADDEFD5C0FDADAADD8FD56 +:10418C00B544C3C58D8C5C3FF0317E0440FC14C239 +:10419C00C0B9A48CF6BC08BC0A9C078C074C2EDD5D +:1041AC003D8D8C0E0770F161DC605C3FF0317E124E +:1041BC007940FCBDD8F6BDDA8C0773095C22318FCF +:1041CC00BDDC70BDDEFDE60DAC08BDDCAC0AFD5CF3 +:1041DC000FADDABC0AADD8BC08615907EFBDAC080D +:1041EC00BDD8AC0ABDDAC9DC0004F6FDB00EC9DCE2 +:1041FC00FFFFF6FDB10FADD8BD86AF3AFC4686DDAC +:10420C0011AF3CFCBF3EFCAF3AFCBF3CFCAD86BFE3 +:10421C003AFCAF3CFC423EFCDC46AF3AFC423CFC78 +:10422C00DE3EAD26423AFCDE374A2A16DC1A4A2A12 +:10423C00A0DE138D884B2ADE0DAF3AFC268A44692A +:10424C001061C8FD9E42F42AAF3AFC445146DC0A88 +:10425C00AF3AFC241027BD28EF0DC928F82AEF0728 +:10426C004A2AFF61E8A42AAF3EFC423CFCDC18AFB2 +:10427C003CFC423AFCDE10AF3AFC4628DE09F488DE +:10428C00AF3AFCBD8AEF074A88FF61E8A488100C9E +:10429C00C6D7717BFAC7710A9E31929E02EFFA8ED5 +:1042AC00949F34FC8E969F35FC8E979F36FC8E988F +:1042BC009F37FC8E939F38FC8E929F39FC710B9E1E +:1042CC00717AFA8F37FCFDC50F76FD334413BD842C +:1042DC00D5EFFBDF0AD5F0FBDF05D5F1FBDD25F6CD +:1042EC00B14684DF11C9843722665C0391DF060A6C +:1042FC0084181A85009617FD564513FD7643310434 +:10430C009A02EF61520692926934FC682EFCDFF639 +:10431C00AD84BD82F880F3311C790AF944FEFFDDCF +:10432C0044D880F101040AF914A944FFFFDF04E624 +:10433C00B9EF0BD880F101040AF914A9A1B9717B6A +:10434C00FAA0EFFBD5EFFBDF1CA0F0FBD5F0FBDFF9 +:10435C0014A0F1FBD5F1FBDF0CCFEFFBFFCFF0FB93 +:10436C00FFCFF1FBFFC6717AFAD7C716D880F107D9 +:10437C0044A800DC0571029AEF1CF647DD18A480F6 +:10438C004A80A8DC0571029AEF0CF880F3311CF618 +:10439C00780AF9B7EFE4C6D7C756A89666F0317E0F +:1043AC0012F6B1780AF966D1DFF1717BFAF5EFFB01 +:1043BC00F5F0FBF5F1FBF48071039AC6717AFAD72C +:1043CC00C72004FBF8FFD44ADF168D809D8D717BCE +:1043DC00FA52069292692EFC68C0FCDFF6717AFAEA +:1043EC004A4A06DE0EE84A09C0FC9C03A44A8C0328 +:1043FC0072EF30F88DF3311C790AF9BB31129A0542 +:10440C008B9C03EF0F8C019C03D48DDF05CD8DA706 +:10441C00EF02B48D718071179A61DC61FB71119A96 +:10442C008C03721004C6D7C72008FBF8FF8F37FC2B +:10443C00FDC50F9C078F36FCFDC50F9C068F35FC08 +:10444C00FDC50F9C058F34FCFDC50F9C048F38FCFB +:10445C009C038F39FC9C028C06318E0112791A2038 +:10446C00BB8C075C03D1DF098C064C0361C86179F6 +:10447C00008C05318EB1610900BB313D120103BBCB +:10448C008B0E04708C011C00BB8FF4FB4E03DC0EF6 +:10449C008C034FF4FBDC0B8C024FF5FBDC04AB12F2 +:1044AC00EF03ABB1121008C6D7C7C3C12008FBF885 +:1044BC00FFF661490A61F8614908DF07F73400002B +:1044CC00ED5245E6BC04F6BC06AC0ABC02AC08BB1B +:1044DC00AC06614902AC0461F8614900DE28AC0409 +:1044EC00BDD8AC06BDDAE1FD6B0FADDABC06ADD8BC +:1044FC00BC04ABBDD8AC02BDDAE1FD860FADDABCB5 +:10450C0002ADD8BBEFCAAC06BC02AC04BBAC08BD58 +:10451C00D8AC0ABDDAAC04BDDCAC06FDE90EAC04CB +:10452C00BDDCAC06FD5C0FE1FD860FADDABC06AD63 +:10453C00D8BC04AC06614902AC0461F8614900DCEA +:10454C00C5AC0214AB12100CC6D7C7C12004FBF8C3 +:10455C00FF8F31FCFDC50F9C034E04DF1CAD824662 +:10456C0084DE07AD84268212EF40F64684DF0746D0 +:10457C0082DD03E7EF34F7EF318C04318EB1128C0E +:10458C0003318E43DF1830382226820684BB8C041C +:10459C005C0391DF05AB041800BBAB12EF0C8C0372 +:1045AC004E04DE0532A900EF01F71006C6D7717B69 +:1045BC00FA31229A0CF64690DD07B690717AFAEF32 +:1045CC007C71239A717AFA4004F904DF077153075E +:1045DC00F42CEF69D9CFFBF1E7240000DD0F23DDCC +:1045EC001A23DD1023DD5323DD2723DD3871530718 +:1045FC00F42CEF49715207F42CEF42D42CDF0771E5 +:10460C005207E42CEF05715307F42CC990FA00EF14 +:10461C002CD42CDF0B715207E42CC990FA00EF1D3F +:10462C00F5CFFBEF18D42CDF0B715307E42CC9909A +:10463C00FA00EF09CFCFFB02EF03FD4A46D7D905AD +:10464C00FCF1E7240000DD0923DD2123DD0923EF44 +:10465C001B715307F42CD7D42CDF07715207E42CB1 +:10466C00EF05715307F42CC9902D01D7715207E453 +:10467C002CD731629701D7710398D9CDFBF1E72480 +:10468C000000DD1223DD1923DD1123DD2623DD34AB +:10469C0023DD3923DD3FFD0A47EF3DFD2B47EF3886 +:1046AC00D9CCFBC1AE6CFD9A2DC0F313BE6C71233B +:1046BC0004EF25F0C1AE6CFD9A2DC0F313BE6C71E6 +:1046CC002304EF14F6BE6C712204EF0CCB6CFF00CC +:1046DC00712304EF03FD9F474004F905DD064004F8 +:1046EC00F901DF067123047103983104980FF6BEAB +:1046FC0064BE6A31220402EF02F690BE6ED7CD2E54 +:10470C0047F492AE6C317DBFCAFCFD7447D2DF0E0C +:10471C00D9CCFBC1AE6CFD9A2DC0F313BE6CD7FD8A +:10472C007447D2DD0DCD2E47F492AE6C317DBFCAED +:10473C00FCD7E8920934205080D6BFC6FC22CAFCB4 +:10474C00BDD8304700FD110EBFC8FC30C6FCFDB013 +:10475C002DF313BE6CB42ED42EDF0CCD2E47A492A9 +:10476C004A921F61C8F492D740AFFB0BDC05712352 +:10477C0004F2D740AFFB0661D831229611F0C1AEDE +:10478C006CFD9A2DC0F313BE6C712204EF03FD9FD8 +:10479C0047E2D7710298F0C1AE6CFD9A2DC0F313AD +:1047AC00BE6CA4934A9340DC37F493D894F1313F18 +:1047BC000412FD14D894F1BDD85008FD600E087297 +:1047CC0008E6D2DD040192DFFC896158D1DD057168 +:1047DC002204EF03712304A4944A942061C8F49436 +:1047EC00D7C73026FDC6D77180717DFADE03520122 +:1047FC00D75200D7C7C12004FBF8FF17040300C130 +:10480C00E0C15010C150A4FDB1021006629C02D14F +:10481C00DD058C0272EF518C0C70C18C0470FD782C +:10482C0048C0629C02D1DD058C0272EF3B8C035CAC +:10483C007DD1DF03F2EF3117A1C1E0C15010C1509F +:10484C00A4FDB1021006629C02D1DD058C0272EF50 +:10485C00178C015C7DD1DD03F2EF0D8C0370C15020 +:10486C0010FD7848C0629C021006C6D7C788061691 +:10487C00710AE650A4FDE503D2DD077133975202AD +:10488C00EF1317FD01046770FD0104FDA348FD75CE +:10489C0004713397F2C6D7FD4C0450A4FD010450AB +:0948AC0020FD010450AAED0104F5 +:1048B50061FC61FCC1C3C5C7520C929269D4FEC1AB +:1048C500DFF88EFD708EFCC1717AFA4004F903DFC2 +:1048D5000530802A6194C09EFC609EFD34D4FE5252 +:1048E50006C0B9A5A592DFF9C6C4C2C061FC61DFE7 +:1048F500520C929269D4FEC1DFF88EFD708EFCC118 +:104905008F4105775C04D1DD06675C01D1DD50314F +:104915005498367162077153988FB4FB5FBCFBD115 +:10492500DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE13 +:10493500FBD1DF098FB7FB5FBFFBD1DD0C31620710 +:1049450002EFFA716307716B2771139AFDBF30F49B +:10495500227148500571605005717AFAED4F4A672A +:104965005C02D1DD16D422DD124A2202DD0DF422CD +:104975007148500571605005717AFA717AFA8D2285 +:10498500318FE7240000DD0823DD1423DD2CEF4AF9 +:10499500F44A7140500571505005E422ED4F4A8F9D +:1049A50040059D4B715050058D4B9D4DD84BFD8954 +:1049B50034629D4CCD2202ED4F4A675C02D1DD1772 +:1049C500675C10D1DD05CD2203EF0F7148500571ED +:1049D500605005F422EF73CD22044A2203DF108DC7 +:1049E5004C9F4005D84CC1D84BFD2035C0EF1F8FDB +:1049F50040057671744BDC054A4B02DE067160504A +:104A050005EF47C7D84BFD4F31C071505005D84D04 +:104A1500F1242900DD27240400DD22242200DD1DE8 +:104A2500241100DD0C240100DD13241E00DD0EEF32 +:104A35000A4A4B60DF07CD4B61EF02A44B4A2203C4 +:104A4500DF08D84BFD8934629D4CC09EFC609EFDFD +:104A550034D4FE5206C0B9A5A592DFF961FCC1C3E5 +:104A6500C5C7520C929269D4FEC1DFF88EFD708ED7 +:104A7500FCC1717AFA51405F0401D1DD06F616A733 +:104A850047DFF2300400BF2401F6BF2A01300B0BCB +:104A9500BF2801FD6402300B0FBF2801FD64023001 +:104AA5000F0FBF2801710AE6F6420C01DD33AF0492 +:104AB50001BF0C0131529729715297710BE2D85100 +:104AC500FDE5033184BD02EFFACBB422FBD853F1E7 +:104AD500BEB8714BE1714BE5710ABD8D529E44EF35 +:104AE5000C715397714AE5717BBD713397C09EFC7C +:104AF500609EFD34D4FE5206C0B9A5A592DFF9C665 +:104B0500C4C2C061FCC1C5717AFAD450DD0BEA4E4E +:104B1500899E44A64EB450EF33710AE6300400BFB7 +:104B25002401F6BF2A01300B0BBF2801000000004D +:104B350000000000510FBF28010000000000000028 +:104B450000500FBF2801712397713397C4C061FCD2 +:104B550061EF520C929269D4FEC1DFF88EFD708E22 +:104B6500FCC12006FBF8FF71503002CEABACCC0483 +:104B750000F6BB31B2E210617900F6614900DFF35E +:104B850071603002ED0F4C8E519C03713BE28C033A +:104B95005C02D1DD1E8C035C08D1DF097150300247 +:104BA500CC0400EFCC8C0570FD0236629E50CC041F +:104BB50002EFBE8C035C03D1DF408E509C02715026 +:104BC50030028C04D1DF0E8C0270FD4836629C05E4 +:104BD500CC0401EF328C044C02DF0671603002EF29 +:104BE50029CF34025A716030028C0270C18C057075 +:104BF500FDAA35C0CF34024AEF108C035C01D1DD2C +:104C05000671603002EF03ED764B1006C09EFC6026 +:104C15009EFD34D4FE5206C0B9A5A592DFF961FC0C +:104C2500C1C3C5C7520C929269D4FEC1DFF88EFD8F +:104C3500708EFCC1710A9E31929E02EFFA8FDEFBE7 +:104C45004F96FFDF198FDFFB4F97FFDF118FE0FBDB +:104C55004F98FFDF095004C15011FD4E35C0710B4F +:104C65009EC09EFC609EFD34D4FE5206C0B9A5A52B +:104C750092DFF9C6C4C2C061FCE46A61FCC1C3C568 +:104C8500C7520C929269D4FEC1DFF88EFD708EFC7E +:104C9500C1C1FBF8FF8D1F9C018E31318EE72406C3 +:104CA50000DD0823DD0E23DD22EF38717AFA8C0151 +:104CB5009D62EF2F717AFA4007F901DF068C019D9D +:104CC50061EF2051FF2E019D61EF18717AFA8C0179 +:104CD5009D304004F903DD064004F904DF0530DCAE +:104CE5002561944031FF09DE05A031FFEF077158BA +:104CF500F000716298710BE3C0C09EFC609EFD34AC +:104D0500D4FE5206C0B9A5A592DFF9C6C4C2C061DA +:104D1500FC717BFAC7D46A61F8312499277123990C +:104D2500D46ADD05B46ACEABAC717AFA5600664C2E +:104D35000ADD1172F3311C79D8FCCEFC0061CA6121 +:104D4500A486EFEA717AFAF2C6D7C7C1C1FBF8FFAC +:104D5500CC01008C014C0ADE36717BFA8C01F031F6 +:104D65007E0410FC14A96168DF09AC02B9717AFAF6 +:104D7500F2EF1D8C01F0317E127910FC614902DFE2 +:104D850006717AFAE2EF09717AFA615901EFC4E224 +:104D95001004C6D7C72004FBF8FFF64210FC61F8E3 +:104DA500ED7B4E717BFA9C038C034C0ADE3C8C0335 +:104DB500F0317E0410FC14A96168DF05717AFAEF01 +:104DC50029717AFA8C0372F3311C7910FCCEFC0040 +:104DD50061CA629C02D1DF0A8C03F0317E12E6784B +:104DE50010FC717BFA615903EFBECC0200CC0101C6 +:104DF5008C02F0317E0410FC14A96168DD788C0208 +:104E0500F0317E127910FCE743DF658C014C0ADE38 +:104E15005F8C01F0317E127910FCE743DD4D717B2B +:104E2500FA8C01F0317E0410FC14A96168DF186169 +:104E350069018C01F0317E12F67810FC8C024E016E +:104E4500DCED717AFAEF2F8C01F0317E0410FC1441 +:104E5500A9128C02F0317E337810FC8C01F0317E82 +:104E650012E67810FC615902717AFA615901EF9BDB +:104E7500615902EDF54D00F21004C6D761FF520CE1 +:104E8500929269D4FEC1DFF88EFD708EFCC1717AF5 +:104E9500FA8FE4FB5C03D1DD114004F903DD064024 +:104EA50004F904DF05300E396194C09EFC609EFD57 +:104EB50034D4FE5206C0B9A5A592DFF961FC61FCA8 +:044EC50061FC61FC2F +:0A4ECA0000060C12181E242A3036D0 +:104ED400ACFB0000000066FE00000000633A95365B +:104EE4008C227E469C2E5B2FBA45983BD1085C3DB4 +:104EF40028FC36FE20FE02F903F929FC30FE2AFCC8 +:104F04002BFC08F926FC6CFF1AFF6EFF6AFF64FF96 +:0A4F140027FC66FF2CFC555555558F +:104F1E00FF0000000000983AF82AFF00000047004A +:104F2E00317503F7332312D714AEF8C716AC061239 +:104F3E00C5AC0416F643DD078B99A7A5B3EFF5C2F2 +:024F4E00C6D7C4 +:024FF400336820 +:0A4FF60030393A30363A3236000006 :00000001FF  \ No newline at end of file diff --git a/snake_trunk/bsr.lmf b/snake_trunk/bsr.lmf index 867e5b8..ec10851 100644 Binary files a/snake_trunk/bsr.lmf and b/snake_trunk/bsr.lmf differ diff --git a/snake_trunk/bsr_k0r.map b/snake_trunk/bsr_k0r.map index 1a379be..2abe347 100644 --- a/snake_trunk/bsr_k0r.map +++ b/snake_trunk/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.33 Date:13 Feb 2014 Page: 1 +78K0R Linker W1.33 Date:13 Mar 2014 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 *** 73 output segment(s) - 3EA0H byte(s) real data - 6417 symbol(s) defined + 3EA4H byte(s) real data + 6421 symbol(s) defined *** Memory map *** @@ -258,7 +258,7 @@ Direc-file:bsr_mcu.dr 0228CH 00000H @@CNST i2c_mcu-sub 0228CH 00000H - ROM_CODE 0228CH 02625H CSEG + ROM_CODE 0228CH 02629H CSEG ROM_CODE pm 0228CH 00A5DH ROM_CODE i2c_ctr 02CE9H 0005CH ROM_CODE main 02D45H 00055H @@ -269,288 +269,288 @@ Direc-file:bsr_mcu.dr ROM_CODE adc 03695H 00261H ROM_CODE renge 038F6H 00018H ROM_CODE accero 0390EH 00155H - ROM_CODE sw 03A63H 00131H + ROM_CODE sw 03A63H 00135H ROM_CODE task_misc - 03B94H 001C4H - ROM_CODE task_sys 03D58H 0038AH + 03B98H 001C4H + ROM_CODE task_sys 03D5CH 0038AH ROM_CODE pedo_alg_thre_det2 - 040E2H 004D4H - ROM_CODE led_cam 045B6H 000C4H - ROM_CODE led_pow 0467AH 0016FH - ROM_CODE voltable 047E9H 00000H + 040E6H 004D4H + ROM_CODE led_cam 045BAH 000C4H + ROM_CODE led_pow 0467EH 0016FH + ROM_CODE voltable 047EDH 00000H ROM_CODE pedo_lpf_coeff - 047E9H 00000H + 047EDH 00000H ROM_CODE kanaria_c - 047E9H 00006H - ROM_CODE get_ei 047EFH 0000DH + 047EDH 00006H + ROM_CODE get_ei 047F3H 0000DH ROM_CODE i2c_mcu-sub - 047FCH 000B5H - @@BASE 048B1H 00614H CSEG BASE - @@BASE loader 048B1H 00000H - @@BASE pm 048B1H 0003EH - @@BASE i2c_ctr 048EFH 00170H - @@BASE main 04A5FH 00000H - @@BASE magic 04A5FH 00000H - @@BASE WDT 04A5FH 00000H - @@BASE i2c_mcu 04A5FH 000F2H - @@BASE i2c_twl 04B51H 000D0H - @@BASE led 04C21H 00000H - @@BASE rtc 04C21H 0005DH - @@BASE vreg_ctr 04C7EH 00000H - @@BASE vreg_twl 04C7EH 00000H - @@BASE adc 04C7EH 00094H - @@BASE renge 04D12H 0016BH - @@BASE accero 04E7DH 00042H + 04800H 000B5H + @@BASE 048B5H 00614H CSEG BASE + @@BASE loader 048B5H 00000H + @@BASE pm 048B5H 0003EH + @@BASE i2c_ctr 048F3H 00170H + @@BASE main 04A63H 00000H + @@BASE magic 04A63H 00000H + @@BASE WDT 04A63H 00000H + @@BASE i2c_mcu 04A63H 000F2H + @@BASE i2c_twl 04B55H 000D0H + @@BASE led 04C25H 00000H + @@BASE rtc 04C25H 0005DH + @@BASE vreg_ctr 04C82H 00000H + @@BASE vreg_twl 04C82H 00000H + @@BASE adc 04C82H 00094H + @@BASE renge 04D16H 0016BH + @@BASE accero 04E81H 00042H @@BASE self_flash - 04EBFH 00000H - @@BASE sw 04EBFH 00000H + 04EC3H 00000H + @@BASE sw 04EC3H 00000H @@BASE task_debug - 04EBFH 00000H + 04EC3H 00000H @@BASE task_misc - 04EBFH 00000H - @@BASE task_sys 04EBFH 00000H + 04EC3H 00000H + @@BASE task_sys 04EC3H 00000H @@BASE pedo_alg_thre_det2 - 04EBFH 00000H - @@BASE ini_VECT 04EBFH 00006H + 04EC3H 00000H + @@BASE ini_VECT 04EC3H 00006H @@BASE task_status - 04EC5H 00000H - @@BASE led_cam 04EC5H 00000H - @@BASE led_pow 04EC5H 00000H - @@BASE hal 04EC5H 00000H + 04EC9H 00000H + @@BASE led_cam 04EC9H 00000H + @@BASE led_pow 04EC9H 00000H + @@BASE hal 04EC9H 00000H @@BASE batt_params - 04EC5H 00000H - @@BASE voltable 04EC5H 00000H + 04EC9H 00000H + @@BASE voltable 04EC9H 00000H @@BASE pedo_lpf_coeff - 04EC5H 00000H + 04EC9H 00000H @@BASE kanaria_c - 04EC5H 00000H + 04EC9H 00000H @@BASE util_funcs - 04EC5H 00000H + 04EC9H 00000H @@BASE i2c_mcu-sub - 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL @cstart 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL pm 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL main 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL led 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL rtc 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL adc 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL renge 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL accero 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL sw 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP + 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL @cstart 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL pm 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL main 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL led 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL rtc 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL adc 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL renge 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL accero 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL sw 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP @@CNSTL task_misc - 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL task_sys 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP + 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL task_sys 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL led_cam 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL led_pow 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP + 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL led_cam 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL led_pow 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP @@CNSTL batt_params - 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP - @@CNSTL voltable 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP + 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP + @@CNSTL voltable 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP @@CNSTL pedo_lpf_coeff - 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP + 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP @@CNSTL kanaria_c - 04EC5H 00000H - @@CNSTL 04EC5H 00000H CSEG PAGE64KP + 04EC9H 00000H + @@CNSTL 04EC9H 00000H CSEG PAGE64KP @@CNSTL i2c_mcu-sub - 04EC5H 00000H - @@RLINIT 04EC5H 00000H CSEG UNIT64KP - @@RLINIT loader 04EC5H 00000H - @@RLINIT pm 04EC5H 00000H - @@RLINIT i2c_ctr 04EC5H 00000H - @@RLINIT main 04EC5H 00000H - @@RLINIT magic 04EC5H 00000H - @@RLINIT WDT 04EC5H 00000H - @@RLINIT i2c_mcu 04EC5H 00000H - @@RLINIT i2c_twl 04EC5H 00000H - @@RLINIT led 04EC5H 00000H - @@RLINIT rtc 04EC5H 00000H - @@RLINIT vreg_ctr 04EC5H 00000H - @@RLINIT vreg_twl 04EC5H 00000H - @@RLINIT adc 04EC5H 00000H - @@RLINIT renge 04EC5H 00000H - @@RLINIT accero 04EC5H 00000H + 04EC9H 00000H + @@RLINIT 04EC9H 00000H CSEG UNIT64KP + @@RLINIT loader 04EC9H 00000H + @@RLINIT pm 04EC9H 00000H + @@RLINIT i2c_ctr 04EC9H 00000H + @@RLINIT main 04EC9H 00000H + @@RLINIT magic 04EC9H 00000H + @@RLINIT WDT 04EC9H 00000H + @@RLINIT i2c_mcu 04EC9H 00000H + @@RLINIT i2c_twl 04EC9H 00000H + @@RLINIT led 04EC9H 00000H + @@RLINIT rtc 04EC9H 00000H + @@RLINIT vreg_ctr 04EC9H 00000H + @@RLINIT vreg_twl 04EC9H 00000H + @@RLINIT adc 04EC9H 00000H + @@RLINIT renge 04EC9H 00000H + @@RLINIT accero 04EC9H 00000H @@RLINIT self_flash - 04EC5H 00000H - @@RLINIT sw 04EC5H 00000H + 04EC9H 00000H + @@RLINIT sw 04EC9H 00000H @@RLINIT task_debug - 04EC5H 00000H + 04EC9H 00000H @@RLINIT task_misc - 04EC5H 00000H - @@RLINIT task_sys 04EC5H 00000H + 04EC9H 00000H + @@RLINIT task_sys 04EC9H 00000H @@RLINIT pedo_alg_thre_det2 - 04EC5H 00000H - @@RLINIT ini_VECT 04EC5H 00000H + 04EC9H 00000H + @@RLINIT ini_VECT 04EC9H 00000H @@RLINIT task_status - 04EC5H 00000H - @@RLINIT led_cam 04EC5H 00000H - @@RLINIT led_pow 04EC5H 00000H - @@RLINIT hal 04EC5H 00000H + 04EC9H 00000H + @@RLINIT led_cam 04EC9H 00000H + @@RLINIT led_pow 04EC9H 00000H + @@RLINIT hal 04EC9H 00000H @@RLINIT batt_params - 04EC5H 00000H - @@RLINIT voltable 04EC5H 00000H + 04EC9H 00000H + @@RLINIT voltable 04EC9H 00000H @@RLINIT pedo_lpf_coeff - 04EC5H 00000H + 04EC9H 00000H @@RLINIT kanaria_c - 04EC5H 00000H + 04EC9H 00000H @@RLINIT util_funcs - 04EC5H 00000H + 04EC9H 00000H @@RLINIT i2c_mcu-sub - 04EC5H 00000H - @@RLINIT @rom 04EC5H 00000H - @@CODEL 04EC5H 00000H CSEG - @@CODEL pm 04EC5H 00000H - @@CODEL i2c_ctr 04EC5H 00000H - @@CODEL main 04EC5H 00000H - @@CODEL magic 04EC5H 00000H - @@CODEL led 04EC5H 00000H - @@CODEL rtc 04EC5H 00000H - @@CODEL vreg_ctr 04EC5H 00000H - @@CODEL vreg_twl 04EC5H 00000H - @@CODEL adc 04EC5H 00000H - @@CODEL renge 04EC5H 00000H - @@CODEL accero 04EC5H 00000H - @@CODEL sw 04EC5H 00000H + 04EC9H 00000H + @@RLINIT @rom 04EC9H 00000H + @@CODEL 04EC9H 00000H CSEG + @@CODEL pm 04EC9H 00000H + @@CODEL i2c_ctr 04EC9H 00000H + @@CODEL main 04EC9H 00000H + @@CODEL magic 04EC9H 00000H + @@CODEL led 04EC9H 00000H + @@CODEL rtc 04EC9H 00000H + @@CODEL vreg_ctr 04EC9H 00000H + @@CODEL vreg_twl 04EC9H 00000H + @@CODEL adc 04EC9H 00000H + @@CODEL renge 04EC9H 00000H + @@CODEL accero 04EC9H 00000H + @@CODEL sw 04EC9H 00000H @@CODEL task_misc - 04EC5H 00000H - @@CODEL task_sys 04EC5H 00000H + 04EC9H 00000H + @@CODEL task_sys 04EC9H 00000H @@CODEL pedo_alg_thre_det2 - 04EC5H 00000H - @@CODEL ini_VECT 04EC5H 00000H - @@CODEL led_cam 04EC5H 00000H - @@CODEL led_pow 04EC5H 00000H + 04EC9H 00000H + @@CODEL ini_VECT 04EC9H 00000H + @@CODEL led_cam 04EC9H 00000H + @@CODEL led_pow 04EC9H 00000H @@CODEL batt_params - 04EC5H 00000H - @@CODEL voltable 04EC5H 00000H + 04EC9H 00000H + @@CODEL voltable 04EC9H 00000H @@CODEL pedo_lpf_coeff - 04EC5H 00000H + 04EC9H 00000H @@CODEL kanaria_c - 04EC5H 00000H + 04EC9H 00000H @@CODEL i2c_mcu-sub - 04EC5H 00000H -* gap * 04EC5H 00001H - @@CNSTL 04EC6H 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04EC6H 0000AH - @@R_INIT 04ED0H 0004AH CSEG UNIT64KP - @@R_INIT @cstart 04ED0H 00000H - @@R_INIT loader 04ED0H 00000H - @@R_INIT pm 04ED0H 00000H - @@R_INIT i2c_ctr 04ED0H 00000H - @@R_INIT main 04ED0H 00000H - @@R_INIT magic 04ED0H 00000H - @@R_INIT WDT 04ED0H 00000H - @@R_INIT i2c_mcu 04ED0H 00000H - @@R_INIT i2c_twl 04ED0H 00000H - @@R_INIT led 04ED0H 00000H - @@R_INIT rtc 04ED0H 00000H - @@R_INIT vreg_ctr 04ED0H 00000H - @@R_INIT vreg_twl 04ED0H 00000H - @@R_INIT adc 04ED0H 0000CH - @@R_INIT renge 04EDCH 00014H - @@R_INIT accero 04EF0H 00000H + 04EC9H 00000H +* gap * 04EC9H 00001H + @@CNSTL 04ECAH 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04ECAH 0000AH + @@R_INIT 04ED4H 0004AH CSEG UNIT64KP + @@R_INIT @cstart 04ED4H 00000H + @@R_INIT loader 04ED4H 00000H + @@R_INIT pm 04ED4H 00000H + @@R_INIT i2c_ctr 04ED4H 00000H + @@R_INIT main 04ED4H 00000H + @@R_INIT magic 04ED4H 00000H + @@R_INIT WDT 04ED4H 00000H + @@R_INIT i2c_mcu 04ED4H 00000H + @@R_INIT i2c_twl 04ED4H 00000H + @@R_INIT led 04ED4H 00000H + @@R_INIT rtc 04ED4H 00000H + @@R_INIT vreg_ctr 04ED4H 00000H + @@R_INIT vreg_twl 04ED4H 00000H + @@R_INIT adc 04ED4H 0000CH + @@R_INIT renge 04EE0H 00014H + @@R_INIT accero 04EF4H 00000H @@R_INIT self_flash - 04EF0H 00000H - @@R_INIT sw 04EF0H 00000H + 04EF4H 00000H + @@R_INIT sw 04EF4H 00000H @@R_INIT task_debug - 04EF0H 00000H + 04EF4H 00000H @@R_INIT task_misc - 04EF0H 00026H - @@R_INIT task_sys 04F16H 00000H + 04EF4H 00026H + @@R_INIT task_sys 04F1AH 00000H @@R_INIT pedo_alg_thre_det2 - 04F16H 00000H - @@R_INIT ini_VECT 04F16H 00000H + 04F1AH 00000H + @@R_INIT ini_VECT 04F1AH 00000H @@R_INIT task_status - 04F16H 00000H - @@R_INIT led_cam 04F16H 00000H - @@R_INIT led_pow 04F16H 00004H - @@R_INIT hal 04F1AH 00000H + 04F1AH 00000H + @@R_INIT led_cam 04F1AH 00000H + @@R_INIT led_pow 04F1AH 00004H + @@R_INIT hal 04F1EH 00000H @@R_INIT batt_params - 04F1AH 00000H - @@R_INIT voltable 04F1AH 00000H + 04F1EH 00000H + @@R_INIT voltable 04F1EH 00000H @@R_INIT pedo_lpf_coeff - 04F1AH 00000H + 04F1EH 00000H @@R_INIT kanaria_c - 04F1AH 00000H + 04F1EH 00000H @@R_INIT util_funcs - 04F1AH 00000H + 04F1EH 00000H @@R_INIT i2c_mcu-sub - 04F1AH 00000H - @@R_INIT @rom 04F1AH 00000H - @@R_INIS 04F1AH 00010H CSEG UNIT64KP - @@R_INIS @cstart 04F1AH 00000H - @@R_INIS loader 04F1AH 00000H - @@R_INIS pm 04F1AH 00002H - @@R_INIS i2c_ctr 04F1CH 00002H - @@R_INIS main 04F1EH 00000H - @@R_INIS magic 04F1EH 00000H - @@R_INIS WDT 04F1EH 00000H - @@R_INIS i2c_mcu 04F1EH 00000H - @@R_INIS i2c_twl 04F1EH 00000H - @@R_INIS led 04F1EH 00000H - @@R_INIS rtc 04F1EH 00000H - @@R_INIS vreg_ctr 04F1EH 00000H - @@R_INIS vreg_twl 04F1EH 00000H - @@R_INIS adc 04F1EH 00000H - @@R_INIS renge 04F1EH 00000H - @@R_INIS accero 04F1EH 00000H + 04F1EH 00000H + @@R_INIT @rom 04F1EH 00000H + @@R_INIS 04F1EH 00010H CSEG UNIT64KP + @@R_INIS @cstart 04F1EH 00000H + @@R_INIS loader 04F1EH 00000H + @@R_INIS pm 04F1EH 00002H + @@R_INIS i2c_ctr 04F20H 00002H + @@R_INIS main 04F22H 00000H + @@R_INIS magic 04F22H 00000H + @@R_INIS WDT 04F22H 00000H + @@R_INIS i2c_mcu 04F22H 00000H + @@R_INIS i2c_twl 04F22H 00000H + @@R_INIS led 04F22H 00000H + @@R_INIS rtc 04F22H 00000H + @@R_INIS vreg_ctr 04F22H 00000H + @@R_INIS vreg_twl 04F22H 00000H + @@R_INIS adc 04F22H 00000H + @@R_INIS renge 04F22H 00000H + @@R_INIS accero 04F22H 00000H @@R_INIS self_flash - 04F1EH 00000H - @@R_INIS sw 04F1EH 00000H + 04F22H 00000H + @@R_INIS sw 04F22H 00000H @@R_INIS task_debug - 04F1EH 00000H + 04F22H 00000H @@R_INIS task_misc - 04F1EH 00000H - @@R_INIS task_sys 04F1EH 00002H + 04F22H 00000H + @@R_INIS task_sys 04F22H 00002H @@R_INIS pedo_alg_thre_det2 - 04F20H 00006H - @@R_INIS ini_VECT 04F26H 00000H + 04F24H 00006H + @@R_INIS ini_VECT 04F2AH 00000H @@R_INIS task_status - 04F26H 00000H - @@R_INIS led_cam 04F26H 00002H - @@R_INIS led_pow 04F28H 00002H - @@R_INIS hal 04F2AH 00000H + 04F2AH 00000H + @@R_INIS led_cam 04F2AH 00002H + @@R_INIS led_pow 04F2CH 00002H + @@R_INIS hal 04F2EH 00000H @@R_INIS batt_params - 04F2AH 00000H - @@R_INIS voltable 04F2AH 00000H + 04F2EH 00000H + @@R_INIS voltable 04F2EH 00000H @@R_INIS pedo_lpf_coeff - 04F2AH 00000H + 04F2EH 00000H @@R_INIS kanaria_c - 04F2AH 00000H + 04F2EH 00000H @@R_INIS util_funcs - 04F2AH 00000H + 04F2EH 00000H @@R_INIS i2c_mcu-sub - 04F2AH 00000H - @@R_INIS @rom 04F2AH 00000H - @@LCODEL 04F2AH 00022H CSEG - @@LCODEL abs 04F2AH 00008H - @@LCODEL memcpy_n 04F32H 0001AH -* gap * 04F4CH 000A8H + 04F2EH 00000H + @@R_INIS @rom 04F2EH 00000H + @@LCODEL 04F2EH 00022H CSEG + @@LCODEL abs 04F2EH 00008H + @@LCODEL memcpy_n 04F36H 0001AH +* gap * 04F50H 000A4H MGC_VER 04FF4H 00002H CSEG AT MGC_VER magic 04FF4H 00002H MGC_TAIL 04FF6H 0000AH CSEG AT diff --git a/snake_trunk/config.h b/snake_trunk/config.h index 3d15678..01f6991 100644 --- a/snake_trunk/config.h +++ b/snake_trunk/config.h @@ -7,7 +7,7 @@ */ #define MCU_VER_MAJOR 0x03 -#define MCU_VER_MINOR 0x37 +#define MCU_VER_MINOR 0x38 /* 2014/02/13 2.36 琰ăW[グB }Ci[͈p diff --git a/snake_trunk/hoge.bin b/snake_trunk/hoge.bin index 2bfc1ac..5180de9 100644 Binary files a/snake_trunk/hoge.bin and b/snake_trunk/hoge.bin differ diff --git a/snake_trunk/pm.c b/snake_trunk/pm.c index 38b2409..247ba90 100644 --- a/snake_trunk/pm.c +++ b/snake_trunk/pm.c @@ -1066,7 +1066,7 @@ void set_vdd_voltages( enum family_ family ) { // SNAKE pmreg_v_core = PM_REG_BIT_VDD1P_1R05; - } + } else { // NORMAL diff --git a/snake_trunk/pm.h b/snake_trunk/pm.h index e208431..a0d27ed 100644 --- a/snake_trunk/pm.h +++ b/snake_trunk/pm.h @@ -120,6 +120,7 @@ enum NTR_PM_BT_STATUS{ #define PM_REG_BIT_VDD1P_1R15 bits8(0,0,0,0, 0,0,0,0) #define PM_REG_BIT_VDD1P_1R05 bits8(0,0,0,0, 1,0,0,0) #define PM_REG_BIT_VDD1P_1R00 bits8(0,0,0,1, 0,0,0,0) +#define PM_REG_BIT_VDD1P_0R95 bits8(0,0,0,1, 1,0,0,0) #define PM_REG_BIT_VDD1P_0R90 bits8(0,0,1,0, 0,0,0,0) #define PM_REG_BIT_VDD_AUTO bits8(0,0,0,0, 0,1,1,1) #define PM_REG_BIT_VDD_PWM bits8(0,0,0,0, 0,0,0,0) diff --git a/snake_trunk/sw.c b/snake_trunk/sw.c index be26b65..19561a8 100644 --- a/snake_trunk/sw.c +++ b/snake_trunk/sw.c @@ -133,7 +133,6 @@ void tsk_sw( ) // @̏ꍇ if( ! system_status.taikendai ) { - // dXCb`̊Ď // if( SW_pow_count == ( TIME_PWSW_CLICK ) ) // NbNԂɓB { @@ -141,7 +140,10 @@ void tsk_sw( ) { system_status.pwr_state = OFF_TRIG; } - set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); + if( SHELL_OPEN ) // PWSW IoĂ֌WŁAuW‚v ANbN͖ + { + set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); + } } else if( SW_pow_count == ( HOLD_THREASHOLD ) ) // ɓB { diff --git a/snake_trunk/yav_mcu_bsr.prk b/snake_trunk/yav_mcu_bsr.prk index 0ca18c1..d4ea9f8 100644 --- a/snake_trunk/yav_mcu_bsr.prk +++ b/snake_trunk/yav_mcu_bsr.prk @@ -2,14 +2,14 @@ FrameMax=0 FrameX=2 FrameY=0 -FrameCX=1256 -FrameCY=946 -OpenFile1=ProjectWindow +FrameCX=1363 +FrameCY=1108 +OpenFile1=pm.c,0,45,36,1021,638,65,546,65,0 +OpenFile2=ProjectWindow PrjPos=0,0,706,0,291 -OpenFile2=pm.c,0,75,75,1051,677,65,546,65,0 OpenFile3=OutputWindow -OutputPos=0,191,674,434,1152 -OpenFile4=config.h,0,100,100,984,672,0,32,0,0 +OutputPos=0,354,837,394,1112 +OpenFile4=config.h,0,100,100,984,672,2,11,2,0 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/snake_trunk/yav_mcu_bsr.sdb b/snake_trunk/yav_mcu_bsr.sdb index 3b915f9..a70bdb2 100644 --- a/snake_trunk/yav_mcu_bsr.sdb +++ b/snake_trunk/yav_mcu_bsr.sdb @@ -13,7 +13,7 @@ T=52b3fb69 9=WDT.h 10=magic.h [pm.c] -T=52fb2676 +T=5320f646 1=incs.h 2=adc.h 3=led.h @@ -40,7 +40,7 @@ T=51c8f7f4 7=i2c_mcu.h 8=pool.h [magic.c] -T=52fb2687 +T=531d683e 1=magic.h 2=config.h [WDT.c] @@ -125,7 +125,7 @@ T=51c8f7fa 9=WDT.h 10=util_funcs.h [sw.c] -T=51c91572 +T=531d6619 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -140,7 +140,7 @@ T=51c8f7f9 3=pm.h 4=accero.h [task_misc.c] -T=522971da +T=5320f661 1=incs.h 2=renge\renge.h 3=pm.h @@ -235,7 +235,7 @@ T=51c8f7f9 7=vreg_ctr.h 8=vreg_twl.h [config.h] -T=52fc14ed +T=5320f66a [jhl_defs.h] T=52a97827 [user_define.h] @@ -271,7 +271,7 @@ T=51c8f7fa [i2c_ctr.h] T=51c8f7f5 [pm.h] -T=52fb2675 +T=5306cd98 [rtc.h] T=51c8f7f5 [reboot.h]