fix auto add water

dist/newWaterSys/node/auto.js

@@ -14,8 +14,8 @@ setInterval(() => {
 
     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, () => {});
+    fs.writeFileSync('data/w1InsFlow.txt', String(w1InsFlow * rate));
+    fs.writeFileSync('data/w2InsFlow.txt', String(w2InsFlow));
     console.log('w1: ' + w1InsFlow * rate + '  w2: ' + w2InsFlow);
     //console.log(fdata);
 
@@ -26,46 +26,46 @@ setInterval(() => {
     if (isReset) {
 
         fdata = data;
-        fs.writeFileSync('data/fdata.json', JSON.stringify(data), () => {});
+        fs.writeFileSync('data/fdata.json', JSON.stringify(data));
 
         isReset = 0;
-        fs.writeFileSync('config/reset.txt', '0', () => {});
+        fs.writeFileSync('config/reset.txt', '0');
     }
     if (isAdd != fAdd) {
 
         isAuto = 0;
-        fs.writeFileSync('config/auto.txt', '0', () => {});
+        fs.writeFileSync('config/auto.txt', '0');
     }
 
     if (isAuto) {
 
         if (timestamp.getHours() == AddTime || timestamp.getHours() == AddTime + 1) {
 
-            if (w2InsFlow * 2 < w1InsFlow * rate) {
+            if (w2InsFlow / 2 > w1InsFlow * rate) {
 
-                fs.writeFileSync('config/_ctl.txt', '1', () => {});
+                fs.writeFileSync('config/_ctl.txt', '1');
                 isAdd = 1;
                 fAdd = 1;
 
-                fs.writeFileSync('ctl.txt', '1', () => {});
+                fs.writeFileSync('ctl.txt', '1');
 
             } else {
 
-                fs.writeFileSync('config/_ctl.txt', '0', () => {});
+                fs.writeFileSync('config/_ctl.txt', '0');
                 isAdd = 0;
                 fAdd = 0;
 
-                fs.writeFileSync('ctl.txt', '0', () => {});
+                fs.writeFileSync('ctl.txt', '0');
 
             }
 
         } else {
 
-            fs.writeFileSync('config/_ctl.txt', '0', () => {});
+            fs.writeFileSync('config/_ctl.txt', '0');
             isAdd = 0;
             fAdd = 0;
 
-            fs.writeFileSync('ctl.txt', '0', () => {});
+            fs.writeFileSync('ctl.txt', '0');
 
 
         }
@@ -73,15 +73,15 @@ setInterval(() => {
 
         if (isAdd) {
 
-            fs.writeFileSync('config/_ctl.txt', '1', () => {});
+            fs.writeFileSync('config/_ctl.txt', '1');
         } else {
-            fs.writeFileSync('config/_ctl.txt', '0', () => {});
+            fs.writeFileSync('config/_ctl.txt', '0');
         }
     }
     if (timestamp.getHours() == AddTime + 2 && timestamp.getMinutes() == 1) {
 
         fdata = data;
-        fs.writeFileSync('data/fdata.json', JSON.stringify(fdata), () => {});
+        fs.writeFileSync('data/fdata.json', JSON.stringify(fdata));
 
     }
     fAdd = isAdd;

dist/newWaterSys/node/config/AddTime.txt

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

dist/newWaterSys/node/data.json

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

dist/newWaterSys/node/sync.js

@@ -4,7 +4,7 @@ var mysql  = require('mysql');
 var moment = require('moment');
  
 var connection = mysql.createConnection({     
-  host     : '192.168.3.15',       
+  host     : '127.0.0.1',       
   user     : 'home',              
   password : 'KJ4j2JL6s^k@jsa2',       
   port: '3306',