Merge branch 'develop'

Conflicts:
	Controller/Controller/Micro820/Micro820/MICRO820_MdfUpdate.xtc
	Controller/Controller/Micro820/Micro820/Micro820_MiscLinkInfoOlc.mtc

Controller/Controller/Micro820/Micro820/Control.AcfMlge

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Root Version="6">
   <LanguageContainerStyle CommentTextColor="Green" CommentFont="Courier New, 10pt" PonctuationTextColor="Black" PonctuationFont="Courier New, 10pt" IdentifierTextColor="Black" IdentifierFont="Courier New, 10pt" OperatorTextColor="Black" OperatorFont="Courier New, 10pt" ReservedWordTextColor="Fuchsia" ReservedWordFont="Courier New, 10pt" PouTextColor="BlueViolet" PouFont="Courier New, 10pt" NumberTextColor="Firebrick" NumberFont="Courier New, 10pt" StringTextColor="Gray" StringFont="Courier New, 10pt" EditorTextAreaBackgroundColor="White" EditorFont="Courier New, 10pt" Index="0" />
 </Root>

Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc

@@ -6,5 +6,5 @@ Offset3=0x4428
 Memory Usage Estimate(Code)=0x6AB8
 Memory Usage Estimate(Data)=0x7BB8
 Memory Usage Estimate(Retain)=0x28
-Memory Usage Estimate(Temporary variables)=0x178C
+Memory Usage Estimate(Temporary variables)=0x1788
 Offset4=0x414

Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc

@@ -1,16 +1,28 @@
 [MODIF]
+POU=Y
+TYPE=Y
+LEVEL1=Y
+IO=Y
+RETAIN=Y
+INSTDEF=Y
+VARDEF=Y
+INIT_INST=Y
+ADD_DEL=Y
+VARSIZE=Y
+IO_DEF=Y
+LAST_VA=Y
 
 [RESULT]
-ON_LINE=N
+ON_LINE=Y
 TBL_CONF=Y
-CRC_ORG=0x0
-CRC_OLD=
-CRC_NEW=0xF16F4608
-DAT_ORG=0
-DAT_OLD=0
-DAT_NEW=1456176904
-VER_ORG=0
-VER_OLD=0
-VER_NEW=66
-CRC_ALL_OLD=
-CRC_ALL_NEW=0x6182BBE4
+CRC_ORG=0xF16F4608
+CRC_OLD=0xF16F4608
+CRC_NEW=0xC7202867
+DAT_ORG=1456176904
+DAT_OLD=1456176904
+DAT_NEW=1456188298
+VER_ORG=66
+VER_OLD=66
+VER_NEW=67
+CRC_ALL_OLD=0x6182BBE4
+CRC_ALL_NEW=0x600A5B9C

Controller/Controller/Micro820/Micro820/Micro820_LinkInfo.mtc

@@ -6,5 +6,5 @@ Offset3=0x4428
 Memory Usage Estimate(Code)=0x6AB8
 Memory Usage Estimate(Data)=0x7BB8
 Memory Usage Estimate(Retain)=0x28
-Memory Usage Estimate(Temporary variables)=0x178C
+Memory Usage Estimate(Temporary variables)=0x1788
 Offset4=0x414

Controller/Controller/Micro820/Micro820/Micro820_MiscLinkInfoOlc.mtc

@@ -1,3 +1,7 @@
 [MEMORY]
 Code Space Free Memory=0x1B580
+<<<<<<< HEAD
 Code Space Requirement=0x56F8
+=======
+Code Space Requirement=0x3898
+>>>>>>> develop

Controller/Controller/Micro820/Micro820/Micro820_SymbolsComplement.ttc

@@ -610,16 +610,16 @@ I608=micro820.micro820.vfd_configmap/vfd_w_torqueperfmode.enetctrlto_sec,0x446A,
 I609=micro820.micro820.vfd_configmap/vfd_w_torqueperfmode.parameternumber,0x44AE,UINT
 I610=micro820.micro820.vfd_configmap/vfd_w_torqueperfmode.parametervalue,0x44AA,UINT
 I611=micro820.micro820.downtime_timer.in,0x59E4,BOOL
-I612=micro820.micro820.downtime_timer.pt,0x59F0,TIME
+I612=micro820.micro820.downtime_timer.pt,0x59E8,TIME
 I613=micro820.micro820.vfd_messaging/vfd.msg_drvtype.reqdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
-I614=micro820.micro820.vfd_messaging/vfd.msg_drvtype.reqlength,0x59E8,UINT
+I614=micro820.micro820.vfd_messaging/vfd.msg_drvtype.reqlength,0x59E6,UINT
 I615=micro820.micro820.vfd_messaging/vfd.msg_drvtype.__adi_reqdata,0xFFFFFFFF,UINT
 I616=micro820.micro820.vfd_messaging/vfd.msg_timeout.resdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
 I617=micro820.micro820.vfd_messaging/vfd.msg_timeout.__adi_resdata,0xFFFFFFFF,UINT
 I618=micro820.micro820.vfd_messaging/vfd.msg_cmd.resdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
 I619=micro820.micro820.vfd_messaging/vfd.msg_cmd.__adi_resdata,0xFFFFFFFF,UINT
 I620=micro820.micro820.vfd_messaging/vfd.msg_sts.reqdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
-I621=micro820.micro820.vfd_messaging/vfd.msg_sts.reqlength,0x59E8,UINT
+I621=micro820.micro820.vfd_messaging/vfd.msg_sts.reqlength,0x59E6,UINT
 I622=micro820.micro820.vfd_messaging/vfd.msg_sts.__adi_reqdata,0xFFFFFFFF,UINT
 I623=micro820.micro820.vfd_configmap/vfd_r_nphp.msgparread.reqdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
 I624=micro820.micro820.vfd_configmap/vfd_r_nphp.msgparread.__adi_reqdata,0xFFFFFFFF,UINT
@@ -664,15 +664,15 @@ I662=micro820.micro820.vfd_configmap/vfd_w_motorpoles.msgparwrite.__adi_resdata,
 I663=micro820.micro820.vfd_configmap/vfd_w_motorpoles.msgtimeout.resdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
 I664=micro820.micro820.vfd_configmap/vfd_w_motorpoles.msgtimeout.__adi_resdata,0xFFFFFFFF,UINT
 I665=micro820.micro820.vfd_configmap/vfd_r_acceltime.fben,0x59E4,BOOL
-I666=micro820.micro820.vfd_configmap/vfd_r_acceltime.ipaddress,0x59F4,STRING
-I667=micro820.micro820.vfd_configmap/vfd_r_acceltime.updaterate_ms,0x59E8,UINT
-I668=micro820.micro820.vfd_configmap/vfd_r_acceltime.parameternumber,0x59E8,UINT
+I666=micro820.micro820.vfd_configmap/vfd_r_acceltime.ipaddress,0x5AFC,STRING
+I667=micro820.micro820.vfd_configmap/vfd_r_acceltime.updaterate_ms,0x59E6,UINT
+I668=micro820.micro820.vfd_configmap/vfd_r_acceltime.parameternumber,0x59E6,UINT
 I669=micro820.micro820.vfd_configmap/vfd_r_acceltime.msgparread.in,0x59E4,BOOL
 I670=micro820.micro820.vfd_configmap/vfd_r_acceltime.msgparread.ctrlcfg,0xFFFFFFFF,CIPCONTROLCFG
 I671=micro820.micro820.vfd_configmap/vfd_r_acceltime.msgparread.appcfg,0xFFFFFFFF,CIPAPPCFG
 I672=micro820.micro820.vfd_configmap/vfd_r_acceltime.msgparread.targetcfg,0xFFFFFFFF,CIPTARGETCFG
 I673=micro820.micro820.vfd_configmap/vfd_r_acceltime.msgparread.reqdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
-I674=micro820.micro820.vfd_configmap/vfd_r_acceltime.msgparread.reqlength,0x59E8,UINT
+I674=micro820.micro820.vfd_configmap/vfd_r_acceltime.msgparread.reqlength,0x59E6,UINT
 I675=micro820.micro820.vfd_configmap/vfd_r_acceltime.msgparread.resdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
 I676=micro820.micro820.vfd_configmap/vfd_r_acceltime.msgparread.__adi_reqdata,0xFFFFFFFF,UINT
 I677=micro820.micro820.vfd_configmap/vfd_r_acceltime.msgparread.__adi_resdata,0xFFFFFFFF,UINT
@@ -680,16 +680,16 @@ I678=micro820.micro820.vfd_configmap/vfd_r_acceltime.fben_rtrig.clk,0x59E4,BOOL
 I679=micro820.micro820.vfd_configmap/vfd_r_acceltime.msgparread_q_rtrig.clk,0x59E4,BOOL
 I680=micro820.micro820.vfd_configmap/vfd_r_acceltime.msgparread_err_rtrig.clk,0x59E4,BOOL
 I681=micro820.micro820.vfd_configmap/vfd_w_acceltime.fben,0x59E4,BOOL
-I682=micro820.micro820.vfd_configmap/vfd_w_acceltime.ipaddress,0x59F4,STRING
-I683=micro820.micro820.vfd_configmap/vfd_w_acceltime.enetctrlto_sec,0x59E6,USINT
-I684=micro820.micro820.vfd_configmap/vfd_w_acceltime.parameternumber,0x59E8,UINT
-I685=micro820.micro820.vfd_configmap/vfd_w_acceltime.parametervalue,0x59E8,UINT
+I682=micro820.micro820.vfd_configmap/vfd_w_acceltime.ipaddress,0x5AFC,STRING
+I683=micro820.micro820.vfd_configmap/vfd_w_acceltime.enetctrlto_sec,0x59E5,USINT
+I684=micro820.micro820.vfd_configmap/vfd_w_acceltime.parameternumber,0x59E6,UINT
+I685=micro820.micro820.vfd_configmap/vfd_w_acceltime.parametervalue,0x59E6,UINT
 I686=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgparwrite.in,0x59E4,BOOL
 I687=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgparwrite.ctrlcfg,0xFFFFFFFF,CIPCONTROLCFG
 I688=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgparwrite.appcfg,0xFFFFFFFF,CIPAPPCFG
 I689=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgparwrite.targetcfg,0xFFFFFFFF,CIPTARGETCFG
 I690=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgparwrite.reqdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
-I691=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgparwrite.reqlength,0x59E8,UINT
+I691=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgparwrite.reqlength,0x59E6,UINT
 I692=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgparwrite.resdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
 I693=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgparwrite.__adi_reqdata,0xFFFFFFFF,UINT
 I694=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgparwrite.__adi_resdata,0xFFFFFFFF,UINT
@@ -701,22 +701,22 @@ I699=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgtimeout.ctrlcfg,0xFFFFFF
 I700=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgtimeout.appcfg,0xFFFFFFFF,CIPAPPCFG
 I701=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgtimeout.targetcfg,0xFFFFFFFF,CIPTARGETCFG
 I702=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgtimeout.reqdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
-I703=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgtimeout.reqlength,0x59E8,UINT
+I703=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgtimeout.reqlength,0x59E6,UINT
 I704=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgtimeout.resdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
 I705=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgtimeout.__adi_reqdata,0xFFFFFFFF,UINT
 I706=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgtimeout.__adi_resdata,0xFFFFFFFF,UINT
 I707=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgtimeout_err_rtrig.clk,0x59E4,BOOL
 I708=micro820.micro820.vfd_configmap/vfd_w_acceltime.msgtimeout_q_rtrig.clk,0x59E4,BOOL
 I709=micro820.micro820.vfd_configmap/vfd_r_deceltime.fben,0x59E4,BOOL
-I710=micro820.micro820.vfd_configmap/vfd_r_deceltime.ipaddress,0x59F4,STRING
-I711=micro820.micro820.vfd_configmap/vfd_r_deceltime.updaterate_ms,0x59E8,UINT
-I712=micro820.micro820.vfd_configmap/vfd_r_deceltime.parameternumber,0x59E8,UINT
+I710=micro820.micro820.vfd_configmap/vfd_r_deceltime.ipaddress,0x5AFC,STRING
+I711=micro820.micro820.vfd_configmap/vfd_r_deceltime.updaterate_ms,0x59E6,UINT
+I712=micro820.micro820.vfd_configmap/vfd_r_deceltime.parameternumber,0x59E6,UINT
 I713=micro820.micro820.vfd_configmap/vfd_r_deceltime.msgparread.in,0x59E4,BOOL
 I714=micro820.micro820.vfd_configmap/vfd_r_deceltime.msgparread.ctrlcfg,0xFFFFFFFF,CIPCONTROLCFG
 I715=micro820.micro820.vfd_configmap/vfd_r_deceltime.msgparread.appcfg,0xFFFFFFFF,CIPAPPCFG
 I716=micro820.micro820.vfd_configmap/vfd_r_deceltime.msgparread.targetcfg,0xFFFFFFFF,CIPTARGETCFG
 I717=micro820.micro820.vfd_configmap/vfd_r_deceltime.msgparread.reqdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
-I718=micro820.micro820.vfd_configmap/vfd_r_deceltime.msgparread.reqlength,0x59E8,UINT
+I718=micro820.micro820.vfd_configmap/vfd_r_deceltime.msgparread.reqlength,0x59E6,UINT
 I719=micro820.micro820.vfd_configmap/vfd_r_deceltime.msgparread.resdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
 I720=micro820.micro820.vfd_configmap/vfd_r_deceltime.msgparread.__adi_reqdata,0xFFFFFFFF,UINT
 I721=micro820.micro820.vfd_configmap/vfd_r_deceltime.msgparread.__adi_resdata,0xFFFFFFFF,UINT
@@ -724,16 +724,16 @@ I722=micro820.micro820.vfd_configmap/vfd_r_deceltime.fben_rtrig.clk,0x59E4,BOOL
 I723=micro820.micro820.vfd_configmap/vfd_r_deceltime.msgparread_q_rtrig.clk,0x59E4,BOOL
 I724=micro820.micro820.vfd_configmap/vfd_r_deceltime.msgparread_err_rtrig.clk,0x59E4,BOOL
 I725=micro820.micro820.vfd_configmap/vfd_w_deceltime.fben,0x59E4,BOOL
-I726=micro820.micro820.vfd_configmap/vfd_w_deceltime.ipaddress,0x59F4,STRING
-I727=micro820.micro820.vfd_configmap/vfd_w_deceltime.enetctrlto_sec,0x59E6,USINT
-I728=micro820.micro820.vfd_configmap/vfd_w_deceltime.parameternumber,0x59E8,UINT
-I729=micro820.micro820.vfd_configmap/vfd_w_deceltime.parametervalue,0x59E8,UINT
+I726=micro820.micro820.vfd_configmap/vfd_w_deceltime.ipaddress,0x5AFC,STRING
+I727=micro820.micro820.vfd_configmap/vfd_w_deceltime.enetctrlto_sec,0x59E5,USINT
+I728=micro820.micro820.vfd_configmap/vfd_w_deceltime.parameternumber,0x59E6,UINT
+I729=micro820.micro820.vfd_configmap/vfd_w_deceltime.parametervalue,0x59E6,UINT
 I730=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgparwrite.in,0x59E4,BOOL
 I731=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgparwrite.ctrlcfg,0xFFFFFFFF,CIPCONTROLCFG
 I732=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgparwrite.appcfg,0xFFFFFFFF,CIPAPPCFG
 I733=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgparwrite.targetcfg,0xFFFFFFFF,CIPTARGETCFG
 I734=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgparwrite.reqdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
-I735=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgparwrite.reqlength,0x59E8,UINT
+I735=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgparwrite.reqlength,0x59E6,UINT
 I736=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgparwrite.resdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
 I737=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgparwrite.__adi_reqdata,0xFFFFFFFF,UINT
 I738=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgparwrite.__adi_resdata,0xFFFFFFFF,UINT
@@ -745,7 +745,7 @@ I743=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgtimeout.ctrlcfg,0xFFFFFF
 I744=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgtimeout.appcfg,0xFFFFFFFF,CIPAPPCFG
 I745=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgtimeout.targetcfg,0xFFFFFFFF,CIPTARGETCFG
 I746=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgtimeout.reqdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
-I747=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgtimeout.reqlength,0x59E8,UINT
+I747=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgtimeout.reqlength,0x59E6,UINT
 I748=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgtimeout.resdata,0xFFFFFFFF,____FB_INIT_CONST_0000000C
 I749=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgtimeout.__adi_reqdata,0xFFFFFFFF,UINT
 I750=micro820.micro820.vfd_configmap/vfd_w_deceltime.msgtimeout.__adi_resdata,0xFFFFFFFF,UINT

Controller/Controller/Micro820/Micro820/VFD_ConfigMap.AcfMlge

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Root Version="6">
   <LanguageContainerStyle CommentTextColor="Green" CommentFont="Courier New, 10pt" PonctuationTextColor="Black" PonctuationFont="Courier New, 10pt" IdentifierTextColor="Black" IdentifierFont="Courier New, 10pt" OperatorTextColor="Black" OperatorFont="Courier New, 10pt" ReservedWordTextColor="Fuchsia" ReservedWordFont="Courier New, 10pt" PouTextColor="BlueViolet" PouFont="Courier New, 10pt" NumberTextColor="Firebrick" NumberFont="Courier New, 10pt" StringTextColor="Gray" StringFont="Courier New, 10pt" EditorTextAreaBackgroundColor="White" EditorFont="Courier New, 10pt" Index="0" />
 </Root>

Controller/Controller/Micro820/Micro820/VFD_ErrorMap.AcfMlge

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Root Version="6">
   <LanguageContainerStyle CommentTextColor="Green" CommentFont="Courier New, 10pt" PonctuationTextColor="Black" PonctuationFont="Courier New, 10pt" IdentifierTextColor="Black" IdentifierFont="Courier New, 10pt" OperatorTextColor="Black" OperatorFont="Courier New, 10pt" ReservedWordTextColor="Fuchsia" ReservedWordFont="Courier New, 10pt" PouTextColor="BlueViolet" PouFont="Courier New, 10pt" NumberTextColor="Firebrick" NumberFont="Courier New, 10pt" StringTextColor="Gray" StringFont="Courier New, 10pt" EditorTextAreaBackgroundColor="White" EditorFont="Courier New, 10pt" Index="0" />
 </Root>