Diff: main.cpp

Branch:

PressureResponse

Revision:

25:389d96280bcf

Parent:

24:0b6a6ea42234

Child:

26:23325c50bfc8

--- a/main.cpp	Fri Mar 05 19:25:26 2021 +0900
+++ b/main.cpp	Fri Mar 05 19:30:30 2021 +0900
@@ -44,92 +44,92 @@
 
 int main()
 {
-    timer.start();
-    wireless.baud(115200);
+	timer.start();
+	wireless.baud(115200);
 
-    uint16_t data[2];
-    ads1115.setGain(GAIN_TWOTHIRDS);
-    TempK.format(16, 0);
-    TempK.frequency(5000000);
+	uint16_t data[2];
+	ads1115.setGain(GAIN_TWOTHIRDS);
+	TempK.format(16, 0);
+	TempK.frequency(5000000);
 
-    char file_name_format[] = "/sd/IZU2020_VALVE_MEASUREMENT_%d.dat";
-    int file_number = 1;
-    while(1) {
-        sprintf(file_name, file_name_format, file_number);
-        fp = fopen(file_name, "r");
-        if(fp != NULL) {
-            fclose(fp);
-            file_number++;
-        } else {
-            sprintf(file_name, file_name_format, file_number);
-            break;
-        }
-    }
-    fp = fopen(file_name, "w");
-    sd_timer.start();
+	char file_name_format[] = "/sd/IZU2020_VALVE_MEASUREMENT_%d.dat";
+	int file_number = 1;
+	while(1) {
+		sprintf(file_name, file_name_format, file_number);
+		fp = fopen(file_name, "r");
+		if(fp != NULL) {
+			fclose(fp);
+			file_number++;
+		} else {
+			sprintf(file_name, file_name_format, file_number);
+			break;
+		}
+	}
+	fp = fopen(file_name, "w");
+	sd_timer.start();
 
-    int dt = 0;
-    while(1) {
-
-        press_bit1 = ads1115.readADC_SingleEnded(1);
-        press_bit2 = ads1115.readADC_SingleEnded(3);
+	int dt = 0;
+	while(1) {
 
-        ss1 = 0;
-        data[0] = TempK.write(0x00);
-        data[1] = TempK.write(0x00);
-        ss1 = 1;
-        data[0] &= 0xfffc;
-        temp1 = (float)((int16_t)data[0]) * TEMP_LSB;
+		press_bit1 = ads1115.readADC_SingleEnded(1);
+		press_bit2 = ads1115.readADC_SingleEnded(3);
 
-        ss2 = 0;
-        data[0] = TempK.write(0x00);
-        data[1] = TempK.write(0x00);
-        ss2 = 1;
-        data[0] &= 0xfffc;
-        temp2 = (float)((int16_t)data[0]) * TEMP_LSB;
+		ss1 = 0;
+		data[0] = TempK.write(0x00);
+		data[1] = TempK.write(0x00);
+		ss1 = 1;
+		data[0] &= 0xfffc;
+		temp1 = (float)((int16_t)data[0]) * TEMP_LSB;
 
-	// Debug and Config section-----------------------------------------------------------------
-	if (pc.readable() > 0){
-		wireless.putc(pc.getc());
-		ConfigFlag = true;
-	}
-	while (wireless.readable() > 0){
+		ss2 = 0;
+		data[0] = TempK.write(0x00);
+		data[1] = TempK.write(0x00);
+		ss2 = 1;
+		data[0] &= 0xfffc;
+		temp2 = (float)((int16_t)data[0]) * TEMP_LSB;
+
+		// Debug and Config section-----------------------------------------------------------------
+		if (pc.readable() > 0){
+			wireless.putc(pc.getc());
+			ConfigFlag = true;
+		}
+		while (wireless.readable() > 0){
 			pc.putc(wireless.getc());
-	}
-	if(ConfigFlag){
-		continue;
-	}
-	// -----------------------------------------------------------------------------------------
-	
-	int time = timer.read_ms();
-	if(time - dt >= 100){
-		// Debug and Config section-----------------------------------------------------------------
-		if (pc.readable() == 0 && wireless.readable() == 0){
-			pc.printf("%d\t%d\t%d\t%f\t%f\r\n", timer.read_ms(), press_bit1, press_bit2, temp1, temp2);
+		}
+		if(ConfigFlag){
+			continue;
 		}
 		// -----------------------------------------------------------------------------------------
-	
-		// 無線機の電源供給のみを止めると、コレがpcの方にも漏れてくるのって、何なんだろう？
-		wireless.printf("Tank Pressure is %d now.\r\n",press_bit1);
-		dt = time;
-	}
-	//valvcontroler---------------------
-	if(press_bit1 <= Threshold){
-		valve_controler1 = 0;
-		valve_controler2 = 0;
+
+		int time = timer.read_ms();
+		if(time - dt >= 100){
+			// Debug and Config section-----------------------------------------------------------------
+			if (pc.readable() == 0 && wireless.readable() == 0){
+				pc.printf("%d\t%d\t%d\t%f\t%f\r\n", timer.read_ms(), press_bit1, press_bit2, temp1, temp2);
+			}
+			// -----------------------------------------------------------------------------------------
+
+			// 無線機の電源供給のみを止めると、コレがpcの方にも漏れてくるのって、何なんだろう？
+			wireless.printf("Tank Pressure is %d now.\r\n",press_bit1);
+			dt = time;
+		}
+		//valvcontroler---------------------
+		if(press_bit1 <= Threshold){
+			valve_controler1 = 0;
+			valve_controler2 = 0;
+		}
+		else{
+			valve_controler1 = 1;
+			valve_controler2 = 1;
+		}
+		//----------------------------------
+		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) {
+			if(fp) {
+				fclose(fp);
+				fp = fopen(file_name, "a");
+			}
+		}
 	}
-	else{
-		valve_controler1 = 1;
-		valve_controler2 = 1;
-	}
-	//----------------------------------
-        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) {
-            if(fp) {
-                fclose(fp);
-                fp = fopen(file_name, "a");
-            }
-        }
-    }
 }