nmelone/E300-IPP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added scaled flow to Analog Input 1

Browse Source
This commit is contained in:
Patrick McDonagh
2016-07-31 18:04:31 -05:00
parent 38869bc514
commit cd26d7af5e
31 changed files with 23 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Controller/Controller/Compile.ic
View File

@@ -1 +1 @@
COMPILED
TO RELINK

13
Controller/Controller/LogicalValues.csv
View File

@@ -224,6 +224,14 @@ Controller.Micro820.Micro820.Control.Epoch_Time_1.RTC_READ_1.RTCEnabled
Controller.Micro820.Micro820.Control.Epoch_Time_1.RTC_READ_1.RTCPresent
Controller.Micro820.Micro820.Control.Epoch_Time_1.RTC_READ_ENABLED
Controller.Micro820.Micro820.Control.Epoch_Time_1.year_seconds
Controller.Micro820.Micro820.Control.LinearScale_Flow.b
Controller.Micro820.Micro820.Control.LinearScale_Flow.EU_Max
Controller.Micro820.Micro820.Control.LinearScale_Flow.EU_Min
Controller.Micro820.Micro820.Control.LinearScale_Flow.EU_Out
Controller.Micro820.Micro820.Control.LinearScale_Flow.m
Controller.Micro820.Micro820.Control.LinearScale_Flow.Raw_Inp
Controller.Micro820.Micro820.Control.LinearScale_Flow.Raw_Max
Controller.Micro820.Micro820.Control.LinearScale_Flow.Raw_Min
Controller.Micro820.Micro820.Control.LinearScale_Pressure.b 300.0
Controller.Micro820.Micro820.Control.LinearScale_Pressure.EU_Max 300.0
Controller.Micro820.Micro820.Control.LinearScale_Pressure.EU_Min 300.0
@@ -5356,6 +5364,11 @@ Controller.Micro820.Micro820.E300Data.WriteE300ConfigData.REAL_COP.Sts 0
Controller.Micro820.Micro820.E300Data.WriteE300ConfigData.REAL_COP.Swap FALSE
Controller.Micro820.Micro820.E300Data.WriteE300ConfigData.UpdateRate_ms 1000
Controller.Micro820.Micro820.Enable_IO_Read TRUE
Controller.Micro820.Micro820.Flow_EU_Max
Controller.Micro820.Micro820.Flow_EU_Min
Controller.Micro820.Micro820.Flow_Today
Controller.Micro820.Micro820.Flow_Yesterday
Controller.Micro820.Micro820.Flowrate
Controller.Micro820.Micro820.Hand_Mode FALSE
Controller.Micro820.Micro820.Modbus_Read0[1] 0
Controller.Micro820.Micro820.Modbus_Read0[10] 0
1 Controller.Micro820.Micro820.__SYSVA_ABORT_CYCLE FALSE
224 Controller.Micro820.Micro820.Control.Epoch_Time_1.RTC_READ_1.RTCPresent
225 Controller.Micro820.Micro820.Control.Epoch_Time_1.RTC_READ_ENABLED
226 Controller.Micro820.Micro820.Control.Epoch_Time_1.year_seconds
227 Controller.Micro820.Micro820.Control.LinearScale_Flow.b
228 Controller.Micro820.Micro820.Control.LinearScale_Flow.EU_Max
229 Controller.Micro820.Micro820.Control.LinearScale_Flow.EU_Min
230 Controller.Micro820.Micro820.Control.LinearScale_Flow.EU_Out
231 Controller.Micro820.Micro820.Control.LinearScale_Flow.m
232 Controller.Micro820.Micro820.Control.LinearScale_Flow.Raw_Inp
233 Controller.Micro820.Micro820.Control.LinearScale_Flow.Raw_Max
234 Controller.Micro820.Micro820.Control.LinearScale_Flow.Raw_Min
235 Controller.Micro820.Micro820.Control.LinearScale_Pressure.b 300.0
236 Controller.Micro820.Micro820.Control.LinearScale_Pressure.EU_Max 300.0
237 Controller.Micro820.Micro820.Control.LinearScale_Pressure.EU_Min 300.0
5364 Controller.Micro820.Micro820.E300Data.WriteE300ConfigData.REAL_COP.Swap FALSE
5365 Controller.Micro820.Micro820.E300Data.WriteE300ConfigData.UpdateRate_ms 1000
5366 Controller.Micro820.Micro820.Enable_IO_Read TRUE
5367 Controller.Micro820.Micro820.Flow_EU_Max
5368 Controller.Micro820.Micro820.Flow_EU_Min
5369 Controller.Micro820.Micro820.Flow_Today
5370 Controller.Micro820.Micro820.Flow_Yesterday
5371 Controller.Micro820.Micro820.Flowrate
5372 Controller.Micro820.Micro820.Hand_Mode FALSE
5373 Controller.Micro820.Micro820.Modbus_Read0[1] 0
5374 Controller.Micro820.Micro820.Modbus_Read0[10] 0

1
Controller/Controller/Micro820/Micro820/Compile.ics
View File

@@ -1 +0,0 @@
TO RELINK

1
Controller/Controller/Micro820/Micro820/Compile.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_CONTROL.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_DINT_TO_USINT.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_E300DATA.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_EPOCH_TIME.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_RA_CIP_ELECTRICAL_ENERGY_OBJ.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_RA_E300_OUTPUT_CONTROL.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_READDOWNHOLEDATA.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_READE300CONFIG.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_READE300IO.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_READE300PARAM.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_READE300TRIPRESET.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_SINT_TO_USINT.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_UDINT_TO_USINT.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_UINT_TO_USINT.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_USINT_TO_DINT.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_USINT_TO_SINT.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UDINT.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UINT.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_WRITEE300CONFIG.ict
View File

@@ -1 +0,0 @@
COMPILED

1
Controller/Controller/Micro820/Micro820/Compile_WRITEE300TRIPRESET.ict
View File

@@ -1 +0,0 @@
COMPILED

2
Controller/Controller/Micro820/Micro820/Control.stf
View File

@@ -12,7 +12,9 @@ IF NOT Test_Mode THEN
Auto_Mode := DigitalInput_Status_2;
Hand_Mode := DigitalInput_Status_3;
LinearScale_Pressure(13107.0, 65535.0, Pressure_EU_Min, Pressure_EU_Max, ANY_TO_REAL(_IO_P1_AI_00));
LinearScale_Flow(13107.0, 65535.0, Flow_EU_Min, Flow_EU_Max, ANY_TO_REAL(_IO_P1_AI_01));
Pressure_In := LinearScale_Pressure.EU_Out;
Flowrate : LinearScale_Flow.EU_Out;
ELSE
Contactor_Status := cmd_Run;
VoltageOK := TRUE;

21
Controller/Controller/Micro820/Micro820/MICRO820.icp
View File

@@ -1,21 +0,0 @@
USINT_TO_UDINT(149):
DINT_TO_USINT(154):
UINT_TO_USINT(155):
READE300TRIPRESET(147):FB,MSG_CIPGENERIC();FB,R_TRIG();FB,COP();FB,F_TRIG();
RA_E300_OUTPUT_CONTROL(144):FB,MSG_CIPGENERIC();FB,R_TRIG();FB,F_TRIG();FB,COP();
E300DATA(162):FB,RA_CIP_ELECTRICAL_ENERGY_OBJ(143);FB,RA_E300_OUTPUT_CONTROL(144);FB,READE300IO(145);FB,READE300PARAM(148);FB,USINT_TO_UINT(151);FB,WRITEE300TRIPRESET(158);FB,READE300CONFIG(146);FB,USINT_TO_UDINT(149);FB,USINT_TO_DINT(150);FB,USINT_TO_SINT(152);FB,UDINT_TO_USINT(153);FB,UINT_TO_USINT(155);FB,DINT_TO_USINT(154);FB,SINT_TO_USINT(156);FB,WRITEE300CONFIG(157);
READE300PARAM(148):FB,MSG_CIPGENERIC();FB,R_TRIG();FB,COP();FB,F_TRIG();
USINT_TO_UINT(151):
CONTROL(161):FB,EPOCH_TIME(163);FB,LINEARSCALE(159);
EPOCH_TIME(163):FB,RTC_READ();
USINT_TO_SINT(152):
READE300IO(145):FB,MSG_CIPGENERIC();FB,R_TRIG();FB,COP();FB,F_TRIG();
LINEARSCALE(159):
WRITEE300TRIPRESET(158):FB,MSG_CIPGENERIC();FB,R_TRIG();FB,COP();FB,F_TRIG();
SINT_TO_USINT(156):
READE300CONFIG(146):FB,MSG_CIPGENERIC();FB,R_TRIG();FB,COP();FB,F_TRIG();
RA_CIP_ELECTRICAL_ENERGY_OBJ(143):FB,MSG_CIPGENERIC();FB,R_TRIG();FB,COP();FB,F_TRIG();
UDINT_TO_USINT(153):
USINT_TO_DINT(150):
WRITEE300CONFIG(157):FB,MSG_CIPGENERIC();FB,R_TRIG();FB,COP();FB,F_TRIG();
READDOWNHOLEDATA(160):

BIN
Controller/Controller/PrjLibrary.mdb
View File

Binary file not shown.

2
Controller/Controller/RMD.info
View File

@@ -1,2 +1,2 @@
[RMDManager]
TASK=BUILD
TASK=REBUILD

BIN
Controller/Controller/persist.ccwx
View File

Binary file not shown.

6
controller/Controller/RmcVariables Normal file
View File

@@ -0,0 +1,6 @@
Controller.Micro820.Micro820.Control.LinearScale_Flow
Controller.Micro820.Micro820.Flow_EU_Min
Controller.Micro820.Micro820.Flow_EU_Max
Controller.Micro820.Micro820.Flowrate
Controller.Micro820.Micro820.Flow_Today
Controller.Micro820.Micro820.Flow_Yesterday