Revision 15:04b37f329c84, committed 2016-08-25

Comitter:

Dengjj

Date:

Thu Aug 25 12:58:12 2016 +0000

Parent:

14:0616e4361f0c

Commit message:

one alarm

Changed in this revision

diff -r 0616e4361f0c -r 04b37f329c84 LinearAnalogSensors.lib
--- a/LinearAnalogSensors.lib	Wed Aug 24 11:52:28 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://developer.mbed.org/teams/wireless-sensor/code/LinearAnalogSensors/#61e97a2029f8

diff -r 0616e4361f0c -r 04b37f329c84 main.cpp
--- a/main.cpp	Wed Aug 24 11:52:28 2016 +0000
+++ b/main.cpp	Thu Aug 25 12:58:12 2016 +0000
@@ -4,32 +4,25 @@
 #include <string>
 #include <vector>
 #include <algorithm>
-#include "AnalogPH.h"
+
 
 const char TURNON[]  = "ON";
 const char TURNOFF[] = "OFF";
 
-DigitalOut Alarm(PA_2);
+bool cmpStr(char* str1, const char* str2, int len)
+{
+     int k;
+     for (k=0; k<len; k++){
+         if (str1[k] != str2[k]) return false;
+     }
+     return true;    
+}
+
+DigitalOut Alarm(PB_0);
 
 //defined for mDot SVB debug, comment it if applying for whole system
 //#define NO_MULTITECH_GATEWAY
 
-//Define the number of channels
-#define NUM_OF_CH     4
- 
-AnalogPHSensor CH1_PH(PB_1, 0.0, 0.0);
-
-#if (NUM_OF_CH >1)
-  AnalogPHSensor CH2_PH(PB_0, 0.0, 0.0);
-#endif
-
-#if (NUM_OF_CH >2)
-  AnalogPHSensor CH3_PH(PA_5, 0.0, 0.0);
-#endif
-#if (NUM_OF_CH >3)
-  AnalogPHSensor CH4_PH(PA_4, 0.0, 0.0);
-#endif
-
 // these options must match the settings on your Conduit
 // uncomment the following lines and edit their values to match your configuration
 static std::string config_network_name = "chinaiot";
@@ -40,16 +33,17 @@
     int32_t ret; 
     mDot* dot;
     std::vector<uint8_t> sendData, recvData;
-    float phValue;
-    char _header[] = "PH Sensors";
-    char sendBuf[11], recvBuf[11];
-    int  i, k;
+    std::vector<uint8_t> sendData1,sendData2, sendData3, sendData4;
+    char recvBuf[11];
     int send_failed;
-    bool alarm_on;
-    const uint32_t baud = 1200;
+    int  i;
+    //bool alarm_on;
+    std::string data_str1 = "REQ1";
+    std::string data_str2 = "REQ2";
+    std::string data_str3 = "REQ3";
+    std::string data_str4 = "REQ4";
+    bool a1, a2, a3, a4;
     
-    int32_t setBaud(const uint32_t& baud);
-    uint32_t getBaud();
  
     // get a mDot handle
     dot = mDot::getInstance();
@@ -64,7 +58,7 @@
     dot->resetConfig();
 
     dot->setLogLevel(mts::MTSLog::INFO_LEVEL);
-#ifndef NO_MULTITECH_GATEWAY
+
     // set up the mDot with our network information: frequency sub band, network name, and network password
     // these can all be saved in NVM so they don't need to be set every time - see mDot::saveConfig()
 
@@ -116,57 +110,63 @@
         // in the 868 (EU) frequency band, we need to wait until another channel is available before transmitting again
         osDelay(std::max((uint32_t)1000, (uint32_t)dot->getNextTxMs()));
     }
+   
+    // format data for sending to the gateway
+    for (std::string::iterator it = data_str1.begin(); it != data_str1.end(); it++)
+        sendData1.push_back((uint8_t) *it);
+    
+    // format data for sending to the gateway
+    for (std::string::iterator it = data_str2.begin(); it != data_str2.end(); it++)
+        sendData2.push_back((uint8_t) *it);
+        
+    // format data for sending to the gateway
+    for (std::string::iterator it = data_str3.begin(); it != data_str3.end(); it++)
+        sendData3.push_back((uint8_t) *it);
 
-    sendData.clear(); 
     // format data for sending to the gateway
-    for( int i=0; i< strlen(_header); i++ )
-               sendData.push_back( _header[i] );
-               
-    // send the data to the gateway
-    if ((ret = dot->send(sendData)) != mDot::MDOT_OK) {
-        logError("failed to send", ret, mDot::getReturnCodeString(ret).c_str());
-    } else {
-            logInfo("successfully sent data to gateway");
-    } 
-#else
-  logInfo("%s", _header);
-#endif 
-    while (true) {
-        send_failed = 0;
-        alarm_on = false;
-        // Read the PH values
-        for(k=1; k<(NUM_OF_CH+1); k++){
-           switch(k){
-              case 1:  phValue = CH1_PH; break;
-            #if (NUM_OF_CH >1)
-              case 2:  phValue = CH2_PH; break;
-            #endif
-            #if (NUM_OF_CH >2)
-              case 3:  phValue = CH3_PH; break;
-            #endif  
-            #if (NUM_OF_CH >3)
-              case 4:  phValue = CH4_PH; break;
-            #endif
-              default: 
-                   break;
-            }           
-            sprintf(sendBuf, "CH%d:%5.4f", k, phValue);
-            logInfo("%s", sendBuf);
+    for (std::string::iterator it = data_str4.begin(); it != data_str4.end(); it++)
+        sendData4.push_back((uint8_t) *it);
+        
+    send_failed = 0;              
+    while (true) {         
+            // send the data to the gateway
+            if ((ret = dot->send(sendData1)) != mDot::MDOT_OK) {
+               send_failed++; 
+               logError("failed to send", ret, mDot::getReturnCodeString(ret).c_str());
+               osDelay(std::max((uint32_t)5000, (uint32_t)dot->getNextTxMs()));
+            } else { 
+                send_failed=0;            
+                logInfo("successfully sent data to gateway");  
+                for(i=0;i<11;i++)recvBuf[i]=0; //clear recv buffer
+                recvData.clear(); //clear recv data
+                if ((ret = dot->recv(recvData)) != mDot::MDOT_OK) {
+                   logError("failed to recv: [%d][%s]", ret, mDot::getReturnCodeString(ret).c_str());
+                } else {
+                   //logInfo("datasize = %d", recvData.size());
+                   for(i=0; i< recvData.size(); i++ )
+                     recvBuf[i] = recvData[i];
+                   //logInfo("RECV:%s", recvBuf);
+                   if(cmpStr(recvBuf, TURNON, 2)){
+                      a1 = true;
+                      logInfo("A1 is on!"); 
+                    } 
+                    if(cmpStr(recvBuf, TURNOFF, 3)){
+                      a1 = false;
+                      logInfo("A1 is off!"); 
+                    }    
+                } 
+            }
             
-         #ifndef NO_MULTITECH_GATEWAY
-            //Send the data to Gateway
-            sendData.clear();   
-            // probably not the most efficent way to do this
-            for( int i=0; i< strlen(sendBuf); i++ )
-               sendData.push_back( sendBuf[i] );
-        
+            osDelay(std::max((uint32_t)5000, (uint32_t)dot->getNextTxMs()));
+
             // send the data to the gateway
-            if ((ret = dot->send(sendData)) != mDot::MDOT_OK) {
+            if ((ret = dot->send(sendData2)) != mDot::MDOT_OK) {
+               send_failed++; 
                logError("failed to send", ret, mDot::getReturnCodeString(ret).c_str());
-               send_failed++;
                osDelay(std::max((uint32_t)5000, (uint32_t)dot->getNextTxMs()));
-            } else {            
-                logInfo("successfully sent data to gateway");
+            } else { 
+                send_failed=0;            
+                logInfo("successfully sent data to gateway");  
                 for(i=0;i<11;i++)recvBuf[i]=0; //clear recv buffer
                 recvData.clear(); //clear recv data
                 if ((ret = dot->recv(recvData)) != mDot::MDOT_OK) {
@@ -175,41 +175,104 @@
                    //logInfo("datasize = %d", recvData.size());
                    for(i=0; i< recvData.size(); i++ )
                      recvBuf[i] = recvData[i];
-                   logInfo("RECV:%s", recvBuf);
-                   if(0==strcmp(recvBuf, TURNON)) alarm_on = true; 
+                   //logInfo("RECV:%s", recvBuf);
+                   if(cmpStr(recvBuf, TURNON, 2)){
+                      a2 = true;
+                      logInfo("A2 is on!"); 
+                    } 
+                    if(cmpStr(recvBuf, TURNOFF, 3)){
+                      a2 = false;
+                      logInfo("A2 is off!"); 
+                    }    
+                } 
+            }
+            
+            osDelay(std::max((uint32_t)5000, (uint32_t)dot->getNextTxMs()));
+
+            // send the data to the gateway
+            if ((ret = dot->send(sendData3)) != mDot::MDOT_OK) {
+               send_failed++; 
+               logError("failed to send", ret, mDot::getReturnCodeString(ret).c_str());
+               osDelay(std::max((uint32_t)5000, (uint32_t)dot->getNextTxMs()));
+            } else { 
+                send_failed=0;            
+                logInfo("successfully sent data to gateway");  
+                for(i=0;i<11;i++)recvBuf[i]=0; //clear recv buffer
+                recvData.clear(); //clear recv data
+                if ((ret = dot->recv(recvData)) != mDot::MDOT_OK) {
+                   logError("failed to recv: [%d][%s]", ret, mDot::getReturnCodeString(ret).c_str());
+                } else {
+                   //logInfo("datasize = %d", recvData.size());
+                   for(i=0; i< recvData.size(); i++ )
+                     recvBuf[i] = recvData[i];
+                   //logInfo("RECV:%s", recvBuf);
+                   if(cmpStr(recvBuf, TURNON, 2)){
+                      a3 = true;
+                      logInfo("A3 is on!"); 
+                    } 
+                    if(cmpStr(recvBuf, TURNOFF, 3)){
+                      a3 = false;
+                      logInfo("A3 is off!"); 
+                    }    
+                } 
+            }
+            
+            osDelay(std::max((uint32_t)5000, (uint32_t)dot->getNextTxMs()));
+            
+            // send the data to the gateway
+            if ((ret = dot->send(sendData4)) != mDot::MDOT_OK) {
+               send_failed++; 
+               logError("failed to send", ret, mDot::getReturnCodeString(ret).c_str());
+               osDelay(std::max((uint32_t)5000, (uint32_t)dot->getNextTxMs()));
+            } else { 
+                send_failed=0;            
+                logInfo("successfully sent data to gateway");  
+                for(i=0;i<11;i++)recvBuf[i]=0; //clear recv buffer
+                recvData.clear(); //clear recv data
+                if ((ret = dot->recv(recvData)) != mDot::MDOT_OK) {
+                   logError("failed to recv: [%d][%s]", ret, mDot::getReturnCodeString(ret).c_str());
+                } else {
+                   //logInfo("datasize = %d", recvData.size());
+                   for(i=0; i< recvData.size(); i++ )
+                     recvBuf[i] = recvData[i];
+                   //logInfo("RECV:%s", recvBuf);
+                   if(cmpStr(recvBuf, TURNON, 2)){
+                      a4 = true;
+                      logInfo("A4 is on!"); 
+                    } 
+                    if(cmpStr(recvBuf, TURNOFF, 3)){
+                      a4 = false;
+                      logInfo("A4 is off!"); 
+                    }    
                 } 
             }
             osDelay(std::max((uint32_t)5000, (uint32_t)dot->getNextTxMs()));
-          #endif
-        } 
-        
-        //handle the alarm
-        if(alarm_on){
-           logInfo("Turn on the alarm");
-           Alarm = 1;
-        }else{
-           logInfo("Turn off the alarm");
-            Alarm = 0;
-        }
+            
+            if(a1 || a2 || a3 || a4){
+                logInfo("============================");
+                logInfo("Alarm is ON");
+                Alarm = 1;
+            }else{
+                logInfo("============================");
+                logInfo("Alarm is OFF");
+                Alarm = 0;
+            }
+            
+            osDelay(std::max((uint32_t)5000, (uint32_t)dot->getNextTxMs()));
+                         
         
         if(send_failed>=3){
+           send_failed=0;           
            // attempt to rejoin the network
            logInfo("Attemp to rejoin network....");
            if ((ret = dot->joinNetworkOnce()) != mDot::MDOT_OK) {
                 logError("Failed to rejoin network!"); // %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
            }else{
-                logInfo("Rejoin network successfully!");    
+                logInfo("Rejoin network successfully!");   
            } 
            osDelay(std::max((uint32_t)5000, (uint32_t)dot->getNextTxMs()));
         }
         
-        //printf("++++++++++++++++++++++\t"); 
-        // in the 868 (EU) frequency band, we need to wait until another channel is available before transmitting again
-     #ifndef NO_MULTITECH_GATEWAY
-        osDelay(std::max((uint32_t)5000, (uint32_t)dot->getNextTxMs()));
-     #else
-        osDelay(1000);
-     #endif
     }
 
 }