Merge pull request #2 in IPP/vfd_ipp from feature/IPP-8-add-ability-to-change-specific-gravity to master

* commit '0fdf20d6c36d8e0c9f4e474191f96d6855ecea69': Added configuration for Specific Gravity
2016-03-12 00:35:53 +00:00
parent 928b95f56c 0fdf20d6c3
commit f7077fce02
20 changed files with 4 additions and 22 deletions
--- a/Controller/Controller/Compile.ic
+++ b/Controller/Controller/Compile.ic
@@ -1 +1 @@
-COMPILED
+TO RELINK
--- 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
--- a/Controller/Controller/Micro820/Micro820/Compile.ics
+++ b/Controller/Controller/Micro820/Micro820/Compile.ics
@@ -1 +0,0 @@
-TO RELINK
--- a/Controller/Controller/Micro820/Micro820/Compile.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_CONTROL.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_CONTROL.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_READ.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_READ.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_WRITE.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_WRITE.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_STS_CMD.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_STS_CMD.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_READDOWNHOLEDATA.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_READDOWNHOLEDATA.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_VFD_CONFIGMAP.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_VFD_CONFIGMAP.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_VFD_ERRORMAP.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_VFD_ERRORMAP.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_VFD_MESSAGING.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_VFD_MESSAGING.ict
@@ -1 +0,0 @@
-COMPILED
--- 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';
--- a/Controller/Controller/Micro820/Micro820/MICRO820.icp
+++ b/Controller/Controller/Micro820/Micro820/MICRO820.icp
@@ -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):
--- a/Controller/Controller/PrjLibrary.mdb
+++ b/Controller/Controller/PrjLibrary.mdb
--- 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
--- a/Controller/Controller/persist.ccwx
+++ b/Controller/Controller/persist.ccwx
--- a/IntelligentPumpPanel_VFD.v12.ccwsuo
+++ b/IntelligentPumpPanel_VFD.v12.ccwsuo
--- a/Project/PV_IPP_VFD.cha
+++ b/Project/PV_IPP_VFD.cha