Diff: main.cpp

Revision:

6:d8b3de585749

Parent:

5:0be85f1bdb35

Child:

7:cc405d286e24

--- a/main.cpp	Wed Apr 26 17:57:55 2017 +0000
+++ b/main.cpp	Sun Nov 12 19:12:02 2017 +0000
@@ -1,20 +1,28 @@
-#include "stm32f103c8t6.h"
+#include "MapleMini.h"
 #include "mbed.h"
 #include "USBSerial.h"
+#include "DHT.h"
 
 DigitalOut  myled(LED1);
+DigitalOut  usb_disc(PB_9);
+DHT dht(PA_0,DHT22);
 
 int main() {
     confSysClock();     //Configure system clock (72MHz HSE clock, 48MHz USB clock)
-    
-    Serial    pc(PA_2, PA_3);
+       
+    //Serial    pc(PA_2, PA_3);
     //USBSerial usbSerial;  // connection must be blocked when USB is not plugged in
     USBSerial usbSerial(0x1f00, 0x2012, 0x0001,  false);    // connection is not blocked when USB is not plugged in
+    usb_disc = 0;
     
     while(1) {
         myled = !myled;
-        pc.printf("I am a serial port\r\n");            // 9600 bit/s
-        usbSerial.printf("I am a USB serial port\r\n"); // 12 Mbit/s (USB full-speed)
+        //pc.printf("I am a serial port\r\n");            // 9600 bit/s
+        int data=dht.readData();
+
+        // Print on Virtual USB Serial port
+        //usb_serial.
+        usbSerial.printf("%f,%f,%d\r\n", dht.ReadTemperature(),dht.ReadHumidity(),data);
         wait_ms(1000);
     }
 }