Diff: main.cpp

Revision:

8:1bc57f862d1f

Parent:

5:a3b89d999c47

Child:

10:087a29f80ae6

--- a/main.cpp	Wed Sep 06 06:00:29 2017 +0000
+++ b/main.cpp	Thu Mar 01 02:15:46 2018 +0000
@@ -1,9 +1,11 @@
 #include "mbed.h"
 #include "Milkcocoa.h"
+#include "BME280.h"
 #include "ESP8266Interface.h"
 
 ESP8266Interface wifi(D1,D0);
 RawSerial pc(USBTX,USBRX);
+BME280 bme(I2C_SDA, I2C_SCL);
 
 /************************* WiFi Access Point *********************************/
 
@@ -13,7 +15,7 @@
 /************************* Your Milkcocoa Setup *********************************/
 
 #define MILKCOCOA_APP_ID      "...YOUR_MILKCOCOA_APP_ID..."
-#define MILKCOCOA_DATASTORE   "mbed_esp8266"
+#define MILKCOCOA_DATASTORE   "environment"
 
 /************* Milkcocoa Setup (you don't need to change this!) ******************/
 
@@ -27,8 +29,9 @@
 
 int main() {
     
-    pc.baud(9600);
+    pc.baud(115200);
     pc.printf("Milkcocoa mbed os ver demo\n\r\n\r\n\r");
+    bme.initialize();
     pc.printf("Connecting to %s\n\r",WLAN_SSID);
     
     int ret = wifi.connect(WLAN_SSID, WLAN_PASS, NSAPI_SECURITY_WPA_WPA2);
@@ -42,30 +45,16 @@
     
     milkcocoa->connect();
     
-    pc.printf("%d\n\r",milkcocoa->on(MILKCOCOA_DATASTORE, "push", onpush));
-    
-#ifdef __MILKCOCOA_THREAD
-    milkcocoa->setLoopCycle(5000);
-    milkcocoa->start();
-#endif
+    int count = 0;
     while(1) {
         DataElement elem = DataElement();
-        elem.setValue("v", 1);
+        elem.setValue("temperature", bme.getTemperature());
+        elem.setValue("humidity", bme.getHumidity());
         
         milkcocoa->push(MILKCOCOA_DATASTORE, elem);
 
-#ifndef __MILKCOCOA_THREAD
         milkcocoa->loop();
-#endif
-        Thread::wait(7000);
         
+        Thread::wait(7*1000);
     }
 }
-
-void onpush(MQTT::MessageData& md)
-{
-    MQTT::Message &message = md.message;
-    DataElement de = DataElement((char*)message.payload);
-    pc.printf("onpush\n\r");
-    pc.printf("%d\n\r",de.getInt("v"));
-}
\ No newline at end of file