update home.yimian.xyz

bin/preproc/ctags_target_for_gcc_minus_e.cpp

@@ -23,6 +23,7 @@ String password = "1234567890.";
 ESP8266WebServer httpServer(80);
 ESP8266HTTPUpdateServer httpUpdater;
 WiFiServer wifiServer(8848);
+unsigned int LastConnectTime = millis();
 
 void serial_setup() {
     Serial.begin(115200);
@@ -156,6 +157,7 @@ void loop()
                 break;
             }
             while (client.available() > 0) {
+                LastConnectTime = millis();
                 String s = client.readStringUntil('\n');
                 Serial.println(s);
                 // client.print(line);
@@ -172,5 +174,9 @@ void loop()
         client.stop();
     }
 
+    if(LastConnectTime + 100000 < millis()){
+        Serial.println(LastConnectTime);
+        ESP.restart();
+    }
 
 }

bin/sketch/w2.ino.cpp

@@ -24,32 +24,33 @@ String password = WIFI_STA_PSK;
 ESP8266WebServer httpServer(80);
 ESP8266HTTPUpdateServer httpUpdater;
 WiFiServer wifiServer(8848);
+unsigned int LastConnectTime = millis();
 
-#line 25 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
+#line 26 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
 void serial_setup();
-#line 30 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
+#line 31 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
 void eeprom_setup();
-#line 36 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
+#line 37 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
 void eeprom_insertStr(int start, int end, const String& s);
-#line 49 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
+#line 50 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
 String eeprom_readStr(int start, int end);
-#line 62 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
+#line 63 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
 auto _pin(int i);
-#line 79 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
+#line 80 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
 void pin_setup();
-#line 84 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
+#line 85 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
 void wifi_setup();
-#line 100 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
+#line 101 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
 void socket_setup();
-#line 109 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
+#line 110 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
 void pulse();
-#line 116 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
+#line 117 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
 void http_sta_reset();
-#line 127 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
+#line 128 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
 void setup();
-#line 143 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
+#line 144 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
 void loop();
-#line 25 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
+#line 26 "e:\\Arduino_project\\wIoT\\dist\\newWaterSys\\w2\\w2.ino"
 void serial_setup() {
     Serial.begin(115200);
     Serial.setTimeout(12);
@@ -182,6 +183,7 @@ void loop()
                 break;
             }
             while (client.available() > 0) {
+                LastConnectTime = millis();
                 String s = client.readStringUntil('\n');
                 Serial.println(s);
                 // client.print(line);
@@ -198,6 +200,10 @@ void loop()
         client.stop();
     }
 
+    if(LastConnectTime + 100000 < millis()){
+        Serial.println(LastConnectTime);
+        ESP.restart();
+    }
 
 }
 

dist/newWaterSys/w1/w1.ino

@@ -15,6 +15,7 @@
 
 String ssid = WIFI_STA_SSID;
 String password = WIFI_STA_PSK;
+unsigned int LastConnectTime = millis();
 
 /********** Web Server ***********/
 ESP8266WebServer httpServer(80);
@@ -156,6 +157,7 @@ void loop()
             }
 
             while (client.available() > 0) {
+                LastConnectTime = millis();
                 String s = client.readStringUntil('\n');
                 Serial.println(s);
                 // client.print(line);
@@ -185,6 +187,11 @@ void loop()
         client.stop();
     }
 
+    if(LastConnectTime + 100000 < millis()){
+        Serial.println(LastConnectTime);
+        ESP.restart();
+    }
+
 
 }
 

dist/newWaterSys/w2/w2.ino

@@ -21,6 +21,7 @@ String password = WIFI_STA_PSK;
 ESP8266WebServer httpServer(80);
 ESP8266HTTPUpdateServer httpUpdater;
 WiFiServer wifiServer(8848);
+unsigned int LastConnectTime = millis();
 
 void serial_setup() {
     Serial.begin(115200);
@@ -154,6 +155,7 @@ void loop()
                 break;
             }
             while (client.available() > 0) {
+                LastConnectTime = millis();
                 String s = client.readStringUntil('\n');
                 Serial.println(s);
                 // client.print(line);
@@ -170,6 +172,10 @@ void loop()
         client.stop();
     }
 
+    if(LastConnectTime + 100000 < millis()){
+        Serial.println(LastConnectTime);
+        ESP.restart();
+    }
 
 }
 

dist/server/data.php

@@ -12,8 +12,8 @@ elseif(file_get_contents('./node/ctl.txt')=="1") $wS="正在加水";
 if(file_get_contents('./node/config/auto.txt')=="0") $wS.="(手动)";
 else $wS.="(自动)";
 
-$tW = "加水量: ".substr(file_get_contents('./node/data/w1InsFlow.txt') / (file_get_contents('./node/data/w2InsFlow.txt') - file_get_contents('./node/data/w1InsFlow.txt')), 0, 4);
-$tW .= "% | 校准参数: ". file_get_contents('./node/config/rate.txt') ." | 开始加水Hour: ". file_get_contents('./node/config/AddTime.txt');
+$tW = "加水量: ".substr(100 * file_get_contents('./node/data/w1InsFlow.txt') / (file_get_contents('./node/data/w2InsFlow.txt') + 0.001 - file_get_contents('./node/data/w1InsFlow.txt')), 0, 4);
+$tW .= "% | 校准参数: ". file_get_contents('./node/config/rate.txt') ." | 开始加水: ". file_get_contents('./node/config/AddTime.txt');
 
 if(file_get_contents('fon_hall.txt')=="1" && file_get_contents('fon_kit.txt')==1 && file_get_contents('fon_din.txt')==1 && file_get_contents('fon_liv.txt')==1 && file_get_contents('fon_livS.txt')==1) $lS="正常运行";
 else

dist/server/index.php

@@ -7,7 +7,7 @@ yimian__headerEnd();
 <h4>参考温度：<span id="temp"></span> &nbsp;&nbsp;&nbsp;&nbsp;参考亮度：<span id="Ls"></span></h4>
 <h4>换热器水流量：<span id="wF1"></span></h4>
 <h4>太阳能水流量：<span id="wF2"></span></h4>
-<h4>太阳能已使用水量：<span id="tW"></span>&nbsp;&nbsp;&nbsp;&nbsp;<button id="isAuto" onClick="auto()"></button>&nbsp;&nbsp;<button id="reset" onClick="reset()">重置</button></h4>
+<h4><span id="tW"></span><br/><button id="isAuto" onClick="auto()"></button>&nbsp;&nbsp;<button id="reset" onClick="reset()">重置</button></h4>
 <h4>水流系统状态：<span id="wS"></span>&nbsp;&nbsp;&nbsp;&nbsp;<button id="isAdd" onClick="manual()"></button></h4>
 <h4>灯系统状态：<span id="lS"></span></h4>
 <h4>客厅人数：<span id="lP"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<button onClick="openDoor()">戳我开门</button></h4>
@@ -33,7 +33,7 @@ function action()
 		$('#dl').html(msg.dl);
 		$('#wS').html(msg.wS);
 		$('#lS').html(msg.lS);
-		$('#tW').html(msg.tW+" L");
+		$('#tW').html(msg.tW+"H");
 		$('#temp').html(msg.temp+" ℃ ");
 		$('#Ls').html(msg.Ls2+" ");
 		$('#lP').html(msg.lP+' 人');
@@ -83,7 +83,7 @@ function addWater()
 
 function reset(){
 
-	$.post("./reset.php");
+	$.post("./reset.php?key=15");
 }
 
 function manual(){

dist/server/reset.php

@@ -2,6 +2,6 @@
 
 if($_REQUEST['key'] != '15') die();
 $myfile = fopen("./node/config/reset.txt", "w") or die("Unable to open file!");
-$txt = '1'
+$txt = '1';
 fwrite($myfile, $txt);
 fclose($myfile);