diff --git a/branches/sim/VCProj/Debug/bsr_trunk.log b/branches/sim/VCProj/Debug/bsr_trunk.log index 936a5e0..3dbba98 100644 --- a/branches/sim/VCProj/Debug/bsr_trunk.log +++ b/branches/sim/VCProj/Debug/bsr_trunk.log @@ -1,13 +1,14 @@ -2011/07/01 11:39:55 にビルドを開始しました。 +2011/07/20 15:49:16 にビルドを開始しました。 1>ノード 2 上のプロジェクト "C:\78k_data\yav-mcu-basara\branches\sim\VCProj\bsr_trunk.vcxproj" (build ターゲット)。 1>InitializeBuildStatus: "AlwaysCreate" が指定されたため "Debug\sim.unsuccessfulbuild" を作成しています。 ClCompile: - C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /Z7 /nologo /W1 /WX- /Od /Oy- /D _MBCS /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc100.pdb" /Gd /TC /analyze- /errorReport:prompt ..\WDT.c ..\accero.c ..\adc.c ..\i2c_ctr.c ..\i2c_mcu.c ..\i2c_twl.c ..\ini_VECT.c ..\led.c ..\led_cam.c ..\led_pow.c ..\loader.c ..\magic.c ..\main.c ..\pedo_alg_thre_det2.c ..\pm.c ..\renge\renge.c ..\rtc.c ..\self_flash.c ..\sw.c ..\task_debug.c ..\task_misc.c ..\task_status.c ..\task_sys.c ..\vreg_ctr.c ..\vreg_twl.c - WDT.c + C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /Z7 /nologo /W1 /WX- /Od /Oy- /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.c ..\i2c_twl.c ..\ini_VECT.c ..\led.c ..\led_cam.c ..\led_pow.c ..\loader.c ..\magic.c ..\main.c ..\pedo_alg_thre_det2.c ..\pm.c ..\rtc.c ..\self_flash.c ..\sw.c ..\task_debug.c ..\task_misc.c ..\task_status.c ..\task_sys.c ..\vreg_ctr.c ..\vreg_twl.c ..\WDT.c ..\renge\renge.c accero.c adc.c + hal.c i2c_ctr.c + 1>..\i2c_ctr.c(243): error C2143: 構文エラー : ';' が '型' の前にありません。 i2c_mcu.c i2c_twl.c ini_VECT.c @@ -19,56 +20,23 @@ main.c pedo_alg_thre_det2.c pm.c - 1>..\pm.c(1272): warning C4090: '=' : 異なる 'const' 修飾子です。 - renge.c + 1>..\pm.c(1271): warning C4090: '=' : 異なる 'const' 修飾子です。 rtc.c self_flash.c sw.c task_debug.c + task_misc.c コードを生成中... コンパイル中... - task_misc.c task_status.c task_sys.c vreg_ctr.c vreg_twl.c + WDT.c + renge.c コードを生成中... - Link: - C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"C:\78k_data\yav-mcu-basara\branches\sim\VCProj\Debug\sim.exe" /NOLOGO kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /ManifestFile:"Debug\sim.exe.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /DEBUG /PDB:"C:\78k_data\yav-mcu-basara\branches\sim\VCProj\Debug\sim.pdb" /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"C:\78k_data\yav-mcu-basara\branches\sim\VCProj\Debug\sim.lib" /MACHINE:X86 Debug\accero.obj - Debug\adc.obj - Debug\i2c_ctr.obj - Debug\i2c_mcu.obj - Debug\i2c_twl.obj - Debug\ini_VECT.obj - Debug\led.obj - Debug\led_cam.obj - Debug\led_pow.obj - Debug\loader.obj - Debug\magic.obj - Debug\main.obj - Debug\pedo_alg_thre_det2.obj - Debug\pm.obj - Debug\rtc.obj - Debug\self_flash.obj - Debug\simFixture.obj - Debug\sw.obj - Debug\task_debug.obj - Debug\task_misc.obj - Debug\task_status.obj - Debug\task_sys.obj - Debug\vreg_ctr.obj - Debug\vreg_twl.obj - Debug\WDT.obj - Debug\renge.obj - LINK : 前回のインクリメンタル リンクで C:\78k_data\yav-mcu-basara\branches\sim\VCProj\Debug\sim.exe が見つからなかったか、ビルドされませんでした。フル リンクを行います。 - bsr_trunk.vcxproj -> C:\78k_data\yav-mcu-basara\branches\sim\VCProj\Debug\sim.exe - Manifest: - C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\mt.exe /nologo /verbose /outputresource:"C:\78k_data\yav-mcu-basara\branches\sim\VCProj\Debug\sim.exe;#1" /manifest Debug\sim.exe.intermediate.manifest - FinalizeBuildStatus: - ファイル "Debug\sim.unsuccessfulbuild" を削除しています。 - "Debug\sim.lastbuildstate" のタッチ タスクを実行しています。 - 1>プロジェクト "C:\78k_data\yav-mcu-basara\branches\sim\VCProj\bsr_trunk.vcxproj" (build ターゲット) のビルドが完了しました。 + 1>プロジェクト "C:\78k_data\yav-mcu-basara\branches\sim\VCProj\bsr_trunk.vcxproj" (build ターゲット) のビルドが終了しました -- 失敗。 -ビルドに成功しました。 +ビルドに失敗しました。 -経過時間 00:00:06.77 +経過時間 00:00:05.52 diff --git a/branches/sim/VCProj/bsr_trunk.sdf b/branches/sim/VCProj/bsr_trunk.sdf index 6a5a94f..375d286 100644 Binary files a/branches/sim/VCProj/bsr_trunk.sdf and b/branches/sim/VCProj/bsr_trunk.sdf differ diff --git a/branches/sim/VCProj/bsr_trunk.suo b/branches/sim/VCProj/bsr_trunk.suo index fd40a02..dc55323 100644 Binary files a/branches/sim/VCProj/bsr_trunk.suo and b/branches/sim/VCProj/bsr_trunk.suo differ diff --git a/branches/sim/batt_params.h b/branches/sim/batt_params.h index 3b8d542..eaa2dfb 100644 --- a/branches/sim/batt_params.h +++ b/branches/sim/batt_params.h @@ -72,6 +72,42 @@ const bt_param_ bt_param[ _BT_PARAM_NUM_ ] = }, // BT_PARAM_CTR_PANA + { + { + 0x8C, 0x30, 0x9C, 0x10, 0xA5, 0xE0, 0xB0, 0x40, + 0xB1, 0xC0, 0xB2, 0x00, 0xB2, 0x50, 0xB3, 0x10, + 0xB4, 0x90, 0xB6, 0x20, 0xB8, 0x60, 0xBA, 0x50, + 0xBF, 0xA0, 0xC6, 0xB0, 0xCE, 0x90, 0xD0, 0x20, + 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, + 0x7B, 0x30, 0x68, 0x60, 0x20, 0x00, 0x17, 0x00, + 0x17, 0x30, 0x12, 0xF0, 0x0D, 0xE0, 0x07, 0xF0, + 0x07, 0x00, 0x09, 0x30, 0x01, 0xC0, 0x01, 0xC0 + }, + 1, + { 171, (u8)(-256* 1.00), (u8)(-256* 2.60) }, + 0xDA20, + { 0x69, 0x67 }, + }, + + // BT_PARAM_SPFL_MAXELL !!dummy!! + { + { + 0xAE, 0xF0, 0xB4, 0x30, 0xB7, 0x40, 0xBA, 0x30, + 0xBB, 0x50, 0xBB, 0xB0, 0xBC, 0x50, 0xBD, 0x10, + 0xBD, 0x60, 0xBD, 0xB0, 0xBF, 0xE0, 0xC2, 0xB0, + 0xC4, 0x20, 0xC7, 0xB0, 0xCA, 0xE0, 0xCE, 0x10, + 0x01, 0xF0, 0x14, 0x10, 0x14, 0x20, 0x06, 0x30, + 0x63, 0x90, 0x49, 0x00, 0x6E, 0x00, 0x77, 0x70, + 0x7B, 0x00, 0x19, 0x00, 0x19, 0x00, 0x17, 0xF0, + 0x1C, 0x60, 0x12, 0x00, 0x12, 0x00, 0x12, 0x00 + }, + 2, + { 92, (u8)(-256* 0.79), (u8)(-256* 4.35) }, + 0xD800, + { 0xEA, 0xE8 } + }, + + // BT_PARAM_SPFL_PANA !!dummy!! { { 0x8C, 0x30, 0x9C, 0x10, 0xA5, 0xE0, 0xB0, 0x40, diff --git a/branches/sim/bsr.hex b/branches/sim/bsr.hex index 84ecd9b..15491b7 100644 --- a/branches/sim/bsr.hex +++ b/branches/sim/bsr.hex @@ -1,13 +1,13 @@ :02000000730D7E :02000200FFFFFE -:0400100044494649D0 -:02001C003F4B58 -:020024008C4B03 -:02002A00D74BB2 -:08003400FF4CA24CFB4C314EC5 -:02004A00484923 -:02005A008349D8 -:02006200B54D9A +:040010004D494F49BE +:02001C00FC4A9C +:02002400494B46 +:02002A00944BF5 +:08003400BC4C5F4CB84CEE4DD2 +:02004A0051491A +:02005A008C49CF +:02006200724DDD :0400C0007EFBFF853F :0A00C4001B339499E033F240BFAA09 :0A00CE00FFFFFFFFFFFFFFFFFFFF32 @@ -23,7 +23,7 @@ :10016800F64F14896142DF03F6EF01E66061068706 :10017800EFBC40F84F3A61E88666D161E8FDEB06CE :10018800C6D751105B0C319E609F16F94016F901D5 -:10019800DF05CD3005EF03CD30078F14F95CE39F01 +:10019800DF05CD3205EF03CD32078F14F95CE39FFD :1001A80014F951035B04318EE7240000DD1023DDD0 :1001B8000823DF0E712014F9D7713014F9D7714074 :1001C80014F9D7717BFACEA010CEA180E5F300CE4A @@ -36,33 +36,33 @@ :100238008700BF1801BF1A01BF1C01BF1E01D7C725 :10024800C1C1FBF8FFCEABAC8C02D1DD12616902F3 :10025800305C03BBF6614900DDEE618900EFF51003 -:1002680004C6D7FD902FFDAA38FDC304717AFAFDA4 -:10027800AD23F512F98F14F93105135003FD7C2BCA -:10028800625C01D161E8CF12F902CFC5FB64FD7051 -:1002980030FDF74471025F712BE7FDAD38FD4C3935 +:1002680004C6D7FD892FFDB338FDC304717AFAFDA2 +:10027800AD23F512F98F14F93105135003FD732BD3 +:10028800625C01D161E8CF12F902CFC5FB64FD6958 +:1002980030FD0045710261712BE7FDB638FD553917 :1002A80061EDEFF6D7D7C7F616FDC304717BFA31B7 -:1002B800225D0871225D717AFAEF0B717AFAA7F65E +:1002B800225F0871225F717AFAEF0B717AFAA7F65A :1002C80047DFE9E2EF01F2C6D7C7C1C1FBF8FF1764 :1002D800A1C1E0C18C0A70C18C0270FDF902100640 -:1002E800D2DF04F437EF03CD37028C01721004C655 +:1002E800D2DF04F439EF03CD39028C01721004C651 :1002F800D7C7C1FBF8FFFDAE02D2DD03E2EF618B89 -:1003080070FD1704D2DD0771235D5202EF528C088D +:1003080070FD1704D2DD0771235F5202EF528C088B :1003180070FD2C04FD77048B6C0170FD2C043004F7 :1003280000BF2401301740BF1C01300400BF220168 :100338008C0A91DF04F6BF2A01710BE2CE44FF312B :1003480082E202EFFAAC0C148E449961790C61696F -:100358000A8C0AD1DFDAFDA004710BE271235DF289 +:100358000A8C0AD1DFDAFDA004710BE271235FF287 :10036800C0C6D7C7C1FBF8FFFDAE02D2DD03E2EF7E -:1003780025710AE68B70FD1704D2DD0771235D52E3 +:1003780025710AE68B70FD1704D2DD0771235F52E1 :1003880002EF138C0870FD2C048C0A70FD2C04FD00 -:10039800A00471235DF2C0C6D7C7C1FBF8FFFDAE4C +:10039800A00471235FF2C0C6D7C7C1FBF8FFFDAE4A :1003A80002D2DD03E2EF65710AE6710BE28B70FDA4 -:1003B8001704D2DD0771235D5202EF50710BE23151 -:1003C800125D39C73430FBAC0C1652048B99A5A7C3 +:1003B8001704D2DD0771235F5202EF50710BE2314F +:1003C800125F39C73430FBAC0C1652048B99A5A7C1 :1003D80092DFF9C63184BD02EFFA717ABDCEB1441D :1003E800CBB430FB8C0A318EBEB8CEBB48714BE122 :1003F800714BE5710ABD8C089E44EF0F710BE68CBA -:10040800089E448C0A9D36AC0CBD34F2C0C6D7C7D2 +:10040800089E448C0A9D38AC0CBD36F2C0C6D7C7CE :1004180016FD4F0417FD2C04D2DD06FDA004E2EF03 :1004280001F2C6D7C716710AE6710BE2669E44311F :1004380082E202EFFAF6420401DD09AF0401BF0CC3 @@ -73,20 +73,20 @@ :100488000B08BF2801FDAD02AF2A01085CFB08BFBD :100498002A01FDAD02ED4F04300400BF2401F6BF70 :1004A8002A01300B0BBF2801FDAD02300B0FBF280E -:1004B80001FDAD02300F0FBF2801D731345D01D7E0 -:1004C80071225D710BBD0000717BBD713A25713AD7 +:1004B80001FDAD02300F0FBF2801D731345F01D7DE +:1004C80071225F710BBD0000717BBD713A25713AD5 :1004D800236A0E03713205713B25713203713B2388 :1004E800500AFD47027120F000FDAD02F6BF26015B :1004F8005024BF1401CB440014300F0FBF280171E2 -:10050800135D710BE2710AE6FD4F04CE44FF3182A0 -:10051800E202EFFAFDA004AF0401BF0C0171235DF4 -:1005280071325DD731245D02EFFAFD7704713A2507 +:10050800135F710BE2710AE6FD4F04CE44FF31829E +:10051800E202EFFAFDA004AF0401BF0C0171235FF2 +:1005280071325FD731245F02EFFAFD7704713A2503 :10053800713A235A0EFC713305713B2571330371EF -:100548003B237128F00071335DD7C7880616FDAECE +:100548003B237128F00071335FD7C7880616FDAECC :1005580002D2DD03E2EF38710AE650A4FD1704D297 -:10056800DD0771235D5202EF2617FD2C046770FD2D +:10056800DD0771235F5202EF2617FD2C046770FD2B :100578002C04FD770450A4FD2C045020FD2C04D934 -:1005880034FBFD2C04A034FBFDA00471235DF2C6EE +:1005880034FBFD2C04A034FBFDA00471235FF2C6EC :10059800D7C72008FBF8FFFDE9085014C15008FD33 :1005A8001B08C0CC07048C074C14DE0C8C07318E5A :1005B800FD550A615907EFEECC07048C074C14610E @@ -116,12 +116,12 @@ :100738009C01617902EFBB40F67FFF61F8615901C6 :100748008C01D161F8EDE907CC0100717AFAFDC39B :1007580004711300711B20710303710205E0C1507D -:1007680003FD6B2BC05013FD4702500FC1E0FD6B1A +:1007680003FD622BC05013FD4702500FC1E0FD622C :100778002BC0CEABAC6159018C0191DD068C014CCC :1007880003DF03E6EF01F66061FB7151018C014C58 :100798000861F8CC010031320705A042FCEF03F5EF :1007A80042FC4042FC11DC0DF542FCF0C15003FD57 -:1007B8006B2BC0EF12E6BC02F6614902DDB4000003 +:1007B800622BC0EF12E6BC02F6614902DDB400000C :1007C8000000617902EFF1CE3708CBE4FFFFCBE6FA :1007D800FFF7CED4FFCF370008F5120561FDF5AB62 :1007E800FFFDE908D25008C15014FD1B08C0D2FD16 @@ -142,39 +142,39 @@ :1008D800D2DD03E2EF0761590BED3808F2100EC6BE :1008E800D7C7717B9D717BFAFDFE073018F9FD04AF :1008F8000BFD8F0AC6D7FDE908FDDE0BFD1708F5CD -:10090800ABFFF2D7C7316460067110C9FBEF047101 +:10090800ABFFF2D7C7316462067110C9FBEF0471FF :1009180018C9FB8FC9FB7FE8FC76D1DD5C8FC9FB6A :100928009FE8FC4012F903DF22665C10D1DD1C8FC2 -:10093800C9FB5C10D1DD0B5080C15011FDB534C02E -:10094800EF095040C15011FDB534C04012F903DD24 +:10093800C9FB5C10D1DD0B5080C15011FDBE34C025 +:10094800EF095040C15011FDBE34C04012F903DD1B :10095800064012F904DF22665C02D1DD1C8FC9FB58 -:100968005C02D1DD0B5040C15010FDB534C0EF0919 -:100978005020C15010FDB534C0C6D7C78F0CFC76C7 +:100968005C02D1DD0B5040C15010FDBE34C0EF0910 +:100978005020C15010FDBE34C0C6D7C78F0CFC76BE :100988008F0DFC77665C80D1DD10675C80D1DF0558 -:10099800711360EF0B711260EF067104077111603B -:1009A800665C40D1DD10675C40D1DF05712360EFE4 -:1009B8000B712260EF06711405712160665C01D12C -:1009C800DD10675C01D1DF05713360EF0B713260B8 -:1009D800EF06713407713160665C02D1DD10675C27 -:1009E80002D1DF05714360EF1D714260EF184015B9 -:1009F800F901DF08710402714160EF0AC73610057A -:100A080071C4C6714160665C04D1DD10675C04D1B5 -:100A1800DF05715360EF0B715260EF067144077187 -:100A28005160665C08D1DD10675C08D1DF05716232 -:100A380060EF0B716360EF06711407716160665CAB +:10099800711362EF0B711262EF0671040771116235 +:1009A800665C40D1DD10675C40D1DF05712362EFE2 +:1009B8000B712262EF06711405712162665C01D128 +:1009C800DD10675C01D1DF05713362EF0B713262B4 +:1009D800EF06713407713162665C02D1DD10675C25 +:1009E80002D1DF05714362EF1D714262EF184015B5 +:1009F800F901DF08710402714162EF0AC736100578 +:100A080071C4C6714162665C04D1DD10675C04D1B3 +:100A1800DF05715362EF0B715262EF067144077183 +:100A28005162665C08D1DD10675C08D1DF0571632F +:100A380062EF0B716262EF06711407716162665CA6 :090A480010D161E8715AD1C6D742 :100A51005208EF065203EF025206FEE600FE1B00AB :100A6100DC16089F03088F0408089F040862FE240F :100A710000089F0408EEBF00EEBA00C1C514410E84 :100A810011D9D0FF118FD1FF312E45C4C0D7F2311A :100A9100A2C401E2D79DE261DD4C09DF12717BFA4C -:100AA100C18F06089F33FDC0CF060800EE27003135 +:100AA100C18F06089F31FDC0CF060800EE27003137 :100AB100F2FA04CF0608004C00DF05D50008DD1668 :100AC10061DD717BFAD50608DD0ACDE31F61CD61D9 :100AD100CDEE160061CDFED40061FFFE9A00FCF858 :100AE100FF0EFEB20061CDFED5004C09DF0EC18FB5 -:100AF10006086F33FD9F0608C0EE0400CF0608000C -:100B0100F8E3D75200EF025202FE3700CF32FD0068 +:100AF10006086F31FD9F0608C0EE0400CF0608000E +:100B0100F8E3D75200EF025202FE3700CF30FD006A :100B1100CF060800BF0408C716629F0008410011F4 :100B21008F22229B4100118F23229F0108C6510071 :100B3100FE62FFEF025205CF060800C1510CFE0A0A @@ -182,28 +182,28 @@ :100B510070CEC0A59EC47CFF9EC4609EC461CDD7EB :100B610061DD717BFAC18EC45C1BFED6FFCF060826 :100B710001FED7FFC061CDD731F2FA1AC1AEE4BF91 -:100B810024FDAEE6BF26FDAED4BF28FD30FFFFBE7B -:100B9100E4BEE6BED4C0D731F2FA11C1AF24FDBE26 -:100BA100E4AF26FDBEE6AF28FDBED4C0D7C1BF2A43 -:100BB100FD13BF2CFD15BF2EFD17BF30FDC0D7AFF4 -:100BC1002AFDDB2CFDEB2EFDFB30FDD7534B3052C4 +:100B810022FDAEE6BF24FDAED4BF26FD30FFFFBE81 +:100B9100E4BEE6BED4C0D731F2FA11C1AF22FDBE28 +:100BA100E4AF24FDBEE6AF26FDBED4C0D7C1BF2849 +:100BB100FD13BF2AFD15BF2CFD17BF2EFDC0D7AFFA +:100BC10028FDDB2AFDEB2CFDFB2EFDD7534B3052CC :100BD1005430324E323030475631323000FFC1503E :100BE100FEFEAB0061DD717BFACF060800FE0A0054 -:100BF100FEA4FF61CDF8E3EECF00C7FB0408BF24DC -:100C0100FD8FC0009C05C5C337040600BF26FD3516 +:100BF100FEA4FF61CDF8E3EECF00C7FB0408BF22DE +:100C0100FD8FC0009C05C5C337040600BF24FD3518 :100C110036430C300000522BFE6600C2C4C630F1D0 -:100C21000BB800300000B8022004AF26FDB8003038 -:100C31000F00B802AF24FD61FF520AFE3AFFECF843 +:100C21000BB800300000B8022004AF24FDB800303A +:100C31000F00B802AF22FD61FF520AFE3AFFECF845 :100C4100FF0E717BFAC1C7FB04088C05C65C80FEF0 :100C51000200C0D761DD717BFA70CFC0FFA59FC0D4 :100C6100007CFF9FC000609FC00061CDD7618BFEFB :100C7100E2FF717BBE410011FB000017CEFC006159 :100C8100CB089EFDF31161C999A58392DFF7D7FEC9 -:100C9100B1FED532FDDF23C1CF0308035109FEF4B4 +:100C9100B1FED530FDDF23C1CF0308035109FEF4B6 :100CA100FDC0D2DF37FE3800A20408CF0308075188 :100CB10009FEE1FDD2B20408DF22C7FB040831833B -:100CC10002C6D7C6510AFECCFD624C1FDF06CF32E9 -:100CD100FD01EF04CF32FD00C0EE5BFEC0EE55FE1C +:100CC10002C6D7C6510AFECCFD624C1FDF06CF30EB +:100CD100FD01EF04CF30FD00C0EE5BFEC0EE55FE1E :100CE100C7C1FB04088B31196C0161589BC0C6D781 :100CF100717BFAFE4DFEAF0408040600C11436559F :100D01000C300000522DF3FE77FF8FC000FE2BFE4A @@ -216,10 +216,10 @@ :020D7100C3FDC0 :100D730061CF5100718C7109FECBF800FEFCCB01F1 :100D830000F6BF00F953C0F693935820FEDFF941F4 -:100D93000036424E34F2FCEF05118B99A7A5174498 -:100DA300744EDFF53602F930F2FCEF04CC0000A7F5 -:100DB30047DFF9410036744E3420FEEF05118B995D -:100DC300A7A517447A4EDFF53626FE305CFEEF0406 +:100D93000036FE4D34F2FCEF05118B99A7A51744DD +:100DA3002E4EDFF53602F930F2FCEF04CC0000A73B +:100DB30047DFF94100362E4E3420FEEF05118B99A3 +:100DC300A7A51744364EDFF53628FE305EFEEF0446 :100DD300CC0000A747DFF9FCD80000EFFE61DD710E :100DE3007BFABEF0ADD8BEF200AEF661CDD7C361DB :100DF300DD717BFABEF0ADD8BEF200DBF6FFADDCF1 @@ -252,10 +252,10 @@ :100FA300F9B4DADFF4BDD813BDDAC2C0D746D8DD51 :100FB3000771FF7177D971C0D75BDB9DDB605BDAAB :100FC3009DDAADDC5BD9085BD808BDD8D7C3C7F3BE -:100FD300728EFDC162314C410036384E1161A072F0 +:100FD300728EFDC162314C410036F44D1161A07235 :070FE300C09EFD62C6C2D7EB -:0A0FF60031353A34363A3534000044 -:0A20000031353A34363A3534000029 +:0A0FF60031383A31353A323100004B +:0A20000031383A31353A3231000030 :10200A00AEF0B430B740BA30BB50BBB0BC50BD1014 :10201A00BD60BDB0BFE0C2B0C420C7B0CAE0CE1038 :10202A0001F0141014200630639049006E00777096 @@ -265,16 +265,16 @@ :10206A00B860BA50BFA0C6B0CE90D02000200020E1 :10207A00002000207B30686020001700173012F023 :10208A000DE007F00700093001C001C00100AB00F4 -:10209A000000670020DA6967000000000000000005 -:1020AA000000000000000000000000000000000026 -:1020BA000000000000000000000000000000000016 -:1020CA000000000000000000000000000000000006 -:1020DA0000000000000000000000000000000000F6 -:1020EA0000000000000000000000000000000000E6 -:1020FA0000000000000000000000000000000000D6 -:10210A0000000000000000000000000000000000C5 -:10211A0000000000000000000000000000000000B5 -:10212A0000000000000000000000000000000000A5 +:10209A000000670020DA6967AEF0B430B740BA30A2 +:1020AA00BB50BBB0BC50BD10BD60BDB0BFE0C2B03C +:1020BA00C420C7B0CAE0CE1001F0141014200630B4 +:1020CA00639049006E0077707B001900190017F0C1 +:1020DA001C6012001200120002005C003600A70009 +:1020EA0000D8EAE88C309C10A5E0B040B1C0B2003C +:1020FA00B250B310B490B620B860BA50BFA0C6B000 +:10210A00CE90D02000200020002000207B30686084 +:10211A0020001700173012F00DE007F00700093011 +:10212A0001C001C00100AB000000670020DA696746 :10213A000000000000000000000000000000000095 :10214A000000000000000000000000000000000085 :10215A000000000000000000000000000000000075 @@ -298,713 +298,708 @@ :10227A00625344342619100A08080808080808088E :02228A000A1038 :10228C00D512F9DD0D8FF2FCB0F2FCD1DF4DCFF29F -:10229C00FC1EFD4623FDE82231325C0D31045C0945 -:1022AC0031126005713304EF03713204FD1F2331C9 -:1022BC00225C05714202EF03714302D428DD05B4A0 -:1022CC0028714202314402067140C9FBEF04714887 -:1022DC00C9FB4012F90161E8FD1426D74A264BDCF4 -:1022EC00134A26B9DE0E4004F928DE04A004F9D7FF -:1022FC0071335CD74A263EDC054A26BDDC0E400510 -:10230C00F928DE04A005F9D771325CD7F504F9F58C -:10231C0005F9D73122600E4006F902DE04A006F959 -:10232C00D771235CD73132040A40C5FB3CDE047103 -:10233C00235CD771225CF506F9D7C7C1FBF8FF7196 -:10234C00445C711760DE5771146071415C3114602C -:10235C00127130C9FB5002C15011FDB534C0CD28EB -:10236C0032EF3B7138C9FBE0C15011FDB534C0F4FC -:10237C002817C15002FD532BC0D2DF0D8B318E318B -:10238C008D080E01081C00BD2AAD2A44009BDC05FB -:10239C00D5C5FBDF095020C15011FDB534C0C0C6F6 -:1023AC00D7C78D2076FDEF23D515F9DD0571035CBC -:1023BC00EF2FFD872B664B2061F831545C1A71535B -:1023CC005CFDC304664C07DD0381DF098F14F93112 -:1023DC000303FD7824FD8C2471025C306825FD021A +:10229C00FC1EFD4623FDE82231325E0D31045E0941 +:1022AC0031126205713304EF03713204FD1F2331C7 +:1022BC00225E05714202EF03714302D42ADD05B49C +:1022CC002A714202314402067140C9FBEF04714885 +:1022DC00C9FB4012F90161E8FD1426D74A284BDCF2 +:1022EC00134A28B9DE0E4004F928DE04A004F9D7FD +:1022FC0071335ED74A283EDC054A28BDDC0E40050A +:10230C00F928DE04A005F9D771325ED7F504F9F58A +:10231C0005F9D73122620E4006F902DE04A006F957 +:10232C00D771235ED73132040A40C5FB3CDE047101 +:10233C00235ED771225EF506F9D7C7C1FBF8FF7192 +:10234C00445E711762DE5771146271415E31146222 +:10235C00127130C9FB5002C15011FDBE34C0CD2AE0 +:10236C0032EF3B7138C9FBE0C15011FDBE34C0F4F3 +:10237C002A17C15002FD4A2BC0D2DF0D8B318E3192 +:10238C008D080E01081C00BD2CAD2C44009BDC05F7 +:10239C00D5C5FBDF095020C15011FDBE34C0C0C6ED +:1023AC00D7C78D2076FDEF23D515F9DD0571035EBA +:1023BC00EF2FFD7E2B664B2061F831545E1A715362 +:1023CC005EFDC304664C07DD0381DF098F14F93110 +:1023DC000303FD7824FD8C2471025E306825FD0B0F :1023EC0039C6D7C77162017172015005FD470250A1 -:1023FC0008FD7F37629D265009FD7F376276716339 -:10240C0001711814F94A26F1DC05E515F9EF224A99 -:10241C002604DE1ACF15F9025008C1506CFDD1020A -:10242C00C092DF0DD437DF09711014F9EF03F515E5 +:1023FC0008FD8837629D285009FD88376276716325 +:10240C0001711814F94A28F1DC05E515F9EF224A97 +:10241C002804DE1ACF15F9025008C1506CFDD10208 +:10242C00C092DF0DD439DF09711014F9EF03F515E3 :10243C00F94015F901DF05710A22EF06710B2271C3 :10244C000302CD20075700674C08DE107309D22118 :10245C00614EDC05679D20EF0387EFEB4A2007DF19 :10246C0009D515F961F8CF15F903C6D7500AFD4700 -:10247C0002304000C15006FD362BC05096ED47028D +:10247C0002304000C15006FD2D2BC05096ED470296 :10248C00C72006FBF8FFD515F961E8ED6425304A45 -:10249C0057C1503EFD362BC0D2DD077100C8FBED95 +:10249C0057C1503EFD2D2BC0D2DD077100C8FBED9E :1024AC0064257108C8FB17A1C15004C1500CC15060 -:1024BC006CFDF9021006EA2EAA48318D12AA483199 -:1024CC008E616B08616A08C1500EFD362BC0F69008 -:1024DC00C1500CFD362BC0CC00008B4C04DE2631D9 -:1024EC00245D02EFFA71125DEA2E8B5010D605C1F5 +:1024BC006CFDF9021006EA30AA48318D12AA483197 +:1024CC008E616B08616A08C1500EFD2D2BC0F69011 +:1024DC00C1500CFD2D2BC0CC00008B4C04DE2631E2 +:1024EC00245F02EFFA71125FEA308B5010D605C1EF :1024FC005010C18BD6044000C1506CFDA1031006D6 -:10250C00615900EFD550A5FD4702EA2EAA48318D3E -:10251C0012AA48318E616B08616A08C1500EFD36F3 +:10250C00615900EFD550A5FD4702EA30AA48318D3C +:10251C0012AA48318E616B08616A08C1500EFD2DFC :10252C002BC050A5FD47025004C1506CFDD102C018 -:10253C00629C05EA2E8A4B4E0561C3048A4A4E05FD +:10253C00629C05EA308A4B4E0561C3048A4A4E05FB :10254C0017A1C15004C1500CC1506CFDA103100661 -:10255C00F6C1503EFD362BC01006C6D7C78F07F903 -:10256C004B2661F8ED11264009F928DE06A009F981 -:10257C00ED1126F509F98D269F07F98D265070D699 +:10255C00F6C1503EFD2D2BC01006C6D7C78F07F90C +:10256C004B2861F8ED11264009F928DE06A009F97F +:10257C00ED1126F509F98D289F07F98D285070D695 :10258C0012307351230480001231FF318E039F08E7 :10259C00F99FC4FBF68F08F97C804C95DC1C8F08E6 -:1025AC00F9318F241400EA2EBDD8AA44FDE00D1297 +:1025AC00F9318F241400EA30BDD8AA44FDE00D1295 :1025BC0031FF318E03318F16EF1A8F08F9318F24CA -:1025CC001400EA2EBDD8AA46FDE00D1231FF318E63 -:1025DC0003318F16EA2E8A427217F3031644000158 -:1025EC0071FE61C836FF001701DE02F61617BD4EEC -:1025FC00C7500CFD362BC0D2DF078D269F07F9EF95 +:1025CC001400EA30BDD8AA46FDE00D1231FF318E61 +:1025DC0003318F16EA308A427217F3031644000156 +:1025EC0071FE61C836FF001701DE02F61617BD50EA +:1025FC00C7500CFD2D2BC0D2DF078D289F07F9EF9C :10260C00047100C8FBF2C6D7C72008FBF8FF4015C1 -:10261C00F901DD064015F902DF3217040600FD2E24 +:10261C00F901DD064015F902DF3217040600FD252D :10262C002CD2DF0A8C069C058C079C04EF06CC058B -:10263C0063CC040017040600FD4B2CD2DF078C067C +:10263C0063CC040017040600FD422CD2DF078C0685 :10264C009FC7FBEF04CFC7FBC8ED43271704060059 -:10265C00FD2E2CD2DD107100C8FB71035CCC050083 -:10266C0071025DED1C278C06318E318D080E07082A -:10267C001C00BD2AEA2E8A4072AD2AFD330FBD2AFA -:10268C008D2B9C06D1DF08CC0601CC0700EF048D06 -:10269C002A9C0717040200FD4B2CD2DF738C029F7F -:1026AC00C7FB8C02318E318D080E03081C00BD2A2D -:1026BC004401A5DC09CC0164F6BF0AF9EF52AD2A3E +:10265C00FD252CD2DD107100C8FB71035ECC05008A +:10266C0071025FED1C278C06318E318D080E070828 +:10267C001C00BD2CEA308A4072AD2CFD330FBD2CF2 +:10268C008D2D9C06D1DF08CC0601CC0700EF048D04 +:10269C002C9C0717040200FD422CD2DF738C029F86 +:1026AC00C7FB8C02318E318D080E03081C00BD2C2B +:1026BC004401A5DC09CC0164F6BF0AF9EF52AD2C3C :1026CC00220AF94401A0DC09CC011EF6BF0AF9EF7D -:1026DC003FAD2A44819DDC0BCC010A30F401BF0ACA -:1026EC00F9EF2DAD2A44019BDC0BCC010530F40134 -:1026FC00BF0AF9EF1BAD2A440191DC0BCC01003071 -:10270C00F401BF0AF9EF0971025D30F401BF0AF957 -:10271C003132040C31245C08CC0564CC0400EF1776 +:1026DC003FAD2C44819DDC0BCC010A30F401BF0AC8 +:1026EC00F9EF2DAD2C44019BDC0BCC010530F40132 +:1026FC00BF0AF9EF1BAD2C440191DC0BCC0100306F +:10270C00F401BF0AF9EF0971025F30F401BF0AF955 +:10271C003132040C31245E08CC0564CC0400EF1774 :10272C008C064E01DE0A8C069C058C079C04EF0778 -:10273C008C019C05CC04008F14F9313503CC056455 -:10274C008C059FC5FB8C049FC6FBFDBB2B8F0CF926 -:10275C004E05DD2B40C5FB0BDE06400CF90BDE16DF -:10276C0040C5FB06DE06400CF906DE0AD5C5FBDFCC -:10277C000ED50CF9DD095020C15011FDB534C08FB8 -:10278C00C5FB9F0CF9FDF82B1008C6D7C7D830C174 -:10279C005002FD6B2BC04016F90161F87120100539 -:1027AC005012FD47028D306C0870C15002FD6B2B2E -:1027BC00C05003FD47028D306C1870C15002FD6B88 -:1027CC002BC05016FD47025003FD7C2B625C01D1DF -:1027DC00DD107170C9FB5002C15013FDB534C0F24D -:1027EC00EF01E2C6D7C75004FD7C2B625C03D1DD40 -:1027FC00405014FD882834C9FB895C9F998A0C7C55 -:10280C00FF50FF5C14D1DD228A0C7CFF5C14723407 -:10281C00CDFB89616A9971620756003162070586A2 -:10282C0066D1DFF7716307716B2734DCFB895CEBD6 -:10283C0099712810055002FD7C2BD2DD354016F91C -:10284C0001DF05500AFD47028D306C1070C150023B -:10285C00FD6B2BC0E0FD4702D830C15002FD6B2B45 -:10286C00C05033FD4702F0C15002FD6B2BC0717894 -:10287C00C9FBE0C15013FDB534C0C6D7C7C1200495 -:10288C00FBF8FFCC02005004FD7C2B629C038C04F3 -:10289C005C20D1DD0E8C036C019C038C026C209CA3 -:1028AC0002EF138C045C10D1DD0C8C035CFE9C03DA -:1028BC008C026C109C028C045C08D1DD0E8C036CB9 -:1028CC00029C038C026C089C02EF138C045C04D1F8 -:1028DC00DD0C8C035CFD9C038C026C049C028C0351 -:1028EC00D1DD05501AFD47028C0370C15004FD6BFD -:1028FC002BC08FC9FB5C9F728C03318E316D148C95 -:10290C0003318E314D616D08616C5C606162629F58 -:10291C00C9FB8FD5FB7CFF50FF5E02D1DD278FD525 -:10292C00FB7CFF5E027234CDFB89616A9971620790 -:10293C00CC0100316207086159018C01D1DFF471BF -:10294C006307716B27F21006C6D7D9BDFBC15006C1 -:10295C00FD6B2BC0D9BEFBC15007FD6B2BC0D7FD47 -:10296C005629F2D7C7711300711B20710303710232 -:10297C0005E0C15003FD6B2BC05013FD4702F0C1A5 -:10298C005005FD6B2BC0500FC1E0FD6B2BC0500AE6 -:10299C00FD47027103055008FD4702501FC1E0FDC1 -:1029AC006B2BC05012FD47025003FD7C2B625C0167 -:1029BC00D1DF03E2EF24F0FD7C2B629D2C3602F973 -:1029CC00C75008FD532BC05003C1FD6B2BC07102C7 -:1029DC0003711A20FD132BF427F2C6D75003FD7C8C -:1029EC002B625C01D1DD155014FD8828FDF12750B8 -:1029FC0014FD4702E0C15003FD6B2BC07113007135 -:102A0C001B207103035014FD4702F0C1E0FD6B2B3A -:102A1C00C0F0C15003FD6B2BC0D7C72004FBF8FFDF -:102A2C00CC02008D279C035010C150A4FDD102C0D4 -:102A3C00629D27D437DD04F2EDF02A8C037B275CF2 -:102A4C0008D1DD0F8D275C08D1DF05CC0210EF0318 -:102A5C00CC02208C037B275C04D1DD158D275C0414 -:102A6C00D1DF088C026C049C02EF068C026C089C73 -:102A7C00028FC8FB5CF3728D275C0C6162629FC88D -:102A8C00FB8FD4FB7CFF50FF5E029C02D1DD1F3418 -:102A9C00CCFB896E0299716207CC01003162070888 -:102AAC006159018C01D1DFF4716307716B278D279C -:102ABC005C40D1DD095002C15012FDB534C08D27E8 -:102ACC005C01D1DD08E0C15012FDB534C0717AFA59 -:102ADC008D275C41D1DD0C5A27BED827C15010FD83 -:102AEC005205C0F21004C6D7FD9827F2D7FDF12786 -:102AFC00F2D7C78FDCFB7617FD8828664FDCFBDF2F -:102B0C00F2F5DCFBF2C6D75064FD4702FD632C6284 -:102B1C0061FB71115CF171145C61DC70C15012FDD0 -:102B2C005205C0FD5B36CD3D03D7C7C1C1FBF8FFD5 -:102B3C00AC0ABB17C15002C18C0270C1506CFDA114 -:102B4C000310061004C6D7C7C1FBF8FFAC08C15070 -:102B5C0002C18B70C1506CFDF9021006C0C6D7C7FC -:102B6C008806166770C1C75084FD6B031004C6D766 -:102B7C00C716C75084FDD102C0C6D7C74A2004DE91 -:102B8C00045600EF0256014016F901DF048686EF69 -:102B9C000A4016F902DF045104610666318F1250A7 -:102BAC004CD633514CD6610A040A20BD2EC6D740F0 -:102BBC00C5FB51DC05CF1CFC0FD740C5FB33DC0536 -:102BCC00CF1CFC0BD740C5FB0BDC05CF1CFC07D77F -:102BDC0040C5FB0661D831320405CF1CFC03D7D5A8 -:102BEC00C5FBDD04E51CFCD7F51CFCD7D512F9DFC1 -:102BFC000471635CD7FD632C6261FB71715C7114B1 -:102C0C005C71775C61C831625C1771625C71745C79 -:102C1C0071115CF171745C61DC70C15012FD520574 -:102C2C00C0D7C7164010FCFFDD0C8F10FC9B17148F -:102C3C00CA0100F2EF07C75004FD532BC0C6D7C71B -:102C4C00164011FCFFDD078F11FC9BF2EF07C750FC -:102C5C0002FD532BC0C6D740C5FB0BDE02E2D7F2F8 -:102C6C00D77100010571785005713AD5713BD1715E -:102C7C003ADD713BD98F10055CFC9F1005CF5405D4 -:102C8C004AE5420571104205710042057148500534 -:102C9C007130500571205005CF530505CF52050AF0 -:102CAC007130510571205105713BD5717050058FF4 -:102CBC0011055CFC9F1105D7717850057108010551 -:102CCC00D77140F00071783002713AE6713BE271D5 -:102CDC003BEA713BEE8F10055CFC9F1005CF340274 -:102CEC004AE552FF711A52710A5271483002713022 -:102CFC00300271203002CF330205CF32020A71301C -:102D0C003102713BE6717030028F11055CFC9F1132 -:102D1C000571603002D7717830027148F000D7C766 -:102D2C0088061666614FDD0967614EDE0396EF017A -:102D3C00866672C6D7C7161714AA0412A943DD29D2 -:102D4C00AA0412A923FD7A4EC3AC02FD7A4E13C21B -:102D5C00BDD813FDB00FDE0C1714AA0212AA04037F -:102D6C00BA04EF051714A9BA04AC041231FF319E52 -:102D7C0003317F087208C6D77100F200304400BFDF -:102D8C00B601300188BF9001300984BF9E01BF9C01 -:102D9C0001BF9A01BF9801BF9601BF9401BF920178 -:102DAC00F53CFF30FE00BFBE01F6BFBC01BFB80151 -:102DBC0050EEBFBA01A1BFB201C918FE00F6BE6E3B -:102DCC00BE64BE6A7123047153078F14F931050771 -:102DDC00F5E3FBCB6CFF0071535D71425DD730EFB7 -:102DEC0000BFB401F6BFBA017108F200712304717F -:102DFC00530771435DD78F9AFBB09AFBD1DF7331C8 -:102E0C00D4D106715BD1E59CFBD59CFBDD347140C4 -:102E1C00C8FBD99BFBF1E734020023DD0625DD035B -:102E2C0025DF05F6BE66EF06D9E2FBF1BE66A09B78 -:102E3C00FB409BFB20DF06F59BFBB09CFBCF9AFB7A -:102E4C0019D7CF9AFB1E7148C8FBD5E4FBDF04F6FB -:102E5C00BE66D7D9E2FBF14266FFDD16D9E2FBF183 -:102E6C0012AE6643DE05A266FFEF03B266FFCF9A91 -:102E7C00FB03D7C7161714F6B9AA0412F62312319E -:102E8C00FF31AE03316FBA02C6D7C7C1FBF8FF8C56 -:102E9C00085080D612AB1413B9AB14AA0412A92390 -:102EAC0012D937FBF133BDD813FD1C0EBA02C0C6C4 -:102EBC00D731645D01D74012F902DF10F6BE64BE53 -:102ECC006EBE6ABFA4FBBFAAFBBFB0FB31545D153D -:102EDC0030A0FBFD7F2E30A6FBFD7F2E30ACFBFD22 -:102EEC007F2EED712F31745D0F71735D7108E8FBEE -:102EFC00F59EFBF59DFBEF6DD59DFBDF658F36FBDE -:102F0C009F9DFB409EFB1FDC1A7100E8FB4038FBC9 -:102F1C00FFDD22A09FFB8F38FB4F9FFBDE17F59E3A -:102F2C00FBEF12D99EFBF1A1605C1F9F9EFB710809 -:102F3C00E8FBF59FFBE99EFB093AFB70C130A0FB57 -:102F4C00FD962EC0E99EFB095AFB70C130A6FBFD15 -:102F5C00962EC0E99EFB097AFB70C130ACFBFD9646 -:102F6C002EC0B09DFB30A0FBFD412DF313BE6E3087 -:102F7C00A6FBFD412DF313BE6A30ACFBFD412DF3D6 -:102F8C0013BE64D7C736F00071F4DC297170F00001 -:102F9C00CE9D08CE9EC0CE9F80F594FFF593FFF595 -:102FAC0092FFE597FFE596FFE595FFE598FFCE9C30 -:102FBC007F7100BCFB711BE3712BE3711AE7712B62 -:102FCC00E7717A9D710A9E31929E02EFFA710B9E07 -:102FDC0071035E71135E71235EC6D7C731025E1E2C -:102FEC0071025E710A9E31929E02EFFA34EAFB3650 -:102FFC0092FF52078B99A5A792DFF9710B9EC6D74A -:10300C00C788061631125E1571125EC734B2FB30DA -:10301C0092FF1652078B99A5A792DFF9C6667367C4 -:10302C0018B2FBC6D7C771035E31145E1E71135EF6 -:10303C00710A9E31929E02EFFA3492FF36B2FB5225 -:10304C00078B99A5A792DFF9710B9E31245E137142 -:10305C00235E717B9E8FF2FB9E9A8FF3FB9E9B717E -:10306C007A9EC6D7CFBDFB5CCFBEFB5FCFDEFB5DD0 -:10307C00CF12FC36CF13FCC9E5E9FBD7C7CFBAFB9F -:10308C0011CFBBFB37CFE2FBFFF5E3FBF5E4FBF520 -:10309C00E5FBF5E6FB5600664C64DE08723836FB41 -:1030AC000086EFF3C6D7C788061617F1E73403007E -:1030BC002361E3EDE6332361F8ED9431B12361E351 -:1030CC00ED9B312561F8EDAA31B1240D0061D8EDED -:1030DC00E633240B0061F8EDCB312361F8ED1232AD -:1030EC002361F8EDDF312361F8EDAA33240600618A -:1030FC00F8ED7B32B12561D8ED973224000061F8F0 -:10310C00EDA4322361F8EDE6332361F8EDC433B15D -:10311C002361E3EDC7322361F8EDD8322361F8ED7A -:10312C00E9322361F8EDD8322361F8EDFA322361EC -:10313C00F8ED0B332361F8ED1A332361F8ED3C33D2 -:10314C002361F8ED48332361F8ED54332361F8ED36 -:10315C005D332402002361E3EDE63324020061F8C1 -:10316C00ED66332361F8ED73332561F8ED7F33247D -:10317C000A0061F8ED8B3324120061F8EDA53323BE -:10318C0061F8ED9633EDE933679FBCFBEDF6333018 -:10319C006B29FD023966736718BAFBEDF63340BF35 -:1031AC00FB6ADF1440C0FB68DF0E674C6CDF093034 -:1031BC002942FD0239713AD5679FC1FBEDF63367A1 -:1031CC00D1DD0630353DFD023934DAFB89616F996A -:1031DC00EDF633675C02D1DD0830F42AFD0239EFDD -:1031EC000C675C01D1DD0630F92AFD0239675C3CC5 -:1031FC00D1DD1030FE2AFD0239675C3C72667362C9 -:10320C0018BAFBEDF63367D1DD625C01D1DD053018 -:10321C000800EF01F6609F19FC675C02D1DD03E644 -:10322C00EF01F63419FC89616899675C04D1DD04FF -:10323C00E6A1EF01F63419FC89616899675C08D145 -:10324C00DD05302000EF01F63419FC8961689967BF -:10325C005C10D1DD05301000EF01F63419FC8961EA -:10326C006899675C20D161E8716019FCEDF633D484 -:10327C0032DF08679FE3FBA432EF0D4A3205DE080C -:10328C00E83267181FFDA432EDF633675C0F7266E7 -:10329C00736218BAFBEDF6334A3264DE1B4A320114 -:1032AC00DF0667D161F85701E832671836FBA432A4 -:1032BC004A320561C871725DEDF633675C7F70C18F -:1032CC0017F1243000FD0C30C0EDF633675C3F7015 -:1032DC00C117F1243000FD0C30C0EDF633675C07EC -:1032EC0070C117F1243000FD0C30C0EDF633675C73 -:1032FC001F70C117F1243000FD0C30C0EDF63367A0 -:10330C0070C117F1243000FD0C30C0EDF633CEAB9C -:10331C00AC710A9E31929E02EFFAD592FFDF0571D5 -:10332C000B9EEFED679E99710B9E9FF1FBEDF633B3 -:10333C0071225E675C7F9FF2FBEDF63371225E6754 -:10334C005C3F9FF3FBEDF633675C3F9FF4FBEDF6C0 -:10335C0033675C1F9FF5FBEDF63330003BFD023904 -:10336C00679FFAFBEDF63330BB3AFD0239679FFBE2 -:10337C00FBEF7730DD3AFD0239679FFEFBEF6B67A1 -:10338C005C01D161E8FDF744EF604A38C8DE08E81B -:10339C0038671868FAA438EF51679D38EF4C6731DD -:1033AC008E247000DD0D240200DF3F30FE08FD028C -:1033BC0039EF37FDF743EF32675C01D1DD05711250 -:1033CC0002EF03711302675C02D1DD05712202EF7B -:1033DC0003712302679FE9FBEF1000EF0D664C5B56 -:1033EC00DE07736718BAFBEF0100C6D7C716664C29 -:1033FC0030DC094C37DE05FDE72FEF6E664C02DF43 -:10340C001F8FBCFB5C03728F1BFC5C03318E316D18 -:10341C0008616A08128F1BFC5C80312A6162EF59CB -:10342C00664C3DDF0AAE90BF16FCF916FCEF4A66FF -:10343C004C3EDF05F917FCEF40664C4FDF05FD19DC -:10344C0045EF36664C61DF08E8380968FA72EF29F7 -:10345C00664C7FDF05FDA53DEF1F664C4EDF0B3143 -:10346C00645F045210EF12F2EF0F664C5BDC0452F7 -:10347C00FFEF06667309BAFB72C6D7C78806161724 -:10348C00F1241000240500DC07244C00DD17EF1795 -:10349C00717BFA17F104BAFB1489617F99717AFA7E -:1034AC0071325EEF02A438C6D7C7C1C1FBF8FF402A -:1034BC0012F903DD064012F904DF2F8C027309C2E6 -:1034CC00FB5E0AD1DF248C02318E04BAFB14896EA8 -:1034DC000A99716207CC0100316207086159018CAD -:1034EC0001D1DFF4716307716B271004C6D7CF1BB2 -:1034FC00FC03F519FCF51DFCF51FFCD7C788061657 -:10350C0017F1E734020025DD3D23DD1725DD1C23F3 -:10351C00DD0523DD2BEF3B71625E679F1EFCCD3D0D -:10352C0003EF2F675C839F1BFCEF27675C039F1DDA -:10353C00FC675C034C0261F8710260FD0C47EF12F2 -:10354C00679F1FFCEF0C6791DF08E0C15012FDB5BF -:10355C0034C0C6D7C71617F1E7240000DD2A23DDD7 -:10356C001E240300DD0724FB00DD24EF253112604F -:10357C0005308000EF01F6086F1CFC7208EF198F04 -:10358C0019FCF519FC72EF1071425F5235EF09F21C -:10359C00EF0666730918FC72C6D7C71617F1E72435 -:1035AC000000DD38241000DD1C23DD1C23DD30245D -:1035BC000E00DD18241100DD1B240F00DD12243059 -:1035CC0000DD15EF1EE2EF1D5202EF195204EF154C -:1035DC005206EF115205EF0D5207EF09F2EF0652AA -:1035EC0003EF0252FFC6D7C731445E3771435E8D7D -:1035FC003C9FC2FB8D3B9FE1FB36FCFCC7D83BFDDF -:10360C00B037618A70618AFDF537C0D840F1312F2F -:10361C00609D3F8D3A4B3FDD0A71525E8D3F9D3A66 -:10362C00CD3D034A3D05DE09306536FD0239CD3D01 -:10363C006BB43D7150F000CE300BCF170006CE317D -:10364C0006FDAD02717A30710BE3710BE7C6D78DB5 -:10365C003F9D3A8D3F9FC3FBD74012F903DF0640D5 -:10366C0012F904DF02F2D731545E0D71535E71739F -:10367C005E8D3F9F28FCEF3831645E2371635E7171 -:10368C00725ED51EFCDF05F529FCEF0B8F1EFC507E -:10369C0002D6A1609F29FC8F29FC9F28FCEF1131D9 -:1036AC00745E088F29FC9F28FCEF058D3F9F28FC3A -:1036BC008F28FC9FC3FBD928FCFDD836E928FC09D0 -:1036CC00DA2170C15013FD5205C0F2D7C7C1C1FB3E -:1036DC00F8FF8C02D1DF05F51EFCEF1A8C024C05AD -:1036EC00DE06CF1EFC02EF0E8C02318E1231FE0371 -:1036FC00311F609F1EFC8F2AFC4F1EFCDD29CC0164 -:10370C001F8F1EFC9F2AFCCC00008B4C08DE148BF8 -:10371C0073091A224F1EFCDC058B9C01EF056159C5 -:10372C0000EFE78C019D3E1004C6D7C7168B728C38 -:10373C0001614ADE1F8B728C02614ADE138C0172AE -:10374C008C02614ADE058C0172EF268C0272EF212D -:10375C008B72EF1D8B728C02614ADE048B72EF113F -:10376C008C01728C026142DE058C0172EF038C02BB -:10377C0072C6D7C716710AE7710BE37150F000CE11 -:10378C00300BCF170006669E31FDAD02717A307199 -:10379C000BE33182E302EFFA8D1F7158F000710BCD -:1037AC00E772C6D7C7C1C1FBF8FF8F12FC4E02DC13 -:1037BC0003F2EF318C024F13FCDC0452FFEF268C2A -:1037CC00022F12FC706131318D128F13FC2F12FC01 -:1037DC0070613133BDD813FD3E0EBB440001DC03D8 -:1037EC00F690BB8B721004C6D7C7C1FBF8FFAC08B0 -:1037FC0014A91489708B6128706131FD7A4E1344C1 -:10380C00030071FEDC23AC08148A04819A04AC0812 -:10381C00148A044C11DC10A9148B99AC0814CA023C -:10382C0000AC0814CA0310EF72AC0814CA0400AC44 -:10383C000814A914894DDE0AAC08148A02819A0274 -:10384C00EF12AC0814A914894D61D308AC08148A82 -:10385C0002919A02AC08148A03919A03D1DF3CAC12 -:10386C0008148A024C10DF10A91489318EA112ACF5 -:10387C000814A9146299EF17AC08148A024CF0DFF3 -:10388C000EA91489318EB112AC0814A9146299AC2A -:10389C000814CA0200AC0814CA0310C0C6D7EDED58 -:1038AC0038717BFAC7D44261F831045F2E71045F22 -:1038BC0071215F71035FD442DD05B442CEABAC71B4 -:1038CC007AFA5600664C0ADD1272F3311C7902FD4D -:1038DC00CEFC0061CAFD4C3986EFE9717AFAF2C66A -:1038EC00D7C75600664C0ADE0BF0317E12F6782CE8 -:1038FC00FC86EFF0C6D7C7C1C1FBF8FFCC01008C2A -:10390C00014C0ADE36717BFA8C01F0317E042CFC02 -:10391C0014A96168DF09AC02B9717AFAF2EF1D8C57 -:10392C0001F0317E12792CFC614902DF06717AFAC2 -:10393C00E2EF09717AFA615901EFC4E21004C6D7BB -:10394C00C72004FBF8FFF6422CFC61F8ED313A710C -:10395C007BFA9C038C034C0ADE3C8C03F0317E0416 -:10396C002CFC14A96168DF05717AFAEF29717AFAD7 -:10397C008C0372F3311C792CFCCEFC0061CA629C66 -:10398C0002D1DF0A8C03F0317E12E6782CFC717BBD -:10399C00FA615903EFBECC0200CC01018C02F0316C -:1039AC007E042CFC14A96168DD7B8C02F0317E1244 -:1039BC00792CFCE743DF688C014C0ADE628C01F049 -:1039CC00317E12792CFCE743DD50717BFA8C01F0CF -:1039DC00317E042CFC14A96168DF1B616901717BC9 -:1039EC00FA8C01F0317E12F6782CFC717AFA8C028A -:1039FC004E01DCE7EF2F8C01F0317E042CFC14A976 -:103A0C00128C02F0317E33782CFC8C01F0317E125A -:103A1C00E6782CFC615902717AFA615901EF9861D0 -:103A2C005902EDA83900F21004C6D7C72006FBF8DE -:103A3C00FF34FFFBC55006C150A8C15030FDF90240 -:103A4C001006D2DD1DA040FC4040FC08DE03E2EF76 -:103A5C005A34FAFB895CFC99FD003B7110C8FBF2EF -:103A6C00EF49F540FC8FFAFB5C01D1DD264012F9E1 -:103A7C0003DF205010C180FDB534C0C7361005716E -:103A8C00D4C6DE0F17C15006C150A8C15030FDF985 -:103A9C000210064012F901DD114012F905DD0B8F01 -:103AAC00FAFB5C02D161E8FD2E42F21006C6D7D9B2 -:103ABC00FBFBC15030FDD102C0629FFEFB7130CBCD -:103ACC00FB8FD3FB5C08D1DF06716307716B27F2A8 -:103ADC00D7D9FEFBC1D9FDFBC15030FD6B031004DF -:103AEC007130CBFB8FD3FB5C08D1DF0671630771A0 -:103AFC006B27F2D7C7200AFBF8FF500FC15030FDDF -:103B0C00D102C04A3702DF077110C8FBF2EF5F71B8 -:103B1C0018C8FBCC07004015F901DF05CC0802EFF3 -:103B2C0003CC0810CC09808FFAFB5C03D1DF087141 -:103B3C007AD5CC0607EF06717BD5CC062F17040679 -:103B4C0000C15004C150A0C15030FDA1031006C7E4 -:103B5C0036100571D4C6DE154012F903DF0F17C1FC -:103B6C005006C150A8C15030FDF9021006F2100ADF -:103B7C00C6D74012F902DF03F6BD44B016FDD516C8 -:103B8C00FD61E8EDA43CCF16FD048F12F9318FE7EF -:103B9C0023DD0B24020024030061C8EDA43C8F1428 -:103BAC00F931233F301B004644DF0AE0C15010FDC1 -:103BBC00B534C0EF1D3077014644DF165002C150BA -:103BCC0010FDB534C0F6464ADF088FDEFB5010D628 -:103BDC00BD4AF6464ADD37B64AE6464ADF30710240 -:103BEC005DEF2B301B004644DF13F6464CDF18E02C -:103BFC00C15010FDB534C0C94CE803EF0A30770151 -:103C0C00464461F871025DF6464C61E8B64C3134BD -:103C1C00600871335FF6BD44EF1431345F05F6BDB7 -:103C2C0044EF0BA644F6464461F8C944FFFF314209 -:103C3C0060194A4605DE16A4464A4605DF0FA4461F -:103C4C005004C15010FDB534C0EF02F4463144604D -:103C5C00194A4805DE16A4484A4805DF0FA4485007 -:103C6C0008C15010FDB534C0EF02F448D449DD034F -:103C7C00B449D7315260174A4705DE14A4474A4766 -:103C8C0005DF0DA4475010C1FDB534C0EF02F44759 -:103C9C004A470661F8CD4925D7C736100571D4DEE1 -:103CAC000730373AFD0239D24012F903DF1D3122B9 -:103CBC00070630262AFD023931445F0C71435F50F0 -:103CCC0080C15012FDB534C0FDDC3CFD073DC6D7AC -:103CDC008F1BFC5C01D1DD22D545FCDD04B045FC1D -:103CEC00D7CF45FC098D3E4F44FCDD0E8D3E9F44E5 -:103CFC00FC5040C15012FDB534C0D74012F903DD61 -:103D0C0004F6BD1AD7D5E6FBDF08F6461ADD19B660 -:103D1C001AD7D9E2FBF1461ADD0ED9E2FB12AD1A25 -:103D2C0043DE03A61AD7B61AD7C78FDAFB76F5DAB5 -:103D3C00FB5C10D161E871525F665C0FD1DD576698 -:103D4C005C01D1DD05F512F9EF4C665C02D1DD1199 -:103D5C00E0C15003FD6B2BC0711300711B2071036C -:103D6C0003665C04D1DD11711300711B20D51BFCA3 -:103D7C0061F8710303FDFA34665C08D161E87103E4 -:103D8C00035005FD47027102035003C1FD6B2BC0AC -:103D9C00711A20FD132BF2C6D7C72014FBF8FF4A6B -:103DAC003213DC0552FFED903E8F14F931150530BE -:103DBC000400EF0F8F14F9314505300500EF04D9DD -:103DCC0015F9F1609C018D2C9C028D209C038F02B7 -:103DDC00F99C048F03F99C058D4E9C068D269C073F -:103DEC0071345CE661301271045C61DC3119616222 -:103DFC00629C08CC09018F16F99C0AF171240461AC -:103E0C00DC9C0BAE6C609C0CAD1A609C0DAE6E60B5 -:103E1C009C0EAE6A609C0FAE64609C10F1715407EE -:103E2C0061DC9C11AE66609C123124600530400050 -:103E3C00EF01F6C131340405302000EF01F6C26108 -:103E4C006B08616A08C131546005300400EF01F65B -:103E5C00C2616B08616A08C131446004E6A1EF01DC -:103E6C00F6C2616B08616A08C131346003E6EF0188 -:103E7C00F6C2616B08616A9C13A432D832F1B107A7 -:103E8C00A11489721014C6D7C7FD83098F12F9319A -:103E9C008FE724000061F8ED624023DD1B2361F8FD -:103EAC00ED6C3F2361F8EDE83F2361F8ED314023E1 -:103EBC0061F8ED1441ED5F40D513F9DF2AF6464465 -:103ECC00DD05F518FDEF03A018FD4018FD65DC0AB3 -:103EDC00CF12F90571025FEDA241AD44440A0061B5 -:103EEC00D8EDA241E513F971325FF5DDFBFDC3049A -:103EFC0071535CFDAD234015F903DF0971025FF5C9 -:103F0C0012F9EDA241FD142640C7FB9BDE0971029C -:103F1C005FF512F9EDA241714A277140110571301C -:103F2C001105713A22715A2271501105FD7029D276 -:103F3C00DD0971025FF512F9EDA24171103500CF68 -:103F4C0037001D714012054013F901DF05F5E3FB45 -:103F5C00EF04CFE3FB03CF12F902FD5629EDA2418A -:103F6C00FD6D2CFDCD2C714A9DFDFA34FD8830F58C -:103F7C0037FF712BE0F513F971025FCBE43FEFCB08 -:103F8C00E6F6F0FDC304713BD47112027123028F6B -:103F9C0014F93105285004FD7C2B625C03318E3101 -:103FAC005D34C9FB896168995002FD7C2BD2DD061A -:103FBC007170C9FBEF047178C9FBFDAD23FD842D35 -:103FCC00710814F9CF12F9038FBCFB5C02D1DD0927 -:103FDC005080C15010FDB534C0EDA241FDA441315B -:103FEC00545F2FA450D450DD0831A4E00A31020CE8 -:103FFC0006712BE0FD1A4231A4E01731040C137149 -:10400C002BE05027C15005FD6B2BC0CF12F904716A -:10401C00025FFD0F428F14F931250731146003F54F -:10402C0012F9EDA241FDA44131020C14F0C150056E -:10403C00FD6B2BC05005FD4702FD1A42CF12F90350 -:10404C00FD0F428F14F931250731146003F512F975 -:10405C00EDA241F512F9CFE3FB03F5E4FBF5E6FB2A -:10406C0071525DF6426CFF61E8EDA241F6BD4A71FA -:10407C00035DF5FAFBFD003BFDEA2DFDC42CFD2292 -:10408C002D714B9D711302712302F5CAFBF5CBFB0D -:10409C00F5CCFBF5CDFB31245D02EFFACE3708CB26 -:1040AC00E4BFFFCBE6FFF1CED4FFCF370009714858 -:1040BC001205F6BEE0BEE2BED0716A27FDE829719A -:1040CC004307714B27714810057148110571381061 -:1040DC000571381105713302713B22715302715B0A -:1040EC00227158100571581105FD2C05CF12F905D8 -:1040FC0071325FF6BD44F50CFCF50EFCCF14FCFFE1 -:10410C00CF10FCFFCF11FCFFF513F9F518FD3112A0 -:10411C00602EFDAD23AD44440B0061C8E512F9D50A -:10412C0015F961E8FD2C058F14F9312511F50EFCFC -:10413C00F50CFC502EFD4702E513F9E512F9EF568C -:10414C00D428DF52FD2C05FD462371730171320416 -:10415C0071430271035C71525C31949E02EFFA71EF -:10416C002AE7CEA409F5F3003114600ED50CFCDF60 -:10417C00064010FCFF61F80061FDE5F300CEA408D9 -:10418C003114600671335FE512F9712BE78F14F966 -:10419C00312503F512F9C6D7D546FCDF1A310200DA -:1041AC00155003FD7C2B625C01D1DF07F512F97110 -:1041BC00025FD7E546FCD74046FCF0DF083104002F -:1041CC0041F546FCD74046FCC8DF0BF512F97102ED -:1041DC005FCF46FCF0D73102000A4046FCFFDD22DF -:1041EC00A046FCD7F0C15004FD6B2BC08FC9FB5C03 -:1041FC009F9FC9FB7110DAFB30353DFD0239CF466C -:10420C00FCF0D731045D06F512F971025FD77153DA -:10421C005FF450717207FDAD02717307D7FD9905FC -:10422C00F2D7C7200CFBF8FF8F00FCF0F9FFFBF373 -:10423C0003FD7A4E13BC048F02FCF0F901FCF3036E -:10424C00FD7A4E13BC028F04FCF0F903FCF303FD62 -:10425C007A4E13BBAC04BDD8F6BDDAAC04311EBD2E -:10426C00DCF6BDDEFDF10DADD8BDDCADDABDDEACEE -:10427C0002BDD8F6BDDAAC02311EDADCC3DADEC31D -:10428C00BDDCF6BDDEFDF10DC0BDDEC0BDDCADDEBE -:10429C00FD670FADD8BDDCADDABDDEABBDD8F6BD6C -:1042AC00DAAB311EDADCC3DADEC3BDDCF6BDDEFD13 -:1042BC00F10DC0BDDEC0BDDCADDEFD670FDADAADE1 -:1042CC00D8FD0746C3C58FE0FC5C3FF0317E04602F -:1042DC00FC14C2C0B9A0E0FCF6BC08BC0A9C078C5C -:1042EC00074C2EDD3E8FE0FC0E0770F161DC605C4C -:1042FC003FF0317E127960FCBDD8F6BDDA8C0773C5 -:10430C00092422318FBDDC70BDDEFDF10DAC08BD82 -:10431C00DCAC0AFD670FADDABC0AADD8BC0861593C -:10432C0007EFBCAC08BDD8AC0ABDDAC9DC0004F69A -:10433C00FDBB0EC9DCFFFFF6FDBC0FADD8BF5AFCB0 -:10434C00AF54FC425AFCDD12AF56FCBF58FCAF54C4 -:10435C00FCBF56FCAF5AFCBF54FCAF56FC4258FC99 -:10436C00DC50AF54FC4256FCDE48AF1AFD4254FC04 -:10437C00DE40401EFD16DC1F401EFDA0DE168F5CCD -:10438C00FC4F1EFDDE0EAF54FC225EFC4469106136 -:10439C00C8FDF743F51EFDAF54FC445146DC0BAF92 -:1043AC0054FC241027BF1CFDEF1130F82ABF1CFD54 -:1043BC00EF09401EFDFF61E8A01EFDAF58FC425600 -:1043CC00FCDC1BAF56FC4254FCDE13AF54FC421C0D -:1043DC00FDDE0BF55CFCAF54FCBF5EFCEF09405CF2 -:1043EC00FCFF61E8A05CFC100CC6D7717BFAC771AE -:1043FC000A9E31929E02EFFA8E949F4EFC8E969FEF -:10440C004FFC8E979F50FC8E989F51FC8E939F5221 -:10441C00FC8E929F53FC710B9E717AFA8F51FCFDAE -:10442C00D00F76FD854513BD56D505FCDF0AD506A4 -:10443C00FCDF05D507FCDD25F6B14656DF11C95664 -:10444C003722665C0391DF060A56181A5700961736 -:10445C00FDA84613FDC94431645F02EF5E5206921B -:10446C0092694EFC6848FCDFF6AD56BD54F852F329 -:10447C00311C7918F944FEFFDD41D852F1010418C2 -:10448C00F914A944FFFFDF04E6B9EF0BD852F10190 -:10449C000418F914A9A1B9A005FCD505FCDF1CA0D2 -:1044AC0006FCD506FCDF14A007FCD507FCDF0CCFFF -:1044BC0005FCFFCF06FCFFCF07FCFFC6D7C716D8FD -:1044CC0052F10744A800DC0571625FEF1CF647DD72 -:1044DC0018A4524A52A8DC0571625FEF0CF852F333 -:1044EC00311CF67818F9B7EFE4C6D7C756A896660C -:1044FC00F0317E12F6B17818F966D1DFF1F505FCD2 -:10450C00F506FCF507FCF45271635FC6D7C72004AF -:10451C00FBF8FFD432DF178D529FE1FC717BFA520E -:10452C000692926948FC68E2FCDFF6717AFA4A322C -:10453C0006DE0EE83209E2FC9C03A4328C0372EF17 -:10454C0034F9E1FCF3311C7918F9BB31725F058B3E -:10455C009C03EF128C019C03D5E1FCDF06CFE1FC40 -:10456C00A7EF03B0E1FC718071775F61DC61FB71D7 -:10457C00715F8C03721004C6D7C72008FBF8FF8F3D -:10458C0051FCFDD00F9C078F50FCFDD00F9C068F6B -:10459C004FFCFDD00F9C058F4EFCFDD00F9C048F63 -:1045AC0052FC9C038F53FC9C028C06318E011279B9 -:1045BC005222BB8C075C03D1DF098C064C0361C80B -:1045CC006179008C05318EB1610900BB313D12015E -:1045DC0003BB8B0E04708C011C00BB8F0AFC4E03BA -:1045EC00DC0E8C034F0AFCDC0B8C024F0BFCDC0446 -:1045FC00AB12EF03ABB1121008C6D7C7C3C120086A -:10460C00FBF8FFF661490A61F8614908DF07F734E6 -:10461C000000EDA446E6BC04F6BC06AC0ABC02AC39 -:10462C0008BBAC06614902AC0461F8614900DE28A4 -:10463C00AC04BDD8AC06BDDAE1FD760FADDABC0634 -:10464C00ADD8BC04ABBDD8AC02BDDAE1FD910FAD69 -:10465C00DABC02ADD8BBEFCAAC06BC02AC04BBAC36 -:10466C0008BDD8AC0ABDDAAC04BDDCAC06FDF40E5A -:10467C00AC04BDDCAC06FD670FE1FD910FADDABCFF -:10468C0006ADD8BC04AC06614902AC0461F86149C2 -:10469C0000DCC5AC0214AB12100CC6D7C7C1200489 -:1046AC00FBF8FF8F4BFCFDD00F9C034E04DF1CADC1 -:1046BC00544656DE07AD56265412EF40F64656DFEA -:1046CC00074654DD03E7EF34F7EF318C04318EB13C -:1046DC00128C03318E43DF18306D0126540656BB05 -:1046EC008C045C0391DF05AB041800BBAB12EF0C20 -:1046FC008C034E04DE0532A900EF01F71006C6D775 -:10470C00717BFA31026009F64658DD04B658EF7C2D -:10471C00710360717AFA4012F904DF07715307F4E0 -:10472C0022EF69D9E5FBF1E7240000DD0F23DD1A48 -:10473C0023DD1023DD5323DD2723DD38715307F4EC -:10474C0022EF49715207F422EF42D422DF07715253 -:10475C0007E422EF05715307F422C958FA00EF2C35 -:10476C00D422DF0B715207E422C958FA00EF1DF571 -:10477C00E5FBEF18D422DF0B715307E422C958FA7A -:10478C0000EF09CFE5FB02EF03FD9947D7D91DFCDC -:10479C00F1E7240000DD0923DD2123DD0923EF1BD4 -:1047AC00715307F422D7D422DF07715207E422EFAA -:1047BC0005715307F422C9582D01D7715207E42211 -:1047CC00D731425D01D771635DD9E3FBF1E724007A -:1047DC0000DD1223DD1923DD1123DD2623DD342337 -:1047EC00DD3923DD3FFD5948EF3DFD7A48EF38D9DF -:1047FC00E2FBC1AE6CFD2B2DC0F313BE6C71230418 -:10480C00EF25F0C1AE6CFD2B2DC0F313BE6C7123E4 -:10481C0004EF14F6BE6C712204EF0CCB6CFF00712C -:10482C002304EF03FDEE484012F905DD064012F9B2 -:10483C0001DF0671230471635D31645D0FF6BE64A4 -:10484C00BE6A31220402EF02F690BE6ED7CD244729 -:10485C00F45AAE6C317DBFEEFCFDC348D2DF0ED9ED -:10486C00E2FBC1AE6CFD2B2DC0F313BE6CD7FDC3A8 -:10487C0048D2DD0DCD2447F45AAE6C317DBFEEFC31 -:10488C00D7E85A096C225080D6BFEAFC22EEFCBD58 -:10489C00D8304700FD1C0EBFECFC30EAFCFD412D6E -:1048AC00F313BE6CB424D424DF0CCD2447A45A4A91 -:1048BC005A1F61C8F45AD740C5FB0BDC05712304A1 -:1048CC00F2D740C5FB0661D831225C11F0C1AE6C49 -:1048DC00FD2B2DC0F313BE6C712204EF03FDEE48CB -:1048EC00E2D771625DF0C1AE6CFD2B2DC0F313BE2F -:1048FC006CA0F0FC40F0FC40DC3DF5F0FCD9F1FC88 -:10490C00F1313F0420FD14D9F1FCF1BDD85008FD64 -:10491C006B0E087208E6D2DD040192DFFC89615847 -:10492C00D1DD05712204EF03712304A0F1FC40F1E9 -:08493C00FC2061C8F5F1FCD775 -:1049440061FC61FCC1C3C5C7520C929269D4FEC11B -:10495400DFF88EFD708EFCC1717AFA4012F903DF24 -:104964000630262AFD0239C09EFC609EFD34D4FE2A -:104974005206C0B9A5A592DFF9C6C4C2C061FC61E4 -:10498400DF520C929269D4FEC1DFF88EFD708EFC6A -:10499400C1C736410571A4C6DC65F5F4FC71485005 -:1049A400057160500531345E3671620771335E8F74 -:1049B400CAFB5FD2FBD1DF1B8FCBFB5FD3FBD1DF05 -:1049C400128FCCFB5FD4FBD1DF098FCDFB5FD5FB0E -:1049D400D1DD0C31620702EFFA716307716B277145 -:1049E400735FFD3130F432C73641057184C6DC0F84 -:1049F400C73641057194C6DC06717AFAED2B4BC7B4 -:104A04003641057184C6DE19F5F4FC71485005FD84 -:104A14003130C73641057194C6DC06717AFAED2B44 -:104A24004BC73641057194C6DE0FD5F4FCDD0A4050 -:104A3400F4FC0261E871605005717AFA8FF4FC317C -:104A44008FE7240000DD0823DD1323DD31EF5971E6 -:104A540040500571505005E5F4FCED2B4B8F40059B -:104A64009F0EF9715050058F0EF99F10F9D90EF968 -:104A7400FDF833629F0FF9CFF4FC02ED2B4BC736E0 -:104A840041057194C6DE1DC736410571C4C6DE06F4 -:104A9400CFF4FC03EF127148500571605005F5F432 -:104AA400FCED2B4BCFF4FC0440F4FC03DF138F0F1D -:104AB400F99F4005D90FF9C1D90EF9FD8734C0EF2C -:104AC400218F4005768F0EF901DC05D50EF9DF063E -:104AD40071605005EF51C7D90EF9FDB230C0715065 -:104AE4005005D910F9F1242900DD2C240400DD2718 -:104AF400242200DD22241100DD0C240100DD182411 -:104B04001E00DD13EF0C400EF960DF0BCF0EF961D0 -:104B1400EF05F432A00EF940F4FC03DF0AD90EF9D4 -:104B2400FDF833629F0FF9C09EFC609EFD34D4FEF5 -:104B34005206C0B9A5A592DFF961FCC1C7717AFA22 -:104B4400714AE5717BBD51405F0401D1DD06F61663 -:104B5400A747DFF2300400BF2401F6BF2A01300B5F -:104B64000BBF28010000000000000000510FBF2807 -:104B7400010000000000000000500FBF2801710A6E -:104B8400E671235DC6C061FCC1C5717AFAD436DD15 -:104B94000BEA34899E44A634B436EF33710AE63006 -:104BA4000400BF2401F6BF2A01300B0BBF2801000B -:104BB40000000000000000510FBF280100000000A9 -:104BC40000000000500FBF280171135D71235DC404 -:104BD400C061FC61EF520C929269D4FEC1DFF88E81 -:104BE400FD708EFCC12006FBF8FF71503002CEAB85 -:104BF400ACCC0100F6BC0231B2E20F617902F6617D -:104C04004902DFF371603002EF7E8E519B713BE20B -:104C14008B5C02D1DD1D8B5C08D1DF097150300241 -:104C2400CC0100EFCF8C0570FD6035629E50CC0145 -:104C340002EFC18B5C03D1DF408E509C0471503075 -:104C4400028C01D1DF0E8C0470FDA635629C05CC6C -:104C54000101EF318C014C02DF0671603002EF2854 -:104C6400CF34025A716030028C0470C18C0570FD1F -:104C74000835C0CF34024AEF0F8B5C01D1DD0671D9 -:104C8400603002EF03EDF84B1006C09EFC609EFD01 -:104C940034D4FE5206C0B9A5A592DFF961FCC1C3A4 -:104CA400C5C7520C929269D4FEC1DFF88EFD708E96 -:104CB400FCC1710A9E31929E02EFFA8FF4FB4F966B -:104CC400FFDF198FF5FB4F97FFDF118FF6FB4F982E -:104CD400FFDF095004C15011FDB534C0710B9EC0F3 -:104CE4009EFC609EFD34D4FE5206C0B9A5A592DF99 -:104CF400F9C6C4C2C061FCA44261FCC1C3C5C752A9 -:104D04000C929269D4FEC1DFF88EFD708EFCC1C195 -:104D1400FBF8FF8D1F9C018E31318EE7240600DDE8 -:104D24000823DD0E23DD22EF4E717AFA8C019D3CBF -:104D3400EF45717AFA4015F901DF068C019D3BEFCE -:104D44003651FF2E019D3BEF2E717AFA4014FCFF81 -:104D5400DF068C019D26EF058F14FC9D268FC8FB72 -:104D64005C01D1DF124012F903DD064012F904DFC1 -:104D740006306825FD02394031FF09DE05A031FF08 -:104D8400EF137158F00071425EA02BFC402BFC0322 -:104D940061C8F52BFC710BE3C0C09EFC609EFD3422 -:104DA400D4FE5206C0B9A5A592DFF9C6C4C2C0613B -:104DB400FC61FF520C929269D4FEC1DFF88EFD7043 -:104DC4008EFCC1717AFA8FFAFB5C03D1DD194012B3 -:104DD400F903DD064012F904DF0D36100571D4DE47 -:104DE4000630373AFD0239C09EFC609EFD34D4FE85 -:104DF4005206C0B9A5A592DFF961FC61FC61FC61B2 -:104E0400FC61FC61FC61FC61FC61FC61FC61FC61B6 -:104E1400FC61FC61FC61FC61FC61FC61FC61FC61A6 -:104E2400FC61FC61FC61FC61FC61FC61FC61FC6196 -:034E3400FC61FC22 -:0A4E380000060C12181E242A303662 -:104E420000000000C2FB0000000040FE0000000065 -:104E52007E3BF3358C22CD47022EBD2E0C47A53C5E -:104E62000C09943E01000000983AF82AFF005555BB -:024E7200555594 -:064E7400FF0000004700F2 -:084E7A00317503F7332312D751 +:10273C008C019C05CC04008C059FC5FB8C049FC6AA +:10274C00FBFDB22B8F0CF94E05DD2B40C5FB0BDED0 +:10275C0006400CF90BDE1640C5FB06DE06400CF9F4 +:10276C0006DE0AD5C5FBDF0ED50CF9DD095020C1FC +:10277C005011FDBE34C08FC5FB9F0CF9FDEF2B1023 +:10278C0008C6D7C7D832C15002FD622BC04016F91B +:10279C000161F8712010055012FD47028D326C0852 +:1027AC0070C15002FD622BC05003FD47028D326C8C +:1027BC001870C15002FD622BC05016FD4702500329 +:1027CC00FD732B625C01D1DD107170C9FB5002C12D +:1027DC005013FDBE34C0F2EF01E2C6D7C75004FD62 +:1027EC00732B625C03D1DD405014FD7F2834C9FB90 +:1027FC00895C9F998A0C7CFF50FF5C14D1DD228A86 +:10280C000C7CFF5C147234CDFB89616A9971620790 +:10281C005600316207058666D1DFF7716307716B6D +:10282C002734DCFB895CEB99712810055002FD7391 +:10283C002BD2DD354016F901DF05500AFD47028D1C +:10284C00326C1070C15002FD622BC0E0FD4702D803 +:10285C0032C15002FD622BC05033FD4702F0C15013 +:10286C0002FD622BC07178C9FBE0C15013FDBE3470 +:10287C00C0C6D7C7C12004FBF8FFCC02005004FD32 +:10288C00732B629C038C045C20D1DD0E8C036C01D9 +:10289C009C038C026C209C02EF138C045C10D1DD29 +:1028AC000C8C035CFE9C038C026C109C028C045CF4 +:1028BC0008D1DD0E8C036C029C038C026C089C020C +:1028CC00EF138C045C04D1DD0C8C035CFD9C038C3D +:1028DC00026C049C028C03D1DD05501AFD47028C5E +:1028EC000370C15004FD622BC08FC9FB5C9F728CBE +:1028FC0003318E316D148C03318E314D616D086155 +:10290C006C5C606162629FC9FB8FD5FB7CFF50FFE2 +:10291C005E02D1DD278FD5FB7CFF5E027234CDFBCE +:10292C0089616A99716207CC0100316207086159AB +:10293C00018C01D1DFF4716307716B27F21006C6AD +:10294C00D7D9BDFBC15006FD622BC0D9BEFBC1500F +:10295C0007FD622BC0D7FD4D29F2D7C7711300714B +:10296C001B20710303710205E0C15003FD622BC0F3 +:10297C005013FD4702F0C15005FD622BC0500FC132 +:10298C00E0FD622BC0500AFD47027103055008FDA3 +:10299C004702501FC1E0FD622BC05012FD47025090 +:1029AC0003FD732B625C01D1DF03E2EF24F0FD73B6 +:1029BC002B629D2E3602F9C75008FD4A2BC05003DE +:1029CC00C1FD622BC0710203711A20FD0A2BF42980 +:1029DC00F2C6D75003FD732B625C01D1DD15501488 +:1029EC00FD7F28FDE8275014FD4702E0C15003FD90 +:1029FC00622BC0711300711B207103035014FD472F +:102A0C0002F0C1E0FD622BC0F0C15003FD622BC08F +:102A1C00D7C72004FBF8FFCC02008D299C03501073 +:102A2C00C150A4FDD102C0629D29D439DD04F2ED60 +:102A3C00E72A8C037B295C08D1DD0F8D295C08D13A +:102A4C00DF05CC0210EF03CC02208C037B295C0445 +:102A5C00D1DD158D295C04D1DF088C026C049C023D +:102A6C00EF068C026C089C028FC8FB5CF3728D29FC +:102A7C005C0C6162629FC8FB8FD4FB7CFF50FF5ED5 +:102A8C00029C02D1DD1F34CCFB896E029971620766 +:102A9C00CC0100316207086159018C01D1DFF4715E +:102AAC006307716B278D295C40D1DD095002C15041 +:102ABC0012FDBE34C08D295C01D1DD08E0C150127D +:102ACC00FDBE34C0717AFA8D295C41D1DD0C5A29D6 +:102ADC00BED829C15010FD5205C0F21004C6D7FD56 +:102AEC008F27F2D7FDE827F2D7C78FDCFB7617FDCF +:102AFC007F28664FDCFBDFF2F5DCFBF2C6D75064B7 +:102B0C00FD4702FD5A2C6261FB71115EF171145E7E +:102B1C0061DC70C15012FD5205C0FD6436CD3F031F +:102B2C00D7C7C1C1FBF8FFAC0ABB17C15002C18C9F +:102B3C000270C1506CFDA10310061004C6D7C7C1AA +:102B4C00FBF8FFAC08C15002C18B70C1506CFDF991 +:102B5C00021006C0C6D7C78806166770C1C7508456 +:102B6C00FD6B031004C6D7C716C75084FDD102C035 +:102B7C00C6D7C74A2004DE045600EF0256014016A1 +:102B8C00F901DF048686EF0A4016F902DF045104CE +:102B9C00610666318F12504CD633514CD6610A0403 +:102BAC000A20BD30C6D740C5FB51DC05CF1CFC0F3D +:102BBC00D740C5FB33DC05CF1CFC0BD740C5FB0B4A +:102BCC00DC05CF1CFC07D740C5FB0661D8313204AD +:102BDC0005CF1CFC03D7D5C5FBDD04E51CFCD7F5E4 +:102BEC001CFCD7D512F9DF0471635ED7FD5A2C6239 +:102BFC0061FB71715E71145E71775E61C831625EEA +:102C0C001771625E71745E71115EF171745E61DCDC +:102C1C0070C15012FD5205C0D7C7164010FCFFDD25 +:102C2C000C8F10FC9B1714CA0100F2EF07C750045D +:102C3C00FD4A2BC0C6D7C7164011FCFFDD078F110C +:102C4C00FC9BF2EF07C75002FD4A2BC0C6D740C50C +:102C5C00FB0BDE02E2D7F2D771000105717850054B +:102C6C00713AD5713BD1713ADD713BD98F10055C4E +:102C7C00FC9F1005CF54054AE542057110420571C1 +:102C8C00004205714850057130500571205005CF38 +:102C9C00530505CF52050A7130510571205105714C +:102CAC003BD5717050058F11055CFC9F1105F4220A +:102CBC00D77178500571080105D77140F000717813 +:102CCC003002713AE6713BE2713BEA713BEE8F10D8 +:102CDC00055CFC9F1005CF34024AE552FF711A5275 +:102CEC00710A52714830027130300271203002CFBB +:102CFC00330205CF32020A71303102713BE671703A +:102D0C0030028F11055CFC9F110571603002D77188 +:102D1C007830027148F000D7C788061666614FDD1F +:102D2C000967614EDE0396EF01866672C6D7C71639 +:102D3C001714AA0412A943DD29AA0412A923FD36EB +:102D4C004EC3AC02FD364E13C2BDD813FDB00FDE20 +:102D5C000C1714AA0212AA0403BA04EF051714A93B +:102D6C00BA04AC041231FF319E03317F087208C6DD +:102D7C00D77100F200304400BFB601300188BF901B +:102D8C0001300984BF9E01BF9C01BF9A01BF98010D +:102D9C00BF9601BF9401BF9201F53CFF30FE00BF0E +:102DAC00BE01F6BFBC01BFB80150EEBFBA01A1BF56 +:102DBC00B201C918FE00F6BE6EBE64BE6A71230471 +:102DCC007153078F14F9310507F5E3FBCB6CFF004A +:102DDC0071535F71425FD730EF00BFB401F6BFBAD9 +:102DEC00017108F20071230471530771435FD78F8F +:102DFC009AFBB09AFBD1DF7331D4D106715BD1E56C +:102E0C009CFBD59CFBDD347140C8FBD99BFBF1E7E7 +:102E1C0034020023DD0625DD0325DF05F6BE66EF53 +:102E2C0006D9E2FBF1BE66A09BFB409BFB20DF06B4 +:102E3C00F59BFBB09CFBCF9AFB19D7CF9AFB1E716D +:102E4C0048C8FBD5E4FBDF04F6BE66D7D9E2FBF13C +:102E5C004266FFDD16D9E2FBF112AE6643DE05A237 +:102E6C0066FFEF03B266FFCF9AFB03D7C7161714A2 +:102E7C00F6B9AA0412F6231231FF31AE03316FBA40 +:102E8C0002C6D7C7C1FBF8FF8C085080D612AB1412 +:102E9C0013B9AB14AA0412A92312D937FBF133BD11 +:102EAC00D813FD1C0EBA02C0C6D731645F01D740DF +:102EBC0012F902DF10F6BE64BE6EBE6ABFA4FBBF81 +:102ECC00AAFBBFB0FB31545F1530A0FBFD782E3050 +:102EDC00A6FBFD782E30ACFBFD782EED6A2F3174FD +:102EEC005F0F71735F7108E8FBF59EFBF59DFBEFBF +:102EFC006DD59DFBDF658F36FB9F9DFB409EFB1FB9 +:102F0C00DC1A7100E8FB4038FBFFDD22A09FFB8F31 +:102F1C0038FB4F9FFBDE17F59EFBEF12D99EFBF1A2 +:102F2C00A1605C1F9F9EFB7108E8FBF59FFBE99E6F +:102F3C00FB093AFB70C130A0FBFD8F2EC0E99EFB54 +:102F4C00095AFB70C130A6FBFD8F2EC0E99EFB0910 +:102F5C007AFB70C130ACFBFD8F2EC0B09DFB30A056 +:102F6C00FBFD3A2DF313BE6E30A6FBFD3A2DF31389 +:102F7C00BE6A30ACFBFD3A2DF313BE64D7C736F0F6 +:102F8C000071F4DC297170F000CE9D08CE9EC0CE8D +:102F9C009F80F594FFF593FFF592FFE597FFE5967B +:102FAC00FFE595FFE598FFCE9C7F7100BCFB711B84 +:102FBC00E3712BE3711AE7712BE7717A9D710A9E0D +:102FCC0031929E02EFFA710B9E7103607113607166 +:102FDC002360C6D7C73102601E710260710A9E3130 +:102FEC00929E02EFFA34EAFB3692FF52078B99A5B8 +:102FFC00A792DFF9710B9EC6D7C7880616311260EF +:10300C0015711260C734B2FB3092FF1652078B99C0 +:10301C00A5A792DFF9C666736718B2FBC6D7C7714E +:10302C0003603114601E711360710A9E31929E020E +:10303C00EFFA3492FF36B2FB52078B99A5A792DFB9 +:10304C00F9710B9E31246013712360717B9E8FF29A +:10305C00FB9E9A8FF3FB9E9B717A9EC6D7CFBDFBCE +:10306C005CCFBEFB5FCFDEFB5DCF12FC36CF13FC1B +:10307C00C9E5E9FBD7C7CFBAFB11CFBBFB37CFE212 +:10308C00FBFFF5E3FBF5E4FBF5E5FBF5E6FB560092 +:10309C00664C64DE08723836FB0086EFF3C6D7C781 +:1030AC0088061617F1E73403002361E3EDEE3323B2 +:1030BC0061F8ED9C31B12361E3EDA3312561F8EDAD +:1030CC00B231B1240D0061D8EDEE33240B0061F860 +:1030DC00EDD3312361F8ED1A322361F8EDE731239A +:1030EC0061F8EDB23324060061F8ED8332B125614D +:1030FC00D8ED9F3224000061F8EDAC322361F8ED7D +:10310C00EE332361F8EDCC33B12361E3EDCF322301 +:10311C0061F8EDE0322361F8EDF1322361F8EDE076 +:10312C00322361F8ED02332361F8ED13332361F898 +:10313C00ED22332361F8ED44332361F8ED50332352 +:10314C0061F8ED5C332361F8ED65332402002361F3 +:10315C00E3EDEE3324020061F8ED6E332361F8EDFC +:10316C007B332561F8ED8733B124060061D8EDEE91 +:10317C003324000061F8EDF1332561F8ED9333242D +:10318C00120061F8EDAD332361F8ED9E33EDF233AF +:10319C00679FBCFBEDFF33306229FD0B396673670B +:1031AC0018BAFBEDFF3340BFFB6ADF1440C0FB686D +:1031BC00DF0E674C6CDF09303242FD0B39713AD5AA +:1031CC00679FC1FBEDFF3367D1DD06303E3DFD0B44 +:1031DC003934DAFB89616F99EDFF33675C02D1DD1D +:1031EC000830EB2AFD0B39EF0C675C01D1DD0630A2 +:1031FC00F02AFD0B39675C3CD1DD1030F52AFD0B54 +:10320C0039675C3C7266736218BAFBEDFF3367D1A9 +:10321C00DD625C01D1DD05300800EF01F6609F191D +:10322C00FC675C02D1DD03E6EF01F63419FC896121 +:10323C006899675C04D1DD04E6A1EF01F63419FC52 +:10324C0089616899675C08D1DD05302000EF01F6D3 +:10325C003419FC89616899675C10D1DD0530100068 +:10326C00EF01F63419FC89616899675C20D161E83B +:10327C00716019FCEDFF33D434DF08679FE3FBA4C6 +:10328C0034EF0D4A3405DE08E83467181DFDA4340C +:10329C00EDFF33675C0F7266736218BAFBEDFF3398 +:1032AC004A3464DE1B4A3401DF0667D161F85701EA +:1032BC00E834671836FBA4344A340561C871725F70 +:1032CC00EDFF33675C7F70C117F1243000FD0530D2 +:1032DC00C0EDFF33675C3F70C117F1243000FD0572 +:1032EC0030C0EDFF33675C0770C117F1243000FD6F +:1032FC000530C0EDFF33675C1F70C117F12430003F +:10330C00FD0530C0EDFF336770C117F1243000FDAF +:10331C000530C0EDFF33CEABAC710A9E31929E02EC +:10332C00EFFAD592FFDF05710B9EEFED679E997159 +:10333C000B9E9FF1FBEDFF33712260675C7F9FF268 +:10334C00FBEDFF33712260675C3F9FF3FBEDFF33B6 +:10335C00675C3F9FF4FBEDFF33675C1F9FF5FBED54 +:10336C00FF3330093BFD0B39679FFAFBEDFF333020 +:10337C00C43AFD0B39679FFBFBEF7830E63AFD0B47 +:10338C0039679FFEFBEF6C675C01D161E8FD00457E +:10339C00EF614A3AC8DE08E83A671868FAA43AEFCF +:1033AC0052679D3AEF4D67318E247000DD0D24027B +:1033BC0000DF4030FE08FD0B39EF38FD0044EF33E1 +:1033CC00675C01D1DD05711202EF03711302675CBA +:1033DC0002D1DD05712202EF03712302679FE9FB25 +:1033EC00EF1100EF0E00664C5BDE07736718BAFB3B +:1033FC00EF0100C6D7C716664C30DC094C37DE052A +:10340C00FDE02FEF6E664C02DF1F8FBCFB5C03727E +:10341C008F1BFC5C03318E316D08616A08128F1BA7 +:10342C00FC5C80312A6162EF59664C3DDF0AAE903C +:10343C00BF16FCF916FCEF4A664C3EDF05F917FC8B +:10344C00EF40664C4FDF05FD2245EF36664C61DFE1 +:10345C0008E83A0968FA72EF29664C7FDF05FDAE81 +:10346C003DEF1F664C4EDF0B316461045210EF12BE +:10347C00F2EF0F664C5BDC0452FFEF06667309BA81 +:10348C00FB72C6D7C788061617F124100024050056 +:10349C00DC07244C00DD17EF17717BFA17F104BA27 +:1034AC00FB1489617F99717AFA713260EF02A43A48 +:1034BC00C6D7C7C1C1FBF8FF4012F903DD064012A5 +:1034CC00F904DF2F8C027309C2FB5E0AD1DF248C56 +:1034DC0002318E04BAFB14896E0A99716207CC0111 +:1034EC0000316207086159018C01D1DFF471630767 +:1034FC00716B271004C6D7CF1BFC03F519FCF51D07 +:10350C00FCF51FFCD7C788061617F1E73402002517 +:10351C00DD3D23DD1725DD1C23DD0523DD2BEF3BF6 +:10352C00716260679F1EFCCD3F03EF2F675C839F2A +:10353C001BFCEF27675C039F1DFC675C034C02615F +:10354C00F8710262FD1547EF12679F1FFCEF0C67C5 +:10355C0091DF08E0C15012FDBE34C0C6D7C71617A4 +:10356C00F1E7240000DD2A23DD1E240300DD0724FF +:10357C00FB00DD24EF2531126205308000EF01F6EF +:10358C00086F1CFC7208EF198F19FCF519FC72EF0F +:10359C00107142615235EF09F2EF0666730918FC9F +:1035AC0072C6D7C71617F1E7240000DD38241000C7 +:1035BC00DD1C23DD1C23DD30240E00DD182411005E +:1035CC00DD1B240F00DD12243000DD15EF1EE2EFB1 +:1035DC001D5202EF195204EF155206EF115205EF6E +:1035EC000D5207EF09F2EF065203EF0252FFC6D756 +:1035FC00C7314460377143608D3E9FC2FB8D3D9F48 +:10360C00E1FB36FAFCC7D83DFDB937618A70618A97 +:10361C00FDFE37C0D842F1312F609D418D3C4B41AE +:10362C00DD0A7152608D419D3CCD3F034A3F05DE62 +:10363C0009306E36FD0B39CD3F6BB43F7150F00045 +:10364C00CE300BCF170006CE3106FDAD02717A30AD +:10365C00710BE3710BE7C6D78D419D3C8D419FC328 +:10366C00FBD74012F903DF064012F904DF02F2D750 +:10367C003154600D7153607173608D419F28FCEF64 +:10368C003831646023716360717260D51EFCDF0594 +:10369C00F529FCEF0B8F1EFC5002D6A1609F29FC74 +:1036AC008F29FC9F28FCEF11317460088F29FC9F37 +:1036BC0028FCEF058D419F28FC8F28FC9FC3FBD96C +:1036CC0028FCFDE136E928FC09DA2170C15013FD14 +:1036DC005205C0F2D7C7C1C1FBF8FF8C02D1DF0580 +:1036EC00F51EFCEF1A8C024C05DE06CF1EFC02EF19 +:1036FC000E8C02318E1231FE03311F609F1EFC8F27 +:10370C002AFC4F1EFCDD29CC011F8F1EFC9F2AFCBE +:10371C00CC00008B4C08DE148B73091A224F1EFC54 +:10372C00DC058B9C01EF05615900EFE78C019D4096 +:10373C001004C6D7C7168B728C01614ADE1F8B72C0 +:10374C008C02614ADE138C01728C02614ADE058C9C +:10375C000172EF268C0272EF218B72EF1D8B728C33 +:10376C0002614ADE048B72EF118C01728C02614291 +:10377C00DE058C0172EF038C0272C6D7C716710A74 +:10378C00E7710BE37150F000CE300BCF17000666DB +:10379C009E31FDAD02717A30710BE33182E302EFA1 +:1037AC00FA8D1F7158F000710BE772C6D7C7C1C1F3 +:1037BC00FBF8FF8F12FC4E02DC03F2EF318C024F50 +:1037CC0013FCDC0452FFEF268C022F12FC706131CB +:1037DC00318D128F13FC2F12FC70613133BDD81355 +:1037EC00FD3E0EBB440001DC03F690BB8B72100453 +:1037FC00C6D7C7C1FBF8FFAC0814A91489708B613C +:10380C0028706131FD364E1344030071FEDC23AC8D +:10381C0008148A04819A04AC08148A044C11DC1034 +:10382C00A9148B99AC0814CA0200AC0814CA031072 +:10383C00EF72AC0814CA0400AC0814A914894DDE4C +:10384C000AAC08148A02819A02EF12AC0814A9146B +:10385C00894D61D308AC08148A02919A02AC081401 +:10386C008A03919A03D1DF3CAC08148A024C10DF16 +:10387C0010A91489318EA112AC0814A9146299EF05 +:10388C0017AC08148A024CF0DF0EA91489318EB1E2 +:10389C0012AC0814A9146299AC0814CA0200AC0842 +:1038AC0014CA0310C0C6D7EDF638717BFAC7D444DE +:1038BC0061F83104612E710461712161710361D46D +:1038CC0044DD05B444CEABAC717AFA5600664C0AB2 +:1038DC00DD1272F3311C7900FDCEFC0061CAFD557E +:1038EC003986EFE9717AFAF2C6D7C75600664C0AE8 +:1038FC00DE0BF0317E12F6782CFC86EFF0C6D7C7C3 +:10390C00C1C1FBF8FFCC01008C014C0ADE36717B87 +:10391C00FA8C01F0317E042CFC14A96168DF09AC2F +:10392C0002B9717AFAF2EF1D8C01F0317E12792C0A +:10393C00FC614902DF06717AFAE2EF09717AFA61E9 +:10394C005901EFC4E21004C6D7C72004FBF8FFF6F8 +:10395C00422CFC61F8ED3A3A717BFA9C038C034CD7 +:10396C000ADE3C8C03F0317E042CFC14A96168DF68 +:10397C0005717AFAEF29717AFA8C0372F3311C799A +:10398C002CFCCEFC0061CA629C02D1DF0A8C03F0D5 +:10399C00317E12E6782CFC717BFA615903EFBECCB8 +:1039AC000200CC01018C02F0317E042CFC14A961C4 +:1039BC0068DD7B8C02F0317E12792CFCE743DF68EA +:1039CC008C014C0ADE628C01F0317E12792CFCE702 +:1039DC0043DD50717BFA8C01F0317E042CFC14A970 +:1039EC006168DF1B616901717BFA8C01F0317E1219 +:1039FC00F6782CFC717AFA8C024E01DCE7EF2F8CF6 +:103A0C0001F0317E042CFC14A9128C02F0317E33AF +:103A1C00782CFC8C01F0317E12E6782CFC6159027A +:103A2C00717AFA615901EF98615902EDB13900F2DE +:103A3C001004C6D7C72006FBF8FF34FFFBC55006A1 +:103A4C00C150A8C15030FDF9021006D2DD1DA040B6 +:103A5C00FC4040FC08DE03E2EF5A34FAFB895CFCC4 +:103A6C0099FD093B7110C8FBF2EF49F540FC8FFA48 +:103A7C00FB5C01D1DD264012F903DF205010C18020 +:103A8C00FDBE34C0C736100571D4C6DE0F17C15049 +:103A9C0006C150A8C15030FDF90210064012F901C0 +:103AAC00DD114012F905DD0B8FFAFB5C02D161E8E8 +:103ABC00FD3742F21006C6D7D9FBFBC15030FDD101 +:103ACC0002C0629FFEFB7130CBFB8FD3FB5C08D135 +:103ADC00DF06716307716B27F2D7D9FEFBC1D9FDE5 +:103AEC00FBC15030FD6B0310047130CBFB8FD3FB4B +:103AFC005C08D1DF06716307716B27F2D7C7200A08 +:103B0C00FBF8FF500FC15030FDD102C04A3902DF23 +:103B1C00077110C8FBF2EF5F7118C8FBCC070040AF +:103B2C0015F901DF05CC0802EF03CC0810CC098095 +:103B3C008FFAFB5C03D1DF08717AD5CC0607EF0650 +:103B4C00717BD5CC062F17040600C15004C150A0C0 +:103B5C00C15030FDA1031006C736100571D4C6DE66 +:103B6C00154012F903DF0F17C15006C150A8C15000 +:103B7C0030FDF9021006F2100AC6D74012F902DF26 +:103B8C0003F6BD46B014FDD514FD61E8EDAD3CCF98 +:103B9C0014FD048F12F9318FE723DD0B240200246E +:103BAC00030061C8EDAD3C8F14F931233F301B008D +:103BBC004646DF0AE0C15010FDBE34C0EF1D307721 +:103BCC00014646DF165002C15010FDBE34C0F64609 +:103BDC004CDF088FDEFB5010D6BD4CF6464CDD3763 +:103BEC00B64CE6464CDF3071025FEF2B301B0046C3 +:103BFC0046DF13F6464EDF18E0C15010FDBE34C050 +:103C0C00C94EE803EF0A307701464661F871025F4E +:103C1C00F6464E61E8B64E31346208713361F6BD3A +:103C2C0046EF1431346105F6BD46EF0BA646F64659 +:103C3C004661F8C946FFFF314262194A4805DE1653 +:103C4C00A4484A4805DF0FA4485004C15010FDBEDB +:103C5C0034C0EF02F448314462194A4A05DE16A416 +:103C6C004A4A4A05DF0FA44A5008C15010FDBE3421 +:103C7C00C0EF02F44AD44BDD03B44BD73152621778 +:103C8C004A4905DE14A4494A4905DF0DA4495010E0 +:103C9C00C1FDBE34C0EF02F4494A490661F8CD4B70 +:103CAC0025D7C736100571D4DE0730403AFD0B39E5 +:103CBC00D24012F903DF1D31220706301D2AFD0BFD +:103CCC00393144610C7143615080C15012FDBE34D6 +:103CDC00C0FDE53CFD103DC6D78F1BFC5C01D1DD62 +:103CEC0022D545FCDD04B045FCD7CF45FC098D4001 +:103CFC004F44FCDD0E8D409F44FC5040C15012FDE2 +:103D0C00BE34C0D74012F903DD04F6BD1AD7D5E690 +:103D1C00FBDF08F6461ADD19B61AD7D9E2FBF146D5 +:103D2C001ADD0ED9E2FB12AD1A43DE03A61AD7B682 +:103D3C001AD7C78FDAFB76F5DAFB5C10D161E87124 +:103D4C005261665C0FD1DD57665C01D1DD05F51261 +:103D5C00F9EF4C665C02D1DD11E0C15003FD622B22 +:103D6C00C0711300711B20710303665C04D1DD115B +:103D7C00711300711B20D51BFC61F8710303FD034B +:103D8C0035665C08D161E87103035005FD4702718B +:103D9C0002035003C1FD622BC0711A20FD0A2BF2E5 +:103DAC00C6D7C72014FBF8FF4A3413DC0552FFEDCD +:103DBC00993E8F14F9311505300400EF0F8F14F96B +:103DCC00314505300500EF04D915F9F1609C018DE2 +:103DDC002E9C028D209C038F02F99C048F03F99C6E +:103DEC00058D509C068D289C0771345EE66130125F +:103DFC0071045E61DC31196162629C08CC09018F2F +:103E0C0016F99C0AF171240461DC9C0BAE6C609C6D +:103E1C000CAD1A609C0DAE6E609C0EAE6A609C0F71 +:103E2C00AE64609C10F171540761DC9C11AE66604D +:103E3C009C1231246205304000EF01F6C13134048C +:103E4C0005302000EF01F6C2616B08616A08C131D0 +:103E5C00546205300400EF01F6C2616B08616A0818 +:103E6C00C131446204E6A1EF01F6C2616B08616ADC +:103E7C0008C131346203E6EF01F6C2616B08616A76 +:103E8C009C13A434D834F1B107A11489721014C650 +:103E9C00D7C7FD83098F12F9318FE724000061F831 +:103EAC00ED6B4023DD1B2361F8ED753F2361F8EDCD +:103EBC00F13F2361F8ED3A402361F8ED1D41ED68C7 +:103ECC0040D513F9DF2AF64646DD05F516FDEF035E +:103EDC00A016FD4016FD65DC0ACF12F905710261D2 +:103EEC00EDAB41AD46440A0061D8EDAB41E513F9A9 +:103EFC00713261F5DDFBFDC30471535EFDAD2340F2 +:103F0C0015F903DF09710261F512F9EDAB41FD14EE +:103F1C002640C7FB9BDE09710261F512F9EDAB413E +:103F2C00714A277140110571301105713A22715A8D +:103F3C002271501105FD6729D2DD09710261F5125C +:103F4C00F9EDAB4171103500CF37001D71401205F2 +:103F5C004013F901DF05F5E3FBEF04CFE3FB03CFDF +:103F6C0012F902FD4D29EDAB41FD642CFDC62C71FF +:103F7C004A9DFD0335FD8130F537FF712BE0F513BC +:103F8C00F9710261CBE43FEFCBE6F6F0FDC30471AF +:103F9C003BD47112027123028F14F931052850049D +:103FAC00FD732B625C03318E315D34C9FB89616812 +:103FBC00995002FD732BD2DD067170C9FBEF0471B1 +:103FCC0078C9FBFDAD23FD7D2D710814F9CF12F9D5 +:103FDC00038FBCFB5C02D1DD095080C15010FDBECB +:103FEC0034C0EDAB41FDAD413154612FA452D452DC +:103FFC00DD0831A4E00A31020C06712BE0FD2342EE +:10400C0031A4E01731040C13712BE05027C150057B +:10401C00FD622BC0CF12F904710261FD18428F149E +:10402C00F931250731146203F512F9EDAB41FDAD01 +:10403C004131020C14F0C15005FD622BC05005FD3E +:10404C004702FD2342CF12F903FD18428F14F931B8 +:10405C00250731146203F512F9EDAB41F512F9CFD6 +:10406C00E3FB03F5E4FBF5E6FB71525FF6426CFFF4 +:10407C0061E8EDAB41F6BD4C71035FF5FAFBFD0950 +:10408C003BFDE32DFDBD2CFD1B2D714B9D711302D2 +:10409C00712302F5CAFBF5CBFBF5CCFBF5CDFB315F +:1040AC00245F02EFFACE3708CBE4BFFFCBE6FFF17B +:1040BC00CED4FFCF37000971481205F6BEE0BEE240 +:1040CC00BED0716A27FDDF29714307714B277148F8 +:1040DC0010057148110571381005713811057133CF +:1040EC0002713B22715302715B2271581005715899 +:1040FC001105FD2C05CF12F905713261F6BD46F59F +:10410C000CFCF50EFCCF14FCFFCF10FCFFCF11FC08 +:10411C00FFF513F9F516FD3112622EFDAD23AD46F8 +:10412C00440B0061C8E512F9D515F961E8FD2C05C1 +:10413C008F14F9312511F50EFCF50CFC502EFD47B2 +:10414C0002E513F9E512F9EF56D42ADF52FD2C05DE +:10415C00FD462371730171320471430271035E7168 +:10416C00525E31949E02EFFA712AE7CEA409F5F360 +:10417C00003114620ED50CFCDF064010FCFF61F818 +:10418C000061FDE5F300CEA40831146206713361C1 +:10419C00E512F9712BE78F14F9312503F512F9C6E5 +:1041AC00D7D546FCDF1A310200155003FD732B6284 +:1041BC005C01D1DF07F512F9710261D7E546FCD736 +:1041CC004046FCF0DF0831040041F546FCD7404680 +:1041DC00FCC8DF0BF512F9710261CF46FCF0D73148 +:1041EC0002000A4046FCFFDD22A046FCD7F0C1507D +:1041FC0004FD622BC08FC9FB5C9F9FC9FB7110DA59 +:10420C00FB303E3DFD0B39CF46FCF0D731045F0649 +:10421C00F512F9710261D7715361F452717207FD95 +:10422C00AD02717307D7FD9905F2D7C7200CFBF8C7 +:10423C00FF8F00FCF0F9FFFBF303FD364E13BC04BB +:10424C008F02FCF0F901FCF303FD364E13BC028F18 +:10425C0004FCF0F903FCF303FD364E13BBAC04BDB8 +:10426C00D8F6BDDAAC04311EBDDCF6BDDEFDF10DB9 +:10427C00ADD8BDDCADDABDDEAC02BDD8F6BDDAAC76 +:10428C0002311EDADCC3DADEC3BDDCF6BDDEFDF1C5 +:10429C000DC0BDDEC0BDDCADDEFD670FADD8BDDC35 +:1042AC00ADDABDDEABBDD8F6BDDAAB311EDADCC3A0 +:1042BC00DADEC3BDDCF6BDDEFDF10DC0BDDEC0BD7A +:1042CC00DCADDEFD670FDADAADD8FD1046C3C58F65 +:1042DC00E0FC5C3FF0317E0460FC14C2C0B9A0E08D +:1042EC00FCF6BC08BC0A9C078C074C2EDD3E8FE00C +:1042FC00FC0E0770F161DC605C3FF0317E1279607E +:10430C00FCBDD8F6BDDA8C0773092422318FBDDCD5 +:10431C0070BDDEFDF10DAC08BDDCAC0AFD670FAD68 +:10432C00DABC0AADD8BC08615907EFBCAC08BDD8E3 +:10433C00AC0ABDDAC9DC0004F6FDBB0EC9DCFFFF1C +:10434C00F6FDBC0FADD8BF5AFCAF54FC425AFCDD95 +:10435C0012AF56FCBF58FCAF54FCBF56FCAF5AFC16 +:10436C00BF54FCAF56FC4258FCDC50AF54FC4256D8 +:10437C00FCDE48AF18FD4254FCDE40401CFD16DC50 +:10438C001F401CFDA0DE168F5CFC4F1CFDDE0EAF2B +:10439C0054FC225EFC44691061C8FD0044F51CFD10 +:1043AC00AF54FC445146DC0BAF54FC241027BF1A0D +:1043BC00FDEF1130F82ABF1AFDEF09401CFDFF611B +:1043CC00E8A01CFDAF58FC4256FCDC1BAF56FC426F +:1043DC0054FCDE13AF54FC421AFDDE0BF55CFCAF53 +:1043EC0054FCBF5EFCEF09405CFCFF61E8A05CFC88 +:1043FC00100CC6D7717BFAC7710A9E31929E02EFE0 +:10440C00FA8E949F4EFC8E969F4FFC8E979F50FC7D +:10441C008E989F51FC8E939F52FC8E929F53FC71F1 +:10442C000B9E717AFA8F51FCFDD00F76FD8E4513E1 +:10443C00BD58D505FCDF0AD506FCDF05D507FCDD2C +:10444C0025F6B14658DF11C9583722665C0391DF57 +:10445C00060A58181A59009617FDB14613FDD24496 +:10446C0031646102EF5E52069292694EFC6848FC20 +:10447C00DFF6AD58BD56F854F3311C7918F944FEEB +:10448C00FFDD41D854F1010418F914A944FFFFDFF2 +:10449C0004E6B9EF0BD854F1010418F914A9A1B929 +:1044AC00A005FCD505FCDF1CA006FCD506FCDF1422 +:1044BC00A007FCD507FCDF0CCF05FCFFCF06FCFFEB +:1044CC00CF07FCFFC6D7C716D854F10744A800DCA9 +:1044DC0005716261EF1CF647DD18A4544A54A8DC40 +:1044EC0005716261EF0CF854F3311CF67818F9B7CA +:1044FC00EFE4C6D7C756A89666F0317E12F6B178AF +:10450C0018F966D1DFF1F505FCF506FCF507FCF4AE +:10451C0054716361C6D7C72004FBF8FFD434DF178E +:10452C008D549FE1FC717BFA520692926948FC68AB +:10453C00E2FCDFF6717AFA4A3406DE0EE83409E260 +:10454C00FC9C03A4348C0372EF34F9E1FCF3311CB2 +:10455C007918F9BB317261058B9C03EF128C019CAD +:10456C0003D5E1FCDF06CFE1FCA7EF03B0E1FC7162 +:10457C008071776161DC61FB7171618C0372100475 +:10458C00C6D7C72008FBF8FF8F51FCFDD00F9C0746 +:10459C008F50FCFDD00F9C068F4FFCFDD00F9C055F +:1045AC008F4EFCFDD00F9C048F52FC9C038F53FC50 +:1045BC009C028C06318E0112795222BB8C075C0353 +:1045CC00D1DF098C064C0361C86179008C05318EF2 +:1045DC00B1610900BB313D120103BB8B0E04708C21 +:1045EC00011C00BB8F0AFC4E03DC0E8C034F0AFC33 +:1045FC00DC0B8C024F0BFCDC04AB12EF03ABB112E7 +:10460C001008C6D7C7C3C12008FBF8FFF661490ADA +:10461C0061F8614908DF07F7340000EDAD46E6BCF0 +:10462C0004F6BC06AC0ABC02AC08BBAC0661490281 +:10463C00AC0461F8614900DE28AC04BDD8AC06BD01 +:10464C00DAE1FD760FADDABC06ADD8BC04ABBDD853 +:10465C00AC02BDDAE1FD910FADDABC02ADD8BBEF17 +:10466C00CAAC06BC02AC04BBAC08BDD8AC0ABDDA03 +:10467C00AC04BDDCAC06FDF40EAC04BDDCAC06FD3C +:10468C00670FE1FD910FADDABC06ADD8BC04AC06EA +:10469C00614902AC0461F8614900DCC5AC0214ABA1 +:1046AC0012100CC6D7C7C12004FBF8FF8F4BFCFDC2 +:1046BC00D00F9C034E04DF1CAD564658DE07AD5898 +:1046CC00265612EF40F64658DF074656DD03E7EF55 +:1046DC0034F7EF318C04318EB1128C03318E43DF01 +:1046EC001830382226560658BB8C045C0391DF0523 +:1046FC00AB041800BBAB12EF0C8C034E04DE05327E +:10470C00A900EF01F71006C6D7717BFA31026209D6 +:10471C00F6465ADD04B65AEF7C710362717AFA40A0 +:10472C0012F904DF07715307F424EF69D9E5FBF1A3 +:10473C00E7240000DD0F23DD1A23DD1023DD5323D6 +:10474C00DD2723DD38715307F424EF49715207F448 +:10475C0024EF42D424DF07715207E424EF05715390 +:10476C0007F424C95AFA00EF2CD424DF0B7152073A +:10477C00E424C95AFA00EF1DF5E5FBEF18D424DF49 +:10478C000B715307E424C95AFA00EF09CFE5FB0279 +:10479C00EF03FDA247D7D91DFCF1E7240000DD098A +:1047AC0023DD2123DD0923EF1B715307F424D7D418 +:1047BC0024DF07715207E424EF05715307F424C971 +:1047CC005A2D01D7715207E424D731425F01D771BA +:1047DC00635FD9E3FBF1E7240000DD1223DD19232D +:1047EC00DD1123DD2623DD3423DD3923DD3FFD629E +:1047FC0048EF3DFD8348EF38D9E2FBC1AE6CFD2498 +:10480C002DC0F313BE6C712304EF25F0C1AE6CFD0B +:10481C00242DC0F313BE6C712304EF14F6BE6C711F +:10482C002204EF0CCB6CFF00712304EF03FDF7485F +:10483C004012F905DD064012F901DF0671230471FF +:10484C00635F31645F0FF6BE64BE6A31220402EF0F +:10485C0002F690BE6ED7CD2647F45CAE6C317DBFB0 +:10486C00EEFCFDCC48D2DF0ED9E2FBC1AE6CFD24D0 +:10487C002DC0F313BE6CD7FDCC48D2DD0DCD264731 +:10488C00F45CAE6C317DBFEEFCD7E85C096C225059 +:10489C0080D6BFEAFC22EEFCBDD8304700FD1C0ED2 +:1048AC00BFECFC30EAFCFD3A2DF313BE6CB426D4FD +:1048BC0026DF0CCD2647A45C4A5C1F61C8F45CD78C +:1048CC0040C5FB0BDC05712304F2D740C5FB066128 +:1048DC00D831225E11F0C1AE6CFD242DC0F313BE95 +:1048EC006C712204EF03FDF748E2D771625FF0C1EF +:1048FC00AE6CFD242DC0F313BE6CA0F0FC40F0FC9C +:10490C0040DC3DF5F0FCD9F1FCF1313F041EFD1407 +:10491C00D9F1FCF1BDD85008FD6B0E087208E6D237 +:10492C00DD040192DFFC896158D1DD05712204EFB1 +:10493C0003712304A0F1FC40F1FC2061C8F5F1FCEB +:01494C00D793 +:10494D0061FC61FCC1C3C5C7520C929269D4FEC112 +:10495D00DFF88EFD708EFCC1717AFA4012F903DF1B +:10496D0006301D2AFD0B39C09EFC609EFD34D4FE21 +:10497D005206C0B9A5A592DFF9C6C4C2C061FC61DB +:10498D00DF520C929269D4FEC1DFF88EFD708EFC61 +:10499D00C18F4105775C04D1DD06675C01D1DD5027 +:1049AD00313460367162077133608FCAFB5FD2FBA1 +:1049BD00D1DF1B8FCBFB5FD3FBD1DF128FCCFB5F26 +:1049CD00D4FBD1DF098FCDFB5FD5FBD1DD0C31627F +:1049DD000702EFFA716307716B27717361FD2A305E +:1049ED00F4227148500571605005717AFAEDE84A6C +:1049FD00675C02D1DD17D422DD134A2202DD0E00E1 +:104A0D00F4227148500571605005717AFA717AFA85 +:104A1D008D22318FE7240000DD0823DD1423DD31E5 +:104A2D00EF4FF4347140500571505005E422EDE81C +:104A3D004A8F40059F0EF9715050058F0EF99F104A +:104A4D00F9D90EF9FD0134629F0FF9CD2202EDE87F +:104A5D004A675C02D1DD17675C10D1DD05CD2203FD +:104A6D00EF0F7148500571605005F422EF6DCD22A6 +:104A7D00044A2203DF138F0FF99F4005D90FF9C1A7 +:104A8D00D90EF9FD9034C0EF108F400576C7D90EC1 +:104A9D00F9FDAB30C071505005D910F9F124290042 +:104AAD00DD2A240400DD25242200DD20241100DD73 +:104ABD000C240100DD16241E00DD11EF0C400EF953 +:104ACD0060DF09CF0EF961EF03A00EF94A2203DF73 +:104ADD000AD90EF9FD0134629F0FF9C09EFC609E4C +:104AED00FD34D4FE5206C0B9A5A592DFF961FCC113 +:104AFD00C7717AFA714AE5717BBD51405F0401D1EE +:104B0D00DD06F616A747DFF2300400BF2401F6BF1D +:104B1D002A01300B0BBF280100000000000000002F +:104B2D00510FBF28010000000000000000500FBF12 +:104B3D002801710AE671235FC6C061FCC1C5717A97 +:104B4D00FAD438DD0BEA36899E44A636B438EF33F5 +:104B5D00710AE6300400BF2401F6BF2A01300B0BA9 +:104B6D00BF28010000000000000000510FBF280108 +:104B7D000000000000000000500FBF280171135FFE +:104B8D0071235FC4C061FC61EF520C929269D4FE37 +:104B9D00C1DFF88EFD708EFCC12006FBF8FF715051 +:104BAD003002CEABACCC0100F6BC0231B2E20F61EB +:104BBD007902F6614902DFF371603002EF7E8E51AA +:104BCD009B713BE28B5C02D1DD1D8B5C08D1DF0953 +:104BDD0071503002CC0100EFCF8C0570FD6935624C +:104BED009E50CC0102EFC18B5C03D1DF408E509CF7 +:104BFD0004715030028C01D1DF0E8C0470FDAF3585 +:104C0D00629C05CC0101EF318C014C02DF06716015 +:104C1D003002EF28CF34025A716030028C0470C11B +:104C2D008C0570FD1135C0CF34024AEF0F8B5C013E +:104C3D00D1DD0671603002EF03EDB54B1006C09E5D +:104C4D00FC609EFD34D4FE5206C0B9A5A592DFF9D5 +:104C5D0061FCC1C3C5C7520C929269D4FEC1DFF885 +:104C6D008EFD708EFCC1710A9E31929E02EFFA8FFD +:104C7D00F4FB4F96FFDF198FF5FB4F97FFDF118F79 +:104C8D00F6FB4F98FFDF095004C15011FDBE34C033 +:104C9D00710B9EC09EFC609EFD34D4FE5206C0B9C1 +:104CAD00A5A592DFF9C6C4C2C061FCA44461FCC1D4 +:104CBD00C3C5C7520C929269D4FEC1DFF88EFD7048 +:104CCD008EFCC1C1FBF8FF8D1F9C018E31318EE72B +:104CDD00240600DD0823DD0E23DD22EF4E717AFA66 +:104CED008C019D3EEF45717AFA4015F901DF068C76 +:104CFD00019D3DEF3651FF2E019D3DEF2E717AFA4C +:104D0D004014FCFFDF068C019D28EF058F14FC9DE0 +:104D1D00288FC8FB5C01D1DF124012F903DD06407C +:104D2D0012F904DF06306825FD0B394031FF09DE2D +:104D3D0005A031FFEF137158F000714260A02BFCFC +:104D4D00402BFC0361C8F52BFC710BE3C0C09EFC2E +:104D5D00609EFD34D4FE5206C0B9A5A592DFF9C6FA +:104D6D00C4C2C061FC61FF520C929269D4FEC1DFD6 +:104D7D00F88EFD708EFCC1717AFA8FFAFB5C03D14F +:104D8D00DD194012F903DD064012F904DF0D36106E +:104D9D000571D4DE0630403AFD0B39C09EFC609E95 +:104DAD00FD34D4FE5206C0B9A5A592DFF961FC61B0 +:104DBD00FC61FC61FC61FC61FC61FC61FC61FC61FE +:104DCD00FC61FC61FC61FC61FC61FC61FC61FC61EE +:104DDD00FC61FC61FC61FC61FC61FC61FC61FC61DE +:074DED00FC61FC61FC61FCAC +:0A4DF40000060C12181E242A3036A7 +:104DFE000000C2FB0000000042FE00000000873BE6 +:104E0E00FC358C22D647FB2DB62E1547AE3C0C0931 +:104E1E009D3E01000000983AF82AFF005555555561 +:084E2E00FF0000000000470036 +:084E3600317503F7332312D795 :024FF400013783 -:0A4FF60031353A34363A3534000004 +:0A4FF60031383A31353A323100000B :00000001FF  \ No newline at end of file diff --git a/branches/sim/bsr.lmf b/branches/sim/bsr.lmf index 329d276..236e422 100644 Binary files a/branches/sim/bsr.lmf and b/branches/sim/bsr.lmf differ diff --git a/branches/sim/bsr_k0r.map b/branches/sim/bsr_k0r.map index 2041ae9..81226a9 100644 --- a/branches/sim/bsr_k0r.map +++ b/branches/sim/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.33 Date:14 Jul 2011 Page: 1 +78K0R Linker W1.33 Date:20 Jul 2011 Page: 1 Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - obsr.lmf ..\..\..\..\Program Files (x86)\NEC Electronics Tool @@ -25,8 +25,8 @@ Direc-file:bsr_mcu.dr *** Link information *** 69 output segment(s) - 3DDDH byte(s) real data - 6117 symbol(s) defined + 3D9AH byte(s) real data + 6098 symbol(s) defined *** Memory map *** @@ -194,256 +194,255 @@ Direc-file:bsr_mcu.dr @@CNST led_cam 0226CH 00000H @@CNST led_pow 0226CH 00020H @@CNST hal 0228CH 00000H - ROM_CODE 0228CH 026B8H CSEG - ROM_CODE pm 0228CH 009E1H - ROM_CODE i2c_ctr 02C6DH 00060H - ROM_CODE i2c_twl 02CCDH 0005EH - ROM_CODE led 02D2BH 00265H - ROM_CODE rtc 02F90H 000E0H - ROM_CODE vreg_ctr 03070H 0048AH - ROM_CODE vreg_twl 034FAH 000F9H - ROM_CODE adc 035F3H 002B7H - ROM_CODE renge 038AAH 0018DH - ROM_CODE accero 03A37H 00147H - ROM_CODE sw 03B7EH 00127H + ROM_CODE 0228CH 026C1H CSEG + ROM_CODE pm 0228CH 009D8H + ROM_CODE i2c_ctr 02C64H 00062H + ROM_CODE i2c_twl 02CC6H 0005EH + ROM_CODE led 02D24H 00265H + ROM_CODE rtc 02F89H 000E0H + ROM_CODE vreg_ctr 03069H 0049AH + ROM_CODE vreg_twl 03503H 000F9H + ROM_CODE adc 035FCH 002B7H + ROM_CODE renge 038B3H 0018DH + ROM_CODE accero 03A40H 00147H + ROM_CODE sw 03B87H 00127H ROM_CODE task_misc - 03CA5H 001EFH - ROM_CODE task_sys 03E94H 0039AH + 03CAEH 001EFH + ROM_CODE task_sys 03E9DH 0039AH ROM_CODE pedo_alg_thre_det2 - 0422EH 004DEH - ROM_CODE led_cam 0470CH 000C1H - ROM_CODE led_pow 047CDH 00177H - @@BASE 04944H 004F3H CSEG BASE - @@BASE loader 04944H 00000H - @@BASE pm 04944H 0003FH - @@BASE i2c_ctr 04983H 001BCH - @@BASE main 04B3FH 00000H - @@BASE magic 04B3FH 00000H - @@BASE WDT 04B3FH 00000H - @@BASE i2c_mcu 04B3FH 00098H - @@BASE i2c_twl 04BD7H 000CBH - @@BASE led 04CA2H 00000H - @@BASE rtc 04CA2H 0005DH - @@BASE vreg_ctr 04CFFH 00000H - @@BASE vreg_twl 04CFFH 00000H - @@BASE adc 04CFFH 000B6H - @@BASE renge 04DB5H 00000H - @@BASE accero 04DB5H 0004AH + 04237H 004DEH + ROM_CODE led_cam 04715H 000C1H + ROM_CODE led_pow 047D6H 00177H + @@BASE 0494DH 004A7H CSEG BASE + @@BASE loader 0494DH 00000H + @@BASE pm 0494DH 0003FH + @@BASE i2c_ctr 0498CH 00170H + @@BASE main 04AFCH 00000H + @@BASE magic 04AFCH 00000H + @@BASE WDT 04AFCH 00000H + @@BASE i2c_mcu 04AFCH 00098H + @@BASE i2c_twl 04B94H 000CBH + @@BASE led 04C5FH 00000H + @@BASE rtc 04C5FH 0005DH + @@BASE vreg_ctr 04CBCH 00000H + @@BASE vreg_twl 04CBCH 00000H + @@BASE adc 04CBCH 000B6H + @@BASE renge 04D72H 00000H + @@BASE accero 04D72H 0004AH @@BASE self_flash - 04DFFH 00000H - @@BASE sw 04DFFH 00000H + 04DBCH 00000H + @@BASE sw 04DBCH 00000H @@BASE task_debug - 04DFFH 00000H + 04DBCH 00000H @@BASE task_misc - 04DFFH 00000H - @@BASE task_sys 04DFFH 00000H + 04DBCH 00000H + @@BASE task_sys 04DBCH 00000H @@BASE pedo_alg_thre_det2 - 04DFFH 00000H - @@BASE ini_VECT 04DFFH 00038H + 04DBCH 00000H + @@BASE ini_VECT 04DBCH 00038H @@BASE task_status - 04E37H 00000H - @@BASE led_cam 04E37H 00000H - @@BASE led_pow 04E37H 00000H - @@BASE hal 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP - @@CNSTL @cstart 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP - @@CNSTL pm 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP - @@CNSTL led 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP - @@CNSTL rtc 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP - @@CNSTL adc 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP - @@CNSTL renge 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP - @@CNSTL accero 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP - @@CNSTL sw 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP + 04DF4H 00000H + @@BASE led_cam 04DF4H 00000H + @@BASE led_pow 04DF4H 00000H + @@BASE hal 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP + @@CNSTL @cstart 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP + @@CNSTL pm 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP + @@CNSTL led 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP + @@CNSTL rtc 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP + @@CNSTL adc 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP + @@CNSTL renge 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP + @@CNSTL accero 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP + @@CNSTL sw 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP @@CNSTL task_misc - 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP - @@CNSTL task_sys 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP + 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP + @@CNSTL task_sys 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP - @@CNSTL led_cam 04E37H 00000H - @@CNSTL 04E37H 00000H CSEG PAGE64KP - @@CNSTL led_pow 04E37H 00000H - @@CALT 04E37H 00000H CSEG - @@CALT @cstart 04E37H 00000H - @@CALT loader 04E37H 00000H - @@CALT pm 04E37H 00000H - @@CALT i2c_ctr 04E37H 00000H - @@CALT main 04E37H 00000H - @@CALT magic 04E37H 00000H - @@CALT WDT 04E37H 00000H - @@CALT i2c_mcu 04E37H 00000H - @@CALT i2c_twl 04E37H 00000H - @@CALT led 04E37H 00000H - @@CALT rtc 04E37H 00000H - @@CALT vreg_ctr 04E37H 00000H - @@CALT vreg_twl 04E37H 00000H - @@CALT adc 04E37H 00000H - @@CALT renge 04E37H 00000H - @@CALT accero 04E37H 00000H - @@CALT self_flash - 04E37H 00000H - @@CALT sw 04E37H 00000H - @@CALT task_debug - 04E37H 00000H - @@CALT task_misc - 04E37H 00000H - @@CALT task_sys 04E37H 00000H - @@CALT pedo_alg_thre_det2 - 04E37H 00000H - @@CALT ini_VECT 04E37H 00000H - @@CALT task_status - 04E37H 00000H - @@CALT led_cam 04E37H 00000H - @@CALT led_pow 04E37H 00000H - @@CALT hal 04E37H 00000H - @@RLINIT 04E37H 00000H CSEG UNIT64KP - @@RLINIT loader 04E37H 00000H - @@RLINIT pm 04E37H 00000H - @@RLINIT i2c_ctr 04E37H 00000H - @@RLINIT main 04E37H 00000H - @@RLINIT magic 04E37H 00000H - @@RLINIT WDT 04E37H 00000H - @@RLINIT i2c_mcu 04E37H 00000H - @@RLINIT i2c_twl 04E37H 00000H - @@RLINIT led 04E37H 00000H - @@RLINIT rtc 04E37H 00000H - @@RLINIT vreg_ctr 04E37H 00000H - @@RLINIT vreg_twl 04E37H 00000H - @@RLINIT adc 04E37H 00000H - @@RLINIT renge 04E37H 00000H - @@RLINIT accero 04E37H 00000H - @@RLINIT self_flash - 04E37H 00000H - @@RLINIT sw 04E37H 00000H - @@RLINIT task_debug - 04E37H 00000H - @@RLINIT task_misc - 04E37H 00000H - @@RLINIT task_sys 04E37H 00000H - @@RLINIT pedo_alg_thre_det2 - 04E37H 00000H - @@RLINIT ini_VECT 04E37H 00000H - @@RLINIT task_status - 04E37H 00000H - @@RLINIT led_cam 04E37H 00000H - @@RLINIT led_pow 04E37H 00000H - @@RLINIT hal 04E37H 00000H - @@RLINIT @rom 04E37H 00000H - @@CODEL 04E37H 00000H CSEG - @@CODEL pm 04E37H 00000H - @@CODEL i2c_ctr 04E37H 00000H - @@CODEL magic 04E37H 00000H - @@CODEL i2c_twl 04E37H 00000H - @@CODEL led 04E37H 00000H - @@CODEL rtc 04E37H 00000H - @@CODEL vreg_ctr 04E37H 00000H - @@CODEL vreg_twl 04E37H 00000H - @@CODEL adc 04E37H 00000H - @@CODEL renge 04E37H 00000H - @@CODEL accero 04E37H 00000H - @@CODEL sw 04E37H 00000H - @@CODEL task_misc - 04E37H 00000H - @@CODEL task_sys 04E37H 00000H - @@CODEL pedo_alg_thre_det2 - 04E37H 00000H - @@CODEL ini_VECT 04E37H 00000H - @@CODEL led_cam 04E37H 00000H - @@CODEL led_pow 04E37H 00000H -* gap * 04E37H 00001H - @@CNSTL 04E38H 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04E38H 0000AH - @@R_INIT 04E42H 00032H CSEG UNIT64KP - @@R_INIT @cstart 04E42H 00000H - @@R_INIT loader 04E42H 00000H - @@R_INIT pm 04E42H 00002H - @@R_INIT i2c_ctr 04E44H 00002H - @@R_INIT main 04E46H 00000H - @@R_INIT magic 04E46H 00000H - @@R_INIT WDT 04E46H 00000H - @@R_INIT i2c_mcu 04E46H 00000H - @@R_INIT i2c_twl 04E46H 00000H - @@R_INIT led 04E46H 00000H - @@R_INIT rtc 04E46H 00000H - @@R_INIT vreg_ctr 04E46H 00000H - @@R_INIT vreg_twl 04E46H 00000H - @@R_INIT adc 04E46H 0000CH - @@R_INIT renge 04E52H 00014H - @@R_INIT accero 04E66H 00000H + 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP + @@CNSTL led_cam 04DF4H 00000H + @@CNSTL 04DF4H 00000H CSEG PAGE64KP + @@CNSTL led_pow 04DF4H 00000H + @@CNSTL 04DF4H 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04DF4H 0000AH + @@R_INIT 04DFEH 00030H CSEG UNIT64KP + @@R_INIT @cstart 04DFEH 00000H + @@R_INIT loader 04DFEH 00000H + @@R_INIT pm 04DFEH 00002H + @@R_INIT i2c_ctr 04E00H 00000H + @@R_INIT main 04E00H 00000H + @@R_INIT magic 04E00H 00000H + @@R_INIT WDT 04E00H 00000H + @@R_INIT i2c_mcu 04E00H 00000H + @@R_INIT i2c_twl 04E00H 00000H + @@R_INIT led 04E00H 00000H + @@R_INIT rtc 04E00H 00000H + @@R_INIT vreg_ctr 04E00H 00000H + @@R_INIT vreg_twl 04E00H 00000H + @@R_INIT adc 04E00H 0000CH + @@R_INIT renge 04E0CH 00014H + @@R_INIT accero 04E20H 00000H @@R_INIT self_flash - 04E66H 00000H - @@R_INIT sw 04E66H 00002H + 04E20H 00000H + @@R_INIT sw 04E20H 00002H @@R_INIT task_debug - 04E68H 00000H + 04E22H 00000H @@R_INIT task_misc - 04E68H 00000H - @@R_INIT task_sys 04E68H 00002H + 04E22H 00000H + @@R_INIT task_sys 04E22H 00002H @@R_INIT pedo_alg_thre_det2 - 04E6AH 00006H - @@R_INIT ini_VECT 04E70H 00000H + 04E24H 00006H + @@R_INIT ini_VECT 04E2AH 00000H @@R_INIT task_status - 04E70H 00000H - @@R_INIT led_cam 04E70H 00000H - @@R_INIT led_pow 04E70H 00004H - @@R_INIT hal 04E74H 00000H - @@R_INIT @rom 04E74H 00000H - @@R_INIS 04E74H 00006H CSEG UNIT64KP - @@R_INIS @cstart 04E74H 00000H - @@R_INIS loader 04E74H 00000H - @@R_INIS pm 04E74H 00002H - @@R_INIS i2c_ctr 04E76H 00000H - @@R_INIS main 04E76H 00000H - @@R_INIS magic 04E76H 00000H - @@R_INIS WDT 04E76H 00000H - @@R_INIS i2c_mcu 04E76H 00000H - @@R_INIS i2c_twl 04E76H 00000H - @@R_INIS led 04E76H 00000H - @@R_INIS rtc 04E76H 00000H - @@R_INIS vreg_ctr 04E76H 00000H - @@R_INIS vreg_twl 04E76H 00000H - @@R_INIS adc 04E76H 00000H - @@R_INIS renge 04E76H 00000H - @@R_INIS accero 04E76H 00000H + 04E2AH 00000H + @@R_INIT led_cam 04E2AH 00000H + @@R_INIT led_pow 04E2AH 00004H + @@R_INIT hal 04E2EH 00000H + @@R_INIT @rom 04E2EH 00000H + @@R_INIS 04E2EH 00008H CSEG UNIT64KP + @@R_INIS @cstart 04E2EH 00000H + @@R_INIS loader 04E2EH 00000H + @@R_INIS pm 04E2EH 00002H + @@R_INIS i2c_ctr 04E30H 00002H + @@R_INIS main 04E32H 00000H + @@R_INIS magic 04E32H 00000H + @@R_INIS WDT 04E32H 00000H + @@R_INIS i2c_mcu 04E32H 00000H + @@R_INIS i2c_twl 04E32H 00000H + @@R_INIS led 04E32H 00000H + @@R_INIS rtc 04E32H 00000H + @@R_INIS vreg_ctr 04E32H 00000H + @@R_INIS vreg_twl 04E32H 00000H + @@R_INIS adc 04E32H 00000H + @@R_INIS renge 04E32H 00000H + @@R_INIS accero 04E32H 00000H @@R_INIS self_flash - 04E76H 00000H - @@R_INIS sw 04E76H 00000H + 04E32H 00000H + @@R_INIS sw 04E32H 00000H @@R_INIS task_debug - 04E76H 00000H + 04E32H 00000H @@R_INIS task_misc - 04E76H 00000H - @@R_INIS task_sys 04E76H 00000H + 04E32H 00000H + @@R_INIS task_sys 04E32H 00000H @@R_INIS pedo_alg_thre_det2 - 04E76H 00000H - @@R_INIS ini_VECT 04E76H 00000H + 04E32H 00000H + @@R_INIS ini_VECT 04E32H 00000H @@R_INIS task_status - 04E76H 00000H - @@R_INIS led_cam 04E76H 00002H - @@R_INIS led_pow 04E78H 00002H - @@R_INIS hal 04E7AH 00000H - @@R_INIS @rom 04E7AH 00000H - @@LCODEL 04E7AH 00008H CSEG - @@LCODEL abs 04E7AH 00008H -* gap * 04E82H 00172H + 04E32H 00000H + @@R_INIS led_cam 04E32H 00002H + @@R_INIS led_pow 04E34H 00002H + @@R_INIS hal 04E36H 00000H + @@R_INIS @rom 04E36H 00000H + @@CALT 04E36H 00000H CSEG + @@CALT @cstart 04E36H 00000H + @@CALT loader 04E36H 00000H + @@CALT pm 04E36H 00000H + @@CALT i2c_ctr 04E36H 00000H + @@CALT main 04E36H 00000H + @@CALT magic 04E36H 00000H + @@CALT WDT 04E36H 00000H + @@CALT i2c_mcu 04E36H 00000H + @@CALT i2c_twl 04E36H 00000H + @@CALT led 04E36H 00000H + @@CALT rtc 04E36H 00000H + @@CALT vreg_ctr 04E36H 00000H + @@CALT vreg_twl 04E36H 00000H + @@CALT adc 04E36H 00000H + @@CALT renge 04E36H 00000H + @@CALT accero 04E36H 00000H + @@CALT self_flash + 04E36H 00000H + @@CALT sw 04E36H 00000H + @@CALT task_debug + 04E36H 00000H + @@CALT task_misc + 04E36H 00000H + @@CALT task_sys 04E36H 00000H + @@CALT pedo_alg_thre_det2 + 04E36H 00000H + @@CALT ini_VECT 04E36H 00000H + @@CALT task_status + 04E36H 00000H + @@CALT led_cam 04E36H 00000H + @@CALT led_pow 04E36H 00000H + @@CALT hal 04E36H 00000H + @@RLINIT 04E36H 00000H CSEG UNIT64KP + @@RLINIT loader 04E36H 00000H + @@RLINIT pm 04E36H 00000H + @@RLINIT i2c_ctr 04E36H 00000H + @@RLINIT main 04E36H 00000H + @@RLINIT magic 04E36H 00000H + @@RLINIT WDT 04E36H 00000H + @@RLINIT i2c_mcu 04E36H 00000H + @@RLINIT i2c_twl 04E36H 00000H + @@RLINIT led 04E36H 00000H + @@RLINIT rtc 04E36H 00000H + @@RLINIT vreg_ctr 04E36H 00000H + @@RLINIT vreg_twl 04E36H 00000H + @@RLINIT adc 04E36H 00000H + @@RLINIT renge 04E36H 00000H + @@RLINIT accero 04E36H 00000H + @@RLINIT self_flash + 04E36H 00000H + @@RLINIT sw 04E36H 00000H + @@RLINIT task_debug + 04E36H 00000H + @@RLINIT task_misc + 04E36H 00000H + @@RLINIT task_sys 04E36H 00000H + @@RLINIT pedo_alg_thre_det2 + 04E36H 00000H + @@RLINIT ini_VECT 04E36H 00000H + @@RLINIT task_status + 04E36H 00000H + @@RLINIT led_cam 04E36H 00000H + @@RLINIT led_pow 04E36H 00000H + @@RLINIT hal 04E36H 00000H + @@RLINIT @rom 04E36H 00000H + @@CODEL 04E36H 00000H CSEG + @@CODEL pm 04E36H 00000H + @@CODEL i2c_ctr 04E36H 00000H + @@CODEL magic 04E36H 00000H + @@CODEL i2c_twl 04E36H 00000H + @@CODEL led 04E36H 00000H + @@CODEL rtc 04E36H 00000H + @@CODEL vreg_ctr 04E36H 00000H + @@CODEL vreg_twl 04E36H 00000H + @@CODEL adc 04E36H 00000H + @@CODEL renge 04E36H 00000H + @@CODEL accero 04E36H 00000H + @@CODEL sw 04E36H 00000H + @@CODEL task_misc + 04E36H 00000H + @@CODEL task_sys 04E36H 00000H + @@CODEL pedo_alg_thre_det2 + 04E36H 00000H + @@CODEL ini_VECT 04E36H 00000H + @@CODEL led_cam 04E36H 00000H + @@CODEL led_pow 04E36H 00000H + @@LCODEL 04E36H 00008H CSEG + @@LCODEL abs 04E36H 00008H +* gap * 04E3EH 001B6H MGC_VER 04FF4H 00002H CSEG AT MGC_VER magic 04FF4H 00002H MGC_TAIL 04FF6H 0000AH CSEG AT @@ -487,217 +486,217 @@ Direc-file:bsr_mcu.dr @@DATA led_pow FFCEAH 00008H @@DATA hal FFCF2H 00000H @@DATA @rom FFCF2H 00000H - @@INIT FFCF2H 00032H DSEG BASEP + @@INIT FFCF2H 00030H DSEG BASEP @@INIT @cstart FFCF2H 00000H @@INIT loader FFCF2H 00000H @@INIT pm FFCF2H 00002H - @@INIT i2c_ctr FFCF4H 00002H - @@INIT main FFCF6H 00000H - @@INIT magic FFCF6H 00000H - @@INIT WDT FFCF6H 00000H - @@INIT i2c_mcu FFCF6H 00000H - @@INIT i2c_twl FFCF6H 00000H - @@INIT led FFCF6H 00000H - @@INIT rtc FFCF6H 00000H - @@INIT vreg_ctr FFCF6H 00000H - @@INIT vreg_twl FFCF6H 00000H - @@INIT adc FFCF6H 0000CH - @@INIT renge FFD02H 00014H - @@INIT accero FFD16H 00000H + @@INIT i2c_ctr FFCF4H 00000H + @@INIT main FFCF4H 00000H + @@INIT magic FFCF4H 00000H + @@INIT WDT FFCF4H 00000H + @@INIT i2c_mcu FFCF4H 00000H + @@INIT i2c_twl FFCF4H 00000H + @@INIT led FFCF4H 00000H + @@INIT rtc FFCF4H 00000H + @@INIT vreg_ctr FFCF4H 00000H + @@INIT vreg_twl FFCF4H 00000H + @@INIT adc FFCF4H 0000CH + @@INIT renge FFD00H 00014H + @@INIT accero FFD14H 00000H @@INIT self_flash - FFD16H 00000H - @@INIT sw FFD16H 00002H + FFD14H 00000H + @@INIT sw FFD14H 00002H @@INIT task_debug - FFD18H 00000H + FFD16H 00000H @@INIT task_misc - FFD18H 00000H - @@INIT task_sys FFD18H 00002H + FFD16H 00000H + @@INIT task_sys FFD16H 00002H @@INIT pedo_alg_thre_det2 - FFD1AH 00006H - @@INIT ini_VECT FFD20H 00000H + FFD18H 00006H + @@INIT ini_VECT FFD1EH 00000H @@INIT task_status - FFD20H 00000H - @@INIT led_cam FFD20H 00000H - @@INIT led_pow FFD20H 00004H - @@INIT hal FFD24H 00000H - @@INIT @rom FFD24H 00000H - FSL_DATA FFD24H 00010H DSEG UNITP + FFD1EH 00000H + @@INIT led_cam FFD1EH 00000H + @@INIT led_pow FFD1EH 00004H + @@INIT hal FFD22H 00000H + @@INIT @rom FFD22H 00000H + FSL_DATA FFD22H 00010H DSEG UNITP FSL_DATA fsl_common - FFD24H 00010H - @@INITL FFD34H 00000H DSEG UNIT64KP - @@INITL loader FFD34H 00000H - @@INITL pm FFD34H 00000H - @@INITL i2c_ctr FFD34H 00000H - @@INITL main FFD34H 00000H - @@INITL magic FFD34H 00000H - @@INITL WDT FFD34H 00000H - @@INITL i2c_mcu FFD34H 00000H - @@INITL i2c_twl FFD34H 00000H - @@INITL led FFD34H 00000H - @@INITL rtc FFD34H 00000H - @@INITL vreg_ctr FFD34H 00000H - @@INITL vreg_twl FFD34H 00000H - @@INITL adc FFD34H 00000H - @@INITL renge FFD34H 00000H - @@INITL accero FFD34H 00000H + FFD22H 00010H + @@INITL FFD32H 00000H DSEG UNIT64KP + @@INITL loader FFD32H 00000H + @@INITL pm FFD32H 00000H + @@INITL i2c_ctr FFD32H 00000H + @@INITL main FFD32H 00000H + @@INITL magic FFD32H 00000H + @@INITL WDT FFD32H 00000H + @@INITL i2c_mcu FFD32H 00000H + @@INITL i2c_twl FFD32H 00000H + @@INITL led FFD32H 00000H + @@INITL rtc FFD32H 00000H + @@INITL vreg_ctr FFD32H 00000H + @@INITL vreg_twl FFD32H 00000H + @@INITL adc FFD32H 00000H + @@INITL renge FFD32H 00000H + @@INITL accero FFD32H 00000H @@INITL self_flash - FFD34H 00000H - @@INITL sw FFD34H 00000H + FFD32H 00000H + @@INITL sw FFD32H 00000H @@INITL task_debug - FFD34H 00000H + FFD32H 00000H @@INITL task_misc - FFD34H 00000H - @@INITL task_sys FFD34H 00000H + FFD32H 00000H + @@INITL task_sys FFD32H 00000H @@INITL pedo_alg_thre_det2 - FFD34H 00000H - @@INITL ini_VECT FFD34H 00000H + FFD32H 00000H + @@INITL ini_VECT FFD32H 00000H @@INITL task_status - FFD34H 00000H - @@INITL led_cam FFD34H 00000H - @@INITL led_pow FFD34H 00000H - @@INITL hal FFD34H 00000H - @@INITL @rom FFD34H 00000H - @@DATAL FFD34H 00000H DSEG UNIT64KP - @@DATAL loader FFD34H 00000H - @@DATAL pm FFD34H 00000H - @@DATAL i2c_ctr FFD34H 00000H - @@DATAL main FFD34H 00000H - @@DATAL magic FFD34H 00000H - @@DATAL WDT FFD34H 00000H - @@DATAL i2c_mcu FFD34H 00000H - @@DATAL i2c_twl FFD34H 00000H - @@DATAL led FFD34H 00000H - @@DATAL rtc FFD34H 00000H - @@DATAL vreg_ctr FFD34H 00000H - @@DATAL vreg_twl FFD34H 00000H - @@DATAL adc FFD34H 00000H - @@DATAL renge FFD34H 00000H - @@DATAL accero FFD34H 00000H + FFD32H 00000H + @@INITL led_cam FFD32H 00000H + @@INITL led_pow FFD32H 00000H + @@INITL hal FFD32H 00000H + @@INITL @rom FFD32H 00000H + @@DATAL FFD32H 00000H DSEG UNIT64KP + @@DATAL loader FFD32H 00000H + @@DATAL pm FFD32H 00000H + @@DATAL i2c_ctr FFD32H 00000H + @@DATAL main FFD32H 00000H + @@DATAL magic FFD32H 00000H + @@DATAL WDT FFD32H 00000H + @@DATAL i2c_mcu FFD32H 00000H + @@DATAL i2c_twl FFD32H 00000H + @@DATAL led FFD32H 00000H + @@DATAL rtc FFD32H 00000H + @@DATAL vreg_ctr FFD32H 00000H + @@DATAL vreg_twl FFD32H 00000H + @@DATAL adc FFD32H 00000H + @@DATAL renge FFD32H 00000H + @@DATAL accero FFD32H 00000H @@DATAL self_flash - FFD34H 00000H - @@DATAL sw FFD34H 00000H + FFD32H 00000H + @@DATAL sw FFD32H 00000H @@DATAL task_debug - FFD34H 00000H + FFD32H 00000H @@DATAL task_misc - FFD34H 00000H - @@DATAL task_sys FFD34H 00000H + FFD32H 00000H + @@DATAL task_sys FFD32H 00000H @@DATAL pedo_alg_thre_det2 - FFD34H 00000H - @@DATAL ini_VECT FFD34H 00000H + FFD32H 00000H + @@DATAL ini_VECT FFD32H 00000H @@DATAL task_status - FFD34H 00000H - @@DATAL led_cam FFD34H 00000H - @@DATAL led_pow FFD34H 00000H - @@DATAL hal FFD34H 00000H - @@DATAL @rom FFD34H 00000H -* gap * FFD34H 000CCH + FFD32H 00000H + @@DATAL led_cam FFD32H 00000H + @@DATAL led_pow FFD32H 00000H + @@DATAL hal FFD32H 00000H + @@DATAL @rom FFD32H 00000H +* gap * FFD32H 000CEH MEMORY=RAM2 BASE ADDRESS=FFE20H SIZE=000C0H OUTPUT INPUT INPUT BASE SIZE SEGMENT SEGMENT MODULE ADDRESS - @@INIS FFE20H 00006H DSEG SADDRP + @@INIS FFE20H 00008H DSEG SADDRP @@INIS @cstart FFE20H 00000H @@INIS loader FFE20H 00000H @@INIS pm FFE20H 00002H - @@INIS i2c_ctr FFE22H 00000H - @@INIS main FFE22H 00000H - @@INIS magic FFE22H 00000H - @@INIS WDT FFE22H 00000H - @@INIS i2c_mcu FFE22H 00000H - @@INIS i2c_twl FFE22H 00000H - @@INIS led FFE22H 00000H - @@INIS rtc FFE22H 00000H - @@INIS vreg_ctr FFE22H 00000H - @@INIS vreg_twl FFE22H 00000H - @@INIS adc FFE22H 00000H - @@INIS renge FFE22H 00000H - @@INIS accero FFE22H 00000H + @@INIS i2c_ctr FFE22H 00002H + @@INIS main FFE24H 00000H + @@INIS magic FFE24H 00000H + @@INIS WDT FFE24H 00000H + @@INIS i2c_mcu FFE24H 00000H + @@INIS i2c_twl FFE24H 00000H + @@INIS led FFE24H 00000H + @@INIS rtc FFE24H 00000H + @@INIS vreg_ctr FFE24H 00000H + @@INIS vreg_twl FFE24H 00000H + @@INIS adc FFE24H 00000H + @@INIS renge FFE24H 00000H + @@INIS accero FFE24H 00000H @@INIS self_flash - FFE22H 00000H - @@INIS sw FFE22H 00000H + FFE24H 00000H + @@INIS sw FFE24H 00000H @@INIS task_debug - FFE22H 00000H + FFE24H 00000H @@INIS task_misc - FFE22H 00000H - @@INIS task_sys FFE22H 00000H + FFE24H 00000H + @@INIS task_sys FFE24H 00000H @@INIS pedo_alg_thre_det2 - FFE22H 00000H - @@INIS ini_VECT FFE22H 00000H + FFE24H 00000H + @@INIS ini_VECT FFE24H 00000H @@INIS task_status - FFE22H 00000H - @@INIS led_cam FFE22H 00002H - @@INIS led_pow FFE24H 00002H - @@INIS hal FFE26H 00000H - @@INIS @rom FFE26H 00000H - @@DATS FFE26H 00036H DSEG SADDRP - @@DATS @cstart FFE26H 00000H - @@DATS loader FFE26H 00000H - @@DATS pm FFE26H 0000CH - @@DATS i2c_ctr FFE32H 00002H - @@DATS main FFE34H 00000H - @@DATS magic FFE34H 00000H - @@DATS WDT FFE34H 00000H - @@DATS i2c_mcu FFE34H 00004H - @@DATS i2c_twl FFE38H 00000H - @@DATS led FFE38H 00000H - @@DATS rtc FFE38H 00000H - @@DATS vreg_ctr FFE38H 00002H - @@DATS vreg_twl FFE3AH 00000H - @@DATS adc FFE3AH 00008H - @@DATS renge FFE42H 00002H - @@DATS accero FFE44H 00000H + FFE24H 00000H + @@INIS led_cam FFE24H 00002H + @@INIS led_pow FFE26H 00002H + @@INIS hal FFE28H 00000H + @@INIS @rom FFE28H 00000H + @@DATS FFE28H 00036H DSEG SADDRP + @@DATS @cstart FFE28H 00000H + @@DATS loader FFE28H 00000H + @@DATS pm FFE28H 0000CH + @@DATS i2c_ctr FFE34H 00002H + @@DATS main FFE36H 00000H + @@DATS magic FFE36H 00000H + @@DATS WDT FFE36H 00000H + @@DATS i2c_mcu FFE36H 00004H + @@DATS i2c_twl FFE3AH 00000H + @@DATS led FFE3AH 00000H + @@DATS rtc FFE3AH 00000H + @@DATS vreg_ctr FFE3AH 00002H + @@DATS vreg_twl FFE3CH 00000H + @@DATS adc FFE3CH 00008H + @@DATS renge FFE44H 00002H + @@DATS accero FFE46H 00000H @@DATS self_flash - FFE44H 00000H - @@DATS sw FFE44H 0000AH + FFE46H 00000H + @@DATS sw FFE46H 0000AH @@DATS task_debug - FFE4EH 00000H + FFE50H 00000H @@DATS task_misc - FFE4EH 00002H - @@DATS task_sys FFE50H 00002H + FFE50H 00002H + @@DATS task_sys FFE52H 00002H @@DATS pedo_alg_thre_det2 - FFE52H 00006H - @@DATS ini_VECT FFE58H 00000H + FFE54H 00006H + @@DATS ini_VECT FFE5AH 00000H @@DATS task_status - FFE58H 00000H - @@DATS led_cam FFE58H 00002H - @@DATS led_pow FFE5AH 00002H - @@DATS hal FFE5CH 00000H - @@DATS @rom FFE5CH 00000H - @@BITS FFE5CH 00005H BSEG - @@BITS @cstart FFE5CH.0 00000H.0 - @@BITS loader FFE5CH.0 00000H.0 - @@BITS pm FFE5CH.0 00001H.0 - @@BITS i2c_ctr FFE5DH.0 00000H.0 - @@BITS main FFE5DH.0 00000H.1 - @@BITS magic FFE5DH.1 00000H.0 - @@BITS WDT FFE5DH.1 00000H.0 - @@BITS i2c_mcu FFE5DH.1 00000H.3 - @@BITS i2c_twl FFE5DH.4 00000H.0 - @@BITS led FFE5DH.4 00000H.4 - @@BITS rtc FFE5EH.0 00000H.3 - @@BITS vreg_ctr FFE5EH.3 00000H.1 - @@BITS vreg_twl FFE5EH.4 00000H.0 - @@BITS adc FFE5EH.4 00000H.4 - @@BITS renge FFE5FH.0 00000H.3 - @@BITS accero FFE5FH.3 00000H.0 + FFE5AH 00000H + @@DATS led_cam FFE5AH 00002H + @@DATS led_pow FFE5CH 00002H + @@DATS hal FFE5EH 00000H + @@DATS @rom FFE5EH 00000H + @@BITS FFE5EH 00005H BSEG + @@BITS @cstart FFE5EH.0 00000H.0 + @@BITS loader FFE5EH.0 00000H.0 + @@BITS pm FFE5EH.0 00001H.0 + @@BITS i2c_ctr FFE5FH.0 00000H.0 + @@BITS main FFE5FH.0 00000H.1 + @@BITS magic FFE5FH.1 00000H.0 + @@BITS WDT FFE5FH.1 00000H.0 + @@BITS i2c_mcu FFE5FH.1 00000H.3 + @@BITS i2c_twl FFE5FH.4 00000H.0 + @@BITS led FFE5FH.4 00000H.4 + @@BITS rtc FFE60H.0 00000H.3 + @@BITS vreg_ctr FFE60H.3 00000H.1 + @@BITS vreg_twl FFE60H.4 00000H.0 + @@BITS adc FFE60H.4 00000H.4 + @@BITS renge FFE61H.0 00000H.3 + @@BITS accero FFE61H.3 00000H.0 @@BITS self_flash - FFE5FH.3 00000H.0 - @@BITS sw FFE5FH.3 00000H.1 + FFE61H.3 00000H.0 + @@BITS sw FFE61H.3 00000H.1 @@BITS task_debug - FFE5FH.4 00000H.0 + FFE61H.4 00000H.0 @@BITS task_misc - FFE5FH.4 00000H.2 - @@BITS task_sys FFE5FH.6 00000H.0 + FFE61H.4 00000H.2 + @@BITS task_sys FFE61H.6 00000H.0 @@BITS pedo_alg_thre_det2 - FFE5FH.6 00000H.2 - @@BITS ini_VECT FFE60H.0 00000H.0 + FFE61H.6 00000H.2 + @@BITS ini_VECT FFE62H.0 00000H.0 @@BITS task_status - FFE60H.0 00000H.0 - @@BITS led_cam FFE60H.0 00000H.1 - @@BITS led_pow FFE60H.1 00000H.0 - @@BITS hal FFE60H.1 00000H.6 -* gap * FFE61H 00073H + FFE62H.0 00000H.0 + @@BITS led_cam FFE62H.0 00000H.1 + @@BITS led_pow FFE62H.1 00000H.0 + @@BITS hal FFE62H.1 00000H.6 +* gap * FFE63H 00071H @@SEGREG FFED4H 00004H DSEG AT @@SEGREG @SEGREG FFED4H 00004H @@RTARG0 FFED8H 00008H DSEG AT diff --git a/branches/sim/config.h b/branches/sim/config.h index 88e5f7e..34d9e06 100644 --- a/branches/sim/config.h +++ b/branches/sim/config.h @@ -2,6 +2,10 @@ #define __config__ +#define MCU_VER_MAJOR 0x01 +#define MCU_VER_MINOR 0x37 + + // fobOXCb` //#define _debug_led_ @@ -13,6 +17,14 @@ //#define _ENABLE_WDT_TEST_ //#define _FORCE_TAIKENDAI_ //#define _FORCE_TAIKENDAI_NBD_ +#define _JHL_DEBUG_ + + +#ifdef _JHL_DEBUG_ +# define dbg_nop() NOP() +#else +# define dbg_nop() ; +#endif // dlt@[ @@ -24,9 +36,6 @@ // fobKA^b`Ƀ^[QbgZbgœd؂Ă܂̂ -#define MCU_VER_MAJOR 0x01 -#define MCU_VER_MINOR 0x37 - // ̎́C‚ȂƑ̌̐YłȂˁI #ifdef _TAIKENDAI_SEISAN_SPECIAL_ #define MCU_VER_MINOR 0x80 diff --git a/branches/sim/hal.c b/branches/sim/hal.c index 1b3e2cc..994ab52 100644 --- a/branches/sim/hal.c +++ b/branches/sim/hal.c @@ -45,7 +45,7 @@ void hal_update() if( temp_conf & REG_BIT_HAL0_PM_EXTDC_n ) { // O͂Ȃ񂾂傫Ȃ肪 - if(( temp_dat & REG_BIT_HAL0_PM_EXTDC_n ) == 0 ) + if(( temp_dat & REG_BIT_HAL0_PM_EXTDC_n ) == 0 ) // K[ { PM_EXTDC_n = 0; } @@ -139,11 +139,11 @@ void hal_update() { if(( temp_dat & REG_BIT_HAL0_SHELL_OPEN ) == 0 ) { - SHELL_OPEN = 1; + SHELL_OPEN = 0; } else { - SHELL_OPEN = 0; + SHELL_OPEN = 1; } } else diff --git a/branches/sim/i2c_ctr.c b/branches/sim/i2c_ctr.c index d0b8da9..fe85584 100644 --- a/branches/sim/i2c_ctr.c +++ b/branches/sim/i2c_ctr.c @@ -48,17 +48,11 @@ #define SMC SMC1 #define DFC DFC1 - #endif + + // ============================================== -extern bit irq_readed; // ꂩIRQWX^ǂ܂ꂽ - -u8 iic_burst_state; - - -/* ======================================================== - ======================================================== */ enum en_IIC_STATE { IIC_IDLE = 0, @@ -69,21 +63,37 @@ enum en_IIC_STATE }; -// 1oCg̓xɊ荞݂o[W + +// ============================================== +extern bit irq_readed; // ꂩIRQWX^ǂ܂ꂽ + +u8 iic_burst_state; +static enum en_IIC_STATE state = IIC_IDLE; + +#define bit_iics_spd (i2c_stat & (1<<0)) +#define bit_iics_std (i2c_stat & (1<<1)) +#define bit_iics_ackd (i2c_stat & (1<<2)) +#define bit_iics_trc (i2c_stat & (1<<3)) +#define bit_iics_coi (i2c_stat & (1<<4)) + +// ============================================== __interrupt void int_iic_ctr( ) { - static enum en_IIC_STATE state = IIC_IDLE; static u8 reg_adrs; static u8 tx_buf; u8 rx_buf; - static u8 adrs_access_from; + static u8 adrs_access_from; // o[XgANZX̎Ɏg + + u8 i2c_stat = IICS1; // volatilê // ǂݏoI - if( !ACKD ) // 荞ݗvNAKif[^M̍Ōj + if( !bit_iics_ackd // 荞ݗvNAKif[^M̍Ōj + || bit_iics_spd ) // XgbvRfBV(!ACKD ɗƂ͊荞ݗȂ (SPIE = 0)) { - state = IIC_IDLE; - SPIE = 0; - LREL = 1; + /* + I2C̔xẴtOOSTDĂ܂Ƃ + ǁAȂ삷‚ + */ // WX^[hŁA荞݃slQ[g // ܂ǂ܂ĂȂ荞݂΁AēxAT[g @@ -100,42 +110,38 @@ __interrupt void int_iic_ctr( ) IRQ0_ast; } } + + // I2CIɉ镨 // hosu_read_end( ); // vǂݏoI rtc_unlock( ); - iic_burst_state = 0; - if( !SPD && !STD ) - { - EI(); - return; - } - } - if( SPD ) // 荞ݗv̓XgbvRfBV - // ʐM̍ŌB !ACKD ɗƂ͊荞ݗȂ (SPIE = 0 ̂ ) - { state = IIC_IDLE; SPIE = 0; - // I2CIɉ镨 // - rtc_unlock( ); - if( !STD ) - { - EI(); - return; - } + LREL = 1; + EI(); + return; } - if( STD ) // 荞ݗvFX^[gRfBV + if( bit_iics_std ) // 荞ݗvFX^[gRfBV { - if( ( state != IIC_IDLE ) && ( state != IIC_TX_OR_RX ) ) + if( !( state == IIC_IDLE || state == IIC_TX_OR_RX )) { - /* - // state = IIC_IDLE; // ƂȂ - // no break // - */ - // Ȃ񂩕ςȃ^C~Oŗ - LREL = 1; // IĂ܂(nack)BgCĂ炨B듮h~H - } - } + // sp/nack 葹˂ + dbg_nop(); // Ȃ͂... +/* + // pPbg̐擪stƌȂB + // ʂɑs + state = IIC_IDLE; +/*/ + // gCĂ炤 + state = IIC_IDLE; + SPIE = 0; + LREL = 1; + EI(); +//*/ + } + // ʏ + } EI(); @@ -144,26 +150,28 @@ __interrupt void int_iic_ctr( ) case ( IIC_IDLE ): // njĂяoɉB // Ȃ + iic_burst_state = 0; SPIE = 1; WREL = 1; // EFCg state = IIC_RCV_REG_ADRS; - break; + return; case ( IIC_RCV_REG_ADRS ): // QoCgځiWX^AhXjMɗ // WX^AhXM reg_adrs = IICA; + WREL = 1; adrs_access_from = reg_adrs; tx_buf = vreg_ctr_read( reg_adrs ); // f[^̏Ă state = IIC_TX_OR_RX; - break; + return; case ( IIC_TX_OR_RX ): // ̎ɗ銄荞݁BSTȂ瑗MAf[^珑܂ // if( TRC ) // MtO ŋʂ̂́A荞ݒxɕsN肦 - if( STD ) + if( bit_iics_std ) { // X^[gRfBVotO // [h - if( COI ) + if( bit_iics_coi ) { // AhXvtO state = IIC_TX; // no break, no return // @@ -193,18 +201,19 @@ __interrupt void int_iic_ctr( ) else { // M rx_buf = IICA; - // debug? f[^΍ // - if( reg_adrs >= 0x80 || reg_adrs == 0 ) + +/* + if( reg_adrs >= 0x80 || reg_adrs <= 1 ) { LREL = 1; // Ȃ񂩃f[^̂ŒʐMI return; } - // else{ +*/ vreg_ctr_write( reg_adrs, rx_buf ); WREL = 1; - } + } - // WX^AhX̃CNg + // WX^AhX̃CNg /// ANZX|C^i߂ȂȃWX^ switch( adrs_access_from ) { @@ -221,8 +230,7 @@ __interrupt void int_iic_ctr( ) } break; default: - iic_burst_state = 0; // ی - reg_adrs ++; + reg_adrs ++; } if( state == IIC_TX ) @@ -272,6 +280,8 @@ void IIC_ctr_Init( void ) IICE = 1; PM20 &= ~0x3; /* set clock pin for IICA */ + + state = IIC_IDLE; } diff --git a/branches/sim/pedo_alg_thre_det2.c b/branches/sim/pedo_alg_thre_det2.c index 1454a73..6d6bb13 100644 --- a/branches/sim/pedo_alg_thre_det2.c +++ b/branches/sim/pedo_alg_thre_det2.c @@ -318,7 +318,7 @@ static void fill_hosu_hist_hours( u16 hours ) if( p_record >= PEDOMETER_LOG_SIZE ) { pedolog_overflow = true; -// NOP(); // ɗ悤ƃoO +// dbg_nop(); // ɗ悤ƃoO break; } else @@ -539,7 +539,7 @@ static u16 calc_hours_spend( u8 year ) else if( cal_log_latest_year == ( year -1 ) ) { // N܂łƂ - u16 temp = 365 - last_hour_fny + now_longhour; + u16 temp = 365 * 24 - last_hour_fny + now_longhour; if( is_firstyear(year) ) { temp += 24; diff --git a/branches/sim/pedometer.h b/branches/sim/pedometer.h index d2b1376..8760308 100644 --- a/branches/sim/pedometer.h +++ b/branches/sim/pedometer.h @@ -1,8 +1,14 @@ #ifndef _pedo_ #define _pedo_ +#ifdef WIN32 +typedef unsigned char bit; +typedef unsigned char u8; +typedef unsigned short u16; +#endif + // ========================================================= extern bit pedolog_read_msb; diff --git a/branches/sim/pm.c b/branches/sim/pm.c index 5b1d3db..25fdec4 100644 --- a/branches/sim/pm.c +++ b/branches/sim/pm.c @@ -506,7 +506,7 @@ static void BT_mgic_init() // JX^fOKI }else{ // s烊gĈH -// NOP(); +// dbg_nop(); } // 10.RCOMPOCV߂ @@ -723,13 +723,17 @@ void BT_get_left(){ } } - if( system_status.taikendai_nbd ) // dr[qɓd‚ȂĂĒlsȂߏ㏑B + /* + \ɖȂdĂ炵̂ŃPAł悵 + if( system_status.taikendai_nbd && system_status.model != MODEL_TS_BOARD ) // dr[qɓd‚ȂĂĒlsȂߏ㏑B { reg_volatile_temp_bt_remain = 100; } + */ + vreg_ctr[ VREG_C_BT_REMAIN ] = reg_volatile_temp_bt_remain; - vreg_ctr[ VREG_C_BT_REMAIN_FINE ] =reg_volatile_temp_bt_remain_fine; + vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = reg_volatile_temp_bt_remain_fine; // twl̃WX^XV@(CTRɊ荞ݓOɍXVȂƊ荞݂̃^C~O܂Ȃ) bt_batt_update_twl(); diff --git a/branches/sim/rtc.c b/branches/sim/rtc.c index 0bdf7bb..c4f80fc 100644 --- a/branches/sim/rtc.c +++ b/branches/sim/rtc.c @@ -91,7 +91,7 @@ __interrupt void int_rtc( ) RTC ̃[h WX^́Asec,min,hour,week,day,month,year ̏ ======================================================== */ -void rtc_buf_reflesh( ) +void rtc_buf_refresh( ) { if( !rtc_lock ) { diff --git a/branches/sim/rtc.h b/branches/sim/rtc.h index f189a89..6b2d9f8 100644 --- a/branches/sim/rtc.h +++ b/branches/sim/rtc.h @@ -3,7 +3,7 @@ void RTC_init( void ); -void rtc_buf_reflesh( ); +void rtc_buf_refresh( ); void set_rtc( u8 adrs, u8 data ); //task_status_immed tski_rtc_close(); diff --git a/branches/sim/task_debug.c b/branches/sim/task_debug.c index 4c520d9..1541f95 100644 --- a/branches/sim/task_debug.c +++ b/branches/sim/task_debug.c @@ -107,7 +107,7 @@ task_interval tsk_hina( ) default: } - return ( ̋N E܂ł̃V EX Ee E tick EE); // tic Ă΂邱ƂɂȂ܂ + return; // tic Ă΂邱ƂɂȂ܂ } diff --git a/branches/sim/task_misc.c b/branches/sim/task_misc.c index e88057b..84c14e2 100644 --- a/branches/sim/task_misc.c +++ b/branches/sim/task_misc.c @@ -75,7 +75,7 @@ void tsk_misc( ) if( ACC_VALID ) { if( renge_task_immed_add( tski_cbk_accero ) == ERR_SUCCESS ){ - // NOP(); + // dbg_nop(); } } @@ -88,7 +88,7 @@ void tsk_misc( ) if( !PM_IRQ_n ) { renge_task_immed_add( tski_ntr_pmic_comm ); - // NOP(); + // dbg_nop(); } /* ======================================================== diff --git a/branches/sim/task_sys.c b/branches/sim/task_sys.c index 935b2a8..ca3958e 100644 --- a/branches/sim/task_sys.c +++ b/branches/sim/task_sys.c @@ -451,7 +451,7 @@ void tsk_sys( ) if( vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] != 0 || vreg_ctr[ VREG_C_HAL_OVW_BT_FUEL ] == 0xFF ) { - NOP(); + dbg_nop(); } STOP( ); diff --git a/branches/sim/vreg_ctr.c b/branches/sim/vreg_ctr.c index deccd94..d675f57 100644 --- a/branches/sim/vreg_ctr.c +++ b/branches/sim/vreg_ctr.c @@ -12,6 +12,7 @@ CTR MCU I2C #include "pool.h" #include + #include "fsl_user.h" @@ -328,7 +329,7 @@ void vreg_ctr_write( u8 adrs, u8 data ) break; } -// vreg_ctr[ VREG_C_COMMAND3 ] = data; +// vreg_ctr[ VREG_C_COMMAND3 ] = data; // KvȂ break; case ( VREG_C_RBR_CONTROL ): @@ -352,52 +353,62 @@ void vreg_ctr_write( u8 adrs, u8 data ) break; // read only ////////////////////////////////////////// - case ( VREG_C_MCU_VER_MAJOR ): - case ( VREG_C_MCU_VER_MINOR ): - case ( VREG_C_3D ): - case ( VREG_C_SND_VOL ): - case ( VREG_C_BT_TEMP ): - case ( VREG_C_BT_REMAIN ): - case ( VREG_C_BT_REMAIN_FINE ): - case ( VREG_C_BT_VOLTAGE ): - case ( VREG_C_STATUS_1 ): - case ( VREG_C_STATUS ): - case ( VREG_C_IRQ0 ): - case ( VREG_C_IRQ1 ): - case ( VREG_C_IRQ2 ): - case ( VREG_C_IRQ3 ): - case ( VREG_C_IRQ4 ): - case ( VREG_C_LED_NOTIFY_FLAG ): - case ( VREG_C_RTC_SEC_FINE_L ): - case ( VREG_C_RTC_SEC_FINE_H ): - // VREG_C_ACC_RESERVE, + case VREG_C_MCU_VER_MAJOR: + case VREG_C_MCU_VER_MINOR: + case VREG_C_3D: // ɃtbV + case VREG_C_SND_VOL: // ɃtbV + case VREG_C_BT_TEMP: // ɃtbV + case VREG_C_BT_REMAIN: // ɃtbV + case VREG_C_BT_REMAIN_FINE: // ɃtbV + case VREG_C_BT_VOLTAGE: // ɃtbV + case VREG_C_STATUS_1: // KɃtbV + case VREG_C_STATUS: // KɃtbV + case VREG_C_IRQ0: // ̂‚łɊ荞݋NĂقȂ... + case VREG_C_IRQ1: + case VREG_C_IRQ2: + case VREG_C_IRQ3: + case VREG_C_IRQ4: + case VREG_C_LED_NOTIFY_FLAG: // tbV + case VREG_C_RTC_SEC_FINE_L: // tbV + case VREG_C_RTC_SEC_FINE_H: // tbV + // VREG_C_ACC_RESERVE, // NȂ // VREG_C_ACC_HOSU_HIST = 0x4F, - NOP(); + case VREG_C_ACC_XH: // tbV + case VREG_C_ACC_XL: + case VREG_C_ACC_YH: + case VREG_C_ACC_YL: + case VREG_C_ACC_ZH: + case VREG_C_ACC_ZL: + dbg_nop(); break; + case VREG_C_ACC_HOSU_L: // ĂǁAfobOpB(AhX0x4B == mcu sla(r)) + dbg_nop(); + /* FALLTHROUGH */ + // ʂɏ邾 ///////////////////////////////// default: /* - case ( VREG_C_IRQ_MASK0 ): - case ( VREG_C_IRQ_MASK1 ): - case ( VREG_C_IRQ_MASK2 ): - case ( VREG_C_IRQ_MASK3 ): - case ( VREG_C_IRQ_MASK4 ): - case ( VREG_C_DBG01 ): - case ( VREG_C_DBG02 ): - case ( VREG_C_LED_BRIGHT ): - case ( VREG_C_ACC_HOSU_L ): - case ( VREG_C_ACC_HOSU_M ): - case ( VREG_C_ACC_HOSU_H ): - case ( VREG_C_ACC_HOSU_HOUR_BOUNDARY ): - case ( VREG_C_FREE_ADRS ): - case ( VREG_C_RTC_ALARM_YEAR ): - case ( VREG_C_ACC_W_ADRS ): - case ( VREG_C_OFF_DELAY ): - VREG_C_HAL_OVW_CONT0 = 0x52, - VREG_C_HAL_OVW_DAT0, - VREG_C_HAL_OVW_CONT1, - VREG_C_HAL_OVW_DAT1, + case VREG_C_IRQ_MASK0: + case VREG_C_IRQ_MASK1: + case VREG_C_IRQ_MASK2: + case VREG_C_IRQ_MASK3: + case VREG_C_IRQ_MASK4: + case VREG_C_DBG01: + case VREG_C_DBG02: + case VREG_C_LED_BRIGHT: + case VREG_C_ACC_HOSU_L: + case VREG_C_ACC_HOSU_M: + case VREG_C_ACC_HOSU_H: + case VREG_C_ACC_HOSU_HOUR_BOUNDARY: + case VREG_C_FREE_ADRS: + case VREG_C_RTC_ALARM_YEAR: + case VREG_C_ACC_W_ADRS: + case VREG_C_OFF_DELAY: + case VREG_C_HAL_OVW_CONT0: + case VREG_C_HAL_OVW_DAT0: + case VREG_C_HAL_OVW_CONT1: + case VREG_C_HAL_OVW_DAT1: */ if( adrs < VREG_C_ENDMARK_ ) { @@ -406,7 +417,7 @@ void vreg_ctr_write( u8 adrs, u8 data ) } else { - NOP(); + dbg_nop(); // read only̏ɏBȂ񂩃oOĂȂH break; } } @@ -429,7 +440,7 @@ u8 vreg_ctr_read( u8 adrs ) // RTC͓ǂݏorɌJオ̂邽 if( ( VREG_C_RTC_SEC <= adrs ) && ( adrs <= VREG_C_RTC_YEAR ) ) { - rtc_buf_reflesh( ); + rtc_buf_refresh( ); } else if( adrs == VREG_C_MCU_STATUS ) { @@ -468,21 +479,20 @@ u8 vreg_ctr_read( u8 adrs ) return( extinfo_read() ); } else if( adrs == VREG_C_ACC_HOSU_SETTING ) - { - if( pedolog_overflow ) - { - return( 0x10 ); - } - else - { - return( 0 ); - } - } + { + if( pedolog_overflow ) + { + return( 0x10 ); + } + else + { + return( 0 ); + } + } if( adrs >= VREG_C_ENDMARK_ ) { - // VREG_C_INFO > VREG_C_ENDMARK_ ŐɕԂĂ - // Ƃ͂Ȃɒ + // VREG_C_INFO > VREG_C_ENDMARK_ Ȃ̂łƂ return( 0xFF ); } return ( vreg_ctr[adrs] ); diff --git a/branches/sim/yav_mcu_bsr.plg b/branches/sim/yav_mcu_bsr.plg index 38e6e5c..6801899 100644 --- a/branches/sim/yav_mcu_bsr.plg +++ b/branches/sim/yav_mcu_bsr.plg @@ -1,8 +1,135 @@ C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no loader.c +loader.c(141) : CC78K0R warning W0401: Conversion may lose significant digits +loader.c(142) : CC78K0R warning W0401: Conversion may lose significant digits +loader.c(174) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 3 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\loader.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no pm.c +pm.c(488) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(785) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(789) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(819) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(840) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(906) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(915) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1118) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1120) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 9 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\pm.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no i2c_ctr.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\i2c_ctr.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no main.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\main.asm +Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no magic.c Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no i2c_twl.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\i2c_twl.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no led.c +led.c(82) : CC78K0R warning W0745: Expected function prototype +led.c(332) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\led.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no rtc.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\rtc.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no vreg_ctr.c +vreg_ctr.c(163) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(166) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(168) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(169) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(217) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(217) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(222) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(222) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(226) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(226) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(230) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(230) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(234) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 14 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\vreg_ctr.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no vreg_twl.c +vreg_twl.c(55) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_twl.c(59) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\vreg_twl.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no adc.c +adc.c(101) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(182) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(228) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(352) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(474) : CC78K0R warning W0745: Expected function prototype +adc.c(503) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(508) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 7 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\adc.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no accero.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\accero.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no sw.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\sw.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no task_debug.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\task_debug.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no task_misc.c +task_misc.c(292) : CC78K0R warning W0401: Conversion may lose significant digits +task_misc.c(299) : CC78K0R warning W0401: Conversion may lose significant digits +task_misc.c(304) : CC78K0R warning W0401: Conversion may lose significant digits +task_misc.c(305) : CC78K0R warning W0401: Conversion may lose significant digits +task_misc.c(306) : CC78K0R warning W0401: Conversion may lose significant digits +task_misc.c(307) : CC78K0R warning W0401: Conversion may lose significant digits +task_misc.c(308) : CC78K0R warning W0401: Conversion may lose significant digits +task_misc.c(310) : CC78K0R warning W0401: Conversion may lose significant digits +task_misc.c(320) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 9 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\task_misc.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no task_sys.c +task_sys.c(215) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(556) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\task_sys.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c +pedo_alg_thre_det2.c(94) : CC78K0R warning W0745: Expected function prototype +pedo_alg_thre_det2.c(109) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\pedo_alg_thre_det2.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no led_cam.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\led_cam.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no led_pow.c +led_pow.c(99) : CC78K0R warning W0401: Conversion may lose significant digits +led_pow.c(104) : CC78K0R warning W0401: Conversion may lose significant digits +led_pow.c(155) : CC78K0R warning W0401: Conversion may lose significant digits +led_pow.c(215) : CC78K0R warning W0401: Conversion may lose significant digits +led_pow.c(244) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 5 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\led_pow.asm +Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -obsr.lmf "..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -go85h,0FC00h,1024 -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel Link complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\oc78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf @@ -10,4 +137,4 @@ Object Conversion Complete, 0 error(s) and 0 warning(s) found. C:\Windows\system32\cmd.exe /c ruby nec_s_2_bsrbin2.rb bsr.hex 133 !E debug enable!! -Build Total error(s) : 0 Total warning(s) : 0 +Build Total error(s) : 0 Total warning(s) : 55 diff --git a/branches/sim/yav_mcu_bsr.pri b/branches/sim/yav_mcu_bsr.pri index fb5dab9..90c2b6c 100644 --- a/branches/sim/yav_mcu_bsr.pri +++ b/branches/sim/yav_mcu_bsr.pri @@ -14,7 +14,7 @@ Low-voltage Flash Rewriting=On Fail Safe Break=0x2000 Port=1 NMI=OFF -TRESET=ON +TRESET=OFF IRESET=OFF WAIT=OFF SysClock=None @@ -22,7 +22,7 @@ SubClock=None [Mapping] Count=0 [Main] -Geometry=1, 1, 878, 808 +Geometry=264, 264, 1200, 858 Window=Max MDI_MAX=OFF Button=ON @@ -58,7 +58,7 @@ Symbol Reset1=ON Dir=\\tsclient\C\78k_data\yav-mcu-basara\branches\sim\ Filter=Source [Debugger Option] -Source Path="\\tsclient\C\78k_data\yav-mcu-basara\branches\sim\renge" +Source Path="" Symbol Size=Byte Symbol Format=Hex Register Name=Func @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=31, 32, 748, 852 +Geometry=397, 379, 710, 677 Window=Normal -DispStart=75 -CaretPos=116,0 +DispStart=337 +CaretPos=378,0 Mode=Normal DispFile= Address1= @@ -139,10 +139,42 @@ SaveRange=Screen SaveStart= SaveEnd= Accumulative=ON +[Source1] +Geometry=125, 125, 710, 677 +Window=Normal +DispStart=127 +CaretPos=140,5 +Mode=Normal +DispFile=\\tsclient\C\78k_data\yav-mcu-basara\branches\sim\i2c_ctr.c +Accumulative=ON +[Source2] +Geometry=0, 0, 823, 1048 +Window=Normal +DispStart=13 +CaretPos=30,46 +Mode=Normal +DispFile=\\tsclient\C\78k_data\yav-mcu-basara\branches\sim\hal.c +Accumulative=ON +[Source3] +Geometry=201, 79, 710, 677 +Window=Normal +DispStart=39 +CaretPos=57,20 +Mode=Normal +DispFile=\\tsclient\C\78k_data\yav-mcu-basara\branches\sim\task_status.c +Accumulative=ON +[Source4] +Geometry=100, 100, 710, 677 +Window=Normal +DispStart=1330 +CaretPos=1384,0 +Mode=Normal +DispFile=\\tsclient\C\78k_data\yav-mcu-basara\branches\sim\pm.c +Accumulative=ON [Assemble] Geometry=0, 0, 0, 0 Window=Hide -DispStart=847561728 +DispStart=847434752 CaretPos=0,0 Address1= Address2= @@ -179,8 +211,8 @@ Data16= Case=ON Scan=OFF Direction=Down -FindStart=0 -FindEnd=0 +FindStart= +FindEnd= SaveRange=Screen SaveStart= SaveEnd= @@ -256,8 +288,8 @@ Window=Hide Boundary=0 Mode=Proper [Sfr] -Geometry=0, 0, 0, 0 -Window=Hide +Geometry=912, 25, 400, 932 +Window=Normal Address1= Address2= Address3= @@ -274,549 +306,549 @@ Address13= Address14= Address15= Address16= -Boundary=0, 0 +Boundary=202, 89 Mode=Hex Attribute=Show -Sort=Unsort +Sort=Address Pickup=OFF SelectSort=Address -Last Name= +Last Name=PM2 Line=531 -L1=P0 -L2=P1 -L3=P2 -L4=P3 -L5=P4 -L6=P5 -L7=P6 -L8=P7 -L9=P12 -L10=P14 -L11=P15 -L12=SDR00 -L13=SIO00 -L14=TXD0 -L15=SDR01 -L16=RXD0 -L17=SIO01 -L18=TDR00 -L19=TDR01 -L20=ADCRH -L21=PM0 -L22=PM1 -L23=PM2 -L24=PM3 -L25=PM4 -L26=PM5 -L27=PM6 -L28=PM7 -L29=PM12 -L30=PM14 -L31=PM15 -L32=ADM -L33=ADCE -L34=ADCS -L35=ADS -L36=KRM -L37=EGP0 -L38=EGN0 -L39=ISC -L40=TIS0 -L41=SDR02 -L42=SIO10 -L43=TXD1 -L44=SDR03 -L45=RXD1 -L46=IICA0 -L47=IICS0 -L48=SPD0 -L49=STD0 -L50=ACKD0 -L51=TRC0 -L52=COI0 -L53=EXC0 -L54=ALD0 -L55=MSTS0 -L56=IICF0 -L57=IICRSV0 -L58=STCEN0 -L59=IICBSY0 -L60=STCF0 -L61=TDR02 -L62=TDR03 -L63=TDR04 -L64=TDR05 -L65=TDR06 -L66=TDR07 -L67=RSUBC -L68=SEC -L69=MIN -L70=HOUR -L71=WEEK -L72=DAY -L73=MONTH -L74=YEAR -L75=SUBCUD -L76=ALARMWM -L77=ALARMWH -L78=ALARMWW -L79=RTCC0 -L80=RCLOE0 -L81=RCLOE1 -L82=RTCE -L83=RTCC1 -L84=RWAIT -L85=RWST -L86=RIFG -L87=WAFG -L88=WALIE -L89=WALE -L90=RTCC2 -L91=RCKDIV -L92=RCLOE2 -L93=RINTE -L94=CMC -L95=CSC -L96=HIOSTOP -L97=XTSTOP -L98=MSTOP -L99=OSTC -L100=OSTS -L101=CKC -L102=MCM0 -L103=MCS -L104=CSS -L105=CLS -L106=CKS0 -L107=PCLOE0 -L108=CKS1 -L109=PCLOE1 -L110=RESF -L111=LVIM -L112=LVIF -L113=LVIMD -L114=LVISEL -L115=LVION -L116=LVIS -L117=WDTE -L118=DSA0 -L119=DSA1 -L120=DRA0 -L121=DRA0L -L122=DRA0H -L123=DRA1 -L124=DRA1L -L125=DRA1H -L126=DBC0 -L127=DBC0L -L128=DBC0H -L129=DBC1 -L130=DBC1L -L131=DBC1H -L132=DMC0 -L133=DWAIT0 -L134=DS0 -L135=DRS0 -L136=STG0 -L137=DMC1 -L138=DWAIT1 -L139=DS1 -L140=DRS1 -L141=STG1 -L142=DRC0 -L143=DST0 -L144=DEN0 -L145=DRC1 -L146=DST1 -L147=DEN1 -L148=BECTL -L149=FLMDPUP -L150=PFCMD -L151=PFS -L152=FPRERR -L153=FLPMC -L154=BFAEN -L155=FWEPR -L156=BRAMEN -L157=IF2 -L158=IF2L -L159=TMIF05 -L160=TMIF06 -L161=TMIF07 -L162=PIF6 -L163=IF2H -L164=IICAIF1 -L165=PIF20 -L166=PIF21 -L167=PIF22 -L168=PIF23 -L169=MK2 -L170=MK2L -L171=TMMK05 -L172=TMMK06 -L173=TMMK07 -L174=PMK6 -L175=MK2H -L176=IICAMK1 -L177=PMK20 -L178=PMK21 -L179=PMK22 -L180=PMK23 -L181=PR02 -L182=PR02L -L183=TMPR005 -L184=TMPR006 -L185=TMPR007 -L186=PPR06 -L187=PR02H -L188=IICAPR01 -L189=PPR020 -L190=PPR021 -L191=PPR022 -L192=PPR023 -L193=PR12 -L194=PR12L -L195=TMPR105 -L196=TMPR106 -L197=TMPR107 -L198=PPR16 -L199=PR12H -L200=IICAPR11 -L201=PPR120 -L202=PPR121 -L203=PPR122 -L204=PPR123 -L205=IF0 -L206=IF0L -L207=WDTIIF -L208=LVIIF -L209=PIF0 -L210=PIF1 -L211=PIF2 -L212=PIF4 -L213=PIF5 -L214=IF0H -L215=DMAIF0 -L216=DMAIF1 -L217=CSIIF00 -L218=STIF0 -L219=CSIIF01 -L220=SRIF0 -L221=SREIF0 -L222=IF1 -L223=IF1L -L224=CSIIF10 -L225=IICIF10 -L226=STIF1 -L227=SRIF1 -L228=SREIF1 -L229=IICAIF0 -L230=TMIF00 -L231=TMIF01 -L232=TMIF02 -L233=TMIF03 -L234=IF1H -L235=ADIF -L236=RTCIF -L237=RTCIIF -L238=KRIF -L239=MDIF -L240=TMIF04 -L241=MK0 -L242=MK0L -L243=WDTIMK -L244=LVIMK -L245=PMK0 -L246=PMK1 -L247=PMK2 -L248=PMK4 -L249=PMK5 -L250=MK0H -L251=DMAMK0 -L252=DMAMK1 -L253=CSIMK00 -L254=STMK0 -L255=CSIMK01 -L256=SRMK0 -L257=SREMK0 -L258=MK1 -L259=MK1L -L260=CSIMK10 -L261=IICMK10 -L262=STMK1 -L263=SRMK1 -L264=SREMK1 -L265=IICAMK0 -L266=TMMK00 -L267=TMMK01 -L268=TMMK02 -L269=TMMK03 -L270=MK1H -L271=ADMK -L272=RTCMK -L273=RTCIMK -L274=KRMK -L275=MDMK -L276=TMMK04 -L277=PR00 -L278=PR00L -L279=WDTIPR0 -L280=LVIPR0 -L281=PPR00 -L282=PPR01 -L283=PPR02 -L284=PPR04 -L285=PPR05 -L286=PR00H -L287=DMAPR00 -L288=DMAPR01 -L289=CSIPR000 -L290=STPR00 -L291=CSIPR001 -L292=SRPR00 -L293=SREPR00 -L294=PR01 -L295=PR01L -L296=CSIPR010 -L297=IICPR010 -L298=STPR01 -L299=SRPR01 -L300=SREPR01 -L301=IICAPR00 -L302=TMPR000 -L303=TMPR001 -L304=TMPR002 -L305=TMPR003 -L306=PR01H -L307=ADPR0 -L308=RTCPR0 -L309=RTCIPR0 -L310=KRPR0 -L311=MDPR0 -L312=TMPR004 -L313=PR10 -L314=PR10L -L315=WDTIPR1 -L316=LVIPR1 -L317=PPR10 -L318=PPR11 -L319=PPR12 -L320=PPR14 -L321=PPR15 -L322=PR10H -L323=DMAPR10 -L324=DMAPR11 -L325=CSIPR100 -L326=STPR10 -L327=CSIPR101 -L328=SRPR10 -L329=SREPR10 -L330=PR11 -L331=PR11L -L332=CSIPR110 -L333=IICPR110 -L334=STPR11 -L335=SRPR11 -L336=SREPR11 -L337=IICAPR10 -L338=TMPR100 -L339=TMPR101 -L340=TMPR102 -L341=TMPR103 -L342=PR11H -L343=ADPR1 -L344=RTCPR1 -L345=RTCIPR1 -L346=KRPR1 -L347=MDPR1 -L348=TMPR104 -L349=MDAL -L350=MULA -L351=MDAH -L352=MULB -L353=MDBH -L354=MULOH -L355=MDBL -L356=MULOL -L357=PMC -L358=MAA -L359=ADPC -L360=PU0 -L361=PU1 -L362=PU3 -L363=PU4 -L364=PU5 -L365=PU7 -L366=PU12 -L367=PU14 -L368=PIM3 -L369=PIM7 -L370=POM3 -L371=POM7 -L372=NFEN0 -L373=NFEN1 -L374=NFEN2 -L375=MDCL -L376=MDCH -L377=MDUC -L378=DIVST -L379=DIVMODE -L380=PER0 -L381=SAU0EN -L382=IICA0EN -L383=ADCEN -L384=RTCEN -L385=PER2 -L386=TAU0EN -L387=OSMC -L388=BCDADJ -L389=SSR00 -L390=SSR00L -L391=SSR01 -L392=SSR01L -L393=SSR02 -L394=SSR02L -L395=SSR03 -L396=SSR03L -L397=SIR00 -L398=SIR00L -L399=SIR01 -L400=SIR01L -L401=SIR02 -L402=SIR02L -L403=SIR03 -L404=SIR03L -L405=SMR00 -L406=SMR01 -L407=SMR02 -L408=SMR03 -L409=SCR00 -L410=SCR01 -L411=SCR02 -L412=SCR03 -L413=SE0 -L414=SE0L -L415=SS0 -L416=SS0L -L417=ST0 -L418=ST0L -L419=SPS0 -L420=SPS0L -L421=SO0 -L422=SOE0 -L423=SOE0L -L424=SOL0 -L425=SOL0L -L426=TCR00 -L427=TCR01 -L428=TCR02 -L429=TCR03 -L430=TCR04 -L431=TCR05 -L432=TCR06 -L433=TCR07 -L434=TMR00 -L435=TMR01 -L436=TMR02 -L437=TMR03 -L438=TMR04 -L439=TMR05 -L440=TMR06 -L441=TMR07 -L442=TSR00 -L443=TSR00L -L444=TSR01 -L445=TSR01L -L446=TSR02 -L447=TSR02L -L448=TSR03 -L449=TSR03L -L450=TSR04 -L451=TSR04L -L452=TSR05 -L453=TSR05L -L454=TSR06 -L455=TSR06L -L456=TSR07 -L457=TSR07L -L458=TE0 -L459=TE0L -L460=TS0 -L461=TS0L -L462=TT0 -L463=TT0L -L464=TPS0 -L465=TPS0L -L466=TO0 -L467=TO0L -L468=TOE0 -L469=TOE0L -L470=TOL0 -L471=TOL0L -L472=TOM0 -L473=TOM0L -L474=IICCTL00 -L475=SPT0 -L476=STT0 -L477=ACKE0 -L478=WTIM0 -L479=SPIE0 -L480=WREL0 -L481=LREL0 -L482=IICE0 -L483=IICCTL10 -L484=DFC0 -L485=SMC0 -L486=DAD0 -L487=CLD0 -L488=WUP0 -L489=IICWL0 -L490=IICWH0 -L491=SVA0 -L492=PER3 -L493=IICA1EN -L494=P20 -L495=PM20 -L496=PU20 -L497=EGP2 -L498=EGN2 -L499=IICA1 -L500=IICS1 -L501=SPD1 -L502=STD1 -L503=ACKD1 -L504=TRC1 -L505=COI1 -L506=EXC1 -L507=ALD1 -L508=MSTS1 -L509=IICF1 -L510=IICRSV1 -L511=STCEN1 -L512=IICBSY1 -L513=STCF1 -L514=IICCTL01 -L515=SPT1 -L516=STT1 -L517=ACKE1 -L518=WTIM1 -L519=SPIE1 -L520=WREL1 -L521=LREL1 -L522=IICE1 -L523=IICCTL11 -L524=DFC1 -L525=SMC1 -L526=DAD1 -L527=CLD1 -L528=WUP1 -L529=IICWL1 -L530=IICWH1 -L531=SVA1 +L1=ADPC +L2=PU0 +L3=PU1 +L4=PU3 +L5=PU4 +L6=PU5 +L7=PU7 +L8=PU12 +L9=PU14 +L10=PIM3 +L11=PIM7 +L12=POM3 +L13=POM7 +L14=NFEN0 +L15=NFEN1 +L16=NFEN2 +L17=MDCL +L18=MDCH +L19=MDUC +L20=DIVST +L21=DIVMODE +L22=PER0 +L23=SAU0EN +L24=IICA0EN +L25=ADCEN +L26=RTCEN +L27=PER2 +L28=TAU0EN +L29=OSMC +L30=BCDADJ +L31=SSR00 +L32=SSR00L +L33=SSR01 +L34=SSR01L +L35=SSR02 +L36=SSR02L +L37=SSR03L +L38=SSR03 +L39=SIR00 +L40=SIR00L +L41=SIR01 +L42=SIR01L +L43=SIR02 +L44=SIR02L +L45=SIR03 +L46=SIR03L +L47=SMR00 +L48=SMR01 +L49=SMR02 +L50=SMR03 +L51=SCR00 +L52=SCR01 +L53=SCR02 +L54=SCR03 +L55=SE0 +L56=SE0L +L57=SS0 +L58=SS0L +L59=ST0 +L60=ST0L +L61=SPS0 +L62=SPS0L +L63=SO0 +L64=SOE0L +L65=SOE0 +L66=SOL0 +L67=SOL0L +L68=TCR00 +L69=TCR01 +L70=TCR02 +L71=TCR03 +L72=TCR04 +L73=TCR05 +L74=TCR06 +L75=TCR07 +L76=TMR00 +L77=TMR01 +L78=TMR02 +L79=TMR03 +L80=TMR04 +L81=TMR05 +L82=TMR06 +L83=TMR07 +L84=TSR00 +L85=TSR00L +L86=TSR01L +L87=TSR01 +L88=TSR02 +L89=TSR02L +L90=TSR03L +L91=TSR03 +L92=TSR04 +L93=TSR04L +L94=TSR05 +L95=TSR05L +L96=TSR06L +L97=TSR06 +L98=TSR07 +L99=TSR07L +L100=TE0 +L101=TE0L +L102=TS0 +L103=TS0L +L104=TT0 +L105=TT0L +L106=TPS0 +L107=TPS0L +L108=TO0 +L109=TO0L +L110=TOE0 +L111=TOE0L +L112=TOL0 +L113=TOL0L +L114=TOM0 +L115=TOM0L +L116=IICCTL00 +L117=SPT0 +L118=STT0 +L119=ACKE0 +L120=WTIM0 +L121=SPIE0 +L122=WREL0 +L123=LREL0 +L124=IICE0 +L125=IICCTL10 +L126=DFC0 +L127=SMC0 +L128=DAD0 +L129=CLD0 +L130=WUP0 +L131=IICWL0 +L132=IICWH0 +L133=SVA0 +L134=PER3 +L135=IICA1EN +L136=P20 +L137=PM20 +L138=PU20 +L139=EGP2 +L140=EGN2 +L141=IICA1 +L142=IICS1 +L143=SPD1 +L144=STD1 +L145=ACKD1 +L146=TRC1 +L147=COI1 +L148=EXC1 +L149=ALD1 +L150=MSTS1 +L151=IICF1 +L152=IICRSV1 +L153=STCEN1 +L154=IICBSY1 +L155=STCF1 +L156=IICCTL01 +L157=SPT1 +L158=STT1 +L159=ACKE1 +L160=WTIM1 +L161=SPIE1 +L162=WREL1 +L163=LREL1 +L164=IICE1 +L165=IICCTL11 +L166=DFC1 +L167=SMC1 +L168=DAD1 +L169=CLD1 +L170=WUP1 +L171=IICWL1 +L172=IICWH1 +L173=SVA1 +L174=P0 +L175=P1 +L176=P2 +L177=P3 +L178=P4 +L179=P5 +L180=P6 +L181=P7 +L182=P12 +L183=P14 +L184=P15 +L185=SDR00 +L186=SIO00 +L187=TXD0 +L188=RXD0 +L189=SDR01 +L190=SIO01 +L191=TDR00 +L192=TDR01 +L193=ADCRH +L194=PM0 +L195=PM1 +L196=PM2 +L197=PM3 +L198=PM4 +L199=PM5 +L200=PM6 +L201=PM7 +L202=PM12 +L203=PM14 +L204=PM15 +L205=ADM +L206=ADCE +L207=ADCS +L208=ADS +L209=KRM +L210=EGP0 +L211=EGN0 +L212=ISC +L213=TIS0 +L214=SIO10 +L215=SDR02 +L216=TXD1 +L217=SDR03 +L218=RXD1 +L219=IICA0 +L220=IICS0 +L221=SPD0 +L222=STD0 +L223=ACKD0 +L224=TRC0 +L225=COI0 +L226=EXC0 +L227=ALD0 +L228=MSTS0 +L229=IICF0 +L230=IICRSV0 +L231=STCEN0 +L232=IICBSY0 +L233=STCF0 +L234=TDR02 +L235=TDR03 +L236=TDR04 +L237=TDR05 +L238=TDR06 +L239=TDR07 +L240=RSUBC +L241=SEC +L242=MIN +L243=HOUR +L244=WEEK +L245=DAY +L246=MONTH +L247=YEAR +L248=SUBCUD +L249=ALARMWM +L250=ALARMWH +L251=ALARMWW +L252=RTCC0 +L253=RCLOE0 +L254=RCLOE1 +L255=RTCE +L256=RTCC1 +L257=RWAIT +L258=RWST +L259=RIFG +L260=WAFG +L261=WALIE +L262=WALE +L263=RTCC2 +L264=RCKDIV +L265=RCLOE2 +L266=RINTE +L267=CMC +L268=CSC +L269=HIOSTOP +L270=XTSTOP +L271=MSTOP +L272=OSTC +L273=OSTS +L274=CKC +L275=MCM0 +L276=MCS +L277=CSS +L278=CLS +L279=CKS0 +L280=PCLOE0 +L281=CKS1 +L282=PCLOE1 +L283=RESF +L284=LVIM +L285=LVIF +L286=LVIMD +L287=LVISEL +L288=LVION +L289=LVIS +L290=WDTE +L291=DSA0 +L292=DSA1 +L293=DRA0 +L294=DRA0L +L295=DRA0H +L296=DRA1L +L297=DRA1 +L298=DRA1H +L299=DBC0L +L300=DBC0 +L301=DBC0H +L302=DBC1L +L303=DBC1 +L304=DBC1H +L305=DMC0 +L306=DWAIT0 +L307=DS0 +L308=DRS0 +L309=STG0 +L310=DMC1 +L311=DWAIT1 +L312=DS1 +L313=DRS1 +L314=STG1 +L315=DRC0 +L316=DST0 +L317=DEN0 +L318=DRC1 +L319=DST1 +L320=DEN1 +L321=BECTL +L322=FLMDPUP +L323=PFCMD +L324=PFS +L325=FPRERR +L326=FLPMC +L327=BFAEN +L328=FWEPR +L329=BRAMEN +L330=IF2L +L331=IF2 +L332=TMIF05 +L333=TMIF06 +L334=TMIF07 +L335=PIF6 +L336=IF2H +L337=IICAIF1 +L338=PIF20 +L339=PIF21 +L340=PIF22 +L341=PIF23 +L342=MK2L +L343=MK2 +L344=TMMK05 +L345=TMMK06 +L346=TMMK07 +L347=PMK6 +L348=MK2H +L349=IICAMK1 +L350=PMK20 +L351=PMK21 +L352=PMK22 +L353=PMK23 +L354=PR02L +L355=PR02 +L356=TMPR005 +L357=TMPR006 +L358=TMPR007 +L359=PPR06 +L360=PR02H +L361=IICAPR01 +L362=PPR020 +L363=PPR021 +L364=PPR022 +L365=PPR023 +L366=PR12 +L367=PR12L +L368=TMPR105 +L369=TMPR106 +L370=TMPR107 +L371=PPR16 +L372=PR12H +L373=IICAPR11 +L374=PPR120 +L375=PPR121 +L376=PPR122 +L377=PPR123 +L378=IF0 +L379=IF0L +L380=WDTIIF +L381=LVIIF +L382=PIF0 +L383=PIF1 +L384=PIF2 +L385=PIF4 +L386=PIF5 +L387=IF0H +L388=DMAIF0 +L389=DMAIF1 +L390=CSIIF00 +L391=STIF0 +L392=CSIIF01 +L393=SRIF0 +L394=SREIF0 +L395=IF1 +L396=IF1L +L397=CSIIF10 +L398=IICIF10 +L399=STIF1 +L400=SRIF1 +L401=SREIF1 +L402=IICAIF0 +L403=TMIF00 +L404=TMIF01 +L405=TMIF02 +L406=TMIF03 +L407=IF1H +L408=ADIF +L409=RTCIF +L410=RTCIIF +L411=KRIF +L412=MDIF +L413=TMIF04 +L414=MK0 +L415=MK0L +L416=WDTIMK +L417=LVIMK +L418=PMK0 +L419=PMK1 +L420=PMK2 +L421=PMK4 +L422=PMK5 +L423=MK0H +L424=DMAMK0 +L425=DMAMK1 +L426=CSIMK00 +L427=STMK0 +L428=SRMK0 +L429=CSIMK01 +L430=SREMK0 +L431=MK1 +L432=MK1L +L433=IICMK10 +L434=CSIMK10 +L435=STMK1 +L436=SRMK1 +L437=SREMK1 +L438=IICAMK0 +L439=TMMK00 +L440=TMMK01 +L441=TMMK02 +L442=TMMK03 +L443=MK1H +L444=ADMK +L445=RTCMK +L446=RTCIMK +L447=KRMK +L448=MDMK +L449=TMMK04 +L450=PR00L +L451=PR00 +L452=WDTIPR0 +L453=LVIPR0 +L454=PPR00 +L455=PPR01 +L456=PPR02 +L457=PPR04 +L458=PPR05 +L459=PR00H +L460=DMAPR00 +L461=DMAPR01 +L462=CSIPR000 +L463=STPR00 +L464=CSIPR001 +L465=SRPR00 +L466=SREPR00 +L467=PR01L +L468=PR01 +L469=CSIPR010 +L470=IICPR010 +L471=STPR01 +L472=SRPR01 +L473=SREPR01 +L474=IICAPR00 +L475=TMPR000 +L476=TMPR001 +L477=TMPR002 +L478=TMPR003 +L479=PR01H +L480=ADPR0 +L481=RTCPR0 +L482=RTCIPR0 +L483=KRPR0 +L484=MDPR0 +L485=TMPR004 +L486=PR10L +L487=PR10 +L488=WDTIPR1 +L489=LVIPR1 +L490=PPR10 +L491=PPR11 +L492=PPR12 +L493=PPR14 +L494=PPR15 +L495=PR10H +L496=DMAPR10 +L497=DMAPR11 +L498=CSIPR100 +L499=STPR10 +L500=CSIPR101 +L501=SRPR10 +L502=SREPR10 +L503=PR11 +L504=PR11L +L505=IICPR110 +L506=STPR11 +L507=CSIPR110 +L508=SRPR11 +L509=SREPR11 +L510=IICAPR10 +L511=TMPR100 +L512=TMPR101 +L513=TMPR102 +L514=TMPR103 +L515=PR11H +L516=ADPR1 +L517=RTCPR1 +L518=RTCIPR1 +L519=KRPR1 +L520=MDPR1 +L521=TMPR104 +L522=MDAL +L523=MULA +L524=MDAH +L525=MULB +L526=MDBH +L527=MULOH +L528=MDBL +L529=MULOL +L530=PMC +L531=MAA [Local Variable] -Geometry=0, 0, 0, 0 -Window=Hide -Boundary=0 +Geometry=1124, 328, 400, 527 +Window=Normal +Boundary=13041851 Mode=Proper [Trace View] Geometry=0, 0, 0, 0 @@ -866,22 +898,22 @@ SaveRange=Screen SaveStart= SaveEnd= [Register] -Geometry=0, 0, 0, 0 +Geometry=125, 125, 250, 400 Window=Hide Mode=Hex -Boundary=62 +Boundary=159 Pickup=OFF Name=Functional Register Bank=0 -RP0=1 -RP1=1 -RP2=1 -RP3=1 -PC=1 -SP=1 -PSW=1 -ES=1 -CS=1 +RP0=3 +RP1=3 +RP2=3 +RP3=3 +PC=3 +SP=3 +PSW=3 +ES=3 +CS=3 [Event Manager] Geometry=0, 0, 0, 0 Window=Hide @@ -957,19 +989,21 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=1143, 3, 440, 1023 +Geometry=1132, 12, 440, 300 Window=Normal Boundary=13762700 -0=.system_status,.,N,A,+,1 -1=.vreg_ctr,P,N,A,+,1 -2=.temp,P,N,A,+,1 -Line=3 +0=+system_status,.,N,A,-,1 +1=.IICS1,B,S,A,+,1 +2=.adrs_access_from,P,N,A,+,1 +3=.state,P,N,A,+,1 +4=.iic_burst_state,P,N,A,+,1 +Line=5 [Quick Watch] -0=temp,P,A,1 -1=system_status,P,A,1 -2=vreg_ctr[],P,A,1 -3=vreg_ctr,P,A,1 -4= +0=iic_burst_state,P,A,1 +1=state,P,A,1 +2=adrs_access_from,P,A,1 +3=IICS1,P,A,1 +4=system_status,P,A,1 5= 6= 7= @@ -985,7 +1019,15 @@ Line=3 Geometry=0, 0, 0, 0 Window=Hide Width=150 30 200 100 -Count=0 +Name0=Swb00002 +Address0=i2c_ctr.c#_int_iic_ctr+0xc8 +Window0=ASM +Status0=ON +Name1=Swb00001 +Address1=task_status.c#_tsk_status+0x2b +Window1=ASM +Status1=ON +Count=2 [Reset] Debugger=ON Symbol=OFF diff --git a/branches/sim/yav_mcu_bsr.prj b/branches/sim/yav_mcu_bsr.prj index defd579..27ab599 100644 --- a/branches/sim/yav_mcu_bsr.prj +++ b/branches/sim/yav_mcu_bsr.prj @@ -231,37 +231,6 @@ Tool1=CC78K0R|W2.13 Tool2=RA78K0R|W1.33 Tool3=SK78K0R|V3.10 Tool4=ID78K0R-QB|V3.61 -[Options.LCNV78K0R 0] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 1] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 2] -Version=100 -LCNV_GO=0 -O0=inter_asm -E=0 -CommandFile=0 -[Options.LCNV78K0R 3] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 4] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 5] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 [SrcFile] Source1=loader.c Source2=pm.c @@ -328,268 +297,6 @@ Include35=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\in Include36=sim\simOnWin.h Include37=sim\sfrAlias.h Include38=hal.h -[Options.LK78K0R 0] -Version=100 -O0=bsr_k0r.lmf -O1=bsr.lmf -O2=flash.lmf -O3=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_k0r.map -P1=bsr.map -P2=flash.map -P3=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=0 -SELFCheck=1 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LK78K0R 1] -Version=100 -O0=a.lmf -G=0 -E=0 -E0=a.elk -GO=0 -GOValue= -GOStart=FC00 -GOSizeValue=1024 -GI=0 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=1 -MemInfoCheck=0 -P=1 -P0=a.map -MI=0 -GB=0 -GBValue= -KM=1 -KD=1 -KP=0 -KL=0 -LF=0 -LL=0 -S=0 -W=1 -SELFCheck=0 -SELF=0 -ZB= -CommandFile=0 -[Options.LK78K0R 2] -Version=100 -O0=bsr.lmf -O1=bsr_k0r.lmf -O2=flash.lmf -O3=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=1B339499E033F240BFAA -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_k0r.map -P1=bsr.map -P2=flash.map -P3=a.map -MI=0 -GB=1 -GBValue=7EFBFF -KM=1 -KD=0 -KP=0 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -B1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=0 -SELFCheck=0 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -OFILE=C:\78k_data\yav-mcu-basara\branches\sim\bsr.lmf -[Options.LK78K0R 3] -Version=100 -O0=bsr_bsr.lmf -O1=bsr_k0r.lmf -O2=bsr.lmf -O3=flash.lmf -O4=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_bsr.map -P1=bsr_k0r.map -P2=bsr.map -P3=flash.map -P4=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=2 -SELFCheck=0 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LK78K0R 4] -Version=100 -O0=bsr_k0r.lmf -O1=bsr.lmf -O2=flash.lmf -O3=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_k0r.map -P1=bsr.map -P2=flash.map -P3=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=0 -SELFCheck=1 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LK78K0R 5] -Version=100 -O0=bsr_bsr.lmf -O1=bsr_k0r.lmf -O2=bsr.lmf -O3=flash.lmf -O4=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_bsr.map -P1=bsr_k0r.map -P2=bsr.map -P3=flash.map -P4=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=2 -SELFCheck=0 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.78K0R] -BuildMode=2 -BuildMode2=K0R_dbg -BuildMode3=BSR_dbg -BuildMode4=BSR_rel -BuildMode5=BSR_WM0 -DefaultMode2=1 -DefaultMode3=1 -DefaultMode4=1 -DefaultMode5=1 [Options.CC78K0R 0] Version=210 Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r @@ -1059,3 +766,296 @@ VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 VF78K0Rvs= +[Options.LK78K0R 0] +Version=100 +O0=bsr_k0r.lmf +O1=bsr.lmf +O2=flash.lmf +O3=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_k0r.map +P1=bsr.map +P2=flash.map +P3=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=0 +SELFCheck=1 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LK78K0R 1] +Version=100 +O0=a.lmf +G=0 +E=0 +E0=a.elk +GO=0 +GOValue= +GOStart=FC00 +GOSizeValue=1024 +GI=0 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=1 +MemInfoCheck=0 +P=1 +P0=a.map +MI=0 +GB=0 +GBValue= +KM=1 +KD=1 +KP=0 +KL=0 +LF=0 +LL=0 +S=0 +W=1 +SELFCheck=0 +SELF=0 +ZB= +CommandFile=0 +[Options.LK78K0R 2] +Version=100 +O0=bsr.lmf +O1=bsr_k0r.lmf +O2=flash.lmf +O3=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=1B339499E033F240BFAA +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_k0r.map +P1=bsr.map +P2=flash.map +P3=a.map +MI=0 +GB=1 +GBValue=7EFBFF +KM=1 +KD=0 +KP=0 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib +B1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=0 +SELFCheck=0 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +OFILE=C:\78k_data\yav-mcu-basara\branches\sim\bsr.lmf +[Options.LK78K0R 3] +Version=100 +O0=bsr_bsr.lmf +O1=bsr_k0r.lmf +O2=bsr.lmf +O3=flash.lmf +O4=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_bsr.map +P1=bsr_k0r.map +P2=bsr.map +P3=flash.map +P4=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=2 +SELFCheck=0 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LK78K0R 4] +Version=100 +O0=bsr_k0r.lmf +O1=bsr.lmf +O2=flash.lmf +O3=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_k0r.map +P1=bsr.map +P2=flash.map +P3=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=0 +SELFCheck=1 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LK78K0R 5] +Version=100 +O0=bsr_bsr.lmf +O1=bsr_k0r.lmf +O2=bsr.lmf +O3=flash.lmf +O4=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_bsr.map +P1=bsr_k0r.map +P2=bsr.map +P3=flash.map +P4=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=2 +SELFCheck=0 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LCNV78K0R 0] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 1] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 2] +Version=100 +LCNV_GO=0 +O0=inter_asm +E=0 +CommandFile=0 +[Options.LCNV78K0R 3] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 4] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 5] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.78K0R] +BuildMode=2 +BuildMode2=K0R_dbg +BuildMode3=BSR_dbg +BuildMode4=BSR_rel +BuildMode5=BSR_WM0 +DefaultMode2=1 +DefaultMode3=1 +DefaultMode4=1 +DefaultMode5=1 diff --git a/branches/sim/ベースからの変更.xls b/branches/sim/ベースからの変更.xls new file mode 100644 index 0000000..40250ee Binary files /dev/null and b/branches/sim/ベースからの変更.xls differ