Diff: main.cpp

Revision:

6:7ef001211531

Parent:

5:c27ca1ae3915

--- a/main.cpp	Wed Sep 06 05:37:29 2017 +0000
+++ b/main.cpp	Wed Sep 06 07:38:39 2017 +0000
@@ -1,61 +1,20 @@
-/*
-* OneWireCRC/OneWireThermometer demo.
-*
-* Copyright (C) <2009> Petras Saduikis <petras@petras.co.uk>
-*
-* This file is part of OneWireCRC/OneWireThermometer.
-*
-* OneWireCRC/OneWireThermometer is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* OneWireCRC/OneWireThermometer is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with OneWireCRC/OneWireThermometer0.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////
-// Test code to read temperature from a Maxim DS18B20 or DS18S20
-// 1-wire device 
-////////////////////////////////////////////////////////////////////
-
-#include <mbed.h>
-#include "DS18S20.h"
-#include "DS18B20.h"
-#include "OneWireDefs.h"
-
-//#define THERMOMETER DS18S20
-#define THERMOMETER DS18B20
-//Serial pc(USBTX, USBRX);
-int main()
-{
-    // device( crcOn, useAddress, parasitic, mbed pin )
-    THERMOMETER device(true, true, false, PA_9);
-    //pc.baud(9600);
-    while (!device.initialize());    // keep calling until it works
-    
-    while (true)
-    {
-        // changing the resolutions only affects the DS18B20. The DS18S20 is fixed.
-        device.setResolution(nineBit);
-        device.readTemperature(); 
-        wait(2);
- /*       device.setResolution(tenBit);
-        device.readTemperature(); 
-        wait(2);
-        device.setResolution(elevenBit);
-        device.readTemperature(); 
-        wait(2);
-        device.setResolution(twelveBit);
-        device.readTemperature(); 
-        wait(2);
- */      
-    }
-     
-    return EXIT_SUCCESS;
-}
+#include "mbed.h"
+#include "max6675.h"
+ 
+SPI spi(PA_7,PA_6,PA_5);
+max6675 max(spi,PB_6);
+ 
+Serial pc(USBTX,USBRX);
+ 
+int main() {
+    pc.baud(9600);
+    while (1) {
+    
+        float temp = max.read_temp();
+        pc.printf("\n\rT: %f",temp );
+       
+        wait(.25);
+    }
+ 
+ 
+}
\ No newline at end of file