Merge remote-tracking branch 'origin/master'

apps/YellowSensorToCloud/components/sensors/bsec/component.c

@@ -3,8 +3,8 @@
 #include <jansson.h>
 
 /// Input resource path
-#define RES_PATH_VALUE        "bme/value"
-#define RES_PATH_CONFIG       "bme/config"
+#define RES_PATH_VALUE        "bsec/value"
+#define RES_PATH_CONFIG       "bsec/config"
 #define VALUE_EXAMPLE "{\"timestamp\":1,\"iaqValue\":1,\"iaqAccuracy\":1,\"co2EquivalentValue\":1,"\
                       "\"co2EquivalentAccuracy\":1,\"breathVocValue\":1,\"breathVocAccuracy\":1,"\
                       "\"pressure\":1,\"temperature\":1,\"humidity\":1 }"

apps/locationService/combain/CombainHttp.cpp

@@ -100,12 +100,13 @@ void *CombainHttpThreadFunc(void *context)
             le_event_Report(ResponseAvailableEvent, NULL, 0);
         }
 
-        std::string json((char*)HttpReceiveBuffer.data, HttpReceiveBuffer.used);
-
-        LE_INFO("RECEIVED %d char: %s", HttpReceiveBuffer.used, (char*) HttpReceiveBuffer.data);
-
-        ResponseJson->enqueue(std::make_tuple(handle, json));
-        le_event_Report(ResponseAvailableEvent, NULL, 0);
+        else
+        {
+            std::string json((char*)HttpReceiveBuffer.data, HttpReceiveBuffer.used);
+            LE_INFO("RECEIVED %d char: %s", HttpReceiveBuffer.used, (char*) HttpReceiveBuffer.data);
+            ResponseJson->enqueue(std::make_tuple(handle, json));
+            le_event_Report(ResponseAvailableEvent, NULL, 0);
+        }
 
         curl_easy_cleanup(curl);
 

apps/locationService/components/location.c

@@ -294,7 +294,7 @@ static void LocationResultHandler(
 
 static bool TrySubmitRequest(void)
 {
-    if (!State.waitingForWifiResults)
+    if (!State.waitingForWifiResults && State.waitingForCombainResults == false)
     {
         LE_INFO("Attempting to submit location request");
         const le_result_t res = ma_combainLocation_SubmitLocationRequest(
@@ -369,17 +369,16 @@ static void WifiEventHandler(le_wifiClient_Event_t event, void *context)
 
                     if (res != LE_OK)
                     {
-                        LE_INFO("Failed to append WiFi scan results to combain request\n");
-                        exit(1);
+                        LE_INFO("Failed to append a WiFi scan result to combain request\n");
                     }
 
                     ap = le_wifiClient_GetNextAccessPoint();
                 }
-                if (WifiStarted)
+                /* if (WifiStarted)
                 {
                     le_wifiClient_Stop();
                     WifiStarted = false;
-                }
+                } */
 
                 TrySubmitRequest();
             }
@@ -388,11 +387,11 @@ static void WifiEventHandler(le_wifiClient_Event_t event, void *context)
         default:
         {
             LE_INFO("WiFi scan failed\n");
-            if (WifiStarted)
+            /*if (WifiStarted)
             {
                 le_wifiClient_Stop();
                 WifiStarted = false;
-            }
+            }*/
             ma_combainLocation_DestroyLocationRequest(State.combainHandle);
             State.waitingForWifiResults = false;
             UseGpsScan();
@@ -450,8 +449,7 @@ static void Sample
             GpsScan = &SavedGpsScan;
         }    
 
-        if (!State.waitingForWifiResults) {
-
+        if (!State.waitingForWifiResults && State.waitingForCombainResults == false) {
             if (!createdAccessPoint)
             {
                 createdAccessPoint = le_wifiClient_Create((const uint8_t *)ssidPtr, strlen(ssidPtr));
@@ -469,16 +467,22 @@ static void Sample
                 }
             }
 
-            startRes = le_wifiClient_Start();
+            if (WifiStarted == false) {
+                startRes = le_wifiClient_Start();
 
-            if (startRes != LE_OK && startRes != LE_BUSY) {
-                LE_INFO("Couldn't start the WiFi service error code: %s", LE_RESULT_TXT(startRes));
-		WifiStarted = true;
+                if (startRes != LE_OK && startRes != LE_BUSY) {
+                    LE_INFO("Couldn't start the WiFi service error code: %s", LE_RESULT_TXT(startRes));
+		    WifiStarted = false;
+                }
+                else
+		    WifiStarted = true;
             }
 
-            saved_ref = ref;
-            le_wifiClient_Scan();
-            State.waitingForWifiResults = true;
+            if (WifiStarted == true) {
+                saved_ref = ref;
+                le_wifiClient_Scan();
+                State.waitingForWifiResults = true;
+            }
         }
         else
             LE_INFO("le_wifiClient_Scan still RUNNING");