Diff: main.cpp

Revision:

12:f3d87351cc34

Parent:

8:8723d0006097

--- a/main.cpp	Tue Aug 01 03:44:15 2017 +0000
+++ b/main.cpp	Thu Sep 14 17:57:42 2017 +0000
@@ -1,63 +1,32 @@
-
 #include "mbed.h"
 #include "MAX31856.h"
-//#include "USBSerial.h"
-//#include "SDFileSystem.h"
-
 
 
-////----------------------------------------------------------
-//#include "max32630fthr.h"
-////Define serial ports
-//// Hardware serial port over DAPLink
-//Serial daplink(P2_1, P2_0);
-//// Virtual serial port over USB
-////USBSerial microUSB;
-////----------------------------------------------------------
-////SPI Interfaces
-////SPI testSPI(SPIO MOSI,SPIO MISO,SPIO SCK);
-//SPI testSPI(P5_1, P5_2, P5_0);
-////----------------------------------------------------------
-////Define featherboard
-//MAX32630FTHR pegasus(MAX32630FTHR::VIO_3V3);
-////----------------------------------------------------------
-////Thermocouples
-//MAX31856 Thermocouple(testSPI, P3_2, CR1_TC_TYPE_K, CR0_FILTER_OUT_60Hz, CR1_AVG_TC_SAMPLES_1, CR0_CONV_MODE_NORMALLY_ON);
-
-
-
-
-
-// Hardware serial port over DAPLink
+// Hardware serial port over USB micro
 Serial serial(USBTX, USBRX);
 
 //SPI spi(SPIO MOSI,SPIO MISO,SPIO SCK);
-SPI spi(P6_1, P6_2, P6_0);
+SPI spi(P2_1, P2_2, P2_0);
 //----------------------------------------------------------
 
 //Thermocouples
-MAX31856 Thermocouple(spi, P6_3);
-
-
-
-
-
-
+MAX31856 Thermocouple(spi, P2_3);
 
 DigitalOut led1(LED1);
-DigitalOut led2(LED2);
+
+int main() {
 
-// main() runs in its own thread in the OS
-int main() {
+    
     float temperature_TC, temperature_CJ;
+    
     while (true) {
         led1 = !led1;
-        wait(0.2);
         temperature_TC=Thermocouple.readTC();
         temperature_CJ=Thermocouple.readCJ();
-        serial.printf("MAX31856 TC = %f Celsius   MAX31856 CJ = %f Celsius  \n\r",temperature_TC,temperature_CJ);
 
-        
+        wait(0.2);
+
+        serial.printf("MAX31856.CJ = %f C   MAX31856.TC = %f C\n\r",temperature_CJ,temperature_TC);  
     }
 }