SW0107更新N档提示

This commit is contained in:
sunbeam 2025-01-10 09:37:51 +08:00
parent 95df761db7
commit 83ec78770a
7 changed files with 3172 additions and 3007 deletions

View File

@ -6,18 +6,16 @@ btnConnect={cls="button";text="连接";left=204;top=64;right=289;bottom=90;z=4};
btnFlash={cls="button";text="开始刷写";left=37;top=315;right=136;bottom=343;z=9};
btnFresh={cls="button";text="刷新";left=204;top=28;right=288;bottom=54;z=2};
btnOpen={cls="button";text="打开文件";left=37;top=282;right=136;bottom=310;z=8};
btnOpenFlashdrv={cls="button";text="打开FlashDriver";left=149;top=282;right=248;bottom=310;z=24};
btnOpenFlashdrv={cls="button";text="打开FlashDriver";left=149;top=282;right=248;bottom=310;z=22};
btnReadF186={cls="button";text="读取当前会话";left=37;top=349;right=136;bottom=377;z=13};
btnReadF198={cls="button";text="读取F198";left=37;top=415;right=136;bottom=443;z=19};
btnReadF199={cls="button";text="读取F199";left=149;top=415;right=248;bottom=443;z=20};
btnReadHw={cls="button";text="读取硬件版本号";left=149;top=381;right=248;bottom=409;z=12};
btnReadSw={cls="button";text="读取软件版本号";left=37;top=382;right=136;bottom=410;z=10};
btnTest={cls="button";text="停止";left=149;top=316;right=248;bottom=344;z=11};
cbbChannel={cls="combobox";left=58;top=64;right=191;bottom=90;edge=1;items={};mode="dropdown";z=3};
cbbDev={cls="combobox";left=58;top=27;right=191;bottom=53;edge=1;items={};mode="dropdown";z=1};
checkbox={cls="checkbox";text="CANFD设备";left=151;top=101;right=248;bottom=120;z=21};
checkbox={cls="checkbox";text="CANFD设备";left=151;top=101;right=248;bottom=120;checked=1;z=19};
edFile={cls="richedit";left=8;top=131;right=288;bottom=187;border=1;disabled=1;edge=1;multiline=1;wrap=1;z=14};
edFile2={cls="richedit";left=8;top=213;right=288;bottom=269;border=1;disabled=1;edge=1;multiline=1;wrap=1;z=22};
edFile2={cls="richedit";left=8;top=213;right=288;bottom=269;border=1;disabled=1;edge=1;multiline=1;wrap=1;z=20};
edit={cls="edit";left=294;top=19;right=596;bottom=401;autovscroll=false;edge=1;multiline=1;vscroll=1;z=5};
progress={cls="progress";left=296;top=436;right=596;bottom=464;edge=1;max=100;min=0;z=15};
static={cls="static";text="设备";left=1;top=28;right=61;bottom=52;align="center";center=1;transparent=1;z=6};
@ -25,7 +23,7 @@ static2={cls="static";text="通道";left=1;top=66;right=61;bottom=90;align="cent
static3={cls="static";text="刷写进度";left=296;top=409;right=349;bottom=429;transparent=1;z=16};
static4={cls="static";text="烧录APP";left=13;top=108;right=85;bottom=132;center=1;transparent=1;z=17};
static5={cls="static";text="V0.1_20220518";left=451;top=1;right=595;bottom=17;align="right";center=1;transparent=1;z=18};
static6={cls="static";text="FlashDriver";left=13;top=195;right=101;bottom=218;transparent=1;z=23}
static6={cls="static";text="FlashDriver";left=13;top=195;right=101;bottom=218;transparent=1;z=21}
)
/*}}*/
@ -222,13 +220,7 @@ mainForm.onClose = function(hwnd,message,wParam,lParam){
//console.pause()
}
mainForm.btnReadF198.oncommand = function(id,event){
DiagReadDID(0x1701);
}
mainForm.btnReadF199.oncommand = function(id,event){
DiagReadDID(0x1702);
}
mainForm.btnOpenFlashdrv.oncommand = function(id,event){
::PostThreadMessage(thrdId,104,0,0)//自定义消息-打开flashdriver

File diff suppressed because one or more lines are too long

View File

@ -1,19 +1,182 @@
QualityReport
2024年9月7日 11:40:57
2025年1月9日 16:24:20
------ Start build(ECU_APP, DefaultBuild) ------
------ Build ended(Error:0, Warning:0)(ECU_APP, DefaultBuild) ------
C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\Bin\ccrl.exe DataFlash\r_pfdl.c rscan_driver\RL78_RCAN.c rscan_driver\r_rl78_can_drv.c rscan_driver\r_rl78_can_irq.c r_systeminit.c r_main.c r_cg_wdt_user.c r_cg_wdt.c r_cg_timer_user.c r_cg_timer.c r_cg_port_user.c r_cg_port.c r_cg_cgc_user.c r_cg_cgc.c r_cg_adc_user.c r_cg_adc.c sys\VectorTable.c CanNw\CanNw.c CanNw\CanNwConfig.c diagnose\Dcm_App.c diagnose\Dcm_App_Cfg.c diagnose\Dcm_Cfg.c diagnose\Dcm_DID.c diagnose\Dcm_DID_Cfg.c diagnose\Dcm_Key.c diagnose\extern.c diagnose\CanIf\CanIf.c diagnose\CanIf\CanIf_Cfg.c diagnose\CanTp\CanTp_Cfg.c diagnose\CanTrcv\CanTrcv.c diagnose\CanTrcv\CanTrcv_Cfg.c diagnose\DTC\DCM_DTC.c diagnose\Dcm.c diagnose\CanTp\CanTp.c user\appTask.c user\can_user.c user\hwCtrl.c user\CRC.c -cpu=S3 -obj_path=DefaultBuild "-dev=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F10BGG.DVF" -g -g_line -I diagnose\DTC -I diagnose\CanTrcv -I sys -I . -I rscan_driver -I diagnose -I DataFlash -I CanNw -I diagnose\CanTp -I diagnose\CanIf -I user -D DEBUG1 -c -msg_lang=english
DataFlash\r_pfdl.c(107):W0520188:Enumerated type mixed with another type
DataFlash\r_pfdl.c(137):W0520188:Enumerated type mixed with another type
DataFlash\r_pfdl.c(162):W0520188:Enumerated type mixed with another type
DataFlash\r_pfdl.c(166):W0520940:Missing return statement at end of non-void function "WriteDataflash"
DataFlash\r_pfdl.c(248):W0520188:Enumerated type mixed with another type
DataFlash\r_pfdl.c(254):W0520188:Enumerated type mixed with another type
DataFlash\r_pfdl.c(262):W0520188:Enumerated type mixed with another type
DataFlash\r_pfdl.c(292):W0520513:A value of type "uint32_t __near" cannot be assigned to an entity of type "volatile uint8_t *"
rscan_driver\r_rl78_can_drv.c(846):W0523076:Function declarations should have prototype
r_cg_timer_user.c(142):W0520167:Argument of type "uint16_t __near *" is incompatible with parameter of type "unsigned int *__near"
diagnose\Dcm_App.c(296):W0520549:Variable "DcmResetDelay" is used before its value is set
diagnose\Dcm_App.c(320):W0520177:Variable "ResetDelayCnt" was declared but never referenced
diagnose\Dcm_App.c(470):W0520177:Variable "ResetDelayCnt" was declared but never referenced
diagnose\Dcm_App.c(899):W0520549:Variable "LeDcm_u_Result" is used before its value is set
diagnose\Dcm_App.c(966):W0520549:Variable "LeDcm_u_Result" is used before its value is set
diagnose\Dcm_App.c(917):W0520177:Variable "LaDcm_u_TempBuffer" was declared but never referenced
diagnose\Dcm_App.c(1281):W0520940:Missing return statement at end of non-void function "MngDcm_RoutineF001Start"
diagnose\Dcm_App.c(1285):W0520940:Missing return statement at end of non-void function "MngDcm_RoutineF001Stop"
diagnose\Dcm_App.c(1289):W0520940:Missing return statement at end of non-void function "MngDcm_RoutineF001Result"
diagnose\Dcm_App.c(1559):W0520177:Variable "temp" was declared but never referenced
diagnose\Dcm_App.c(1906):W0520549:Variable "LeDcm_u_FinallyResult" is used before its value is set
diagnose\Dcm_App.c(1840):W0520177:Variable "LeDcm_u_dataFomatldentifier" was declared but never referenced
diagnose\Dcm_App.c(1841):W0520177:Variable "LeDcm_u_addressAndLengthFomatldentifier" was declared but never referenced
diagnose\Dcm_App.c(1842):W0520177:Variable "LeDcm_w_Address" was declared but never referenced
diagnose\Dcm_App.c(1843):W0520177:Variable "LeDcm_w_DataLength" was declared but never referenced
diagnose\Dcm_App.c(1844):W0520177:Variable "LeDcm_u_SidIndex" was declared but never referenced
diagnose\Dcm_App.c(1845):W0520177:Variable "LeDcm_u_SecurityAccessCheckResult" was declared but never referenced
diagnose\Dcm_App.c(1846):W0520177:Variable "LaDcm_u_TempBuffer" was declared but never referenced
diagnose\Dcm_App.c(2010):W0520549:Variable "LeDcm_u_FinallyResult" is used before its value is set
diagnose\Dcm_App.c(1926):W0520177:Variable "LeDcm_w_SingleTransmitDataCount" was declared but never referenced
diagnose\Dcm_App.c(1927):W0520177:Variable "LeDcm_u_BlockSequenceCount" was declared but never referenced
diagnose\Dcm_App.c(1928):W0520177:Variable "LeDcm_u_BlockExpect" was declared but never referenced
diagnose\Dcm_App.c(1929):W0520177:Variable "LaDcm_u_TempBuffer" was declared but never referenced
diagnose\Dcm_App.c(60):W0520177:Variable "CeDcm_w_SecurityAccessFBLMask" was declared but never referenced
diagnose\Dcm_App.c(63):W0520177:Variable "SeDcm_w_DownLoadDataLength" was declared but never referenced
diagnose\Dcm_App.c(64):W0520177:Variable "SeDcm_w_TransmitDataCount" was declared but never referenced
diagnose\Dcm_App.c(65):W0520177:Variable "SeDcm_u_BlockSequenceCountSts" was declared but never referenced
diagnose\Dcm_App.c(66):W0520177:Variable "CaDcm_w_SingleAllowDateLength" was declared but never referenced
diagnose\Dcm_App.c(71):W0520177:Variable "SeDcm_u_RidF001Sts" was declared but never referenced
diagnose\Dcm_Cfg.c(83):W0520144:A value of type "uint8 (__far *)(void)" cannot be used to initialize an entity of type "SubDealfunc"
diagnose\Dcm_Cfg.c(84):W0520144:A value of type "uint8 (__far *)(void)" cannot be used to initialize an entity of type "SubDealfunc"
diagnose\Dcm_Cfg.c(87):W0520144:A value of type "uint8 (__far *)(void)" cannot be used to initialize an entity of type "SubDealfunc"
diagnose\Dcm_Cfg.c(1157):W0520940:Missing return statement at end of non-void function "MngDcm_ReadMemoryDataService"
diagnose\Dcm_Cfg.c(1179):W0520167:Argument of type "const TsDcm_h_WithParaSubCheckType __near *" is incompatible with parameter of type "const TsDcm_h_SubCheckType __far *__near"
diagnose\Dcm_Cfg.c(1199):W0520167:Argument of type "const TsDcm_h_WithParaSubCheckType __near *" is incompatible with parameter of type "const TsDcm_h_SubCheckType __far *__near"
diagnose\Dcm_Cfg.c(1240):W0520167:Argument of type "const TsDcm_h_WithParaSubCheckType __near *" is incompatible with parameter of type "const TsDcm_h_SubCheckType __far *__near"
diagnose\Dcm_Cfg.c(1259):W0520167:Argument of type "const TsDcm_h_WithParaSubCheckType __near *" is incompatible with parameter of type "const TsDcm_h_SubCheckType __far *__near"
diagnose\Dcm_Cfg.c(1294):W0520177:Variable "i" was declared but never referenced
diagnose\Dcm_Cfg.c(1304):W0520177:Variable "LeDcm_u_CollectDataPost" was declared but never referenced
diagnose\Dcm_Cfg.c(1597):W0520177:Variable "LeDcm_u_DLCheckResult" was declared but never referenced
diagnose\Dcm_Cfg.c(1603):W0520177:Variable "LeDcm_u_CollectDataPost" was declared but never referenced
diagnose\Dcm_Cfg.c(509):W0520177:Function "MngDcm_2AReadDidCheckDL" was declared but never referenced
diagnose\Dcm_Cfg.c(551):W0520177:Function "MngDcm_IoDidCheckDL" was declared but never referenced
diagnose\Dcm_Key.c(76):W0520177:Variable "key_test" was declared but never referenced
diagnose\Dcm_Key.c(108):W0520940:Missing return statement at end of non-void function "GENERIC_ALGORITHM"
diagnose\CanIf\CanIf.c(299):W0520550:Variable "temp" was set but never used
diagnose\CanIf\CanIf.c(389):W0520188:Enumerated type mixed with another type
diagnose\CanIf\CanIf.c(20):W0520550:Variable "TsCanIf_h_TxQueue" was set but never used
diagnose\CanIf\CanIf_Cfg.c(33):W0520009:Nested comment is not allowed
diagnose\CanIf\CanIf_Cfg.c(43):W0520009:Nested comment is not allowed
diagnose\DTC\DCM_DTC.c(111):W0520167:Argument of type "uint32 __near *" is incompatible with parameter of type "unsigned char *__near"
diagnose\DTC\DCM_DTC.c(175):W0520167:Argument of type "uint8 __near (*)[2]" is incompatible with parameter of type "unsigned char *__near"
diagnose\DTC\DCM_DTC.c(166):W0520177:Variable "DtcSnapshotRecord" was declared but never referenced
diagnose\DTC\DCM_DTC.c(780):W0520167:Argument of type "uint8 __near (*)[28]" is incompatible with parameter of type "unsigned char *__near"
diagnose\DTC\DCM_DTC.c(97):W0520177:Function "ChkDiagVolt" was declared but never referenced
diagnose\DTC\DCM_DTC.c(107):W0520177:Function "GetLastSnapshotRecordNum" was declared but never referenced
diagnose\Dcm.c(69):W0520550:Variable "LeDcm_u_FinallyResult" was set but never used
diagnose\CanTp\CanTp.c(192):W0520069:Integer conversion resulted in truncation
diagnose\CanTp\CanTp.c(786):W0520188:Enumerated type mixed with another type
user\appTask.c(144):W0520550:Variable "temp_N_state" was set but never used
user\appTask.c(146):W0520177:Variable "db_pos" was declared but never referenced
user\appTask.c(50):W0520177:Variable "err_counter" was declared but never referenced
C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\Bin\ccrl.exe cstart.asm stkinit.asm -cpu=S3 -obj_path=DefaultBuild "-dev=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F10BGG.DVF" -g -c -msg_lang=english
C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\Bin\rlink.exe -subcommand=DefaultBuild\ECU_APP.clnk
W0561017:The evaluation period of CC-RL V1 has expired. Please consider purchasing the product.
RAMDATA SECTION: 00000c05 Byte(s)
ROMDATA SECTION: 0000070b Byte(s)
PROGRAM SECTION: 000051e0 Byte(s)
W0561017:The evaluation period of CC-RL V1 has expired. Please consider purchasing the product.
W0561017:The evaluation period of CC-RL V1 has expired. Please consider purchasing the product.
Renesas Optimizing Linker Completed
------ Build ended(Error:0, Warning:75)(ECU_APP, DefaultBuild) ------
--- CommandFile 1 ---
DefaultBuild\ECU_APP.clnk :
-Input=DefaultBuild\cstart.obj
-Input=DefaultBuild\stkinit.obj
-Input=DefaultBuild\r_pfdl.obj
-Input=DefaultBuild\RL78_RCAN.obj
-Input=DefaultBuild\r_rl78_can_drv.obj
-Input=DefaultBuild\r_rl78_can_irq.obj
-Input=DefaultBuild\r_systeminit.obj
-Input=DefaultBuild\r_main.obj
-Input=DefaultBuild\r_cg_wdt_user.obj
-Input=DefaultBuild\r_cg_wdt.obj
-Input=DefaultBuild\r_cg_timer_user.obj
-Input=DefaultBuild\r_cg_timer.obj
-Input=DefaultBuild\r_cg_port_user.obj
-Input=DefaultBuild\r_cg_port.obj
-Input=DefaultBuild\r_cg_cgc_user.obj
-Input=DefaultBuild\r_cg_cgc.obj
-Input=DefaultBuild\r_cg_adc_user.obj
-Input=DefaultBuild\r_cg_adc.obj
-Input=DefaultBuild\VectorTable.obj
-Input=DefaultBuild\CanNw.obj
-Input=DefaultBuild\CanNwConfig.obj
-Input=DefaultBuild\Dcm_App.obj
-Input=DefaultBuild\Dcm_App_Cfg.obj
-Input=DefaultBuild\Dcm_Cfg.obj
-Input=DefaultBuild\Dcm_DID.obj
-Input=DefaultBuild\Dcm_DID_Cfg.obj
-Input=DefaultBuild\Dcm_Key.obj
-Input=DefaultBuild\extern.obj
-Input=DefaultBuild\CanIf.obj
-Input=DefaultBuild\CanIf_Cfg.obj
-Input=DefaultBuild\CanTp_Cfg.obj
-Input=DefaultBuild\CanTrcv.obj
-Input=DefaultBuild\CanTrcv_Cfg.obj
-Input=DefaultBuild\DCM_DTC.obj
-Input=DefaultBuild\Dcm.obj
-Input=DefaultBuild\CanTp.obj
-Input=DefaultBuild\appTask.obj
-Input=DefaultBuild\can_user.obj
-Input=DefaultBuild\hwCtrl.obj
-Input=DefaultBuild\CRC.obj
-LIBrary=DataFlash\pfdl.lib
-SECURITY_ID=00000000000000000000
-DEVICE=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F10BGG.DVF
-DEBug
-NOCOmpress
-NOOPtimize
-OUtput=DefaultBuild\ECU_APP.abs
-LIBrary=C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\lib\rl78em4s.lib
-LIBrary=C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\lib\malloc_n.lib
-LIBrary=C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\lib\rl78em4r.lib
-OCDBG=04
-USER_OPT_BYTE=E933E8
-LISt=DefaultBuild\ECU_APP.map
-SHow=Reference,Xreference,Total_size,STRUCT
-STARt=VectorRemapingAddr_n,.const,.text,.RLIB,.SLIB,PFDL_COD,.textf,.constf,.data,.sdata/0A000,DID_TBL_f/19C00,KAM_SEG_n/FE500,.dataR,.bss/FE510,.sdataR,.sbss/FFE20
-ROm=.data=.dataR
-ROm=.sdata=.sdataR
-Message
-Total_size
-NOLOgo
-end
-Input=DefaultBuild\ECU_APP.abs
-DEVICE=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F10BGG.DVF
-OUtput=OutPut\ECU_APP.mot
-FOrm=Stype
-REcord=S3
-BYte_count=10
-Message
-end
-Input=DefaultBuild\ECU_APP.abs
-DEVICE=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F10BGG.DVF
-OUtput=output\ECU_APP.S19= A000-19FFF
-FOrm=Stype
-REcord=S3
-SPace=FF
-BYte_count=10
-Message
-exit
--- SHA1 hash value of output files ---
F:\FCB_project\temp\HDG\zhenan\code\ECU_APP\DefaultBuild\ECU_APP.abs: f9ac150ffe14c97e574714c96f65ca8869a8cfa9
F:\FCB_project\temp\HDG\zhenan\code\ECU_APP\OutPut\ECU_APP.mot: eb41d7baa4a56541eb4732bbbc83016c46a4de2b
F:\FCB_project\temp\HDG\zhenan\code\ECU_APP\output\ECU_APP.S19: 07522ab8ce6ec256261d771c3bc960151ce3adc6
F:\work\LYFJDB\CODE\ECU_APP\DefaultBuild\ECU_APP.abs: c62ca9fa1b52fdc0f028b070164f134deb6dfdfb
F:\work\LYFJDB\CODE\ECU_APP\OutPut\ECU_APP.mot: 9de1aa05b20843a16aae52f496b198e9c8701b40
F:\work\LYFJDB\CODE\ECU_APP\output\ECU_APP.S19: ad46b2c503044b8597a9035726c6db6dbf6e1a2b
--- System Information ---
*OS Version
Microsoft Windows 10 专业版 (-, 10.0.19045, WOW64)
Microsoft Windows 10 IoT 企业版 LTSC (-, 10.0.19044, WOW64)
*Language
中文(中国)
*.NET Framework Version
@ -33,16 +196,16 @@ F:\FCB_project\temp\HDG\zhenan\code\ECU_APP\output\ECU_APP.S19: 07522ab8ce6ec256
*Product License
*Execution Place
E:\Program Files (x86)\renesas\CS+\CC
C:\Program Files (x86)\Renesas Electronics\CS+\CC
*Memory Usage
*Private Working Set
276 MB
252 MB
*Number of GDI Objects
2088
2147
*Number of USER Objects
945
1192
*Opened Files
2 editors, 2 files, 12 KB
6 editors, 6 files, 71 KB
--- Build Tool Plug-in Information ---
RH850 Build tool CC-RH Plug-in
@ -171,7 +334,7 @@ Device Information Common Interface
DeviceInformation.dll
--- Main Project Information ---
F:\FCB_project\temp\HDG\zhenan\code\ECU_APP\ECU_APP.mtpj
F:\work\LYFJDB\CODE\ECU_APP\ECU_APP.mtpj
Microcontroller Information
*R5F10BGG
*File Name: Version

View File

@ -8,7 +8,7 @@ __far const unsigned char HD_VERSION[]={
'H' , //AC_HD_VERSION_00
'W' , //AC_HD_VERSION_01
'0' , //AC_HD_VERSION_02
'3' , //AC_HD_VERSION_03
'1' , //AC_HD_VERSION_03
'0' , //AC_HD_VERSION_04
'0' , //AC_HD_VERSION_05
' ' , //AC_HD_VERSION_06
@ -31,7 +31,7 @@ __far const unsigned char SW_VERSION[]={
'1' , //AC_SW_VERSION_04
'.' , //AC_SW_VERSION_05
'0' , //AC_SW_VERSION_06
'1' , //AC_SW_VERSION_07
'7' , //AC_SW_VERSION_07
' ' , //AC_SW_VERSION_08
' ' , //AC_SW_VERSION_09
' ' , //AC_SW_VERSION_10

File diff suppressed because it is too large Load Diff

View File

@ -107,8 +107,8 @@ S3090000A5D4F84030888D
S3150000A5D8CBF820FEFC82AE003684E53006F1EF04A7
S3150000A5E8CC0000A747DFF93620FE3020FEEF04CC6A
S3150000A5F80000A747DFF94100327400EF08B311499C
S3150000A608A6F74810E5F643DFF44100320000EF08EC
S3150000A618B311491AF84820FEF643DFF4FC87AE006A
S3150000A608BAF74810E5F643DFF44100320000EF08D8
S3150000A618B311492EF84820FEF643DFF4FC87AE0056
S3150000A628F6EFFED730F401BF6AF032C4F0E1FCED74
S3150000A638AC00AFC4F0444107DD0544DF07DF2C4416
S3150000A648DF07DF1240CDF03EDF0C40CEF080DF069C
@ -116,9 +116,9 @@ S3150000A658FCFDBE00EF0F128FCBF0314A7034CCF000
S3150000A668F1FC00E000E5B1E5E5A9E5AFC4F0120CA0
S3150000A678FC448000DE0DE5A7E5E15FCDF09FB0E57F
S3150000A688E5A9E513448901DF12365BE531850C54EB
S3150000A6980832CCF0309CF0EC94F400D7D7D7345875
S3150000A6980832CCF0309CF0ECA7F400D7D7D7345862
S3150000A6A803A9085CEF08B9D700D761FCE592E5EC89
S30D0000A6B85FAF00D7EC22F700AA
S30D0000A6B85FAF00D7EC35F70097
S3150000A6C0C116F645DD094900009BA3A7B5EFF3C007
S3060000A6D0D7AC
S3150000A6D27100900016BF04088C019F0108E503086B
@ -246,9 +246,9 @@ S3150000AE6000CA0400CA0504CA0700FC26B100FC2972
S3150000AE70B100FC07B100FCA3B100FC2DB000F578D1
S3150000AE8000D7717BFAEFD1FE27004008E5A5DF1356
S3150000AE903406035208A95CFCB93400E5305107FCBE
S3150000AEA07DDD00FC70F300FCFFAE00FC05ED00EF5D
S3150000AEB0F6FC2FF100FCD8C000FC6AEB00FE230074
S3150000AEC0FCB8F400FC05B200FCC7B000712301FC1D
S3150000AEA07DDD00FC83F300FCFFAE00FC05ED00EF4A
S3150000AEB0F6FC42F100FCD8C000FC6AEB00FE230061
S3150000AEC0FCCBF400FC05B200FCC7B000712301FC0A
S3150000AED038AE00FCF6B100FCE2B100FCE7B0007150
S3150000AEE07AFAD73621FF71837102017192D736E45F
S3150000AEF0FF7182710BE0710AEC710AE87183D7CE9B
@ -318,7 +318,7 @@ S3150000B2E0E572914C02DE2A30D007BFA4E5E596E56B
S3150000B2F0304006BF9CE5F6BF98E5BFA2E5CF97E5CF
S3150000B300029261F8EEB901CFADE50530F401EEB475
S3150000B31001F596E593DF64AF98E5448913DC5CF5A7
S3150000B32097E5FC9BF300EF5340ADE504DC0630F4F3
S3150000B32097E5FCAEF300EF5340ADE504DC0630F4E0
S3150000B33001BFA0E58FA6E57391DD0C40ACE501DD0C
S3150000B34006AF9CE5EE920093F7EF4643DF2DCF96CE
S3150000B350E505304006BF9CE5F6BF98E530F401BF31
@ -352,7 +352,7 @@ S3150000B500A6E57391DF046071CA70609FC7E551FBC1
S3150000B5100F96E54C028FC9E5DE04718AEF02718B46
S3150000B5209FC9E5634C02D9CAE5DF06CFC8E502EF3D
S3150000B5300B93DF05E5C8E5EF03F5C8E5605C049FFE
S3150000B540CAE5540832C6E530BEE5EC94F40077C38C
S3150000B540CAE5540832C6E530BEE5ECA7F40077C379
S3150000B550C4D5A8E5DF0CE5A8E5F6BF98E5F512E544
S3150000B560EF1AAF98E544E903DE048991DF0E89916D
S3150000B570DFEBCA0000F6BF98E5E512E567D1DF0507
@ -361,9 +361,9 @@ S3150000B59061E85102D7F5ABE5D714E60214E5BF140E
S3150000B5A0E5441F00DC2589D1DF178F16E5819F163C
S3150000B5B0E54C04DC06CF16E503E1D7F6BF14E5EF4C
S3150000B5C00ACA0000F6BF14E5F516E5F1D7323604CF
S3150000B5D030B6E5FC9DF500CFC6E53651EE5FC7E512
S3150000B5D030B6E5FCB0F500CFC6E53651EE5FC7E5FF
S3150000B5E09FC7E57108C9E5F5C8E551045FCAE59F3F
S3150000B5F0CAE5540832C6E530BEE5EC94F400F5CE53
S3150000B5F0CAE5540832C6E530BEE5ECA7F400F5CE40
S3150000B600E551EE5FCFE59FCFE57108D1E5F5D0E5D1
S3150000B61051045FD2E59FD2E5D7CFB4E50CFEADFF6E
S3150000B620EFDCF6BFEEE5BFF0E5F5F2E5F17319F3F1
@ -954,8 +954,8 @@ S3150000DAA0DD0073C4C56399E1C2D7C15106FC5BDDD5
S3150000DAB00073C4C56399E1C2D7C15107FC5BDD00A1
S3150000DAC073C4C56399E1C2D7E1D7E1D7E1D7E1D7FE
S3150000DAD0E1D7E1D7E1D7E1D7E1D7E1D7E1D7E1D780
S3150000DAE0E1D7E1D7E1D7E1D7E1D7E1D7E1D7FC5ECE
S3150000DAF0F700E1D7E1D7FC8EF400E1D7E1D714F1C6
S3150000DAE0E1D7E1D7E1D7E1D7E1D7E1D7E1D7FC71BB
S3150000DAF0F700E1D7E1D7FCA1F400E1D7E1D714F1B3
S3150000DB0073318E05168B1831E583634C08DFF251AD
S3150000DB1005FC2ADF007253083031E5FCC3DD00D175
S3150000DB20E161E8F1D714F173318E05168B1831E5F2
@ -999,7 +999,7 @@ S3150000DD70E6148800CA0001A599C0D7F1D7C3BF7CB5
S3150000DD80E6C5C2511F5F7FE69F7FE6AF7EE6F05C89
S3150000DD90E0BF7EE651806F83E65C8F9F83E6AF82AD
S3150000DDA0E6F05CF0BF82E6F6BF80E6C4C53084E6E6
S3150000DDB0FC94F400307CE6FCE5AB00F743E161F847
S3150000DDB0FCA7F400307CE6FCE5AB00F743E161F834
S3150000DDC0F1C2D7C1205663980092DD1392DD4D92C1
S3150000DDD061F8EE87009261F8EEC1001058F1D73075
S3150000DDE05000C1AEF8040800B806340F0032001423
@ -1245,25 +1245,25 @@ S3150000ECD014F363614ADE0D891849F017BF52F083B9
S3150000ECE0A7A5EFEE3448F05208305107FC85E00046
S3150000ECF0F554F0F5D8E6F597EBF5D9E6D7D5D8E68D
S3150000ED00E161E8F1D78D01312309D576F061F8FC90
S3150000ED1009F5004064F001DF2AF564F0FC72E700B3
S3150000ED101CF5004064F001DF2AF564F0FC72E700A0
S3150000ED20FCBBEB00FCB9BE009F5BE5FCBDBE009FD3
S3150000ED305CE5AF62E5F74361F8FE0805FC11F600F5
S3150000ED40FEDC024065F001DF0FF565F0FE4306408C
S3150000ED305CE5AF62E5F74361F8FE1B05FC24F600CF
S3150000ED40FEEF024065F001DF0FF565F0FE56064066
S3150000ED5086F00161F8FE31004066F001DF14F566C9
S3150000ED60F0FEDB02FE2503D586F061F8FE0B02FEFF
S3150000ED707C024067F001DF06F567F0FE4505406856
S3150000ED60F0FEEE02FE3803D586F061F8FE1E02FEC6
S3150000ED708F024067F001DF06F567F0FE5805406830
S3150000ED80F00161F8F568F0D7D72006407EF001DF84
S3150000ED9010F57EF0D581F0DF05E581F0EF03F58112
S3150000EDA0F0E1FC14F700B8045102FC14F700B802B5
S3150000EDB05103FC14F700168F82F070D1DD0E914CD2
S3150000EDC00261D8EE4F01F582F0EE88011744E9039F
S3150000EDA0F0E1FC27F700B8045102FC27F700B8028F
S3150000EDB05103FC27F700168F82F070D1DD0E914CBF
S3150000EDC00261D8EE4F01F582F0EE9B011744E9038C
S3150000EDD0E13C00741744E903F11C0075A8024414D1
S3150000EDE000F11C009801A802441400E13C009800C0
S3150000EDF0A80444E903E13C0072A80444E903F54A87
S3150000EE00E5F11C00738801615A615C728800616BD0
S3150000EE10616DDF194090F001DF168F91F0819F91AF
S3150000EE20F04C29DC0BF591F0F590F0EF03F591F03D
S3150000EE304090F00161F8EE1B01A80244E903DC32C0
S3150000EE304090F00161F8EE2E01A80244E903DC32AD
S3150000EE40A804441400DE2BD583F0DF26D588F0DF36
S3150000EE5021E60256E5BF56E5442900DC19302800B4
S3150000EE60BF56E5D57DF0DF05E583F0EF09E582F0D5
@ -1276,155 +1276,156 @@ S3150000EEC0A802441400DE1FA804441400DE18E6025B
S3150000EED050E5BF50E5442900DC10302800BF50E55E
S3150000EEE0711088F0EF04F6BF50E517441400DE1FDA
S3150000EEF0A802441400DE18E60252E5BF52E5442992
S3150000EF0000DC51302800BF52E5713088F0EF45F63D
S3150000EF10BF52E5EF3F8F4AE5D1DD0B91DF36604CFE
S3150000EF2001DF1817EF1B407DF001DF28A80244140B
S3150000EF3000DE21E54AE5F590F0EF194C02DF0DA859
S3150000EF4004441400DE06F582F0E590F0D57DF0610C
S3150000EF50F8F54AE5A804443200F161C8E19F66E588
S3150000EF60A802443200F161C8E19F67E51744320008
S3150000EF70F161C8E19F68E51006D7C78F4CE54C32B2
S3150000EF80DE06819F4CE5EF64F587F0C8000251026A
S3150000EF90FC96F60031496F87F09F87F0E1FC14F785
S3150000EFA000443200DC03F1980088006F87F09F87E9
S3150000EFB0F05102FC14F700443200F161C851046FAD
S3150000EFC087F09F87F05103FC14F700443200510884
S3150000EFD061C8F16F87F09F87F0DF0E8F4BE5819F49
S3150000EFE04BE54C05DC06E586F0F54BE5C0D78F8989
S3150000EFF0F04C03DC224C03DD06F592F0F1EF0C8FAA
S3150000F00092F0819F92F04C0BDE05E1EC79F6004C14
S3150000F010175102DCF6EF04FC79F600F592F0D740C2
S3150000F0204DE507DE058F82F0EF025103FCC9F600BD
S3150000F0308F4DE5819F4DE54C0A61C8F54DE5D7F149
S3150000F040FCEFF5009161F8E57DF0E1FCEFF500914C
S3150000F05061F8E57EF05103FCEFF50091DF0ED580F7
S3150000F060F0F161F8E19F80F0FC09F700F1FC00F691
S3150000F070009161F8F57DF0E1FC00F6009161F8F58C
S3150000F0807EF05102FCBEF6009F7FF0D7C78F82F05C
S3150000F090734C01500461E8F0D1550861E8550063EE
S3150000F0A04C02531061E8F33683F08F7FF031595CE0
S3150000F0B02098008F80F031695C407265616088003D
S3150000F0C008616B6168616A9F94F051F85F97F0710F
S3150000F0D0843684F0718971843685F07199718471F2
S3150000F0E0A99F97F03687F05102319301F150043110
S3150000F0F0A301F0530831B301F361683688F050106C
S3150000F100319301F0616B534031B301F36168368787
S3150000F110F0508031C301F0616B61689F96F0520731
S3150000F1203094F0FC8BF7009F9BF0C0D7D7D7D72041
S3150000F13024E6C1AEF8040400B802340F003200140D
S3150000F140FC80A900C0880281DF41F1734C08DE070C
S3150000F150C6C709DEA3EF184C19DE07318E04DEA3FD
S3150000F160EF094C21DE0B318E04DEA314C6C789617C
S3150000F170D983634C21DFD5302100C1340F00320022
S3150000F18014AEF8040400FCA4A700C0E6C1AEF8045F
S3150000F1900400B802340F00320018FC80A900C088B1
S3150000F1A00281DF4CF1734C10DE07C6C709FFA3EFDF
S3150000F1B0234C14DE07318E04FFA3EF144C18DE0730
S3150000F1C0318E04FFA3EF094C20DE0B318E04FFA322
S3150000F1D014C6C78961D983634C20DFCA302000C1B9
S3150000F1E0340F00320018AEF8040400FCA4A700C0D7
S3150000F1F01024D78F0C03F3313501E38F0403311547
S3150000F200418F0C03313504A248E5E38F47E5724C84
S3150000F2100ADE0FAF48E5446400DC0762819F47E5DC
S3150000F220EF11624C0ADC1BAF48E544E803DC13CF60
S3150000F23047E50A340403F6BF48E5BA08A9085CFCAA
S3150000F24008B963D7AF0C0360313545FC14AE0060D6
S3150000F25031153DAF74F0F743DF358F76F073D1DFAC
S3150000F26006306400BF74F0634C05DE0BD1DD08FE8A
S3150000F2703100306400EF0A4C05DC09FE250030E859
S3150000F28003BF74F08F76F04C05DE04819F76F0D7CD
S3150000F290D576F0DD0AAF74F0F74361F8F576F0F550
S3150000F2A060E5D7345003F789718B990089718A9983
S3150000F2B0AF0C0343DD04F6BF0C035404A9085CFC41
S3150000F2C008B9D7C7F1FC14F70014321D01CEFB01B3
S3150000F2D0316C31AE03BF8AF01532546FCEFB011488
S3150000F2E0C0C3316CA80031AEB8001531AE031404AA
S3150000F2F0BC0216BF8CF0A8001261D8A1B800BF8E60
S3150000F300F04400001761F8443521DE17E60262F08A
S3150000F310BF62F044FA00DC5630FA00BF62F0E560E6
S3150000F320F0EF4BA8004400001761F8447440DC1865
S3150000F330E60262F0BF62F044FA00DC3230FA00BF47
S3150000F34062F0CF60F002EF26150494DF1461C8B3B3
S3150000F35013F7431561F844591BDE13AF62F043DF20
S3150000F36009F6BF62F0F560F0EF04B1BF62F0C0D7F6
S3150000F37030F401BF6AF030D007BF62E5E572F0F500
S3150000F3807DF0F57EF0F582F0E581F0F586F0F58901
S3150000F390F0D751035F9CF09F89F0D7FCD7B00034BB
S3150000F3A0B801F6B9BA40BA02BA42B9BA40FCECB1F1
S3150000F3B00036F000710B3071C371837193712306AF
S3150000F3C071330671030C713303713301714301719B
S3150000F3D00303712201AF0403086C0408BF0403AFE2
S3150000F3E02603086C0108BF260300AF2603086C0439
S3150000F3F008BF26037108C502716BD0716BD48D01ED
S3150000F40031750261FD716BD0716AD4712301FC8282
S3150000F410AE00FCB1AE00ECC7B000C3C661488804BC
S3150000F42070DF118981739963614861D8D7CA00007A
S3150000F430CC0001D7CA0000CC0000D7300500C18D32
S3150000F44001317A346FF0326EF0E0FECDFFC0300548
S3150000F45000C18D01317A3471F03270F0F0FEBAFFDE
S3150000F460C04070F001DF05F572F0EF0C406EF00160
S3150000F470DF06E572F07133018F72F04F93F0DD0D08
S3150000F4809F93F0D1DF07340603A95CFCB9D7148F2C
S3150000F4908AF099D7C1C3C664318EA104FFFF12DD7D
S3150000F4A00BC4C58B99A7A5C0C513EFEFC0D75408E9
S3150000F4B03294F030ACF0EFDC712301511F5FA7F0FE
S3150000F4C09FA7F0308801BFA4F0AFA6F0F05CE0BFC4
S3150000F4D0A6F051806FABF05C8F9FABF0AFAAF0F057
S3150000F4E05CF0BFAAF0F6BFA8F0F55AE554083294CE
S3150000F4F0F030ACF0EF9E365BE5318301D73466E53C
S3150000F5005208303303EC7DDD008F97E570914C0295
S3150000F510DE59604C02DF23AFA2E5F743DF17365C06
S3150000F520E5AFA0E5BFA2E531850B8FADE54C05DE65
S3150000F53004819FADE5F56EE5EF318F6EE573D1DDA4
S3150000F5402AAFA2E56168DF23365CE563919F6EE52D
S3150000F550AFA0E5BFA2E531851230B6E5FCE5AB000C
S3150000F5608FADE54C05DE04819FADE5AF5EE5F74363
S3150000F570DF2A365BE531852454083294F030ACF04E
S3150000F580FE11FF30A4F0FCE5AB008F5AE5814C106C
S3150000F59061C8F19F5AE5303200BF5EE5D7C114134A
S3150000F5A0B98A035C1F9A0315A1A114A9F05CE0B9FE
S3150000F5B0C4C58A0771FA5C8F9A071504060014A958
S3150000F5C0F05CF0B9A80004040014F6B9C0D7F173D2
S3150000F5D01970E50083634C04DFF5D74C04DE057330
S3150000F5E01974E501D74C04DE05731978E501D74C8B
S3150000F5F004DE0B318E0474E51489CA0000D7F1D7F6
S3150000F6004C04DE0B318E0478E51489CA0000D7F16C
S3150000F610D7C7F19800FE7E007291DF268800318EF2
S3150000F620148800730970E5D1DF181501047CE51410
S3150000F630A9A1B9441400DC361970E50163FE9BFFED
S3150000F640EF2CD2DF2988005002D612797CE54400DF
S3150000F65000DF178800730970E591DF058800FE84D6
S3150000F660FF8800731970E500EF04B1787CE5880027
S3150000F6708198004C04DF9EC0D7D1DD0791DD0B9148
S3150000F680DD0DD7711304715301D7711204EFF771B1
S3150000F6901304715201D7D1DD0B91DD0E91DD14916A
S3150000F6A0DD16F1D78D06313AEF048D06312A5C015D
S3150000F6B07C01D7E15B06EFF88D06311AEFF04C04BA
S3150000F6C0DE05730970E5D7F1D7D1DD1591DD079118
S3150000F6D0DD1891DD20D73601FF71E271F371030366
S3150000F6E0D73601FF71E371F2EFF33601FF71E37173
S3150000F6F0F3710203D73601FF71E271F2EFF3D1DF46
S3150000F70004711304D7711204D7D1DF0471030CD727
S3150000F71071020CD74C04DE085002D61279EEF0D7EF
S3150000F720F6D78E31D1DD0D91DD1591DD1D91DD25EB
S3150000F730CE3100D730EEF0FCFEB100CE3101D7302D
S3150000F740F0F0FCFEB100CE3102D730F2F0FCFEB193
S3150000F75000CE3103D730F4F0FCFEB100EFD214CA6C
S3150000F7600000D71653FF62318EA104FFFF1463DD3C
S3150000F7701750087D7261017362317504637CB8733A
S3150000F7809063DFF0A715EFE27CFFD71653FF6231D7
S3150000F7908EA104FFFF1463DD0A7D73A709D8A47345
S30B0000F7A015EFEF7CFFD718
S3150000F7A600000000000000003200C800785634123F
S3150000F7B611121314222431333536377F727173785A
S3150000F7C67E00112233445566778899AABBCCDDEEB6
S3150000F7D6FF0000000000000000000000000000001E
S3150000F7E600000000000000000000000303003200D5
S3150000F7F60000D00701030000000000000000000022
S3150000F80600000000000000000000000000000000EC
S3090000F81600000000E8
S31500019C0048573033303020202020202020202020AB
S31500019C1030312E30312E303120202020203032308C
S3150000EF0000DC49302800BF52E5713088F0EF58F632
S3150000EF10BF52E5EF528F4AE5D1DD0B91DF49604CD8
S3150000EF2001DF2B17EF2E8F7DF07391DF0DA80244C2
S3150000EF301400DE06E54AE5F590F0D3DF0CA802449E
S3150000EF401400DE05E584F0EF1EF584F0EF194C029F
S3150000EF50DF0DA804441400DE06F582F0E590F0D536
S3150000EF607DF061F8F54AE5A804443200F161C8E194
S3150000EF709F66E5A802443200F161C8E19F67E51784
S3150000EF80443200F161C8E19F68E51006D7C78F4C8F
S3150000EF90E54C32DE06819F4CE5EF64F587F0C8004C
S3150000EFA0025102FCA9F60031496F87F09F87F0E114
S3150000EFB0FC27F700443200DC03F1980088006F87D5
S3150000EFC0F09F87F05102FC27F700443200F161C838
S3150000EFD051046F87F09F87F05103FC27F7004432F6
S3150000EFE000510861C8F16F87F09F87F0DF0E8F4BE5
S3150000EFF0E5819F4BE54C05DC06E586F0F54BE5C063
S3150000F000D78F89F04C03DC224C03DD06F592F0F134
S3150000F010EF0C8F92F0819F92F04C0BDE05E1EC8CA9
S3150000F020F6004C175102DCF6EF04FC8CF600F59264
S3150000F030F0D7404DE507DE058F82F0EF025103FC65
S3150000F040DCF6008F4DE5819F4DE54C0A61C8F54D14
S3150000F050E5D7F1FC02F6009161F8E57DF0E1FC02EE
S3150000F060F6009161F8E57EF05103FC02F60091DFAF
S3150000F0700ED580F0F161F8E19F80F0FC1CF700F1FD
S3150000F080FC13F6009161F8F57DF0E1FC13F60091B2
S3150000F09061F8F57EF05102FCD1F6009F7FF0D7C7EC
S3150000F0A08F82F0734C01500461E8F0D1550861E895
S3150000F0B05500634C02531061E8F33683F08F7FF0FE
S3150000F0C031595C2098008F80F031695C407265612F
S3150000F0D060880008616B6168616A9F94F051F85F0F
S3150000F0E097F071843684F0718971843685F0719950
S3150000F0F0718471A99F97F03687F05102319301F11F
S3150000F100500431A301F0530831B301F36168368826
S3150000F110F05010319301F0616B534031B301F3614C
S3150000F120683687F0508031C301F0616B61689F9645
S3150000F130F052073094F0FC9EF7009F9BF0C0D7D7A3
S3150000F140D7D72024E6C1AEF8040400B802340F0075
S3150000F150320014FC80A900C0880281DF41F1734CA3
S3150000F16008DE07C6C709DEA3EF184C19DE07318E85
S3150000F17004DEA3EF094C21DE0B318E04DEA314C698
S3150000F180C78961D983634C21DFD5302100C1340F93
S3150000F19000320014AEF8040400FCA4A700C0E6C1C7
S3150000F1A0AEF8040400B802340F00320018FC80A93F
S3150000F1B000C0880281DF4CF1734C10DE07C6C70918
S3150000F1C0FFA3EF234C14DE07318E04FFA3EF144C8C
S3150000F1D018DE07318E04FFA3EF094C20DE0B318EBB
S3150000F1E004FFA314C6C78961D983634C20DFCA30E4
S3150000F1F02000C1340F00320018AEF8040400FCA44D
S3150000F200A700C01024D78F0C03F3313501E38F0418
S3150000F210033115418F0C03313504A248E5E38F47CE
S3150000F220E5724C0ADE0FAF48E5446400DC076281F4
S3150000F2309F47E5EF11624C0ADC1BAF48E544E80343
S3150000F240DC13CF47E50A340403F6BF48E5BA08A93C
S3150000F250085CFC08B963D7AF0C0360313545FC1474
S3150000F260AE006031153DAF74F0F743DF358F76F0B1
S3150000F27073D1DF06306400BF74F0634C05DE0BD13A
S3150000F280DD08FE3100306400EF0A4C05DC09FE257E
S3150000F2900030E803BF74F08F76F04C05DE04819FE2
S3150000F2A076F0D7D576F0DD0AAF74F0F74361F8F55E
S3150000F2B076F0F560E5D7345003F789718B990089AC
S3150000F2C0718A99AF0C0343DD04F6BF0C035404A9FD
S3150000F2D0085CFC08B9D7C7F1FC27F70014321D01FA
S3150000F2E0CEFB01316C31AE03BF8AF01532546FCEBE
S3150000F2F0FB0114C0C3316CA80031AEB8001531AEA5
S3150000F300031404BC0216BF8CF0A8001261D8A1B881
S3150000F31000BF8EF04400001761F8443521DE17E681
S3150000F3200262F0BF62F044FA00DC5630FA00BF62B7
S3150000F330F0E560F0EF4BA8004400001761F8447454
S3150000F34040DC18E60262F0BF62F044FA00DC3230BC
S3150000F350FA00BF62F0CF60F002EF26150494DF14C6
S3150000F36061C8B313F7431561F844591BDE13AF6246
S3150000F370F043DF09F6BF62F0F560F0EF04B1BF625B
S3150000F380F0C0D730F401BF6AF030D007BF62E5E5C0
S3150000F39072F0F57DF0F57EF0F582F0E581F0F58608
S3150000F3A0F0F589F0D751035F9CF09F89F0D7FCD721
S3150000F3B0B00034B801F6B9BA40BA02BA42B9BA4096
S3150000F3C0FCECB10036F000710B3071C371837193A0
S3150000F3D071230671330671030C71330371330171A6
S3150000F3E04301710303712201AF0403086C0408BFD3
S3150000F3F00403AF2603086C0108BF260300AF2603EB
S3150000F400086C0408BF26037108C502716BD0716BC6
S3150000F410D48D0131750261FD716BD0716AD471238F
S3150000F42001FC82AE00FCB1AE00ECC7B000C3C66101
S3150000F43048880470DF118981739963614861D8D760
S3150000F440CA0000CC0001D7CA0000CC0000D73005A6
S3150000F45000C18D01317A346FF0326EF0E0FECDFFDF
S3150000F460C0300500C18D01317A3471F03270F0F090
S3150000F470FEBAFFC04070F001DF05F572F0EF0C40F8
S3150000F4806EF001DF06E572F07133018F72F04F9373
S3150000F490F0DD0D9F93F0D1DF07340603A95CFCB9BC
S3150000F4A0D7148F8AF099D7C1C3C664318EA104FFE1
S3150000F4B0FF12DD0BC4C58B99A7A5C0C513EFEFC01E
S3150000F4C0D754083294F030ACF0EFDC712301511FB1
S3150000F4D05FA7F09FA7F0308801BFA4F0AFA6F0F0B9
S3150000F4E05CE0BFA6F051806FABF05C8F9FABF0AFD6
S3150000F4F0AAF0F05CF0BFAAF0F6BFA8F0F55AE55402
S3150000F500083294F030ACF0EF9E365BE5318301D7DC
S3150000F5103466E55208303303EC7DDD008F97E570E5
S3150000F520914C02DE59604C02DF23AFA2E5F743DFC0
S3150000F53017365CE5AFA0E5BFA2E531850B8FADE5DB
S3150000F5404C05DE04819FADE5F56EE5EF318F6EE586
S3150000F55073D1DD2AAFA2E56168DF23365CE56391EE
S3150000F5609F6EE5AFA0E5BFA2E531851230B6E5FC9A
S3150000F570E5AB008FADE54C05DE04819FADE5AF5EE2
S3150000F580E5F743DF2A365BE531852454083294F0EB
S3150000F59030ACF0FE11FF30A4F0FCE5AB008F5AE56D
S3150000F5A0814C1061C8F19F5AE5303200BF5EE5D745
S3150000F5B0C11413B98A035C1F9A0315A1A114A9F0FB
S3150000F5C05CE0B9C4C58A0771FA5C8F9A0715040610
S3150000F5D00014A9F05CF0B9A80004040014F6B9C040
S3150000F5E0D7F1731970E50083634C04DFF5D74C043B
S3150000F5F0DE05731974E501D74C04DE05731978E549
S3150000F60001D74C04DE0B318E0474E51489CA000060
S3150000F610D7F1D74C04DE0B318E0478E51489CA0085
S3150000F62000D7F1D7C7F19800FE7E007291DF2688D9
S3150000F63000318E148800730970E5D1DF18150104B6
S3150000F6407CE514A9A1B9441400DC361970E5016300
S3150000F650FE9BFFEF2CD2DF2988005002D612797C60
S3150000F660E5440000DF178800730970E591DF05881F
S3150000F67000FE84FF8800731970E500EF04B1787C02
S3150000F680E588008198004C04DF9EC0D7D1DD079144
S3150000F690DD0B91DD0DD7711304715301D77112047F
S3150000F6A0EFF7711304715201D7D1DD0B91DD0E9185
S3150000F6B0DD1491DD16F1D78D06313AEF048D063152
S3150000F6C02A5C017C01D7E15B06EFF88D06311AEF63
S3150000F6D0F04C04DE05730970E5D7F1D7D1DD15913D
S3150000F6E0DD0791DD1891DD20D73601FF71E271F358
S3150000F6F0710303D73601FF71E371F2EFF33601FFB1
S3150000F70071E371F3710203D73601FF71E271F2EF13
S3150000F710F3D1DF04711304D7711204D7D1DF04715A
S3150000F720030CD771020CD74C04DE085002D61279AE
S3150000F730EEF0D7F6D78E31D1DD0D91DD1591DD1DB9
S3150000F74091DD25CE3100D730EEF0FCFEB100CE3192
S3150000F75001D730F0F0FCFEB100CE3102D730F2F026
S3150000F760FCFEB100CE3103D730F4F0FCFEB100EF61
S3150000F770D214CA0000D71653FF62318EA104FFFFD0
S3150000F7801463DD1750087D7261017362317504637D
S3150000F7907CB8739063DFF0A715EFE27CFFD71653B2
S3150000F7A0FF62318EA104FFFF1463DD0A7D73A70992
S30E0000F7B0D8A47315EFEF7CFFD716
S3150000F7BA00000000000000003200C800785634122B
S3150000F7CA11121314222431333536377F7271737846
S3150000F7DA7E00112233445566778899AABBCCDDEEA2
S3150000F7EAFF0000000000000000000000000000000A
S3150000F7FA00000000000000000000000303003200C1
S3150000F80A0000D0070103000000000000000000000D
S3150000F81A00000000000000000000000000000000D8
S3090000F82A00000000D4
S31500019C0048573031303020202020202020202020AD
S31500019C1030312E30312E3037202020202030323086
S31200019C20312020202020202020202020207F
S30900019FF0AA5555AA68
S9030000FC

View File

@ -292,6 +292,14 @@ void HD_task(void)//5ms
temp_N_state = 0;
wait_N_release = 0;
}
if (lock_state == LOCK_STATE_LOCKED && adval[FNR_STATE_N] < 20)
{
g_n_op = 1;
}
else
{
g_n_op = 0;
}
break;
case 1:
if(g_fnr_state == FNR_STATE_F)