From cd26d7af5eebc1de0846a85bbedc75b5d2e3e20e Mon Sep 17 00:00:00 2001
From: Patrick McDonagh <pmcdonagh@henry-pump.com>
Date: Sun, 31 Jul 2016 18:04:31 -0500
Subject: [PATCH] Added scaled flow to Analog Input 1

---
 Controller/Controller/Compile.ic              |   2 +-
 Controller/Controller/LogicalValues.csv       |  13 +++++++++++
 .../Controller/Micro820/Micro820/Compile.ics  |   1 -
 .../Controller/Micro820/Micro820/Compile.ict  |   1 -
 .../Micro820/Micro820/Compile_CONTROL.ict     |   1 -
 .../Micro820/Compile_DINT_TO_USINT.ict        |   1 -
 .../Micro820/Micro820/Compile_E300DATA.ict    |   1 -
 .../Micro820/Micro820/Compile_EPOCH_TIME.ict  |   1 -
 .../Micro820/Micro820/Compile_LINEARSCALE.ict |   1 -
 .../Compile_RA_CIP_ELECTRICAL_ENERGY_OBJ.ict  |   1 -
 .../Compile_RA_E300_OUTPUT_CONTROL.ict        |   1 -
 .../Micro820/Compile_READDOWNHOLEDATA.ict     |   1 -
 .../Micro820/Compile_READE300CONFIG.ict       |   1 -
 .../Micro820/Micro820/Compile_READE300IO.ict  |   1 -
 .../Micro820/Compile_READE300PARAM.ict        |   1 -
 .../Micro820/Compile_READE300TRIPRESET.ict    |   1 -
 .../Micro820/Compile_SINT_TO_USINT.ict        |   1 -
 .../Micro820/Compile_UDINT_TO_USINT.ict       |   1 -
 .../Micro820/Compile_UINT_TO_USINT.ict        |   1 -
 .../Micro820/Compile_USINT_TO_DINT.ict        |   1 -
 .../Micro820/Compile_USINT_TO_SINT.ict        |   1 -
 .../Micro820/Compile_USINT_TO_UDINT.ict       |   1 -
 .../Micro820/Compile_USINT_TO_UINT.ict        |   1 -
 .../Micro820/Compile_WRITEE300CONFIG.ict      |   1 -
 .../Micro820/Compile_WRITEE300TRIPRESET.ict   |   1 -
 .../Controller/Micro820/Micro820/Control.stf  |   2 ++
 .../Controller/Micro820/Micro820/MICRO820.icp |  21 ------------------
 Controller/Controller/PrjLibrary.mdb          | Bin 3168256 -> 3168256 bytes
 Controller/Controller/RMD.info                |   2 +-
 Controller/Controller/persist.ccwx            | Bin 94372 -> 91290 bytes
 controller/Controller/RmcVariables            |   6 +++++
 31 files changed, 23 insertions(+), 46 deletions(-)
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile.ics
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_CONTROL.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_DINT_TO_USINT.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_E300DATA.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_EPOCH_TIME.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_RA_CIP_ELECTRICAL_ENERGY_OBJ.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_RA_E300_OUTPUT_CONTROL.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_READDOWNHOLEDATA.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_READE300CONFIG.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_READE300IO.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_READE300PARAM.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_READE300TRIPRESET.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_SINT_TO_USINT.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_UDINT_TO_USINT.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_UINT_TO_USINT.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_USINT_TO_DINT.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_USINT_TO_SINT.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UDINT.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UINT.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_WRITEE300CONFIG.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/Compile_WRITEE300TRIPRESET.ict
 delete mode 100644 Controller/Controller/Micro820/Micro820/MICRO820.icp
 create mode 100644 controller/Controller/RmcVariables

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 6d06bd2ef741ca4e816552a7246b5c3993a5f2b1..f1ae94ccafa5fd6cb869af050edab90ded016781 100644
GIT binary patch
delta 2406
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
VlDurgq_>C=ahDI%rL)|d{{}30j+Oub

delta 1349
zcma))e@I<r7{}lDJ?}a996er-PVc!(z0<ts)%3b<f0V@-U5LaeXe?N+)l`yjR+EHn
zw?^CDY~DpfJUV+940T3&$Cf)=?7lf#b1+(D>vviWf(UVw2p0rrk=k=EHwhx>a6a#k
z^E~hKeV*q%3Fk6S01i>eBji0pS;Pb7ihfT0(}$P4m-3TK`4}L81W-T*6u<|lfCl6M
zxquGj0e-+cYXAj6A+QE05=;5TlaEUmcJ(ADn~TL{bKr@ftP+IEctJc6lJ7wXN&J9`
z*YJ^#a4By|hA4l{#0F1{5p^Iwri(Y?fgwM4e)dy7lPs#Sov_%O3?%#T0+)j3tbHOR
z+@Kj!3il@<7^0`?-wRn(uQR`C^kGi~$GOyQ)=LOsex~17Vml+;Z8vWhcXqY4#&@^1
z>}iQ?f#aVlFkIoK9p=G6S7gi62$313CBCOC0*=ptZ74a^VFE#5EpP`=0+a$}KnPd|
zlmivOoj|1+>Ik<D`YXuiQ2P``=m&rs!SFkLI?C#7Cot$*hr|H3=CJ6MtWnGxWb1lh
zY<yxQ^?l=<cKmXnY2)7AOoak5*S=;EQK48rwfeVVFQgZ4Ivess{%&Js4HRdY!rEcw
zQql0Dbp-P-w!xvVc3RN~@I04N)-3-_EelDB{VQVaNh_p;R-QpLg<!w39no>!TQtKW
z*ITq8UVp}#)_>2)od+q%-`}U6;@48F)^>`7>sa|z=;tkp<&`v|$Ayu$e%qnPkeA>n
zocNA%e>r=l9U}u#0KvtSLmU9C@Frjb5bq0^W3UAmc){jPV99(`S0}^UQ>1!R%sZ=Q
zf>3Y7VzHc^mc&jix`A-Lirv&!@0f2KXZ7i7M%3J7rlMhxILY(e@Gs(alvPl^yc}*4
zhwo)REMC5ky^eF`j30vMWAIZy@d~dH?)_{R5nUTtuOxeYT24R62-dr)SM*f~>b2>x
zx|R2~YaO;zCEOT0M8vDLW;abYf<E5IrA=&(HyF$i?j|;h#nsL12DL}`rJES3R$t2K
z-lRNdM4sZ?Zz$`9n_yfP#-mlwWAR6lsjA+bar!c==c*S6-_q*1+s6)wew$Uwm2V?O
z%O6Jc8v4&cTzZo|q-FIM{-wuDW+BbT=Gc)uil16-#*EjDOMLj48WC=a{Yb?1Q*54y
zixcc&toLMo_;0g$^{K~re`9zv{44ArJv-V%((gm|<O&rzQ_P)LLyFh73!oj-f8}nf
zYC+&zIHaVVD&l6XAN<35_QW}wJUUSg+y&GCwLk=@1J;Y96L-I`RT#JMqVoSo+exHj
aQDSJ%`n+^7>J$Y|q2#ljR^It!)cy<bV8Uns

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 abd0b73afd61c8c10dc084e4f05c0652e895bd2f..ab4b9a4958c592cedd6129a5966aee6569de5c55 100644
GIT binary patch
delta 1405
zcma)5YiLtv82;XzG=^i6swHXK9NSv8f{8XY=Nz*YtF-}J>V0j!&b1~vHE9zw{A0n@
z!oUkUp`0J@s_3SOqLz&sW;!OcUVf+u-eKZEgTFQ?Ug(B@r2D=v>AKTj2Hu?SJm-1e
z_jxbh`E0?-y9M@*&4O7Z?DzYLiGF+SqJX?x4u>O(7F5HsrbRk-tEw7RmdUDC;|~V?
zOH=z2k#I`yZ;^(Mb%2$+HC{De=}(WtdZ_zE@5+j%$coC%!5YQy?}#eF<<W>74yt;e
zQ08C(f3g2@JxgU}#q^+1IJ2y}r6(2LS7#90_-yFSS8jn2H=eBq7or9W^j$@A+CEDZ
z1R5n>TGT4oS-8*Ee*D{EBE*610u<{jEDO`aF4@FMZ`@-!_DgA9?oeGZ4E)ny^W1JO
z=l0NMr_(}+(}EoWII%GXRq5u>Yb~61bk#@^KQy;UxtQ^`qq$K3Y#T7~2oJ^%j9#P#
zT@>}9PM7W#=j%VU$!YP+0g=02=zKVvA9{Kg9pN5X?ft0`5E25G(}ml*VPWP^fH>Ed
zX%pZjPnHQ<AU=b;3_NP@^;rq=S#{X%#Dj@kLo#z6P-bP(Gj%Q)<jOK*CE&~XOA-|1
zP7BJQ)xmiOeBc&%%!!H@RfS$c3cZ<YD$Mbs8inPIgQ+Mq)qdi<H#UQ53Hfi&_`=|L
z6l!>mscB<Cg8+{n)4*f8>A*u8)N|k-1%x$oh`zW;MyV5Q9QAgB$NYnn5PgY7!Gn|V
z2?`66o9Gj6wQyQ;d`CZm4efg%RKd36xXrS9E$uWjg<plqzn$gy^&V)bWUQzDv+2QN
zLYNs@#q((T8#5G~8Oy6GjnNFtP>n%|tNez(o35?IlQC%Ez$*%v_kThC-dYvkG=Ys<
zi?_Tkr;E)jFsX$<u@&3nP+!gjojY&-xtcCDGb3w0j>cg%S3R|N(@7&cXm*bnz~L^i
zac*zPX+fJ!2s2~ACmQAU{-1m3*A2&iJ4^^OV>d4Br`)Wlpr<?Ejm6!x`iBJ9bmy!8
zjsf4A@bV<^mICHz0T6wbEig6QO$o|-Y{O&%>iMLgYJ6lBZ3;7E)-ESLNI(N`jHT~P
z>nNQiGb5`MYmyM+#eV<%)|~-LU}hvWd8m#b?F!yc<_ma{q&hau#Sh7R0d;#RaLJ21
i_Cf;}Hg!t~u^A?Idnxv%z~zvLM7rn&DA`UEl79g*O0Sy$

delta 1698
zcma)6ZA@Eb6n;+&w9wn~wNeP>b8eHARZ8!@tQz@{#=zJ|9drn7DQ)RBBm2PM4`$pH
z6Ga?9M&8Iv(QGUsSxlOxOVzp%V^Du+{0uP~&E{ayA2_FEaYkpB`QEps-DM`)=Cr5J
zeV+54^PY1$_eu7`YPR0hrOwJj@~ca_F|B`OhfT0cjglmWBwLV|g5h9OBQH31@lB2p
zZxfputs|pHhC(B_z-zvEDgat4>$vS1fcWpQ51Rj{y0*G==+W8(At4}zZT!$KyF=g|
zp#XkCU1^X5?w-$GKd(dRye=M9=j*Va+e+&EuoVP6t!YWRB6ZDp(NL(Siujj?7uC$^
zDRL*BsPS19L+VOzB#|=n-lTJ=>Rn*xeBE#^9yK8pHIXF?l#nw%*cKnISvE0Yi(@>8
z(Xj4E(p`*DcQFZ+gAvbZx5sl^j~DCZTw7MQbj1Ln7_pT>3BF68ecJsEum}t8$>fO*
zeUW4`pLq&(?9qz!RUr%h@}>P#ixUVfP9%e`=WUPwHMTk-v);Y}F%~ItS_M~Cj34>o
zr`M2%HcW&4MMhl3J%DG6_{7iIa5G2NB(8EWqh;Qh5u)t;#EvqkSFv<wzx(jx2u(L4
zr)$D7{kFs#<?w#;lz|Fx8<_MR3zVvv;EQihK3<_lr~+SbJ7@z6ygW7^oTpw}nG-|r
zxVF2)-Q(QfyDvV~dk&aJ_s2qZMkA&*;=gNHUEg23?LJ{e=!7+K*$PD#;%bC3;(QF2
zKp;y_xRvxp@^l}(CFe*U?1#?k|C%^5-4Dg-DJ9W<u(9JZBSx<GgPjGe@j$uim3-3d
zfwpS7x3&+a&~+7JW@lTn@u4p!XE#`mJ$G&yC`&eBgTTJSB{N=VuaQG}&pzBcPOnim
zCFxoz!j4jr%z1%hX}sx$a`mzq;X1QO?rfl(56ZJ@s}aIpjX(x{De^HHzEVTsC5>Ql
zb%AOpN-uQBM;8wmjX4O(rabje@~aP=wQ_2i@!m{&u9e0;r4`8J0C0?(o_0Dy%7D#1
zl)Fy3zfdl#<L?1_oxX#l)DLY8@cL<CYkdf}_VHw7FhzS$MqlzGeA#mkS~*D3$Wt_=
zbPxJGMY9ecrzfrE3H6(+U6pRW?xcyyrc7=I$lbwICxTV0lcTg%vME`eY9R9}5J@DE
zDmSxi2q_1^k^=}AaCYJers~KI(u`;IKz`$Z&%nbJR@q9(L=f89EqqP^SRrdcaI)VG
zAzD+unTDI!-(S<Elgm%8=@F7mnXRdk#6r-{+EQ{f;)>FGWK*(^)ziSk27&Az0**~$
zdZFngDr<W6As}Ubuv>-AH=ADQ`!rkZNzD`DW=&?H5#khUaYh8RH*oZj6drxXI(Fo+
Vt1Fw%Cqk9<y_5d!2g0<0=pWdj(~STC

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