Diff: main.cpp

Branch:

PressureResponse

Revision:

31:22dcdffbe5c2

Parent:

30:cf909d4c6710

Child:

32:f3814a0a0f85

diff -r cf909d4c6710 -r 22dcdffbe5c2 main.cpp
--- a/main.cpp	Sun Mar 07 03:18:08 2021 +0900
+++ b/main.cpp	Sun Mar 07 07:38:02 2021 +0900
@@ -46,6 +46,7 @@
 {
 	timer.start();
 	wireless.baud(115200);
+	wireless.attach(ValveOC,Serial::RxIrq);
 
 	uint16_t data[2];
 	ads1115.setGain(GAIN_TWOTHIRDS);
@@ -93,10 +94,10 @@
 			wireless.putc(pc.getc());
 			ConfigFlag = true;
 		}
-		while (wireless.readable() > 0){
-			pc.putc(wireless.getc());
-		}
 		if(ConfigFlag){
+			while (wireless.readable() > 0){
+				pc.putc(wireless.getc());
+			}
 			continue;
 		}
 		// -----------------------------------------------------------------------------------------
@@ -112,7 +113,7 @@
 			wireless.printf("Tank Pressure is %d now.\r\n",press_bit1);
 			dt = time;
 		}
-		//valvcontroler---------------------
+		//valvcontroler-----------------------------------------------------------------------------
 		if(press_bit1 > Threshold){
 			valve_controler1 = 1;
 			valve_controler2 = 1;
@@ -121,7 +122,7 @@
 			valve_controler1 = 0;
 			valve_controler2 = 0;
 		}
-		//----------------------------------
+		//------------------------------------------------------------------------------------------
 		fprintf(fp, "%d\t%d\t%d\t%f\t%f\r\n", time, press_bit1, press_bit2, temp1, temp2);
 
 		if(sd_timer.read_ms() > 20*1000) {
@@ -132,3 +133,18 @@
 		}
 	}
 }
+
+void ValveOC()
+{
+	char message = wireless.getc();
+	if (message == 'o')
+	{
+		valve_controler1 = 1;
+		valve_controler2 = 1;
+	}
+	else if (message == 'c')
+	{
+		valve_controler1 = 0;
+		valve_controler2 = 0;
+	}
+}