Diff: main.cpp

Branch:

UplinkEnabled

Revision:

50:c9f29b839c32

Parent:

49:171de000bae0

Child:

51:61f7e3e5f9b5

--- a/main.cpp	Tue Mar 09 16:59:36 2021 +0900
+++ b/main.cpp	Tue Mar 09 17:48:53 2021 +0900
@@ -25,6 +25,8 @@
 DigitalInOut valve_controler1(p18, PIN_OUTPUT, OpenDrain, 0);
 DigitalInOut valve_controler2(p19, PIN_OUTPUT, OpenDrain, 0);
 
+bool IsValveOpened = false;
+
 DigitalOut led1(LED1);
 
 DigitalOut ss1(p19);
@@ -44,7 +46,19 @@
 
 bool APLFlug = true; // for valve controler
 
-void ValveOC(); // Wireless interruption(fake) for open/close valve
+void ValveOpen()
+{
+	valve_controler1 = 1;
+	valve_controler2 = 1;
+	IsValveOpened = true;
+}
+
+void ValveClose()
+{
+	valve_controler1 = 0;
+	valve_controler2 = 0;
+	IsValveOpened = false;
+}
 
 int main()
 {
@@ -121,7 +135,7 @@
 			}
 			// -----------------------------------------------------------------------------------------
 
-			wireless.printf("Tank Pressure is %d now.\r\n", press_bit1);
+			wireless.printf("Tank Pressure %d IsAPL_Enabled %s IsValveOpened %s.\r\n", press_bit1, APLFlug ? "true":"false" , IsValveOpened ? "true":"false" );
 			dt = time;
 		}
 		//valvcontroler auto pressure limitation----------------------------------------------------
@@ -130,21 +144,17 @@
 			// This support only single lettar.
 			char up_msg = wireless.getc();
 
-			wireless.printf("Message = %c.",up_msg);
+			//wireless.printf("Message = %c.",up_msg);
 
 			if (up_msg == 'o') //open
 			{
-				valve_controler1 = 1;
-				valve_controler2 = 1;
+				ValveOpen();
 				APLFlug = false;
-				wireless.printf("Valve Opened.\r\n");
 			}
 			else if (up_msg == 'c') //close
 			{
-				valve_controler1 = 0;
-				valve_controler2 = 0;
+				ValveClose();
 				APLFlug = false;
-				wireless.printf("Valve Closed.\r\n");
 			}
 			else 
 			{
@@ -164,6 +174,9 @@
 							&& up_msg != '7'
 							&& up_msg != '8'
 							&& up_msg != '9'
+							&& up_msg != '\0'
+							&& up_msg != '\r'
+							&& up_msg != '\n'
 				     ){
 					wireless.printf("You send invaild command.\r\n");
 				}
@@ -173,18 +186,12 @@
 		{
 			if(press_bit1 > Threshold)
 			{
-				valve_controler1 = 1;
-				valve_controler2 = 1;
+				ValveOpen();
 			}
 			else{
-				valve_controler1 = 0;
-				valve_controler2 = 0;
+				ValveClose();
 			}
 		}
-		else if(!APLFlug)
-		{
-			wireless.printf("Auto Pressure Limitation is Disabled.\r\n");
-		}
 		//------------------------------------------------------------------------------------------
 		fprintf(fp, "%d\t%d\t%d\t%f\t%f\r\n", time, press_bit1, press_bit2, temp1, temp2);