diff --git a/branches/sim/VCProj/Debug/bsr_trunk.log b/branches/sim/VCProj/Debug/bsr_trunk.log index 6dcc476..936a5e0 100644 --- a/branches/sim/VCProj/Debug/bsr_trunk.log +++ b/branches/sim/VCProj/Debug/bsr_trunk.log @@ -1,11 +1,10 @@ -2011/06/20 15:03:03 にビルドを開始しました。 - 1>ノード 2 上のプロジェクト "C:\78k_data\yav-mcu-basara\branches\sim\VCProj\bsr_trunk.vcxproj" (rebuild ターゲット)。 - 1>_PrepareForClean: - ファイル "Debug\sim.lastbuildstate" を削除しています。 - InitializeBuildStatus: +2011/07/01 11:39:55 にビルドを開始しました。 + 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 ..\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 ..\rtc.c ..\self_flash.c ..\sim\simFixture.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 + 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 accero.c adc.c i2c_ctr.c @@ -20,21 +19,19 @@ main.c pedo_alg_thre_det2.c pm.c - 1>..\pm.c(1259): warning C4090: '=' : 異なる 'const' 修飾子です。 + 1>..\pm.c(1272): warning C4090: '=' : 異なる 'const' 修飾子です。 + renge.c rtc.c self_flash.c - simFixture.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 @@ -63,14 +60,15 @@ 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" (rebuild ターゲット) のビルドが完了しました。 + 1>プロジェクト "C:\78k_data\yav-mcu-basara\branches\sim\VCProj\bsr_trunk.vcxproj" (build ターゲット) のビルドが完了しました。 ビルドに成功しました。 -経過時間 00:00:02.95 +経過時間 00:00:06.77 diff --git a/branches/sim/VCProj/bsr_trunk.sdf b/branches/sim/VCProj/bsr_trunk.sdf index 21efe1e..6b44376 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 e45a7d5..0167a4c 100644 Binary files a/branches/sim/VCProj/bsr_trunk.suo and b/branches/sim/VCProj/bsr_trunk.suo differ diff --git a/branches/sim/adc.c b/branches/sim/adc.c index 454da1e..9edf864 100644 --- a/branches/sim/adc.c +++ b/branches/sim/adc.c @@ -64,6 +64,7 @@ const u8 TWL_VOL_BOUNDARY[] = { extern void nop8(); static void adc_filter( u8 new_val, filter_work* work ); static u8 adc_scaling( u8 ); +static void update_twl_vol( u8 sent_index ); @@ -85,10 +86,6 @@ static u8 adc_scaling( u8 ); ======================================================== */ void tsk_adc( ) { - static u8 old_3D; - static u8 sndvol_codec; - static u8 bt_temp_old; - if( adc_updated ) { adc_updated = false; @@ -156,8 +153,7 @@ void vol_reset() task_status_immed tski_vol_update() { static u8 sent_index, sent_index_twl; - static u8 sent_data; - static bit last_modifyer_is_twl; // 0 = ctr + static bit last_modifyer_is_twl; // false = ctr if( !( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP )){ @@ -165,15 +161,7 @@ task_status_immed tski_vol_update() } // ǂ̉ʂɂ́H // - if( vreg_ctr[ VREG_C_VOL_OPTION ] & ( REG_BIT_VOL_UPDATE_TO_SLIDER ) ) - { - // debug // - NOP(); - // ŗD XC_ɏ㏑ - sent_index = vol_data_ctr; - vreg_ctr[ VREG_C_VOL_OPTION ] &= ~REG_BIT_VOL_UPDATE_TO_SLIDER; - } - else if( vol_changed_by_ctr ) + if( vol_changed_by_ctr ) { // XC_ vol_changed_by_ctr = false; @@ -211,6 +199,21 @@ task_status_immed tski_vol_update() // WX^̍XV // vreg_ctr[ VREG_C_SND_VOL ] = sent_index; + + // twlXV + update_twl_vol( sent_index ); + + // codecɓ` + /// lł + iic_mcu_write_a_byte_codec( CODEC_REG_VOL, slider_to_codec[ sent_index ] ); + + // set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE ); // 荞ݔp~ + return( ERR_FINISED ); +} + + +static void update_twl_vol( u8 sent_index ) +{ // XP[O if( sent_index == 0 ) { @@ -248,25 +251,9 @@ task_status_immed tski_vol_update() vol_level_twl = new_level; } } - - - // CODECɏɍsH - if( vreg_ctr[ VREG_C_VOL_OPTION ] & REG_BIT_VOL_BY_SPI ) - { - return( ERR_FINISED ); - // by SPI Ȃ炱܂łł܂ // - } - - // codecɓ` - /// lł - iic_mcu_write_a_byte_codec( CODEC_REG_VOL, slider_to_codec[ sent_index ] ); - - // set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE ); // 荞ݔp~ - return( ERR_FINISED ); } - /* ======================================================== @ߋR‚minłMAXłȂlԂ @˔IȃmCYB @@ -274,6 +261,22 @@ task_status_immed tski_vol_update() ======================================================== */ static u8 getmean3( u8 * hist ) { +/* +// ͑傫Ēx + u16 temp = 0; + u8 min = 255; + u8 max = 0; + u8 i; + + for( i=0; i!= 3; i++ ) + { + temp += *(hist+i); + if( min > *(hist+i) ){ min = *(hist+i); } + if( max < *(hist+i) ){ max = *(hist+i); } + } + return (u8)(temp - min - max); +*/ + if( *hist > *( hist + 1 ) ) { if( *hist > *( hist + 2 ) ) @@ -304,9 +307,6 @@ static u8 getmean3( u8 * hist ) ======================================================== */ __interrupt void int_adc( ) { - static u8 hist_3D[3]; - static u8 hist_snd_vol[3]; - static u8 hist_bt_temp[3]; static u8 index; volatile u8 adc_data; @@ -451,7 +451,6 @@ static u8 adc_scaling( u8 orig_val ) #define KIKAN 16 static void adc_filter( u8 new_val, filter_work *work ) { - u8 temp; if( abs( new_val - *( work -> value_used )) > 2 ) { // 傫ꂽ diff --git a/branches/sim/bsr.hex b/branches/sim/bsr.hex index 72ce389..7e7eb28 100644 --- a/branches/sim/bsr.hex +++ b/branches/sim/bsr.hex @@ -1,257 +1,249 @@ -:02000000450DAC -:04001000DD49DF499E -:02001C00A94BEE -:02002400F64B99 -:02002A00454C43 -:080034006E4D104D694D9D4E0B -:02004A00E1498A -:02005A001C4A3E -:02006200214E2D -:0400C0007EFBFF04C0 +:02000000AE0C44 +:02000200FFFFFE +:04001000B649B849EC +:02001C00924B05 +:02002400DF4BB0 +:02002A002E4C5A +:08003400574DF94C524D864E68 +:02004A00BA49B1 +:02005A00F54966 +:020062000A4E44 +:0400C0007EFBFF853F :0A00C4001B339499E033F240BFAA09 -:1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A -:1000DE00D8710022F98EA89C018C015C10D1DD0A2A -:1000EE007110CEFB710022F9EF0B8C015C80D16197 -:1000FE00E8710022F98F22F931030EF6B1BBF661D9 -:10010E004900DD05618900EFF5FDD901FD2801FDEE -:10011E008001FDF602EFAEC0C6D7C7360000674CB1 -:10012E0009DE3F318E04F60FC1317B9EFDC411896D -:10013E007267318E04F64F14896142DF03F6EF01C8 -:10014E00E660610667318E124900207267318E04B7 -:10015E00F64F14896142DF03F6EF01E66061068710 -:10016E00EFBC40F84F3A61E88666D161E8FD7A0748 -:10017E00C6D751105B0C319E609F24F94024F901C3 -:10018E00DF06CF0EF905EF04CF0EF9078F22F95CCB -:10019E00E39F22F951035B04318EE7240000DD104A -:1001AE0023DD0823DF0E712022F9D7713022F9D713 -:1001BE00714022F9D7717BFACEA010CEA180E5F363 -:1001CE0000CEA408F5AAFFF5A9FFD78F22F93105B5 -:1001DE000ACD0003CD0307F40EEF07F400CD03069E -:1001EE00F40ECE20FFCE23F0CE2EFC8F22F931035B -:1001FE001FF51005CD01C0F402CD0408F405F40678 -:10020E00CD0740F40CF40F7108F200F690BFB40164 -:10021E00F6BEE0BEE2BED0CBE4FFFFCBE6FFFFCBE7 -:10022E00D4FFFFCF1105F8F521FFCE22E9CE24F33E -:10023E00CE25F2CE26FCCE275FCE2CFFCE2FFFCFC3 -:10024E00120511F53000F53100F53300F53400CF0D -:10025E00350002CF370019F53C00F53E00F543009E -:10026E00F54700CF530006F55700CBE8FFFFCBEA6A -:10027E00FFFFCBECFFFFCBEEFEFFCED8FFCEDCFFB9 -:10028E00CE3831CE3970CF38050AF53905F537FF3E -:10029E007158F000F530FF7128F0005087BF18013B -:1002AE00BF1A01BF1C01BF1E017148F000F53002DC -:1002BE0071080105F55005F5BCFFF5BDFFF5A5FF6D -:1002CE00F5A6FFD7C7C1C1FBF8FFCEABAC8C02D1F0 -:1002DE00DD12616902305C03BBF6614900DDEE613F -:1002EE008900EFF51004C6D7FDC52FFD4639FD5226 -:1002FE0005717AFAFDC523F520F98F22F931051320 -:10030E005003FDE72B625C01D161E8CF20F902CFEB -:10031E00D7FB64FDA530FD6845710223712BE7FD07 -:10032E004939FDEB3961EDEFF6D7D7C7F616FD5219 -:10033E0005717BFA31222108712221717AFAEF0BB5 -:10034E00717AFAA7F647DFE9E2EF01F2C6D7C7C125 -:10035E00C1FBF8FF17A1C1E0C18C0A70C18C0270FD -:10036E00FD86031006D2DF05F545FBEF04CF45FBF6 -:10037E00028C01721004C6D7C7C1FBF8FFFD39030A -:10038E00D2DD03E2EF618B70FDA604D2DD0771238F -:10039E00215202EF528C0870FDBB04FD06058B6CDA -:1003AE000170FDBB04300400BF2401301740BF1C98 -:1003BE0001300400BF22018C0A91DF04F6BF2A012E -:1003CE00710BE2CE44FF3182E202EFFAAC0C148ED6 -:1003DE00449961790C61690A8C0AD1DFDAFD2F0527 -:1003EE00710BE2712321F2C0C6D7C7C1FBF8FFFD26 -:1003FE003903D2DD03E2EF25710AE68B70FDA60408 -:10040E00D2DD077123215202EF138C0870FDBB045D -:10041E008C0A70FDBB04FD2F05712321F2C0C6D7D7 -:10042E00C7C1FBF8FFFD3903D2DD03E2EF67710AA6 -:10043E00E6710BE28B70FDA604D2DD07712321520B -:10044E0002EF52710BE231122139C7343EFBAC0C74 -:10045E001652048B99A5A792DFF9C63184BD02EF1F -:10046E00FA717ABDCEB144CBB43EFB8C0A318EBE4E -:10047E00B8CEBB48714BE1714BE5710ABD8C089E3D -:10048E0044EF11710BE68C089E448C0A9F44FBAC22 -:10049E000CBF42FBF2C0C6D7C716FDDE0417FDBB6C -:1004AE0004D2DD06FD2F05E2EF01F2C6D7C71671A5 -:1004BE000AE6710BE2669E443182E202EFFAF642E0 -:1004CE000401DD09AF0401BF0C01E2EF01F2C6D752 -:1004DE00AF2801085CFB08BF2801FD3803AF2801D7 -:1004EE005CFBBF2801300400BF2A01301780BF1CFF -:1004FE0001300400BF2201D7AF2401086C0408BFED -:10050E002401AF28016C0F086C0B08BF2801FD38C1 -:10051E0003AF2A01085CFB08BF2A01FD3803EDDE9C -:10052E0004300400BF2401F6BF2A01300B0BBF2894 -:10053E0001FD3803300B0FBF2801FD3803300F0FBC -:10054E00BF2801D731342101D7712221710BBD0093 -:10055E0000717BBD713A25713A236A0E0371320523 -:10056E00713B25713203713B235014FDD202712071 -:10057E00F000FD3803F6BF26015024BF1401CB4412 -:10058E000014300F0FBF2801711321710BE2710A95 -:10059E00E6FDDE04CE44FF3182E202EFFAFD2F05C6 -:1005AE00AF0401BF0C01712321713221D7312421F7 -:1005BE0002EFFAFD0605713A25713A235A0EFC71C7 -:1005CE003305713B25713303713B237128F00071A4 -:1005DE003321D7C7880616FD3903D2DD03E2EF3883 -:1005EE00710AE650A4FDA604D2DD07712321520242 -:1005FE00EF2617FDBB046770FDBB04FD060550A476 -:10060E00FDBB045020FDBB04D946FBFDBB04A04638 -:10061E00FBFD2F05712321F2C6D7C72008FBF8FF7B -:10062E00FD78095014C15008FDAA08C0CC07048CEF -:10063E00074C14DE0C8C07318EFD270A615907EF2B -:10064E00EECC07048C074C1461C8ED1607CC0600DF -:10065E008C064C0461C8EDF5063026F9BC02F6BBDB -:10066E00CEABAC31B2D109C73641057184C6DEF3CB -:10067E00F1C73641057184C661DC9C05713BD1AC76 -:10068E0002148F400599715050056179026179000D -:10069E00F0E1614900DD09C73641057184C6DEC34C -:1006AE00F1C73641057184C661DC0E059C055040CC -:1006BE00C18C07318E31AD128C06318E318D03BD5A -:1006CE00D831FFBDDADADAADD8FDF30CC0D2DD0CCD -:1006DE005008C15014FDAA08C0FDB00B8C05D1DF27 -:1006EE0006615906ED5E068C07318EFD2B0AD2DDB2 -:1006FE000C5008C15014FDAA08C0FDB00B8C05D1DA -:10070E00DF06615907ED520671605005CC0400CC2E -:10071E0005008C054C09DE2B8C05318E04F61FC1AD -:10072E00317B9EFDC41189728C05318E04F64F14F7 -:10073E00896142DF03F6EF01E6600E049C04615905 -:10074E0005EFCF41001140F81F3A61E86159048C62 -:10075E0004D1DF08FDB10BFDC30CEF0C5008C150E6 -:10076E0014FDAA08C0FDB00B1008C6D7C72004FBA5 -:10077E00F8FF715B21CC0100F6BC02AC024409000B -:10078E00DE3EAC0204F60F144100118972AC020C6D -:10079E005014896142DF03F6EF01E6600E019C0101 -:1007AE00AC021249005072AC0204F67F1489614209 -:1007BE00DF03F6EF01E6600E019C01617902EFBBEB -:1007CE0040F67FFF61F86159018C01D161F8ED7837 -:1007DE0008CC0100717AFAFD5205711300711B20CD -:1007EE00710303710205E0C15003FDD62BC05013F7 -:1007FE00FDD202500FC1E0FDD62BC0CEABAC61597D -:10080E00018C0191DD068C014C03DF03E6EF01F64E -:10081E006061FB7151018C014C0861F8CC01003113 -:10082E00320705A06AFCEF03F56AFC406AFC11DC96 -:10083E000DF56AFCF0C15003FDD62BC0EF12E6BCDD -:10084E0002F6614902DDB400000000617902EFF1A9 -:10085E00CE3708CBE4FFFFCBE6FFF7CED4FFCF3782 -:10086E000008F5120561FDF5ABFFFD7809D25008C1 -:10087E00C15014FDAA08C0D2FDB00B1004C6D7316A -:10088E0084BD02EFFA717BBDCBE4FFFFCBE6FFFF29 -:10089E00CBD4FFFF717ABED7717BBED7C7C1200CF8 -:1008AE00FBF8FF8C0C318E31ADC1317B9DD4C0BCB9 -:1008BE00068DD49C088C149C0B8C14318E040C0069 -:1008CE00128C0B318EBDD813FD820F61C8ED7309EA -:1008DE00CEABACCC05068C0B318EFD230AD2DD15CA -:1008EE008C0B318EFD270A6169058C05D1DFE7FD82 -:1008FE00A608E2EF71CC0A008C0A4C04DE54F6BC5A -:10090E00023026F9BBAC06148C089EFD118972AB21 -:10091E00146299AC06A1BC06617900617902F0E11E -:10092E00614902DFE05040C18C0B318E31AD128C2B -:10093E000A318E318D03BDD831FFBDDADADAADD88A -:10094E00FDF30CC0D2DD06FDA608E2EF1961590ACF -:10095E00EFA68C0B318EFD2B0AD2DD03E2EF076181 -:10096E00590BEDC708F2100EC6D7C7717B9D717B70 -:10097E00FAFD8D083026F9FDD60AFD610AC6D7FDAF -:10098E007809FDB00BFDA608F5ABFFF2D7C7D55E13 -:10099E00FDDD05B05EFDEF7BCF5EFD023114070677 -:1009AE007110DBFBEF047118DBFB8FDBFB7F22FD8D -:1009BE0076D1DD5F8FDBFB9F22FD4020F903DF2523 -:1009CE00665C10D1DD1F7122208FDBFB5C10D1DD48 -:1009DE000B5080C15011FD2035C0EF095040C15061 -:1009EE0011FD2035C04020F903DD064020F904DF5B -:1009FE0022665C02D1DD1C8FDBFB5C02D1DD0B506D -:100A0E0040C15010FD2035C0EF095020C15010FDDF -:050A1E002035C0C6D721 -:100A23005208EF065203EF025206FEE600FE1B00D9 -:100A3300DC16089F03088F0408089F040862FE243D -:100A430000089F0408EEBF00EEBA00C1C514410EB2 -:100A530011D9D0FF118FD1FF312E45C4C0D7F23148 -:100A6300A2C401E2D79DE261DD4C09DF12717BFA7A -:100A7300C18F06089F77FDC0CF060800EE2700311F -:100A8300F2FA04CF0608004C00DF05D50008DD1696 -:100A930061DD717BFAD50608DD0ACDE31F61CD6107 -:100AA300CDEE160061CDFED40061FFFE9A00FCF886 -:100AB300FF0EFEB20061CDFED5004C09DF0EC18FE3 -:100AC30006086F77FD9F0608C0EE0400CF060800F6 -:100AD300F8E3D75200EF025202FE3700CF76FD0053 -:100AE300CF060800BF0408C716629F000841001123 -:100AF3008F22229B4100118F23229F0108C65100A0 -:100B0300FE62FFEF025205CF060800C1510CFE0A38 -:100B130000C0D7C1511DFE0200C0D761DD717BFA51 -:100B230070CEC0A59EC47CFF9EC4609EC461CDD719 -:100B330061DD717BFAC18EC45C1BFED6FFCF060854 -:100B430001FED7FFC061CDD731F2FA1AC1AEE4BFBF -:100B530068FDAEE6BF6AFDAED4BF6CFD30FFFFBEDD -:100B6300E4BEE6BED4C0D731F2FA11C1AF68FDBE10 -:100B7300E4AF6AFDBEE6AF6CFDBED4C0D7C1BF6EA5 -:100B8300FD13BF70FD15BF72FD17BF74FDC0D7AF56 -:100B93006EFDDB70FDEB72FDFB74FDD7534B3052E2 -:100BA3005430324E323030475631323000FFC1506C -:100BB300FEFEAB0061DD717BFACF060800FE0A0082 -:100BC300FEA4FF61CDF8E3EECF00C7FB0408BF68C6 -:100BD300FD8FC0009C05C5C337040600BF6AFD3501 -:100BE30036150C300000522BFE6600C2C4C630C35B -:100BF3000BB800300000B8022004AF6AFDB8003023 -:100C03000F00B802AF68FD61FF520AFE3AFFECF82D -:100C1300FF0E717BFAC1C7FB04088C05C65C80FE1E -:100C23000200C0D761DD717BFA70CFC0FFA59FC002 -:100C3300007CFF9FC000609FC00061CDD7618BFE29 -:100C4300E2FF717BBE410011FB000017CEFC006187 -:100C5300CB089EFDF31161C999A58392DFF7D7FEF7 -:100C6300B1FED576FDDF23C1CF0308035109FEF49E -:100C7300FDC0D2DF37FE3800A20408CF03080751B6 -:100C830009FEE1FDD2B20408DF22C7FB0408318369 -:100C930002C6D7C6510AFECCFD624C1FDF06CF76D3 -:100CA300FD01EF04CF76FD00C0EE5BFEC0EE55FE06 -:100CB300C7C1FB04088B31196C0161589BC0C6D7AF -:100CC300717BFAFE4DFEAF0408040600C1143627FB -:100CD3000C300000522DF3FE77FF8FC000FE2BFE79 -:100CE30061CF5C807C8073C0041900CEFC0F61CBA4 -:100CF300C55404EF03C55417FE18FEC7360008BBDE -:100D0300629C0288089C03D1DD334C41DE2F70F1D5 -:100D1300312DB161090033081C000851FF612A41DC -:100D23000E118FD0FF613B118FD1FF6138DC0E8B29 -:100D33005C03DF0964C6C4FE2BFDEECAFDC6C4EE28 -:020D4300C3FDEE -:100D450061CF5100718C7109FECBF800FEFCC30127 -:100D550000F6BF00F953C0F693935820FEDFF94122 -:100D65000036AE4E3430FDEF05118B99A7A517441B -:100D7500E64EDFF53602F93030FDEF04CC0000A772 -:100D850047DFF9410036A34E3468FDEF05118B9915 -:100D9500A7A51744A34EDFF53668FD3068FDEF04BF -:100DA500CC0000A747DFF9FCCE0000EFFE61DD7146 -:100DB5007BFABEF0ADD8BEF200AEF661CDD7C36109 -:100DC500DD717BFABEF0ADD8BEF200DBF6FFADDC1F -:100DD500BEF000AEF6BDD8AEF40312ADDABEF20039 -:100DE500AEF661CD03BDDAC2D7C3F33174D908833A -:100DF500C1F626D8BDD8C031750683C312F623C205 -:100E0500FD100E93DF0312F623C2D7440000DD2642 -:100E150061DD717BFACFE80080BEF6F6BEF4BEF266 -:100E2500ADD8BEF0CFE800818FE8003103FAAEF00F -:100E3500F5E80061CDD7B1D7C3F33174D90883C1C3 -:100E4500F626D8BDD8C0317505C312F623C2FD5E9E -:100E55000E93DF0312F623C2D7440000DD2761DDC0 -:100E6500717BFACFE80080BEF6F6BEF4BEF2ADD8CF -:100E7500BEF0CFE800818FE8003103FAAFE000F55E -:100E8500E80061CDD7ADD8D7C3F33174DB0F83C18B -:100E9500F626D8BDD861317026DABDDAC031750DB8 -:100EA50083C312F626DCBDDC61317023C2FDC60E9C -:100EB50093DF0CF626D8BDD861317026DABDDAC2CB -:100EC500D7C161686BDC6BDDC0DD2F61DD717BFA3D -:100ED500CFE80080BEF4ADDCBEF6ADD8BEF0ADDA2D -:100EE500BEF2CFE800818FE8003103FAAEF0BDD83D -:100EF500AEF2BDDAF5E80061CDD7F6BDD8BDDAD7DB -:100F05008292DD2B61DD717BFACFE80080BEF0F6C1 -:100F1500BEF2BEF46208BEF6CFE800818FE800316C -:100F250003FAAFE0006072AEF0F5E80061CDD7607E -:100F350072F6B1D706DABDDAADDC06D8BDD861D810 -:100F4500A6DAD7D1DD17C1C3DAD89DD8ADDA311C01 -:100F550061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD94 -:100F65001BC1C3DADA9DDAADD8311E33311E3371B8 -:100F7500F9B4DADFF4BDD813BDDAC2C0D746D8DD7F -:100F85000771FF7177D971C0D75BDB9DDB605BDAD9 -:100F95009DDAADDC5BD9085BD808BDD8D7C3C7F3EC -:100FA500728EFDC162314C410036A44E1161A072B2 -:070FB500C09EFD62C6C2D719 -:0A0FF60031373A35363A3331000046 -:0A20000031373A35363A333100002B +:0A00CE00FFFFFFFFFFFFFFFFFFFF32 +:1000D800C7C1FBF8FFCEABACC736F00071F4C66100 +:1000E800D8710022F98EA89C018C015C10D1DD0A20 +:1000F8007110CEFB710022F9EF0B8C015C80D1618D +:10010800E8710022F98F22F931030EF6B1BBF661CE +:100118004900DD05618900EFF5FDE001FD3201FDD3 +:100128008A01FD6D02EFAEC0C6D7C7360000674C26 +:1001380009DE3F318E04F60FC1317B9EFDC4118963 +:100148007267318E04F64F14896142DF03F6EF01BE +:10015800E660610667318E124900207267318E04AD +:10016800F64F14896142DF03F6EF01E66061068706 +:10017800EFBC40F84F3A61E88666D161E8FDF106C8 +:10018800C6D751105B0C319E609F24F94024F901B9 +:10019800DF06CF0EF905EF04CF0EF9078F22F95CC1 +:1001A800E39F22F951035B04318EE7240000DD1040 +:1001B80023DD0823DF0E712022F9D7713022F9D709 +:1001C800714022F9D7717BFACEA010CEA180E5F359 +:1001D80000CEA408F5AAFFD78F22F9310508CD0073 +:1001E80003CD0307EF03CD0306CE23F88F22F931A1 +:1001F8000308CD0408F690BFB401CF1105F8F52126 +:10020800FFCE22E9CE24F3CE25F2CE26FCCE275F00 +:10021800CE2EFCCF120511CF350002CF370019CFF3 +:10022800530006CBEEFEFFCE3831CE3970CF3805FD +:100238000A308700BF1801BF1A01BF1C01BF1E0189 +:10024800D7C7C1C1FBF8FFCEABAC8C02D1DD1261C0 +:100258006902305C03BBF6614900DDEE618900EF9D +:10026800F51004C6D7FDC52FFD1339FDC904717AF1 +:10027800FAFDC523F520F98F22F93105135003FD46 +:10028800E72B625C01D161E8CF20F902CFD7FB648C +:10029800FDA530FD4145710223712BE7FD1639FD9F +:1002A800B83961EDEFF6D7D7C7F616FDC904717BEB +:1002B800FA31222108712221717AFAEF0B717AFA48 +:1002C800A7F647DFE9E2EF01F2C6D7C7C1C1FBF8DD +:1002D800FF17A1C1E0C18C0A70C18C0270FDFD023C +:1002E8001006D2DF05F545FBEF04CF45FB028C0174 +:1002F800721004C6D7C7C1FBF8FFFDB002D2DD03F8 +:10030800E2EF618B70FD1D04D2DD077123215202DB +:10031800EF528C0870FD3204FD7D048B6C0170FD7A +:100328003204300400BF2401301740BF1C013004E0 +:1003380000BF22018C0A91DF04F6BF2A01710BE28B +:10034800CE44FF3182E202EFFAAC0C148E4499617C +:10035800790C61690A8C0AD1DFDAFDA604710BE217 +:10036800712321F2C0C6D7C7C1FBF8FFFDB002D286 +:10037800DD03E2EF25710AE68B70FD1D04D2DD076F +:100388007123215202EF138C0870FD32048C0A701D +:10039800FD3204FDA604712321F2C0C6D7C7C1FBF4 +:1003A800F8FFFDB002D2DD03E2EF67710AE6710BD8 +:1003B800E28B70FD1D04D2DD077123215202EF523A +:1003C800710BE231122139C7343EFBAC0C165204D2 +:1003D8008B99A5A792DFF9C63184BD02EFFA717A2D +:1003E800BDCEB144CBB43EFB8C0A318EBEB8CEBB79 +:1003F80048714BE1714BE5710ABD8C089E44EF11C1 +:10040800710BE68C089E448C0A9F44FBAC0CBF42DF +:10041800FBF2C0C6D7C716FD550417FD3204D2DD5E +:1004280006FDA604E2EF01F2C6D7C716710AE67107 +:100438000BE2669E443182E202EFFAF6420401DDE5 +:1004480009AF0401BF0C01E2EF01F2C6D7AF2801E2 +:10045800085CFB08BF2801FDAF02AF28015CFBBFA9 +:100468002801300400BF2A01301780BF1C01300466 +:1004780000BF2201D7AF2401086C0408BF2401AFD4 +:1004880028016C0F086C0B08BF2801FDAF02AF2ACA +:1004980001085CFB08BF2A01FDAF02ED55043004DA +:1004A80000BF2401F6BF2A01300B0BBF2801FDAFA6 +:1004B80002300B0FBF2801FDAF02300F0FBF28011C +:1004C800D731342101D7712221710BBD0000717B16 +:1004D800BD713A25713A236A0E03713205713B25C5 +:1004E800713203713B23500AFD49027120F000FD6F +:1004F800AF02F6BF26015024BF1401CB44001430CC +:100508000F0FBF2801711321710BE2710AE6FD5527 +:1005180004CE44FF3182E202EFFAFDA604AF0401E3 +:10052800BF0C01712321713221D731242102EFFA46 +:10053800FD7D04713A25713A235A0EFC7133057119 +:100548003B25713303713B237128F000713321D7A8 +:10055800C7880616FDB002D2DD03E2EF38710AE65D +:1005680050A4FD1D04D2DD077123215202EF261786 +:10057800FD32046770FD3204FD7D0450A4FD320491 +:100588005020FD3204D946FBFD3204A046FBFDA6EF +:1005980004712321F2C6D7C72008FBF8FFFDEF0836 +:1005A8005014C15008FD2108C0CC07048C074C1416 +:1005B800DE0C8C07318EFD9009615907EFEECC07F0 +:1005C800048C074C1461C8ED8D06CC06008C064CD3 +:1005D8000461C8ED6C063026F9BC02F6BBCEABACA4 +:1005E80031B2D109C73641057184C6DEF3F1C73689 +:1005F80041057184C661DC9C05713BD1AC02148F46 +:1006080040059971505005617902617900F0E16106 +:100618004900DD09C73641057184C6DEC3F1C73616 +:1006280041057184C661DC0E059C055040C18C07EC +:10063800318E31AD128C06318E318D03BDD831FF2C +:10064800BDDADADAADD8FD5C0CC0D2DD0C5008C1D9 +:100658005014FD2108C0FD190B8C05D1DF06615926 +:1006680006EDD5058C07318EFD9409D2DD0C5008B6 +:10067800C15014FD2108C0FD190B8C05D1DF06619E +:100688005907EDC90571605005CC0400CC05008CF4 +:10069800054C09DE2B8C05318E04F61FC1317B9E7B +:1006A800FDC41189728C05318E04F64F148961429C +:1006B800DF03F6EF01E6600E049C04615905EFCFF5 +:1006C80041001140F81F3A61E86159048C04D1DFF8 +:1006D80008FD1A0BFD2C0CEF0C5008C15014FD211D +:1006E80008C0FD190B1008C6D7C72004FBF8FF7116 +:1006F8005B21CC0100F6BC02AC02440900DE3EAC32 +:100708000204F60F144100118972AC020C501489CE +:100718006142DF03F6EF01E6600E019C01AC0212B4 +:1007280049005072AC0204F67F14896142DF03F677 +:10073800EF01E6600E019C01617902EFBB40F67F94 +:10074800FF61F86159018C01D161F8EDEF07CC0127 +:1007580000717AFAFDC904711300711B207103033B +:10076800710205E0C15003FDD62BC05013FD4902AC +:10077800500FC1E0FDD62BC0CEABAC6159018C0146 +:1007880091DD068C014C03DF03E6EF01F66061FBA7 +:100798007151018C014C0861F8CC01003132070518 +:1007A800A05EFCEF03F55EFC405EFC11DC0DF55E1F +:1007B800FCF0C15003FDD62BC0EF12E6BC02F66177 +:1007C8004902DDB400000000617902EFF1CE37087C +:1007D800CBE4FFFFCBE6FFF7CED4FFCF370008F519 +:1007E800120561FDF5ABFFFDEF08D25008C15014AA +:1007F800FD2108C0D2FD190B1004C6D73184BD02F3 +:10080800EFFA717BBDCBE4FFFFCBE6FFFFCBD4FF54 +:10081800FF717ABED7717BBED7C7C1200CFBF8FF2A +:100828008C0C318E31ADC1317B9DD4C0BC068DD4CA +:100838009C088C149C0B8C14318E040C00128C0BAD +:10084800318EBDD813FDEB0E61C8EDEA08CEABAC16 +:10085800CC05068C0B318EFD8C09D2DD158C0B3145 +:100868008EFD90096169058C05D1DFE7FD1D08E261 +:10087800EF71CC0A008C0A4C04DE54F6BC02302618 +:10088800F9BBAC06148C089EFD118972AB146299F1 +:10089800AC06A1BC06617900617902F0E161490208 +:1008A800DFE05040C18C0B318E31AD128C0A318E95 +:1008B800318D03BDD831FFBDDADADAADD8FD5C0C75 +:1008C800C0D2DD06FD1D08E2EF1961590AEFA68CBA +:1008D8000B318EFD9409D2DD03E2EF0761590BED70 +:1008E8003E08F2100EC6D7C7717B9D717BFAFD04D6 +:1008F800083026F9FD3F0AFDCA09C6D7FDEF08FDF5 +:10090800190BFD1D08F5ABFFF2D7C73114070671A7 +:1009180010DBFBEF047118DBFB8FDBFB7F16FD762A +:10092800D1DD5F8FDBFB9F16FD4020F903DF2566D5 +:100938005C10D1DD1F7122208FDBFB5C10D1DD0B39 +:100948005080C15011FD0035C0EF095040C1501111 +:10095800FD0035C04020F903DD064020F904DF2200 +:10096800665C02D1DD1C8FDBFB5C02D1DD0B5040E5 +:10097800C15010FD0035C0EF095020C15010FD00D6 +:0409880035C0C6D7D9 +:10098C005208EF065203EF025206FEE600FE1B0071 +:10099C00DC16089F03088F0408089F040862FE24D5 +:1009AC0000089F0408EEBF00EEBA00C1C514410E4A +:1009BC0011D9D0FF118FD1FF312E45C4C0D7F231E0 +:1009CC00A2C401E2D79DE261DD4C09DF12717BFA12 +:1009DC00C18F06089F69FDC0CF060800EE270031C5 +:1009EC00F2FA04CF0608004C00DF05D50008DD162E +:1009FC0061DD717BFAD50608DD0ACDE31F61CD619F +:100A0C00CDEE160061CDFED40061FFFE9A00FCF81D +:100A1C00FF0EFEB20061CDFED5004C09DF0EC18F7A +:100A2C0006086F69FD9F0608C0EE0400CF0608009B +:100A3C00F8E3D75200EF025202FE3700CF68FD00F8 +:100A4C00CF060800BF0408C716629F0008410011BA +:100A5C008F22229B4100118F23229F0108C6510037 +:100A6C00FE62FFEF025205CF060800C1510CFE0AD0 +:100A7C0000C0D7C1511DFE0200C0D761DD717BFAE9 +:100A8C0070CEC0A59EC47CFF9EC4609EC461CDD7B1 +:100A9C0061DD717BFAC18EC45C1BFED6FFCF0608EC +:100AAC0001FED7FFC061CDD731F2FA1AC1AEE4BF57 +:100ABC005AFDAEE6BF5CFDAED4BF5EFD30FFFFBE9F +:100ACC00E4BEE6BED4C0D731F2FA11C1AF5AFDBEB6 +:100ADC00E4AF5CFDBEE6AF5EFDBED4C0D7C1BF6067 +:100AEC00FD13BF62FD15BF64FD17BF66FDC0D7AF18 +:100AFC0060FDDB62FDEB64FDFB66FDD7534B3052B2 +:100B0C005430324E323030475631323000FFC15003 +:100B1C00FEFEAB0061DD717BFACF060800FE0A0019 +:100B2C00FEA4FF61CDF8E3EECF00C7FB0408BF5A6B +:100B3C00FD8FC0009C05C5C337040600BF5CFD35A6 +:100B4C00367E0B300000522BFE6600C2C4C6302C21 +:100B5C000BB800300000B8022004AF5CFDB80030C8 +:100B6C000F00B802AF5AFD61FF520AFE3AFFECF8D3 +:100B7C00FF0E717BFAC1C7FB04088C05C65C80FEB6 +:100B8C000200C0D761DD717BFA70CFC0FFA59FC09A +:100B9C00007CFF9FC000609FC00061CDD7618BFEC1 +:100BAC00E2FF717BBE410011FB000017CEFC00611F +:100BBC00CB089EFDF31161C999A58392DFF7D7FE8F +:100BCC00B1FED568FDDF23C1CF0308035109FEF444 +:100BDC00FDC0D2DF37FE3800A20408CF030807514E +:100BEC0009FEE1FDD2B20408DF22C7FB0408318301 +:100BFC0002C6D7C6510AFECCFD624C1FDF06CF6879 +:100C0C00FD01EF04CF68FD00C0EE5BFEC0EE55FEAB +:100C1C00C7C1FB04088B31196C0161589BC0C6D746 +:100C2C00717BFAFE4DFEAF0408040600C114369029 +:100C3C000B300000522DF3FE77FF8FC000FE2BFE11 +:100C4C0061CF5C807C8073C0041900CEFC0F61CB3B +:100C5C00C55404EF03C55417FE18FEC7360008BB75 +:100C6C00629C0288089C03D1DD334C41DE2F70F16D +:100C7C00312DB161090033081C000851FF612A4174 +:100C8C000E118FD0FF613B118FD1FF6138DC0E8BC1 +:100C9C005C03DF0964C6C4FE2BFDEECAFDC6C4EEC0 +:020CAC00C3FD86 +:100CAE0061CF5100718C7109FECBF800FEFCCD01B5 +:100CBE0000F6BF00F953C0F693935820FEDFF941BA +:100CCE000036964E3424FDEF05118B99A7A51744D7 +:100CDE00CC4EDFF53602F93024FDEF04CC0000A730 +:100CEE0047DFF9410036CC4E345AFDEF05118B9992 +:100CFE00A7A51744CC4EDFF5365AFD305AFDEF044A +:100D0E00CC0000A747DFF9FCD80000EFFE61DD71D3 +:100D1E007BFABEF0ADD8BEF200AEF661CDD7C361A0 +:100D2E00DD717BFABEF0ADD8BEF200DBF6FFADDCB6 +:100D3E00BEF000AEF6BDD8AEF40312ADDABEF200D0 +:100D4E00AEF661CD03BDDAC2D7C3F33174D90883D1 +:100D5E00C1F626D8BDD8C031750683C312F623C29C +:100D6E00FD790D93DF0312F623C2D7440000DD2672 +:100D7E0061DD717BFACFE80080BEF6F6BEF4BEF2FE +:100D8E00ADD8BEF0CFE800818FE8003103FAAEF0A7 +:100D9E00F5E80061CDD7B1D7C3F33174D90883C15B +:100DAE00F626D8BDD8C0317505C312F623C2FDC7CD +:100DBE000D93DF0312F623C2D7440000DD2761DD59 +:100DCE00717BFACFE80080BEF6F6BEF4BEF2ADD867 +:100DDE00BEF0CFE800818FE8003103FAAFE000F5F6 +:100DEE00E80061CDD7ADD8D7C3F33174DB0F83C123 +:100DFE00F626D8BDD861317026DABDDAC031750D50 +:100E0E0083C312F626DCBDDC61317023C2FD2F0ECA +:100E1E0093DF0CF626D8BDD861317026DABDDAC262 +:100E2E00D7C161686BDC6BDDC0DD2F61DD717BFAD4 +:100E3E00CFE80080BEF4ADDCBEF6ADD8BEF0ADDAC4 +:100E4E00BEF2CFE800818FE8003103FAAEF0BDD8D4 +:100E5E00AEF2BDDAF5E80061CDD7F6BDD8BDDAD772 +:100E6E008292DD2B61DD717BFACFE80080BEF0F659 +:100E7E00BEF2BEF46208BEF6CFE800818FE8003104 +:100E8E0003FAAFE0006072AEF0F5E80061CDD76016 +:100E9E0072F6B1D706DABDDAADDC06D8BDD861D8A8 +:100EAE00A6DAD7D1DD17C1C3DAD89DD8ADDA311C99 +:100EBE0061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD2C +:100ECE001BC1C3DADA9DDAADD8311E33311E337150 +:100EDE00F9B4DADFF4BDD813BDDAC2C0D746D8DD17 +:100EEE000771FF7177D971C0D75BDB9DDB605BDA71 +:100EFE009DDAADDC5BD9085BD808BDD8D7C3C7F384 +:100F0E00728EFDC162314C4100368C4E1161A07261 +:070F1E00C09EFD62C6C2D7B0 +:0A0FF60031353A31363A3139000046 +:0A20000031353A31363A313900002B :10200A00AEF0B430B740BA30BB50BBB0BC50BD1014 :10201A00BD60BDB0BFE0C2B0C420C7B0CAE0CE1038 :10202A0001F0141014200630639049006E00777096 @@ -293,7 +285,7 @@ :10226A004E011926344453626E777D80807D776EE5 :10227A00625344342619100A08080808080808088E :02228A000A1038 -:10228C00D520F9DD0D8F31FDB031FDD1DF51CF31CE +:10228C00D520F9DD0D8F25FDB025FDD1DF51CF25F2 :10229C00FD1EFD4E23FDEC223142200D31042009A0 :1022AC0031020705713304EF03713204FD2723312A :1022BC00322003E6EF01F66061FB714102D504F9AF @@ -307,50 +299,50 @@ :10233C000A40D7FB3CDE04713320D7713220F511F3 :10234C00F9D7C72004FBF8FF710407E66130609CE5 :10235C00038F12F94E03DD5D8C039F12F98C03D1B0 -:10236C00DD137130DBFB5002C15011FD2035C0CFA5 -:10237C0004F932EF407138DBFBE0C15011FD203520 +:10236C00DD137130DBFB5002C15011FD0035C0CFC5 +:10237C0004F932EF407138DBFBE0C15011FD003540 :10238C00C0F504F917A1C15002FDBE2BC0D2DF0F5E :10239C008C01318E318D080E02081C00BF06F9AF7E :1023AC0006F944009BDC05D5D7FBDF095020C15052 -:1023BC0011FD2035C01004C6D7C78F30FD76FD093E +:1023BC0011FD0035C01004C6D7C78F24FD76FD096A :1023CC0024D523F9DD05710320EF30FDF22B664F88 -:1023DC0030FD61F83154201A715320FD5205664CC2 +:1023DC0024FD61F83154201A715320FDC904664C58 :1023EC0007DD0381DF098F22F9310303FD9924FDF9 -:1023FC00AD24710220308D25FDA139C6D7C771627D -:10240C00017172015005FDD2025008FD1538629F12 -:10241C0002F95009FD15386276716301711822F9C1 +:1023FC00AD24710220308D25FD6E39C6D7C77162B0 +:10240C00017172015005FD49025008FDE837629FC9 +:10241C0002F95009FDE8376276716301711822F9EF :10242C004002F9F1DC05E523F9EF244002F904DE62 -:10243C001BCF23F9025008C1506CFD5C03C092DF26 +:10243C001BCF23F9025008C1506CFDD302C092DFB0 :10244C000ED545FBDF09711022F9EF03F523F94096 :10245C0023F901DF05710A22EF06710B22710302C9 -:10246C00CF30FD075700674C08DE117309D221618C -:10247C004EDC06679F30FDEF0387EFEA4030FD0727 +:10246C00CF24FD075700674C08DE117309D2216198 +:10247C004EDC06679F24FDEF0387EFEA4024FD073F :10248C00DF09D523F961F8CF23F903C6D7500AFD2C -:10249C00D202304000C15006FDA12BC05096EDD2A7 +:10249C004902304000C15006FDA12BC05096ED49B9 :1024AC0002C72006FBF8FFD523F961E8ED8925303A :1024BC004A57C1503EFDA12BC0D2DD077100DAFB9B :1024CC00ED89257108DAFB17A1C15004C1500CC16C -:1024DC00506CFD86031006EB0CF9AA48318D12AA3C +:1024DC00506CFDFD021006EB0CF9AA48318D12AAC6 :1024EC0048318E616B08616A08C1500EFDA12BC08A :1024FC00F690C1500CFDA12BC0CC00008B4C04DE1F :10250C002731242102EFFA711221EB0CF98B5010B8 -:10251C00D605C15010C18BD6044000C1506CFD2EA5 -:10252C00041006615900EFD450A5FDD202EB0CF952 +:10251C00D605C15010C18BD6044000C1506CFDA52E +:10252C00031006615900EFD450A5FD4902EB0CF9DC :10253C00AA48318D12AA48318E616B08616A08C1B4 -:10254C00500EFDA12BC050A5FDD2025004C1506C01 -:10255C00FD5C03C0629C05EB0CF98A4B4E0561C314 +:10254C00500EFDA12BC050A5FD49025004C1506C8A +:10255C00FDD302C0629C05EB0CF98A4B4E0561C39E :10256C00048A4A4E0517A1C15004C1500CC1506CCD -:10257C00FD2E041006F6C1503EFDA12BC01006C660 +:10257C00FDA5031006F6C1503EFDA12BC01006C6EA :10258C00D7C78F13F94F02F961F8ED3E264015F9C4 :10259C0028DE06A015F9ED3E26F515F98F02F99FF8 :1025AC0013F98F02F95070D6123073512304800046 :1025BC001231FF318E039F14F99FD6FBF68F14F95D :1025CC007C804C95DC1D8F14F9318F241400EB0C9E -:1025DC00F9BDD8AA44FDB20D1231FF318E03318FF3 +:1025DC00F9BDD8AA44FD1B0D1231FF318E03318F8A :1025EC0016EF1B8F14F9318F241400EB0CF9BDD8A6 -:1025FC00AA46FDB20D1231FF318E03318F16EB0C52 +:1025FC00AA46FD1B0D1231FF318E03318F16EB0CE9 :10260C00F98A427217F3031644000171FE61C83651 -:10261C00FF001701DE02F61617BF78FCC7500CFD41 +:10261C00FF001701DE02F61617BF6CFCC7500CFD4D :10262C00A12BC0D2DF088F02F99F13F9EF047100C0 :10263C00DAFBF2C6D7C72006FBF8FF4023F901DF0F :10264C000BCFD7FB63CFD9FBC8ED97274023F902FB @@ -361,7 +353,7 @@ :10269C00C15004FDBE2BC0D2DD107100DAFB7103FA :1026AC0020F5D7FB710221ED6C278C04318E318D16 :1026BC00080E05081C00BF06F9EB0CF98A4072AF36 -:1026CC0006F9FD050FBF06F99C04D1DF08CC040107 +:1026CC0006F9FD6E0EBF06F99C04D1DF08CC04019F :1026DC00CC0500EF058F06F99C0517040200C150CC :1026EC0002FDBE2BC0D2DF788C029FD9FB8C02314D :1026FC008E318D080E03081C00BF06F94401A5DCC1 @@ -377,30 +369,30 @@ :10279C0004CFD7FB64FD282C8F18F94FD7FBDD2B0A :1027AC0040D7FB0BDE064018F90BDE1640D7FB06B4 :1027BC00DE064018F906DE0AD5D7FBDF0ED518F970 -:1027CC00DD095020C15011FD2035C08FD7FB9F185B +:1027CC00DD095020C15011FD0035C08FD7FB9F187B :1027DC00F9FD652C1006C6D7C7D90EF9C15002FDFC :1027EC00D62BC04024F90161F8712010055012FD60 -:1027FC00D2028F0EF96C0870C15002FDD62BC0505E -:10280C0003FDD2028F0EF96C1870C15002FDD62B4D -:10281C00C05016FDD2025003FDE72B625C01D1DDE6 -:10282C00107170DBFB5002C15013FD2035C0F2EF6C +:1027FC0049028F0EF96C0870C15002FDD62BC050E7 +:10280C0003FD49028F0EF96C1870C15002FDD62BD6 +:10281C00C05016FD49025003FDE72B625C01D1DD6F +:10282C00107170DBFB5002C15013FD0035C0F2EF8C :10283C0001E2C6D7C75004FDE72B625C03D1DD4033 :10284C005014FDD92834DBFB895C9F998A0C7CFFE2 :10285C0050FF5C14D1DD228A0C7CFF5C147234DFD7 :10286C00FB89616A997162075600316207058666B9 :10287C00D1DFF7716307716B2734EEFB895CEB9941 :10288C00712810055002FDE72BD2DD374024F901E9 -:10289C00DF05500AFDD2028F0EF96C1070C1500288 -:1028AC00FDD62BC0E0FDD202D90EF9C15002FDD6E7 -:1028BC002BC05033FDD202F0C15002FDD62BC0719B -:1028CC0078DBFBE0C15013FD2035C0C6D7C7C12053 +:10289C00DF05500AFD49028F0EF96C1070C1500211 +:1028AC00FDD62BC0E0FD4902D90EF9C15002FDD670 +:1028BC002BC05033FD4902F0C15002FDD62BC07124 +:1028CC0078DBFBE0C15013FD0035C0C6D7C7C12073 :1028DC0004FBF8FFCC02005004FDE72B629C038C38 :1028EC00045C20D1DD0E8C036C019C038C026C20EB :1028FC009C02EF138C045C10D1DD0C8C035CFE9CF1 :10290C00038C026C109C028C045C08D1DD0E8C03D1 :10291C006C029C038C026C089C02EF138C045C040C :10292C00D1DD0C8C035CFD9C038C026C049C028C32 -:10293C0003D1DD05501AFDD2028C0370C15004FD89 +:10293C0003D1DD05501AFD49028C0370C15004FD12 :10294C00D62BC08FDBFB5C9F728C03318E316D14E8 :10295C008C03318E314D616D08616C5C606162621B :10296C009FDBFB8FE7FB7CFF50FF5E02D1DD278FE7 @@ -409,19 +401,19 @@ :10299C00716307716B27F21006C6D7D9CFFBC150F4 :1029AC0006FDD62BC0D9D0FBC15007FDD62BC0D706 :1029BC00FDA729F2D7C7711300711B207103037196 -:1029CC000205E0C15003FDD62BC05013FDD202F01E +:1029CC000205E0C15003FDD62BC05013FD4902F0A7 :1029DC00C15005FDD62BC0500FC1E0FDD62BC05009 -:1029EC000AFDD2027103055008FDD202501FC1E04E -:1029FC00FDD62BC05012FDD2025003FDE72B625CBA +:1029EC000AFD49027103055008FD4902501FC1E060 +:1029FC00FDD62BC05012FD49025003FDE72B625C43 :102A0C0001D1DF03E2EF26F0FDE72B629F08F936D8 :102A1C0009F9C75008FDBE2BC05003C1FDD62BC011 :102A2C00710203711A20FD762BF503F9F2C6D7500B :102A3C0003FDE72B625C01D1DD155014FDD928FD97 -:102A4C0040285014FDD202E0C15003FDD62BC071BA -:102A5C001300711B207103035014FDD202F0C1E06E +:102A4C0040285014FD4902E0C15003FDD62BC07143 +:102A5C001300711B207103035014FD4902F0C1E0F7 :102A6C00FDD62BC0F0C15003FDD62BC0D7C7200418 :102A7C00FBF8FFCC02008F03F99C035010C150A44B -:102A8C00FD5C03C0629F03F9D545FBDD04F2ED53F9 +:102A8C00FDD302C0629F03F9D545FBDD04F2ED5383 :102A9C002B8C037F03F95C08D1DD108F03F95C08E4 :102AAC00D1DF05CC0210EF03CC02208C037F03F99D :102ABC005C04D1DD168F03F95C04D1DF088C026C49 @@ -430,20 +422,20 @@ :102AEC00FF50FF5E029C02D1DD1F34DEFB896E02BB :102AFC0099716207CC0100316207086159018C01A0 :102B0C00D1DFF4716307716B278F03F95C40D1DD62 -:102B1C00095002C15012FD2035C08F03F95C01D160 -:102B2C00DD08E0C15012FD2035C0717AFA8F03F92F +:102B1C00095002C15012FD0035C08F03F95C01D180 +:102B2C00DD08E0C15012FD0035C0717AFA8F03F94F :102B3C005C41D1DD113403F9895CBE99D903F9C12B -:102B4C005010FDE105C0F21004C6D7FDE427F2D702 +:102B4C005010FD5805C0F21004C6D7FDE427F2D78B :102B5C00FD4028F2D7C78FEEFB7617FDD928664FBC -:102B6C00EEFBDFF2F5EEFBF2C6D75064FDD202406D +:102B6C00EEFBDFF2F5EEFBF2C6D75064FD490240F6 :102B7C00D7FB0BDE03E6EF01F66061FB711120F170 -:102B8C0071142061DC70C15012FDE105C0FDD4361A +:102B8C0071142061DC70C15012FD5805C0FDB436C3 :102B9C00CF3DFC03D7C7C1C1FBF8FFAC0ABB17C1C3 -:102BAC005002C18C0270C1506CFD2E041006100432 +:102BAC005002C18C0270C1506CFDA50310061004BC :102BBC00C6D7C7C1FBF8FFAC08C15002C18B70C1AE -:102BCC00506CFD86031006C0C6D7C7880616677002 -:102BDC00C1C75084FDF8031004C6D7C716C750846C -:102BEC00FD5C03C0C6D7C74030FD04DE045600EFC1 +:102BCC00506CFDFD021006C0C6D7C788061667708C +:102BDC00C1C75084FD6F031004C6D7C716C75084F5 +:102BEC00FDD302C0C6D7C74024FD04DE045600EF57 :102BFC000256014024F901DF048686EF0A4024F9CD :102C0C0002DF045104610666318F12504CD63351E9 :102C1C004CD6610A040A20BF0CF9C6D740D7FB5129 @@ -454,7 +446,7 @@ :102C6C0020D740D7FB0BDE03E6EF01F66061FB716A :102C7C00712071142071772061C831622017716244 :102C8C0020717420711120F171742061DC70C150BD -:102C9C0012FDE105C0D77100010571785005713A3C +:102C9C0012FD5805C0D77100010571785005713AC5 :102CAC00D5713BD1713ADD713BD98F10055CFC9F1E :102CBC001005CF54054AE5420571104205710042DA :102CCC0005714850057130500571205005CF5305E2 @@ -468,8 +460,8 @@ :102D4C00055CFC9F110571603002D77178300271FF :102D5C0048F000D7C788061666614FDD0967614EDB :102D6C00DE0396EF01866672C6D7C7161714AA043F -:102D7C0012A943DD29AA0412A923FDE64EC3AC0215 -:102D8C00FDE64E13C2BDD813FD820FDE0C1714AA3C +:102D7C0012A943DD29AA0412A923FDCC4EC3AC022F +:102D8C00FDCC4E13C2BDD813FDEB0EDE0C1714AAEE :102D9C000212AA0403BA04EF051714A9BA04AC046E :102DAC001231FF319E03317F087208C6D77100F2D1 :102DBC0000304400BFB601300188BF900130098457 @@ -490,7 +482,7 @@ :102EAC00B266FFCFACFB03D7C7161714F6B9AA044A :102EBC0012F6231231FF31AE03316FBA02C6D7C7F7 :102ECC00C1FBF8FF8C085080D612AB1413B9AB14AD -:102EDC00AA0412A92312D949FBF133BDD813FDEE74 +:102EDC00AA0412A92312D949FBF133BDD813FD570B :102EEC000DBA02C0C6D731642101D74020F902DFE8 :102EFC0010F6BE64BE6EBE6ABFB6FBBFBCFBBFC2E3 :102F0C00FB3154211530B2FBFDB42E30B8FBFDB4AF @@ -519,493 +511,492 @@ :10307C00FF36C4FB52078B99A5A792DFF9710B9E03 :10308C0031242213712322717B9E8F04FC9E9A8F14 :10309C0005FC9E9B717A9EC6D7CFCFFB5CCFD0FB35 -:1030AC005FCFF0FB5DCF24FC36CF25FCC9D7C7CF53 -:1030BC00CCFB11CFCDFB40CFF4FBFFF5F5FBF5F6C8 -:1030CC00FBF5F7FBF5F8FBF5F2FB5600664C64DEFE +:1030AC005FCFF0FB5DCF24FC36CF25FCC9E523FCBC +:1030BC00D7C7CFCCFB11CFCDFB36CFF4FBFFF5F54B +:1030CC00FBF5F6FBF5F7FBF5F8FB5600664C64DEFA :1030DC0008723848FB0086EFF3C6D7C78806161768 -:1030EC00F1E73402002361E3ED4E342361F8EDDBAC -:1030FC0031B12361E3EDE23124030061F8EDF131EC -:10310C0024070024070061D8ED4E34240B0061F82D -:10311C00ED12322361F8ED59322361F8ED2632239A -:10312C0061F8ED00342561F8ED50342361F8ED3A87 -:10313C003424030061F8EDC232B124030061D8EDF0 -:10314C00E33224000061F8EDF0322361F8ED4E34E7 -:10315C00252361E3ED18332361F8ED29332361F85E -:10316C00ED3A332361F8ED29332361F8ED4B33232A -:10317C0061F8ED5C332361F8ED6B332361F8ED8D71 -:10318C00332361F8ED99332361F8EDA5332361F80E -:10319C00EDAE33252361E3ED4E342561F8EDB73305 -:1031AC002361F8EDC43324030061F8EDD133240A14 -:1031BC000061F8EDDD3324090061F8ED14342409C5 -:1031CC000061F8EDFA332361F8EDE833ED51346723 -:1031DC009FCEFBED5B3430BC29FDA13966736718BB -:1031EC00CCFBED5B3440D1FB6ADF1440D2FB68DFD3 -:1031FC000E674C6CDF09307942FDA139713AD56705 -:10320C009FD3FBED5B3467D1DD0630263EFDA13943 -:10321C0034ECFB89616F99ED5B34675C02D1DD089E -:10322C0030572BFDA139EF0C675C01D1DD06305C0A -:10323C002BFDA139675C3CD1DD1030612BFDA13930 -:10324C00675C3C7266736218CCFBED5B3467D1DD56 -:10325C00625C01D1DD05300800EF01F6609F2BFCAC -:10326C00675C02D1DD03E6EF01F6342BFC89616863 -:10327C0099675C04D1DD04E6A1EF01F6342BFC89DF -:10328C00616899675C08D1DD05302000EF01F634E8 -:10329C002BFC89616899675C10D1DD05301000EF5B -:1032AC0001F6342BFC89616899675C20D161E87167 -:1032BC00602BFCED5B34D51AF9DF09679FF5FBA099 -:1032CC001AF9EF10401AF905DE0AE91AF9671861C4 -:1032DC00FDA01AF9ED5B34675C0F7266736218CC53 -:1032EC00FBED5B34401AF964DE1F401AF901DF066E -:1032FC0067D161F85701E91AF9671848FBA01AF968 -:10330C00401AF90561C8717221ED5B34675C7F70FE -:10331C00C117F1243000FD4130C0ED5B34675C3FD8 -:10332C0070C117F1243000FD4130C0ED5B34675C97 -:10333C000770C117F1243000FD4130C0ED5B3467DC -:10334C005C1F70C117F1243000FD4130C0ED5B34BF -:10335C006770C117F1243000FD4130C0ED5B34CEF5 -:10336C00ABAC710A9E31929E02EFFAD592FFDF054B -:10337C00710B9EEFED679E99710B9E9F03FCED5BAD -:10338C0034712222675C7F9F04FCED5B3471222236 -:10339C00675C3F9F05FCED5B34675C3F9F06FCED73 -:1033AC005B34675C1F9F07FCED5B34309F3BFDA1DA -:1033BC0039679F0CFCED5B34305A3BFDA139679F9C -:1033CC000DFCED5B34307C3BFDA139679F10FCEFAD -:1033DC007E675C01D161E8FD6845EF734026FCC84F -:1033EC00DE0AE926FC671876FAA026FCEF61679FD7 -:1033FC0026FCEF5B67318E247200DF06308D09FDF1 -:10340C00A139679FEFFBEF47675C01D1DD03E6EF66 -:10341C0001F66061FB711102675C02D1DD03E6EF1E -:10342C0001F66061FB712102679F23FCEF218FF293 -:10343C00FB617F5C10D161E8CF3DFC03679FF2FB21 -:10344C00EF0DEF0B00664C5ADE05736718CCFBC60C -:10345C00D7C716664C30DC094C37DE05FD1C30EF47 -:10346C0073664C02DF1F8FCEFB5C03728F2DFC5CEE -:10347C0003318E316D08616A08128F2DFC5C80312E -:10348C002A6162EF5E664C3DDF0AAE90BF28FCF904 -:10349C0028FCEF4F664C3EDF05F929FCEF45664CE6 -:1034AC004FDF05FD8B45EF3B664C61DF09E926FCE0 -:1034BC000976FA72EF2D664C7FDF05FD963EEF2301 -:1034CC00664C4EDF0F31742305301000EF01F60807 -:1034DC007208EF0F664C5ADC0452FFEF0666730954 -:1034EC00CCFB72C6D7C788061617F124100024052A -:1034FC0000DC07244C00DD17EF18717BFA17F10480 -:10350C00CCFB1489617F99717AFA713222EF03A096 -:10351C0026FCC6D7C7C1C1FBF8FF4020F903DD0666 -:10352C004020F904DF2F8C027309D4FB5E0AD1DF33 -:10353C00248C02318E04CCFB14896E0A99716207BB -:10354C00CC0100316207086159018C01D1DFF471A3 -:10355C006307716B271004C6D7CF2DFC03F52BFC2A -:10356C00F52FFCF531FCD7C788061617F1E73402A6 -:10357C000025DD3E23DD1825DD1D23DD0523DD2C97 -:10358C00EF3C716222679F30FCCF3DFC03EF2F674D -:10359C005C839F2DFCEF27675C039F2FFC675C030C -:1035AC004C0261F8711224FD8047EF12679F31FCC9 -:1035BC00EF0C6791DF08E0C15012FD2035C0C6D773 -:1035CC00C71617F1E7240000DD2A23DD1E240300B3 -:1035DC00DD0724FB00DD24EF2531020705308000D8 -:1035EC00EF01F6086F2EFC7208EF198F2BFCF52BF0 -:1035FC00FC72EF107152235235EF09F2EF0666732D -:10360C00092AFC72C6D7C71617F1E7240000DD386B -:10361C00241000DD1C23DD1C23DD30240E00DD18FE -:10362C00241100DD1B240F00DD12243000DD15EF0A -:10363C001EE2EF1D5202EF195204EF155206EF1164 -:10364C005205EF0D5207EF09F2EF065203EF02524B -:10365C00FFC6D7C7314422417143228F3CFC9FD413 -:10366C00FB8F3BFC9FF3FB363AFDC7D93BFCFD4679 -:10367C0038618A70618AFD8B38C0D940FCF1312FDA -:10368C00609F3FFC8F3AFC4F3FFCDD0D7152228F47 -:10369C003FFC9F3AFCCF3DFC03403DFC05DE0A306D -:1036AC00E136FDA139CF3DFC6BB03DFC7150F00013 -:1036BC00CE300BCF170006CE3106FD3803717A30B1 -:1036CC00710BE3710BE7C6D78F3FFC9F3AFC8F3F22 -:1036DC00FC9FD5FBD7C74020F903DF064020F90437 -:1036EC00DF04F2EDC1378FF2FB5C10D1DD0D008FE2 -:1036FC003FFC9F44FC7148F2FBEF4B3154220E719E -:10370C0053227173228F3FFC9F44FCEF39316422AA -:10371C0023716322717222D530FCDF05F545FCEF75 -:10372C000B8F30FC5002D6A1609F45FC8F45FC9F4F -:10373C0044FCEF12317422088F45FC9F44FCEF06C9 -:10374C008F3FFC9F44FC8F44FC9FD5FBD544FCDF92 -:10375C0005F530FCEF1A4044FC05DE06CF30FC02C8 -:10376C00EF0ED944FCF11231FE03311F609F30FC87 -:10377C008F47FC4F30FCDD23571F8F30FC9F47FCDD -:10378C005600664C08DE1073091A224F30FCDC041C -:10379C006677EF0386EFEB679F3EFC8FF2FB5C01D5 -:1037AC00D1DD03F2EF0FE944FC09DA2170C15013AB -:1037BC00FDE105C0F2C6D7C7168B728C01614ADEDB -:1037CC00248B728C02614ADE188C01728C02614A65 -:1037DC00DE068C01318EEF048C02318E087208EFFC -:1037EC00268B72EF228B728C02614ADE048B72EF95 -:1037FC00168C01728C026142DE068C01318EEF0454 -:10380C008C02318E087208C6D7C716710AE7710B85 -:10381C00E37150F000CE300BCF170006669E31FDE1 -:10382C003803717A30710BE33182E302EFFA8D1FAA -:10383C007158F000710BE772C6D7C7C1C1FBF8FF16 -:10384C008F24FC4E02DC03F2EF318C024F25FCDCA2 -:10385C000452FFEF268C022F24FC706131318D1243 -:10386C008F25FC2F24FC70613133BDD813FD100E55 -:10387C00BB440001DC03F690BB8B721004C6D7C7A7 -:10388C00C1C1FBF8FFAC0A14A91489708C02612821 -:10389C00706131FDE64E1344030071FEDC24AC0A6A -:1038AC00148A04819A04AC0A148A044C11DC11A900 -:1038BC00148C0299AC0A14CA0200AC0A14CA031084 -:1038CC00EF74AC0A14CA0400AC0A14A914894E0291 -:1038DC00DE0AAC0A148A02819A02EF13AC0A14A90C -:1038EC0014894E0261D308AC0A148A02919A02AC74 -:1038FC000A148A03919A03D1DF3CAC0A148A024C55 -:10390C0010DF10A91489318EA112AC0A14A914620B -:10391C0099EF17AC0A148A024CF0DF0EA914893106 -:10392C008EB112AC0A14A9146299AC0A14CA020022 -:10393C00AC0A14CA03101004C6D7ED8C39717BFA8B -:10394C00C7D552FC61F83104233071042371212353 -:10395C00710323D552FCDD06B052FCCEABAC717AB0 -:10396C00FA5600664C0ADD1272F3311C7940FDCE1A -:10397C00FC0061CAFDEB3986EFE9717AFAF2C6D721 -:10398C00C75600664C0ADE0BF0317E12F67854FCFA -:10399C0086EFF0C6D7C7C1C1FBF8FFCC01008C0184 -:1039AC004C0ADE36717BFA8C01F0317E0454FC1427 -:1039BC00A96168DF09AC02B9717AFAF2EF1D8C01CA -:1039CC00F0317E127954FC614902DF06717AFAE219 -:1039DC00EF09717AFA615901EFC4E21004C6D7C736 -:1039EC002004FBF8FFF64254FC61F8EDD03A717BF1 -:1039FC00FA9C038C034C0ADE3C8C03F0317E04549D -:103A0C00FC14A96168DF05717AFAEF29717AFA8CD6 -:103A1C000372F3311C7954FCCEFC0061CA629C0227 -:103A2C00D1DF0A8C03F0317E12E67854FC717BFAFC -:103A3C00615903EFBECC0200CC01018C02F0317E47 -:103A4C000454FC14A96168DD7B8C02F0317E127980 -:103A5C0054FCE743DF688C014C0ADE628C01F031C8 -:103A6C007E127954FCE743DD50717BFA8C01F03106 -:103A7C007E0454FC14A96168DF1B616901717BFA37 -:103A8C008C01F0317E12F67854FC717AFA8C024E6D -:103A9C0001DCE7EF2F8C01F0317E0454FC14A912E9 -:103AAC008C02F0317E337854FC8C01F0317E12E6BE -:103ABC007854FC615902717AFA615901EF98615995 -:103ACC0002ED473A00F21004C6D7C72006FBF8FFF8 -:103ADC003411FCC55006C150A8C15030FD860310EE -:103AEC0006D2DD1DA068FC4068FC08DE03E2EF5A3C -:103AFC00340CFC895CFC99FD9F3B7110DAFBF2EFF6 -:103B0C0049F568FC8F0CFC5C01D1DD264020F903E3 -:103B1C00DF205010C180FD2035C0C736100571D490 -:103B2C00C6DE0F17C15006C150A8C15030FD860328 -:103B3C0010064020F901DD114020F905DD0B8F0C3A -:103B4C00FC5C02D161E8FD7E42F21006C6D7D90DAD -:103B5C00FCC15030FD5C03C0629F10FC7130DDFB7A -:103B6C008FE5FB5C08D1DF06716307716B27F2D719 -:103B7C00D910FCC1D90FFCC15030FDF803100471F1 -:103B8C0030DDFB8FE5FB5C08D1DF06716307716BE1 -:103B9C0027F2D7C7200AFBF8FF500FC15030FD5C4D -:103BAC0003C04045FB02DF077110DAFBF2EF5F71D7 -:103BBC0018DAFBCC07004023F901DF05CC0802EF33 -:103BCC0003CC0810CC09808F0CFC5C03D1DF08718E -:103BDC007AD5CC0607EF06717BD5CC062F170406D9 -:103BEC0000C15004C150A0C15030FD2E041006C7B6 -:103BFC0036100571D4C6DE154020F903DF0F17C14E -:103C0C005006C150A8C15030FD86031006F2100AB0 -:103C1C00C6D7C74020F902DF04F6BF6CFCB054FDD8 -:103C2C00D554FD61E8ED923DCF54FD048F20F93160 -:103C3C008FE723DD0B24020024030061C8ED923DC5 -:103C4C008F22F9312346301B00426CFCDF0AE0C1A5 -:103C5C005010FD2035C0EF20307701426CFCDF188E -:103C6C005002C15010FD2035C0F64272FCDF098FA6 -:103C7C00F0FB5010D6BF72FCF64272FCDD40B27203 -:103C8C00FCE64272FCDF37710221EF32301B00423E -:103C9C006CFCDF16F64274FCDF1BE0C15010FD20FB -:103CAC0035C030E803BF74FCEF0B307701426CFC7D -:103CBC0061F8710221F64274FC61E8B274FC313493 -:103CCC000709713323F6BF6CFCEF1731342306F66A -:103CDC00BF6CFCEF0DA26CFCF6426CFCDF04B1BFB8 -:103CEC006CFC8F23F9318FE7240000DD0623DD0DFA -:103CFC0023DF1236100571C4714123EF0B710402DE -:103D0C00714123EF037142233142231D406EFC06A7 -:103D1C0061D8A06EFC406EFC05DF11A06EFC500457 -:103D2C00C15010FD2035C0EF03F56EFC3144231D4E -:103D3C004070FC0661D8A070FC4070FC05DF11A03F -:103D4C0070FC5008C15010FD2035C0EF03F570FC1D -:103D5C00D571FCDD05B071FCEF2C3142071B406FB7 -:103D6C00FC0661D8A06FFC406FFC05DF0FA06FFC58 -:103D7C005010C1FD2035C0EF03F56FFC406FFC0601 -:103D8C0061F8CF71FC25C6D7C736100571D4DE0794 -:103D9C0030D63AFDA139D24020F903DF1D3122077C -:103DAC000630792AFDA1393154230C7153235080EC -:103DBC00C15012FD2035C0FDCB3DFDF83DC6D78F5F -:103DCC002DFC5C01D1DD24D577FCDD04B077FCD76C -:103DDC00CF77FC098F3EFC4F76FCDD0F8F3EFC9FAE -:103DEC0076FC5040C15012FD2035C0D74020F9035D -:103DFC00DD04F6BD1AD7D5F8FBDF08F6461ADD1937 -:103E0C00B61AD7D9F4FBF1461ADD0ED9F4FB12AD74 -:103E1C001A43DE03A61AD7B61AD7C78FECFB76F572 -:103E2C00ECFB5C10D161E8716223665C0FD1DD574D -:103E3C00665C01D1DD05F520F9EF4C665C02D1DD45 -:103E4C0011E0C15003FDD62BC0711300711B207102 -:103E5C000303665C04D1DD11711300711B20D52D99 -:103E6C00FC61F8710303FD6535665C08D161E8718E -:103E7C0003035005FDD2027102035003C1FDD62B82 -:103E8C00C0711A20FD762BF2C6D7C7200AFBF8FFAB -:103E9C00401AF90ADC0452FFEF618F22F931150543 -:103EAC00300400EF0F8F22F9314505300500EF0487 -:103EBC00D923F9F1609B8F08F99C018F30FD9C028E -:103ECC008F09F99C038F0AF99C048F78FC9C058F51 -:103EDC0002F99C06714420E661301271042061DC09 -:103EEC0031196162629C07CC08018F24F99C09A0EE -:103EFC001AF9D91AF9F1B107148972100AC6D7C781 -:103F0C008F20F9318FE724000061F8EDD74023DDD5 -:103F1C001B2361F8EDE53F2361F8ED5B402361F86D -:103F2C00EDA6402361F8ED7341EDD440D521F9DFC6 -:103F3C002CF6426CFCDD05F556FDEF03A056FD405A -:103F4C0056FD65DC0ACF20F905710223EDF141AF76 -:103F5C006CFC440A0061D8EDF141E521F971322382 -:103F6C00F556FDF5EFFBFD5205715320FDC52340C1 -:103F7C0023F903DF09710223F520F9EDF141FD412D -:103F8C002640D9FB9BDE09710223F520F9EDF141A6 -:103F9C00714A277140110571301105713A22715A1D -:103FAC002271501105FDC129D2DD09710223F520C2 -:103FBC00F9EDF14171103500CF37001D714012053C -:103FCC004021F901DF05F5F5FBEF04CFF5FB03CF3D -:103FDC0020F902FDA729EDF141FDA22CFD022D7166 -:103FEC004A9DFD6535FDBA30F537FF712BE0F521A3 -:103FFC00F9710223CBE43FEFCBE6F6F0FD520571ED -:10400C003BD48F22F93105285004FDE72B625C0369 -:10401C00318E315D34DBFB896168995002FDE72BF1 -:10402C00D2DD067170DBFBEF047178DBFBFDC52381 -:10403C00FDB92D710822F9CF20F9038FCEFB5C025C -:10404C00D1DD095080C15010FD2035C0EDF141FD8E -:10405C00F34131642331A07AFCD57AFCDD0831A41C -:10406C00E00A31020C06712BE0FD694231A4E01725 -:10407C0031040C13712BE05027C15005FDD62BC019 -:10408C00CF20F904710223FD5E428F22F9312507FE -:10409C0031040703F520F9EDF141FDF34131020C38 -:1040AC0014F0C15005FDD62BC05005FDD202FD69A0 -:1040BC0042CF20F903FD5E428F22F93125073104EE -:1040CC000703F520F9EDF141F520F9CFF5FB03F5E8 -:1040DC00F6FBF5F8FB715221F6426CFF61E8EDF14D -:1040EC0041F6BF72FC710321F50CFCFD9F3BFD1FDB -:1040FC002EFDF92CFD572D714B9DF5DCFBF5DDFBF1 -:10410C00F5DEFBF5DFFB31242102EFFACE3708CBCD -:10411C00E4BFFFCBE6FFF1CED4FFCF3700097148E7 -:10412C001205F6BEE0BEE2BED0716A27FD3B2A71D5 -:10413C004307714B277148100571481105713810F0 -:10414C000571381105713302713B22715302715B99 -:10415C00227158100571581105FDBB05CF20F905CA -:10416C00713223F6BF6CFCF521F931020729FDC52C -:10417C0023AF6CFC440A0061C8E520F9D523F96132 -:10418C00E8FDBB058F22F931255B502EFDD202E5EF -:10419C0021F9E520F9EF4ED504F9DF49FDBB05FD0A -:1041AC004E237173017132047143027103207152F9 -:1041BC002031949E02EFFA712AE7CEA409F5F300A0 -:1041CC003104070261FDE5F300CEA40831040709B0 -:1041DC00713323E520F9F556FD712BE78F22F93168 -:1041EC002503F520F9C6D7D57BFCDF1A3102001563 -:1041FC005003FDE72B625C01D1DF07F520F971025A -:10420C0023D7E57BFCD7407BFCF0DF083104004171 -:10421C00F57BFCD7407BFCC8DF0BF520F971022342 -:10422C00CF7BFCF0D73102000A407BFCFFDD22A0E3 -:10423C007BFCD7F0C15004FDD62BC08FDBFB5C9F01 -:10424C009FDBFB7110ECFB30263EFDA139CF7BFCD4 -:10425C00F0D731042106F520F9710223D7716323BD -:10426C00F57AFC717207FD3803717307D7FD2806C8 -:10427C00F2D7C7200CFBF8FF8F12FCF0F911FCF3FE -:10428C0003FDE64E13BC048F14FCF0F913FCF3038E -:10429C00FDE64E13BC028F16FCF0F915FCF303FD82 -:1042AC00E64E13BBAC04BDD8F6BDDAAC04311EBD72 -:1042BC00DCF6BDDEFDC30DADD8BDDCADDABDDEACCC -:1042CC0002BDD8F6BDDAAC02311EDADCC3DADEC3CD -:1042DC00BDDCF6BDDEFDC30DC0BDDEC0BDDCADDE9C -:1042EC00FD390FADD8BDDCADDABDDEABBDD8F6BD4A -:1042FC00DAAB311EDADCC3DADEC3BDDCF6BDDEFDC3 -:10430C00C30DC0BDDEC0BDDCADDEFD390FDADAADEC -:10431C00D8FD7E46C3C58F1AFD5C3FF0317E049AF2 -:10432C00FC14C2C0B9A01AFDF6BC08BC0A9C078CD0 -:10433C00074C2EDD3E8F1AFD0E0770F161DC605CC0 -:10434C003FF0317E12799AFCBDD8F6BDDA8C07733A -:10435C00092422318FBDDC70BDDEFDC30DAC08BD60 -:10436C00DCAC0AFD390FADDABC0AADD8BC0861591A -:10437C0007EFBCAC08BDD8AC0ABDDAC9DC0004F64A -:10438C00FD8D0EC9DCFFFFF6FD8E0FADD8BF94FC82 -:10439C00AF8EFC4294FCDD12AF90FCBF92FCAF8E52 -:1043AC00FCBF90FCAF94FCBF8EFCAF90FC4292FC27 -:1043BC00DC50AF8EFC4290FCDE48AF58FD428EFCC8 -:1043CC00DE40405CFD16DC1F405CFDA0DE168F96C7 -:1043DC00FC4F5CFDDE0EAF8EFC2298FC4469106134 -:1043EC00C8FD5744F55CFDAF8EFC445146DC0BAF69 -:1043FC008EFC241027BF5AFDEF1930F82ABF5AFD46 -:10440C00EF11405CFDFFDD03E6EF01F6345CFD8946 -:10441C00610899AF92FC4290FCDC1BAF90FC428E81 -:10442C00FCDE13AF8EFC425AFDDE0BF596FCAF8E14 -:10443C00FCBF98FCEF114096FCFFDD03E6EF01F6A4 -:10444C003496FC89610899100CC6D7717BFAC77138 -:10445C000A9E31929E02EFFA8E949F86FC8E969F56 -:10446C0087FC8E979F88FC8E989F89FC8E939F8AE1 -:10447C00FC8E929F8BFC710B9E717AFA8F89FCFDDE -:10448C00A20F76FDFC4513BF8CFCD517FCDF0AD5BB -:10449C0018FCDF05D519FCDD2CF6B1428CFCDF17BE -:1044AC00665C0391DF03E6EF01F6046D01313D120A -:1044BC000103B1BF8CFC9617FD1F4713FD36453128 -:1044CC00742302EF63520692926986FC687EFCDFCD -:1044DC00F6AF8CFCBF84FCF97CFCF3311C7926F91B -:1044EC0044FEFFDD43D97CFCF1010426F914A944F8 -:1044FC00FFFFDF04E6B9EF0CD97CFCF1010426F9CF -:10450C0014A9A1B9A017FCD517FCDF1CA018FCD569 -:10451C0018FCDF14A019FCD519FCDF0CCF17FCFF1D -:10452C00CF18FCFFCF19FCFFC6D7C716D97CFCF1FE -:10453C000744A800DC05717223EF1FF647DD1BA0B2 -:10454C007CFC407CFCA8DC05717223EF0DF97CFC33 -:10455C00F3311CF67826F9B7EFE1C6D7C756A89603 -:10456C0066F0317E12F6B17826F966D1DFF1F517D7 -:10457C00FCF518FCF519FCF57CFC717323C6D7C748 -:10458C002004FBF8FFD51AF9DF188F7CFC9F1BFD6C -:10459C00717BFA52069292697EFC681CFDDFF67103 -:1045AC007AFA401AF906DE10E91AF9091CFD9C0387 -:1045BC00A01AF98C0372EF34F91BFDF3311C792628 -:1045CC00F9BB310224058B9C03EF128C019C03D5A3 -:1045DC001BFDDF06CF1BFDA7EF03B01BFD71807128 -:1045EC00072461DC61FB7101248C03721004C6D7B3 -:1045FC00C72008FBF8FF8F89FCFDA20F9C078F8852 -:10460C00FCFDA20F9C068F87FCFDA20F9C058F86DC -:10461C00FCFDA20F9C048F8AFC9C038F8BFC9C02DC -:10462C008C06318E0112795222BB8C075C03D1DFD0 -:10463C00098C064C0361C86179008C05318EB1611F -:10464C000900BB313D120103BB8B0E04708C011CA5 -:10465C0000BB8F1CFC4E03DC0E8C034F1CFCDC0BD4 -:10466C008C024F1DFCDC04AB12EF03ABB112100833 -:10467C00C6D7C7C3C12008FBF8FFF661490A61F829 -:10468C00614908DF07F7340000ED1B47E6BC04F670 -:10469C00BC06AC0ABC02AC08BBAC06614902AC045B -:1046AC0061F8614900DE28AC04BDD8AC06BDDAE186 -:1046BC00FD480FADDABC06ADD8BC04ABBDD8AC021E -:1046CC00BDDAE1FD630FADDABC02ADD8BBEFCAAC0D -:1046DC0006BC02AC04BBAC08BDD8AC0ABDDAAC0459 -:1046EC00BDDCAC06FDC60EAC04BDDCAC06FD390F62 -:1046FC00E1FD630FADDABC06ADD8BC04AC06614974 -:10470C0002AC0461F8614900DCC5AC0214AB1210B8 -:10471C000CC6D7C7168F81FCFDA20F77614EDF2226 -:10472C00AF84FC428CFCDE09AF8CFC2284FC12EFC3 -:10473C0041F6428CFCDF084284FCDD03E7EF33F7E3 -:10474C00EF3017F1B11267318E43DF1B665C0391BA -:10475C00DF03E6EF01F6046D01313D120103228403 -:10476C00FC028CFC12EF0B67614EDE0532A900EFE8 -:10477C0001F7C6D7717BFA3112240CF64224FDDD09 -:10478C0006B224FDED1F48711324717AFA4020F90A -:10479C0004DF08715307F560FDEF78D9F7FBF1E7FB -:1047AC00240000DD0F23DD1C23DD1123DD6223DD5E -:1047BC002E23DD43715307F560FDEF57715207F55A -:1047CC0060FDEF4FD560FDDF08715207E560FDEF2E -:1047DC0006715307F560FD30FA00BF24FDEF34D5A8 -:1047EC0060FDDF0E715207E560FD30FA00BF24FD5D -:1047FC00EF21F5F7FBEF1CD560FDDF0E715307E5DC -:10480C0060FD30FA00BF24FDEF09CFF7FB02EF0388 -:10481C00FD2048D7D92FFCF1E7240000DD0923DD6A -:10482C002723DD0A23EF21715307F560FDD7D560EF -:10483C00FDDF08715207E560FDEF06715307F56067 -:10484C00FD302D02BF24FDD7715207E560FDD73135 -:10485C00422101D7716321D9F5FBF1E7240000DD7A -:10486C001223DD1923DD1123DD2623DD3423DD396D -:10487C0023DD3FFDE748EF3DFD0A49EF38D9F4FB56 -:10488C00C1AE6CFD602DC0F313BE6C712304EF251B -:10489C00F0C1AE6CFD602DC0F313BE6C712304EF40 -:1048AC0014F6BE6C712204EF0CCB6CFF0071230468 -:1048BC00EF03FD87494020F905DD064020F901DFB3 -:1048CC00067123047163213164210FF6BE64BE6A44 -:1048DC003124040390EF01F6BE6ED7CF66FD47F589 -:1048EC0026FDAE6C317DBF2CFDFD5C49D2DF0ED9AF -:1048FC00F4FBC1AE6CFD602DC0F313BE6CD7FD5C38 -:10490C0049D2DD0FCF66FD47F526FDAE6C317DBF7C -:10491C002CFDD7E926FD096C225080D6BF28FD223C -:10492C002CFDBDD8304700FDEE0DBF2AFD3028FD13 -:10493C00FD762DF313BE6CB066FDD566FDDF10CF92 -:10494C0066FD47A026FD4026FD1F61C8F526FDD754 -:10495C0040D7FB0BDC05712304F2D740D7FB066173 -:10496C00D831322011F0C1AE6CFD602DC0F313BEF6 -:10497C006C712204EF03FD8749E2D7716221F0C10B -:10498C00AE6CFD602DC0F313BE6CA02EFD402EFD51 -:10499C0040DC3DF52EFDD92FFDF1313F0462FD14B5 -:1049AC00D92FFDF1BDD85008FD3D0E087208E6D296 -:1049BC00DD040192DFFC896158D1DD05712204EF21 -:1049CC0003712304A02FFD402FFD2061C8F52FFD9E -:0149DC00D703 -:1049DD0061FC61FCC1C3C5C7520C929269D4FEC182 -:1049ED00DFF88EFD708EFCC1717AFA4020F903DF7D -:1049FD000630792AFDA139C09EFC609EFD34D4FE9F -:104A0D005206C0B9A5A592DFF9C6C4C2C061FC614A -:104A1D00DF520C929269D4FEC1DFF88EFD708EFCD0 -:104A2D00C1717AFAC736410571A4C6DC51F532FD64 -:104A3D00714850057160500531342236716207712D -:104A4D0033228FDCFB5FE4FBD1DF1B8FDDFB5FE5EA -:104A5D00FBD1DF128FDEFB5FE6FBD1DF098FDFFBC2 -:104A6D005FE7FBD1DD0C31620702EFFA716307716D -:104A7D006B27710324FD6630F51AF9ED954BC7369A -:104A8D0041057184C6DE0DF532FD71485005FD6698 -:104A9D0030ED954BC73641057194C6DE154032FD9C -:104AAD0003DD0C4032FD04DD064032FD0161F8F5F9 -:104ABD0032FDD932FDF1E7240000DD0823DD13239B -:104ACD00DD2EEF5571405005E532FD71505005ED6D -:104ADD00954B8F40059F1BF99F1EF9D91BF9FD5D65 -:104AED0034629F1DF9CF32FD0271505005ED954B8B -:104AFD00C73641057194C6DE1CC736410571C4C663 -:104B0D00DE06CF32FD03EF11F532FD714850057110 -:104B1D00605005EF73CF32FD044032FD03DF138F7C -:104B2D001DF99F4005D91DF9C1D91BF9FDF134C0FF -:104B3D00EF108F400576C7D91BF9FDE730C07150D6 -:104B4D005005D91EF9F1242900DD2D240400DD289E -:104B5D00242200DD23241100DD0C240100DD1924A5 -:104B6D001E00DD14EF0C401BF960DF0CCF1BF9614B -:104B7D00EF06F51AF9A01BF94032FD03DF0AD91B28 -:104B8D00F9FD5D34629F1DF9C09EFC609EFD34D41D -:104B9D00FE5206C0B9A5A592DFF961FCC1C7717AB5 -:104BAD00FA714AE5717BBD51405F0401D1DD06F616 -:104BBD0016A747DFF2300400BF2401F6BF2A0130EB -:104BCD000B0BBF28010000000000000000510FBFBB -:104BDD0028010000000000000000500FBF280171E7 -:104BED000AE6712321C6C061FCC1C5717AFAD544AC -:104BFD00FBDD0EEB42FB899E44A242FBB044FBEF72 -:104C0D0033710AE6300400BF2401F6BF2A01300BD0 -:104C1D000BBF28010000000000000000510FBF284D -:104C2D00010000000000000000500FBF28017113AB -:104C3D0021712321C4C061FC61EF520C929269D4A1 -:104C4D00FEC1DFF88EFD708EFCC12008FBF8FF71F0 -:104C5D00503002CEABACCC0100F6BC0231B2E20F4B -:104C6D00617902F6614902DFF371603002EF7E8EE9 -:104C7D00519B713BE28B5C02D1DD1D8B5C08D1DF5A -:104C8D000971503002CC0100EFCF8C0770FDCC358F -:104C9D00629E50CC0102EFC18B5C03D1DF408E5080 -:104CAD009C05715030028C01D1DF0E8C0570FD1208 -:104CBD0036629C07CC0101EF318C014C02DF06718D -:104CCD00603002EF28CF34025A716030028C0570CB -:104CDD00C18C0770FD7335C0CF34024AEF0F8B5C6A -:104CED0001D1DD0671603002EF03ED664C1008C096 -:104CFD009EFC609EFD34D4FE5206C0B9A5A592DF80 -:104D0D00F961FCC1C3C5C7520C929269D4FEC1DFD3 -:104D1D00F88EFD708EFCC1710A9E31929E02EFFAE3 -:104D2D008F06FC4F96FFDF198F07FC4F97FFDF11A2 -:104D3D008F08FC4F98FFDF095004C15011FD20353D -:104D4D00C0710B9EC09EFC609EFD34D4FE5206C009 -:104D5D00B9A5A592DFF9C6C4C2C061FCA052FC6121 -:104D6D00FCC1C3C5C7520C929269D4FEC1DFF88E47 -:104D7D00FD708EFCC1C1FBF8FF8D1F9C018E313182 -:104D8D008EE7240600DD0823DD0F23DD25EF4571B9 -:104D9D007AFA8C019F3CFCEF3B717AFA4023F901C2 -:104DAD00DF078C019F3BFCEF2B51FF2E019F3BFC3E -:104DBD00EF22717AFA8C019F02F98FDAFB5C01D137 -:104DCD00DF124020F903DD064020F904DF06308DA7 -:104DDD0025FDA1394031FF09DE05A031FFEF197125 -:104DED0058F0007142224051FC02DF03F6EF05D965 -:104DFD0051FCF1A1609F51FC710BE3C0C09EFC60A2 -:104E0D009EFD34D4FE5206C0B9A5A592DFF9C6C4E5 -:104E1D00C2C061FC61FF520C929269D4FEC1DFF8F1 -:104E2D008EFD708EFCC1717AFA8F0CFC5C03D1DDA6 -:104E3D00194020F903DD064020F904DF0D36100579 -:104E4D0071D4DE0630D63AFDA139C09EFC609EFDC0 -:104E5D0034D4FE5206C0B9A5A592DFF961FC61FC00 -:104E6D0061FC61FC61FC61FC61FC61FC61FC61FC4D -:104E7D0061FC61FC61FC61FC61FC61FC61FC61FC3D -:104E8D0061FC61FC61FC61FC61FC61FC61FC61FC2D -:064E9D0061FC61FC61FCF8 -:0A4EA40000060C12181E242A3036F6 -:104EAE00FF000000D4FB0000000040FC00000000EA -:104EBE001E3C5F368C225B48372EF22E8047943D87 -:104ECE009B090B3F01000000983AF82AFF000000F2 -:084EDE00000055555555470031 -:084EE600317503F7332312D7E5 -:0A4FF60031373A35363A3331000006 +:1030EC00F1E73402002361E3ED2B342361F8EDCDDD +:1030FC0031B12361E3EDD43124030061F8EDE33108 +:10310C00B1240D0061D8ED2B34240B0061F8ED04D3 +:10311C00322361F8ED4B322361F8ED18322361F85C +:10312C00EDF13324060061F8EDB432B124030061F3 +:10313C00D8EDD53224000061F8EDE2322361F8EDD0 +:10314C002B34252361E3ED0A332361F8ED1B332384 +:10315C0061F8ED2C332361F8ED1B332361F8ED3D61 +:10316C00332361F8ED4E332361F8ED5D332361F8C1 +:10317C00ED7F332361F8ED8B332361F8ED97332327 +:10318C0061F8EDA033252361E3ED2B342561F8EDD7 +:10319C00A9332361F8EDB63324030061F8EDC23393 +:1031AC00240A0061F8EDCE3324090061F8ED0534F2 +:1031BC0024090061F8EDEB332361F8EDD933ED2EE2 +:1031CC0034679FCEFBED3B3430BC29FD6E39667302 +:1031DC006718CCFBED3B3440D1FB6ADF1440D2FBCB +:1031EC0068DF0E674C6CDF09305242FD6E39713A64 +:1031FC00D5679FD3FBED3B3467D1DD0630F33DFD46 +:10320C006E3934ECFB89616F99ED3B34675C02D10C +:10321C00DD0830572BFD6E39EF0C675C01D1DD06F4 +:10322C00305C2BFD6E39675C3CD1DD1030612BFDC1 +:10323C006E39675C3C7266736218CCFBED3B34678D +:10324C00D1DD625C01D1DD05300800EF01F6609F35 +:10325C002BFC675C02D1DD03E6EF01F6342BFC8915 +:10326C00616899675C04D1DD04E6A1EF01F6342BAB +:10327C00FC89616899675C08D1DD05302000EF019D +:10328C00F6342BFC89616899675C10D1DD05301030 +:10329C0000EF01F6342BFC89616899675C20D161E1 +:1032AC00E871602BFCED3B34D51AF9DF09679FF50B +:1032BC00FBA01AF9EF10401AF905DE0AE91AF967B2 +:1032CC001853FDA01AF9ED3B34675C0F72667362FC +:1032DC0018CCFBED3B34401AF964DE1F401AF9019F +:1032EC00DF0667D161F85701E91AF9671848FBA0A6 +:1032FC001AF9401AF90561C8717221ED3B34675C0B +:10330C007F70C117F1243000FD4130C0ED3B3467B4 +:10331C005C3F70C117F1243000FD4130C0ED3B34EF +:10332C00675C0770C117F1243000FD4130C0ED3BE4 +:10333C0034675C1F70C117F1243000FD4130C0EDC3 +:10334C003B346770C117F1243000FD4130C0ED3BB8 +:10335C0034CEABAC710A9E31929E02EFFAD592FF3D +:10336C00DF05710B9EEFED679E99710B9E9F03FC21 +:10337C00ED3B34712222675C7F9F04FCED3B347182 +:10338C002222675C3F9F05FCED3B34675C3F9F0648 +:10339C00FCED3B34675C1F9F07FCED3B34306C3B12 +:1033AC00FD6E39679F0CFCED3B3430273BFD6E39CD +:1033BC00679F0DFCEF7930493BFD6E39679F10FC20 +:1033CC00EF6D675C01D161E8FD4145EF624026FC81 +:1033DC00C8DE5CE926FC671876FAA026FCEF50677D +:1033EC009F26FCEF4A67318E247200DF06300409F9 +:1033FC00FD6E39679FEFFBEF36675C01D1DD03E6AD +:10340C00EF01F66061FB711102675C02D1DD03E62E +:10341C00EF01F66061FB712102679F23FCEF100046 +:10342C00EF0D664C5ADE07736718CCFBEF0100C634 +:10343C00D7C716664C30DC094C37DE05FD1C30EF67 +:10344C0073664C02DF1F8FCEFB5C03728F2DFC5C0E +:10345C0003318E316D08616A08128F2DFC5C80314E +:10346C002A6162EF5E664C3DDF0AAE90BF28FCF924 +:10347C0028FCEF4F664C3EDF05F929FCEF45664C06 +:10348C004FDF05FD6445EF3B664C61DF09E926FC27 +:10349C000976FA72EF2D664C7FDF05FD633EEF2354 +:1034AC00664C4EDF0F31742305301000EF01F60827 +:1034BC007208EF0F664C5ADC0452FFEF0666730974 +:1034CC00CCFB72C6D7C788061617F124100024054A +:1034DC0000DC07244C00DD17EF18717BFA17F104A0 +:1034EC00CCFB1489617F99717AFA713222EF03A0B7 +:1034FC0026FCC6D7C7C1C1FBF8FF4020F903DD0687 +:10350C004020F904DF2F8C027309D4FB5E0AD1DF53 +:10351C00248C02318E04CCFB14896E0A99716207DB +:10352C00CC0100316207086159018C01D1DFF471C3 +:10353C006307716B271004C6D7CF2DFC03F52BFC4A +:10354C00F52FFCF531FCD7C788061617F1E73402C6 +:10355C000025DD3E23DD1825DD1D23DD0523DD2CB7 +:10356C00EF3C716222679F30FCCF3DFC03EF2F676D +:10357C005C839F2DFCEF27675C039F2FFC675C032C +:10358C004C0261F8711224FD5947EF12679F31FC10 +:10359C00EF0C6791DF08E0C15012FD0035C0C6D7B3 +:1035AC00C71617F1E7240000DD2A23DD1E240300D3 +:1035BC00DD0724FB00DD24EF2531020705308000F8 +:1035CC00EF01F6086F2EFC7208EF198F2BFCF52B10 +:1035DC00FC72EF107152235235EF09F2EF0666734D +:1035EC00092AFC72C6D7C71617F1E7240000DD388C +:1035FC00241000DD1C23DD1C23DD30240E00DD181F +:10360C00241100DD1B240F00DD12243000DD15EF2A +:10361C001EE2EF1D5202EF195204EF155206EF1184 +:10362C005205EF0D5207EF09F2EF065203EF02526B +:10363C00FFC6D7C7314422417143228F3CFC9FD433 +:10364C00FB8F3BFC9FF3FB362EFDC7D93BFCFD19D2 +:10365C0038618A70618AFD5E38C0D940FCF1312F27 +:10366C00609F3FFC8F3AFC4F3FFCDD0D7152228F67 +:10367C003FFC9F3AFCCF3DFC03403DFC05DE0A308D +:10368C00C136FD6E39CF3DFC6BB03DFC7150F00086 +:10369C00CE300BCF170006CE3106FDAF02717A305B +:1036AC00710BE3710BE7C6D78F3FFC9F3AFC8F3F42 +:1036BC00FC9FD5FBD74020F903DF064020F904DF3F +:1036CC0002F2D73154220E7153227173228F3FFCB8 +:1036DC009F41FCEF3931642223716322717222D530 +:1036EC0030FCDF05F542FCEF0B8F30FC5002D6A10D +:1036FC00609F42FC8F42FC9F41FCEF123174220808 +:10370C008F42FC9F41FCEF068F3FFC9F41FC8F4199 +:10371C00FC9FD5FBD941FCFD3637E941FC09DA2188 +:10372C0070C15013FD5805C0F2D7C7C1C1FBF8FFDB +:10373C008C02D1DF05F530FCEF1A8C024C05DE064D +:10374C00CF30FC02EF0E8C02318E1231FE03311F92 +:10375C00609F30FC8F43FC4F30FCDD2ACC011F8F67 +:10376C0030FC9F43FCCC00008B4C08DE148B73099F +:10377C001A224F30FCDC058B9C01EF05615900EFE0 +:10378C00E78C019F3EFC1004C6D7C7168B728C01C8 +:10379C00614ADE248B728C02614ADE188C01728CB9 +:1037AC0002614ADE068C01318EEF048C02318E08E8 +:1037BC007208EF268B72EF228B728C02614ADE0448 +:1037CC008B72EF168C01728C026142DE068C013119 +:1037DC008EEF048C02318E087208C6D7C716710A98 +:1037EC00E7710BE37150F000CE300BCF170006667B +:1037FC009E31FDAF02717A30710BE33182E302EF3F +:10380C00FA8D1F7158F000710BE772C6D7C7C1C192 +:10381C00FBF8FF8F24FC4E02DC03F2EF318C024FDD +:10382C0025FCDC0452FFEF268C022F24FC70613146 +:10383C00318D128F25FC2F24FC70613133BDD813D0 +:10384C00FD790DBB440001DC03F690BB8B721004B8 +:10385C00C6D7C7C1FBF8FFAC0814A91489708B61DB +:10386C0028706131FDCC4E1344030071FEDC23AC97 +:10387C0008148A04819A04AC08148A044C11DC10D4 +:10388C00A9148B99AC0814CA0200AC0814CA031012 +:10389C00EF72AC0814CA0400AC0814A914894DDEEC +:1038AC000AAC08148A02819A02EF12AC0814A9140B +:1038BC00894D61D308AC08148A02919A02AC0814A1 +:1038CC008A03919A03D1DF3CAC08148A024C10DFB6 +:1038DC0010A91489318EA112AC0814A9146299EFA5 +:1038EC0017AC08148A024CF0DF0EA91489318EB182 +:1038FC0012AC0814A9146299AC0814CA0200AC08E2 +:10390C0014CA0310C0C6D7ED5939717BFAC7D54616 +:10391C00FC61F831042330710423712123710323DA +:10392C00D546FCDD06B046FCCEABAC717AFA56003F +:10393C00664C0ADD1272F3311C7934FDCEFC006149 +:10394C00CAFDB83986EFE9717AFAF2C6D7C75600C4 +:10395C00664C0ADE0BF0317E12F67848FC86EFF0EE +:10396C00C6D7C7C1C1FBF8FFCC01008C014C0ADEE5 +:10397C0036717BFA8C01F0317E0448FC14A9616825 +:10398C00DF09AC02B9717AFAF2EF1D8C01F0317ECD +:10399C00127948FC614902DF06717AFAE2EF09718B +:1039AC007AFA615901EFC4E21004C6D7C72004FBB0 +:1039BC00F8FFF64248FC61F8ED9D3A717BFA9C03E6 +:1039CC008C034C0ADE3C8C03F0317E0448FC14A9B9 +:1039DC006168DF05717AFAEF29717AFA8C0372F358 +:1039EC00311C7948FCCEFC0061CA629C02D1DF0A12 +:1039FC008C03F0317E12E67848FC717BFA61590336 +:103A0C00EFBECC0200CC01018C02F0317E0448FCEC +:103A1C0014A96168DD7B8C02F0317E127948FCE7D9 +:103A2C0043DF688C014C0ADE628C01F0317E127926 +:103A3C0048FCE743DD50717BFA8C01F0317E044881 +:103A4C00FC14A96168DF1B616901717BFA8C01F0C0 +:103A5C00317E12F67848FC717AFA8C024E01DCE762 +:103A6C00EF2F8C01F0317E0448FC14A9128C02F06B +:103A7C00317E337848FC8C01F0317E12E67848FCBC +:103A8C00615902717AFA615901EF98615902ED148A +:103A9C003A00F21004C6D7C72006FBF8FF3411FC1D +:103AAC00C55006C150A8C15030FDFD021006D2DD34 +:103ABC001DA05CFC405CFC08DE03E2EF5A340CFCFD +:103ACC00895CFC99FD6C3B7110DAFBF2EF49F55CFB +:103ADC00FC8F0CFC5C01D1DD264020F903DF20506B +:103AEC0010C180FD0035C0C736100571D4C6DE0F7D +:103AFC0017C15006C150A8C15030FDFD0210064040 +:103B0C0020F901DD114020F905DD0B8F0CFC5C0266 +:103B1C00D161E8FD5742F21006C6D7D90DFCC15051 +:103B2C0030FDD302C0629F10FC7130DDFB8FE5FBD2 +:103B3C005C08D1DF06716307716B27F2D7D910FCD3 +:103B4C00C1D90FFCC15030FD6F0310047130DDFB87 +:103B5C008FE5FB5C08D1DF06716307716B27F2D729 +:103B6C00C7200AFBF8FF500FC15030FDD302C040F4 +:103B7C0045FB02DF077110DAFBF2EF5F7118DAFB1D +:103B8C00CC07004023F901DF05CC0802EF03CC0879 +:103B9C0010CC09808F0CFC5C03D1DF08717AD5CC7A +:103BAC000607EF06717BD5CC062F17040600C15013 +:103BBC0004C150A0C15030FDA5031006C736100536 +:103BCC0071D4C6DE154020F903DF0F17C15006C1B2 +:103BDC0050A8C15030FDFD021006F2100AC6D7C71E +:103BEC004020F902DF04F6BF60FCB048FDD548FD6B +:103BFC0061E8ED5F3DCF48FD048F20F9318FE7235D +:103C0C00DD0B24020024030061C8ED5F3D8F22F917 +:103C1C00312346301B004260FCDF0AE0C15010FD2E +:103C2C000035C0EF203077014260FCDF185002C134 +:103C3C005010FD0035C0F64266FCDF098FF0FB50DA +:103C4C0010D6BF66FCF64266FCDD40B266FCE6426E +:103C5C0066FCDF37710221EF32301B004260FCDF63 +:103C6C0016F64268FCDF1BE0C15010FD0035C03079 +:103C7C00E803BF68FCEF0B3077014260FC61F87120 +:103C8C000221F64268FC61E8B268FC313407097124 +:103C9C003323F6BF60FCEF1731342306F6BF60FC0C +:103CAC00EF0DA260FCF64260FCDF04B1BF60FC8F3C +:103CBC0023F9318FE7240000DD0623DD0D23DF120D +:103CCC0036100571C4714123EF0B7104027141234D +:103CDC00EF037142233142231D4062FC0661D8A0E0 +:103CEC0062FC4062FC05DF11A062FC5004C1501064 +:103CFC00FD0035C0EF03F562FC3144231D4064FC2C +:103D0C000661D8A064FC4064FC05DF11A064FC5083 +:103D1C0008C15010FD0035C0EF03F564FCD565FCFF +:103D2C00DD05B065FCEF2C3142071B4063FC0661DE +:103D3C00D8A063FC4063FC05DF0FA063FC5010C1EE +:103D4C00FD0035C0EF03F563FC4063FC0661F8CF62 +:103D5C0065FC25C6D7C736100571D4DE0730A33AEB +:103D6C00FD6E39D24020F903DF1D31220706307970 +:103D7C002AFD6E393154230C7153235080C15012DB +:103D8C00FD0035C0FD983DFDC53DC6D78F2DFC5CB3 +:103D9C0001D1DD24D56BFCDD04B06BFCD7CF6BFC03 +:103DAC00098F3EFC4F6AFCDD0F8F3EFC9F6AFC5076 +:103DBC0040C15012FD0035C0D74020F903DD04F698 +:103DCC00BD1AD7D5F8FBDF08F6461ADD19B61AD797 +:103DDC00D9F4FBF1461ADD0ED9F4FB12AD1A43DE11 +:103DEC0003A61AD7B61AD7C78FECFB76F5ECFB5C9B +:103DFC0010D161E8716223665C0FD1DD57665C01FE +:103E0C00D1DD05F520F9EF4C665C02D1DD11E0C186 +:103E1C005003FDD62BC0711300711B207103036678 +:103E2C005C04D1DD11711300711B20D52DFC61F8E0 +:103E3C00710303FD4535665C08D161E871030350DD +:103E4C0005FD49027102035003C1FDD62BC0711A46 +:103E5C0020FD762BF2C6D7C7200AFBF8FF401AF9D3 +:103E6C000ADC0452FFEF618F22F931150530040092 +:103E7C00EF0F8F22F9314505300500EF04D923F9F6 +:103E8C00F1609B8F08F99C018F24FD9C028F09F92E +:103E9C009C038F0AF99C048F6CFC9C058F02F99C87 +:103EAC0006714420E661301271042061DC31196125 +:103EBC0062629C07CC08018F24F99C09A01AF9D9DD +:103ECC001AF9F1B107148972100AC6D7C78F20F9F5 +:103EDC00318FE724000061F8EDAA4023DD1B23613C +:103EEC00F8EDB23F2361F8ED2E402361F8ED7940F7 +:103EFC002361F8ED4C41EDA740D521F9DF2CF642BA +:103F0C0060FCDD05F54AFDEF03A04AFD404AFD6566 +:103F1C00DC0ACF20F905710223EDCA41AF60FC44E5 +:103F2C000A0061D8EDCA41E521F9713223F54AFD49 +:103F3C00F5EFFBFDC904715320FDC5234023F903A4 +:103F4C00DF09710223F520F9EDCA41FD412640D964 +:103F5C00FB9BDE09710223F520F9EDCA41714A275A +:103F6C007140110571301105713A22715A2271504C +:103F7C001105FDC129D2DD09710223F520F9EDCA25 +:103F8C004171103500CF37001D714012054021F9E9 +:103F9C0001DF05F5F5FBEF04CFF5FB03CF20F902AC +:103FAC00FDA729EDCA41FDA22CFD022D714A9DFDF4 +:103FBC004535FDBD30F537FF712BE0F521F9710268 +:103FCC0023CBE43FEFCBE6F6F0FDC904713BD47193 +:103FDC0012027123028F22F93105285004FDE72BC0 +:103FEC00625C03318E315D34DBFB89616899500270 +:103FFC00FDE72BD2DD067170DBFBEF047178DBFB88 +:10400C00FDC523FDB92D710822F9CF20F9038FCE00 +:10401C00FB5C02D1DD095080C15010FD0035C0EDB4 +:10402C00CA41FDCC4131642331A06EFCD56EFCDD60 +:10403C000831A4E00A31020C06712BE0FD4242313A +:10404C00A4E01731040C13712BE05027C15005FD6F +:10405C00D62BC0CF20F904710223FD37428F22F9F1 +:10406C0031250731040703F520F9EDCA41FDCC4198 +:10407C0031020C14F0C15005FDD62BC05005FD4982 +:10408C0002FD4242CF20F903FD37428F22F9312540 +:10409C000731040703F520F9EDCA41F520F9CFF5F6 +:1040AC00FB03F5F6FBF5F8FB715221F6426CFF6150 +:1040BC00E8EDCA41F6BF66FC710321F50CFCFD6C02 +:1040CC003BFD1F2EFDF92CFD572D714B9D711302DD +:1040DC00712302F5DCFBF5DDFBF5DEFBF5DFFB31D7 +:1040EC00242102EFFACE3708CBE4BFFFCBE6FFF179 +:1040FC00CED4FFCF37000971481205F6BEE0BEE200 +:10410C00BED0716A27FD3B2A714307714B2771485A +:10411C00100571481105713810057138110571338E +:10412C0002713B22715302715B2271581005715858 +:10413C001105FD3205CF20F905713223F6BF60FC65 +:10414C00F521F931020729FDC523AF60FC440A00B3 +:10415C0061C8E520F9D523F961E8FD32058F22F914 +:10416C0031255B502EFD4902E521F9E520F9EF4E92 +:10417C00D504F9DF49FD3205FD4E2371730171320F +:10418C000471430271032071522031949E02EFFAA4 +:10419C00712AE7CEA409F5F3003104070261FDE5AD +:1041AC00F300CEA40831040709713323E520F9F597 +:1041BC004AFD712BE78F22F9312503F520F9C6D77B +:1041CC00D56FFCDF1A310200155003FDE72B625C42 +:1041DC0001D1DF07F520F9710223D7E56FFCD74039 +:1041EC006FFCF0DF0831040041F56FFCD7406FFC29 +:1041FC00C8DF0BF520F9710223CF6FFCF0D7310229 +:10420C00000A406FFCFFDD22A06FFCD7F0C1500408 +:10421C00FDD62BC08FDBFB5C9F9FDBFB7110ECFB97 +:10422C0030F33DFD6E39CF6FFCF0D731042106F52C +:10423C0020F9710223D7716323F56EFC717207FDAF +:10424C00AF02717307D7FD9F05F2D7C7200CFBF89F +:10425C00FF8F12FCF0F911FCF303FDCC4E13BC04E0 +:10426C008F14FCF0F913FCF303FDCC4E13BC028F3E +:10427C0016FCF0F915FCF303FDCC4E13BBAC04BDDE +:10428C00D8F6BDDAAC04311EBDDCF6BDDEFD2C0D5E +:10429C00ADD8BDDCADDABDDEAC02BDD8F6BDDAAC56 +:1042AC0002311EDADCC3DADEC3BDDCF6BDDEFD2C6A +:1042BC000DC0BDDEC0BDDCADDEFDA20EADD8BDDCDB +:1042CC00ADDABDDEABBDD8F6BDDAAB311EDADCC380 +:1042DC00DADEC3BDDCF6BDDEFD2C0DC0BDDEC0BD1F +:1042EC00DCADDEFDA20EDADAADD8FD5746C3C58FC4 +:1042FC000EFD5C3FF0317E048EFC14C2C0B9A00EE2 +:10430C00FDF6BC08BC0A9C078C074C2EDD3E8F0EBC +:10431C00FD0E0770F161DC605C3FF0317E12798E2E +:10432C00FCBDD8F6BDDA8C0773092422318FBDDCB5 +:10433C0070BDDEFD2C0DAC08BDDCAC0AFDA20EADD3 +:10434C00DABC0AADD8BC08615907EFBCAC08BDD8C3 +:10435C00AC0ABDDAC9DC0004F6FDF60DC9DCFFFFC2 +:10436C00F6FDF70EADD8BF88FCAF82FC4288FCDDB1 +:10437C0012AF84FCBF86FCAF82FCBF84FCAF88FC10 +:10438C00BF82FCAF84FC4286FCDC50AF82FC4284D2 +:10439C00FCDE48AF4CFD4282FCDE404050FD16DC9A +:1043AC001F4050FDA0DE168F8AFC4F50FDDE0EAF75 +:1043BC0082FC228CFC44691061C8FD3044F550FD30 +:1043CC00AF82FC445146DC0BAF82FC241027BF4E5D +:1043DC00FDEF1930F82ABF4EFDEF114050FDFFDD07 +:1043EC0003E6EF01F63450FD89610899AF86FC4273 +:1043FC0084FCDC1BAF84FC4282FCDE13AF82FC42EB +:10440C004EFDDE0BF58AFCAF82FCBF8CFCEF11403D +:10441C008AFCFFDD03E6EF01F6348AFC896108991A +:10442C00100CC6D7717BFAC7710A9E31929E02EFAF +:10443C00FA8E949F7AFC8E969F7BFC8E979F7CFCC9 +:10444C008E989F7DFC8E939F7EFC8E929F7FFC713D +:10445C000B9E717AFA8F7DFCFD0B0F76FDD5451303 +:10446C00BF80FCD517FCDF0AD518FCDF05D519FC7D +:10447C00DD2CF6B14280FCDF17665C0391DF03E6AE +:10448C00EF01F6046D01313D120103B1BF80FC96C2 +:10449C0017FDF84613FD0F4531742302EF635206E6 +:1044AC009292697AFC6872FCDFF6AF80FCBF78FCF4 +:1044BC00F970FCF3311C7926F944FEFFDD43D97009 +:1044CC00FCF1010426F914A944FFFFDF04E6B9EF5F +:1044DC000CD970FCF1010426F914A9A1B9A017FCA0 +:1044EC00D517FCDF1CA018FCD518FCDF14A019FC98 +:1044FC00D519FCDF0CCF17FCFFCF18FCFFCF19FC34 +:10450C00FFC6D7C716D970FCF10744A800DC0571AB +:10451C007223EF1FF647DD1BA070FC4070FCA8DC7B +:10452C0005717223EF0DF970FCF3311CF67826F946 +:10453C00B7EFE1C6D7C756A89666F0317E12F6B132 +:10454C007826F966D1DFF1F517FCF518FCF519FCA6 +:10455C00F570FC717323C6D7C72004FBF8FFD51A7E +:10456C00F9DF188F70FC9F0FFD717BFA5206929247 +:10457C006972FC6810FDDFF6717AFA401AF906DEF2 +:10458C0010E91AF90910FD9C03A01AF98C0372EFBB +:10459C0034F90FFDF3311C7926F9BB310224058B5C +:1045AC009C03EF128C019C03D50FFDDF06CF0FFD92 +:1045BC00A7EF03B00FFD718071072461DC61FB7103 +:1045CC0001248C03721004C6D7C72008FBF8FF8F98 +:1045DC007DFCFD0B0F9C078F7CFCFD0B0F9C068F4D +:1045EC007BFCFD0B0F9C058F7AFCFD0B0F9C048F45 +:1045FC007EFC9C038F7FFC9C028C06318E01127911 +:10460C005222BB8C075C03D1DF098C064C0361C8BA +:10461C006179008C05318EB1610900BB313D12010D +:10462C0003BB8B0E04708C011C00BB8F1CFC4E0357 +:10463C00DC0E8C034F1CFCDC0B8C024F1DFCDC04D1 +:10464C00AB12EF03ABB1121008C6D7C7C3C1200819 +:10465C00FBF8FFF661490A61F8614908DF07F73496 +:10466C000000EDF446E6BC04F6BC06AC0ABC02AC99 +:10467C0008BBAC06614902AC0461F8614900DE2854 +:10468C00AC04BDD8AC06BDDAE1FDB10EADDABC06AA +:10469C00ADD8BC04ABBDD8AC02BDDAE1FDCC0EADDF +:1046AC00DABC02ADD8BBEFCAAC06BC02AC04BBACE6 +:1046BC0008BDD8AC0ABDDAAC04BDDCAC06FD2F0ECF +:1046CC00AC04BDDCAC06FDA20EE1FDCC0EADDABC3B +:1046DC0006ADD8BC04AC06614902AC0461F8614972 +:1046EC0000DCC5AC0214AB12100CC6D7C7168F7504 +:1046FC00FCFD0B0F77614EDF22AF78FC4280FCDEB5 +:10470C0009AF80FC2278FC12EF41F64280FCDF08F6 +:10471C004278FCDD03E7EF33F7EF3017F1B11267A6 +:10472C00318E43DF1B665C0391DF03E6EF01F60479 +:10473C006D01313D1201032278FC0280FC12EF0B5B +:10474C0067614EDE0532A900EF01F7C6D7717BFA1F +:10475C003112240CF64218FDDD06B218FDEDF847B7 +:10476C00711324717AFA4020F904DF08715307F5AC +:10477C0052FDEF78D9F7FBF1E7240000DD0F23DDC4 +:10478C001C23DD1123DD6223DD2E23DD4371530752 +:10479C00F552FDEF57715207F552FDEF4FD552FD13 +:1047AC00DF08715207E552FDEF06715307F552FD14 +:1047BC0030FA00BF18FDEF34D552FDDF0E715207F1 +:1047CC00E552FD30FA00BF18FDEF21F5F7FBEF1CA9 +:1047DC00D552FDDF0E715307E552FD30FA00BF18BC +:1047EC00FDEF09CFF7FB02EF03FDF947D7D92FFCFB +:1047FC00F1E7240000DD0923DD2723DD0A23EF2167 +:10480C00715307F552FDD7D552FDDF08715207E5FC +:10481C0052FDEF06715307F552FD302D02BF18FD06 +:10482C00D7715207E552FDD731422101D77163216F +:10483C00D9F5FBF1E7240000DD1223DD1923DD118E +:10484C0023DD2623DD3423DD3923DD3FFDC048EF96 +:10485C003DFDE348EF38D9F4FBC1AE6CFD602DC0D3 +:10486C00F313BE6C712304EF25F0C1AE6CFD602D0B +:10487C00C0F313BE6C712304EF14F6BE6C712204EA +:10488C00EF0CCB6CFF00712304EF03FD604940205B +:10489C00F905DD064020F901DF067123047163215F +:1048AC003164210FF6BE64BE6A3124040390EF011B +:1048BC00F6BE6ED7CF58FD47F51AFDAE6C317DBFF5 +:1048CC0020FDFD3549D2DF0ED9F4FBC1AE6CFD6085 +:1048DC002DC0F313BE6CD7FD3549D2DD0FCF58FD7B +:1048EC0047F51AFDAE6C317DBF20FDD7E91AFD09E5 +:1048FC006C225080D6BF1CFD2220FDBDD830470055 +:10490C00FD570DBF1EFD301CFDFD762DF313BE6C47 +:10491C00B058FDD558FDDF10CF58FD47A01AFD400B +:10492C001AFD1F61C8F51AFDD740D7FB0BDC0571CA +:10493C002304F2D740D7FB0661D831322011F0C1E5 +:10494C00AE6CFD602DC0F313BE6C712204EF03FD41 +:10495C006049E2D7716221F0C1AE6CFD602DC0F3ED +:10496C0013BE6CA022FD4022FD40DC3DF522FDD99A +:10497C0023FDF1313F0454FD14D923FDF1BDD85072 +:10498C0008FDA60D087208E6D2DD040192DFFC8951 +:10499C006158D1DD05712204EF03712304A023FDBE +:0A49AC004023FD2061C8F523FDD76C +:1049B60061FC61FCC1C3C5C7520C929269D4FEC1A9 +:1049C600DFF88EFD708EFCC1717AFA4020F903DFA4 +:1049D6000630792AFD6E39C09EFC609EFD34D4FEF9 +:1049E6005206C0B9A5A592DFF9C6C4C2C061FC6172 +:1049F600DF520C929269D4FEC1DFF88EFD708EFCF8 +:104A0600C1717AFAC736410571A4C6DC51F526FD97 +:104A16007148500571605005313422367162077154 +:104A260033228FDCFB5FE4FBD1DF1B8FDDFB5FE511 +:104A3600FBD1DF128FDEFB5FE6FBD1DF098FDFFBE9 +:104A46005FE7FBD1DD0C31620702EFFA7163077194 +:104A56006B27710324FD6630F51AF9ED7E4BC736D8 +:104A660041057184C6DE0DF526FD71485005FD66CB +:104A760030ED7E4BC73641057194C6DE0FD526FD57 +:104A8600DD0A4026FD0261E8716050058F26FD3182 +:104A96008FE7240000DD0823DD1323DD31EF597194 +:104AA60040500571505005E526FDED7E4B8F4005C3 +:104AB6009F1BF9715050058F1BF99F1EF9D91BF9E1 +:104AC600FD3D34629F1DF9CF26FD02ED7E4BC736B4 +:104AD60041057194C6DE1DC736410571C4C6DE06A2 +:104AE600CF26FD03EF127148500571605005F5267B +:104AF600FDED7E4BCF26FD044026FD03DF138F1D03 +:104B0600F99F4005D91DF9C1D91BF9FDD134C0EF74 +:104B1600218F4005768F1BF901DC05D51BF9DF06D1 +:104B260071605005EF52C7D91BF9FDE730C07150CF +:104B36005005D91EF9F1242900DD2D240400DD28B5 +:104B4600242200DD23241100DD0C240100DD1924BC +:104B56001E00DD14EF0C401BF960DF0CCF1BF96162 +:104B6600EF06F51AF9A01BF94026FD03DF0AD91B4B +:104B7600F9FD3D34629F1DF9C09EFC609EFD34D454 +:104B8600FE5206C0B9A5A592DFF961FCC1C7717ACC +:104B9600FA714AE5717BBD51405F0401D1DD06F62D +:104BA60016A747DFF2300400BF2401F6BF2A013002 +:104BB6000B0BBF28010000000000000000510FBFD2 +:104BC60028010000000000000000500FBF280171FE +:104BD6000AE6712321C6C061FCC1C5717AFAD544C3 +:104BE600FBDD0EEB42FB899E44A242FBB044FBEF89 +:104BF60033710AE6300400BF2401F6BF2A01300BE8 +:104C06000BBF28010000000000000000510FBF2864 +:104C1600010000000000000000500FBF28017113C2 +:104C260021712321C4C061FC61EF520C929269D4B8 +:104C3600FEC1DFF88EFD708EFCC12006FBF8FF7109 +:104C4600503002CEABACCC0100F6BC0231B2E20F62 +:104C5600617902F6614902DFF371603002EF7E8E00 +:104C6600519B713BE28B5C02D1DD1D8B5C08D1DF71 +:104C76000971503002CC0100EFCF8C0570FDAC35C8 +:104C8600629E50CC0102EFC18B5C03D1DF408E5097 +:104C96009C04715030028C01D1DF0E8C0470FDF241 +:104CA60035629C05CC0101EF318C014C02DF0671A7 +:104CB600603002EF28CF34025A716030028C0470E3 +:104CC600C18C0570FD5335C0CF34024AEF0F8B5CA3 +:104CD60001D1DD0671603002EF03ED4F4C1006C0C6 +:104CE6009EFC609EFD34D4FE5206C0B9A5A592DF97 +:104CF600F961FCC1C3C5C7520C929269D4FEC1DFEB +:104D0600F88EFD708EFCC1710A9E31929E02EFFAFA +:104D16008F06FC4F96FFDF198F07FC4F97FFDF11B9 +:104D26008F08FC4F98FFDF095004C15011FD003574 +:104D3600C0710B9EC09EFC609EFD34D4FE5206C020 +:104D4600B9A5A592DFF9C6C4C2C061FCA046FC6144 +:104D5600FCC1C3C5C7520C929269D4FEC1DFF88E5E +:104D6600FD708EFCC1C1FBF8FF8D1F9C018E313199 +:104D76008EE7240600DD0823DD0F23DD25EF4571D0 +:104D86007AFA8C019F3CFCEF3B717AFA4023F901D9 +:104D9600DF078C019F3BFCEF2B51FF2E019F3BFC55 +:104DA600EF22717AFA8C019F02F98FDAFB5C01D14E +:104DB600DF124020F903DD064020F904DF06308DBE +:104DC60025FD6E394031FF09DE05A031FFEF19716F +:104DD60058F0007142224044FC02DF03F6EF05D989 +:104DE60044FCF1A1609F44FC710BE3C0C09EFC60D3 +:104DF6009EFD34D4FE5206C0B9A5A592DFF9C6C4FD +:104E0600C2C061FC61FF520C929269D4FEC1DFF808 +:104E16008EFD708EFCC1717AFA8F0CFC5C03D1DDBD +:104E2600194020F903DD064020F904DF0D36100590 +:104E360071D4DE0630A33AFD6E39C09EFC609EFD3D +:104E460034D4FE5206C0B9A5A592DFF961FC61FC17 +:104E560061FC61FC61FC61FC61FC61FC61FC61FC64 +:104E660061FC61FC61FC61FC61FC61FC61FC61FC54 +:104E760061FC61FC61FC61FC61FC61FC61FC61FC44 +:064E860061FC61FC61FC0F +:0A4E8C0000060C12181E242A30360E +:104E9600FF000000D4FB0000000040FC0000000002 +:104EA600EB3B3F368C223448372EF22E5947613D74 +:104EB6001209D83E01000000983AF82AFF000000C7 +:064EC6005555555547004B +:084ECC00317503F7332312D7FF +:024FF400013684 +:0A4FF60031353A31363A3139000006 :00000001FF  \ No newline at end of file diff --git a/branches/sim/bsr.lmf b/branches/sim/bsr.lmf index c2eaab0..1fee871 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 95ee135..5014c67 100644 --- a/branches/sim/bsr_k0r.map +++ b/branches/sim/bsr_k0r.map @@ -1,20 +1,20 @@ -78K0R Linker W1.33 Date:20 Jun 2011 Page: 1 +78K0R Linker W1.33 Date: 1 Jul 2011 Page: 1 Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - obsr.lmf ..\..\..\..\Program Files (x86)\NEC Electronics Tool - s\CC78K0R\W2.13\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -p - bsr_k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Elec - tronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bc - l0rm.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronic - s Tools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w0 loader.rel - pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2 - c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel r - enge.rel accero.rel self_flash.rel sw.rel task_debug.rel task - _misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel ta - sk_status.rel led_cam.rel led_pow.rel + s\CC78K0R\W2.13\lib78k0r\s0rm.rel -go85h,0FC00h,1024 -gi1B339 + 499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -bC:\Program F + iles (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.l + ib -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -iC:\Program Files ( + x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.d + r -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 vre + g_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 Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map @@ -23,9 +23,9 @@ Direc-file:bsr_mcu.dr *** Link information *** - 65 output segment(s) - 3E17H byte(s) real data - 5807 symbol(s) defined + 68 output segment(s) + 3D6BH byte(s) real data + 5798 symbol(s) defined *** Memory map *** @@ -57,7 +57,8 @@ Direc-file:bsr_mcu.dr LDR_CNSL 00002H 00000H CSEG PAGE64KP LDR_CNSL task_status 00002H 00000H -* gap * 00002H 0000EH + ??NMIROM 00002H 00002H CSEG +* gap * 00004H 0000CH @@VECT10 00010H 00004H CSEG AT @@VECT10 ini_VECT 00010H 00004H * gap * 00014H 00008H @@ -98,53 +99,54 @@ Direc-file:bsr_mcu.dr LDR_CODL task_status 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - LDR_CODE 000CEH 00955H CSEG - LDR_CODE loader 000CEH 00228H - LDR_CODE main 002F6H 00042H - LDR_CODE WDT 00338H 00000H - LDR_CODE i2c_mcu 00338H 002F0H + ?OCDSTAD 000CEH 0000AH CSEG + LDR_CODE 000D8H 008B4H CSEG + LDR_CODE loader 000D8H 00195H + LDR_CODE main 0026DH 00042H + LDR_CODE WDT 002AFH 00000H + LDR_CODE i2c_mcu 002AFH 002F0H LDR_CODE self_flash - 00628H 00373H + 0059FH 00373H LDR_CODE task_debug - 0099BH 00000H + 00912H 00000H LDR_CODE task_status - 0099BH 00088H - FSL_CODE 00A23H 00322H CSEG + 00912H 0007AH + FSL_CODE 0098CH 00322H CSEG FSL_CODE fsl_block_cmd - 00A23H 0002BH + 0098CH 0002BH FSL_CODE fsl_block_check - 00A4EH 00013H + 009B7H 00013H FSL_CODE fsl_common - 00A61H 0014FH + 009CAH 0014FH FSL_CODE fsl_reset - 00BB0H 00001H + 00B19H 00001H FSL_CODE fsl_si_ibf - 00BB1H 00064H + 00B1AH 00064H FSL_CODE fsl_phySwap - 00C15H 0004DH + 00B7EH 0004DH FSL_CODE fsl_si_common - 00C62H 00061H - FSL_CODE fsl_swap 00CC3H 00030H + 00BCBH 00061H + FSL_CODE fsl_swap 00C2CH 00030H FSL_CODE fsl_write - 00CF3H 00052H - @@LCODE 00D45H 00277H CSEG - @@LCODE @cstart 00D45H 0006DH - @@LCODE @imul 00DB2H 00011H - @@LCODE @lumul 00DC3H 0002BH - @@LCODE @isdiv 00DEEH 00022H - @@LCODE @iudiv 00E10H 0002DH - @@LCODE @isrem 00E3DH 00021H - @@LCODE @iurem 00E5EH 0002FH - @@LCODE @lsdiv 00E8DH 00039H - @@LCODE @ludiv 00EC6H 0003FH - @@LCODE @divuw 00F05H 00034H - @@LCODE @ladd 00F39H 0000FH - @@LCODE @llsh 00F48H 0001BH - @@LCODE @lursh 00F63H 0001FH - @@LCODE @iscmp 00F82H 0000CH - @@LCODE @lband 00F8EH 00014H - @@LCODE @bcdtob 00FA2H 0001AH -* gap * 00FBCH 0003AH + 00C5CH 00052H + @@LCODE 00CAEH 00277H CSEG + @@LCODE @cstart 00CAEH 0006DH + @@LCODE @imul 00D1BH 00011H + @@LCODE @lumul 00D2CH 0002BH + @@LCODE @isdiv 00D57H 00022H + @@LCODE @iudiv 00D79H 0002DH + @@LCODE @isrem 00DA6H 00021H + @@LCODE @iurem 00DC7H 0002FH + @@LCODE @lsdiv 00DF6H 00039H + @@LCODE @ludiv 00E2FH 0003FH + @@LCODE @divuw 00E6EH 00034H + @@LCODE @ladd 00EA2H 0000FH + @@LCODE @llsh 00EB1H 0001BH + @@LCODE @lursh 00ECCH 0001FH + @@LCODE @iscmp 00EEBH 0000CH + @@LCODE @lband 00EF7H 00014H + @@LCODE @bcdtob 00F0BH 0001AH +* gap * 00F25H 000D1H MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -186,251 +188,252 @@ Direc-file:bsr_mcu.dr 0226CH 00000H @@CNST led_cam 0226CH 00000H @@CNST led_pow 0226CH 00020H - ROM_CODE 0228CH 02751H CSEG + ROM_CODE 0228CH 0272AH CSEG ROM_CODE pm 0228CH 00A16H ROM_CODE i2c_ctr 02CA2H 00060H ROM_CODE i2c_twl 02D02H 0005EH ROM_CODE led 02D60H 00265H ROM_CODE rtc 02FC5H 000E0H - ROM_CODE vreg_ctr 030A5H 004C0H - ROM_CODE vreg_twl 03565H 000FAH - ROM_CODE adc 0365FH 002E7H - ROM_CODE renge 03946H 00190H - ROM_CODE accero 03AD6H 00148H - ROM_CODE sw 03C1EH 00176H + ROM_CODE vreg_ctr 030A5H 004A0H + ROM_CODE vreg_twl 03545H 000FAH + ROM_CODE adc 0363FH 002D4H + ROM_CODE renge 03913H 00190H + ROM_CODE accero 03AA3H 00148H + ROM_CODE sw 03BEBH 00176H ROM_CODE task_misc - 03D94H 00177H - ROM_CODE task_sys 03F0BH 00373H + 03D61H 00177H + ROM_CODE task_sys 03ED8H 0037FH ROM_CODE pedo_alg_thre_det2 - 0427EH 00502H - ROM_CODE led_cam 04780H 000DBH - ROM_CODE led_pow 0485BH 00182H - @@BASE 049DDH 004C6H CSEG BASE - @@BASE loader 049DDH 00000H - @@BASE pm 049DDH 0003FH - @@BASE i2c_ctr 04A1CH 0018DH - @@BASE main 04BA9H 00000H - @@BASE magic 04BA9H 00000H - @@BASE WDT 04BA9H 00000H - @@BASE i2c_mcu 04BA9H 0009CH - @@BASE i2c_twl 04C45H 000CBH - @@BASE led 04D10H 00000H - @@BASE rtc 04D10H 0005EH - @@BASE vreg_ctr 04D6EH 00000H - @@BASE vreg_twl 04D6EH 00000H - @@BASE adc 04D6EH 000B3H - @@BASE renge 04E21H 00000H - @@BASE accero 04E21H 0004AH + 04257H 00502H + ROM_CODE led_cam 04759H 000DBH + ROM_CODE led_pow 04834H 00182H + @@BASE 049B6H 004D6H CSEG BASE + @@BASE loader 049B6H 00000H + @@BASE pm 049B6H 0003FH + @@BASE i2c_ctr 049F5H 0019DH + @@BASE main 04B92H 00000H + @@BASE magic 04B92H 00000H + @@BASE WDT 04B92H 00000H + @@BASE i2c_mcu 04B92H 0009CH + @@BASE i2c_twl 04C2EH 000CBH + @@BASE led 04CF9H 00000H + @@BASE rtc 04CF9H 0005EH + @@BASE vreg_ctr 04D57H 00000H + @@BASE vreg_twl 04D57H 00000H + @@BASE adc 04D57H 000B3H + @@BASE renge 04E0AH 00000H + @@BASE accero 04E0AH 0004AH @@BASE self_flash - 04E6BH 00000H - @@BASE sw 04E6BH 00000H + 04E54H 00000H + @@BASE sw 04E54H 00000H @@BASE task_debug - 04E6BH 00000H + 04E54H 00000H @@BASE task_misc - 04E6BH 00000H - @@BASE task_sys 04E6BH 00000H + 04E54H 00000H + @@BASE task_sys 04E54H 00000H @@BASE pedo_alg_thre_det2 - 04E6BH 00000H - @@BASE ini_VECT 04E6BH 00038H + 04E54H 00000H + @@BASE ini_VECT 04E54H 00038H @@BASE task_status - 04EA3H 00000H - @@BASE led_cam 04EA3H 00000H - @@BASE led_pow 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP - @@CNSTL @cstart 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP - @@CNSTL pm 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP - @@CNSTL led 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP - @@CNSTL rtc 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP - @@CNSTL adc 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP - @@CNSTL renge 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP - @@CNSTL accero 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP - @@CNSTL sw 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP + 04E8CH 00000H + @@BASE led_cam 04E8CH 00000H + @@BASE led_pow 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP + @@CNSTL @cstart 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP + @@CNSTL pm 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP + @@CNSTL led 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP + @@CNSTL rtc 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP + @@CNSTL adc 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP + @@CNSTL renge 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP + @@CNSTL accero 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP + @@CNSTL sw 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP @@CNSTL task_misc - 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP - @@CNSTL task_sys 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP + 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP + @@CNSTL task_sys 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP - @@CNSTL led_cam 04EA3H 00000H - @@CNSTL 04EA3H 00000H CSEG PAGE64KP - @@CNSTL led_pow 04EA3H 00000H - @@R_INIS 04EA3H 00000H CSEG UNIT64KP - @@R_INIS @cstart 04EA3H 00000H - @@R_INIS loader 04EA3H 00000H - @@R_INIS pm 04EA3H 00000H - @@R_INIS i2c_ctr 04EA3H 00000H - @@R_INIS main 04EA3H 00000H - @@R_INIS magic 04EA3H 00000H - @@R_INIS WDT 04EA3H 00000H - @@R_INIS i2c_mcu 04EA3H 00000H - @@R_INIS i2c_twl 04EA3H 00000H - @@R_INIS led 04EA3H 00000H - @@R_INIS rtc 04EA3H 00000H - @@R_INIS vreg_ctr 04EA3H 00000H - @@R_INIS vreg_twl 04EA3H 00000H - @@R_INIS adc 04EA3H 00000H - @@R_INIS renge 04EA3H 00000H - @@R_INIS accero 04EA3H 00000H - @@R_INIS self_flash - 04EA3H 00000H - @@R_INIS sw 04EA3H 00000H - @@R_INIS task_debug - 04EA3H 00000H - @@R_INIS task_misc - 04EA3H 00000H - @@R_INIS task_sys 04EA3H 00000H - @@R_INIS pedo_alg_thre_det2 - 04EA3H 00000H - @@R_INIS ini_VECT 04EA3H 00000H - @@R_INIS task_status - 04EA3H 00000H - @@R_INIS led_cam 04EA3H 00000H - @@R_INIS led_pow 04EA3H 00000H - @@R_INIS @rom 04EA3H 00000H - @@CALT 04EA3H 00000H CSEG - @@CALT @cstart 04EA3H 00000H - @@CALT loader 04EA3H 00000H - @@CALT pm 04EA3H 00000H - @@CALT i2c_ctr 04EA3H 00000H - @@CALT main 04EA3H 00000H - @@CALT magic 04EA3H 00000H - @@CALT WDT 04EA3H 00000H - @@CALT i2c_mcu 04EA3H 00000H - @@CALT i2c_twl 04EA3H 00000H - @@CALT led 04EA3H 00000H - @@CALT rtc 04EA3H 00000H - @@CALT vreg_ctr 04EA3H 00000H - @@CALT vreg_twl 04EA3H 00000H - @@CALT adc 04EA3H 00000H - @@CALT renge 04EA3H 00000H - @@CALT accero 04EA3H 00000H - @@CALT self_flash - 04EA3H 00000H - @@CALT sw 04EA3H 00000H - @@CALT task_debug - 04EA3H 00000H - @@CALT task_misc - 04EA3H 00000H - @@CALT task_sys 04EA3H 00000H - @@CALT pedo_alg_thre_det2 - 04EA3H 00000H - @@CALT ini_VECT 04EA3H 00000H - @@CALT task_status - 04EA3H 00000H - @@CALT led_cam 04EA3H 00000H - @@CALT led_pow 04EA3H 00000H - @@RLINIT 04EA3H 00000H CSEG UNIT64KP - @@RLINIT loader 04EA3H 00000H - @@RLINIT pm 04EA3H 00000H - @@RLINIT i2c_ctr 04EA3H 00000H - @@RLINIT main 04EA3H 00000H - @@RLINIT magic 04EA3H 00000H - @@RLINIT WDT 04EA3H 00000H - @@RLINIT i2c_mcu 04EA3H 00000H - @@RLINIT i2c_twl 04EA3H 00000H - @@RLINIT led 04EA3H 00000H - @@RLINIT rtc 04EA3H 00000H - @@RLINIT vreg_ctr 04EA3H 00000H - @@RLINIT vreg_twl 04EA3H 00000H - @@RLINIT adc 04EA3H 00000H - @@RLINIT renge 04EA3H 00000H - @@RLINIT accero 04EA3H 00000H - @@RLINIT self_flash - 04EA3H 00000H - @@RLINIT sw 04EA3H 00000H - @@RLINIT task_debug - 04EA3H 00000H - @@RLINIT task_misc - 04EA3H 00000H - @@RLINIT task_sys 04EA3H 00000H - @@RLINIT pedo_alg_thre_det2 - 04EA3H 00000H - @@RLINIT ini_VECT 04EA3H 00000H - @@RLINIT task_status - 04EA3H 00000H - @@RLINIT led_cam 04EA3H 00000H - @@RLINIT led_pow 04EA3H 00000H - @@RLINIT @rom 04EA3H 00000H - @@CODEL 04EA3H 00000H CSEG - @@CODEL pm 04EA3H 00000H - @@CODEL i2c_ctr 04EA3H 00000H - @@CODEL magic 04EA3H 00000H - @@CODEL i2c_twl 04EA3H 00000H - @@CODEL led 04EA3H 00000H - @@CODEL rtc 04EA3H 00000H - @@CODEL vreg_ctr 04EA3H 00000H - @@CODEL vreg_twl 04EA3H 00000H - @@CODEL adc 04EA3H 00000H - @@CODEL renge 04EA3H 00000H - @@CODEL accero 04EA3H 00000H - @@CODEL sw 04EA3H 00000H - @@CODEL task_misc - 04EA3H 00000H - @@CODEL task_sys 04EA3H 00000H - @@CODEL pedo_alg_thre_det2 - 04EA3H 00000H - @@CODEL ini_VECT 04EA3H 00000H - @@CODEL led_cam 04EA3H 00000H - @@CODEL led_pow 04EA3H 00000H -* gap * 04EA3H 00001H - @@CNSTL 04EA4H 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04EA4H 0000AH - @@R_INIT 04EAEH 00038H CSEG UNIT64KP - @@R_INIT @cstart 04EAEH 00000H - @@R_INIT loader 04EAEH 00000H - @@R_INIT pm 04EAEH 00002H - @@R_INIT i2c_ctr 04EB0H 00002H - @@R_INIT main 04EB2H 00000H - @@R_INIT magic 04EB2H 00000H - @@R_INIT WDT 04EB2H 00000H - @@R_INIT i2c_mcu 04EB2H 00000H - @@R_INIT i2c_twl 04EB2H 00000H - @@R_INIT led 04EB2H 00000H - @@R_INIT rtc 04EB2H 00000H - @@R_INIT vreg_ctr 04EB2H 00000H - @@R_INIT vreg_twl 04EB2H 00000H - @@R_INIT adc 04EB2H 0000CH - @@R_INIT renge 04EBEH 00014H - @@R_INIT accero 04ED2H 00000H + 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP + @@CNSTL led_cam 04E8CH 00000H + @@CNSTL 04E8CH 00000H CSEG PAGE64KP + @@CNSTL led_pow 04E8CH 00000H + @@CNSTL 04E8CH 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04E8CH 0000AH + @@R_INIT 04E96H 00036H CSEG UNIT64KP + @@R_INIT @cstart 04E96H 00000H + @@R_INIT loader 04E96H 00000H + @@R_INIT pm 04E96H 00002H + @@R_INIT i2c_ctr 04E98H 00002H + @@R_INIT main 04E9AH 00000H + @@R_INIT magic 04E9AH 00000H + @@R_INIT WDT 04E9AH 00000H + @@R_INIT i2c_mcu 04E9AH 00000H + @@R_INIT i2c_twl 04E9AH 00000H + @@R_INIT led 04E9AH 00000H + @@R_INIT rtc 04E9AH 00000H + @@R_INIT vreg_ctr 04E9AH 00000H + @@R_INIT vreg_twl 04E9AH 00000H + @@R_INIT adc 04E9AH 0000CH + @@R_INIT renge 04EA6H 00014H + @@R_INIT accero 04EBAH 00000H @@R_INIT self_flash - 04ED2H 00000H - @@R_INIT sw 04ED2H 00002H + 04EBAH 00000H + @@R_INIT sw 04EBAH 00002H @@R_INIT task_debug - 04ED4H 00000H + 04EBCH 00000H @@R_INIT task_misc - 04ED4H 00000H - @@R_INIT task_sys 04ED4H 00002H + 04EBCH 00000H + @@R_INIT task_sys 04EBCH 00002H @@R_INIT pedo_alg_thre_det2 - 04ED6H 00006H - @@R_INIT ini_VECT 04EDCH 00000H + 04EBEH 00006H + @@R_INIT ini_VECT 04EC4H 00000H @@R_INIT task_status - 04EDCH 00002H - @@R_INIT led_cam 04EDEH 00002H - @@R_INIT led_pow 04EE0H 00006H - @@R_INIT @rom 04EE6H 00000H - @@LCODEL 04EE6H 00008H CSEG - @@LCODEL abs 04EE6H 00008H -* gap * 04EEEH 00108H + 04EC4H 00000H + @@R_INIT led_cam 04EC4H 00002H + @@R_INIT led_pow 04EC6H 00006H + @@R_INIT @rom 04ECCH 00000H + @@R_INIS 04ECCH 00000H CSEG UNIT64KP + @@R_INIS @cstart 04ECCH 00000H + @@R_INIS loader 04ECCH 00000H + @@R_INIS pm 04ECCH 00000H + @@R_INIS i2c_ctr 04ECCH 00000H + @@R_INIS main 04ECCH 00000H + @@R_INIS magic 04ECCH 00000H + @@R_INIS WDT 04ECCH 00000H + @@R_INIS i2c_mcu 04ECCH 00000H + @@R_INIS i2c_twl 04ECCH 00000H + @@R_INIS led 04ECCH 00000H + @@R_INIS rtc 04ECCH 00000H + @@R_INIS vreg_ctr 04ECCH 00000H + @@R_INIS vreg_twl 04ECCH 00000H + @@R_INIS adc 04ECCH 00000H + @@R_INIS renge 04ECCH 00000H + @@R_INIS accero 04ECCH 00000H + @@R_INIS self_flash + 04ECCH 00000H + @@R_INIS sw 04ECCH 00000H + @@R_INIS task_debug + 04ECCH 00000H + @@R_INIS task_misc + 04ECCH 00000H + @@R_INIS task_sys 04ECCH 00000H + @@R_INIS pedo_alg_thre_det2 + 04ECCH 00000H + @@R_INIS ini_VECT 04ECCH 00000H + @@R_INIS task_status + 04ECCH 00000H + @@R_INIS led_cam 04ECCH 00000H + @@R_INIS led_pow 04ECCH 00000H + @@R_INIS @rom 04ECCH 00000H + @@CALT 04ECCH 00000H CSEG + @@CALT @cstart 04ECCH 00000H + @@CALT loader 04ECCH 00000H + @@CALT pm 04ECCH 00000H + @@CALT i2c_ctr 04ECCH 00000H + @@CALT main 04ECCH 00000H + @@CALT magic 04ECCH 00000H + @@CALT WDT 04ECCH 00000H + @@CALT i2c_mcu 04ECCH 00000H + @@CALT i2c_twl 04ECCH 00000H + @@CALT led 04ECCH 00000H + @@CALT rtc 04ECCH 00000H + @@CALT vreg_ctr 04ECCH 00000H + @@CALT vreg_twl 04ECCH 00000H + @@CALT adc 04ECCH 00000H + @@CALT renge 04ECCH 00000H + @@CALT accero 04ECCH 00000H + @@CALT self_flash + 04ECCH 00000H + @@CALT sw 04ECCH 00000H + @@CALT task_debug + 04ECCH 00000H + @@CALT task_misc + 04ECCH 00000H + @@CALT task_sys 04ECCH 00000H + @@CALT pedo_alg_thre_det2 + 04ECCH 00000H + @@CALT ini_VECT 04ECCH 00000H + @@CALT task_status + 04ECCH 00000H + @@CALT led_cam 04ECCH 00000H + @@CALT led_pow 04ECCH 00000H + @@RLINIT 04ECCH 00000H CSEG UNIT64KP + @@RLINIT loader 04ECCH 00000H + @@RLINIT pm 04ECCH 00000H + @@RLINIT i2c_ctr 04ECCH 00000H + @@RLINIT main 04ECCH 00000H + @@RLINIT magic 04ECCH 00000H + @@RLINIT WDT 04ECCH 00000H + @@RLINIT i2c_mcu 04ECCH 00000H + @@RLINIT i2c_twl 04ECCH 00000H + @@RLINIT led 04ECCH 00000H + @@RLINIT rtc 04ECCH 00000H + @@RLINIT vreg_ctr 04ECCH 00000H + @@RLINIT vreg_twl 04ECCH 00000H + @@RLINIT adc 04ECCH 00000H + @@RLINIT renge 04ECCH 00000H + @@RLINIT accero 04ECCH 00000H + @@RLINIT self_flash + 04ECCH 00000H + @@RLINIT sw 04ECCH 00000H + @@RLINIT task_debug + 04ECCH 00000H + @@RLINIT task_misc + 04ECCH 00000H + @@RLINIT task_sys 04ECCH 00000H + @@RLINIT pedo_alg_thre_det2 + 04ECCH 00000H + @@RLINIT ini_VECT 04ECCH 00000H + @@RLINIT task_status + 04ECCH 00000H + @@RLINIT led_cam 04ECCH 00000H + @@RLINIT led_pow 04ECCH 00000H + @@RLINIT @rom 04ECCH 00000H + @@CODEL 04ECCH 00000H CSEG + @@CODEL pm 04ECCH 00000H + @@CODEL i2c_ctr 04ECCH 00000H + @@CODEL magic 04ECCH 00000H + @@CODEL i2c_twl 04ECCH 00000H + @@CODEL led 04ECCH 00000H + @@CODEL rtc 04ECCH 00000H + @@CODEL vreg_ctr 04ECCH 00000H + @@CODEL vreg_twl 04ECCH 00000H + @@CODEL adc 04ECCH 00000H + @@CODEL renge 04ECCH 00000H + @@CODEL accero 04ECCH 00000H + @@CODEL sw 04ECCH 00000H + @@CODEL task_misc + 04ECCH 00000H + @@CODEL task_sys 04ECCH 00000H + @@CODEL pedo_alg_thre_det2 + 04ECCH 00000H + @@CODEL ini_VECT 04ECCH 00000H + @@CODEL led_cam 04ECCH 00000H + @@CODEL led_pow 04ECCH 00000H + @@LCODEL 04ECCH 00008H CSEG + @@LCODEL abs 04ECCH 00008H +* gap * 04ED4H 00120H + MGC_VER 04FF4H 00002H CSEG AT + MGC_VER magic 04FF4H 00002H MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL magic 04FF6H 0000AH @@ -438,7 +441,7 @@ Direc-file:bsr_mcu.dr BASE ADDRESS=FF900H SIZE=00500H OUTPUT INPUT INPUT BASE SIZE SEGMENT SEGMENT MODULE ADDRESS - @@DATA FF900H 00430H DSEG BASEP + @@DATA FF900H 00424H DSEG BASEP @@DATA @cstart FF900H 00002H @@DATA loader FF902H 00000H @@DATA pm FF902H 00018H @@ -452,192 +455,192 @@ Direc-file:bsr_mcu.dr @@DATA rtc FFBC4H 00008H @@DATA vreg_ctr FFBCCH 0005EH @@DATA vreg_twl FFC2AH 00010H - @@DATA adc FFC3AH 00018H - @@DATA renge FFC52H 00016H - @@DATA accero FFC68H 00002H + @@DATA adc FFC3AH 0000CH + @@DATA renge FFC46H 00016H + @@DATA accero FFC5CH 00002H @@DATA self_flash - FFC6AH 00002H - @@DATA sw FFC6CH 0000AH + FFC5EH 00002H + @@DATA sw FFC60H 0000AH @@DATA task_debug - FFC76H 00000H + FFC6AH 00000H @@DATA task_misc - FFC76H 00004H - @@DATA task_sys FFC7AH 00002H + FFC6AH 00004H + @@DATA task_sys FFC6EH 00002H @@DATA pedo_alg_thre_det2 - FFC7CH 000A6H - @@DATA ini_VECT FFD22H 00000H + FFC70H 000A6H + @@DATA ini_VECT FFD16H 00000H @@DATA task_status - FFD22H 00002H - @@DATA led_cam FFD24H 00002H - @@DATA led_pow FFD26H 0000AH - @@DATA @rom FFD30H 00000H - @@INIT FFD30H 00038H DSEG BASEP - @@INIT @cstart FFD30H 00000H - @@INIT loader FFD30H 00000H - @@INIT pm FFD30H 00002H - @@INIT i2c_ctr FFD32H 00002H - @@INIT main FFD34H 00000H - @@INIT magic FFD34H 00000H - @@INIT WDT FFD34H 00000H - @@INIT i2c_mcu FFD34H 00000H - @@INIT i2c_twl FFD34H 00000H - @@INIT led FFD34H 00000H - @@INIT rtc FFD34H 00000H - @@INIT vreg_ctr FFD34H 00000H - @@INIT vreg_twl FFD34H 00000H - @@INIT adc FFD34H 0000CH - @@INIT renge FFD40H 00014H - @@INIT accero FFD54H 00000H + FFD16H 00002H + @@DATA led_cam FFD18H 00002H + @@DATA led_pow FFD1AH 0000AH + @@DATA @rom FFD24H 00000H + @@INIT FFD24H 00036H DSEG BASEP + @@INIT @cstart FFD24H 00000H + @@INIT loader FFD24H 00000H + @@INIT pm FFD24H 00002H + @@INIT i2c_ctr FFD26H 00002H + @@INIT main FFD28H 00000H + @@INIT magic FFD28H 00000H + @@INIT WDT FFD28H 00000H + @@INIT i2c_mcu FFD28H 00000H + @@INIT i2c_twl FFD28H 00000H + @@INIT led FFD28H 00000H + @@INIT rtc FFD28H 00000H + @@INIT vreg_ctr FFD28H 00000H + @@INIT vreg_twl FFD28H 00000H + @@INIT adc FFD28H 0000CH + @@INIT renge FFD34H 00014H + @@INIT accero FFD48H 00000H @@INIT self_flash - FFD54H 00000H - @@INIT sw FFD54H 00002H + FFD48H 00000H + @@INIT sw FFD48H 00002H @@INIT task_debug - FFD56H 00000H + FFD4AH 00000H @@INIT task_misc - FFD56H 00000H - @@INIT task_sys FFD56H 00002H + FFD4AH 00000H + @@INIT task_sys FFD4AH 00002H @@INIT pedo_alg_thre_det2 - FFD58H 00006H - @@INIT ini_VECT FFD5EH 00000H + FFD4CH 00006H + @@INIT ini_VECT FFD52H 00000H @@INIT task_status - FFD5EH 00002H - @@INIT led_cam FFD60H 00002H - @@INIT led_pow FFD62H 00006H - @@INIT @rom FFD68H 00000H - @@INIS FFD68H 00000H DSEG UNITP - @@INIS @cstart FFD68H 00000H - @@INIS loader FFD68H 00000H - @@INIS pm FFD68H 00000H - @@INIS i2c_ctr FFD68H 00000H - @@INIS main FFD68H 00000H - @@INIS magic FFD68H 00000H - @@INIS WDT FFD68H 00000H - @@INIS i2c_mcu FFD68H 00000H - @@INIS i2c_twl FFD68H 00000H - @@INIS led FFD68H 00000H - @@INIS rtc FFD68H 00000H - @@INIS vreg_ctr FFD68H 00000H - @@INIS vreg_twl FFD68H 00000H - @@INIS adc FFD68H 00000H - @@INIS renge FFD68H 00000H - @@INIS accero FFD68H 00000H + FFD52H 00000H + @@INIT led_cam FFD52H 00002H + @@INIT led_pow FFD54H 00006H + @@INIT @rom FFD5AH 00000H + @@INIS FFD5AH 00000H DSEG UNITP + @@INIS @cstart FFD5AH 00000H + @@INIS loader FFD5AH 00000H + @@INIS pm FFD5AH 00000H + @@INIS i2c_ctr FFD5AH 00000H + @@INIS main FFD5AH 00000H + @@INIS magic FFD5AH 00000H + @@INIS WDT FFD5AH 00000H + @@INIS i2c_mcu FFD5AH 00000H + @@INIS i2c_twl FFD5AH 00000H + @@INIS led FFD5AH 00000H + @@INIS rtc FFD5AH 00000H + @@INIS vreg_ctr FFD5AH 00000H + @@INIS vreg_twl FFD5AH 00000H + @@INIS adc FFD5AH 00000H + @@INIS renge FFD5AH 00000H + @@INIS accero FFD5AH 00000H @@INIS self_flash - FFD68H 00000H - @@INIS sw FFD68H 00000H + FFD5AH 00000H + @@INIS sw FFD5AH 00000H @@INIS task_debug - FFD68H 00000H + FFD5AH 00000H @@INIS task_misc - FFD68H 00000H - @@INIS task_sys FFD68H 00000H + FFD5AH 00000H + @@INIS task_sys FFD5AH 00000H @@INIS pedo_alg_thre_det2 - FFD68H 00000H - @@INIS ini_VECT FFD68H 00000H + FFD5AH 00000H + @@INIS ini_VECT FFD5AH 00000H @@INIS task_status - FFD68H 00000H - @@INIS led_cam FFD68H 00000H - @@INIS led_pow FFD68H 00000H - @@INIS @rom FFD68H 00000H - @@DATS FFD68H 00000H DSEG UNITP - @@DATS @cstart FFD68H 00000H - @@DATS loader FFD68H 00000H - @@DATS pm FFD68H 00000H - @@DATS i2c_ctr FFD68H 00000H - @@DATS main FFD68H 00000H - @@DATS magic FFD68H 00000H - @@DATS WDT FFD68H 00000H - @@DATS i2c_mcu FFD68H 00000H - @@DATS i2c_twl FFD68H 00000H - @@DATS led FFD68H 00000H - @@DATS rtc FFD68H 00000H - @@DATS vreg_ctr FFD68H 00000H - @@DATS vreg_twl FFD68H 00000H - @@DATS adc FFD68H 00000H - @@DATS renge FFD68H 00000H - @@DATS accero FFD68H 00000H + FFD5AH 00000H + @@INIS led_cam FFD5AH 00000H + @@INIS led_pow FFD5AH 00000H + @@INIS @rom FFD5AH 00000H + @@DATS FFD5AH 00000H DSEG UNITP + @@DATS @cstart FFD5AH 00000H + @@DATS loader FFD5AH 00000H + @@DATS pm FFD5AH 00000H + @@DATS i2c_ctr FFD5AH 00000H + @@DATS main FFD5AH 00000H + @@DATS magic FFD5AH 00000H + @@DATS WDT FFD5AH 00000H + @@DATS i2c_mcu FFD5AH 00000H + @@DATS i2c_twl FFD5AH 00000H + @@DATS led FFD5AH 00000H + @@DATS rtc FFD5AH 00000H + @@DATS vreg_ctr FFD5AH 00000H + @@DATS vreg_twl FFD5AH 00000H + @@DATS adc FFD5AH 00000H + @@DATS renge FFD5AH 00000H + @@DATS accero FFD5AH 00000H @@DATS self_flash - FFD68H 00000H - @@DATS sw FFD68H 00000H + FFD5AH 00000H + @@DATS sw FFD5AH 00000H @@DATS task_debug - FFD68H 00000H + FFD5AH 00000H @@DATS task_misc - FFD68H 00000H - @@DATS task_sys FFD68H 00000H + FFD5AH 00000H + @@DATS task_sys FFD5AH 00000H @@DATS pedo_alg_thre_det2 - FFD68H 00000H - @@DATS ini_VECT FFD68H 00000H + FFD5AH 00000H + @@DATS ini_VECT FFD5AH 00000H @@DATS task_status - FFD68H 00000H - @@DATS led_cam FFD68H 00000H - @@DATS led_pow FFD68H 00000H - @@DATS @rom FFD68H 00000H - FSL_DATA FFD68H 00010H DSEG UNITP + FFD5AH 00000H + @@DATS led_cam FFD5AH 00000H + @@DATS led_pow FFD5AH 00000H + @@DATS @rom FFD5AH 00000H + FSL_DATA FFD5AH 00010H DSEG UNITP FSL_DATA fsl_common - FFD68H 00010H - @@INITL FFD78H 00000H DSEG UNIT64KP - @@INITL loader FFD78H 00000H - @@INITL pm FFD78H 00000H - @@INITL i2c_ctr FFD78H 00000H - @@INITL main FFD78H 00000H - @@INITL magic FFD78H 00000H - @@INITL WDT FFD78H 00000H - @@INITL i2c_mcu FFD78H 00000H - @@INITL i2c_twl FFD78H 00000H - @@INITL led FFD78H 00000H - @@INITL rtc FFD78H 00000H - @@INITL vreg_ctr FFD78H 00000H - @@INITL vreg_twl FFD78H 00000H - @@INITL adc FFD78H 00000H - @@INITL renge FFD78H 00000H - @@INITL accero FFD78H 00000H + FFD5AH 00010H + @@INITL FFD6AH 00000H DSEG UNIT64KP + @@INITL loader FFD6AH 00000H + @@INITL pm FFD6AH 00000H + @@INITL i2c_ctr FFD6AH 00000H + @@INITL main FFD6AH 00000H + @@INITL magic FFD6AH 00000H + @@INITL WDT FFD6AH 00000H + @@INITL i2c_mcu FFD6AH 00000H + @@INITL i2c_twl FFD6AH 00000H + @@INITL led FFD6AH 00000H + @@INITL rtc FFD6AH 00000H + @@INITL vreg_ctr FFD6AH 00000H + @@INITL vreg_twl FFD6AH 00000H + @@INITL adc FFD6AH 00000H + @@INITL renge FFD6AH 00000H + @@INITL accero FFD6AH 00000H @@INITL self_flash - FFD78H 00000H - @@INITL sw FFD78H 00000H + FFD6AH 00000H + @@INITL sw FFD6AH 00000H @@INITL task_debug - FFD78H 00000H + FFD6AH 00000H @@INITL task_misc - FFD78H 00000H - @@INITL task_sys FFD78H 00000H + FFD6AH 00000H + @@INITL task_sys FFD6AH 00000H @@INITL pedo_alg_thre_det2 - FFD78H 00000H - @@INITL ini_VECT FFD78H 00000H + FFD6AH 00000H + @@INITL ini_VECT FFD6AH 00000H @@INITL task_status - FFD78H 00000H - @@INITL led_cam FFD78H 00000H - @@INITL led_pow FFD78H 00000H - @@INITL @rom FFD78H 00000H - @@DATAL FFD78H 00000H DSEG UNIT64KP - @@DATAL loader FFD78H 00000H - @@DATAL pm FFD78H 00000H - @@DATAL i2c_ctr FFD78H 00000H - @@DATAL main FFD78H 00000H - @@DATAL magic FFD78H 00000H - @@DATAL WDT FFD78H 00000H - @@DATAL i2c_mcu FFD78H 00000H - @@DATAL i2c_twl FFD78H 00000H - @@DATAL led FFD78H 00000H - @@DATAL rtc FFD78H 00000H - @@DATAL vreg_ctr FFD78H 00000H - @@DATAL vreg_twl FFD78H 00000H - @@DATAL adc FFD78H 00000H - @@DATAL renge FFD78H 00000H - @@DATAL accero FFD78H 00000H + FFD6AH 00000H + @@INITL led_cam FFD6AH 00000H + @@INITL led_pow FFD6AH 00000H + @@INITL @rom FFD6AH 00000H + @@DATAL FFD6AH 00000H DSEG UNIT64KP + @@DATAL loader FFD6AH 00000H + @@DATAL pm FFD6AH 00000H + @@DATAL i2c_ctr FFD6AH 00000H + @@DATAL main FFD6AH 00000H + @@DATAL magic FFD6AH 00000H + @@DATAL WDT FFD6AH 00000H + @@DATAL i2c_mcu FFD6AH 00000H + @@DATAL i2c_twl FFD6AH 00000H + @@DATAL led FFD6AH 00000H + @@DATAL rtc FFD6AH 00000H + @@DATAL vreg_ctr FFD6AH 00000H + @@DATAL vreg_twl FFD6AH 00000H + @@DATAL adc FFD6AH 00000H + @@DATAL renge FFD6AH 00000H + @@DATAL accero FFD6AH 00000H @@DATAL self_flash - FFD78H 00000H - @@DATAL sw FFD78H 00000H + FFD6AH 00000H + @@DATAL sw FFD6AH 00000H @@DATAL task_debug - FFD78H 00000H + FFD6AH 00000H @@DATAL task_misc - FFD78H 00000H - @@DATAL task_sys FFD78H 00000H + FFD6AH 00000H + @@DATAL task_sys FFD6AH 00000H @@DATAL pedo_alg_thre_det2 - FFD78H 00000H - @@DATAL ini_VECT FFD78H 00000H + FFD6AH 00000H + @@DATAL ini_VECT FFD6AH 00000H @@DATAL task_status - FFD78H 00000H - @@DATAL led_cam FFD78H 00000H - @@DATAL led_pow FFD78H 00000H - @@DATAL @rom FFD78H 00000H -* gap * FFD78H 00088H + FFD6AH 00000H + @@DATAL led_cam FFD6AH 00000H + @@DATAL led_pow FFD6AH 00000H + @@DATAL @rom FFD6AH 00000H +* gap * FFD6AH 00096H MEMORY=RAM2 BASE ADDRESS=FFE20H SIZE=000C0H diff --git a/branches/sim/config.h b/branches/sim/config.h index d2dfd75..8c7c0a0 100644 --- a/branches/sim/config.h +++ b/branches/sim/config.h @@ -27,7 +27,7 @@ #define MCU_VER_MAJOR 0x01 -#define MCU_VER_MINOR 0x40 +#define MCU_VER_MINOR 0x36 // ̎́C‚ȂƑ̌̐YłȂˁI #ifdef _TAIKENDAI_SEISAN_SPECIAL_ diff --git a/branches/sim/hoge.bin b/branches/sim/hoge.bin index a941672..a252c7f 100644 Binary files a/branches/sim/hoge.bin and b/branches/sim/hoge.bin differ diff --git a/branches/sim/i2c_ctr.c b/branches/sim/i2c_ctr.c index 20ab0e8..489c886 100644 --- a/branches/sim/i2c_ctr.c +++ b/branches/sim/i2c_ctr.c @@ -59,7 +59,7 @@ u8 iic_burst_state; /* ======================================================== ======================================================== */ -enum IIC_STATE +enum en_IIC_STATE { IIC_IDLE = 0, IIC_RCV_REG_ADRS, @@ -72,7 +72,7 @@ enum IIC_STATE // 1oCg̓xɊ荞݂o[W __interrupt void int_iic_ctr( ) { - static u8 state = IIC_IDLE; + static enum en_IIC_STATE state = IIC_IDLE; static u8 reg_adrs; static u8 reg_adrs_internal; static u8 tx_buf; @@ -121,12 +121,14 @@ __interrupt void int_iic_ctr( ) if( STD ) // 荞ݗvFX^[gRfBV { - if( ( state == IIC_TX ) || ( state == IIC_RX ) - || ( state == IIC_RCV_REG_ADRS ) - ) + if( ( state != IIC_IDLE ) && ( state != IIC_TX_OR_RX ) ) { - state = IIC_IDLE; + /* + // state = IIC_IDLE; // ƂȂ // no break // + */ + // Ȃ񂩕ςȃ^C~Oŗ + LREL = 1; // IĂ܂(nack)BgCĂ炨B듮h~H } } @@ -136,21 +138,21 @@ __interrupt void int_iic_ctr( ) // njĂяoɉB // Ȃ SPIE = 1; - state = IIC_RCV_REG_ADRS; WREL = 1; // EFCg + state = IIC_RCV_REG_ADRS; break; 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; - WREL = 1; break; case ( IIC_TX_OR_RX ): // ̎ɗ銄荞݁BSTȂ瑗MAf[^珑܂ -// if( TRC ){ // MtO ŋʂ̂́A荞ݒxɕsN肦 + // if( TRC ) // MtO ŋʂ̂́A荞ݒxɕsN肦 if( STD ) { // X^[gRfBVotO // [h @@ -162,9 +164,9 @@ __interrupt void int_iic_ctr( ) else { // X^[gňႤfoCXĂ΂ꂽI - state = IIC_IDLE; // I SPIE = 0; LREL = 1; // EFCg? + state = IIC_IDLE; // I return; } } @@ -173,6 +175,7 @@ __interrupt void int_iic_ctr( ) state = IIC_RX; // f[^1oCgM̊荞݂ // no break, no return // } + /* FALLTHROUGH */ default: // o[Xg R/W łĂ΂邱ƂɂȂ if( state == IIC_TX ) @@ -183,6 +186,13 @@ __interrupt void int_iic_ctr( ) else { // M rx_buf = IICA; + // debug? f[^΍ // + if( reg_adrs >= 0x80 || reg_adrs == 0 ) + { + LREL = 1; // Ȃ񂩃f[^̂ŒʐMI + return; + } + // else{ vreg_ctr_write( reg_adrs, rx_buf ); WREL = 1; } @@ -242,7 +252,7 @@ void IIC_ctr_Init( void ) SPIE = 0; // XgbvRfBVł̊荞݂֎~ WTIM = 1; // ACKԂclkLɌŒ肷 - ACKE = 1; // _CPU͖Ď̒ʐM͂߂邩ȂőclkJȂƂȂ + ACKE = 1; IICWH = 5; IICWL = 10; // LԂ̒ diff --git a/branches/sim/i2c_mcu.c b/branches/sim/i2c_mcu.c index 5e82587..71eae0b 100644 --- a/branches/sim/i2c_mcu.c +++ b/branches/sim/i2c_mcu.c @@ -562,7 +562,7 @@ void iic_mcu_start( ) DEN1 = 0; I2C_PU_on(); - wait_ms( 20 ); // オ̂50usʂ + wait_ms( 10 ); // オ̂50usʂ SAU0EN = 1; nop8(); diff --git a/branches/sim/i2c_twl.c b/branches/sim/i2c_twl.c index 1f5e7b6..87cdda6 100644 --- a/branches/sim/i2c_twl.c +++ b/branches/sim/i2c_twl.c @@ -94,7 +94,6 @@ enum IIC_TWL_STATE{ __interrupt void int_iic_twl( ) { u8 vreg_adrs; - u8 pre_dat; u8 rcvd; u16 tot; u8 state; diff --git a/branches/sim/loader.c b/branches/sim/loader.c index 79cedd7..478269a 100644 --- a/branches/sim/loader.c +++ b/branches/sim/loader.c @@ -226,7 +226,7 @@ void hdwinit( void ) /*--- doH̐ݒ ---*/ /* Zbg̃ftHǵAIvVEoCgɂĎw肳 */ LVIS = 0x00; /* VLVI = 4.22}0.1V */ - LVIM = 0x00; /* LVI֎~ */ +// LVIM = 0x00; /* LVI֎~ */ /* dd(VDD)od(VLVI)Ɋ */ /* dd(VDD)od> 8 ) & 0xFF ) ); } - else if( adrs == VREG_C_ACC_HOSU_HIST ) +/* + // debug I + else if( adrs == VREG_C_IRQ_MASK0 ) + { + return( vreg_ctr[ VREG_C_IRQ_MASK0 ] & 0x7F ); // `MSB0B1ȂʐMG[ + } +*/ + else if( adrs == VREG_C_ACC_HOSU_HIST ) { return( hosu_read() ); } diff --git a/branches/sim/vreg_ctr.h b/branches/sim/vreg_ctr.h index 161cb8a..dc216c3 100644 --- a/branches/sim/vreg_ctr.h +++ b/branches/sim/vreg_ctr.h @@ -114,8 +114,8 @@ #define REG_BIT_TWL_IRQ_VOL_CHANGE 0x40 // VOL option (0x26) -#define REG_BIT_VOL_UPDATE_TO_SLIDER ( 1 << 4 ) -#define REG_BIT_VOL_BY_SPI ( 1 << 0 ) +//#define REG_BIT_VOL_UPDATE_TO_SLIDER ( 1 << 4 ) +//#define REG_BIT_VOL_BY_SPI ( 1 << 0 ) // FORCE_REG̕ア // CODECPMIC NTR ̑㗝WX^ @@ -130,7 +130,7 @@ // RBR control (0x57) #define REG_BIT_FLIGHT ( 1 << 1 ) -#define REG_BIT_RESET ( 1 << 0 ) +#define REG_BIT_RESET_n ( 1 << 0 ) /* @@ -192,8 +192,8 @@ enum VREG_C_ADRS VREG_C_COMMAND3, // 'r' Ń}CRZbgA 'w' WDTZbg VREG_C_OFF_DELAY = 0x24, - VREG_C_VOL_DIGITAL = 0x25, // todo - VREG_C_VOL_OPTION, +// VREG_C_VOL_DIGITAL = 0x25, // todo +// VREG_C_VOL_OPTION, VREG_C_VOL_ADC_RAW = 0x27, VREG_C_LED_BRIGHT = 0x28, @@ -245,7 +245,7 @@ enum VREG_C_ADRS VREG_C_ACC_HOSU_HOUR_BOUNDARY = 0x50, VREG_C_ACC_HOSU_HOUR_BOUNDARY_SEC, - VREG_C_VOL_RBR_CONTROL = 0x57, + VREG_C_RBR_CONTROL = 0x57, VREG_C_VOL_CAL_MIN = 0x58, VREG_C_VOL_CAL_MAX, diff --git a/branches/sim/yav_mcu_bsr.plg b/branches/sim/yav_mcu_bsr.plg index e6e5100..f05ed28 100644 --- a/branches/sim/yav_mcu_bsr.plg +++ b/branches/sim/yav_mcu_bsr.plg @@ -1,164 +1,31 @@ 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 -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 -qvjl2w -sainter_asm -zpb -no pm.c -pm.c(479) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(784) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(788) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(818) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(839) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(905) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(914) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1117) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1119) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 9 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\pm.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -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\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 -qvjl2w -sainter_asm -zpb -w2 -no i2c_ctr.c +bsr_system.h(55) : CC78K0R warning W0851: Data aligned in 'struct tag' +i2c_ctr.c(77) : CC78K0R warning W0309: Unused 'reg_adrs_internal' +i2c_ctr.c(277) : CC78K0R warning W0851: Data aligned in '@@DATA section' +i2c_ctr.c(277) : CC78K0R warning W0851: Data aligned in '@@INIT section' +Compilation complete, 0 error(s) and 4 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 -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 -qvjl2w -sainter_asm -zpb -no magic.c -Compilation 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 -qvjl2w -sainter_asm -zpb -w2 -no magic.c +magic.c(16) : CC78K0R warning W0871: Data aligned after 'MGC_HEADdN' in 'MGC_MIMI section' +magic.c(24) : CC78K0R warning W0871: Data aligned after 'MGC_TAILd' in 'MGC_TAIL section' +magic.c(12) : CC78K0R warning W0871: Data aligned after 'MGC_LOADd' in 'MGC_LOAD section' +Compilation complete, 0 error(s) and 3 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\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 -qvjl2w -sainter_asm -zpb -no WDT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\WDT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_mcu.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 -qvjl2w -sainter_asm -zpb -w2 -no i2c_mcu.c +bsr_system.h(55) : CC78K0R warning W0851: Data aligned in 'struct tag' i2c_mcu.c(210) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. +i2c_mcu.c(655) : CC78K0R warning W0851: Data aligned in '@@DATA section' +Compilation complete, 0 error(s) and 3 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\i2c_mcu.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -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 -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 -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 -qvjl2w -sainter_asm -zpb -no vreg_ctr.c -vreg_ctr.c(161) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(162) : 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(167) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(215) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(215) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(220) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(220) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(224) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(224) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(228) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(228) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(232) : 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 -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 -qvjl2w -sainter_asm -zpb -no adc.c -adc.c(104) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(194) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(225) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(337) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(377) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(455) : CC78K0R warning W0745: Expected function prototype -adc.c(484) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(489) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(123) : 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\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 -qvjl2w -sainter_asm -zpb -no renge\renge.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\renge.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -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 -qvjl2w -sainter_asm -zpb -no self_flash.c -self_flash.c(280) : CC78K0R warning W0401: Conversion may lose significant digits -self_flash.c(281) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\self_flash.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -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 -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 -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 -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_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 -qvjl2w -sainter_asm -zpb -no task_sys.c -task_sys.c(215) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(531) : 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 -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c -pedo_alg_thre_det2.c(95) : CC78K0R warning W0745: Expected function prototype -pedo_alg_thre_det2.c(110) : CC78K0R warning W0401: Conversion may lose significant digits -pedo_alg_thre_det2.c(178) : CC78K0R warning W0401: Conversion may lose significant digits -pedo_alg_thre_det2.c(191) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 4 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 -qvjl2w -sainter_asm -zpb -no task_status.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\task_status.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no led_cam.c -led_cam.c(135) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\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 -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" -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 +"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 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 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 -4 -intel-HEX to bsr bin converter - file converted! - - -Build Total error(s) : 0 Total warning(s) : 56 +133 +!E debug enable!! +Build Total error(s) : 0 Total warning(s) : 10 diff --git a/branches/sim/yav_mcu_bsr.pri b/branches/sim/yav_mcu_bsr.pri index edd788b..1d8d57f 100644 --- a/branches/sim/yav_mcu_bsr.pri +++ b/branches/sim/yav_mcu_bsr.pri @@ -22,7 +22,7 @@ SubClock=None [Mapping] Count=0 [Main] -Geometry=154, 154, 1080, 635 +Geometry=22, 22, 1200, 858 Window=Max MDI_MAX=OFF Button=ON @@ -33,7 +33,7 @@ Coverage=OFF Timer=OFF Tracer=OFF [Load File] -Dir=\\Tsclient\c\78k_data\yav-mcu-basara\trunk\ +Dir=\\tsclient\C\78k_data\yav-mcu-basara\branches\sim\ SaveFilter=0 Start=0 End=0 @@ -45,7 +45,7 @@ Erase=OFF HighSpeed=OFF Symbol Reset=ON CPU Reset=ON -File1=\\Tsclient\c\78k_data\yav-mcu-basara\trunk\bsr.lmf +File1=\\tsclient\C\78k_data\yav-mcu-basara\branches\sim\bsr.lmf LoadFilter1=5 Offset1=0 Object1=ON @@ -55,7 +55,7 @@ HighSpeed1=OFF CPU Reset1=ON Symbol Reset1=ON [View File] -Dir=\\Tsclient\c\78k_data\yav-mcu-basara\trunk\ +Dir=\\tsclient\C\78k_data\yav-mcu-basara\branches\sim\ Filter=Source [Debugger Option] Source Path="" @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=28, 27, 1001, 770 +Geometry=0, 0, 600, 400 Window=Normal -DispStart=432 -CaretPos=433,0 +DispStart=60 +CaretPos=81,0 Mode=Normal DispFile= Address1= @@ -139,11 +139,27 @@ SaveRange=Screen SaveStart= SaveEnd= Accumulative=ON +[Source1] +Geometry=717, 97, 600, 750 +Window=Normal +DispStart=158 +CaretPos=209,0 +Mode=Normal +DispFile=\\tsclient\C\78k_data\yav-mcu-basara\branches\sim\i2c_ctr.c +Accumulative=ON +[Source2] +Geometry=0, 0, 600, 889 +Window=Normal +DispStart=344 +CaretPos=397,0 +Mode=Normal +DispFile=\\tsclient\C\78k_data\yav-mcu-basara\branches\sim\vreg_ctr.c +Accumulative=ON [Assemble] -Geometry=43, 31, 727, 721 -Window=Hide -DispStart=847754240 -CaretPos=0,0 +Geometry=50, 50, 600, 400 +Window=Normal +DispStart=684 +CaretPos=684,27 Address1= Address2= Address3= @@ -179,24 +195,24 @@ Data16= Case=ON Scan=OFF Direction=Down -FindStart=0 -FindEnd=0 +FindStart= +FindEnd= SaveRange=Screen SaveStart= SaveEnd= [Memory] -Geometry=244, 107, 550, 400 -Window=Normal -Boundary=163 +Geometry=0, 0, 0, 0 +Window=Hide +Boundary=0 Format=Hex Mode=Byte -Endian=Little +Endian= Ascii=OFF Idtag=OFF Address= -DispStart=000F2220 -CaretPosData=26, 62009 -CaretPosAscii=50176, 0 +DispStart=FFFFFFFF +CaretPosData=0, 0 +CaretPosAscii=0, 0 Address1= Address2= Address3= @@ -277,7 +293,7 @@ Address16= Boundary=0, 0 Mode=Hex Attribute=Show -Sort=Unsort +Sort=Address Pickup=OFF SelectSort=Address Last Name= @@ -814,9 +830,9 @@ L529=IICWL1 L530=IICWH1 L531=SVA1 [Local Variable] -Geometry=1032, 466, 400, 300 -Window=Normal -Boundary=13041851 +Geometry=0, 0, 0, 0 +Window=Hide +Boundary=0 Mode=Proper [Trace View] Geometry=0, 0, 0, 0 @@ -869,7 +885,7 @@ SaveEnd= Geometry=0, 0, 0, 0 Window=Hide Mode=Hex -Boundary=62 +Boundary=0 Pickup=OFF Name=Functional Register Bank=0 @@ -957,43 +973,44 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=981, 20, 440, 451 -Window=Normal -Boundary=13762700 -0=.battery_manufacturer,P,N,A,+,1 -1=.temp_fuel,P,N,A,+,1 -2=.bt_volt16,P,N,A,+,1 -Line=3 +Geometry=0, 0, 0, 0 +Window=Hide +Boundary=0 +Line=0 [Quick Watch] -0=LED_dim_status_info_G,P,A,1 -1=LED_dim_status_info_B,P,A,1 -2=LED_dim_status_info_R,P,A,1 -3=info_LED.info_LED,P,A,1 -4=temp,P,A,1 -5=p_batt_param,P,A,1 -6=loop,P,A,1 -7=system_status,P,A,1 -8=battery_manufacturer,P,A,1 -9=p_bt_param,P,A,1 -10=bt_volt16,P,A,1 -11=temp_fuel,P,A,1 +0= +1= +2= +3= +4= +5= +6= +7= +8= +9= +10= +11= 12= 13= 14= 15= [Software Break] -Geometry=75, 75, 500, 200 +Geometry=0, 876, 500, 200 Window=Normal Width=150 30 200 100 Name0=Swb00001 -Address0=pm.c#_BT_get_left+0x13c +Address0=vreg_ctr.c#_vreg_ctr_write+0x344 Window0=ASM Status0=ON -Name1=Swb00003 -Address1=pm.c#_BT_get_left+0x135 +Name1=Swb00002 +Address1=vreg_ctr.c#_vreg_ctr_write+0x353 Window1=ASM Status1=ON -Count=2 +Name2=Swb00003 +Address2=i2c_ctr.c#_int_iic_ctr+0x133 +Window2=ASM +Status2=ON +Count=3 [Reset] Debugger=ON Symbol=OFF diff --git a/branches/sim/yav_mcu_bsr.prj b/branches/sim/yav_mcu_bsr.prj index 677046f..84cb5cf 100644 --- a/branches/sim/yav_mcu_bsr.prj +++ b/branches/sim/yav_mcu_bsr.prj @@ -23,7 +23,7 @@ MuitiLoad=0 LoadPrjNum=0 CheckVersion=CC78K0R|W2.13;RA78K0R|W1.33 [Option.IDK0R32G] -File=\\Tsclient\c\78k_data\yav-mcu-basara\trunk\yav_mcu_bsr.pri +File=\\tsclient\C\78k_data\yav-mcu-basara\branches\sim\yav_mcu_bsr.pri [BuildMode2] BuildModeName=K0R_dbg TargetFile=0 @@ -36,6 +36,265 @@ TargetFile=0 [BuildMode5] BuildModeName=BSR_WM0 TargetFile=0 +[Options.OC78K0R 0] +Version=100 +O0=.\bsr.hex +O1=bsr.hex +UC=1 +UN=FF +UST= +USZ= +K=1 +ZF=0 +S=1 +E=0 +CommandFile=0 +[Options.OC78K0R 1] +Version=100 +UC=1 +UN=FF +UST= +USZ= +K=1 +ZF=0 +S=1 +E=0 +CommandFile=0 +[Options.OC78K0R 2] +Version=100 +O0=.\bsr.hex +O1=bsr.hex +UC=0 +UN=FF +UST= +USZ= +K=0 +ZF=0 +S=1 +E=0 +CommandFile=0 +[Options.OC78K0R 3] +Version=100 +O0=.\bsr.hex +O1=bsr.hex +UC=1 +UN=FF +UST= +USZ= +K=1 +ZF=0 +S=1 +E=0 +CommandFile=0 +[Options.OC78K0R 4] +Version=100 +O0=.\bsr.hex +O1=bsr.hex +UC=1 +UN=FF +UST= +USZ= +K=1 +ZF=0 +S=1 +E=0 +CommandFile=0 +[Options.OC78K0R 5] +Version=100 +O0=.\bsr.hex +O1=bsr.hex +UC=1 +UN=FF +UST= +USZ= +K=1 +ZF=0 +S=1 +E=0 +CommandFile=0 +[SrcFile] +Source1=loader.c +Source2=pm.c +Source3=i2c_ctr.c +Source4=main.c +Source5=magic.c +Source6=WDT.c +Source7=i2c_mcu.c +Source8=i2c_twl.c +Source9=led.c +Source10=rtc.c +Source11=vreg_ctr.c +Source12=vreg_twl.c +Source13=adc.c +Source14=renge\renge.c +Source15=accero.c +Source16=self_flash.c +Source17=sw.c +Source18=task_debug.c +Source19=task_misc.c +Source20=task_sys.c +Source21=pedo_alg_thre_det2.c +Source22=ini_VECT.c +Source23=task_status.c +Source24=led_cam.c +Source25=led_pow.c +[BuildBefore-AfterCmd] +Before1=c:\cygwin\bin\touch magic.c +After1=ruby nec_s_2_bsrbin2.rb bsr.hex +[Options.RA78K0R 0] +Version=100 +G=1 +GA=1 +E=0 +COMMON=0 +COMPATI=0 +P=1 +KA=1 +KS=0 +KX=0 +LF=0 +LW=132 +LL=0 +LT=8 +Z=0 +CommandFile=0 +RA_OPT= +[Options.RA78K0R 1] +Version=100 +G=0 +GA=0 +E=0 +COMMON=0 +COMPATI=0 +P=1 +KA=1 +KS=0 +KX=0 +LF=0 +LW=132 +LL=0 +LT=8 +Z=0 +CommandFile=0 +RA_OPT= +[Options.RA78K0R 2] +Version=100 +O0= +O1=obj +G=1 +GA=1 +E=0 +COMMON=0 +COMPATI=0 +P=1 +KA=1 +KS=0 +KX=0 +LF=0 +LW=132 +LL=0 +LT=8 +Z=0 +CommandFile=0 +RA_OPT= +[Options.RA78K0R 3] +Version=100 +G=1 +GA=1 +E=0 +COMMON=0 +COMPATI=0 +P=1 +KA=1 +KS=0 +KX=0 +LF=0 +LW=132 +LL=0 +LT=8 +Z=0 +CommandFile=0 +RA_OPT= +[Options.RA78K0R 4] +Version=100 +G=1 +GA=1 +E=0 +COMMON=0 +COMPATI=0 +P=1 +KA=1 +KS=0 +KX=0 +LF=0 +LW=132 +LL=0 +LT=8 +Z=0 +CommandFile=0 +RA_OPT= +[Options.RA78K0R 5] +Version=100 +G=1 +GA=1 +E=0 +COMMON=0 +COMPATI=0 +P=1 +KA=1 +KS=0 +KX=0 +LF=0 +LW=132 +LL=0 +LT=8 +Z=0 +CommandFile=0 +RA_OPT= +[ToolSet] +ToolSetName=(ύX)78K0R Software Package V1.10 +Tool1=CC78K0R|W2.13 +Tool2=RA78K0R|W1.33 +Tool3=SK78K0R|V3.10 +Tool4=ID78K0R-QB|V3.61 +[IncFile] +Include1=incs_loader.h +Include2=jhl_defs.h +Include3=config.h +Include4=user_define.h +Include5=bsr_system.h +Include6=renge\renge.h +Include7=renge\renge_defs.h +Include8=renge\renge_task_immediate.h +Include9=vreg_ctr.h +Include10=vreg_twl.h +Include11=loader.h +Include12=i2c_mcu.h +Include13=WDT.h +Include14=fsl_user.h +Include15=i2c_ctr.h +Include16=pm.h +Include17=rtc.h +Include18=reboot.h +Include19=magic.h +Include20=incs.h +Include21=i2c_twl.h +Include22=accero.h +Include23=pedometer.h +Include24=sw.h +Include25=adc.h +Include26=led.h +Include27=batt_params.h +Include28=pool.h +Include29=i2c_twl_defs.h +Include30=voltable.h +Include31=renge\renge_task_intval.h +Include32=self_flash.h +Include33=pedo_lpf_coeff.h +Include34=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +Include35=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h +Include36=sim\simOnWin.h +Include37=sim\sfrAlias.h [Options.CC78K0R 0] Version=210 Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r @@ -249,7 +508,7 @@ Intunexpand=1 Kanjicode=1210 Verbose=0 CommandFile=0 -Warninglevel=1 +Warninglevel=2 Startupchk=1 Fixation=0 FarROMization=0 @@ -505,227 +764,6 @@ VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 VF78K0Rvs= -[Options.OC78K0R 0] -Version=100 -O0=.\bsr.hex -O1=bsr.hex -UC=1 -UN=FF -UST= -USZ= -K=1 -ZF=0 -S=1 -E=0 -CommandFile=0 -[Options.OC78K0R 1] -Version=100 -UC=1 -UN=FF -UST= -USZ= -K=1 -ZF=0 -S=1 -E=0 -CommandFile=0 -[Options.OC78K0R 2] -Version=100 -O0=.\bsr.hex -O1=bsr.hex -UC=0 -UN=FF -UST= -USZ= -K=0 -ZF=0 -S=1 -E=0 -CommandFile=0 -[Options.OC78K0R 3] -Version=100 -O0=.\bsr.hex -O1=bsr.hex -UC=1 -UN=FF -UST= -USZ= -K=1 -ZF=0 -S=1 -E=0 -CommandFile=0 -[Options.OC78K0R 4] -Version=100 -O0=.\bsr.hex -O1=bsr.hex -UC=1 -UN=FF -UST= -USZ= -K=1 -ZF=0 -S=1 -E=0 -CommandFile=0 -[Options.OC78K0R 5] -Version=100 -O0=.\bsr.hex -O1=bsr.hex -UC=1 -UN=FF -UST= -USZ= -K=1 -ZF=0 -S=1 -E=0 -CommandFile=0 -[SrcFile] -Source1=loader.c -Source2=pm.c -Source3=i2c_ctr.c -Source4=main.c -Source5=magic.c -Source6=WDT.c -Source7=i2c_mcu.c -Source8=i2c_twl.c -Source9=led.c -Source10=rtc.c -Source11=vreg_ctr.c -Source12=vreg_twl.c -Source13=adc.c -Source14=renge\renge.c -Source15=accero.c -Source16=self_flash.c -Source17=sw.c -Source18=task_debug.c -Source19=task_misc.c -Source20=task_sys.c -Source21=pedo_alg_thre_det2.c -Source22=ini_VECT.c -Source23=task_status.c -Source24=led_cam.c -Source25=led_pow.c -[BuildBefore-AfterCmd] -Before1=c:\cygwin\bin\touch magic.c -After1=ruby nec_s_2_bsrbin2.rb bsr.hex -[Options.RA78K0R 0] -Version=100 -G=1 -GA=1 -E=0 -COMMON=0 -COMPATI=0 -P=1 -KA=1 -KS=0 -KX=0 -LF=0 -LW=132 -LL=0 -LT=8 -Z=0 -CommandFile=0 -RA_OPT= -[Options.RA78K0R 1] -Version=100 -G=0 -GA=0 -E=0 -COMMON=0 -COMPATI=0 -P=1 -KA=1 -KS=0 -KX=0 -LF=0 -LW=132 -LL=0 -LT=8 -Z=0 -CommandFile=0 -RA_OPT= -[Options.RA78K0R 2] -Version=100 -O0= -O1=obj -G=1 -GA=1 -E=0 -COMMON=0 -COMPATI=0 -P=1 -KA=1 -KS=0 -KX=0 -LF=0 -LW=132 -LL=0 -LT=8 -Z=0 -CommandFile=0 -RA_OPT= -[Options.RA78K0R 3] -Version=100 -G=1 -GA=1 -E=0 -COMMON=0 -COMPATI=0 -P=1 -KA=1 -KS=0 -KX=0 -LF=0 -LW=132 -LL=0 -LT=8 -Z=0 -CommandFile=0 -RA_OPT= -[Options.RA78K0R 4] -Version=100 -G=1 -GA=1 -E=0 -COMMON=0 -COMPATI=0 -P=1 -KA=1 -KS=0 -KX=0 -LF=0 -LW=132 -LL=0 -LT=8 -Z=0 -CommandFile=0 -RA_OPT= -[Options.RA78K0R 5] -Version=100 -G=1 -GA=1 -E=0 -COMMON=0 -COMPATI=0 -P=1 -KA=1 -KS=0 -KX=0 -LF=0 -LW=132 -LL=0 -LT=8 -Z=0 -CommandFile=0 -RA_OPT= -[ToolSet] -ToolSetName=(ύX)78K0R Software Package V1.10 -Tool1=CC78K0R|W2.13 -Tool2=RA78K0R|W1.33 -Tool3=SK78K0R|V3.10 -Tool4=ID78K0R-QB|V3.61 [Options.LK78K0R 0] Version=100 O0=bsr_k0r.lmf @@ -810,7 +848,7 @@ G=1 E=0 E0=flash.elk E1=a.elk -GO=0 +GO=1 GOValue=85 GOStart=FC00 GOSizeValue=1024 @@ -1019,41 +1057,3 @@ DefaultMode2=1 DefaultMode3=1 DefaultMode4=1 DefaultMode5=1 -[IncFile] -Include1=incs_loader.h -Include2=jhl_defs.h -Include3=config.h -Include4=user_define.h -Include5=bsr_system.h -Include6=renge\renge.h -Include7=renge\renge_defs.h -Include8=renge\renge_task_immediate.h -Include9=vreg_ctr.h -Include10=vreg_twl.h -Include11=loader.h -Include12=i2c_mcu.h -Include13=WDT.h -Include14=fsl_user.h -Include15=i2c_ctr.h -Include16=pm.h -Include17=rtc.h -Include18=reboot.h -Include19=magic.h -Include20=incs.h -Include21=i2c_twl.h -Include22=accero.h -Include23=pedometer.h -Include24=sw.h -Include25=adc.h -Include26=led.h -Include27=batt_params.h -Include28=pool.h -Include29=i2c_twl_defs.h -Include30=voltable.h -Include31=renge\renge_task_intval.h -Include32=self_flash.h -Include33=pedo_lpf_coeff.h -Include34=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h -Include35=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h -Include36=sim\simOnWin.h -Include37=sim\sfrAlias.h diff --git a/branches/sim/yav_mcu_bsr.prk b/branches/sim/yav_mcu_bsr.prk index 4ef0391..a9901ab 100644 --- a/branches/sim/yav_mcu_bsr.prk +++ b/branches/sim/yav_mcu_bsr.prk @@ -1,22 +1,14 @@ [ProjectManager] FrameMax=0 -FrameX=89 -FrameY=169 -FrameCX=1550 -FrameCY=921 -OpenFile1=led.c,0,100,100,1295,581,2,168,45,0 -OpenFile2=ProjectWindow +FrameX=11 +FrameY=26 +FrameCX=1614 +FrameCY=1005 +OpenFile1=ProjectWindow PrjPos=0,0,706,0,291 -OpenFile3=led_cam.c,0,125,125,1320,606,0,24,0,0 -OpenFile4=led_pow.c,0,150,150,1345,631,0,205,0,0 -OpenFile5=config.h,0,442,428,1557,1029,29,23,29,0 -OpenFile6=i2c_mcu.c,0,175,175,1766,882,0,303,0,0 -OpenFile7=i2c_mcu.h,0,200,200,1791,907,46,23,48,0 -OpenFile8=self_flash.c,0,0,0,1195,481,21,290,12,0 -OpenFile9=batt_params.h,0,596,19,1842,741,0,31,0,0 -OpenFile10=pm.c,0,225,225,1278,761,33,54,32,0 -OpenFile11=OutputWindow -OutputPos=0,198,904,529,1655 +OpenFile2=i2c_ctr.c,0,150,150,1469,736,0,40,0,0 +OpenFile3=OutputWindow +OutputPos=0,32,734,735,1861 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/branches/sim/yav_mcu_bsr.sdb b/branches/sim/yav_mcu_bsr.sdb index d554cbd..28cb653 100644 --- a/branches/sim/yav_mcu_bsr.sdb +++ b/branches/sim/yav_mcu_bsr.sdb @@ -1,9 +1,9 @@ [SdbInfo] Ver=5 [loader.c] -T=4cc02a17 +T=4e0a86c1 1=incs_loader.h -2=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h +2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 3=fsl_user.h 4=i2c_ctr.h 5=i2c_mcu.h @@ -12,21 +12,21 @@ T=4cc02a17 8=reboot.h 9=magic.h [pm.c] -T=4ce758f6 +T=4e0aea23 1=incs.h 2=adc.h 3=led.h 4=pm.h 5=renge\renge.h 6=batt_params.h -7=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h +7=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 8=fsl_user.h [i2c_ctr.c] -T=4cc020c9 +T=4e0d6607 1=config.h 2=incs.h [main.c] -T=4cd9f64d +T=4e0af952 1=incs_loader.h 2=WDT.h 3=rtc.h @@ -36,31 +36,31 @@ T=4cd9f64d 7=adc.h 8=pool.h [magic.c] -T=4ce75924 +T=4e0d6027 1=config.h 2=magic.h [WDT.c] -T=4cc020c9 +T=4dfae637 1=incs_loader.h [i2c_mcu.c] -T=4cd9f64c +T=4e0d6618 1=incs_loader.h 2=i2c_mcu.h [i2c_twl.c] -T=4cc020c9 +T=4e0c1e90 1=config.h 2=incs.h 3=i2c_twl_defs.h 4=i2c_twl.h [led.c] -T=4cd9fb99 +T=4dfafb99 1=incs.h 2=led.h [rtc.c] -T=4cd9f64c +T=4dfb0204 1=incs.h [vreg_ctr.c] -T=4cc020c9 +T=4e0d6024 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -68,17 +68,17 @@ T=4cc020c9 5=accero.h 6=pm.h 7=pool.h -8=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h +8=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 9=fsl_user.h [vreg_twl.c] -T=4cc11aea +T=4df868b8 1=incs.h 2=jhl_defs.h 3=led.h 4=vreg_twl.h 5=vreg_ctr.h [adc.c] -T=4cc14cca +T=4e0c1e90 1=incs.h 2=adc.h 3=pm.h @@ -86,30 +86,31 @@ T=4cc14cca 5=vreg_twl.h 6=voltable.h [renge\renge.c] -T=4cd9f64c +T=4e093f8f 1=renge\renge.h 2=renge\renge_task_intval.h 3=renge\renge_task_immediate.h 4=WDT.h 5=config.h 6=user_define.h -7=bsr_system.h +7=sim\simOnWin.h +8=bsr_system.h [accero.c] -T=4cc020c9 +T=4dff0001 1=config.h 2=incs.h -3=..\..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.12\inc78k0r\math.h +3=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h [self_flash.c] -T=4cd9f64c +T=4dfef02d 1=incs_loader.h -2=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h +2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 3=fsl_user.h 4=i2c_ctr.h 5=pool.h 6=magic.h 7=pm.h [sw.c] -T=4cc020c9 +T=4dfae24c 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -118,13 +119,13 @@ T=4cc020c9 6=rtc.h 7=sw.h [task_debug.c] -T=4cc020c9 +T=4dfae637 1=incs_loader.h 2=renge\renge.h 3=pm.h 4=accero.h [task_misc.c] -T=4cd9f5ab +T=4dff022d 1=incs.h 2=renge\renge.h 3=pm.h @@ -134,7 +135,7 @@ T=4cd9f5ab 7=led.h 8=vreg_twl.h [task_sys.c] -T=4cd9f64c +T=4e0af952 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -146,126 +147,143 @@ T=4cd9f64c 9=adc.h 10=self_flash.h [pedo_alg_thre_det2.c] -T=4cc020c9 +T=4e097fce 1=incs.h -2=..\..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.12\inc78k0r\math.h +2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h 3=accero.h 4=pedometer.h 5=pedo_lpf_coeff.h 6=pool.h [ini_VECT.c] -T=4cc020c9 +T=4dfaf66c 1=config.h [task_status.c] -T=4cc020c9 +T=4e0c2614 1=incs_loader.h 2=renge\renge.h 3=pm.h 4=accero.h 5=adc.h 6=i2c_mcu.h +[led_cam.c] +T=4dfae24c +1=incs.h +2=led.h +[led_pow.c] +T=4dfae637 +1=incs.h +2=led.h [incs_loader.h] -T=4cc020c9 -1=jhl_defs.h -2=user_define.h -3=bsr_system.h -4=renge\renge.h -5=vreg_ctr.h -6=vreg_twl.h -7=loader.h -8=i2c_mcu.h -9=WDT.h +T=4dfae8e8 +1=sim\simOnWin.h +2=jhl_defs.h +3=user_define.h +4=bsr_system.h +5=renge\renge.h +6=vreg_ctr.h +7=vreg_twl.h +8=loader.h +9=i2c_mcu.h +10=WDT.h [jhl_defs.h] -T=4cc020c9 +T=4df868b8 1=config.h [config.h] -T=4ce75a11 +T=4e0d28fe [user_define.h] -T=4cc020c9 +T=4e0af952 [bsr_system.h] -T=4cc020c9 +T=4df868b8 [renge\renge.h] -T=4cc020c4 +T=4df868b6 1=renge\renge_defs.h 2=renge\renge_task_immediate.h [renge\renge_defs.h] -T=4cc020c4 +T=4dfae85a [renge\renge_task_immediate.h] -T=4cc020c4 +T=4df868b6 1=renge\renge_defs.h [vreg_ctr.h] -T=4cc11aea +T=4e0af952 1=config.h [vreg_twl.h] -T=4cc11aea +T=4df868b8 [loader.h] -T=4cc020c9 +T=4df868b8 [i2c_mcu.h] -T=4cc020c9 +T=4df868b8 [WDT.h] -T=4cc020c9 -[C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h] -T=49a3bd4e +T=4df868b8 [fsl_user.h] -T=4cc020c9 +T=4dfea7e9 [i2c_ctr.h] -T=4cc020c9 +T=4df868b9 [pm.h] -T=4cd9f5ab +T=4dfef02d [rtc.h] -T=4cc020c9 +T=4df868b9 [reboot.h] -T=4cc020c9 +T=4df868b8 [magic.h] -T=4cc020c9 +T=4df868b8 [incs.h] -T=4cc020c9 -1=jhl_defs.h -2=user_define.h -3=bsr_system.h -4=renge\renge.h -5=loader.h -6=vreg_ctr.h -7=vreg_twl.h -8=i2c_mcu.h -9=i2c_twl.h -10=rtc.h -11=accero.h -12=pm.h -13=sw.h -14=adc.h -15=WDT.h +T=4dfec4bd +1=sim\simOnWin.h +2=jhl_defs.h +3=user_define.h +4=bsr_system.h +5=renge\renge.h +6=loader.h +7=vreg_ctr.h +8=vreg_twl.h +9=i2c_mcu.h +10=i2c_twl.h +11=rtc.h +12=accero.h +13=pm.h +14=sw.h +15=adc.h +16=WDT.h [i2c_twl.h] -T=4bf0fdc7 +T=4df868b8 [accero.h] -T=4cc020c9 +T=4df868b8 1=jhl_defs.h 2=pedometer.h [pedometer.h] -T=4cc020c9 +T=4df868b8 [sw.h] -T=4cc020c9 +T=4df868b8 1=config.h [adc.h] -T=4cc020c9 +T=4df868b8 1=jhl_defs.h [led.h] -T=4cc020c9 +T=4dfafdf5 [batt_params.h] -T=4cc020c9 +T=4df868b9 +1=jhl_defs.h [pool.h] -T=4cc020c9 +T=4df868b8 1=pedometer.h [i2c_twl_defs.h] -T=4cc020c9 +T=4df868b8 [voltable.h] -T=4cc020c9 +T=4df868b8 [renge\renge_task_intval.h] -T=4cc020c4 +T=4df868b6 1=renge\renge_defs.h -[..\..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.12\inc78k0r\math.h] -T=45f12258 [self_flash.h] -T=4cc020c9 +T=4df868b8 [pedo_lpf_coeff.h] -T=4cc020c9 +T=4df868b9 +[..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h] +T=49a3bd4e +[..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h] +T=45f12258 +[sim\simOnWin.h] +T=4e0014e7 +1=sim\sfrAlias.h +[sim\sfrAlias.h] +T=4e0af952 +1=config.h