diff --git a/Controller/Controller/Compile.ic b/Controller/Controller/Compile.ic index 7e6cc76..34c4e94 100644 --- a/Controller/Controller/Compile.ic +++ b/Controller/Controller/Compile.ic @@ -1 +1 @@ -COMPILED +TO RELINK \ No newline at end of file diff --git a/Controller/Controller/LogicalValues.csv b/Controller/Controller/LogicalValues.csv index ea80dfa..ae4a49a 100644 --- a/Controller/Controller/LogicalValues.csv +++ b/Controller/Controller/LogicalValues.csv @@ -62,6 +62,7 @@ Controller.Micro820.Micro820.cfg_NameplateHz 60.0 Controller.Micro820.Micro820.cfg_NameplateOLCurrent 12.5 Controller.Micro820.Micro820.cfg_NameplateRPM 3450.0 Controller.Micro820.Micro820.cfg_NameplateVolts 460.0 +Controller.Micro820.Micro820.cfg_SpecificGravity Controller.Micro820.Micro820.cfg_StopMode 0 Controller.Micro820.Micro820.cfg_TorquePerfMode 0 Controller.Micro820.Micro820.Clear_Trip_Cycle T#15s diff --git a/Controller/Controller/Micro820/Micro820/Compile.ics b/Controller/Controller/Micro820/Micro820/Compile.ics deleted file mode 100644 index 679cef0..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile.ics +++ /dev/null @@ -1 +0,0 @@ -TO RELINK diff --git a/Controller/Controller/Micro820/Micro820/Compile.ict b/Controller/Controller/Micro820/Micro820/Compile.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_CONTROL.ict b/Controller/Controller/Micro820/Micro820/Compile_CONTROL.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_CONTROL.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict b/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_READ.ict b/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_READ.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_READ.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_WRITE.ict b/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_WRITE.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_WRITE.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_STS_CMD.ict b/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_STS_CMD.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_STS_CMD.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_READDOWNHOLEDATA.ict b/Controller/Controller/Micro820/Micro820/Compile_READDOWNHOLEDATA.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_READDOWNHOLEDATA.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_VFD_CONFIGMAP.ict b/Controller/Controller/Micro820/Micro820/Compile_VFD_CONFIGMAP.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_VFD_CONFIGMAP.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_VFD_ERRORMAP.ict b/Controller/Controller/Micro820/Micro820/Compile_VFD_ERRORMAP.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_VFD_ERRORMAP.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_VFD_MESSAGING.ict b/Controller/Controller/Micro820/Micro820/Compile_VFD_MESSAGING.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_VFD_MESSAGING.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Control.stf b/Controller/Controller/Micro820/Micro820/Control.stf index 32d8153..4c1377b 100644 --- a/Controller/Controller/Micro820/Micro820/Control.stf +++ b/Controller/Controller/Micro820/Micro820/Control.stf @@ -44,7 +44,7 @@ IF Downhole_Tool_Enabled THEN DH_MaxIntakeTemperature_Startup := ANY_TO_REAL(Modbus_Read0[40]) / 10.0; DH_MaxIntakePressure_Startup := Modbus_Read0[41]; DH_DownholeStatus_INT := Modbus_Read0[99]; - DH_Fluid_Level := (DH_IntakePressure - 14.0) * (1.0 / 0.433); + DH_Fluid_Level := (DH_IntakePressure - 14.0) * (1.0 / cfg_SpecificGravity); CASE Modbus_Read0[99] OF 0: DH_DownholeStatus := 'OK'; diff --git a/Controller/Controller/Micro820/Micro820/MICRO820.icp b/Controller/Controller/Micro820/Micro820/MICRO820.icp deleted file mode 100644 index c1a05c9..0000000 --- a/Controller/Controller/Micro820/Micro820/MICRO820.icp +++ /dev/null @@ -1,9 +0,0 @@ -RA_PFX_ENET_PAR_WRITE(168):FB,MSG_CIPGENERIC();FB,R_TRIG(); -VFD_MESSAGING(163):FB,RA_PFX_ENET_STS_CMD(164); -VFD_CONFIGMAP(167):FB,RA_PFX_ENET_PAR_READ(166);FB,RA_PFX_ENET_PAR_WRITE(168); -VFD_ERRORMAP(169): -RA_PFX_ENET_STS_CMD(164):FB,MSG_CIPGENERIC();FB,R_TRIG();FB,COP(); -CONTROL(161):FB,LINEARSCALE(159); -LINEARSCALE(159): -RA_PFX_ENET_PAR_READ(166):FB,MSG_CIPGENERIC();FB,R_TRIG(); -READDOWNHOLEDATA(160): diff --git a/Controller/Controller/PrjLibrary.mdb b/Controller/Controller/PrjLibrary.mdb index b3c18c6..19f9960 100644 Binary files a/Controller/Controller/PrjLibrary.mdb and b/Controller/Controller/PrjLibrary.mdb differ diff --git a/Controller/Controller/RmcVariables b/Controller/Controller/RmcVariables index 3f027e1..f90aad9 100644 --- a/Controller/Controller/RmcVariables +++ b/Controller/Controller/RmcVariables @@ -2,3 +2,4 @@ Controller.Micro820.Micro820.RP_CurrentLeakage Controller.Micro820.Micro820.SP_CurrentLeakage Controller.Micro820.Micro820.ALARM_CurrentLeakage Controller.Micro820.Micro820.WARNING_CurrentLeakage +Controller.Micro820.Micro820.cfg_SpecificGravity diff --git a/Controller/Controller/persist.ccwx b/Controller/Controller/persist.ccwx index 90ad9da..40005d3 100644 Binary files a/Controller/Controller/persist.ccwx and b/Controller/Controller/persist.ccwx differ diff --git a/IntelligentPumpPanel_VFD.v12.ccwsuo b/IntelligentPumpPanel_VFD.v12.ccwsuo index 7165ba2..24c5063 100644 Binary files a/IntelligentPumpPanel_VFD.v12.ccwsuo and b/IntelligentPumpPanel_VFD.v12.ccwsuo differ diff --git a/PVc Project/PV_IPP_VFD.cha b/PVc Project/PV_IPP_VFD.cha index d2e7053..f0eccf7 100644 Binary files a/PVc Project/PV_IPP_VFD.cha and b/PVc Project/PV_IPP_VFD.cha differ