diff --git a/flower_toriaezu2/VCProj/Debug/bsr_trunk.log b/flower_toriaezu2/VCProj/Debug/bsr_trunk.log index fb95820..ed3e340 100644 --- a/flower_toriaezu2/VCProj/Debug/bsr_trunk.log +++ b/flower_toriaezu2/VCProj/Debug/bsr_trunk.log @@ -1,9 +1,9 @@ -2013/01/28 10:34:28 にビルドを開始しました。 +2012/10/26 18:10:44 にビルドを開始しました。 1>ノード 2 上のプロジェクト "C:\78k_data\yav-mcu-basara\trunk\VCProj\bsr_trunk.vcxproj" (build ターゲット)。 1>InitializeBuildStatus: "Debug\bsr_trunk.unsuccessfulbuild" のタッチ タスクを実行しています。 ClCompile: - C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /Zi /nologo /W1 /WX- /O2 /Oy- /D _MBCS /D _MBCS /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc100.pdb" /Gd /TC /analyze- /errorReport:prompt ..\accero.c ..\adc.c ..\batt_params.c ..\hal.c ..\i2c_ctr.c "..\i2c_mcu-sub.c" ..\i2c_mcu.c ..\i2c_twl.c ..\ini_VECT.c ..\kanaria_c.c ..\led.c ..\led_cam.c ..\led_pow.c ..\loader.c ..\magic.c ..\main.c ..\pedo_alg_thre_det2.c ..\pedo_lpf_coeff.c ..\pm.c ..\reboot.c ..\renge\renge.c ..\rtc.c ..\self_flash.c ..\sim\simFixture.c ..\sw.c ..\task_debug.c ..\task_misc.c ..\task_status.c ..\task_sys.c ..\util_funcs.c ..\voltable.c ..\vreg_ctr.c ..\vreg_twl.c ..\WDT.c + C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /Zi /nologo /W1 /WX- /O2 /Oy- /D _MBCS /D _MBCS /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc100.pdb" /Gd /TC /analyze- /errorReport:prompt ..\accero.c ..\adc.c ..\batt_params.c ..\hal.c ..\i2c_ctr.c "..\i2c_mcu-sub.c" ..\i2c_mcu.c ..\i2c_twl.c ..\ini_VECT.c ..\kanaria_c.c ..\led.c ..\led_cam.c ..\led_pow.c ..\loader.c ..\magic.c ..\main.c ..\my_led.c ..\pedo_alg_thre_det2.c ..\pedo_lpf_coeff.c ..\pm.c ..\reboot.c ..\renge\renge.c ..\rtc.c ..\self_flash.c ..\sim\simFixture.c ..\sim\sim_interrupt_decrare.c ..\sw.c ..\task_debug.c ..\task_misc.c ..\task_status.c ..\task_sys.c ..\util_funcs.c ..\voltable.c ..\vreg_ctr.c ..\vreg_twl.c ..\WDT.c accero.c 1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。 adc.c @@ -25,7 +25,6 @@ 1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。 led.c 1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。 - 1>..\led.c(162): warning C4133: '初期化中' : 'uni_info_LED *' と 'char *' の間で型に互換性がありません。 led_cam.c 1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。 led_pow.c @@ -37,20 +36,17 @@ magic.c main.c 1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。 + my_led.c pedo_alg_thre_det2.c 1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。 pedo_lpf_coeff.c 1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。 pm.c 1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。 - 1>..\pm.c(1357): warning C4090: '=' : 異なる 'const' 修飾子です。 - reboot.c - 1>..\reboot.c(8): warning C4068: 不明なプラグマがありました。 - 1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。 - 1>..\reboot.c(14): fatal error C1021: プリプロセッサ コマンド 'asm' が無効です。 + 1>..\pm.c(1340): warning C4090: '=' : 異なる 'const' 修飾子です。 コードを生成中... 1>c:\78k_data\yav-mcu-basara\trunk\i2c_mcu.c(300): fatal error C1001: コンパイラで内部エラーが発生しました。 - (コンパイラ ファイル 'f:\dd\vctools\compiler\utc\src\p2\main.c[0x5E74372A:0x00000000]'、行 183) + (コンパイラ ファイル 'f:\dd\vctools\compiler\utc\src\p2\main.c[0x77D9372A:0x00000000]'、行 183) この問題を回避するには、上記の場所付近のプログラムを単純化するか変更してください。 詳細については、Visual C++ ヘルプ メニューのサポート情報コマンドを 選択してください。またはサポート情報 ヘルプ ファイルを参照してください。 @@ -58,4 +54,4 @@ ビルドに失敗しました。 -経過時間 00:00:12.85 +経過時間 00:00:15.85 diff --git a/flower_toriaezu2/VCProj/bsr_trunk.sdf b/flower_toriaezu2/VCProj/bsr_trunk.sdf index eb80e71..121579a 100644 Binary files a/flower_toriaezu2/VCProj/bsr_trunk.sdf and b/flower_toriaezu2/VCProj/bsr_trunk.sdf differ diff --git a/flower_toriaezu2/VCProj/bsr_trunk.suo b/flower_toriaezu2/VCProj/bsr_trunk.suo index 574ca8e..1196854 100644 Binary files a/flower_toriaezu2/VCProj/bsr_trunk.suo and b/flower_toriaezu2/VCProj/bsr_trunk.suo differ diff --git a/flower_toriaezu2/VCProj/bsr_trunk.vcxproj b/flower_toriaezu2/VCProj/bsr_trunk.vcxproj index a4fc5a6..3fe99ad 100644 --- a/flower_toriaezu2/VCProj/bsr_trunk.vcxproj +++ b/flower_toriaezu2/VCProj/bsr_trunk.vcxproj @@ -13,7 +13,6 @@ {9DF31AC3-BD19-4158-BD6F-9CFE64AEE5D2} bsr_trunk - arr_trunk diff --git a/flower_toriaezu2/bsr.hex b/flower_toriaezu2/bsr.hex index cd1a723..c8f3914 100644 --- a/flower_toriaezu2/bsr.hex +++ b/flower_toriaezu2/bsr.hex @@ -1,259 +1,261 @@ -:02000000570D9A -:04001000964898482E -:02001C00444A54 -:02002400EB4AA5 -:02002A00364B53 -:08003400634C064C5F4CA44E26 -:02004A009A48D2 -:02005A00D44888 -:02006200624EEC -:06008000F74C304D7A4DF3 -:0400C0007EFBFF04C0 +:02000000610D90 +:02000200FFFFFE +:040010007E4880485E +:02001C002C4A6C +:02002400D34ABD +:02002A001E4B6B +:080034004B4CEE4B474C8C4E87 +:02004A008248EA +:02005A00BC48A0 +:020062004A4E04 +:06008000DF4C184D624D3B +:0400C0007EFBFF853F :0A00C4001B339499E033F240BFAA09 -:1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A -:1000DE00D8710006F98EA89C018C015C10D1DD0A46 -:1000EE007110A6FB710006F9EF0B8C015C80D161DB -:1000FE00E8710006F98F06F931030EF6B1BBF66111 -:10010E004900DD05618900EFF5FDF401FD3101FDCA -:10011E008901FDFE09FD3509FDA52FFDDC2CEFA59E -:10012E00C0C6D7C7360000674C09DE3F318E04F6D5 -:10013E000FC1317B9EFDC411897267318E04F64F5B -:10014E0014896142DF03F6EF01E660610667318EC6 -:10015E00124900207267318E04F64F14896142DF16 -:10016E0003F6EF01E660610687EFBC40F84F3A6197 -:10017E00E88666D161E8FDA206C6D751065B0C3152 -:10018E001A9F08F9D508F9DF06710009F9EF047115 -:10019E000809F98F09F9310505CD3707EF03CD377A -:1001AE0005D908F9FD61298F06F95CE39F06F9511F -:1001BE00035B04318EE7240000DD1023DD0823DF0E -:1001CE000E712006F9D7713006F9D7714006F9D7AE -:1001DE00717BFACEA010CEA180E5F300000000CE18 -:1001EE00A408F5AAFFD78F06F9310508CD0003CD77 -:1001FE00030FEF08CD030EF690BFB401CD0408CD6A -:10020E000508F521FFCE22E9CE23F8CE24F3CE2524 -:10021E00FACE26FCCE275FCE2EFCCF1105F8CF12DC -:10022E000511CF350002CF370019CF530006CBEEA4 -:10023E00FEFFCE3831CE3970CF38050A308700BF79 -:10024E001801BF1A01BF1C01BF1E01D7D7C7F61672 -:10025E00FD8704717BFA31329B0871329B717AFAF9 -:10026E00EF0C717AFAA7F647DFE95203EF01F2C6F7 -:10027E00D7C7C1C1FBF8FF17A1C1E0C18C0A70C17D -:10028E008C0270FDA0021006629D548C0172100447 -:10029E00C6D7C7C1FBF8FFFD5B02D2DD045203EFE8 -:1002AE00698B70FDD403D2DD0771339B5202EF5A76 -:1002BE008C0870FDF003FD3B048B6C0170FDF003A8 -:1002CE00300400BF2401301740BF1C01300400BFB2 -:1002DE0022018C0A91DF04F6BF2A01710BE2CE4493 -:1002EE00FF3182E202EFFAAC0C148E449961790C64 -:1002FE0061690A8C0AD1DFDA8B4CA461F8FD84485F -:10030E00FD6404710BE271339BF2C0C6D7C7C1FB0B -:10031E00F8FFFD5B02D2DD045203EF25710AE68B76 -:10032E0070FDD403D2DD0771339B5202EF138C089C -:10033E0070FDF0038C0A70FDF003FD640471339BB5 -:10034E00F2C0C6D7C7C1FBF8FFFD5B02D2DD045277 -:10035E0003EF70710AE6710BE28B70FDD403D2DDF0 -:10036E000771339B5202EF5B710BE231229B44C744 -:10037E003422FBAC0C1652048B99A5A792DFF9C65A -:10038E008B9D518C089D528C0A9D533184BD02EF7A -:10039E00FA717ABDCEB144CBB422FB8C0A318EBE3B -:1003AE00B8CEBB48714BE1714BE5710ABD8C089E0E -:1003BE0044EF0F710BE68C089E448C0A9D50AC0CDA -:1003CE00BD4EF2C0C6D7C716FD1304AF0401BF0C55 -:1003DE000117FDF003D2DD07FD64045202EF01F2B6 -:1003EE00C6D7C716710AE6710BE2669E443182E2E9 -:1003FE0002EFFAF6420401DD09AF0401BF0C01E27F -:10040E00EF01F2C6D7AF2801085CFB08BF2801FD3B -:10041E005A02AF28015CFBBF2801300400BF2A013D -:10042E00301780BF1C01300400BF2201D7AF24015A -:10043E00086C0408BF2401AF28016C0F086C0B0870 -:10044E00BF2801FD5A02AF2A01085CFB08BF2A0132 -:10045E00FD5A02ED1304300400BF2401F6BF2A0139 -:10046E00300B0BBF2801FD5A02300B0FBF2801FDC8 -:10047E005A02300F0FBF2801D731449B01D771327A -:10048E009B6A0E03713B25713B23E0FD110A71201F -:10049E00F000FD5A02F6BF26015024BF1401CB44D2 -:1004AE000014300F0FBF280171239B710BE2710AEC -:1004BE00E6FD1304CE44FF3182E202EFFAFD64043E -:1004CE00AF0401BF0C0171339B71429BD731349B3A -:1004DE0002EFFAFD3B04713A25713A235A0EFC7174 -:1004EE0028F00071439BD77140F000717830027193 -:1004FE003AE6713BE2713BEA713BEE5A06FCCF34B1 -:10050E00024AE552FF711A52710A52714830027155 -:10051E0030300271203002CF330209CF32020B711C -:10052E0030310271203102713BE6717030028E263D -:10053E005CFC9E2671603002D7717830027148F0F3 -:10054E0000D7C72008FBF8FFFD9D085014C15008C6 -:10055E00FDCF07C0CC07048C074C14DE0C8C073182 -:10056E008EFD390A615907EFEECC07048C074C1447 -:10057E0061C8ED3E06CC06008C064C0461C8ED1D2C -:10058E0006300AF9BC02F6BBCEABAC31B2D109C70C -:10059E003641057184C6DEF3F1C73641057184C656 -:1005AE0061DC9C05713BD1AC02148F4005997150F2 -:1005BE005005617902617900F0E1614900DD09C7FA -:1005CE003641057184C6DEC3F1C73641057184C656 -:1005DE0061DC0E059C055040C18C07318E31AD1289 -:1005EE008C06318E318D03BDD831FFBDDADADAAD2E -:1005FE00D8FD050DC0D2DD0C5008C15014FDCF073B -:10060E00C0FDC20B8C05D1DF06615906ED86058C47 -:10061E0007318EFD3D0AD2DD0C5008C15014FDCFBE -:10062E0007C0FDC20B8C05D1DF06615907ED7A05B7 -:10063E0071605005CC0400CC05008C054C09DE2BF6 -:10064E008C05318E04F61FC1317B9EFDC41189725B -:10065E008C05318E04F64F14896142DF03F6EF01EB -:10066E00E6600E049C04615905EFCF41001140F87D -:10067E001F3A61E86159048C04D1DF08FDC30BFDFC -:10068E00D50CEF0C5008C15014FDCF07C0FDC20BA6 -:10069E001008C6D7C72004FBF8FF712B24CC01002D -:1006AE00F6BC02AC02440900DE3EAC0204F60F14A6 -:1006BE004100118972AC020C5014896142DF03F6BD -:1006CE00EF01E6600E019C01AC021249005072ACC3 -:1006DE000204F67F14896142DF03F6EF01E6600E35 -:1006EE00019C01617902EFBB40F67FFF61F8615911 -:1006FE00018C01D161F8ED9B07CC0100717AFAFDF6 -:10070E008704711300711B20710303710205E0C190 -:10071E005003FD722BC05013FD110A500FC1E0FDA6 -:10072E00722BC0CEABAC6159018C0191DD068C01F0 -:10073E004C03DF03E6EF01F66061FB7121048C01CF -:10074E004C0861F8CC010031320705A024FCEF0300 -:10075E00F524FC4024FC11DC22F524FCF0C15003EE -:10076E00FD722BC0CE3708CBE4FFFFCBE6FFF7CEF2 -:10077E00D4FFCF370008F5120561FDE6BC02F66125 -:10078E004902DD9F00000000617902EFF1FD9D0836 -:10079E00D2DFFA5008C15014FDCF07C0D2FDC20BF4 -:1007AE001004C6D73184BD02EFFA717BBDCBE4FFD6 -:1007BE00FFCBE6FFFFCBD4FFFF717ABED7717BBEB6 -:1007CE00D7C7C1200CFBF8FF8C0C318E31ADC13177 -:1007DE007B9DD4C0BC068DD49C088C149C0B8C14B1 -:1007EE00318E040C00128C0B318EBDD813FD940F7C -:1007FE0061C8ED9808CEABACCC05068C0B318EFDE6 -:10080E00350AD2DD158C0B318EFD390A6169058CE6 -:10081E0005D1DFE7FDCB07E2EF71CC0A008C0A4C65 -:10082E0004DE54F6BC02300AF9BBAC06148C089EEA -:10083E00FD118972AB146299AC06A1BC06617900F8 -:10084E00617902F0E1614902DFE05040C18C0B3169 -:10085E008E31AD128C0A318E318D03BDD831FFBD74 -:10086E00DADADAADD8FD050DC0D2DD06FDCB07E232 -:10087E00EF1961590AEFA68C0B318EFD3D0AD2DDC0 -:10088E0003E2EF0761590BEDEC07F2100EC6D7C766 -:10089E00717B9D717BFAFDB207300AF9FDE80AFD06 -:1008AE00730AC6D7FD9D08FDC20BFDCB07F5ABFF46 -:1008BE00F2D7C731049F067110B3FBEF047118B362 -:1008CE00FB8FB3FB7B9276D1DD5B8FB3FB9D9240AA -:1008DE0004F903DF22665C10D1DD1C8FB3FB5C10C4 -:1008EE00D1DD0B5080C15011FDCA34C0EF0950400C -:1008FE00C15011FDCA34C04004F903DD064004F9AD -:10090E0004DF22665C02D1DD1C8FB3FB5C02D1DDFD -:10091E000B5040C15010FDCA34C0EF095020C150D9 -:10092E0010FDCA34C0C6D7C7360000665C80D1DD64 -:10093E0010675C80D1DF0571339EEF0B71329EEF35 -:10094E000671040771319E665C40D1DD10675C4014 -:10095E00D1DF0571439EEF0B71429EEF06711405B8 -:10096E0071419E665C01D1DD10675C01D1DF0571BE -:10097E00539EEF0B71529EEF0671340771519E66B6 -:10098E005C02D1DD10675C02D1DF0571639EEF1D45 -:10099E0071629EEF184007F901DF08710402716160 -:1009AE009EEF0AC736100571C4C671619E665C045F -:1009BE00D1DD10675C04D1DF0571739EEF0B717290 -:1009CE009EEF0671440771719E665C08D1DD10675B -:1009DE005C08D1DF0571039FEF0B71029FEF06716B -:1009EE00140771019F665C10D161E8715AD1C6D7A8 -:1009FE00F5F6FBF5F8FBCFFEFBFFCFFAFBFFCFFBC7 -:100A0E00FBFFD7C7C1C1FBF8FFCEABAC8C02D1DD6B -:100A1E0012616902305C03BBF6614900DDEE61894B -:070A2E0000EFF51004C6D72C -:100A35005208EF065203EF025206FEE600FE1B00C7 -:100A4500DC16089F03088F0408089F040862FE242B -:100A550000089F0408EEBF00EEBA00C1C514410EA0 -:100A650011D9D0FF118FD1FF312E45C4C0D7F23136 -:100A7500A2C401E2D79DE261DD4C09DF12717BFA68 -:100A8500C18F06089F25FDC0CF060800EE2700315F -:100A9500F2FA04CF0608004C00DF05D50008DD1684 -:100AA50061DD717BFAD50608DD0ACDE31F61CD61F5 -:100AB500CDEE160061CDFED40061FFFE9A00FCF874 -:100AC500FF0EFEB20061CDFED5004C09DF0EC18FD1 -:100AD50006086F25FD9F0608C0EE0400CF06080036 -:100AE500F8E3D75200EF025202FE3700CF24FD0093 -:100AF500CF060800BF0408C716629F000841001111 -:100B05008F1A209B4100118F1B209F0108C65100A1 -:100B1500FE62FFEF025205CF060800C1510CFE0A26 -:100B250000C0D7C1511DFE0200C0D761DD717BFA3F -:100B350070CEC0A59EC47CFF9EC4609EC461CDD707 -:100B450061DD717BFAC18EC45C1BFED6FFCF060842 -:100B550001FED7FFC061CDD731F2FA1AC1AEE4BFAD -:100B650016FDAEE6BF18FDAED4BF1AFD30FFFFBEC1 -:100B7500E4BEE6BED4C0D731F2FA11C1AF16FDBE50 -:100B8500E4AF18FDBEE6AF1AFDBED4C0D7C1BF1C89 -:100B9500FD13BF1EFD15BF20FD17BF22FDC0D7AF3A -:100BA5001CFDDB1EFDEB20FDFB22FDD7534B305218 -:100BB5005430324E323030475631323000FFC1505A -:100BC500FEFEAB0061DD717BFACF060800FE0A0070 -:100BD500FEA4FF61CDF8E3EECF00C7FB0408BF1606 -:100BE500FD8FC0009C05C5C337040600BF18FD3541 -:100BF50036270C300000522BFE6600C2C4C630D525 -:100C05000BB800300000B8022004AF18FDB8003062 -:100C15000F00B802AF16FD61FF520AFE3AFFECF86D -:100C2500FF0E717BFAC1C7FB04088C05C65C80FE0C -:100C35000200C0D761DD717BFA70CFC0FFA59FC0F0 -:100C4500007CFF9FC000609FC00061CDD7618BFE17 -:100C5500E2FF717BBE410011FB000017CEFC006175 -:100C6500CB089EFDF31161C999A58392DFF7D7FEE5 -:100C7500B1FED524FDDF23C1CF0308035109FEF4DE -:100C8500FDC0D2DF37FE3800A20408CF03080751A4 -:100C950009FEE1FDD2B20408DF22C7FB0408318357 -:100CA50002C6D7C6510AFECCFD624C1FDF06CF2413 -:100CB500FD01EF04CF24FD00C0EE5BFEC0EE55FE46 -:100CC500C7C1FB04088B31196C0161589BC0C6D79D -:100CD500717BFAFE4DFEAF0408040600C1143639D7 -:100CE5000C300000522DF3FE77FF8FC000FE2BFE67 -:100CF50061CF5C807C8073C0041900CEFC0F61CB92 -:100D0500C55404EF03C55417FE18FEC7360008BBCB -:100D1500629C0288089C03D1DD334C41DE2F70F1C3 -:100D2500312DB161090033081C000851FF612A41CA -:100D35000E118FD0FF613B118FD1FF6138DC0E8B17 -:100D45005C03DF0964C6C4FE2BFDEECAFDC6C4EE16 -:020D5500C3FDDC -:100D570061CF5100718C7109FECBF800FEFCDE01FA -:100D670000F6BF00F953C0F693935820FEDFF94110 -:100D77000036B44E34CCFCEF05118B99A7A5174468 -:100D8700FE4EDFF53602F930CCFCEF04CC0000A7AD -:100D970047DFF9410036FE4E3420FEEF05118B99EF -:100DA700A7A517440E4FDFF53630FE309AFEEF0445 -:100DB700CC0000A747DFF9FCCE0000EFFE61DD7134 -:100DC7007BFABEF0ADD8BEF200AEF661CDD7C361F7 -:100DD700DD717BFABEF0ADD8BEF200DBF6FFADDC0D -:100DE700BEF000AEF6BDD8AEF40312ADDABEF20027 -:100DF700AEF661CD03BDDAC2D7C3F33174D9088328 -:100E0700C1F626D8BDD8C031750683C312F623C2F2 -:100E1700FD220E93DF0312F623C2D7440000DD261E -:100E270061DD717BFACFE80080BEF6F6BEF4BEF254 -:100E3700ADD8BEF0CFE800818FE8003103FAAEF0FD -:100E4700F5E80061CDD7B1D7C3F33174D90883C1B1 -:100E5700F626D8BDD8C0317505C312F623C2FD707A -:100E67000E93DF0312F623C2D7440000DD2761DDAE -:100E7700717BFACFE80080BEF6F6BEF4BEF2ADD8BD -:100E8700BEF0CFE800818FE8003103FAAFE000F54C -:100E9700E80061CDD7ADD8D7C3F33174DB0F83C179 -:100EA700F626D8BDD861317026DABDDAC031750DA6 -:100EB70083C312F626DCBDDC61317023C2FDD80E78 -:100EC70093DF0CF626D8BDD861317026DABDDAC2B9 -:100ED700D7C161686BDC6BDDC0DD2F61DD717BFA2B -:100EE700CFE80080BEF4ADDCBEF6ADD8BEF0ADDA1B -:100EF700BEF2CFE800818FE8003103FAAEF0BDD82B -:100F0700AEF2BDDAF5E80061CDD7F6BDD8BDDAD7C8 -:100F17008292DD2B61DD717BFACFE80080BEF0F6AF -:100F2700BEF2BEF46208BEF6CFE800818FE800315A -:100F370003FAAFE0006072AEF0F5E80061CDD7606C -:100F470072F6B1D706DABDDAADDC06D8BDD861D8FE -:100F5700A6DAD7D1DD17C1C3DAD89DD8ADDA311CEF -:100F670061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD82 -:100F77001BC1C3DADA9DDAADD8311E33311E3371A6 -:100F8700F9B4DADFF4BDD813BDDAC2C0D746D8DD6D -:100F97000771FF7177D971C0D75BDB9DDB605BDAC7 -:100FA7009DDAADDC5BD9085BD808BDD8D7C3C7F3DA -:100FB700728EFDC162314C410036AA4E1161A0729A -:070FC700C09EFD62C6C2D707 -:0A0FF60030393A32393A3130000048 -:0A20000030393A32393A313000002D +:0A00CE00FFFFFFFFFFFFFFFFFFFF32 +:1000D800C7C1FBF8FFCEABACC736F00071F4C66100 +:1000E800D8710006F98EA89C018C015C10D1DD0A3C +:1000F8007110A6FB710006F9EF0B8C015C80D161D1 +:10010800E8710006F98F06F931030EF6B1BBF66106 +:100118004900DD05618900EFF5FDFE01FD3B01FDAC +:100128009301FD080AFD3F09FD922FFDB92CEFA5AB +:10013800C0C6D7C7360000674C09DE3F318E04F6CB +:100148000FC1317B9EFDC411897267318E04F64F51 +:1001580014896142DF03F6EF01E660610667318EBC +:10016800124900207267318E04F64F14896142DF0C +:1001780003F6EF01E660610687EFBC40F84F3A618D +:10018800E88666D161E8FDAC06C6D751065B0C313E +:100198001A9F08F9D508F9DF06710009F9EF04710B +:1001A8000809F98F09F9310505CD3707EF03CD3770 +:1001B80005D908F9FD5F298F06F95CE39F06F95117 +:1001C800035B04318EE7240000DD1023DD0823DF04 +:1001D8000E712006F9D7713006F9D7714006F9D7A4 +:1001E800717BFACEA010CEA180E5F300000000CE0E +:1001F800A408F5AAFFD78F06F9310508CD0003CD6D +:10020800030FEF08CD030EF690BFB401CD0408CD5F +:100218000508F521FFCE22E9CE23F8CE24F3CE251A +:10022800FACE26FCCE275FCE2EFCCF1105F8CF12D2 +:100238000511CF350002CF370019CF530006CBEE9A +:10024800FEFFCE3831CE3970CF38050A308700BF6F +:100258001801BF1A01BF1C01BF1E01D7D7C7F61668 +:10026800FD9104717BFA31329708713297717AFAED +:10027800EF0C717AFAA7F647DFE95203EF01F2C6ED +:10028800D7C7C1C1FBF8FF17A1C1E0C18C0A70C173 +:100298008C0270FDAA021006629D528C0172100435 +:1002A800C6D7C7C1FBF8FFFD6502D2DD045203EFD4 +:1002B800698B70FDDE03D2DD077133975202EF5A66 +:1002C8008C0870FDFA03FD45048B6C0170FDFA0380 +:1002D800300400BF2401301740BF1C01300400BFA8 +:1002E80022018C0A91DF04F6BF2A01710BE2CE4489 +:1002F800FF3182E202EFFAAC0C148E449961790C5A +:1003080061690A8C0AD1DFDA8B4CA461F8FD6C486C +:10031800FD6E04710BE2713397F2C0C6D7C7C1FBFB +:10032800F8FFFD6502D2DD045203EF25710AE68B62 +:1003380070FDDE03D2DD077133975202EF138C088C +:1003480070FDFA038C0A70FDFA03FD6E0471339791 +:10035800F2C0C6D7C7C1FBF8FFFD6502D2DD045263 +:1003680003EF70710AE6710BE28B70FDDE03D2DDDC +:10037800077133975202EF5B710BE231229744C742 +:100388003422FBAC0C1652048B99A5A792DFF9C650 +:100398008B9D4F8C089D508C0A9D513184BD02EF76 +:1003A800FA717ABDCEB144CBB422FB8C0A318EBE31 +:1003B800B8CEBB48714BE1714BE5710ABD8C089E04 +:1003C80044EF0F710BE68C089E448C0A9D4EAC0CD2 +:1003D800BD4CF2C0C6D7C716FD1D04AF0401BF0C43 +:1003E8000117FDFA03D2DD07FD6E045202EF01F298 +:1003F800C6D7C716710AE6710BE2669E443182E2DF +:1004080002EFFAF6420401DD09AF0401BF0C01E274 +:10041800EF01F2C6D7AF2801085CFB08BF2801FD31 +:100428006402AF28015CFBBF2801300400BF2A0129 +:10043800301780BF1C01300400BF2201D7AF240150 +:10044800086C0408BF2401AF28016C0F086C0B0866 +:10045800BF2801FD6402AF2A01085CFB08BF2A011E +:10046800FD6402ED1D04300400BF2401F6BF2A011B +:10047800300B0BBF2801FD6402300B0FBF2801FDB4 +:100488006402300F0FBF2801D731449701D771326A +:10049800976A0E03713B25713B23E0FD1B0A71200F +:1004A800F000FD6402F6BF26015024BF1401CB44BE +:1004B8000014300F0FBF2801712397710BE2710AE6 +:1004C800E6FD1D04CE44FF3182E202EFFAFD6E0420 +:1004D800AF0401BF0C01713397714297D73134973C +:1004E80002EFFAFD4504713A25713A235A0EFC7160 +:1004F80028F000714397D77140F00071783002718D +:100508003AE6713BE2713BEA713BEE5A06FCCF34A6 +:10051800024AE552FF711A52710A5271483002714B +:1005280030300271203002CF330209CF32020B7112 +:1005380030310271203102713BE6717030028E2633 +:100548005CFC9E2671603002D7717830027148F0E9 +:1005580000D7C72008FBF8FFFDA7085014C15008B2 +:10056800FDD907C0CC07048C074C14DE0C8C07316E +:100578008EFD430A615907EFEECC07048C074C1433 +:1005880061C8ED4806CC06008C064C0461C8ED270E +:1005980006300AF9BC02F6BBCEABAC31B2D109C702 +:1005A8003641057184C6DEF3F1C73641057184C64C +:1005B80061DC9C05713BD1AC02148F4005997150E8 +:1005C8005005617902617900F0E1614900DD09C7F0 +:1005D8003641057184C6DEC3F1C73641057184C64C +:1005E80061DC0E059C055040C18C07318E31AD127F +:1005F8008C06318E318D03BDD831FFBDDADADAAD24 +:10060800D8FD0F0DC0D2DD0C5008C15014FDD9071C +:10061800C0FDCC0B8C05D1DF06615906ED90058C29 +:1006280007318EFD470AD2DD0C5008C15014FDD9A0 +:1006380007C0FDCC0B8C05D1DF06615907ED840599 +:1006480071605005CC0400CC05008C054C09DE2BEC +:100658008C05318E04F61FC1317B9EFDC411897251 +:100668008C05318E04F64F14896142DF03F6EF01E1 +:10067800E6600E049C04615905EFCF41001140F873 +:100688001F3A61E86159048C04D1DF08FDCD0BFDE8 +:10069800DF0CEF0C5008C15014FDD907C0FDCC0B7E +:1006A8001008C6D7C72004FBF8FF712B24CC010023 +:1006B800F6BC02AC02440900DE3EAC0204F60F149C +:1006C8004100118972AC020C5014896142DF03F6B3 +:1006D800EF01E6600E019C01AC021249005072ACB9 +:1006E8000204F67F14896142DF03F6EF01E6600E2B +:1006F800019C01617902EFBB40F67FFF61F8615907 +:10070800018C01D161F8EDA507CC0100717AFAFDE1 +:100718009104711300711B20710303710205E0C17C +:100728005003FD722BC05013FD1B0A500FC1E0FD92 +:10073800722BC0CEABAC6159018C0191DD068C01E6 +:100748004C03DF03E6EF01F66061FB7121048C01C5 +:100758004C0861F8CC010031320705A024FCEF03F6 +:10076800F524FC4024FC11DC22F524FCF0C15003E4 +:10077800FD722BC0CE3708CBE4FFFFCBE6FFF7CEE8 +:10078800D4FFCF370008F5120561FDE6BC02F6611B +:100798004902DD9F00000000617902EFF1FDA70822 +:1007A800D2DFFA5008C15014FDD907C0D2FDCC0BD6 +:1007B8001004C6D73184BD02EFFA717BBDCBE4FFCC +:1007C800FFCBE6FFFFCBD4FFFF717ABED7717BBEAC +:1007D800D7C7C1200CFBF8FF8C0C318E31ADC1316D +:1007E8007B9DD4C0BC068DD49C088C149C0B8C14A7 +:1007F800318E040C00128C0B318EBDD813FD9E0F68 +:1008080061C8EDA208CEABACCC05068C0B318EFDD1 +:100818003F0AD2DD158C0B318EFD430A6169058CC8 +:1008280005D1DFE7FDD507E2EF71CC0A008C0A4C51 +:1008380004DE54F6BC02300AF9BBAC06148C089EE0 +:10084800FD118972AB146299AC06A1BC06617900EE +:10085800617902F0E1614902DFE05040C18C0B315F +:100868008E31AD128C0A318E318D03BDD831FFBD6A +:10087800DADADAADD8FD0F0DC0D2DD06FDD507E214 +:10088800EF1961590AEFA68C0B318EFD470AD2DDAC +:1008980003E2EF0761590BEDF607F2100EC6D7C752 +:1008A800717B9D717BFAFDBC07300AF9FDF20AFDE8 +:1008B8007D0AC6D7FDA708FDCC0BFDD507F5ABFF14 +:1008C800F2D7C731049B067110B3FBEF047118B35C +:1008D800FB8FB3FB7B8E76D1DD5B8FB3FB9D8E40A8 +:1008E80004F903DF22665C10D1DD1C8FB3FB5C10BA +:1008F800D1DD0B5080C15011FDB734C0EF09504015 +:10090800C15011FDB734C04004F903DD064004F9B5 +:1009180004DF22665C02D1DD1C8FB3FB5C02D1DDF3 +:100928000B5040C15010FDB734C0EF095020C150E2 +:1009380010FDB734C0C6D7C7360000665C80D1DD6D +:1009480010675C80D1DF0571339AEF0B71329AEF33 +:100958000671040771319A665C40D1DD10675C400E +:10096800D1DF0571439AEF0B71429AEF06711405B6 +:1009780071419A665C01D1DD10675C01D1DF0571B8 +:10098800539AEF0B71529AEF0671340771519A66B8 +:100998005C02D1DD10675C02D1DF0571639AEF1D3F +:1009A80071629AEF184007F901DF0871040271615A +:1009B8009AEF0AC736100571C4C671619A665C045D +:1009C800D1DD10675C04D1DF0571739AEF0B71728A +:1009D8009AEF0671440771719A665C08D1DD106759 +:1009E8005C08D1DF0571039BEF0B71029BEF067169 +:1009F800140771019B665C10D161E8715AD1C6D7A2 +:100A0800F5F6FBF5F8FBCFFEFBFFCFFAFBFFCFFBBC +:100A1800FBFFD7C7C1C1FBF8FFCEABAC8C02D1DD61 +:100A280012616902305C03BBF6614900DDEE618941 +:070A380000EFF51004C6D722 +:100A3F005208EF065203EF025206FEE600FE1B00BD +:100A4F00DC16089F03088F0408089F040862FE2421 +:100A5F0000089F0408EEBF00EEBA00C1C514410E96 +:100A6F0011D9D0FF118FD1FF312E45C4C0D7F2312C +:100A7F00A2C401E2D79DE261DD4C09DF12717BFA5E +:100A8F00C18F06089F25FDC0CF060800EE27003155 +:100A9F00F2FA04CF0608004C00DF05D50008DD167A +:100AAF0061DD717BFAD50608DD0ACDE31F61CD61EB +:100ABF00CDEE160061CDFED40061FFFE9A00FCF86A +:100ACF00FF0EFEB20061CDFED5004C09DF0EC18FC7 +:100ADF0006086F25FD9F0608C0EE0400CF0608002C +:100AEF00F8E3D75200EF025202FE3700CF24FD0089 +:100AFF00CF060800BF0408C716629F000841001107 +:100B0F008F1A209B4100118F1B209F0108C6510097 +:100B1F00FE62FFEF025205CF060800C1510CFE0A1C +:100B2F0000C0D7C1511DFE0200C0D761DD717BFA35 +:100B3F0070CEC0A59EC47CFF9EC4609EC461CDD7FD +:100B4F0061DD717BFAC18EC45C1BFED6FFCF060838 +:100B5F0001FED7FFC061CDD731F2FA1AC1AEE4BFA3 +:100B6F0016FDAEE6BF18FDAED4BF1AFD30FFFFBEB7 +:100B7F00E4BEE6BED4C0D731F2FA11C1AF16FDBE46 +:100B8F00E4AF18FDBEE6AF1AFDBED4C0D7C1BF1C7F +:100B9F00FD13BF1EFD15BF20FD17BF22FDC0D7AF30 +:100BAF001CFDDB1EFDEB20FDFB22FDD7534B30520E +:100BBF005430324E323030475631323000FFC15050 +:100BCF00FEFEAB0061DD717BFACF060800FE0A0066 +:100BDF00FEA4FF61CDF8E3EECF00C7FB0408BF16FC +:100BEF00FD8FC0009C05C5C337040600BF18FD3537 +:100BFF0036310C300000522BFE6600C2C4C630DF07 +:100C0F000BB800300000B8022004AF18FDB8003058 +:100C1F000F00B802AF16FD61FF520AFE3AFFECF863 +:100C2F00FF0E717BFAC1C7FB04088C05C65C80FE02 +:100C3F000200C0D761DD717BFA70CFC0FFA59FC0E6 +:100C4F00007CFF9FC000609FC00061CDD7618BFE0D +:100C5F00E2FF717BBE410011FB000017CEFC00616B +:100C6F00CB089EFDF31161C999A58392DFF7D7FEDB +:100C7F00B1FED524FDDF23C1CF0308035109FEF4D4 +:100C8F00FDC0D2DF37FE3800A20408CF030807519A +:100C9F0009FEE1FDD2B20408DF22C7FB040831834D +:100CAF0002C6D7C6510AFECCFD624C1FDF06CF2409 +:100CBF00FD01EF04CF24FD00C0EE5BFEC0EE55FE3C +:100CCF00C7C1FB04088B31196C0161589BC0C6D793 +:100CDF00717BFAFE4DFEAF0408040600C1143643C3 +:100CEF000C300000522DF3FE77FF8FC000FE2BFE5D +:100CFF0061CF5C807C8073C0041900CEFC0F61CB88 +:100D0F00C55404EF03C55417FE18FEC7360008BBC1 +:100D1F00629C0288089C03D1DD334C41DE2F70F1B9 +:100D2F00312DB161090033081C000851FF612A41C0 +:100D3F000E118FD0FF613B118FD1FF6138DC0E8B0D +:100D4F005C03DF0964C6C4FE2BFDEECAFDC6C4EE0C +:020D5F00C3FDD2 +:100D610061CF5100718C7109FECBF800FEFCE801E6 +:100D710000F6BF00F953C0F693935820FEDFF94106 +:100D810000369C4E34CCFCEF05118B99A7A5174476 +:100D9100E64EDFF53602F930CCFCEF04CC0000A7BB +:100DA10047DFF9410036E64E3420FEEF05118B99FD +:100DB100A7A51744F64EDFF53630FE3096FEEF0458 +:100DC100CC0000A747DFF9FCD80000EFFE61DD7120 +:100DD1007BFABEF0ADD8BEF200AEF661CDD7C361ED +:100DE100DD717BFABEF0ADD8BEF200DBF6FFADDC03 +:100DF100BEF000AEF6BDD8AEF40312ADDABEF2001D +:100E0100AEF661CD03BDDAC2D7C3F33174D908831D +:100E1100C1F626D8BDD8C031750683C312F623C2E8 +:100E2100FD2C0E93DF0312F623C2D7440000DD260A +:100E310061DD717BFACFE80080BEF6F6BEF4BEF24A +:100E4100ADD8BEF0CFE800818FE8003103FAAEF0F3 +:100E5100F5E80061CDD7B1D7C3F33174D90883C1A7 +:100E6100F626D8BDD8C0317505C312F623C2FD7A66 +:100E71000E93DF0312F623C2D7440000DD2761DDA4 +:100E8100717BFACFE80080BEF6F6BEF4BEF2ADD8B3 +:100E9100BEF0CFE800818FE8003103FAAFE000F542 +:100EA100E80061CDD7ADD8D7C3F33174DB0F83C16F +:100EB100F626D8BDD861317026DABDDAC031750D9C +:100EC10083C312F626DCBDDC61317023C2FDE20E64 +:100ED10093DF0CF626D8BDD861317026DABDDAC2AF +:100EE100D7C161686BDC6BDDC0DD2F61DD717BFA21 +:100EF100CFE80080BEF4ADDCBEF6ADD8BEF0ADDA11 +:100F0100BEF2CFE800818FE8003103FAAEF0BDD820 +:100F1100AEF2BDDAF5E80061CDD7F6BDD8BDDAD7BE +:100F21008292DD2B61DD717BFACFE80080BEF0F6A5 +:100F3100BEF2BEF46208BEF6CFE800818FE8003150 +:100F410003FAAFE0006072AEF0F5E80061CDD76062 +:100F510072F6B1D706DABDDAADDC06D8BDD861D8F4 +:100F6100A6DAD7D1DD17C1C3DAD89DD8ADDA311CE5 +:100F710061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD78 +:100F81001BC1C3DADA9DDAADD8311E33311E33719C +:100F9100F9B4DADFF4BDD813BDDAC2C0D746D8DD63 +:100FA1000771FF7177D971C0D75BDB9DDB605BDABD +:100FB1009DDAADDC5BD9085BD808BDD8D7C3C7F3D0 +:100FC100728EFDC162314C410036924E1161A072A8 +:070FD100C09EFD62C6C2D7FD +:0A0FF60030383A35353A3230000049 +:0A20000030383A35353A323000002E :10200A0005214F7B9EC5E9000104080D12171C1F0C :10201A00080100001F003B005A0078009700B50035 :10202A00D400F300110130014E01192634445362E1 @@ -295,130 +297,130 @@ :10226A00FA041225384D5F6E777A776E5F4D3825FE :10227A001204FAF3F0F0F3F7FBFE00020303020282 :02228A00010051 -:10228C008D3DB43DD1DF26CD3D1EFD4423FDE52221 -:10229C0031329A0D31049A0931329E05713304EFB3 -:1022AC0003713204FD1823FDBA22FD1B26D771538E -:1022BC009AD432DD05B43271529A31229A073132F6 -:1022CC009E0371529A71549A714102314402057104 -:1022DC0040B3FBD77148B3FBD78D304B3BDC114A75 -:1022EC0030B9DE0C4A3E28DE03A43ED771339AD7B0 -:1022FC008D3C4B30DE054A30BDDC0C4A3F28DE03FA -:10230C00A43FD771329AD7F43EF43FD731429E0C9A -:10231C004A4002DE03A440D771239AD7313204120B -:10232C0040AFFB3CDE0C8FB2FB5C01D1DF047123B0 -:10233C009AD771229AF440D7C7C1FBF8FF31329E6D -:10234C00067130B3FBEF047138B3FB71449A7137EB -:10235C009EDE4F71349E71419A31329E0E5002C1F5 -:10236C005011FDCA34C0CD3229EF37E0C15011FDF8 -:10237C00CA34C0F43217C15002FD5A2BC0D2DF0D43 -:10238C008B318E318D080E01081C00BD34AD3444E8 -:10239C00009BDC05D5AFFBDF095020C15011FDCAF5 -:1023AC0034C0C0C6D78D209D41FDF323FD8E2BD5A7 -:1023BC0007F9DD0471039AD78D414B2061F8316424 -:1023CC009A1C71639AFD87044A4107DD054A41FF57 -:1023DC00DF098F06F9310303FD8224FD9624710277 -:1023EC009A3079256194D7C77162017172015003DB -:1023FC00FD110A5008FD4737629D305009FD4737E3 -:10240C006276716301711806F94A30F1DC0BE5074D -:10241C00F9F508F9CD3707EF224A3004DE1ACF0759 -:10242C00F9025008C1506CFD7F02C092DF0DD454EC -:10243C00DF09711006F9EF03F507F94007F901DF21 -:10244C0005710A22EF06710B22710302CD2007578A -:10245C0000674C08DE1073090A20614EDC05679D8D -:10246C0020EF0387EFEB4A2007DF09D507F961F866 -:10247C00CF07F903C6D7500AFD110A304000C150EE -:10248C0006FD3D2BC05096ED110AC72006FBF8FF48 -:10249C00D507F961E8ED7525304A57C1503EFD3D31 -:1024AC002BC0D2DD077100B2FBED75257108B2FBB4 -:1024BC0017040200C15004C1500CC1506CFDA002A5 -:1024CC001006EA38AA48318D12AA48318E616B0881 -:1024DC00616A08C1500EFD3D2BC0F690C1500CFD39 -:1024EC003D2BC0CC01008C014C04DE2831349B0206 -:1024FC00EFFA71229BEA388C015010D605C15010AE -:10250C00C18C01D6044000C1506CFD520310066111 -:10251C005901EFD250A5FD110AEA38AA48318D12A3 -:10252C00AA48318E616B08616A08C1500EFD3D2BC3 -:10253C00C050A5FD110A5004C1506CFD7F02C06251 -:10254C009C01EA388A4B4E0161C3048A4A4E01173A -:10255C00040200C15004C1500CC1506CFD52031058 -:10256C0006F6C1503EFD3D2BC01006C6D7C78D42A6 -:10257C004B3061F8ED18264A4428DE05A444ED18CA -:10258C0026F4448D309D428D305070D612307351EC -:10259C00230480001231FF318E039D439FAEFBF666 -:1025AC008D437C804C95DC1B8D43318F241400EAC9 -:1025BC0038BDD8AA44FDC40D1231FF318E03318FC2 -:1025CC0016EF198D43318F241400EA38BDD8AA4672 -:1025DC00FDC40D1231FF318E03318F16EA388A4259 -:1025EC007217F3031644000171FE61C836FF001721 -:1025FC0001DE02F61617BD7CC7500CFD3D2BC0D278 -:10260C00DF068D309D42EF047100B2FBF2C6D7C7D6 -:10261C002008FBF8FF4007F901DD064007F902DF4F -:10262C001C17040600FD602CD2DF0A8C069C058C5E -:10263C00079C04EF4ECC0563CC0400EF4617040650 -:10264C0000FD602CD2DD0F7100B2FB71039ACC053A -:10265C000071129BEF2D7108B2FB8C06318E318DFF -:10266C00080E07081C00BBEA388A4072ABFD170F36 -:10267C00BB8C019C05D1DF08CC0501CC0400EF0319 -:10268C008B9C0417040600FD6B2CD2DD06CC06C80F -:10269C00CC07008C069FB1FB8C06318E318D080E59 -:1026AC0007081C00BD34AD344401A5DC08CC036420 -:1026BC00F6BD46EF48AD3426464401A0DC08CC03F9 -:1026CC001EF6BD46EF37AD3444819DDC09CC030AC0 -:1026DC00C946F401EF27AD3444019BDC09CC03055A -:1026EC00C946F401EF17AD34440191DC09CC030069 -:1026FC00C946F401EF0771129BC946F4013132044B -:10270C000C31249A08CC0564CC0400EF0D8C034EDC -:10271C0005DE078C039C05CC04008C059FAFFB8C5D -:10272C00049FB0FBFDED2B8D484E05DD2840AFFB23 -:10273C000BDE054A480BDE1440AFFB06DE054A48AB -:10274C0006DE09D5AFFBDF0DD448DD095020C150A2 -:10275C0011FDCA34C08FAFFB9D48FD2A2C1008C652 -:10276C00D7C75601D837C15002FD722BC08F09F95B -:10277C003105075012FD110AEF0E500AFD110A71B6 -:10278C002010055008FD110A8D376C0870C15002DD -:10279C00FD722BC05003FD110A8D376C1870C1509F -:1027AC0002FD722BC05016FD110A5003FD832B62E3 -:1027BC005C01D1DD0F7170B3FB5002C15013FDCA27 -:1027CC0034C056006672C6D7C75004FD832B625CBA -:1027DC0003D1DD405014FD6B2834B3FB895C9F9909 -:1027EC008A0C7CFF50FF5C14D1DD228A0C7CFF5CD0 -:1027FC00147234B7FB89616A9971620756003162B1 -:10280C0007058666D1DFF7716307716B2734C6FB4A -:10281C00895CEB995002FD832BD2DD398D376C101E -:10282C0070C15002FD722BC0E0FD110AD837C150A7 -:10283C0002FD722BC05033FD110A8F09F9310309C7 -:10284C0071281005500AFD110AF0C15002FD722BBF -:10285C00C07178B3FBE0C15013FDCA34C0C6D7C7F2 -:10286C00C12004FBF8FFCC02005004FD832B629CBA -:10287C00038C045C20D1DD0E8C036C019C038C0258 -:10288C006C209C02EF138C045C10D1DD0C8C035C6F -:10289C00FE9C038C026C109C028C045C08D1DD0E37 -:1028AC008C036C029C038C026C089C02EF138C044E -:1028BC005C04D1DD0C8C035CFD9C038C026C049CD1 -:1028CC00024008F903DF088C03D161E8CC03028CC9 -:1028DC0003D1DD05501AFD110A8C0370C15004FDA3 -:1028EC00722BC08FB3FB5C9F728C03318E316D14D5 -:1028FC008C03318E314D616D08616C5C606162627C -:10290C009FB3FB8FBFFB7CFF50FF5E02D1DD278F97 -:10291C00BFFB7CFF5E027234B7FB89616A997162FE -:10292C0007CC0100316207086159018C01D1DFF439 -:10293C00716307716B27F21006C6D7D9A7FBC1507C -:10294C0006FD722BC0D9A8FBC15007FD722BC0D756 -:10295C00FD4729F2D7C716664C02DD044C04DF058F -:10296C00CD3A10EF02F43AC6D7C7711300711B2091 +:10228C008D3CB43CD1DF26CD3C1EFD4223FDE52226 +:10229C003132960D3104960931329A05713304EFBF +:1022AC0003713204FD1623FDBA22FD1926D7715392 +:1022BC0096D432DD05B43271529631229607313202 +:1022CC009A03715296715496714102314402057110 +:1022DC0040B3FBD77148B3FBD74A304BDC114A30C3 +:1022EC00B9DE0C4A3D28DE03A43DD7713396D74A9C +:1022FC00303EDC054A30BDDC0C4A3E28DE03A43EF1 +:10230C00D7713296D7F43DF43ED731429A0C4A3FFE +:10231C0002DE03A43FD7712396D73132041240AFAB +:10232C00FB3CDE0C8FB2FB5C01D1DF04712396D732 +:10233C00712296F43FD7C7C1FBF8FF31329A067170 +:10234C0030B3FBEF047138B3FB71449671379ADEEE +:10235C004F71349A71419631329A0E5002C150111C +:10236C00FDB734C0CD3229EF37E0C15011FDB73481 +:10237C00C0F43217C15002FD5A2BC0D2DF0D8B3185 +:10238C008E318D080E01081C00BD34AD3444009B09 +:10239C00DC05D5AFFBDF095020C15011FDB734C0AF +:1023AC00C0C6D78D209D40FDF123FD8E2BD507F99E +:1023BC00DD04710396D78D404B2061F83164961C77 +:1023CC00716396FD91044A4007DD054A40FFDF0921 +:1023DC008F06F9310303FD8024FD9424710296309D +:1023EC0077256194D7C77162017172015003FD1B8F +:1023FC000A5008FD3437629D305009FD343762763F +:10240C00716301711806F94A30F1DC0BE507F9F537 +:10241C0008F9CD3707EF224A3004DE1ACF07F9024C +:10242C005008C1506CFD8902C092DF0DD452DF09F7 +:10243C00711006F9EF03F507F94007F901DF057193 +:10244C000A22EF06710B22710302CD200757006799 +:10245C004C08DE1073090A20614EDC05679D20EFE5 +:10246C000387EFEB4A2007DF09D507F961F8CF079F +:10247C00F903C6D7500AFD1B0A304000C15006FDB7 +:10248C003D2BC05096ED1B0AC72006FBF8FFD50765 +:10249C00F961E8ED7325304A57C1503EFD3D2BC024 +:1024AC00D2DD077100B2FBED73257108B2FB170486 +:1024BC000200C15004C1500CC1506CFDAA021006A0 +:1024CC00EA38AA48318D12AA48318E616B08616ACC +:1024DC0008C1500EFD3D2BC0F690C1500CFD3D2B9C +:1024EC00C0CC01008C014C04DE2831349702EFFA89 +:1024FC00712297EA388C015010D605C15010C18C4E +:10250C0001D6044000C1506CFD5C031006615901FA +:10251C00EFD250A5FD1B0AEA38AA48318D12AA4801 +:10252C00318E616B08616A08C1500EFD3D2BC050A5 +:10253C00A5FD1B0A5004C1506CFD8902C0629C01B0 +:10254C00EA388A4B4E0161C3048A4A4E01170402D1 +:10255C0000C15004C1500CC1506CFD5C031006F658 +:10256C00C1503EFD3D2BC01006C6D7C78D414B3028 +:10257C0061F8ED16264A4328DE05A443ED1626F431 +:10258C00438D309D418D305070D6123073512304E1 +:10259C0080001231FF318E039D429FAEFBF68D42BF +:1025AC007C804C95DC1B8D42318F241400EA38BDA5 +:1025BC00D8AA44FDCE0D1231FF318E03318F16EFA8 +:1025CC00198D42318F241400EA38BDD8AA46FDCEAD +:1025DC000D1231FF318E03318F16EA388A42721791 +:1025EC00F3031644000171FE61C836FF001701DECB +:1025FC0002F61617BD7AC7500CFD3D2BC0D2DF0674 +:10260C008D309D41EF047100B2FBF2C6D7C7200894 +:10261C00FBF8FF4007F901DD064007F902DF1C1744 +:10262C00040600FD3D2CD2DF0A8C069C058C079C11 +:10263C0004EF4ECC0563CC0400EF4617040600FDF6 +:10264C003D2CD2DD0F7100B2FB710396CC050071ED +:10265C001297EF2D7108B2FB8C06318E318D080E5E +:10266C0007081C00BBEA388A4072ABFD210FBB8CFB +:10267C00019C05D1DF08CC0501CC0400EF038B9C39 +:10268C000417040600FD482CD2DD06CC06C8CC0786 +:10269C00008C069FB1FB8C06318E318D080E07081D +:1026AC001C00BD34AD344401A5DC08CC0364F6BD7C +:1026BC0044EF48AD3426444401A0DC08CC031EF69C +:1026CC00BD44EF37AD3444819DDC09CC030AC944C9 +:1026DC00F401EF27AD3444019BDC09CC0305C9445C +:1026EC00F401EF17AD34440191DC09CC0300C9446B +:1026FC00F401EF07711297C944F4013132040C3123 +:10270C00249608CC0564CC0400EF0D8C034E05DE3A +:10271C00078C039C05CC04008C059FAFFB8C049F9D +:10272C00B0FBFDCA2B8D464E05DD2840AFFB0BDE02 +:10273C00054A460BDE1440AFFB06DE054A4606DEB4 +:10274C0009D5AFFBDF0DD446DD095020C15011FD7A +:10275C00B734C08FAFFB9D46FD072C1008C6D7C7FA +:10276C005601D837C15002FD722BC08F09F93105C3 +:10277C00075012FD1B0AEF0E500AFD1B0A712010A8 +:10278C00055008FD1B0A8D376C0870C15002FD7294 +:10279C002BC05003FD1B0A8D376C1870C15002FD05 +:1027AC00722BC05016FD1B0A5003FD832B625C017B +:1027BC00D1DD0F7170B3FB5002C15013FDB734C0A3 +:1027CC0056006672C6D7C75004FD832B625C03D1DA +:1027DC00DD405014FD692834B3FB895C9F998A0C49 +:1027EC007CFF50FF5C14D1DD228A0C7CFF5C1472E0 +:1027FC0034B7FB89616A997162075600316207052B +:10280C008666D1DFF7716307716B2734C6FB895C71 +:10281C00EB995002FD832BD2DD398D376C1070C1D2 +:10282C005002FD722BC0E0FD1B0AD837C15002FDCF +:10283C00722BC05033FD1B0A8F09F9310309712823 +:10284C001005500AFD1B0AF0C15002FD722BC0711D +:10285C0078B3FBE0C15013FDB734C0C6D7C7C12055 +:10286C0004FBF8FFCC02005004FD832B629C038C0C +:10287C00045C20D1DD0E8C036C019C038C026C205B +:10288C009C02EF138C045C10D1DD0C8C035CFE9C61 +:10289C00038C026C109C028C045C08D1DD0E8C0342 +:1028AC006C029C038C026C089C02EF138C045C047D +:1028BC00D1DD0C8C035CFD9C038C026C049C0240EF +:1028CC0008F903DF088C03D161E8CC03028C03D137 +:1028DC00DD05501AFD1B0A8C0370C15004FD722BD0 +:1028EC00C08FB3FB5C9F728C03318E316D148C03E3 +:1028FC00318E314D616D08616C5C606162629FB3B9 +:10290C00FB8FBFFB7CFF50FF5E02D1DD278FBFFB2F +:10291C007CFF5E027234B7FB89616A99716207CCE5 +:10292C000100316207086159018C01D1DFF4716338 +:10293C0007716B27F21006C6D7D9A7FBC15006FD4D +:10294C00722BC0D9A8FBC15007FD722BC0D7FD4517 +:10295C0029F2D7C716664C02DF08CD3A10CD3B0BD7 +:10296C00EF05F43ACD3B0FC6D7C7711300711B208E :10297C00710303710205E0C15003FD722BC05013AB -:10298C00FD110AD83AC15005FD722BC0500FC1E0A1 -:10299C00FD722BC0500AFD110A7103055008FD1180 -:1029AC000A501FC1E0FD722BC05012FD110A5003DA +:10298C00FD1B0AD83AC15005FD722BC0500FC1E097 +:10299C00FD722BC0500AFD1B0A7103055008FD1B6C +:1029AC000A501FC1E0FD722BC05012FD1B0A5003D0 :1029BC00FD832B625C01D1DF03E2EF12F0FD832B70 :1029CC00629D363602F9C75008FD5A2BC0F2C6D7A5 :1029DC005003C1FD722BC0710203711A20FD1A2B1A :1029EC00F431D75003FD832B625C01D1DD155014FB -:1029FC00FD6B28FDD4275014FD110AE0C15003FDD6 -:102A0C00722BC0711300711B207103035014FD1144 +:1029FC00FD6928FDD2275014FD1B0AE0C15003FDD0 +:102A0C00722BC0711300711B207103035014FD1B3A :102A1C000AF0C1E0FD722BC0F0C15003FD722BC057 :102A2C00D7C72004FBF8FFCC02008D319C0350105B -:102A3C00C150A4FD7F02C0629D31D454DD04F2ED7F +:102A3C00C150A4FD8902C0629D31D452DD04F2ED77 :102A4C00F72A8C037B315C08D1DD0F8D315C08D10A :102A5C00DF05CC0210EF03CC02208C037B315C042D :102A6C00D1DD158D315C04D1DF088C026C049C0225 @@ -427,592 +429,591 @@ :102A9C00029C02D1DD1F34B6FB896E02997162076C :102AAC00CC0100316207086159018C01D1DFF4714E :102ABC006307716B278D315C40D1DD095002C15029 -:102ACC0012FDCA34C08D315C01D1DD08E0C1501259 -:102ADC00FDCA34C0717AFA8D315C41D1DD0C5A31AA -:102AEC00BED831C15010FDE147C0F21004C6D7FD6D -:102AFC006D27F2D7FDD427F2D7C78FC6FB7617FD0B -:102B0C006B28664FC6FBDFF2F5C6FBF2C6D75064E6 -:102B1C00FD110AFD762C6261FB71119AF171149A08 -:102B2C0061DC70C15012FDE147C0FD7836CD630306 +:102ACC0012FDB734C08D315C01D1DD08E0C150126C +:102ADC00FDB734C0717AFA8D315C41D1DD0C5A31BD +:102AEC00BED831C15010FDC947C0F21004C6D7FD85 +:102AFC006B27F2D7FDD227F2D7C78FC6FB7617FD0F +:102B0C006928664FC6FBDFF2F5C6FBF2C6D75064E8 +:102B1C00FD1B0AFD532C6261FB711196F171149629 +:102B2C0061DC70C15012FDC947C0FD6536CD610333 :102B3C00D7C7C1C1FBF8FFAC0ABB17C15002C18C8F -:102B4C000270C1506CFD520310061004C6D7C7C1E9 -:102B5C00FBF8FFAC08C15002C18B70C1506CFDA0DA +:102B4C000270C1506CFD5C0310061004C6D7C7C1DF +:102B5C00FBF8FFAC08C15002C18B70C1506CFDAAD0 :102B6C00021006C0C6D7C78806166770C1C7508446 -:102B7C00FD1B031004C6D7C716C75084FD7F02C0C7 +:102B7C00FD25031004C6D7C716C75084FD8902C0B3 :102B8C00C6D7C74A2004DE045600EF0256018F0850 -:102B9C00F9318FE7240000DD1A23DD0B23DD0C2334 -:102BAC00DD1123DD0CEF0C8686EF0851046106EF76 -:102BBC0002868666318F12504CD633514CD6610A40 -:102BCC00045420BD384008F902DD064008F904DF42 -:102BDC0008CD3B54CD3C44EF06CD3B4BCD3C3DC6E4 -:102BEC00D740AFFB3DDC05CF04FC0FD740AFFB1F3C -:102BFC00DC05CF04FC0BD740AFFB0BDC05CF04FC92 -:102C0C0007D740AFFB0661D831320405CF04FC0373 -:102C1C00D7D5AFFBDD04E504FCD7F504FCD7D50410 -:102C2C00F9DF0471739AD7FD762C6261FB71019BFD -:102C3C0071149A71079B61C831729A1771729A71EB -:102C4C00049B71119AF171049B61DC70C15012FDEF -:102C5C00E147C0D7C716C75004FD5A2BC0C6D7C70B -:102C6C0016C75002FD5A2BC0C6D740AFFB0BDE0275 -:102C7C00E2D7F2D77100010571785005713AD57120 -:102C8C003BD18F10055CFC9F1005CF54054AE542E3 -:102C9C0005711042057100420571485005713050A4 -:102CAC000571205005CF530509CF52050B713051DA -:102CBC000571205105713BD5717050058F11055C64 -:102CCC00FC9F1105F422D77178500571080105D7C6 -:102CDC00FD7238FD8704717AFAFDB123F504F98F82 -:102CEC0006F931051B5003FD832B625C01D161E8B1 -:102CFC00CF04F902CFAFFB6471040771419AEF1056 -:102D0C00F6710407611012F6B1236061FB71419AF0 -:102D1C00FD8530FD854371229D712BE7618461A493 -:102D2C0061EDEFF8D7C788061666614FDD0967615C -:102D3C004EDE0396EF01866672C6D7C7161714AA25 -:102D4C000412A943DD29AA0412A923FD0E4FC3AC1A -:102D5C0002FD0E4F13C2BDD813FD940FDE0C1714D9 -:102D6C00AA0212AA0403BA04EF051714A9BA04ACF8 -:102D7C00041231FF319E03317F087208C6D77100EF -:102D8C00F200304400BFB601300188BF9001300919 -:102D9C0084BF9E01BF9C01BF9A01BF9801BF9601E1 -:102DAC00BF9401BF9201F53CFF30FE00BFBE01F69F -:102DBC00BFBC01BFB80150EEBFBA01A1BFB201C97F -:102DCC0018FE008F06F9310507F5CDFBCB6CFF0023 -:102DDC0071739B71629BD7C72004FBF8FF3026FBF5 -:102DEC00BC02F6BBAB446400DE0EAC0214CA00009D -:102DFC00617902617900EFEC1004C6D730EF00BFA7 -:102E0C00B401F6BFBA017108F200712304715307C3 -:102E1C00BE6EBE64BE6A712304715307715BD1F43C -:102E2C0057F45671639BD78D58B458D1DF6931D4A0 -:102E3C00D105715BD1E457D457DD2E7140B2FBD86C -:102E4C0056F1E734020023DD0625DD0325DF05F608 -:102E5C00BE66EF06D9CCFBF1BE66A4564A5620DFFF -:102E6C0004F456F457CD5819D7CD581E7148B2FBFF -:102E7C00D5CEFBDF04F6BE66D7D9CCFBF14266FF9C -:102E8C00DD15D9CCFBF112AE6643DE05A266FFEF71 -:102E9C0003B266FFCD5803D7C7161714F6B9AA04A8 -:102EAC0012F6231231FF31AE03316FBA02C6D7C707 -:102EBC00C1FBF8FF8C085080D612AB1413B9AB14BD -:102ECC00AA0412A92312D927FBF133BDD813FD0094 -:102EDC000EBA02C0C6D731049C01D74004F902DFF8 -:102EEC0010F6BE64BE6EBE6ABF8EFBBF94FBBF9A6B -:102EFC00FB31749B14308AFBFDA42E3090FBFDA497 -:102F0C002E3096FBFDA42EEF7131149C0D71139C89 -:102F1C007108D2FBF45AF459EF60D459DF5A8F265A -:102F2C00FB9D594A5A1FDC177100D2FB4028FBFF4E -:102F3C00DD1CA45B8F28FB4B5BDE13F45AEF0FD820 -:102F4C005AF1A1605C1F9D5A7108D2FBF45BE85AE0 -:102F5C00092AFB70C1308AFBFDBB2EC0E85A094A16 -:102F6C00FB70C13090FBFDBB2EC0E85A096AFB70A8 -:102F7C00C13096FBFDBB2EC0B459308AFBFD472DEA -:102F8C00F313BE6E3090FBFD472DF313BE6A3096E3 -:102F9C00FBFD472DF313BE64D7C736F00071F4DC8C -:102FAC00297170F000CE9D08CE9EC0CE9F80F59406 -:102FBC00FFF593FFF592FFE597FFE596FFE595FF8B -:102FCC00E598FFCE9C7F7100A6FB711BE3712BE390 -:102FDC00711AE7712BE7717A9D710A9E31929E02EC -:102FEC00EFFA710B9E71239C71339C71439CC6D775 -:102FFC00C731229C1E71229C710A9E31929E02EF57 -:10300C00FA34D4FB3692FF52078B99A5A792DFF9BD -:10301C00710B9EC6D7C788061631329C1571329C2F -:10302C00C7349CFB3092FF1652078B99A5A792DFF1 -:10303C00F9C6667367189CFBC6D7C771239C3134DD -:10304C009C1E71339C710A9E31929E02EFFA34924F -:10305C00FF369CFB52078B99A5A792DFF9710B9E4B -:10306C0031449C1371439C717B9E8FDCFB9E9A8F29 -:10307C00DDFB9E9B717A9EC6D7CFA7FB5CCFA8FBCE -:10308C005FCFC8FB5DCFFCFB36CFFDFBC9D7C7CFED -:10309C00A4FB12CFA5FB24CFCCFBFFF5CDFBF5CECB -:1030AC00FBF5CFFBF5D0FB5600664C64DE0872389E -:1030BC0026FB0086EFF3F5E3FB714A9D712B217122 -:1030CC000A20711A20710203C6D7C788061617F199 -:1030DC00E73403002361E3ED02342361F8EDD932C8 -:1030EC00B12361E3EDE3322561F8EDF132B1240D4A -:1030FC000061D8ED0234240B0061F8EDCB31236173 -:10310C00F8ED0E322361F8EDDE312361F8EDFB337F -:10311C0024060061F8ED8D32B12561D8EDA9322479 -:10312C00000061F8EDB6322361F8ED02342361F84A -:10313C00ED0034B12361E3ED11332361F8ED22335B -:10314C002361F8ED33332361F8ED22332361F8ED7D -:10315C0044332361F8ED55332361F8ED6433236177 -:10316C00F8ED86332361F8ED91332361F8ED9C3350 -:10317C002361F8EDA4332402002361E3ED02342330 -:10318C0061F8EDD8332361F8EDAC332361F8EDB77A -:10319C00332561F8EDC233B124060061D8ED023459 -:1031AC0024000061F8ED04342561F8EDCD332412D0 -:1031BC000061F8ED87322361F8ED7732ED04346766 -:1031CC00D1DD0C30AC3B619434C4FB89616F99ED5B -:1031DC000E34675C02D1DD0730FB2A6194EF0B677C -:1031EC005C01D1DD0530002B6194675C3CD1DD0FB7 -:1031FC0030052B6194675C3C7266736218A4FBED1E -:10320C000E3467D1DD625C01D1DD05300800EF01C1 -:10321C00F6609F01FC675C02D1DD03E6EF01F6343A -:10322C0001FC89616899675C04D1DD04E6A1EF01BA -:10323C00F63401FC89616899675C08D1DD053020A2 -:10324C0000EF01F63401FC89616899675C10D1DDEF -:10325C0005301000EF01F63401FC89616899675C58 -:10326C0020D161E8716001FCED0E344A5CC8DE08C7 -:10327C00E85C67185AFAA45CED0E34679D5CED0EA1 -:10328C0034D44ADF08679FCDFBA44AEF0D4A4A05A8 -:10329C00DE08E84A671811FDA44AED0E34675C0F8E -:1032AC007266736218A4FBED0E344A4A64DE1B4A44 -:1032BC004A01DF0667D161F85701E84A671826FB17 -:1032CC00A44A4A4A0561C871129CED0E3434A6FB1F -:1032DC0089615F99ED0E34305C29619466736718CF -:1032EC00A4FBED0E3440A9FB6ADF1340AAFB68DF98 -:1032FC000D674C6CDF0830C2406194713AD5679F02 -:10330C00ABFBED0E34675C7F70C117F1243000FD10 -:10331C002130C0ED0E34675C3F70C117F1243000D2 -:10332C00FD2130C0ED0E34675C0770C117F12430FD -:10333C0000FD2130C0ED0E34675C1F70C117F12405 -:10334C003000FD2130C0ED0E346770C117F1243010 -:10335C0000FD2130C0ED0E34CEABAC710A9E319223 -:10336C009E02EFFAD592FFDF05710B9EEFED679E83 -:10337C0099710B9E9FDBFBED0E3471429C675C7F59 -:10338C009FDCFBEF7D71429C675C3F9FDDFBEF7226 -:10339C00675C3F9FDEFBEF6A675C1F9FDFFBEF62A2 -:1033AC003056396194679FE4FBEF573023396194B1 -:1033BC00679FE5FBEF4C303C396194679FE8FBEF6E -:1033CC0041675C01D1DD3BFD8543EF36675C02D183 -:1033DC00DD05712A21EF06714A9D712B21675C0175 -:1033EC00D1DD06710300710B20679FE3FBEF1367C0 -:1033FC00318EEF0EEF0CEF0A664C5BDE057367182F -:10340C00A4FBC6D7C716664C30DC094C37DE05FD6D -:10341C00FC2FEF6B664C02DF1F8FA6FB5C03728FD9 -:10342C0003FC5C03318E316D08616A08128F03FC5A -:10343C005C80312A6162EF56664C3DDF08AE90BD70 -:10344C005EF85EEF49664C3EDF04F85FEF40664C79 -:10345C004FDF05FDAD43EF36664C61DF08E85C09D4 -:10346C005AFA72EF29664C7FDF05FD223CEF1F668E -:10347C004C4EDF0B31049E045210EF12F2EF0F662C -:10348C004C5BDC0452FFEF06667309A4FB72C6D7D3 -:10349C00C788061617F1241000240500DC07244CFD -:1034AC0000DD17EF17717BFA17F104A4FB14896187 -:1034BC007F99717AFA71529CEF02A45CC6D7C7C18E -:1034CC00C1FBF8FF4004F903DD064004F904DF38C2 -:1034DC00717BFA8C027309ACFB5E0AD1DF278C027C -:1034EC00318E04A4FB14896E0A99716207717AFA01 -:1034FC00CC0100316207086159018C01D1DFF471F4 -:10350C006307716B27717AFA1004C6D7CF03FC03DB -:10351C00F501FCF505FCF507FCD7C788061617F175 -:10352C00E734020025DD3D23DD1725DD1C23DD05F9 -:10353C0023DD2BEF3B71029D679F06FCCD6303EFF0 -:10354C002F675C839F03FCEF27675C039F05FC6779 -:10355C005C034C0261F871229EFD9B45EF12679F44 -:10356C0007FCEF0C6791DF08E0C15012FDCA34C0B4 -:10357C00C6D7C71617F1E7240000DD2A23DD1E2469 -:10358C000300DD0724FB00DD24EF2531329E0530DE -:10359C008000EF01F6086F04FC7208EF198F01FC34 -:1035AC00F501FC72EF1071529D5235EF09F2EF06E6 -:1035BC0066730900FC72C6D7C71617F1E724000022 -:1035CC00DD38241000DD1C23DD1C23DD30240E002F -:1035DC00DD18241100DD1B240F00DD12243000DD6A -:1035EC0015EF1EE2EF1D5202EF195204EF155206B1 -:1035FC00EF115205EF0D5207EF09F2EF065203EFF0 -:10360C000252FFC6D7C731649C3771639C8D629F91 -:10361C00ACFB8D619FCBFB36D2FCC7D861FD7837F4 -:10362C00618A70618AFDBD37C0D866F1312F609D0B -:10363C00658D604B65DD0A71729C8D659D60CD63F7 -:10364C00034A6305DE083082366194CD636BB46344 -:10365C007150F000CE300BCF170006CE3106FD5A5C -:10366C0002717A30710BE3710BE7C6D78D659D60E3 -:10367C008D659FADFBD74004F903DF064004F904C8 -:10368C00DF02F2D731749C0C71739C71139D8D65A4 -:10369C009D67EF3131049D1F71039D71129DD506FD -:1036AC00FCDF04F468EF0A8F06FC5002D6A1609D83 -:1036BC00688D689D67EF0E31149D068D689D67EFD0 -:1036CC00048D659D678D679FADFBD867FDEA36E875 -:1036DC0067091C2270C15013FDE147C0F2D7C7C166 -:1036EC00C1FBF8FF8C02D1DF05F506FCEF1A8C024A -:1036FC004C05DE06CF06FC02EF0E8C02318E123129 -:10370C00FE03311F609F06FC8D694F06FCDD28CC43 -:10371C00011F8F06FC9D69CC00008B4C08DE148BBE -:10372C00730912204F06FCDC058B9C01EF056159D7 -:10373C0000EFE78C019D641004C6D7C716710AE729 -:10374C00710BE37150F000CE300BCF170006669E64 -:10375C0031FD5A02717A30710BE33182E302EFFAD8 -:10376C008D1F7158F000710BE772C6D7C7C1C1FB32 -:10377C00F8FF8FFCFB4E02DC03F2EF318C024FFDA5 -:10378C00FBDC0452FFEF268C022FFCFB7061313105 -:10379C008D128FFDFB2FFCFB70613133BDD813FDF7 -:1037AC00220EBB440001DC03F690BB8B721004C6E6 -:1037BC00D7C7C1FBF8FFAC0814A91489708B61281A -:1037CC00706131FD0E4F1344030071FEDC23AC0815 -:1037DC00148A04819A04AC08148A044C11DC10A9D4 -:1037EC00148B99AC0814CA0200AC0814CA0310EF6D -:1037FC0072AC0814CA0400AC0814A914894DDE0A72 -:10380C00AC08148A02819A02EF12AC0814A914892C -:10381C004D61D308AC08148A02919A02AC08148A40 -:10382C0003919A03D1DF3CAC08148A024C10DF10D0 -:10383C00A91489318EA112AC0814A9146299EF173E -:10384C00AC08148A024CF0DF0EA91489318EB11227 -:10385C00AC0814A9146299AC0814CA0200AC081480 -:10386C00CA0310C0C6D7ED7538C75600664C0ADEC1 -:10387C000BF0317E12F67810FC86EFF0C6D7C7201D -:10388C000CFBF8FF17040600C15006C150A8C1502C -:10389C0030FDA0021006D2DD1B4A6C04DE05A46CC0 -:1038AC00E2EF7034E4FB895CFC99FD56397110B27F -:1038BC00FBF2EF5F717BFA300600C117040600C102 -:1038CC0030E9FBFD164F1004717AFAF46C8FE4FBAF -:1038DC005C01D1DD264004F903DF205010C180FDCE -:1038EC00CA34C0C736100571D4C6DE0F17C15006D6 -:1038FC00C150A8C15030FDA00210064004F903DDF0 -:10390C00064004F904DF0B8FE4FB5C02D161E8FD97 -:10391C00C740F2100CC6D7D9E5FBC15030FD7F0271 -:10392C00C0629FE8FB5008C15011FDCA34C0F2D7E9 -:10393C00D9E8FBC1D9E7FBC15030FD1B0310045083 -:10394C0008C15011FDCA34C0F2D7C7200CFBF8FFD8 -:10395C00CC09004007F901DF05CC0A02EF03CC0AC1 -:10396C0010CC0B808FE4FB5C039C07D1DF08717AD1 -:10397C00D5CC0807EF06717BD5CC082F17040800AF -:10398C00C15004C150A0C15030FD52031006624C0E -:10399C0002DF077110B2FBF2EF357118B2FBF46C59 -:1039AC00C736100571D4C6DE164004F903DF1017B4 -:1039BC00A1C15006C150A8C15030FDA00210067123 -:1039CC007BFA8FE4FB5C034E07DD03E2EF01F210A0 -:1039DC000CC6D7D504F9DF03F6BD6E4004F901DD42 -:1039EC000AD478DD03B478D7CD78038F04F9318FFE -:1039FC00E723DD512402002361D30423DD47D7FDE7 -:103A0C00EE3A31029F01D731629E194A7005DE16DB -:103A1C00A4704A7005DF0FA4705004C15010FDCA89 -:103A2C0034C0EF02F47031649E194A7205DE16A49C -:103A3C00724A7205DF0FA4725008C15010FDCA34CF -:103A4C00C0EF02F472FD553AD78F06F93123493095 -:103A5C001B00466EDF158FE3FB5C01D161E8F504BA -:103A6C00F9E0C15010FDCA34C0EF1D307701466E2D -:103A7C00DF165002C15010FDCA34C0F64674DF0880 -:103A8C008FC8FB5010D6BD74F64674DD36B674463E -:103A9C0074DF3071129BEF2B301B00466EDF13F678 -:103AAC004676DF18E0C15010FDCA34C0C976530702 -:103ABC00EF0A307701466E61F871129BF64676611B -:103ACC00E8B67631549E0771439DF6BD6ED73144EE -:103ADC009D04F6BD6ED7A66EF6466E61F8C96EFFF4 -:103AEC00FFD7D473DD03B473D731729E174A7105B7 -:103AFC00DE14A4714A7105DF0DA4715010C1FDCA0A -:103B0C0034C0EF02F4714A710661F8CD7325D7C742 -:103B1C0036100571D4DE0E8FB2FB5C02D1DF06309D -:103B2C008A386194D24004F903DF1C312207053036 -:103B3C002D2A619431549D0C71539D5080C15012AB -:103B4C00FDCA34C0FD583BFD7E3BC6D78F03FC5CE1 -:103B5C0001D1DD1DD47BDD03B47BD7CD7B098D6416 -:103B6C004B7ADD0D8D649D7A5040C15012FDCA34E4 -:103B7C00C0D74004F903DD04F6BD1AD7D5D0FBDF5E -:103B8C0008F6461ADD19B61AD7D9CCFBF1461ADD60 -:103B9C000ED9CCFB12AD1A43DE03A61AD7B61AD730 -:103BAC00717BFAC78FC4FB76F5C4FB717AFA5C1093 -:103BBC00D161E871629D665C0FD1DD57665C01D105 -:103BCC00DD05F504F9EF4C665C02D1DD11E0C15066 -:103BDC0003FD722BC0711300711B20710303665C13 -:103BEC0004D1DD11711300711B20D503FC61F87138 -:103BFC000303FD1835665C08D161E87103035005B9 -:103C0C00FD110A7102035003C1FD722BC0711A2001 -:103C1C00FD1A2BF2C6D7C756FF4A4A1361C8EDD816 -:103C2C003C8F06F9311505300400EF0F8F06F93182 -:103C3C004505300500EF04D907F9F1609F28FC8D8C -:103C4C007C9F29FC71349AE661301271049A61DC14 -:103C5C0031196162629F2AFCE52BFC31449E0530D0 -:103C6C004000EF01F6C131340405302000EF01F6BD -:103C7C00C2616B08616A08C131749E05300400EFA3 -:103C8C0001F6C2616B08616A08C131649E04E6A149 -:103C9C00EF01F6C2616B08616A08C131549E03E6FC -:103CAC00EF01F6C2616B08616A9F2CFCF171240470 -:103CBC0061DC9F26FCF171540761DC9F27FCD84A1C -:103CCC00F10104ECFC14A9148976A44A6672C6D7D7 -:103CDC00FD35098F04F9318FE724000061F8ED4FB1 -:103CEC003E23DD212361F8EDB33D2361F8ED1E3E4B -:103CFC002361F8ED353E2361F8ED953E2361F8ED37 -:103D0C00963DED4C3EF6BD7471139B4005F901DFF9 -:103D1C001831349E07FDFC3E92DF04D7FDB123AD74 -:103D2C006E440A0061D8EDFB3E71429DFD87047123 -:103D3C00639AFDB1234007F903DF0771229DF50457 -:103D4C00F9D7FD1B2640B1FB9BDE0771229DF504C4 -:103D5C00F9D7714A277140110571301105713A225A -:103D6C00715A2271501105FD7529D2DD0771229D02 -:103D7C00F504F9D771103500CF37001D71401205CD -:103D8C005032FD110ACF04F906D7FD863F62318F00 -:103D9C00E7240000DD0D23DD0523DD06EF05F5042A -:103DAC00F9D7D7CF04F902FDDC294005F901DD066E -:103DBC004005F903DF05F5CDFBEF04CFCDFB03CFB9 -:103DCC0004F902FD4729FD802CFDF504FD1835FD95 -:103DDC009A30F505F971229DF537FF712BE0CBE494 -:103DEC003FEFCBE6F6F0FD8704713BD48F06F9313B -:103DFC000503FD7D40FD8A2D710806F9CF04F903FA -:103E0C008FA6FB5C02D1DD095080C15010FDCA3475 -:103E1C00C0D7FD1440FD193FFDA8408F06F9312590 -:103E2C000731349E03F504F9D7FD1440FD4D3FFDD9 -:103E3C00A8408F06F931250731349E03F504F9D7D4 -:103E4C00F504F9FDFD3FD261E8EDFB3EF6BD747162 -:103E5C00139BF5E4FBFD5639717AFAFD082EFDD360 -:103E6C002CFD4705712B21714B9D31349B02EFFAD0 -:103E7C00FDDB3F716A27FDEF29FDA83FCF04F90553 -:103E8C0071429DF6BD6EFDFE09F505F931349E04B7 -:103E9C00D432DD1FE505F9E504F98F06F931254F1C -:103EAC00F5F8FBF5F6FB502EFD110ACF05F903E5ED -:103EBC0004F9D7FDDB04FD442371730171320471E5 -:103ECC00430271039AFD673FFD3509F46A71629AEA -:103EDC0031329E06CF04F905EF0971439DE505F9D2 -:103EEC00E504F9712BE78F06F9312503F504F9D7B1 -:103EFC00F6466EDD04F424EF02A4244A2465DC0BA0 -:103F0C00F6BD6EF504F971229DE2D7F2D731649DAE -:103F1C002FA47ED47EDD0831A4E00A31020C067198 -:103F2C002BE0FDB34031A4E01731040C13712BE0EE -:103F3C005027C15005FD722BC0CF04F90471229D8E -:103F4C00D731020C15D83AC15005FD722BC0500563 -:103F5C00FD110AFDB340CF04F903D731949E02EF53 -:103F6C00FA712AE7CEA409F5F3003104070261FDCA -:103F7C00E5F300FD5A02CEA408D731029F19313265 -:103F8C00020431549E05F6BD80E2D7A680AD804474 -:103F9C000002DE035202D7F6BD80F2D771430771DF -:103FAC004B2771481005714811057138100571388F -:103FBC001105713302713B22715302715B227158EE -:103FCC00100571581105CF37000971481205D7CE6D -:103FDC003708CBE4BFFFCBE6FFF3CED4FFF5B4FB41 -:103FEC00F5B5FBF5B6FBF5B7FBF6BEE0BEE2BED011 -:103FFC00D7CFCDFB03F5CEFBF5D0FB71729BF64210 -:10400C006CFFDD02E2D7F2D78FE3FB5C01D1DF60FE -:10401C00D482DF19310200585003FD832B625C01FE -:10402C00D1DF07F504F971229DD7E482D74A82F0DB -:10403C00DF073104003AF482D74A82C8DF0AF5045C -:10404C00F971229DCD82F0D7310200084A82FFDD42 -:10405C001FA482D7F0C15004FD722BC08FB3FB5C40 -:10406C009F9FB3FB7110C4FB30AC3B6194CD82F0CD -:10407C00D7C75004FD832B625C03318E315D34B3A2 -:10408C00FB896168995002FD832BD2DD067170B3F8 -:10409C00FBEF047178B3FBFDB123C6D731149B063B -:1040AC00F504F971229DD771639DF47E717207FD41 -:1040BC005A02717307D7FD5005F2D7717BFAC720EE -:1040CC000CFBF8FF8FEAFBF0F9E9FBF303FD0E4F55 -:1040DC0013BC048FECFBF0F9EBFBF303FD0E4F1359 -:1040EC00BC028FEEFBF0F9EDFBF303FD0E4F13BB9F -:1040FC00717AFAAC04BDD8F6BDDAAC04311EBDDC65 -:10410C00F6BDDEFDD50DADD8BDDCADDABDDEAC0245 -:10411C00BDD8F6BDDAAC02311EDADCC3DADEC3BDC3 -:10412C00DCF6BDDEFDD50DC0BDDEC0BDDCADDEFDFB -:10413C004B0FADD8BDDCADDABDDEABBDD8F6BDDA0C -:10414C00AB311EDADCC3DADEC3BDDCF6BDDEFDD579 -:10415C000DC0BDDEC0BDDCADDEFD4B0FDADAADD877 -:10416C00FD9644C3C58D905C3FF0317E0440FC1439 -:10417C00C2C0B9A490F6BC08BC0A9C078C074C2E94 -:10418C00DD3D8D900E0770F161DC605C3FF0317E9F -:10419C00127940FCBDD8F6BDDA8C0773095C22316C -:1041AC008FBDDC70BDDEFDD50DAC08BDDCAC0AFDF1 -:1041BC004B0FADDABC0AADD8BC08615907EFBDACEA -:1041CC0008BDD8AC0ABDDAC9DC0004F6FD9F0EC9E7 -:1041DC00DCFFFFF6FDA00FADD8BD8AAF3AFC468AD6 -:1041EC00DD11AF3CFCBF3EFCAF3AFCBF3CFCAD8AE2 -:1041FC00BF3AFCAF3CFC423EFCDC46AF3AFC423CD6 -:10420C00FCDE3EAD26423AFCDE374A2A16DC1A4A60 -:10421C002AA0DE138D8C4B2ADE0DAF3AFC268E4481 -:10422C00691061C8FD7F42F42AAF3AFC445146DC68 -:10423C000AAF3AFC241027BD28EF0DC928F82AEF45 -:10424C00074A2AFF61E8A42AAF3EFC423CFCDC187A -:10425C00AF3CFC423AFCDE10AF3AFC4628DE09F4D7 -:10426C008CAF3AFCBD8EEF074A8CFF61E8A48C1032 -:10427C000CC6D7717BFAC7710A9E31929E02EFFA77 -:10428C008E949F34FC8E969F35FC8E979F36FC8EB9 -:10429C00989F37FC8E939F38FC8E929F39FC710B44 -:1042AC009E717AFA8F37FCFDB40F76FD144413BD62 -:1042BC0088D5EFFBDF0AD5F0FBDF05D5F1FBDD255B -:1042CC00F6B14688DF11C9883722665C0391DF0698 -:1042DC000A88181A89009617FD374513FD57433184 -:1042EC00049E02EF61520692926934FC682EFCDF48 -:1042FC00F6AD88BD86F884F3311C790AF944FEFFCB -:10430C00DD44D884F101040AF914A944FFFFDF0449 -:10431C00E6B9EF0BD884F101040AF914A9A1B9711B -:10432C007BFAA0EFFBD5EFFBDF1CA0F0FBD5F0FB7D -:10433C00DF14A0F1FBD5F1FBDF0CCFEFFBFFCFF0CF -:10434C00FBFFCFF1FBFFC6717AFAD7C716D884F101 -:10435C000744A800DC0571029EEF1CF647DD18A48B -:10436C00844A84A8DC0571029EEF0CF884F3311C9E -:10437C00F6780AF9B7EFE4C6D7C756A89666F031B7 -:10438C007E12F6B1780AF966D1DFF1717BFAF5EF9E -:10439C00FBF5F0FBF5F1FBF48471039EC6717AFA20 -:1043AC00D7C72004FBF8FFD44ADF168D849D91718A -:1043BC007BFA52069292692EFC68C0FCDFF6717A89 -:1043CC00FA4A4A06DE0EE84A09C0FC9C03A44A8C51 -:1043DC000372EF30F891F3311C790AF9BB31129E5C -:1043EC00058B9C03EF0F8C019C03D491DF05CD91C1 -:1043FC00A7EF02B491718071179E61DC61FB7111A2 -:10440C009E8C03721004C6D7C72008FBF8FF8F37A9 -:10441C00FCFDB40F9C078F36FCFDB40F9C068F354A -:10442C00FCFDB40F9C058F34FCFDB40F9C048F383D -:10443C00FC9C038F39FC9C028C06318E0112791A7C -:10444C0020BB8C075C03D1DF098C064C0361C8616F -:10445C0079008C05318EB1610900BB313D1201032D -:10446C00BB8B0E04708C011C00BB8FF4FB4E03DC69 -:10447C000E8C034FF4FBDC0B8C024FF5FBDC04AB16 -:10448C0012EF03ABB1121008C6D7C7C3C12008FB8B -:10449C00F8FFF661490A61F8614908DF07F7340053 -:1044AC0000ED3345E6BC04F6BC06AC0ABC02AC0815 -:1044BC00BBAC06614902AC0461F8614900DE28AC72 -:1044CC0004BDD8AC06BDDAE1FD5A0FADDABC06ADC1 -:1044DC00D8BC04ABBDD8AC02BDDAE1FD750FADDACA -:1044EC00BC02ADD8BBEFCAAC06BC02AC04BBAC087A -:1044FC00BDD8AC0ABDDAAC04BDDCAC06FDD80EAC44 -:10450C0004BDDCAC06FD4B0FE1FD750FADDABC064E -:10451C00ADD8BC04AC06614902AC0461F861490039 -:10452C00DCC5AC0214AB12100CC6D7C7C12004FBFF -:10453C00F8FF8F31FCFDB40F9C034E04DF1CAD86DD -:10454C004688DE07AD88268612EF40F64688DF07E0 -:10455C004686DD03E7EF34F7EF318C04318EB11270 -:10456C008C03318E43DF1830382226860688BB8CAC -:10457C00045C0391DF05AB041800BBAB12EF0C8C91 -:10458C00034E04DE0532A900EF01F71006C6D77101 -:10459C007BFA31229E0CF64694DD07B694717AFABA -:1045AC00EF7C71239E717AFA4004F904DF07715392 -:1045BC0007F42CEF69D9CFFBF1E7240000DD0F23C2 -:1045CC00DD1A23DD1023DD5323DD2723DD38715362 -:1045DC0007F42CEF49715207F42CEF42D42CDF076F -:1045EC00715207E42CEF05715307F42CC994FA00AF -:1045FC00EF2CD42CDF0B715207E42CC994FA00EF8A -:10460C001DF5CFFBEF18D42CDF0B715307E42CC92D -:10461C0094FA00EF09CFCFFB02EF03FD2B46D7D95D -:10462C0005FCF1E7240000DD0923DD2123DD09234E -:10463C00EF1B715307F42CD7D42CDF07715207E40E -:10464C002CEF05715307F42CC9942D01D771520727 -:10465C00E42CD731629B01D771039CD9CDFBF1E7D8 -:10466C00240000DD1223DD1923DD1123DD2623DDDB -:10467C003423DD3923DD3FFDEB46EF3DFD0C47EFE9 -:10468C0038D9CCFBC1AE6CFD312DC0F313BE6C71AF -:10469C002304EF25F0C1AE6CFD312DC0F313BE6CBD -:1046AC00712304EF14F6BE6C712204EF0CCB6CFF7B -:1046BC0000712304EF03FD80474004F905DD06403B -:1046CC0004F901DF0671230471039C31049C0FF67D -:1046DC00BE64BE6A31220402EF02F690BE6ED7CDE4 -:1046EC002E47F496AE6C317DBFCAFCFD5547D2DF28 -:1046FC000ED9CCFBC1AE6CFD312DC0F313BE6CD703 -:10470C00FD5547D2DD0DCD2E47F496AE6C317DBFF5 -:10471C00CAFCD7E8960934205080D6BFC6FC22CA02 -:10472C00FCBDD8304700FD000EBFC8FC30C6FCFDF8 -:10473C00472DF313BE6CB42ED42EDF0CCD2E47A414 -:10474C00964A961F61C8F496D740AFFB0BDC0571F7 -:10475C002304F2D740AFFB0661D831229A11F0C185 -:10476C00AE6CFD312DC0F313BE6C712204EF03FD52 -:10477C008047E2D771029CF0C1AE6CFD312DC0F3C5 -:10478C0013BE6CA4974A9740DC37F497D898F13154 -:10479C003F0412FD14D898F1BDD85008FD4F0E08F7 -:1047AC007208E6D2DD040192DFFC896158D1DD0587 -:1047BC00712204EF03712304A4984A982061C8F471 -:1047CC0098D7C73026FDC6D77180717DFADE0352AB -:1047DC0001D75200D7C7C12004FBF8FF1704030010 -:1047EC00C1E0C15010C150A4FDA0021006629C0291 -:1047FC00D1DD058C0272EF518C0C70C18C0470FDF4 -:10480C005948C0629C02D1DD058C0272EF3B8C03CF -:10481C005C7DD1DF03F2EF3117A1C1E0C15010C1B3 -:10482C0050A4FDA0021006629C02D1DD058C027220 -:10483C00EF178C015C7DD1DD03F2EF0D8C0370C1A1 -:10484C005010FD5948C0629C021006C6D7C7880696 -:10485C0016710AE650A4FDD403D2DD0771339B52C6 -:10486C0002EF1317FDF0036770FDF003FD8448FDA4 -:10487C00640471339BF2C6D7FD3B0450A4FDF003D6 -:0A488C005020FDF00350AAEDF003E8 -:1048960061FC61FCC1C3C5C7520C929269D4FEC1CA -:1048A600DFF88EFD708EFCC1717AFA4004F903DFE1 -:1048B60005302D2A6194C09EFC609EFD34D4FE52C4 -:1048C60006C0B9A5A592DFF9C6C4C2C061FC61DF06 -:1048D600520C929269D4FEC1DFF88EFD708EFCC137 -:1048E6008F4105775C04D1DD06675C01D1DD50316F -:1048F600549C3671620771539C8FB4FB5FBCFBD12D -:10490600DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE32 -:10491600FBD1DF098FB7FB5FBFFBD1DD0C3162072F -:1049260002EFFA716307716B2771139EFD4630F42F -:10493600227148500571605005717AFAED304A6768 -:104946005C02D1DD16D422DD124A2202DD0DF422EC -:104956007148500571605005717AFA717AFA8D22A4 -:10496600318FE7240000DD0823DD1423DD2CEF4A18 -:10497600F44A7140500571505005E422ED304A8FDB -:1049860040059D4B715050058D4B9D4DD84BFD10EC -:1049960034629D4CCD2202ED304A675C02D1DD17B0 -:1049A600675C10D1DD05CD2203EF0F71485005710C -:1049B600605005F422EF73CD22044A2203DF108DE6 -:1049C6004C9F4005D84CC1D84BFD9C34C0EF1F8F7F -:1049D60040057671744BDC054A4B02DE0671605069 -:1049E60005EF47C7D84BFDD630C071505005D84D9E -:1049F600F1242900DD27240400DD22242200DD1D08 -:104A0600241100DD0C240100DD13241E00DD0EEF51 -:104A16000A4A4B60DF07CD4B61EF02A44B4A2203E3 -:104A2600DF08D84BFD1034629D4CC09EFC609EFD95 -:104A360034D4FE5206C0B9A5A592DFF961FCC1C304 -:104A4600C5C7520C929269D4FEC1DFF88EFD708EF6 -:104A5600FCC1717AFA51405F0401D1DD06F616A752 -:104A660047DFF2300400BF2401F6BF2A01300B0BEA -:104A7600BF2801FD5A02300B0FBF2801FD5A023034 -:104A86000F0FBF2801710AE6F6420C01DD33AF04B1 -:104A960001BF0C0131529B2971529B710BE2D85117 -:104AA600FDD4033184BD02EFFACBB422FBD853F117 -:104AB600BEB8714BE1714BE5710ABD8D529E44EF54 -:104AC6000C71539B714AE5717BBD71339BC09EFC93 -:104AD600609EFD34D4FE5206C0B9A5A592DFF9C684 -:104AE600C4C2C061FCC1C5717AFAD450DD0BEA4E6E -:104AF600899E44A64EB450EF33710AE6300400BFD7 -:104B06002401F6BF2A01300B0BBF2801000000006C -:104B160000000000510FBF28010000000000000047 -:104B260000500FBF280171239B71339BC4C061FCE9 -:104B360061EF520C929269D4FEC1DFF88EFD708E41 -:104B4600FCC12006FBF8FF71503002CEABACCC04A2 -:104B560000F6BB31B2E210617900F6614900DFF37D -:104B660071603002EDF04B8E519C03713BE28C0379 -:104B76005C02D1DD1E8C035C08D1DF097150300266 -:104B8600CC0400EFCC8C0570FD7E35629E50CC04C3 -:104B960002EFBE8C035C03D1DF408E509C02715045 -:104BA60030028C04D1DF0E8C0270FDC435629C0588 -:104BB600CC0401EF328C044C02DF0671603002EF48 -:104BC60029CF34025A716030028C0270C18C057094 -:104BD600FD2635C0CF34024AEF108C035C01D1DDCF -:104BE6000671603002EF03ED574B1006C09EFC6065 -:104BF6009EFD34D4FE5206C0B9A5A592DFF961FC2C -:104C0600C1C3C5C7520C929269D4FEC1DFF88EFDAE -:104C1600708EFCC1710A9E31929E02EFFA8FDEFB06 -:104C26004F96FFDF198FDFFB4F97FFDF118FE0FBFA -:104C36004F98FFDF095004C15011FDCA34C0710BF3 -:104C46009EC09EFC609EFD34D4FE5206C0B9A5A54A -:104C560092DFF9C6C4C2C061FCE46A61FCC1C3C587 -:104C6600C7520C929269D4FEC1DFF88EFD708EFC9D -:104C7600C1C1FBF8FF8D1F9C018E31318EE72406E2 -:104C860000DD0823DD0E23DD22EF38717AFA8C0170 -:104C96009D62EF2F717AFA4007F901DF068C019DBC -:104CA60061EF2051FF2E019D61EF18717AFA8C0198 -:104CB6009D304004F903DD064004F904DF05307930 -:104CC6002561944031FF09DE05A031FFEF077158D9 -:104CD600F00071629C710BE3C0C09EFC609EFD34C7 -:104CE600D4FE5206C0B9A5A592DFF9C6C4C2C061FA -:104CF600FC717BFAC7D46A61F831249D2771239D24 -:104D0600D46ADD05B46ACEABAC717AFA5600664C4D -:104D16000ADD1172F3311C79D8FCCEFC0061CA6140 -:104D2600A486EFEA717AFAF2C6D7C7C1C1FBF8FFCB -:104D3600CC01008C014C0ADE36717BFA8C01F03115 -:104D46007E0410FC14A96168DF09AC02B9717AFA15 -:104D5600F2EF1D8C01F0317E127910FC614902DF01 -:104D660006717AFAE2EF09717AFA615901EFC4E243 -:104D76001004C6D7C72004FBF8FFF64210FC61F802 -:104D8600ED5C4E717BFA9C038C034C0ADE3C8C0373 -:104D9600F0317E0410FC14A96168DF05717AFAEF20 -:104DA60029717AFA8C0372F3311C7910FCCEFC005F -:104DB60061CA629C02D1DF0A8C03F0317E12E6786A -:104DC60010FC717BFA615903EFBECC0200CC0101E5 -:104DD6008C02F0317E0410FC14A96168DD788C0227 -:104DE600F0317E127910FCE743DF658C014C0ADE58 -:104DF6005F8C01F0317E127910FCE743DD4D717B4B -:104E0600FA8C01F0317E0410FC14A96168DF186188 -:104E160069018C01F0317E12F67810FC8C024E018D -:104E2600DCED717AFAEF2F8C01F0317E0410FC1460 -:104E3600A9128C02F0317E337810FC8C01F0317EA1 -:104E460012E67810FC615902717AFA615901EF9BFA -:104E5600615902EDD64D00F21004C6D761FF520C1F -:104E6600929269D4FEC1DFF88EFD708EFCC1717A14 -:104E7600FA8FE4FB5C03D1DD114004F903DD064043 -:104E860004F904DF05308A386194C09EFC609EFDFB -:104E960034D4FE5206C0B9A5A592DFF961FC61FCC7 -:044EA60061FC61FC4E -:0A4EAA0000060C12181E242A3036F0 -:104EB400ACFB0000000066FE00000000DF39113684 -:104EC4008C225F46332EE22E9B451B3BC008DC3C04 -:104ED40028FC36FE20FE02F903F929FC30FE2AFCE8 -:104EE4002BFC08F926FC6CFF1AFF6EFF6AFF64FFB7 -:0A4EF40027FC66FF2CFC55555555B0 -:104EFE00FF0000000000983AF82AFF00000047006B -:104F0E00317503F7332312D714AEF8C716AC061259 -:104F1E00C5AC0416F643DD078B99A7A5B3EFF5C212 -:024F2E00C6D7E4 -:024FF400325435 -:0A4FF60030393A32393A3130000008 +:102B9C00F9318FE7240000DD1123DD0623DD072347 +:102BAC00EF088686EF045104610666318F12504C93 +:102BBC00D633514CD6610A045420BD38C6D740AF29 +:102BCC00FB3DDC05CF04FC0FD740AFFB1FDC05CF72 +:102BDC0004FC0BD740AFFB0BDC05CF04FC07D74044 +:102BEC00AFFB0661D831320405CF04FC03D7D5AF57 +:102BFC00FBDD04E504FCD7F504FCD7D504F9DF04B0 +:102C0C00717396D7FD532C6261FB71019771149609 +:102C1C0071079761C831729617717296710497712A +:102C2C001196F171049761DC70C15012FDC947C057 +:102C3C00D7C716C75004FD5A2BC0C6D7C716C750E6 +:102C4C0002FD5A2BC0C6D740AFFB0BDE02E2D7F217 +:102C5C00D77100010571785005713AD5713BD18F50 +:102C6C0010055CFC9F1005CF54054AE54205711018 +:102C7C0042057100420571485005713050057120B4 +:102C8C005005CF530509CF52050B713051057120FA +:102C9C005105713BD5717050058F11055CFC9F116E +:102CAC0005F422D77178500571080105D7FD5F38FE +:102CBC00FD9104717AFAFDAF23F504F98F06F93111 +:102CCC00051B5003FD832B625C01D161E8CF04F935 +:102CDC0002CFAFFB64710407714196EF10F67104DB +:102CEC0007611012F6B1236061FB714196FD7230E1 +:102CFC00FD6D43712299712BE7618461A461EDEF45 +:102D0C00F8D7C788061666614FDD0967614EDE038A +:102D1C0096EF01866672C6D7C7161714AA0412A9B5 +:102D2C0043DD29AA0412A923FDF64EC3AC02FDF61D +:102D3C004E13C2BDD813FD9E0FDE0C1714AA02123F +:102D4C00AA0403BA04EF051714A9BA04AC0412318F +:102D5C00FF319E03317F087208C6D77100F2003034 +:102D6C004400BFB601300188BF9001300984BF9E7A +:102D7C0001BF9C01BF9A01BF9801BF9601BF94018E +:102D8C00BF9201F53CFF30FE00BFBE01F6BFBC0197 +:102D9C00BFB80150EEBFBA01A1BFB201C918FE0005 +:102DAC008F06F9310507F5CDFBCB6CFF00717397DE +:102DBC00716297D7C72004FBF8FF3026FBBC02F6E4 +:102DCC00BBAB446400DE0EAC0214CA000061790295 +:102DDC00617900EFEC1004C6D730EF00BFB401F6F8 +:102DEC00BFBA017108F200712304715307BE6EBEA5 +:102DFC0064BE6A712304715307715BD1F455F454AA +:102E0C00716397D78D56B456D1DF6931D4D1057122 +:102E1C005BD1E455D455DD2E7140B2FBD854F1E7AB +:102E2C0034020023DD0625DD0325DF05F6BE66EF43 +:102E3C0006D9CCFBF1BE66A4544A5420DF04F454EA +:102E4C00F455CD5619D7CD561E7148B2FBD5CEFBD5 +:102E5C00DF04F6BE66D7D9CCFBF14266FFDD15D98F +:102E6C00CCFBF112AE6643DE05A266FFEF03B26641 +:102E7C00FFCD5603D7C7161714F6B9AA0412F623BA +:102E8C001231FF31AE03316FBA02AA046168DD0A58 +:102E9C00AA026168DF04F6B1BA02C6D7C7C1FBF853 +:102EAC00FF8C085080D612AB1413B9AB14AA0412C1 +:102EBC00A92312D927FBF133BDD813FD0A0EBA0290 +:102ECC00C0C6D731049801D74004F902DF10F6BE12 +:102EDC0064BE6EBE6ABF8EFBBF94FBBF9AFB31749F +:102EEC009714308AFBFD812E3090FBFD812E30969D +:102EFC00FBFD812EEF713114980D7113987108D26E +:102F0C00FBF458F457EF60D457DF5A8F26FB9D57CC +:102F1C004A581FDC177100D2FB4028FBFFDD1CA4B4 +:102F2C00598F28FB4B59DE13F458EF0FD858F1A1E9 +:102F3C00605C1F9D587108D2FBF459E858092AFBB4 +:102F4C0070C1308AFBFDA82EC0E858094AFB70C13D +:102F5C003090FBFDA82EC0E858096AFB70C1309672 +:102F6C00FBFDA82EC0B457308AFBFD242DF313BEF5 +:102F7C006E3090FBFD242DF313BE6A3096FBFD24BE +:102F8C002DF313BE64D7C736F00071F4DC297170D1 +:102F9C00F000CE9D08CE9EC0CE9F80F594FFF59399 +:102FAC00FFF592FFE597FFE596FFE595FFE598FFA6 +:102FBC00CE9C7F7100A6FB711BE3712BE3711AE7AA +:102FCC00712BE7717A9D710A9E31929E02EFFA7114 +:102FDC000B9E712398713398714398C6D7C73122D1 +:102FEC00981E712298710A9E31929E02EFFA34D487 +:102FFC00FB3692FF52078B99A5A792DFF9710B9EB6 +:10300C00C6D7C788061631329815713298C7349CCA +:10301C00FB3092FF1652078B99A5A792DFF9C66673 +:10302C007367189CFBC6D7C77123983134981E71EF +:10303C003398710A9E31929E02EFFA3492FF369CBD +:10304C00FB52078B99A5A792DFF9710B9E3144981F +:10305C0013714398717B9E8FDCFB9E9A8FDDFB9ED8 +:10306C009B717A9EC6D7CFA7FB5CCFA8FB5FCFC85E +:10307C00FB5DCFFCFB36CFFDFBC9D7C7CFA4FB1242 +:10308C00CFA5FB25CFCCFBFFF5CDFBF5CEFBF5CFCC +:10309C00FBF5D0FB5600664C64DE08723826FB004C +:1030AC0086EFF3F5E3FB714A9D712B21710A2071B8 +:1030BC001A20710203C6D7C788061617F1E7340326 +:1030CC00002361E3EDEF332361F8EDC632B12361E8 +:1030DC00E3EDD0322561F8EDDE32B1240D0061D87C +:1030EC00EDEF33240B0061F8EDB8312361F8EDFB03 +:1030FC00312361F8EDCB312361F8EDE83324060080 +:10310C0061F8ED7A32B12561D8ED96322400006178 +:10311C00F8EDA3322361F8EDEF332361F8EDED33D5 +:10312C00B12361E3EDFE322361F8ED0F332361F837 +:10313C00ED20332361F8ED0F332361F8ED313323A8 +:10314C0061F8ED42332361F8ED51332361F8ED73EF +:10315C00332361F8ED7E332361F8ED89332361F875 +:10316C00ED91332402002361E3EDEF332361F8ED9D +:10317C00C5332361F8ED99332361F8EDA433256150 +:10318C00F8EDAF33B124060061D8EDEF3324000025 +:10319C0061F8EDF1332561F8EDBA3324120061F8D2 +:1031AC00ED74322361F8ED6432EDF13367D1DD0C4F +:1031BC0030993B619434C4FB89616F99EDFB3367A3 +:1031CC005C02D1DD0730FB2A6194EF0B675C01D107 +:1031DC00DD0530002B6194675C3CD1DD0F30052B95 +:1031EC006194675C3C7266736218A4FBEDFB3367F9 +:1031FC00D1DD625C01D1DD05300800EF01F6609F86 +:10320C0001FC675C02D1DD03E6EF01F63401FC89B9 +:10321C00616899675C04D1DD04E6A1EF01F6340125 +:10322C00FC89616899675C08D1DD05302000EF01ED +:10323C00F63401FC89616899675C10D1DD053010AA +:10324C0000EF01F63401FC89616899675C20D1615B +:10325C00E8716001FCEDFB334A5AC8DE08E85A6796 +:10326C00185AFAA45AEDFB33679D5AEDFB33D44838 +:10327C00DF08679FCDFBA448EF0D4A4805DE08E840 +:10328C0048671811FDA448EDFB33675C0F72667339 +:10329C006218A4FBEDFB334A4864DE1B4A4801DF8D +:1032AC000667D161F85701E848671826FBA4484A1D +:1032BC00480561C8711298EDFB3334A6FB89615F38 +:1032CC0099EDFB33305A29619466736718A4FBEDB2 +:1032DC00FB3340A9FB6ADF1340AAFB68DF0D674C88 +:1032EC006CDF0830AA406194713AD5679FABFBED57 +:1032FC00FB33675C7F70C117F1243000FD0E30C0CA +:10330C00EDFB33675C3F70C117F1243000FD0E30CC +:10331C00C0EDFB33675C0770C117F1243000FD0E64 +:10332C0030C0EDFB33675C1F70C117F1243000FD1A +:10333C000E30C0EDFB336770C117F1243000FD0E69 +:10334C0030C0EDFB33CEABAC710A9E31929E02EFD6 +:10335C00FAD592FFDF05710B9EEFED679E99710B0D +:10336C009E9FDBFBEDFB33714298675C7F9FDCFB20 +:10337C00EF7D714298675C3F9FDDFBEF72675C3FAE +:10338C009FDEFBEF6A675C1F9FDFFBEF6230433908 +:10339C006194679FE4FBEF573010396194679FE5A8 +:1033AC00FBEF4C3029396194679FE8FBEF41675C78 +:1033BC0001D1DD3BFD6D43EF36675C02D1DD05715C +:1033CC002A21EF06714A9D712B21675C01D1DD0624 +:1033DC00710300710B20679FE3FBEF1367318EEFD6 +:1033EC000EEF0CEF0A664C5BDE05736718A4FBC688 +:1033FC00D7C716664C30DC094C37DE05FDE92FEFDC +:10340C006B664C02DF1F8FA6FB5C03728F03FC5CA8 +:10341C0003318E316D08616A08128F03FC5C8031B8 +:10342C002A6162EF56664C3DDF08AE90BD5CF85CDD +:10343C00EF49664C3EDF04F85DEF40664C4FDF050C +:10344C00FD9543EF36664C61DF08E85A095AFA726B +:10345C00EF29664C7FDF05FD0F3CEF1F664C4EDFFE +:10346C000B31049A045210EF12F2EF0F664C5BDC36 +:10347C000452FFEF06667309A4FB72C6D7C7880611 +:10348C001617F1241000240500DC07244C00DD176E +:10349C00EF17717BFA17F104A4FB1489617F997102 +:1034AC007AFA715298EF02A45AC6D7C7C1C1FBF879 +:1034BC00FF4004F903DD064004F904DF38717BFAA0 +:1034CC008C027309ACFB5E0AD1DF278C02318E04AF +:1034DC00A4FB14896E0A99716207717AFACC010007 +:1034EC00316207086159018C01D1DFF471630771F6 +:1034FC006B27717AFA1004C6D7CF03FC03F501FCD5 +:10350C00F505FCF507FCD7C788061617F1E734025A +:10351C000025DD3D23DD1725DD1C23DD0523DD2BFB +:10352C00EF3B710299679F06FCCD6103EF2F675C3F +:10353C00839F03FCEF27675C039F05FC675C034CD0 +:10354C000261F871229AFD8345EF12679F07FCEF29 +:10355C000C6791DF08E0C15012FDB734C0C6D7C765 +:10356C001617F1E7240000DD2A23DD1E240300DDFD +:10357C000724FB00DD24EF2531329A05308000EF63 +:10358C0001F6086F04FC7208EF198F01FCF501FCC1 +:10359C0072EF107152995235EF09F2EF066673090A +:1035AC0000FC72C6D7C71617F1E7240000DD3824DB +:1035BC001000DD1C23DD1C23DD30240E00DD18245F +:1035CC001100DD1B240F00DD12243000DD15EF1E71 +:1035DC00E2EF1D5202EF195204EF155206EF115291 +:1035EC0005EF0D5207EF09F2EF065203EF0252FFFF +:1035FC00C6D7C7316498377163988D609FACFB8DCB +:10360C005F9FCBFB36D2FCC7D85FFD6537618A70F4 +:10361C00618AFDAA37C0D864F1312F609D638D5E3D +:10362C004B63DD0A7172988D639D5ECD61034A61B7 +:10363C0005DE08306F366194CD616BB4617150F06A +:10364C0000CE300BCF170006CE3106FD6402717A26 +:10365C0030710BE3710BE7C6D78D639D5E8D639F55 +:10366C00ADFBD74004F903DF064004F904DF02F296 +:10367C00D73174980C7173987113998D639D65EFA4 +:10368C00313104991F710399711299D506FCDF042D +:10369C00F466EF0A8F06FC5002D6A1609D668D661B +:1036AC009D65EF0E311499068D669D65EF048D6353 +:1036BC009D658D659FADFBD865FDD736E865091C0A +:1036CC002270C15013FDC947C0F2D7C7C1C1FBF866 +:1036DC00FF8C02D1DF05F506FCEF1A8C024C05DEDF +:1036EC0006CF06FC02EF0E8C02318E1231FE033136 +:1036FC001F609F06FC8D674F06FCDD28CC011F8FD9 +:10370C0006FC9D67CC00008B4C08DE148B730912F1 +:10371C00204F06FCDC058B9C01EF05615900EFE79F +:10372C008C019D621004C6D7C716710AE7710BE3B2 +:10373C007150F000CE300BCF170006669E31FD6441 +:10374C0002717A30710BE33182E302EFFA8D1F7153 +:10375C0058F000710BE772C6D7C7C1C1FBF8FF8FD9 +:10376C00FCFB4E02DC03F2EF318C024FFDFBDC0460 +:10377C0052FFEF268C022FFCFB706131318D128FC2 +:10378C00FDFB2FFCFB70613133BDD813FD2C0EBB40 +:10379C00440001DC03F690BB8B721004C6D7C7C182 +:1037AC00FBF8FFAC0814A91489708B612870613187 +:1037BC00FDF64E1344030071FEDC23AC08148A049E +:1037CC00819A04AC08148A044C11DC10A9148B994E +:1037DC00AC0814CA0200AC0814CA0310EF72AC088F +:1037EC0014CA0400AC0814A914894DDE0AAC0814E0 +:1037FC008A02819A02EF12AC0814A914894D61D384 +:10380C0008AC08148A02919A02AC08148A03919AA3 +:10381C0003D1DF3CAC08148A024C10DF10A91489C8 +:10382C00318EA112AC0814A9146299EF17AC0814CC +:10383C008A024CF0DF0EA91489318EB112AC081437 +:10384C00A9146299AC0814CA0200AC0814CA03107B +:10385C00C0C6D7ED6238C75600664C0ADE0BF03195 +:10386C007E12F67810FC86EFF0C6D7C7200CFBF85A +:10387C00FF17040600C15006C150A8C15030FDAA64 +:10388C00021006D2DD1B4A6A04DE05A46AE2EF7060 +:10389C0034E4FB895CFC99FD43397110B2FBF2EF07 +:1038AC005F717BFA300600C117040600C130E9FBDA +:1038BC00FDFE4E1004717AFAF46A8FE4FB5C01D1C0 +:1038CC00DD264004F903DF205010C180FDB734C061 +:1038DC00C736100571D4C6DE0F17C15006C150A8EB +:1038EC00C15030FDAA0210064004F903DD06400465 +:1038FC00F904DF0B8FE4FB5C02D161E8FDAF40F211 +:10390C00100CC6D7D9E5FBC15030FD8902C0629FAF +:10391C00E8FB5008C15011FDB734C0F2D7D9E8FB11 +:10392C00C1D9E7FBC15030FD250310045008C1502C +:10393C0011FDB734C0F2D7C7200CFBF8FFCC09003F +:10394C004007F901DF05CC0A02EF03CC0A10CC0BBF +:10395C00808FE4FB5C039C07D1DF08717AD5CC081F +:10396C0007EF06717BD5CC082F17040800C1500453 +:10397C00C150A0C15030FD5C031006624C02DF0741 +:10398C007110B2FBF2EF357118B2FBF46AC7361046 +:10399C000571D4C6DE164004F903DF1017A1C1501F +:1039AC0006C150A8C15030FDAA021006717BFA8FD7 +:1039BC00E4FB5C034E07DD03E2EF01F2100CC6D70B +:1039CC00D504F9DF03F6BD6C4004F901DD0AD476A9 +:1039DC00DD03B476D7CD76038F04F9318FE723DD81 +:1039EC00512402002361D30423DD47D7FDDB3A3198 +:1039FC00029B01D731629A194A6E05DE16A46E4AF3 +:103A0C006E05DF0FA46E5004C15010FDB734C0EF2B +:103A1C0002F46E31649A194A7005DE16A4704A706D +:103A2C0005DF0FA4705008C15010FDB734C0EF0271 +:103A3C00F470FD423AD78F06F9312349301B00460A +:103A4C006CDF158FE3FB5C01D161E8F504F9E0C193 +:103A5C005010FDB734C0EF1D307701466CDF1650A7 +:103A6C0002C15010FDB734C0F64672DF088FC8FB98 +:103A7C005010D6BD72F64672DD36B6724672DF3025 +:103A8C00711297EF2B301B00466CDF13F64674DF78 +:103A9C0018E0C15010FDB734C0C9745307EF0A3099 +:103AAC007701466C61F8711297F6467461E8B6744A +:103ABC0031549A07714399F6BD6CD731449904F689 +:103ACC00BD6CD7A66CF6466C61F8C96CFFFFD7D4F9 +:103ADC0071DD03B471D731729A174A6F05DE14A4E5 +:103AEC006F4A6F05DF0DA46F5010C1FDB734C0EFE6 +:103AFC0002F46F4A6F0661F8CD7125D7C7361005F1 +:103B0C0071D4DE0E8FB2FB5C02D1DF0630773861E8 +:103B1C0094D24004F903DF1C31220705302D2A61B1 +:103B2C00943154990C7153995080C15012FDB73493 +:103B3C00C0FD453BFD6B3BC6D78F03FC5C01D1DD63 +:103B4C001DD479DD03B479D7CD79098D624B78DD3D +:103B5C000D8D629D785040C15012FDB734C0D740D6 +:103B6C0004F903DD04F6BD1AD7D5D0FBDF08F64601 +:103B7C001ADD19B61AD7D9CCFBF1461ADD0ED9CC01 +:103B8C00FB12AD1A43DE03A61AD7B61AD7717BFA0D +:103B9C00C78FC4FB76F5C4FB717AFA5C10D161E86F +:103BAC00716299665C0FD1DD57665C01D1DD05F55C +:103BBC0004F9EF4C665C02D1DD11E0C15003FD72DB +:103BCC002BC0711300711B20710303665C04D1DDE3 +:103BDC0011711300711B20D503FC61F8710303FDF7 +:103BEC000535665C08D161E87103035005FD1B0ABD +:103BFC007102035003C1FD722BC0711A20FD1A2BE8 +:103C0C00F2C6D7C756FF4A481361C8EDC53C8F06AC +:103C1C00F9311505300400EF0F8F06F931450530E9 +:103C2C000500EF04D907F9F1609F28FC8D7A9F29D4 +:103C3C00FC713496E661301271049661DC311961C5 +:103C4C0062629F2AFCE52BFC31449A05304000EF60 +:103C5C0001F6C131340405302000EF01F6C2616B6E +:103C6C0008616A08C131749A05300400EF01F6C28C +:103C7C00616B08616A08C131649A04E6A1EF01F630 +:103C8C00C2616B08616A08C131549A03E6EF01F610 +:103C9C00C2616B08616A9F2CFCF171240461DC9F8A +:103CAC0026FCF171540761DC9F27FCD848F1010414 +:103CBC00ECFC14A9148976A4486672C6D7C7FD3FDC +:103CCC00098F04F9318FE724000061F8EDC73E231A +:103CDC00DD212361F8EDBA3D2361F8ED4C3E236103 +:103CEC00F8ED953E2361F8ED5A3F2361F8EDA03DC8 +:103CFC00EDC43EF6BD727113974005F901DF2C310E +:103D0C00349A1B466CDD04F424EF02A4244A246587 +:103D1C00DC0FF6BD6CF504F9712299EDDB3FFDAFBC +:103D2C0023AD6C440A0061D8EDDB3F714299FD91E3 +:103D3C0004716396FDAF234007F903DF09712299E3 +:103D4C00F504F9EDDB3FFD192640B1FB9BDE097153 +:103D5C002299F504F9EDDB3F714A27714011057189 +:103D6C00301105713A22715A2271501105FD7529D5 +:103D7C00D2DD09712299F504F9EDDB3F71103500A4 +:103D8C00CF37001D714012055032FD1B0ACF04F9CC +:103D9C0006EDDB3FFD754062318FE7240000DD0A44 +:103DAC0023DF06F504F9EDDB3F00CF04F902FDDC5F +:103DBC00294005F901DD064005F903DF05F5CDFBCA +:103DCC00EF04CFCDFB03CF04F902FD4529FD5D2C9B +:103DDC00FDFF04FD0535FD8730F537FF712BE0F550 +:103DEC0005F9712299CBE43FEFCBE6F6F0FD910497 +:103DFC00713BD48F06F93105285004FD832B625C8E +:103E0C0003318E315D34B3FB896168995002FD83B7 +:103E1C002BD2DD067170B3FBEF047178B3FBFDAFF1 +:103E2C0023FD672D710806F9CF04F9038FA6FB5CFF +:103E3C0002D1DD095080C15010FDB734C0EDDB3F1D +:103E4C00FD0C403164992FA47CD47CDD0831A4E0B6 +:103E5C000A31020C06712BE0FD9B4031A4E01731B6 +:103E6C00040C13712BE05027C15005FD722BC0CFF1 +:103E7C0004F904712299FD90408F06F93125073120 +:103E8C00349A03F504F9EDDB3FFD0C4031020C15BF +:103E9C00D83AC15005FD722BC05005FD1B0AFD9B85 +:103EAC0040CF04F903FD90408F06F93125073134DA +:103EBC009A03F504F9EDDB3FF504F9FDDD3FD26122 +:103ECC00E8EDDB3FF6BD72711397F5E4FBFD43396A +:103EDC00717AFAFDE52DFDB02CFD5105712B217188 +:103EEC004B9D31349702EFFACE3708CBE4BFFFCBB2 +:103EFC00E6FFF3CED4FFF5B4FBF5B5FBF5B6FBF559 +:103F0C00B7FBCF37000971481205F6BEE0BEE2BE22 +:103F1C00D0716A27FDEF29714307714B2771481047 +:103F2C00057148110571381005713811057133028E +:103F3C00713B22715302715B22715810057158113B +:103F4C0005CF04F905714299F6BD6CFD080AF5051B +:103F5C00F9F42431349A04D432DD20E505F9E50472 +:103F6C00F98F06F9312568F5F8FBF5F6FB502EFDB7 +:103F7C001B0ACF05F903E504F9EF54FDE504FD42F6 +:103F8C00237173017132047143027103967162964D +:103F9C0031949E02EFFA712AE7CEA409F5F30031B1 +:103FAC0004070261FDE5F300F468FD3F09CEA408A7 +:103FBC0031329A06CF04F905EF09714399E505F9F9 +:103FCC00E504F9712BE78F06F9312503F504F9C6E1 +:103FDC00D7CFCDFB03F5CEFBF5D0FB717297F64234 +:103FEC006CFFDF184266FFDF13461ADF0F426EFFCD +:103FFC00DF0A426AFFDF054264FFDD02E2D7F2D737 +:10400C008FE3FB5C01D1DF60D47DDF1931020058F6 +:10401C005003FD832B625C01D1DF07F504F971229B +:10402C0099D7E47DD74A7DF0DF073104003AF47D5F +:10403C00D74A7DC8DF0AF504F9712299CD7DF0D7F6 +:10404C00310200084A7DFFDD1FA47DD7F0C150046A +:10405C00FD722BC08FB3FB5C9F9FB3FB7110C4FB35 +:10406C0030993B6194CD7DF0D731049B05F6BD7E34 +:10407C00F2D73132020431549A05F6BD7EE2D7F6FE +:10408C00BD7EF2D731149706F504F9712299D771D8 +:10409C006399F47C717207FD6402717307D7FD5A42 +:1040AC0005F2D7717BFAC7200CFBF8FF8FEAFBF007 +:1040BC00F9E9FBF303FDF64E13BC048FECFBF0F9AE +:1040CC00EBFBF303FDF64E13BC028FEEFBF0F9EDA8 +:1040DC00FBF303FDF64E13BB717AFAAC04BDD8F6B4 +:1040EC00BDDAAC04311EBDDCF6BDDEFDDF0DADD896 +:1040FC00BDDCADDABDDEAC02BDD8F6BDDAAC02314A +:10410C001EDADCC3DADEC3BDDCF6BDDEFDDF0DC0BE +:10411C00BDDEC0BDDCADDEFD550FADD8BDDCADDA0E +:10412C00BDDEABBDD8F6BDDAAB311EDADCC3DADEF0 +:10413C00C3BDDCF6BDDEFDDF0DC0BDDEC0BDDCAD3C +:10414C00DEFD550FDADAADD8FD7E44C3C58D8C5C2F +:10415C003FF0317E0440FC14C2C0B9A48CF6BC08FC +:10416C00BC0A9C078C074C2EDD3D8D8C0E0770F124 +:10417C0061DC605C3FF0317E127940FCBDD8F6BD4D +:10418C00DA8C0773095C22318FBDDC70BDDEFDDF7C +:10419C000DAC08BDDCAC0AFD550FADDABC0AADD8D0 +:1041AC00BC08615907EFBDAC08BDD8AC0ABDDAC973 +:1041BC00DC0004F6FDA90EC9DCFFFFF6FDAA0FAD6D +:1041CC00D8BD86AF3AFC4686DD11AF3CFCBF3EFC49 +:1041DC00AF3AFCBF3CFCAD86BF3AFCAF3CFC423E68 +:1041EC00FCDC46AF3AFC423CFCDE3EAD26423AFCDF +:1041FC00DE374A2A16DC1A4A2AA0DE138D884B2A8F +:10420C00DE0DAF3AFC268A44691061C8FD6742F4A2 +:10421C002AAF3AFC445146DC0AAF3AFC241027BDC5 +:10422C0028EF0DC928F82AEF074A2AFF61E8A42ACB +:10423C00AF3EFC423CFCDC18AF3CFC423AFCDE10CE +:10424C00AF3AFC4628DE09F488AF3AFCBD8AEF078A +:10425C004A88FF61E8A488100CC6D7717BFAC77135 +:10426C000A9E31929E02EFFA8E949F34FC8E969F9A +:10427C0035FC8E979F36FC8E989F37FC8E939F381B +:10428C00FC8E929F39FC710B9E717AFA8F37FCFD74 +:10429C00BE0F76FDFC4313BD84D5EFFBDF0AD5F0D2 +:1042AC00FBDF05D5F1FBDD25F6B14684DF11C984B2 +:1042BC003722665C0391DF060A84181A850096176C +:1042CC00FD1F4513FD3F4331049A02EF61520692E4 +:1042DC00926934FC682EFCDFF6AD84BD82F880F365 +:1042EC00311C790AF944FEFFDD44D880F101040A3F +:1042FC00F914A944FFFFDF04E6B9EF0BD880F101F4 +:10430C00040AF914A9A1B9717BFAA0EFFBD5EFFB54 +:10431C00DF1CA0F0FBD5F0FBDF14A0F1FBD5F1FB0B +:10432C00DF0CCFEFFBFFCFF0FBFFCFF1FBFFC67134 +:10433C007AFAD7C716D880F10744A800DC057102B9 +:10434C009AEF1CF647DD18A4804A80A8DC057102A0 +:10435C009AEF0CF880F3311CF6780AF9B7EFE4C643 +:10436C00D7C756A89666F0317E12F6B1780AF96670 +:10437C00D1DFF1717BFAF5EFFBF5F0FBF5F1FBF416 +:10438C008071039AC6717AFAD7C72004FBF8FFD460 +:10439C0048DF168D809D8D717BFA52069292692EA4 +:1043AC00FC68C0FCDFF6717AFA4A4806DE0EE84873 +:1043BC0009C0FC9C03A4488C0372EF30F88DF331D8 +:1043CC001C790AF9BB31129A058B9C03EF0F8C01F7 +:1043DC009C03D48DDF05CD8DA7EF02B48D71807158 +:1043EC00179A61DC61FB71119A8C03721004C6D7A9 +:1043FC00C72008FBF8FF8F37FCFDBE0F9C078F36DC +:10440C00FCFDBE0F9C068F35FCFDBE0F9C058F344A +:10441C00FCFDBE0F9C048F38FC9C038F39FC9C0266 +:10442C008C06318E0112791A20BB8C075C03D1DF0C +:10443C00098C064C0361C86179008C05318EB16121 +:10444C000900BB313D120103BB8B0E04708C011CA7 +:10445C0000BB8FF4FB4E03DC0E8C034FF4FBDC0B28 +:10446C008C024FF5FBDC04AB12EF03ABB11210085E +:10447C00C6D7C7C3C12008FBF8FFF661490A61F82B +:10448C00614908DF07F7340000ED1B45E6BC04F674 +:10449C00BC06AC0ABC02AC08BBAC06614902AC045D +:1044AC0061F8614900DE28AC04BDD8AC06BDDAE188 +:1044BC00FD640FADDABC06ADD8BC04ABBDD8AC0204 +:1044CC00BDDAE1FD7F0FADDABC02ADD8BBEFCAACF3 +:1044DC0006BC02AC04BBAC08BDD8AC0ABDDAAC045B +:1044EC00BDDCAC06FDE20EAC04BDDCAC06FD550F2C +:1044FC00E1FD7F0FADDABC06ADD8BC04AC0661495A +:10450C0002AC0461F8614900DCC5AC0214AB1210BA +:10451C000CC6D7C7C12004FBF8FF8F31FCFDBE0FC2 +:10452C009C034E04DF1CAD824684DE07AD842682DC +:10453C0012EF40F64684DF074682DD03E7EF34F7DF +:10454C00EF318C04318EB1128C03318E43DF183075 +:10455C00382226820684BB8C045C0391DF05AB04F5 +:10456C001800BBAB12EF0C8C034E04DE0532A90015 +:10457C00EF01F71006C6D7717BFA31229A0CF6467A +:10458C0090DD07B690717AFAEF7C71239A717AFA02 +:10459C004004F904DF07715307F42CEF69D9CFFB02 +:1045AC00F1E7240000DD0F23DD1A23DD1023DD539A +:1045BC0023DD2723DD38715307F42CEF49715207A3 +:1045CC00F42CEF42D42CDF07715207E42CEF057169 +:1045DC005307F42CC990FA00EF2CD42CDF0B71523A +:1045EC0007E42CC990FA00EF1DF5CFFBEF18D42C83 +:1045FC00DF0B715307E42CC990FA00EF09CFCFFB06 +:10460C0002EF03FD1346D7D905FCF1E7240000DDCA +:10461C000923DD2123DD0923EF1B715307F42CD76C +:10462C00D42CDF07715207E42CEF05715307F42CDF +:10463C00C9902D01D7715207E42CD731629701D75D +:10464C00710398D9CDFBF1E7240000DD1223DD19AD +:10465C0023DD1123DD2623DD3423DD3923DD3FFD6E +:10466C00D346EF3DFDF446EF38D9CCFBC1AE6CFD23 +:10467C000E2DC0F313BE6C712304EF25F0C1AE6C8C +:10468C00FD0E2DC0F313BE6C712304EF14F6BE6C3B +:10469C00712204EF0CCB6CFF00712304EF03FD6857 +:1046AC00474004F905DD064004F901DF06712304D7 +:1046BC007103983104980FF6BE64BE6A312204026D +:1046CC00EF02F690BE6ED7CD2E47F492AE6C317DD4 +:1046DC00BFCAFCFD3D47D2DF0ED9CCFBC1AE6CFD91 +:1046EC000E2DC0F313BE6CD7FD3D47D2DD0DCD2E84 +:1046FC0047F492AE6C317DBFCAFCD7E892093420E6 +:10470C005080D6BFC6FC22CAFCBDD8304700FD0A7B +:10471C000EBFC8FC30C6FCFD242DF313BE6CB42EAA +:10472C00D42EDF0CCD2E47A4924A921F61C8F4926E +:10473C00D740AFFB0BDC05712304F2D740AFFB066F +:10474C0061D831229611F0C1AE6CFD0E2DC0F31361 +:10475C00BE6C712204EF03FD6847E2D7710298F03A +:10476C00C1AE6CFD0E2DC0F313BE6CA4934A9340E6 +:10477C00DC37F493D894F1313F0412FD14D894F142 +:10478C00BDD85008FD590E087208E6D2DD0401921E +:10479C00DFFC896158D1DD05712204EF037123041C +:1047AC00A4944A942061C8F494D7C73026FDC6D788 +:1047BC007180717DFADE035201D75200D7C7C12038 +:1047CC0004FBF8FF17040300C1E0C15010C150A452 +:1047DC00FDAA021006629C02D1DD058C0272EF511B +:1047EC008C0C70C18C0470FD4148C0629C02D1DD00 +:1047FC00058C0272EF3B8C035C7DD1DF03F2EF3151 +:10480C0017A1C1E0C15010C150A4FDAA021006624C +:10481C009C02D1DD058C0272EF178C015C7DD1DD21 +:10482C0003F2EF0D8C0370C15010FD4148C0629C27 +:10483C00021006C6D7C7880616710AE650A4FDDE1C +:10484C0003D2DD077133975202EF1317FDFA03679A +:10485C0070FDFA03FD6C48FD6E04713397F2C6D7F8 +:10486C00FD450450A4FDFA035020FDFA0350AAEDB7 +:02487C00FA033D +:10487E0061FC61FCC1C3C5C7520C929269D4FEC1E2 +:10488E00DFF88EFD708EFCC1717AFA4004F903DFF9 +:10489E0005302D2A6194C09EFC609EFD34D4FE52DC +:1048AE0006C0B9A5A592DFF9C6C4C2C061FC61DF1E +:1048BE00520C929269D4FEC1DFF88EFD708EFCC14F +:1048CE008F4105775C04D1DD06675C01D1DD503187 +:1048DE005498367162077153988FB4FB5FBCFBD14D +:1048EE00DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE4B +:1048FE00FBD1DF098FB7FB5FBFFBD1DD0C31620748 +:10490E0002EFFA716307716B2771139AFD3330F45E +:10491E00227148500571605005717AFAED184A6798 +:10492E005C02D1DD16D422DD124A2202DD0DF42204 +:10493E007148500571605005717AFA717AFA8D22BC +:10494E00318FE7240000DD0823DD1423DD2CEF4A30 +:10495E00F4487140500571505005E422ED184A8F0D +:10496E0040059D49715050058D499D4BD849FDFD1F +:10497E0033629D4ACD2202ED184A675C02D1DD17E3 +:10498E00675C10D1DD05CD2203EF0F714850057124 +:10499E00605005F422EF73CD22044A2203DF108DFE +:1049AE004A9F4005D84AC1D849FD8934C0EF1F8FB0 +:1049BE00400576717449DC054A4902DE0671605085 +:1049CE0005EF47C7D849FDC330C071505005D84BCD +:1049DE00F1242900DD27240400DD22242200DD1D20 +:1049EE00241100DD0C240100DD13241E00DD0EEF6A +:1049FE000A4A4960DF07CD4961EF02A4494A220302 +:104A0E00DF08D849FDFD33629D4AC09EFC609EFDC5 +:104A1E0034D4FE5206C0B9A5A592DFF961FCC1C31C +:104A2E00C5C7520C929269D4FEC1DFF88EFD708E0E +:104A3E00FCC1717AFA51405F0401D1DD06F616A76A +:104A4E0047DFF2300400BF2401F6BF2A01300B0B02 +:104A5E00BF2801FD6402300B0FBF2801FD64023038 +:104A6E000F0FBF2801710AE6F6420C01DD33AF04C9 +:104A7E0001BF0C0131529729715297710BE2D84F39 +:104A8E00FDDE033184BD02EFFACBB422FBD851F127 +:104A9E00BEB8714BE1714BE5710ABD8D509E44EF6E +:104AAE000C715397714AE5717BBD713397C09EFCB3 +:104ABE00609EFD34D4FE5206C0B9A5A592DFF9C69C +:104ACE00C4C2C061FCC1C5717AFAD44EDD0BEA4C8A +:104ADE00899E44A64CB44EEF33710AE6300400BFF3 +:104AEE002401F6BF2A01300B0BBF28010000000085 +:104AFE0000000000510FBF28010000000000000060 +:104B0E0000500FBF2801712397713397C4C061FC09 +:104B1E0061EF520C929269D4FEC1DFF88EFD708E59 +:104B2E00FCC12006FBF8FF71503002CEABACCC04BA +:104B3E0000F6BB31B2E210617900F6614900DFF395 +:104B4E0071603002EDD84B8E519C03713BE28C03A9 +:104B5E005C02D1DD1E8C035C08D1DF09715030027E +:104B6E00CC0400EFCC8C0570FD6B35629E50CC04EE +:104B7E0002EFBE8C035C03D1DF408E509C0271505D +:104B8E0030028C04D1DF0E8C0270FDB135629C05B3 +:104B9E00CC0401EF328C044C02DF0671603002EF60 +:104BAE0029CF34025A716030028C0270C18C0570AC +:104BBE00FD1335C0CF34024AEF108C035C01D1DDFA +:104BCE000671603002EF03ED3F4B1006C09EFC6095 +:104BDE009EFD34D4FE5206C0B9A5A592DFF961FC44 +:104BEE00C1C3C5C7520C929269D4FEC1DFF88EFDC7 +:104BFE00708EFCC1710A9E31929E02EFFA8FDEFB1F +:104C0E004F96FFDF198FDFFB4F97FFDF118FE0FB12 +:104C1E004F98FFDF095004C15011FDB734C0710B1E +:104C2E009EC09EFC609EFD34D4FE5206C0B9A5A562 +:104C3E0092DFF9C6C4C2C061FCE46861FCC1C3C5A1 +:104C4E00C7520C929269D4FEC1DFF88EFD708EFCB5 +:104C5E00C1C1FBF8FF8D1F9C018E31318EE72406FA +:104C6E0000DD0823DD0E23DD22EF38717AFA8C0188 +:104C7E009D60EF2F717AFA4007F901DF068C019DD6 +:104C8E005FEF2051FF2E019D5FEF18717AFA8C01B4 +:104C9E009D304004F903DD064004F904DF0530774A +:104CAE002561944031FF09DE05A031FFEF077158F1 +:104CBE00F000716298710BE3C0C09EFC609EFD34E3 +:104CCE00D4FE5206C0B9A5A592DFF9C6C4C2C06112 +:104CDE00FC717BFAC7D46861F83124992771239946 +:104CEE00D468DD05B468CEABAC717AFA5600664C6A +:104CFE000ADD1172F3311C79D8FCCEFC0061CA6159 +:104D0E00A486EFEA717AFAF2C6D7C7C1C1FBF8FFE3 +:104D1E00CC01008C014C0ADE36717BFA8C01F0312D +:104D2E007E0410FC14A96168DF09AC02B9717AFA2D +:104D3E00F2EF1D8C01F0317E127910FC614902DF19 +:104D4E0006717AFAE2EF09717AFA615901EFC4E25B +:104D5E001004C6D7C72004FBF8FFF64210FC61F81A +:104D6E00ED444E717BFA9C038C034C0ADE3C8C03A3 +:104D7E00F0317E0410FC14A96168DF05717AFAEF38 +:104D8E0029717AFA8C0372F3311C7910FCCEFC0077 +:104D9E0061CA629C02D1DF0A8C03F0317E12E67882 +:104DAE0010FC717BFA615903EFBECC0200CC0101FD +:104DBE008C02F0317E0410FC14A96168DD788C023F +:104DCE00F0317E127910FCE743DF658C014C0ADE70 +:104DDE005F8C01F0317E127910FCE743DD4D717B63 +:104DEE00FA8C01F0317E0410FC14A96168DF1861A1 +:104DFE0069018C01F0317E12F67810FC8C024E01A6 +:104E0E00DCED717AFAEF2F8C01F0317E0410FC1478 +:104E1E00A9128C02F0317E337810FC8C01F0317EB9 +:104E2E0012E67810FC615902717AFA615901EF9B12 +:104E3E00615902EDBE4D00F21004C6D761FF520C4F +:104E4E00929269D4FEC1DFF88EFD708EFCC1717A2C +:104E5E00FA8FE4FB5C03D1DD114004F903DD06405B +:104E6E0004F904DF053077386194C09EFC609EFD26 +:104E7E0034D4FE5206C0B9A5A592DFF961FC61FCDF +:044E8E0061FC61FC66 +:0A4E920000060C12181E242A303608 +:104E9C00ACFB0000000064FE00000000CC39FE35C5 +:104EAC008C224746102ECF2E8345083BCA08C93C9E +:104EBC0028FC36FE20FE02F903F929FC30FE2AFC00 +:104ECC002BFC08F926FC6CFF1AFF6EFF6AFF64FFCF +:0A4EDC0027FC66FF2CFC55555555C8 +:104EE600FF0000000000983AF82AFF000000470083 +:104EF600317503F7332312D714AEF8C716AC061272 +:104F0600C5AC0416F643DD078B99A7A5B3EFF5C22A +:024F1600C6D7FC +:024FF400325534 +:0A4FF60030383A35353A3230000009 :00000001FF  \ No newline at end of file diff --git a/flower_toriaezu2/bsr.lmf b/flower_toriaezu2/bsr.lmf index d9498ce..e56271e 100644 Binary files a/flower_toriaezu2/bsr.lmf and b/flower_toriaezu2/bsr.lmf differ diff --git a/flower_toriaezu2/bsr_k0r.map b/flower_toriaezu2/bsr_k0r.map index 24c107c..445ebdc 100644 --- a/flower_toriaezu2/bsr_k0r.map +++ b/flower_toriaezu2/bsr_k0r.map @@ -1,22 +1,22 @@ -78K0R Linker W1.33 Date:29 Mar 2013 Page: 1 +78K0R Linker W1.33 Date:24 May 2013 Page: 1 Command: -yC:\Program Files (x86)\NEC Electronics Tools\DEV -_msgoff - - obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C - C78K0R\W2.13\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -pbsr - _k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Electro - nics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0r - m.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronics T - ools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w2 loader.rel pm - .rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_t - wl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel reng - e.rel accero.rel self_flash.rel sw.rel task_debug.rel task_mi - sc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_ - status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel vo - ltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_e - i.rel util_funcs.rel i2c_mcu-sub.rel + obsr.lmf ..\..\..\..\Program Files (x86)\NEC Electronics Tool + 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 -w2 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 hal. + rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.r + el kanaria_c.rel get_ei.rel util_funcs.rel i2c_mcu-sub.rel Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map @@ -25,9 +25,9 @@ Direc-file:bsr_mcu.dr *** Link information *** - 73 output segment(s) - 3E74H byte(s) real data - 6515 symbol(s) defined + 75 output segment(s) + 3E68H byte(s) real data + 6448 symbol(s) defined *** Memory map *** @@ -64,7 +64,8 @@ Direc-file:bsr_mcu.dr LDR_CNSL 00002H 00000H CSEG PAGE64KP LDR_CNSL util_funcs 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 @@ -155,56 +156,57 @@ Direc-file:bsr_mcu.dr LDR_CODL util_funcs 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - LDR_CODE 000CEH 00967H CSEG - LDR_CODE loader 000CEH 0018CH - LDR_CODE WDT 0025AH 00000H - LDR_CODE i2c_mcu 0025AH 0029BH - LDR_CODE i2c_twl 004F5H 0005BH + ?OCDSTAD 000CEH 0000AH CSEG + LDR_CODE 000D8H 00967H CSEG + LDR_CODE loader 000D8H 0018CH + LDR_CODE WDT 00264H 00000H + LDR_CODE i2c_mcu 00264H 0029BH + LDR_CODE i2c_twl 004FFH 0005BH LDR_CODE self_flash - 00550H 00370H + 0055AH 00370H LDR_CODE task_debug - 008C0H 00000H + 008CAH 00000H LDR_CODE task_status - 008C0H 00075H - LDR_CODE hal 00935H 000DCH + 008CAH 00075H + LDR_CODE hal 0093FH 000DCH LDR_CODE util_funcs - 00A11H 00024H - FSL_CODE 00A35H 00322H CSEG + 00A1BH 00024H + FSL_CODE 00A3FH 00322H CSEG FSL_CODE fsl_block_cmd - 00A35H 0002BH + 00A3FH 0002BH FSL_CODE fsl_block_check - 00A60H 00013H + 00A6AH 00013H FSL_CODE fsl_common - 00A73H 0014FH + 00A7DH 0014FH FSL_CODE fsl_reset - 00BC2H 00001H + 00BCCH 00001H FSL_CODE fsl_si_ibf - 00BC3H 00064H + 00BCDH 00064H FSL_CODE fsl_phySwap - 00C27H 0004DH + 00C31H 0004DH FSL_CODE fsl_si_common - 00C74H 00061H - FSL_CODE fsl_swap 00CD5H 00030H + 00C7EH 00061H + FSL_CODE fsl_swap 00CDFH 00030H FSL_CODE fsl_write - 00D05H 00052H - @@LCODE 00D57H 00277H CSEG - @@LCODE @cstart 00D57H 0006DH - @@LCODE @imul 00DC4H 00011H - @@LCODE @lumul 00DD5H 0002BH - @@LCODE @isdiv 00E00H 00022H - @@LCODE @iudiv 00E22H 0002DH - @@LCODE @isrem 00E4FH 00021H - @@LCODE @iurem 00E70H 0002FH - @@LCODE @lsdiv 00E9FH 00039H - @@LCODE @ludiv 00ED8H 0003FH - @@LCODE @divuw 00F17H 00034H - @@LCODE @ladd 00F4BH 0000FH - @@LCODE @llsh 00F5AH 0001BH - @@LCODE @lursh 00F75H 0001FH - @@LCODE @iscmp 00F94H 0000CH - @@LCODE @lband 00FA0H 00014H - @@LCODE @bcdtob 00FB4H 0001AH -* gap * 00FCEH 00028H + 00D0FH 00052H + @@LCODE 00D61H 00277H CSEG + @@LCODE @cstart 00D61H 0006DH + @@LCODE @imul 00DCEH 00011H + @@LCODE @lumul 00DDFH 0002BH + @@LCODE @isdiv 00E0AH 00022H + @@LCODE @iudiv 00E2CH 0002DH + @@LCODE @isrem 00E59H 00021H + @@LCODE @iurem 00E7AH 0002FH + @@LCODE @lsdiv 00EA9H 00039H + @@LCODE @ludiv 00EE2H 0003FH + @@LCODE @divuw 00F21H 00034H + @@LCODE @ladd 00F55H 0000FH + @@LCODE @llsh 00F64H 0001BH + @@LCODE @lursh 00F7FH 0001FH + @@LCODE @iscmp 00F9EH 0000CH + @@LCODE @lband 00FAAH 00014H + @@LCODE @bcdtob 00FBEH 0001AH +* gap * 00FD8H 0001EH MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -258,298 +260,298 @@ Direc-file:bsr_mcu.dr 0228CH 00000H @@CNST i2c_mcu-sub 0228CH 00000H - ROM_CODE 0228CH 0260AH CSEG - ROM_CODE pm 0228CH 009F4H - ROM_CODE i2c_ctr 02C80H 0005CH - ROM_CODE main 02CDCH 00055H - ROM_CODE led 02D31H 00274H - ROM_CODE rtc 02FA5H 000E0H - ROM_CODE vreg_ctr 03085H 00493H - ROM_CODE vreg_twl 03518H 000F9H - ROM_CODE adc 03611H 00261H - ROM_CODE renge 03872H 00018H - ROM_CODE accero 0388AH 00155H - ROM_CODE sw 039DFH 0013CH + ROM_CODE 0228CH 025F2H CSEG + ROM_CODE pm 0228CH 009D1H + ROM_CODE i2c_ctr 02C5DH 0005CH + ROM_CODE main 02CB9H 00055H + ROM_CODE led 02D0EH 00284H + ROM_CODE rtc 02F92H 000E0H + ROM_CODE vreg_ctr 03072H 00493H + ROM_CODE vreg_twl 03505H 000F9H + ROM_CODE adc 035FEH 00261H + ROM_CODE renge 0385FH 00018H + ROM_CODE accero 03877H 00155H + ROM_CODE sw 039CCH 0013CH ROM_CODE task_misc - 03B1BH 001C1H - ROM_CODE task_sys 03CDCH 003EBH + 03B08H 001C1H + ROM_CODE task_sys 03CC9H 003E6H ROM_CODE pedo_alg_thre_det2 - 040C7H 004D4H - ROM_CODE led_cam 0459BH 000C4H - ROM_CODE led_pow 0465FH 0016FH - ROM_CODE voltable 047CEH 00000H + 040AFH 004D4H + ROM_CODE led_cam 04583H 000C4H + ROM_CODE led_pow 04647H 0016FH + ROM_CODE voltable 047B6H 00000H ROM_CODE pedo_lpf_coeff - 047CEH 00000H + 047B6H 00000H ROM_CODE kanaria_c - 047CEH 00006H - ROM_CODE get_ei 047D4H 0000DH + 047B6H 00006H + ROM_CODE get_ei 047BCH 0000DH ROM_CODE i2c_mcu-sub - 047E1H 000B5H - @@BASE 04896H 00614H CSEG BASE - @@BASE loader 04896H 00000H - @@BASE pm 04896H 0003EH - @@BASE i2c_ctr 048D4H 00170H - @@BASE main 04A44H 00000H - @@BASE magic 04A44H 00000H - @@BASE WDT 04A44H 00000H - @@BASE i2c_mcu 04A44H 000F2H - @@BASE i2c_twl 04B36H 000D0H - @@BASE led 04C06H 00000H - @@BASE rtc 04C06H 0005DH - @@BASE vreg_ctr 04C63H 00000H - @@BASE vreg_twl 04C63H 00000H - @@BASE adc 04C63H 00094H - @@BASE renge 04CF7H 0016BH - @@BASE accero 04E62H 00042H + 047C9H 000B5H + @@BASE 0487EH 00614H CSEG BASE + @@BASE loader 0487EH 00000H + @@BASE pm 0487EH 0003EH + @@BASE i2c_ctr 048BCH 00170H + @@BASE main 04A2CH 00000H + @@BASE magic 04A2CH 00000H + @@BASE WDT 04A2CH 00000H + @@BASE i2c_mcu 04A2CH 000F2H + @@BASE i2c_twl 04B1EH 000D0H + @@BASE led 04BEEH 00000H + @@BASE rtc 04BEEH 0005DH + @@BASE vreg_ctr 04C4BH 00000H + @@BASE vreg_twl 04C4BH 00000H + @@BASE adc 04C4BH 00094H + @@BASE renge 04CDFH 0016BH + @@BASE accero 04E4AH 00042H @@BASE self_flash - 04EA4H 00000H - @@BASE sw 04EA4H 00000H + 04E8CH 00000H + @@BASE sw 04E8CH 00000H @@BASE task_debug - 04EA4H 00000H + 04E8CH 00000H @@BASE task_misc - 04EA4H 00000H - @@BASE task_sys 04EA4H 00000H + 04E8CH 00000H + @@BASE task_sys 04E8CH 00000H @@BASE pedo_alg_thre_det2 - 04EA4H 00000H - @@BASE ini_VECT 04EA4H 00006H + 04E8CH 00000H + @@BASE ini_VECT 04E8CH 00006H @@BASE task_status - 04EAAH 00000H - @@BASE led_cam 04EAAH 00000H - @@BASE led_pow 04EAAH 00000H - @@BASE hal 04EAAH 00000H + 04E92H 00000H + @@BASE led_cam 04E92H 00000H + @@BASE led_pow 04E92H 00000H + @@BASE hal 04E92H 00000H @@BASE batt_params - 04EAAH 00000H - @@BASE voltable 04EAAH 00000H + 04E92H 00000H + @@BASE voltable 04E92H 00000H @@BASE pedo_lpf_coeff - 04EAAH 00000H + 04E92H 00000H @@BASE kanaria_c - 04EAAH 00000H + 04E92H 00000H @@BASE util_funcs - 04EAAH 00000H + 04E92H 00000H @@BASE i2c_mcu-sub - 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL @cstart 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL pm 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL main 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL led 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL rtc 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL adc 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL renge 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL accero 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL sw 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP + 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL @cstart 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL pm 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL main 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL led 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL rtc 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL adc 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL renge 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL accero 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL sw 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP @@CNSTL task_misc - 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL task_sys 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP + 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL task_sys 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL led_cam 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL led_pow 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP + 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL led_cam 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL led_pow 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP @@CNSTL batt_params - 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP - @@CNSTL voltable 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP + 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP + @@CNSTL voltable 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP @@CNSTL pedo_lpf_coeff - 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP + 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP @@CNSTL kanaria_c - 04EAAH 00000H - @@CNSTL 04EAAH 00000H CSEG PAGE64KP + 04E92H 00000H + @@CNSTL 04E92H 00000H CSEG PAGE64KP @@CNSTL i2c_mcu-sub - 04EAAH 00000H - @@CNSTL 04EAAH 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04EAAH 0000AH - @@R_INIT 04EB4H 0004AH CSEG UNIT64KP - @@R_INIT @cstart 04EB4H 00000H - @@R_INIT loader 04EB4H 00000H - @@R_INIT pm 04EB4H 00000H - @@R_INIT i2c_ctr 04EB4H 00000H - @@R_INIT main 04EB4H 00000H - @@R_INIT magic 04EB4H 00000H - @@R_INIT WDT 04EB4H 00000H - @@R_INIT i2c_mcu 04EB4H 00000H - @@R_INIT i2c_twl 04EB4H 00000H - @@R_INIT led 04EB4H 00000H - @@R_INIT rtc 04EB4H 00000H - @@R_INIT vreg_ctr 04EB4H 00000H - @@R_INIT vreg_twl 04EB4H 00000H - @@R_INIT adc 04EB4H 0000CH - @@R_INIT renge 04EC0H 00014H - @@R_INIT accero 04ED4H 00000H + 04E92H 00000H + @@CNSTL 04E92H 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04E92H 0000AH + @@R_INIT 04E9CH 0004AH CSEG UNIT64KP + @@R_INIT @cstart 04E9CH 00000H + @@R_INIT loader 04E9CH 00000H + @@R_INIT pm 04E9CH 00000H + @@R_INIT i2c_ctr 04E9CH 00000H + @@R_INIT main 04E9CH 00000H + @@R_INIT magic 04E9CH 00000H + @@R_INIT WDT 04E9CH 00000H + @@R_INIT i2c_mcu 04E9CH 00000H + @@R_INIT i2c_twl 04E9CH 00000H + @@R_INIT led 04E9CH 00000H + @@R_INIT rtc 04E9CH 00000H + @@R_INIT vreg_ctr 04E9CH 00000H + @@R_INIT vreg_twl 04E9CH 00000H + @@R_INIT adc 04E9CH 0000CH + @@R_INIT renge 04EA8H 00014H + @@R_INIT accero 04EBCH 00000H @@R_INIT self_flash - 04ED4H 00000H - @@R_INIT sw 04ED4H 00000H + 04EBCH 00000H + @@R_INIT sw 04EBCH 00000H @@R_INIT task_debug - 04ED4H 00000H + 04EBCH 00000H @@R_INIT task_misc - 04ED4H 00026H - @@R_INIT task_sys 04EFAH 00000H + 04EBCH 00026H + @@R_INIT task_sys 04EE2H 00000H @@R_INIT pedo_alg_thre_det2 - 04EFAH 00000H - @@R_INIT ini_VECT 04EFAH 00000H + 04EE2H 00000H + @@R_INIT ini_VECT 04EE2H 00000H @@R_INIT task_status - 04EFAH 00000H - @@R_INIT led_cam 04EFAH 00000H - @@R_INIT led_pow 04EFAH 00004H - @@R_INIT hal 04EFEH 00000H + 04EE2H 00000H + @@R_INIT led_cam 04EE2H 00000H + @@R_INIT led_pow 04EE2H 00004H + @@R_INIT hal 04EE6H 00000H @@R_INIT batt_params - 04EFEH 00000H - @@R_INIT voltable 04EFEH 00000H + 04EE6H 00000H + @@R_INIT voltable 04EE6H 00000H @@R_INIT pedo_lpf_coeff - 04EFEH 00000H + 04EE6H 00000H @@R_INIT kanaria_c - 04EFEH 00000H + 04EE6H 00000H @@R_INIT util_funcs - 04EFEH 00000H + 04EE6H 00000H @@R_INIT i2c_mcu-sub - 04EFEH 00000H - @@R_INIT @rom 04EFEH 00000H - @@R_INIS 04EFEH 00010H CSEG UNIT64KP - @@R_INIS @cstart 04EFEH 00000H - @@R_INIS loader 04EFEH 00000H - @@R_INIS pm 04EFEH 00002H - @@R_INIS i2c_ctr 04F00H 00002H - @@R_INIS main 04F02H 00000H - @@R_INIS magic 04F02H 00000H - @@R_INIS WDT 04F02H 00000H - @@R_INIS i2c_mcu 04F02H 00000H - @@R_INIS i2c_twl 04F02H 00000H - @@R_INIS led 04F02H 00000H - @@R_INIS rtc 04F02H 00000H - @@R_INIS vreg_ctr 04F02H 00000H - @@R_INIS vreg_twl 04F02H 00000H - @@R_INIS adc 04F02H 00000H - @@R_INIS renge 04F02H 00000H - @@R_INIS accero 04F02H 00000H + 04EE6H 00000H + @@R_INIT @rom 04EE6H 00000H + @@R_INIS 04EE6H 00010H CSEG UNIT64KP + @@R_INIS @cstart 04EE6H 00000H + @@R_INIS loader 04EE6H 00000H + @@R_INIS pm 04EE6H 00002H + @@R_INIS i2c_ctr 04EE8H 00002H + @@R_INIS main 04EEAH 00000H + @@R_INIS magic 04EEAH 00000H + @@R_INIS WDT 04EEAH 00000H + @@R_INIS i2c_mcu 04EEAH 00000H + @@R_INIS i2c_twl 04EEAH 00000H + @@R_INIS led 04EEAH 00000H + @@R_INIS rtc 04EEAH 00000H + @@R_INIS vreg_ctr 04EEAH 00000H + @@R_INIS vreg_twl 04EEAH 00000H + @@R_INIS adc 04EEAH 00000H + @@R_INIS renge 04EEAH 00000H + @@R_INIS accero 04EEAH 00000H @@R_INIS self_flash - 04F02H 00000H - @@R_INIS sw 04F02H 00000H + 04EEAH 00000H + @@R_INIS sw 04EEAH 00000H @@R_INIS task_debug - 04F02H 00000H + 04EEAH 00000H @@R_INIS task_misc - 04F02H 00000H - @@R_INIS task_sys 04F02H 00002H + 04EEAH 00000H + @@R_INIS task_sys 04EEAH 00002H @@R_INIS pedo_alg_thre_det2 - 04F04H 00006H - @@R_INIS ini_VECT 04F0AH 00000H + 04EECH 00006H + @@R_INIS ini_VECT 04EF2H 00000H @@R_INIS task_status - 04F0AH 00000H - @@R_INIS led_cam 04F0AH 00002H - @@R_INIS led_pow 04F0CH 00002H - @@R_INIS hal 04F0EH 00000H + 04EF2H 00000H + @@R_INIS led_cam 04EF2H 00002H + @@R_INIS led_pow 04EF4H 00002H + @@R_INIS hal 04EF6H 00000H @@R_INIS batt_params - 04F0EH 00000H - @@R_INIS voltable 04F0EH 00000H + 04EF6H 00000H + @@R_INIS voltable 04EF6H 00000H @@R_INIS pedo_lpf_coeff - 04F0EH 00000H + 04EF6H 00000H @@R_INIS kanaria_c - 04F0EH 00000H + 04EF6H 00000H @@R_INIS util_funcs - 04F0EH 00000H + 04EF6H 00000H @@R_INIS i2c_mcu-sub - 04F0EH 00000H - @@R_INIS @rom 04F0EH 00000H - @@RLINIT 04F0EH 00000H CSEG UNIT64KP - @@RLINIT loader 04F0EH 00000H - @@RLINIT pm 04F0EH 00000H - @@RLINIT i2c_ctr 04F0EH 00000H - @@RLINIT main 04F0EH 00000H - @@RLINIT magic 04F0EH 00000H - @@RLINIT WDT 04F0EH 00000H - @@RLINIT i2c_mcu 04F0EH 00000H - @@RLINIT i2c_twl 04F0EH 00000H - @@RLINIT led 04F0EH 00000H - @@RLINIT rtc 04F0EH 00000H - @@RLINIT vreg_ctr 04F0EH 00000H - @@RLINIT vreg_twl 04F0EH 00000H - @@RLINIT adc 04F0EH 00000H - @@RLINIT renge 04F0EH 00000H - @@RLINIT accero 04F0EH 00000H + 04EF6H 00000H + @@R_INIS @rom 04EF6H 00000H + @@RLINIT 04EF6H 00000H CSEG UNIT64KP + @@RLINIT loader 04EF6H 00000H + @@RLINIT pm 04EF6H 00000H + @@RLINIT i2c_ctr 04EF6H 00000H + @@RLINIT main 04EF6H 00000H + @@RLINIT magic 04EF6H 00000H + @@RLINIT WDT 04EF6H 00000H + @@RLINIT i2c_mcu 04EF6H 00000H + @@RLINIT i2c_twl 04EF6H 00000H + @@RLINIT led 04EF6H 00000H + @@RLINIT rtc 04EF6H 00000H + @@RLINIT vreg_ctr 04EF6H 00000H + @@RLINIT vreg_twl 04EF6H 00000H + @@RLINIT adc 04EF6H 00000H + @@RLINIT renge 04EF6H 00000H + @@RLINIT accero 04EF6H 00000H @@RLINIT self_flash - 04F0EH 00000H - @@RLINIT sw 04F0EH 00000H + 04EF6H 00000H + @@RLINIT sw 04EF6H 00000H @@RLINIT task_debug - 04F0EH 00000H + 04EF6H 00000H @@RLINIT task_misc - 04F0EH 00000H - @@RLINIT task_sys 04F0EH 00000H + 04EF6H 00000H + @@RLINIT task_sys 04EF6H 00000H @@RLINIT pedo_alg_thre_det2 - 04F0EH 00000H - @@RLINIT ini_VECT 04F0EH 00000H + 04EF6H 00000H + @@RLINIT ini_VECT 04EF6H 00000H @@RLINIT task_status - 04F0EH 00000H - @@RLINIT led_cam 04F0EH 00000H - @@RLINIT led_pow 04F0EH 00000H - @@RLINIT hal 04F0EH 00000H + 04EF6H 00000H + @@RLINIT led_cam 04EF6H 00000H + @@RLINIT led_pow 04EF6H 00000H + @@RLINIT hal 04EF6H 00000H @@RLINIT batt_params - 04F0EH 00000H - @@RLINIT voltable 04F0EH 00000H + 04EF6H 00000H + @@RLINIT voltable 04EF6H 00000H @@RLINIT pedo_lpf_coeff - 04F0EH 00000H + 04EF6H 00000H @@RLINIT kanaria_c - 04F0EH 00000H + 04EF6H 00000H @@RLINIT util_funcs - 04F0EH 00000H + 04EF6H 00000H @@RLINIT i2c_mcu-sub - 04F0EH 00000H - @@RLINIT @rom 04F0EH 00000H - @@CODEL 04F0EH 00000H CSEG - @@CODEL pm 04F0EH 00000H - @@CODEL i2c_ctr 04F0EH 00000H - @@CODEL main 04F0EH 00000H - @@CODEL magic 04F0EH 00000H - @@CODEL led 04F0EH 00000H - @@CODEL rtc 04F0EH 00000H - @@CODEL vreg_ctr 04F0EH 00000H - @@CODEL vreg_twl 04F0EH 00000H - @@CODEL adc 04F0EH 00000H - @@CODEL renge 04F0EH 00000H - @@CODEL accero 04F0EH 00000H - @@CODEL sw 04F0EH 00000H + 04EF6H 00000H + @@RLINIT @rom 04EF6H 00000H + @@CODEL 04EF6H 00000H CSEG + @@CODEL pm 04EF6H 00000H + @@CODEL i2c_ctr 04EF6H 00000H + @@CODEL main 04EF6H 00000H + @@CODEL magic 04EF6H 00000H + @@CODEL led 04EF6H 00000H + @@CODEL rtc 04EF6H 00000H + @@CODEL vreg_ctr 04EF6H 00000H + @@CODEL vreg_twl 04EF6H 00000H + @@CODEL adc 04EF6H 00000H + @@CODEL renge 04EF6H 00000H + @@CODEL accero 04EF6H 00000H + @@CODEL sw 04EF6H 00000H @@CODEL task_misc - 04F0EH 00000H - @@CODEL task_sys 04F0EH 00000H + 04EF6H 00000H + @@CODEL task_sys 04EF6H 00000H @@CODEL pedo_alg_thre_det2 - 04F0EH 00000H - @@CODEL ini_VECT 04F0EH 00000H - @@CODEL led_cam 04F0EH 00000H - @@CODEL led_pow 04F0EH 00000H + 04EF6H 00000H + @@CODEL ini_VECT 04EF6H 00000H + @@CODEL led_cam 04EF6H 00000H + @@CODEL led_pow 04EF6H 00000H @@CODEL batt_params - 04F0EH 00000H - @@CODEL voltable 04F0EH 00000H + 04EF6H 00000H + @@CODEL voltable 04EF6H 00000H @@CODEL pedo_lpf_coeff - 04F0EH 00000H + 04EF6H 00000H @@CODEL kanaria_c - 04F0EH 00000H + 04EF6H 00000H @@CODEL i2c_mcu-sub - 04F0EH 00000H - @@LCODEL 04F0EH 00022H CSEG - @@LCODEL abs 04F0EH 00008H - @@LCODEL memcpy_n 04F16H 0001AH -* gap * 04F30H 000C4H + 04EF6H 00000H + @@LCODEL 04EF6H 00022H CSEG + @@LCODEL abs 04EF6H 00008H + @@LCODEL memcpy_n 04EFEH 0001AH +* gap * 04F18H 000DCH MGC_VER 04FF4H 00002H CSEG AT MGC_VER magic 04FF4H 00002H MGC_TAIL 04FF6H 0000AH CSEG AT @@ -795,96 +797,96 @@ Direc-file:bsr_mcu.dr @@INIS i2c_mcu-sub FFE30H 00000H @@INIS @rom FFE30H 00000H - @@DATS FFE30H 0006AH DSEG SADDRP + @@DATS FFE30H 00066H DSEG SADDRP @@DATS @cstart FFE30H 00000H @@DATS loader FFE30H 00000H - @@DATS pm FFE30H 0001AH - @@DATS i2c_ctr FFE4AH 00004H - @@DATS main FFE4EH 00000H - @@DATS magic FFE4EH 00000H - @@DATS WDT FFE4EH 00000H - @@DATS i2c_mcu FFE4EH 00008H - @@DATS i2c_twl FFE56H 00000H - @@DATS led FFE56H 00006H - @@DATS rtc FFE5CH 00000H - @@DATS vreg_ctr FFE5CH 00004H - @@DATS vreg_twl FFE60H 00000H - @@DATS adc FFE60H 0000AH - @@DATS renge FFE6AH 00002H - @@DATS accero FFE6CH 00002H + @@DATS pm FFE30H 00018H + @@DATS i2c_ctr FFE48H 00004H + @@DATS main FFE4CH 00000H + @@DATS magic FFE4CH 00000H + @@DATS WDT FFE4CH 00000H + @@DATS i2c_mcu FFE4CH 00008H + @@DATS i2c_twl FFE54H 00000H + @@DATS led FFE54H 00006H + @@DATS rtc FFE5AH 00000H + @@DATS vreg_ctr FFE5AH 00004H + @@DATS vreg_twl FFE5EH 00000H + @@DATS adc FFE5EH 0000AH + @@DATS renge FFE68H 00002H + @@DATS accero FFE6AH 00002H @@DATS self_flash - FFE6EH 00000H - @@DATS sw FFE6EH 0000CH + FFE6CH 00000H + @@DATS sw FFE6CH 0000CH @@DATS task_debug - FFE7AH 00000H + FFE78H 00000H @@DATS task_misc - FFE7AH 00004H - @@DATS task_sys FFE7EH 00006H + FFE78H 00004H + @@DATS task_sys FFE7CH 00004H @@DATS pedo_alg_thre_det2 - FFE84H 0000EH - @@DATS ini_VECT FFE92H 00000H + FFE80H 0000EH + @@DATS ini_VECT FFE8EH 00000H @@DATS task_status - FFE92H 00002H - @@DATS led_cam FFE94H 00002H - @@DATS led_pow FFE96H 00004H - @@DATS hal FFE9AH 00000H + FFE8EH 00002H + @@DATS led_cam FFE90H 00002H + @@DATS led_pow FFE92H 00004H + @@DATS hal FFE96H 00000H @@DATS batt_params - FFE9AH 00000H - @@DATS voltable FFE9AH 00000H + FFE96H 00000H + @@DATS voltable FFE96H 00000H @@DATS pedo_lpf_coeff - FFE9AH 00000H + FFE96H 00000H @@DATS kanaria_c - FFE9AH 00000H + FFE96H 00000H @@DATS util_funcs - FFE9AH 00000H + FFE96H 00000H @@DATS i2c_mcu-sub - FFE9AH 00000H - @@DATS @rom FFE9AH 00000H - @@BITS FFE9AH 00006H BSEG - @@BITS @cstart FFE9AH.0 00000H.0 - @@BITS loader FFE9AH.0 00000H.0 - @@BITS pm FFE9AH.0 00001H.1 - @@BITS i2c_ctr FFE9BH.1 00000H.0 - @@BITS main FFE9BH.1 00000H.1 - @@BITS magic FFE9BH.2 00000H.0 - @@BITS WDT FFE9BH.2 00000H.0 - @@BITS i2c_mcu FFE9BH.2 00000H.4 - @@BITS i2c_twl FFE9BH.6 00000H.0 - @@BITS led FFE9BH.6 00000H.4 - @@BITS rtc FFE9CH.2 00000H.3 - @@BITS vreg_ctr FFE9CH.5 00000H.1 - @@BITS vreg_twl FFE9CH.6 00000H.0 - @@BITS adc FFE9CH.6 00000H.4 - @@BITS renge FFE9DH.2 00000H.2 - @@BITS accero FFE9DH.4 00000H.0 + FFE96H 00000H + @@DATS @rom FFE96H 00000H + @@BITS FFE96H 00006H BSEG + @@BITS @cstart FFE96H.0 00000H.0 + @@BITS loader FFE96H.0 00000H.0 + @@BITS pm FFE96H.0 00001H.1 + @@BITS i2c_ctr FFE97H.1 00000H.0 + @@BITS main FFE97H.1 00000H.1 + @@BITS magic FFE97H.2 00000H.0 + @@BITS WDT FFE97H.2 00000H.0 + @@BITS i2c_mcu FFE97H.2 00000H.4 + @@BITS i2c_twl FFE97H.6 00000H.0 + @@BITS led FFE97H.6 00000H.4 + @@BITS rtc FFE98H.2 00000H.3 + @@BITS vreg_ctr FFE98H.5 00000H.1 + @@BITS vreg_twl FFE98H.6 00000H.0 + @@BITS adc FFE98H.6 00000H.4 + @@BITS renge FFE99H.2 00000H.2 + @@BITS accero FFE99H.4 00000H.0 @@BITS self_flash - FFE9DH.4 00000H.0 - @@BITS sw FFE9DH.4 00000H.1 + FFE99H.4 00000H.0 + @@BITS sw FFE99H.4 00000H.1 @@BITS task_debug - FFE9DH.5 00000H.0 + FFE99H.5 00000H.0 @@BITS task_misc - FFE9DH.5 00000H.3 - @@BITS task_sys FFE9EH.0 00000H.0 + FFE99H.5 00000H.3 + @@BITS task_sys FFE9AH.0 00000H.0 @@BITS pedo_alg_thre_det2 - FFE9EH.0 00000H.2 - @@BITS ini_VECT FFE9EH.2 00000H.0 + FFE9AH.0 00000H.2 + @@BITS ini_VECT FFE9AH.2 00000H.0 @@BITS task_status - FFE9EH.2 00000H.0 - @@BITS led_cam FFE9EH.2 00000H.1 - @@BITS led_pow FFE9EH.3 00000H.0 - @@BITS hal FFE9EH.3 00000H.6 + FFE9AH.2 00000H.0 + @@BITS led_cam FFE9AH.2 00000H.1 + @@BITS led_pow FFE9AH.3 00000H.0 + @@BITS hal FFE9AH.3 00000H.6 @@BITS batt_params - FFE9FH.1 00000H.0 - @@BITS voltable FFE9FH.1 00000H.0 + FFE9BH.1 00000H.0 + @@BITS voltable FFE9BH.1 00000H.0 @@BITS pedo_lpf_coeff - FFE9FH.1 00000H.0 + FFE9BH.1 00000H.0 @@BITS kanaria_c - FFE9FH.1 00000H.0 + FFE9BH.1 00000H.0 @@BITS util_funcs - FFE9FH.1 00000H.0 + FFE9BH.1 00000H.0 @@BITS i2c_mcu-sub - FFE9FH.1 00000H.0 -* gap * FFEA0H 00034H + FFE9BH.1 00000H.0 +* gap * FFE9CH 00038H @@SEGREG FFED4H 00004H DSEG AT @@SEGREG @SEGREG FFED4H 00004H @@RTARG0 FFED8H 00008H DSEG AT diff --git a/flower_toriaezu2/config.h b/flower_toriaezu2/config.h index 70ca1d4..d901fac 100644 --- a/flower_toriaezu2/config.h +++ b/flower_toriaezu2/config.h @@ -7,16 +7,15 @@ */ #define MCU_VER_MAJOR 0x02 -#define MCU_VER_MINOR 0x24 +#define MCU_VER_MINOR 0x25 /* -Ǘo[W 2.32 +Ǘo[W 2.33 */ // rhXCb` //#define _MCU_ARR // snake n - // fobOXCb` //#define _debug_led_ // LED print fobOƂ diff --git a/flower_toriaezu2/hoge.bin b/flower_toriaezu2/hoge.bin index 18f5edf..a252c7f 100644 Binary files a/flower_toriaezu2/hoge.bin and b/flower_toriaezu2/hoge.bin differ diff --git a/flower_toriaezu2/led.c b/flower_toriaezu2/led.c index 1bacaf3..bf62e07 100644 --- a/flower_toriaezu2/led.c +++ b/flower_toriaezu2/led.c @@ -93,6 +93,7 @@ u8 fade_to2( st_LED_dim_status* status ) } else { + // delta Ƃ to ̒lɂԂ‚Ă܂ status->now = status->to; } } @@ -292,6 +293,11 @@ static void calc_info_led_fade_out( st_LED_dim_status* tgt_led ) { tgt_led -> to = 0; tgt_led -> delta = ( 0 - tgt_led -> now ) / 64; + // tF[hAEg([ɌĂB̌z肵Ă܂B) + if(( tgt_led -> now != 0 ) && ( tgt_led -> delta == 0 )) + { + tgt_led -> delta = (sx16)-1; + } } diff --git a/flower_toriaezu2/pm.c b/flower_toriaezu2/pm.c index 5a92baa..27be4cf 100644 --- a/flower_toriaezu2/pm.c +++ b/flower_toriaezu2/pm.c @@ -196,6 +196,7 @@ static void update_chg_led() xtqXeVXL ***********************************************/ #define AVG_COUNT 40 + void bt_chk_temparature() { static u8 heikinka_h,heikinka_l; @@ -1103,6 +1104,8 @@ void reset_release() } + + /********************************************//** dOFFV[PX ***********************************************/ diff --git a/flower_toriaezu2/sw.c b/flower_toriaezu2/sw.c index 96683d0..ab9c5a8 100644 --- a/flower_toriaezu2/sw.c +++ b/flower_toriaezu2/sw.c @@ -144,6 +144,7 @@ void tsk_sw( ) // HOME sw // chk_clicked( SW_HOME_n, SW_home_count, REG_BIT_SW_HOME_CLICK ); chk_clicked( !SW_HOME_n, SW_home_count_rel, REG_BIT_SW_HOME_RELEASE ); + /* fall through */ case( OFF ): case( ON_CHECK ): @@ -166,62 +167,61 @@ void tsk_sw( ) ***********************************************/ static void chk_pow_sw() { - // @̏ꍇ - if( ! system_status.taikendai ) - { - if( SW_pow_count == ( TIME_PWSW_CLICK ) ) // NbNԂɓB + // @̏ꍇ + if( ! system_status.taikendai ) { - if( is_wifi_calib_resets_ast ) // wifi Lu[VȂASoCɒʒmoffɑJ - { - system_status.pwr_state = OFF_TRIG; - } - set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); - } - - else if( SW_pow_count == ( HOLD_THREASHOLD ) ) // ɓB - { - set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_HOLD ); - if( off_timeout_timer == 0 ) // dfJEg_EJnAxȂ悤ɁB + if( SW_pow_count == ( TIME_PWSW_CLICK ) ) // NbNԂɓB { - off_timeout_timer = vreg_ctr[ VREG_C_OFF_DELAY ] * 16; + if( is_wifi_calib_resets_ast ) // wifi Lu[VȂASoCɒʒmoffɑJ + { + system_status.pwr_state = OFF_TRIG; + } + set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); + } + else if( SW_pow_count == ( HOLD_THREASHOLD ) ) // ɓB + { + set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_HOLD ); + if( off_timeout_timer == 0 ) // dfJEg_EJnAxȂ悤ɁB + { + off_timeout_timer = vreg_ctr[ VREG_C_OFF_DELAY ] * 16; + } } - } - if( off_timeout_timer != 0 ) // 荞݌A^CAEgŋItB - { - off_timeout_timer --; - if( off_timeout_timer == 0 ) + if( off_timeout_timer != 0 ) // 荞݌A^CAEgŋItB + { + off_timeout_timer --; + if( off_timeout_timer == 0 ) + { + force_off = true; + } + } + + }else{ + // X^hAV + if( SW_pow_count == ( TIME_PWSW_CLICK ) ) + { + if( sw_pwsw_mukan_time == 0 ) + { + set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); + // ȃ^C~OPWSWHOMEj[ɓĂ܂̂邽߂̃}XN^C}[ + sw_pwsw_mukan_time = TIME_MUKAN_PWSW_RED_TRIAL; + } + } + else if( SW_pow_count == ( HOLD_THREASHOLD ) ) { force_off = true; } - } - - }else{ - // X^hAV - if( SW_pow_count == ( TIME_PWSW_CLICK ) ) - { - if( sw_pwsw_mukan_time == 0 ) + + if( sw_pwsw_mukan_time != 0 ) { - set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); - // ȃ^C~OPWSWHOMEj[ɓĂ܂̂邽߂̃}XN^C}[ - sw_pwsw_mukan_time = TIME_MUKAN_PWSW_RED_TRIAL; + sw_pwsw_mukan_time--; } } - else if( SW_pow_count == ( HOLD_THREASHOLD ) ) - { - force_off = true; - } - - if( sw_pwsw_mukan_time != 0 ) - { - sw_pwsw_mukan_time--; - } - } count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask ); // {^Ԃ̃JEg } - + /********************************************//** wifi XCb`̊Ď ňȎȂ̂͂킩Ă邪AsɏoĂ܂sǃXCb`~ @@ -229,17 +229,18 @@ static void chk_pow_sw() ***********************************************/ static void chk_wifi_sw() { - // wifi sw // - if( sw_wifi_mukan_time != 0 ) - { - sw_wifi_mukan_time--; - } - else - { - chk_clicked( SW_WIFI_n, SW_wifi_count, REG_BIT_SW_WIFI_CLICK ); - if( SW_wifi_count == CLICK_THRESHOLD +1 ) // 蔭I + // wifi sw // + if( sw_wifi_mukan_time != 0 ) { - sw_wifi_mukan_time = TIME_MUKAN; + sw_wifi_mukan_time--; + } + else + { + chk_clicked( SW_WIFI_n, SW_wifi_count, REG_BIT_SW_WIFI_CLICK ); + if( SW_wifi_count == CLICK_THRESHOLD +1 ) // 蔭I + { + sw_wifi_mukan_time = TIME_MUKAN; + } } - } } + diff --git a/flower_toriaezu2/task_misc.c b/flower_toriaezu2/task_misc.c index 1b5e925..b7de6da 100644 --- a/flower_toriaezu2/task_misc.c +++ b/flower_toriaezu2/task_misc.c @@ -343,7 +343,7 @@ static const u8 *infos_table[ KOUMOKU ] = { (u8*)&LED_duty_notify_blu, /* 15 */ &infos_bits[1], (u8*)&LED_duty_WiFi, - &infos_temp[4] /* 18 */ + &infos_temp[4] /* 18 */ /* ڑƂ KOUMOKU ɒ */ }; @@ -395,15 +395,6 @@ u8 extinfo_read(void) infos_bits[1] = (u8)LED_CAM; ret = *infos_table[iic_burst_state]; - -#if 0 -// debug // - /// VXeɋ@펯ʂʼnR‚ - if( iic_burst_state == 9 ) - { - ret = (u8)FAMILY_FLOWER; - } -#endif iic_burst_state ++; } diff --git a/flower_toriaezu2/task_sys.c b/flower_toriaezu2/task_sys.c index cecc817..ff54d88 100644 --- a/flower_toriaezu2/task_sys.c +++ b/flower_toriaezu2/task_sys.c @@ -35,6 +35,7 @@ //========================================================= extern void nop8(); + static void chk_emergencyExit(); static void force_off_check(); static void send_getup_to_soc(); @@ -43,19 +44,15 @@ static void chk_awake(); static err direct_boot_sleep_check(); static err chk_pwsw_timeout(); static void go_stop(); - static void ports_finalize(); static void irqs_finalize(); static void restore_status_regs(); static err leds_closed(); - #ifdef _DBG_CHK_OFF_LEAK_ static void leak_check(); #endif -#ifdef i2c_timeout_test -void i2c_timeout_test_init(); -#endif + //========================================================= extern bit info_led_off; @@ -71,7 +68,7 @@ extern bit i2c_mcu_time_out_error; //========================================================= -#define PWSW_POWON_TIME (u8)( 20 / SYS_INTERVAL_TICK ) // [ms] // INTERVAL_TSK_SW ŊȂBl珬̂ +#define PWSW_POWON_TIME (u8)( 20 / SYS_INTERVAL_TICK ) // [ms] // INTERVAL_TSK_SW ŊȂBl珬̂ #define PWSW_ON_CHECK_TIMEOUT 100 // K donׂ̈ɓdXCb`삳ꂽƂA̎Ԍo߂mcuȓd͂ɖ߂ #define SELSW_DIRECT_BOOT_DELAY (u16)( 1000 / SYS_INTERVAL_TICK ) @@ -96,27 +93,28 @@ void tsk_sys( ) // dXCb`HALT // if( system_status.poweron_reason == RSN_PWSW ) { - if( PM_EXTDC_n ) - { - // A_v^Ȃ + if( PM_EXTDC_n ) + { + // A_v^Ȃ if( chk_pwsw_timeout() == ERR_ERR ) - { + { // ^CAEgBX[vɓ - return; - } - } - else - { + return; + } + } + else + { BT_chk(); // obeOꂽ[d~Ȃǂ邽 - } + } - if( SW_pow_count < PWSW_POWON_TIME ) - { - // ԂZēdonɓBĂȂ - return; - } + + if( SW_pow_count < PWSW_POWON_TIME ) + { + // ԂZēdonɓBĂȂ + return; + } } - // else { if( system_status.poweron_reason == RSN_TRIALAc ) d } + // else { if( system_status.poweron_reason == RSN_TRIALAc ) d } SW_pow_mask = true; // pwswςȂœd/ JԂȂ悤 @@ -155,7 +153,7 @@ void tsk_sys( ) PM_WL_TX = 1; PM_SW_SEL_n = 1; PM_ACCEL_INT1 = 1; - PM_ACC_VALID = 1; + PM_ACC_VALID = 1; if( PM_sys_pow_on( ) != ERR_SUCCESS ) { // dNsƒG[ @@ -165,11 +163,10 @@ void tsk_sys( ) } // ܂ŗƁAdm // - // vAbvon // PU_BT_IN_CHG_n = 1; - PU7 = bits8(0,0,0,1, 1,1,0,1); // 4:SW_WIFI 3:SW_PWSW 2:PM_IRQ 0:PM_EXTDC_n - PU_SW_HOME_n_JIKKI = 1; // SW_HOME + PU7 = bits8(0,0,0,1, 1,1,0,1); // 4:SW_WIFI 3:SW_PWSW 2:PM_IRQ 0:PM_EXTDC_n + PU_SW_HOME_n_JIKKI = 1; // SW_HOME wait_ms( 50 ); // vAbvdƏオ̂܂hal_update() ȂƊ҂̂Ȃ /// 50ms ͎bl @@ -188,12 +185,15 @@ void tsk_sys( ) return; break; + default: + dbg_nop(); + /* fall through */ + case ERR_RET1: // 1b sel ȂĂ͂ȂȂBJEg̓r... return; break; case ERR_SUCCESS: // NB_CNgu[g͂B - default: system_status.pwr_state = ON_TRIG; break; } @@ -217,9 +217,6 @@ void tsk_sys( ) PM_LCD_vcom_set( ); // LCD̑ΌdlȂǏ -#ifdef i2c_timeout_test - i2c_timeout_test_init(); -#endif IIC_ctr_Init( ); IIC_twl_Init( ); @@ -264,7 +261,7 @@ void tsk_sys( ) case ON: //--------------------------------------------- chk_emergencyExit(); // PMICɂ鋭df`FbN - // fobKreset1AT[g邱ƂB̂Ƃ͑SZbg + // fobKreset1AT[g邱ƂB̂Ƃ͑SZbg chk_sleep(); // SLPĎBsystem_status.pwr_state ܂BsV @@ -279,11 +276,11 @@ void tsk_sys( ) } } #endif + break; case SLEEP: //------------------------------------------ chk_emergencyExit(); - chk_awake(); // X[v畜A force_off_check(); @@ -314,15 +311,15 @@ void tsk_sys( ) return; } - // dfJEg_E^C}NA - clear_pow_off_countdown(); + // dfJEg_E^C}NA + clear_pow_off_countdown(); - // xZT~ + // xZT~ vreg_ctr[ VREG_C_ACC_CONFIG ] = 0x00; tski_acc_setup(); - EI(); // DIԂłė̂ŁAI2C_mcu ̂ɕKv + EI(); // DIԂłė̂ŁAI2C_mcu ̂ɕKv - // ̑ytF~ + // ̑ytF~ LED_stop( ); IIC_ctr_Stop( ); IIC_twl_Stop( ); @@ -340,7 +337,7 @@ void tsk_sys( ) irqs_finalize(); IRQ0_disable; // SoC ̃s - PM_sys_pow_off( ); // dJbgIt + PM_sys_pow_off( ); // dJbgIt ports_finalize(); @@ -348,9 +345,9 @@ void tsk_sys( ) SW_pow_mask = true; SW_pow_count = 0; - // HALfobOZbg@YƓdonoȂȂ邱Ƃc - hal_reset(); - /* FALLTHROUGH */ + // HALfobOZbg@YƓdonoȂȂ邱Ƃc + hal_reset(); + /* FALLTHROUGH */ case OFF: // Fł͓d{^d͂܂B @@ -386,6 +383,7 @@ void tsk_sys( ) pm_chk_adapter(); PM_Chg_Stop(); + go_stop(); // 荞ݑ҂ stop [hցB hal_update(); @@ -504,31 +502,32 @@ static void chk_awake() ***********************************************/ static void go_stop() { - while( RWST ) - {;} + while( RWST ) + {;} - RTCIMK = 1; // systickpC^[o^C}[荞݃}XN + // 荞ݑ҂ŐQ // + RTCIMK = 1; // systickpC^[o^C}[荞݃}XN #ifdef _DBG_CHK_OFF_LEAK_ - leak_check(); + leak_check(); #endif - CKC = bits8(0,0,0,0, 1,0,0,1); // 4MHzɗƂ(bit0)STOPȂĂ͂ȂȂ - OSMC = bits8(0,0,0,0, 0,0,0,0); // 5MHzȉ[hցB + CKC = bits8(0,0,0,0, 1,0,0,1); // 4MHzɗƂ(bit0)STOPȂĂ͂ȂȂ + OSMC = bits8(0,0,0,0, 0,0,0,0); // 5MHzȉ[hցB - if( PM_EXTDC_n_RAW ) // ǂ^C~Oő}N邱ƂBHALʂȂׂioffłj - { - STOP(); - } + if( PM_EXTDC_n_RAW ) // ǂ^C~Oő}N邱ƂBHALʂȂׂioffłj + { + STOP(); + } - // N // - // N - // EKeyReturn荞݁id{^j - // ERTCA[iݕj + // N // + // N + // EKeyReturn荞݁id{^j + // ERTCA[iݕj - // NbNA - OSMC = bits8(0,0,0,0, 0,0,0,1); // 8MHz쏀 + // NbNA + OSMC = bits8(0,0,0,0, 0,0,0,1); // 8MHz쏀 nop8(); - CKC = bits8(0,0,0,0, 1,0,0,0); // OSMC.FSEL = 1 3clkȏJ + CKC = bits8(0,0,0,0, 1,0,0,0); // OSMC.FSEL = 1 3clkȏJ } /********************************************//** @@ -542,31 +541,38 @@ static err direct_boot_sleep_check() { static u16 sel_sw_count; - if( !SHELL_OPEN ) + // W󂫁H + if( SHELL_OPEN ) { - // X[vXCb`onB_CNgu[g`FbN -// if( SW_HOME_n ) - if( SW_SEL_n || SW_POW_n ) - { - sel_sw_count = 0; - return ERR_ERR; - } - else - { - sel_sw_count++; - if( sel_sw_count < SELSW_DIRECT_BOOT_DELAY ) - { - return ERR_RET1; // Ă邪܂Ȃ - } - } + // ʏN + sel_sw_count = 0; + return ERR_SUCCESS; + } + + // else W‚/X[vXCb`on + /// _CNgu[g`FbN + if( SW_SEL_n || SW_POW_n ) + { + // sel ĂȂ + sel_sw_count = 0; + return ERR_ERR; } - +/* + // else sel ĂBԑ肷B + sel_sw_count++; + if( sel_sw_count < SELSW_DIRECT_BOOT_DELAY ) + { + return ERR_RET1; // Ă邪܂Ȃ + } +*/ + // else _CNgu[g sel_sw_count = 0; - return ERR_SUCCESS; + return ERR_SUCCESS; } + /********************************************//** |[gނ~[hɁB HłALo͂ɂȂႾ߂ȁB @@ -595,8 +601,6 @@ static void ports_finalize() PU_SW_HOME_n_JIKKI = 0; // SW_HOME ~ } - - /********************************************//** MCU IRQ ̒~ ***********************************************/ @@ -618,6 +622,7 @@ static void irqs_finalize() IF1 = 0; IF2 = 0; } +} @@ -628,13 +633,17 @@ static err leds_closed() vreg_ctr[ VREG_C_LED_3D ] = LED_3D_ILM_OFF; info_led_off = true; - if( LED_duty_pow_blu != 0 ) + if( LED_duty_pow_blu != 0 || + LED_duty_WiFi != 0 || + LED_duty_3d != 0 || + LED_duty_notify_red != 0 || + LED_duty_notify_grn != 0 || + LED_duty_notify_blu != 0 ) { return ERR_ERR; } return ERR_SUCCESS; } - /********************************************//** PMICdُŎ~߂mF @@ -724,9 +733,6 @@ static void restore_status_regs() vreg_ctr[ VREG_C_STATUS ], REG_BIT_LCD_POW ); BT_chk(); } - - - /********************************************//** - d{^ - dr؂ @@ -815,20 +821,3 @@ static void leak_check() NOP(); // u[Nu } #endif _DBG_CHK_OFF_LEAK_ - - - -#ifdef i2c_timeout_test -// for debug -void i2c_timeout_test_init() -{ - LED_duty_pow_blu = 0; - LED_duty_3d = 0; - LED_duty_notify_red = 0; - LED_duty_notify_grn = 0; - LED_duty_notify_blu = 0; - LED_pow_red = 0; - LED_CAM = 0; - i2c_mcu_time_out_error = false; -} -#endif diff --git a/flower_toriaezu2/vreg_ctr.h b/flower_toriaezu2/vreg_ctr.h index b0629e2..00c2140 100644 --- a/flower_toriaezu2/vreg_ctr.h +++ b/flower_toriaezu2/vreg_ctr.h @@ -133,6 +133,11 @@ // VREG_C_LED_NOTIFY_FLAG #define REG_BIT_IN_LOOP ( 1 << 0 ) +// RBR control (0x57) +#define REG_BIT_FLIGHT ( 1 << 1 ) +#define REG_BIT_RESET_n ( 1 << 0 ) + + // HAL bitfields 0 #define REG_BIT_HAL0_PM_EXTDC_n ( 1 << 7 ) #define REG_BIT_HAL0_BT_IN_CHG_n ( 1 << 6 ) diff --git a/flower_toriaezu2/yav_mcu_bsr.plg b/flower_toriaezu2/yav_mcu_bsr.plg index f16c62a..3ef401a 100644 --- a/flower_toriaezu2/yav_mcu_bsr.plg +++ b/flower_toriaezu2/yav_mcu_bsr.plg @@ -6,16 +6,16 @@ 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 -pinter_asm -ks -kx 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 -rd2s2 -qvjl2w -sainter_asm -zpb -no pm.c -pm.c(545) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(856) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(860) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(888) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(902) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(988) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(997) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1068) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1217) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1219) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(546) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(857) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(861) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(889) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(903) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(989) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(998) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1069) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1220) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1222) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 10 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 -pinter_asm -ks -kx inter_asm\pm.asm Assembly complete, 0 error(s) and 0 warning(s) found. @@ -46,7 +46,7 @@ Compilation complete, 0 error(s) and 0 warning(s) found. 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 -rd2s2 -qvjl2w -sainter_asm -zpb -no led.c led.c(90) : CC78K0R warning W0745: Expected function prototype -led.c(375) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(381) : 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 -pinter_asm -ks -kx inter_asm\led.asm Assembly complete, 0 error(s) and 0 warning(s) found. @@ -120,10 +120,21 @@ 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 -pinter_asm -ks -kx 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 -rd2s2 -qvjl2w -sainter_asm -zpb -no task_sys.c -task_sys.c(492) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(704) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(722) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 3 warning(s) found. +task_sys.c(490) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(625) : CC78K0R error E0324: Too many }'s +task_sys.c(625) : CC78K0R error E0301: Syntax error +task_sys.c(625) : CC78K0R error E0701: External definition syntax +task_sys.c(625) : CC78K0R error E0701: External definition syntax +task_sys.c(646) : CC78K0R error E0324: Too many }'s +task_sys.c(713) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(720) : CC78K0R error E0324: Too many }'s +task_sys.c(731) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(735) : CC78K0R error E0324: Too many }'s +task_sys.c(750) : CC78K0R error E0324: Too many }'s +task_sys.c(768) : CC78K0R error E0324: Too many }'s +task_sys.c(781) : CC78K0R error E0324: Too many }'s +task_sys.c(824) : CC78K0R error E0202: Unexpected EOF +Compilation complete, 11 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 -pinter_asm -ks -kx 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 -rd2s2 -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c @@ -132,10 +143,6 @@ pedo_alg_thre_det2.c(120) : CC78K0R warning W0401: Conversion may lose significa 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 -pinter_asm -ks -kx 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 -rd2s2 -qvjl2w -sainter_asm -zpb -no ini_VECT.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 -pinter_asm -ks -kx inter_asm\ini_VECT.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 -rd2s2 -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 -pinter_asm -ks -kx inter_asm\task_status.asm @@ -177,31 +184,5 @@ Assembly complete, 0 error(s) and 0 warning(s) found. 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 -pinter_asm -ks -kx inter_asm\i2c_mcu-sub.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 -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel i2c_mcu-sub.rel -RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K' - Read Device File Directory : C:\PROGRAM FILES (X86)\NEC ELECTRONICS TOOLS\DEV\ -RA78K0R warning W3420: File 'pm.rel' already has had error(s)/warning(s) by 'CC78K' -RA78K0R warning W3420: File 'i2c_mcu.rel' already has had error(s)/warning(s) by 'CC78K' -RA78K0R warning W3420: File 'led.rel' already has had error(s)/warning(s) by 'CC78K' -RA78K0R warning W3420: File 'vreg_ctr.rel' already has had error(s)/warning(s) by 'CC78K' -RA78K0R warning W3420: File 'vreg_twl.rel' already has had error(s)/warning(s) by 'CC78K' -RA78K0R warning W3420: File 'adc.rel' already has had error(s)/warning(s) by 'CC78K' -RA78K0R warning W3420: File 'accero.rel' already has had error(s)/warning(s) by 'CC78K' -RA78K0R warning W3420: File 'self_flash.rel' already has had error(s)/warning(s) by 'CC78K' -RA78K0R warning W3420: File 'task_misc.rel' already has had error(s)/warning(s) by 'CC78K' -RA78K0R warning W3420: File 'task_sys.rel' already has had error(s)/warning(s) by 'CC78K' -RA78K0R warning W3420: File 'pedo_alg_thre_det2.rel' already has had error(s)/warning(s) by 'CC78K' -RA78K0R warning W3420: File 'led_pow.rel' already has had error(s)/warning(s) by 'CC78K' -RA78K0R warning W3420: File 'batt_params.rel' already has had error(s)/warning(s) by 'CC78K' - -Link complete, 0 error(s) and 14 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 -nec_s_2_bsrbin2.rb:2: warning: variable $KCODE is no longer effective; ignored -4 -intel-HEX to bsr bin converter - file converted! - -Build Total error(s) : 0 Total warning(s) : 68 +Build Total error(s) : 11 Total warning(s) : 54 diff --git a/flower_toriaezu2/yav_mcu_bsr.pri b/flower_toriaezu2/yav_mcu_bsr.pri index b018509..4179360 100644 --- a/flower_toriaezu2/yav_mcu_bsr.pri +++ b/flower_toriaezu2/yav_mcu_bsr.pri @@ -14,7 +14,7 @@ Low-voltage Flash Rewriting=On Fail Safe Break=0x2000 Port=1 NMI=OFF -TRESET=OFF +TRESET=ON IRESET=OFF WAIT=OFF SysClock=None @@ -22,7 +22,7 @@ SubClock=None [Mapping] Count=0 [Main] -Geometry=154, 154, 1188, 812 +Geometry=132, 132, 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\2.25_SDK5.2a\ 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\2.25_SDK5.2a\bsr.lmf LoadFilter1=5 Offset1=0 Object1=ON @@ -55,10 +55,10 @@ 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\2.25_SDK5.2a\ Filter=Source [Debugger Option] -Source Path="\\tsclient\C\78k_data\yav-mcu-basara\trunk\renge" +Source Path="" Symbol Size=Byte Symbol Format=Hex Register Name=Func @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=762, 184, 689, 822 +Geometry=0, 0, 644, 1061 Window=Normal -DispStart=82 -CaretPos=83,0 +DispStart=25 +CaretPos=96,0 Mode=Normal DispFile= Address1= @@ -140,17 +140,17 @@ SaveStart= SaveEnd= Accumulative=ON [Source1] -Geometry=100, 100, 689, 822 +Geometry=14, 5, 799, 1001 Window=Normal -DispStart=55 -CaretPos=1,0 +DispStart=290 +CaretPos=322,13 Mode=Normal -DispFile=\\tsclient\C\78k_data\yav-mcu-basara\trunk\hal.c +DispFile=\\tsclient\C\78k_data\yav-mcu-basara\branches\2.25_SDK5.2a\task_sys.c Accumulative=ON [Assemble] Geometry=0, 0, 0, 0 Window=Hide -DispStart=847627264 +DispStart=844143616 CaretPos=0,0 Address1= Address2= @@ -187,8 +187,8 @@ Data16= Case=ON Scan=OFF Direction=Down -FindStart= -FindEnd= +FindStart=0 +FindEnd=0 SaveRange=Screen SaveStart= SaveEnd= @@ -285,7 +285,7 @@ Address16= Boundary=0, 0 Mode=Hex Attribute=Show -Sort=Address +Sort=Unsort Pickup=OFF SelectSort=Address Last Name= @@ -877,22 +877,22 @@ SaveEnd= Geometry=0, 0, 0, 0 Window=Hide Mode=Hex -Boundary=0 +Boundary=62 Pickup=OFF Name=Functional Register Bank=0 -RP0=3 -RP1=3 -RP2=3 -RP3=3 -PC=3 -SP=3 -PSW=3 -ES=3 -CS=3 +RP0=1 +RP1=1 +RP2=1 +RP3=1 +PC=1 +SP=1 +PSW=1 +ES=1 +CS=1 [Event Manager] -Geometry=0, 0, 0, 0 -Window=Hide +Geometry=616, 1, 500, 200 +Window=Normal Sort by=Unsort Detail=OFF [Event Set] @@ -965,20 +965,25 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=1153, 8, 440, 300 +Geometry=1117, 3, 440, 300 Window=Normal Boundary=13762700 -0=.BT_IN_CHG_n,P,N,A,+,1 -Line=1 +0=.TDR01,P,S,A,+,1 +1=.TDR02,P,S,A,+,1 +2=.TDR03,P,S,A,+,1 +3=.TDR05,P,S,A,+,1 +4=.TDR06,P,S,A,+,1 +5=.TDR07,P,S,A,+,1 +Line=6 [Quick Watch] -0=BT_IN_CHG_n,P,A,1 -1= -2= -3= -4= -5= -6= -7= +0=LED_duty_pow_blu,P,A,1 +1=LED_duty_WiFi,P,A,1 +2=TDR02,P,A,1 +3=TDR01,P,A,1 +4=TDR06,P,A,1 +5=TDR05,P,A,1 +6=TDR03,P,A,1 +7=TDR07,P,A,1 8= 9= 10= @@ -988,18 +993,14 @@ Line=1 14= 15= [Software Break] -Geometry=0, 0, 0, 0 -Window=Hide +Geometry=839, 335, 500, 200 +Window=Normal Width=150 30 200 100 Name0=Swb00002 -Address0=pm.c#_tsk_batt+0x27 +Address0=task_sys.c#_leds_closed+0x2b Window0=ASM -Status0=ON -Name1=Swb00001 -Address1=pm.c#_tsk_batt+0x24 -Window1=ASM -Status1=ON -Count=2 +Status0=OFF +Count=1 [Reset] Debugger=ON Symbol=OFF @@ -1024,7 +1025,7 @@ Window=Hide [Data Flash Option] Data Flash Emulation=OFF [List] -Geometry=0, 0, 0, 0 +Geometry=0, 0, 450, 400 Window=Hide [Console] Geometry=0, 0, 0, 0 diff --git a/flower_toriaezu2/yav_mcu_bsr.prj b/flower_toriaezu2/yav_mcu_bsr.prj index 5886046..a1c6c77 100644 --- a/flower_toriaezu2/yav_mcu_bsr.prj +++ b/flower_toriaezu2/yav_mcu_bsr.prj @@ -1,6 +1,6 @@ [ProjectManager] Version=6.00 -Path=C:\78k_data\yav-mcu-basara\flower_toriaezu2\ +Path=C:\78k_data\yav-mcu-basara\branches\2.25_SDK5.2a\ Title=yav-mcu Series=78K0R.PM Device=uPD79F0104 @@ -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\2.25_SDK5.2a\yav_mcu_bsr.pri [BuildMode2] BuildModeName=K0R_dbg TargetFile=0 @@ -1091,28 +1091,28 @@ Include11=vreg_twl.h Include12=loader.h Include13=i2c_mcu.h Include14=WDT.h -Include15=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h -Include16=fsl_user.h -Include17=i2c_ctr.h -Include18=pm.h -Include19=rtc.h -Include20=reboot.h -Include21=magic.h -Include22=incs.h -Include23=i2c_twl.h -Include24=accero.h -Include25=pedometer.h -Include26=sw.h -Include27=adc.h -Include28=led.h -Include29=batt_params.h -Include30=pool.h -Include31=i2c_twl_defs.h -Include32=renge\renge_task_intval.h -Include33=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h -Include34=self_flash.h -Include35=util_funcs.h -Include36=i2c_mcu_sub.h +Include15=fsl_user.h +Include16=i2c_ctr.h +Include17=pm.h +Include18=rtc.h +Include19=reboot.h +Include20=magic.h +Include21=incs.h +Include22=i2c_twl.h +Include23=accero.h +Include24=pedometer.h +Include25=sw.h +Include26=adc.h +Include27=led.h +Include28=batt_params.h +Include29=pool.h +Include30=i2c_twl_defs.h +Include31=renge\renge_task_intval.h +Include32=self_flash.h +Include33=util_funcs.h +Include34=i2c_mcu_sub.h +Include35=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +Include36=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h [Options.LK78K0R 0] Version=100 O0=bsr_k0r.lmf @@ -1197,7 +1197,7 @@ G=1 E=0 E0=flash.elk E1=a.elk -GO=0 +GO=1 GOValue=85 GOStart=FC00 GOSizeValue=1024 @@ -1231,7 +1231,7 @@ ZB= Etcetera0= Etcetera1=boot.lmf CommandFile=0 -OFILE=C:\78k_data\yav-mcu-basara\flower_toriaezu2\bsr.lmf +OFILE=C:\78k_data\yav-mcu-basara\branches\2.25_SDK5.2a\bsr.lmf [Options.LK78K0R 3] Version=100 O0=bsr_bsr.lmf diff --git a/flower_toriaezu2/yav_mcu_bsr.prk b/flower_toriaezu2/yav_mcu_bsr.prk index 2f77b60..036e847 100644 --- a/flower_toriaezu2/yav_mcu_bsr.prk +++ b/flower_toriaezu2/yav_mcu_bsr.prk @@ -1,17 +1,18 @@ [ProjectManager] FrameMax=0 -FrameX=237 -FrameY=131 -FrameCX=1200 -FrameCY=959 +FrameX=464 +FrameY=31 +FrameCX=1391 +FrameCY=1046 OpenFile1=ProjectWindow PrjPos=0,0,706,0,291 -OpenFile2=loader.c,0,215,59,1446,717,65,88,65,0 -OpenFile3=config.h,0,323,22,1500,759,19,51,19,0 -OpenFile4=sw.c,0,50,50,980,615,0,146,0,0 -OpenFile5=task_sys.c,0,75,75,1005,640,23,187,0,0 -OpenFile6=OutputWindow -OutputPos=0,133,783,212,1168 +OpenFile2=config.h,0,323,22,1500,759,29,10,29,0 +OpenFile3=self_flash.c,0,75,75,1146,677,11,310,21,0 +OpenFile4=led.c,0,100,100,1171,702,60,295,59,0 +OpenFile5=task_sys.c,0,50,50,1121,787,39,228,39,0 +OpenFile6=loader.c,0,346,99,1577,757,35,214,35,0 +OpenFile7=OutputWindow +OutputPos=0,159,809,180,1136 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/flower_toriaezu2/yav_mcu_bsr.sdb b/flower_toriaezu2/yav_mcu_bsr.sdb index cc76ab8..bfdc199 100644 --- a/flower_toriaezu2/yav_mcu_bsr.sdb +++ b/flower_toriaezu2/yav_mcu_bsr.sdb @@ -1,9 +1,9 @@ [SdbInfo] Ver=5 [loader.c] -T=5126c7d7 +T=519c6425 1=incs_loader.h -2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\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 @@ -13,24 +13,24 @@ T=5126c7d7 9=WDT.h 10=magic.h [pm.c] -T=512d4c2d +T=519d744a 1=incs.h 2=adc.h 3=led.h 4=pm.h 5=renge\renge.h 6=batt_params.h -7=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +7=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 8=fsl_user.h 9=vreg_twl.h 10=i2c_mcu.h [i2c_ctr.c] -T=51256880 +T=519c6423 1=incs.h 2=rtc.h 3=pedometer.h [main.c] -T=5125687e +T=519c6425 1=incs.h 2=rtc.h 3=pm.h @@ -40,35 +40,35 @@ T=5125687e 7=i2c_mcu.h 8=pool.h [magic.c] -T=51306f0f +T=519da01b 1=magic.h 2=config.h [WDT.c] -T=5125687f +T=519c641f 1=incs_loader.h [i2c_mcu.c] -T=5125687e +T=519c641f 1=incs_loader.h 2=i2c_mcu.h 3=loader.h 4=util_funcs.h 5=i2c_mcu_sub.h [i2c_twl.c] -T=51256883 +T=519c6425 1=incs_loader.h 2=i2c_twl_defs.h 3=i2c_twl.h 4=vreg_twl.h 5=WDT.h [led.c] -T=51256882 +T=519d9ee6 1=incs.h 2=led.h [rtc.c] -T=51256880 +T=519c6423 1=incs.h [vreg_ctr.c] -T=5125687e +T=519c6425 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -79,17 +79,17 @@ T=5125687e 8=vreg_twl.h 9=sw.h 10=WDT.h -11=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +11=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 12=fsl_user.h [vreg_twl.c] -T=51256880 +T=519c6426 1=incs.h 2=jhl_defs.h 3=led.h 4=vreg_twl.h 5=adc.h [adc.c] -T=5125687f +T=519c641f 1=incs.h 2=adc.h 3=pm.h @@ -97,7 +97,7 @@ T=5125687f 5=vreg_twl.h 6=i2c_mcu.h [renge\renge.c] -T=5125687f +T=519c6420 1=renge\renge.h 2=renge\renge_task_intval.h 3=renge\renge_task_immediate.h @@ -107,15 +107,15 @@ T=5125687f 7=util_funcs.h 8=bsr_system.h [accero.c] -T=51256883 +T=519c641f 1=incs.h 2=accero.h 3=i2c_mcu.h -4=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h +4=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h [self_flash.c] -T=5125687f +T=519c6425 1=incs_loader.h -2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\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 @@ -125,7 +125,7 @@ T=5125687f 9=WDT.h 10=util_funcs.h [sw.c] -T=512aebdf +T=519d703f 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -134,13 +134,13 @@ T=512aebdf 6=rtc.h 7=sw.h [task_debug.c] -T=5125687e +T=519c6425 1=incs_loader.h 2=renge\renge.h 3=pm.h 4=accero.h [task_misc.c] -T=51256879 +T=519c6426 1=incs.h 2=renge\renge.h 3=pm.h @@ -150,7 +150,7 @@ T=51256879 7=led.h 8=vreg_twl.h [task_sys.c] -T=51306fc9 +T=519d9f98 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -164,17 +164,17 @@ T=51306fc9 11=i2c_mcu.h 12=vreg_twl.h [pedo_alg_thre_det2.c] -T=51256883 +T=519c6420 1=incs.h -2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h +2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h 3=accero.h 4=pedometer.h 5=pool.h [ini_VECT.c] -T=51256883 +T=519c641f 1=config.h [task_status.c] -T=51256882 +T=519c6425 1=incs_loader.h 2=renge\renge.h 3=pm.h @@ -183,41 +183,41 @@ T=51256882 6=i2c_mcu.h 7=led.h [led_cam.c] -T=51256883 +T=519c6425 1=incs.h 2=led.h 3=vreg_twl.h [led_pow.c] -T=51256880 +T=519c6423 1=incs.h 2=led.h 3=pm.h [hal.c] -T=51300d4b +T=519d720d 1=incs_loader.h [batt_params.c] -T=51257c79 +T=519d717b 1=jhl_defs.h 2=batt_params.h [voltable.c] -T=51256883 +T=519c641f 1=incs.h [pedo_lpf_coeff.c] -T=5125687e +T=519c6423 1=incs.h [kanaria.asm] -T=51256883 +T=519c6425 [kanaria_c.c] -T=5125687e +T=519c6426 1=incs.h [get_ei.asm] -T=5125687f +T=519c6425 [util_funcs.c] -T=51256883 +T=519c6426 1=incs_loader.h 2=WDT.h [i2c_mcu-sub.c] -T=5125687e +T=519c6426 1=incs.h 2=i2c_mcu.h 3=loader.h @@ -225,7 +225,7 @@ T=5125687e 5=i2c_mcu_sub.h 6=pm.h [incs_loader.h] -T=51256883 +T=519c6425 1=jhl_defs.h 2=config.h 3=user_define.h @@ -235,51 +235,49 @@ T=51256883 7=vreg_ctr.h 8=vreg_twl.h [config.h] -T=51306409 +T=519c6446 [jhl_defs.h] -T=51256880 +T=519c6426 [user_define.h] -T=51256883 +T=519c6425 [hal.h] -T=51256882 +T=519c6425 [bsr_system.h] -T=51306cd1 +T=519d9d77 [renge\renge.h] -T=5125687f +T=519c6420 1=renge\renge_defs.h 2=renge\renge_task_immediate.h [renge\renge_defs.h] -T=513063fd +T=519c6420 [renge\renge_task_immediate.h] -T=5125687f +T=519c6420 1=renge\renge_defs.h [vreg_ctr.h] -T=51306cc4 +T=519c6425 1=config.h [vreg_twl.h] -T=51256880 +T=519c6426 [loader.h] -T=5125687f +T=519c6426 [i2c_mcu.h] -T=5125687e +T=519c641f [WDT.h] -T=5125687f -[..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h] -T=49a3bd4e +T=519c641f [fsl_user.h] -T=51256883 +T=519c641f [i2c_ctr.h] -T=51256880 +T=519c6423 [pm.h] -T=512d6698 +T=519d9ec6 [rtc.h] -T=51256880 +T=519c6423 [reboot.h] -T=51256883 +T=519c641f [magic.h] -T=51256880 +T=519c6423 [incs.h] -T=5125687f +T=519c6425 1=jhl_defs.h 2=config.h 3=user_define.h @@ -289,37 +287,39 @@ T=5125687f 7=vreg_ctr.h 8=util_funcs.h [i2c_twl.h] -T=51256883 +T=519c6425 [accero.h] -T=51256883 +T=519c641f 1=jhl_defs.h 2=pedometer.h [pedometer.h] -T=5125687e +T=519c6426 [sw.h] -T=51256880 +T=519c6426 1=config.h [adc.h] -T=5125687f +T=519c641f 1=jhl_defs.h [led.h] -T=51256882 +T=519c6425 [batt_params.h] -T=51256882 +T=519c6425 1=jhl_defs.h [pool.h] -T=51256883 +T=519c641f 1=pedometer.h [i2c_twl_defs.h] -T=51256883 +T=519c6420 [renge\renge_task_intval.h] -T=5125687f +T=519c6420 1=renge\renge_defs.h -[..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h] -T=45f12258 [self_flash.h] -T=5125687f +T=519c6426 [util_funcs.h] -T=51256883 +T=519c641f [i2c_mcu_sub.h] -T=5125687e +T=519c6426 +[..\..\..\..\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