add auto water sys

dist/newWaterSys/node/auto.js

@@ -0,0 +1,89 @@
+
+var fs = require('fs');
+var rate = Number(fs.readFileSync('config/rate.txt').toString());
+var fAdd = Number(fs.readFileSync('ctl.txt').toString());
+var AddTime = Number(fs.readFileSync('config/AddTime.txt').toString());
+
+
+setInterval(() => {
+
+    var timestamp = new Date();
+
+    var data = JSON.parse(fs.readFileSync('data.json').toString());
+    var fdata = JSON.parse(fs.readFileSync('data/fdata.json').toString());
+
+    var w1InsFlow = (data.w1Flow - fdata.w1Flow > 0) ? data.w1Flow - fdata.w1Flow : 0;
+    var w2InsFlow = (data.w2Flow - fdata.w2Flow > 0) ? data.w2Flow - fdata.w2Flow : 0;
+    fs.writeFileSync('data/w1InsFlow.txt', w1InsFlow * rate, () => {});
+    fs.writeFileSync('data/w2InsFlow.txt', w2InsFlow, () => {});
+    console.log('w1: ' + w1InsFlow * rate + '  w2: ' + w2InsFlow);
+    //console.log(fdata);
+
+    var isAuto = Number(fs.readFileSync('config/auto.txt').toString());
+    var isAdd = Number(fs.readFileSync('ctl.txt').toString());
+    var isReset = Number(fs.readFileSync('config/reset.txt').toString());
+
+    if (isReset) {
+
+        fdata = data;
+        fs.writeFileSync('data/fdata.json', JSON.stringify(data), () => {});
+
+        isReset = 0;
+        fs.writeFileSync('config/reset.txt', '0', () => {});
+    }
+    if (isAdd != fAdd) {
+
+        isAuto = 0;
+        fs.writeFileSync('config/auto.txt', '0', () => {});
+    }
+
+    if (isAuto) {
+
+        if (timestamp.getHours() == AddTime || timestamp.getHours() == AddTime + 1) {
+
+            if (w2InsFlow * 2 < w1InsFlow * rate) {
+
+                fs.writeFileSync('config/_ctl.txt', '1', () => {});
+                isAdd = 1;
+                fAdd = 1;
+
+                fs.writeFileSync('ctl.txt', '1', () => {});
+
+            } else {
+
+                fs.writeFileSync('config/_ctl.txt', '0', () => {});
+                isAdd = 0;
+                fAdd = 0;
+
+                fs.writeFileSync('ctl.txt', '0', () => {});
+
+            }
+
+        } else {
+
+            fs.writeFileSync('config/_ctl.txt', '0', () => {});
+            isAdd = 0;
+            fAdd = 0;
+
+            fs.writeFileSync('ctl.txt', '0', () => {});
+
+
+        }
+    } else {
+
+        if (isAdd) {
+
+            fs.writeFileSync('config/_ctl.txt', '1', () => {});
+        } else {
+            fs.writeFileSync('config/_ctl.txt', '0', () => {});
+        }
+    }
+    if (timestamp.getHours() == AddTime + 2 && timestamp.getMinutes() == 1) {
+
+        fdata = data;
+        fs.writeFileSync('data/fdata.json', JSON.stringify(fdata), () => {});
+
+    }
+    fAdd = isAdd;
+
+}, 3000);

dist/newWaterSys/node/config/_ctl.txt

@@ -0,0 +1 @@
+0

dist/newWaterSys/node/config/auto.txt

@@ -0,0 +1 @@
+0

dist/newWaterSys/node/config/rate.txt

@@ -0,0 +1 @@
+1.17

dist/newWaterSys/node/config/reset.txt

@@ -0,0 +1 @@
+0

dist/newWaterSys/node/data.json

@@ -1 +1 @@
-{"w1Flow":2.43,"w2Flow":10.49,"ctl":0,"w1Status":"1","w2Status":"1","timestamp":1560164997000}
+{"w1Flow":7.14,"w2Flow":19.48,"ctl":0,"w1Status":1,"w2Status":1,"timestamp":1560180550000}

dist/newWaterSys/node/data/fdata.json

@@ -0,0 +1 @@
+{"w1Flow":2.43,"w2Flow":14.02,"ctl":0,"w1Status":1,"w2Status":1,"timestamp":1560178779000}

dist/newWaterSys/node/data/w1Data.json

@@ -1 +1 @@
-{"flow":2.43,"ctl":0}
+{"flow":7.14,"ctl":0}

dist/newWaterSys/node/data/w1InsFlow.txt

@@ -0,0 +1 @@
+5.510699999999998

dist/newWaterSys/node/data/w2Data.json

@@ -1 +1 @@
-{"flow":10.49}
+{"flow":19.48}

dist/newWaterSys/node/data/w2InsFlow.txt

@@ -0,0 +1 @@
+5.460000000000001

dist/newWaterSys/node/sync.js

@@ -24,8 +24,8 @@ setInterval(()=>{
     data.w1Flow = w1.flow;
     data.w2Flow = w2.flow;
     data.ctl = w1.ctl;
-    data.w1Status = fs.readFileSync('data/w1Status.txt').toString();
-    data.w2Status = fs.readFileSync('data/w2Status.txt').toString();
+    data.w1Status = Number(fs.readFileSync('data/w1Status.txt').toString());
+    data.w2Status = Number(fs.readFileSync('data/w2Status.txt').toString());
     data.timestamp = Date.parse(new Date());
 
     
@@ -43,7 +43,7 @@ setInterval(()=>{
     });
  
     
-}, 5000);
+}, 1000);
 
 
 //connection.end();

dist/newWaterSys/node/w1.js

@@ -10,7 +10,7 @@ var w1 = client({
     name: "w1",
     ctl: 0,
     send: ()=>{
-        w1.ctl = fs.readFileSync('ctl.txt').toString();
+        w1.ctl = fs.readFileSync('config/_ctl.txt').toString();
         return '_wiot_' + w1.ctl;
     },
     res: (data)=>{