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 8ce4cf4..8567521 100644 --- a/Controller/Controller/LogicalValues.csv +++ b/Controller/Controller/LogicalValues.csv @@ -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 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_DINT_TO_USINT.ict b/Controller/Controller/Micro820/Micro820/Compile_DINT_TO_USINT.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_DINT_TO_USINT.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_E300DATA.ict b/Controller/Controller/Micro820/Micro820/Compile_E300DATA.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_E300DATA.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_EPOCH_TIME.ict b/Controller/Controller/Micro820/Micro820/Compile_EPOCH_TIME.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_EPOCH_TIME.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_CIP_ELECTRICAL_ENERGY_OBJ.ict b/Controller/Controller/Micro820/Micro820/Compile_RA_CIP_ELECTRICAL_ENERGY_OBJ.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_RA_CIP_ELECTRICAL_ENERGY_OBJ.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_RA_E300_OUTPUT_CONTROL.ict b/Controller/Controller/Micro820/Micro820/Compile_RA_E300_OUTPUT_CONTROL.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_RA_E300_OUTPUT_CONTROL.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_READE300CONFIG.ict b/Controller/Controller/Micro820/Micro820/Compile_READE300CONFIG.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_READE300CONFIG.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_READE300IO.ict b/Controller/Controller/Micro820/Micro820/Compile_READE300IO.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_READE300IO.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_READE300PARAM.ict b/Controller/Controller/Micro820/Micro820/Compile_READE300PARAM.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_READE300PARAM.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_READE300TRIPRESET.ict b/Controller/Controller/Micro820/Micro820/Compile_READE300TRIPRESET.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_READE300TRIPRESET.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_SINT_TO_USINT.ict b/Controller/Controller/Micro820/Micro820/Compile_SINT_TO_USINT.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_SINT_TO_USINT.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_UDINT_TO_USINT.ict b/Controller/Controller/Micro820/Micro820/Compile_UDINT_TO_USINT.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_UDINT_TO_USINT.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_UINT_TO_USINT.ict b/Controller/Controller/Micro820/Micro820/Compile_UINT_TO_USINT.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_UINT_TO_USINT.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_DINT.ict b/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_DINT.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_DINT.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_SINT.ict b/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_SINT.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_SINT.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UDINT.ict b/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UDINT.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UDINT.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UINT.ict b/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UINT.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UINT.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_WRITEE300CONFIG.ict b/Controller/Controller/Micro820/Micro820/Compile_WRITEE300CONFIG.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_WRITEE300CONFIG.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_WRITEE300TRIPRESET.ict b/Controller/Controller/Micro820/Micro820/Compile_WRITEE300TRIPRESET.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_WRITEE300TRIPRESET.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Control.stf b/Controller/Controller/Micro820/Micro820/Control.stf index 14d4517..d986b83 100644 --- a/Controller/Controller/Micro820/Micro820/Control.stf +++ b/Controller/Controller/Micro820/Micro820/Control.stf @@ -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; diff --git a/Controller/Controller/Micro820/Micro820/MICRO820.icp b/Controller/Controller/Micro820/Micro820/MICRO820.icp deleted file mode 100644 index f0f84ce..0000000 --- a/Controller/Controller/Micro820/Micro820/MICRO820.icp +++ /dev/null @@ -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): diff --git a/Controller/Controller/PrjLibrary.mdb b/Controller/Controller/PrjLibrary.mdb index 6d06bd2..f1ae94c 100644 Binary files a/Controller/Controller/PrjLibrary.mdb and b/Controller/Controller/PrjLibrary.mdb differ diff --git a/Controller/Controller/RMD.info b/Controller/Controller/RMD.info index 3a98e98..6572d3c 100644 --- a/Controller/Controller/RMD.info +++ b/Controller/Controller/RMD.info @@ -1,2 +1,2 @@ [RMDManager] -TASK=BUILD +TASK=REBUILD diff --git a/Controller/Controller/persist.ccwx b/Controller/Controller/persist.ccwx index abd0b73..ab4b9a4 100644 Binary files a/Controller/Controller/persist.ccwx and b/Controller/Controller/persist.ccwx differ diff --git a/controller/Controller/RmcVariables b/controller/Controller/RmcVariables new file mode 100644 index 0000000..d1b1802 --- /dev/null +++ b/controller/Controller/RmcVariables @@ -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