Revision 8:60007735feed, committed 2015-11-19

Comitter:

nicoschtein

Date:

Thu Nov 19 22:55:44 2015 +0000

Parent:

7:609e7bb06486

Commit message:

Temperature and Humidity sent to TTN !

Changed in this revision

diff -r 609e7bb06486 -r 60007735feed DHT.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/DHT.lib	Thu Nov 19 22:55:44 2015 +0000
@@ -0,0 +1,1 @@
+http://developer.mbed.org/users/Wimpie/code/DHT/#9b5b3200688f

diff -r 609e7bb06486 -r 60007735feed main.cpp
--- a/main.cpp	Thu Nov 19 20:15:09 2015 +0000
+++ b/main.cpp	Thu Nov 19 22:55:44 2015 +0000
@@ -4,29 +4,34 @@
 #include <string>
 #include <vector>
 #include <algorithm>
+#include "DHT.h"
+
 // these options must match the settings on your Conduit
 // TTN Keys
 static const uint8_t netowork_session_key_array[] = {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C};
 static const uint8_t data_session_key_array[] = {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C};
 // uncomment the following lines and edit their values to match your configuration
-//static const uint8_t network_address_array[] = {0x02, 0x01, 0xBA, 0x01}; // use yours based on http://thethingsnetwork.org/wiki/AddressSpace
+static const uint8_t network_address_array[] = {0x02, 0x01, 0xBA, 0x16}; // use yours based on http://thethingsnetwork.org/wiki/AddressSpace
 static std::vector<uint8_t> netowork_session_key (netowork_session_key_array, netowork_session_key_array + sizeof(netowork_session_key_array) / sizeof(uint8_t));
 static std::vector<uint8_t> data_session_key (data_session_key_array, data_session_key_array + sizeof(data_session_key_array) / sizeof(uint8_t));
 static std::vector<uint8_t> network_address (network_address_array, network_address_array + sizeof(network_address_array) / sizeof(uint8_t));
 static uint8_t config_frequency_sub_band = 4;
 
+
 int main() {
     int32_t ret;
     mDot* dot;
     std::vector<uint8_t> data;
-    std::string data_str = "hello ropu!";
-    
+    DHT sensor(PA_11,DHT11); // Use the DHT11 sensor connected to Vcc GND and on pin D7 UKD2
+    std::string data_str = "Hello Nico!";
+
+
     // get a mDot handle
     dot = mDot::getInstance();
 
     dot->resetConfig();
 
-    dot->setLogLevel(mts::MTSLog::INFO_LEVEL);
+    dot->setLogLevel(mts::MTSLog::DEBUG_LEVEL);
 
     // too lazzy to check all errors
     dot->setJoinMode(mDot::MANUAL);
@@ -47,7 +52,7 @@
     
     
     
-    // request receive confirmation of packets from the gateway
+    // request not to receive confirmation of packets from the gateway since TTN doesn't support it
     logInfo("enabling ACKs");
     if ((ret = dot->setAck(0)) != mDot::MDOT_OK) {
         logError("failed to enable ACKs %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
@@ -70,20 +75,74 @@
         osDelay(std::max((uint32_t)1000, (uint32_t)dot->getNextTxMs()));
     }
 
-    // format data for sending to the gateway
-    for (std::string::iterator it = data_str.begin(); it != data_str.end(); it++)
-        data.push_back((uint8_t) *it);
+    int sensor_error = 0;
+    float temp = 0;
+    float humid = 0;
+    int update_period = 5000;
+    std::string separator_str = ",";
+    char string_buffer[64];
 
     while (true) {
-        // send the data to the gateway
-        if ((ret = dot->send(data)) != mDot::MDOT_OK) {
-            logError("failed to send", ret, mDot::getReturnCodeString(ret).c_str());
-        } else {
-            logInfo("successfully sent data to gateway");
+        data.clear();
+
+        sensor_error = sensor.readData();
+        if (sensor_error !=0)
+            printf("\r\nErr %i \n",sensor_error);
+        while ( sensor_error != 0 ) {
+            sensor_error = sensor.readData();
+            osDelay(100);
+        }
+        // TEMP
+        temp = sensor.ReadTemperature(CELCIUS);
+        sprintf(string_buffer, "%4.2f", temp);
+        for (int i = 0; i<strlen(string_buffer); i++)
+        {
+            data.push_back(((char*)string_buffer)[i]);
+        }
+        // SEPARATOR
+        data.push_back((uint8_t) *separator_str.begin());
+        // HUMIDITY
+        humid = sensor.ReadHumidity();
+        sprintf(string_buffer, "%4.2f", humid);
+        for (int i = 0; i<strlen(string_buffer); i++)
+        {
+            data.push_back(((char*)string_buffer)[i]);
         }
 
-        // in the 868 (EU) frequency band, we need to wait until another channel is available before transmitting again
-        osDelay(std::max((uint32_t)5000, (uint32_t)dot->getNextTxMs()));
+        logInfo("Temperature is %4.2f C",temp);
+        logInfo("Temperature is %4.2f F",sensor.ReadTemperature(FARENHEIT));
+        logInfo("Temperature is %4.2f K",sensor.ReadTemperature(KELVIN));
+        logInfo("Humidity is %4.2f",humid);
+        logInfo("Dew point is %4.2f",sensor.CalcdewPoint(sensor.ReadTemperature(CELCIUS), sensor.ReadHumidity()));
+        logInfo("Dew point (fast) is %4.2f",sensor.CalcdewPointFast(sensor.ReadTemperature(CELCIUS), sensor.ReadHumidity()));
+        
+        logDebug("Sending LoRa message, length: %d", data.size());
+        logDebug("sending data: ");
+        for(int i = 0; i < data.size(); i++)
+        {
+            printf("%c", data[i]);
+        }
+        printf("\n");
+        if ((ret = dot->send(data)) != mDot::MDOT_OK)
+        {
+            logError("failed to send", ret, mDot::getReturnCodeString(ret).c_str());
+        } else
+        {
+            logInfo("successfully sent data to gateway");
+            data.clear();
+            if ((ret = dot->recv(data)) != mDot::MDOT_OK)  {
+                logError("failed to rec", ret, mDot::getReturnCodeString(ret).c_str());
+            } else {
+                logDebug("successfully recd data from gateway");
+                logDebug("recv data size: %i\n",data.size());
+                logDebug("recv data: ");
+                for(int i = 0;i < data.size();i++) {
+                    printf("%c", data[i]);
+                }
+                printf("\n");
+            }
+        }
+        osDelay(std::max((uint32_t)update_period, (uint32_t)dot->getNextTxMs()));
     }
 
     return 0;