Diff: main.cpp

Revision:

1:6f0b395c052d

Parent:

0:94c1a94c5a47

Child:

3:f0f39d7c1c16

--- a/main.cpp	Sun May 08 02:49:10 2016 +0000
+++ b/main.cpp	Mon Jun 20 10:22:55 2016 +0000
@@ -1,8 +1,10 @@
 #include "mbed.h"
 #include "I2C_SSD1306Z.h" 
+#include "BME280.h"
 
 
 I2C i2c(I2C_SDA, I2C_SCL);
+BME280 sensor(PB_3, PB_10);
  
 DigitalOut myled(LED1);
 Serial pc(SERIAL_TX, SERIAL_RX);
@@ -21,22 +23,39 @@
 int main()
 {
 
-    
+    char tbuffer[50], hpbuffer[50], hbuffer[50];
     printf("init oled\n");
     
     Init_LCD();
     clear_LCD();
  
   while (1) {
- 
-   
-     draw_LCD(BMP_Logo_ittraining);
+     
+
+     
+     sprintf(tbuffer, "Temp: %2.2f degC", sensor.getTemperature());
+     sprintf(hpbuffer, "P: %4.2f hPa", sensor.getPressure());
+     sprintf(hbuffer, "Hum: %2.2f %%", sensor.getHumidity()); 
+     
+     tbuffer[strlen(tbuffer)] = '\0';
+     hpbuffer[strlen(hpbuffer)] = '\0';
+     hbuffer[strlen(hbuffer)] = '\0';
+     
+     print_Line(0, tbuffer);
+     print_Line(1, hpbuffer);
+     print_Line(2, hbuffer);
+      
+ /*   print_Line(0,"%2.2f degC\r\n", (sensor.getTemperature()-32)*5.0/9.0);
+    print_Line(1, "%04.2f hPa\r\n", sensor.getPressure());
+    print_Line(2, "%2.2f %%\r\n", sensor.getHumidity());
+    
+   /*  draw_LCD(BMP_Logo_ittraining);
      wait(2.0);
      clear_LCD();
      print_Line(0, "IT Maker Space");
      print_Line(1, "ARM mbed RTOS");
      print_Line(2, "ST Micro");
-     print_Line(3, "ittraining.com");  
+     print_Line(3, "ittraining.com");  */
      wait(2.0);
      clear_LCD();