Diff: main.cpp

Branch:

UplinkEnabled

Revision:

58:582b730cb591

Parent:

57:0e4699ddfff0

Child:

59:ed37d5b8d18a

--- a/main.cpp	Mon Mar 15 00:02:14 2021 +0900
+++ b/main.cpp	Mon Mar 15 14:29:37 2021 +0900
@@ -18,8 +18,6 @@
 
 SDFileSystem sd(p5, p6, p7, p8, "sd");
 
-SPI TempK(p5, p6, p7);
-
 const int Threshold = 3580;
 
 DigitalInOut valve_controler1(p18, PIN_OUTPUT, OpenDrain, 0);
@@ -31,9 +29,6 @@
 
 DigitalOut led1(LED1);
 
-DigitalOut ss1(p21);
-DigitalOut ss2(p22);
-
 Timer timer;
 Timer sd_timer;
 
@@ -42,7 +37,6 @@
 char file_name[64];
 
 int press_bit1, press_bit2;
-float temp1, temp2;
 
 bool ConfigFlag = false; 
 
@@ -67,8 +61,6 @@
 
 	uint16_t data[2];
 	ads1115.setGain(GAIN_TWOTHIRDS);
-	TempK.format(16, 0);
-	TempK.frequency(5000000);
 
 	char file_name_format[] = "/sd/IZU2021_VALVE_MEASUREMENT_%d.dat";
 	int file_number = 1;
@@ -92,20 +84,6 @@
 		press_bit1 = ads1115.readADC_SingleEnded(1);
 		press_bit2 = ads1115.readADC_SingleEnded(3);
 
-		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;
-
-		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)
 		{
@@ -131,7 +109,7 @@
 			// 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.printf("%d\t%d\t%d\r\n", timer.read_ms(), press_bit1, press_bit2);
 			}
 			// -----------------------------------------------------------------------------------------
 
@@ -193,7 +171,7 @@
 			}
 		}
 		//------------------------------------------------------------------------------------------
-		fprintf(fp, "%d,%d,%d,%f,%f\r\n", time, press_bit1, press_bit2, temp1, temp2);
+		fprintf(fp, "%d,%d,%d\r\n", time, press_bit1, press_bit2);
 
 		if(sd_timer.read_ms() > 20*1000) {
 			if(fp) {