Changeset 231 for rtos_arduino/trunk

Timestamp:

May 4, 2016, 9:45:02 PM (8 years ago)

Author:

ertl-honda

Message:

セマフォの追加

File:

• rtos_arduino/trunk/arduino_lib/libraries/Milkcocoa_Arduino_SDK/Milkcocoa.cpp (modified) (8 diffs)

rtos_arduino/trunk/arduino_lib/libraries/Milkcocoa_Arduino_SDK/Milkcocoa.cpp

@@ -24 +24 @@
 */
 #include "Milkcocoa.h"
+#include "rca.h"
 
 DataElement::DataElement() {
@@ -124 +125 @@
 
   MILKCOCOA_DEBUG_PRINTLN("Connecting to MQTT... ");
-
+    
+  wai_sem(MILKCOCOA_SEM);
   while ((ret = mqtt->connect()) != 0) { // connect will return 0 for connected
       mqtt->disconnect();
       // Timeout
       if ((tmout !=  0) && (++retry == tmout)) {
+          sig_sem(MILKCOCOA_SEM);
           return ret;
       }
@@ -134 +137 @@
   }
   MILKCOCOA_DEBUG_PRINTLN("MQTT Connected!");
-
+  sig_sem(MILKCOCOA_SEM);
+    
   return 0;  
 }
@@ -144 +148 @@
 
   if((ret = connect(timeout)) != 0){return ret;}
-    
+
+  wai_sem(MILKCOCOA_SEM);    
   sprintf(topic, "%s/%s/push", app_id, path);
   Adafruit_MQTT_Publish pushPublisher = Adafruit_MQTT_Publish(mqtt, topic);
@@ -150 +155 @@
   ret = (pushPublisher.publish(send_array))? 0 : MILKCOCOA_PUSH_ERRORNO;
   free(send_array);
+  sig_sem(MILKCOCOA_SEM);
+    
   return ret;
 }
@@ -159 +166 @@
 
   if((ret = connect(timeout)) != 0){return ret;}
-    
+
+  wai_sem(MILKCOCOA_SEM);        
   sprintf(topic, "%s/%s/send", app_id, path);
   Adafruit_MQTT_Publish pushPublisher = Adafruit_MQTT_Publish(mqtt, topic);
   send_array = pdataelement->toCharArray();
   ret = (pushPublisher.publish(send_array))? 0 : MILKCOCOA_PUSH_ERRORNO;
-  free(send_array);    
+  free(send_array);
+  sig_sem(MILKCOCOA_SEM);
+    
   return ret;
 }
@@ -178 +188 @@
 
   if((ret = connect(timeout)) != 0){return ret;}
-   
+
+  wai_sem(MILKCOCOA_SEM);    
   Adafruit_MQTT_Subscribe *subscription;
   while ((subscription = mqtt->readSubscription(1000))) {
@@ -189 +200 @@
     }
   }
-
+  sig_sem(MILKCOCOA_SEM);
+    
   return 0;  
 }