Diff: main.cpp

Revision:

17:6e0c4c0e0fe2

Parent:

16:fc7d8cc6bf4b

Child:

18:e3827d5dbdd9

--- a/main.cpp	Tue May 09 11:23:21 2017 +0000
+++ b/main.cpp	Wed May 10 08:54:18 2017 +0000
@@ -72,12 +72,21 @@
 
 //Fonction pour créer et envoyer la chaine d'infos en BLE
 //On balance tout en float, même pour des int...Qui peut le plus peut le moins...
-//3 par 3 ça passe juste avec un décimal....Sinon faire deux par deux ???
-void build_send_Message(string com, float A, float B, float C)
+//deux par deux, methode pour de int et methode pour des float
+void build_send_Message_float(string com, float A, float B)
 {
     char buf[50];
-    sprintf(buf,"%s%.1f:%.1f:%.1f\r\n", com, A, B, C);
+    sprintf(buf,"%s%.1f:%.1f\r\n", com.c_str(), A, B);
     uartServicePtr->writeString(buf);
+    wait_ms(100);
+}
+
+void build_send_Message_int(string com, int A, int B)
+{
+    char buf[50];
+    sprintf(buf,"%s%d:%d\r\n", com.c_str(), A, B);
+    uartServicePtr->writeString(buf);
+    wait_ms(100);
 }
 
 void disconnectionCallback(const Gap::DisconnectionCallbackParams_t *params)
@@ -146,11 +155,16 @@
             }
         else
 */
+
+        //En accord avec app Android
         if (strcmp(commande, "t") == 0) {
-            build_send_Message("t", ppO2, co2, pression);
+            build_send_Message_int("t", co2, ppO2);
         }else
         if (strcmp(commande, "u") == 0) {
-            build_send_Message("u", Temp1, Temp2, Humi);
+            build_send_Message_float("u", Temp1, Temp2);
+        }else
+        if (strcmp(commande, "v") == 0) {
+            build_send_Message_float("v", Humi, pression);
         }
     }
 }
@@ -246,7 +260,7 @@
     ble.accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED);
     ble.setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
     ble.accumulateAdvertisingPayload(GapAdvertisingData::SHORTENED_LOCAL_NAME,
-                                     (const uint8_t *)"BLE UART", sizeof("BLE UART") - 1);
+                                     (const uint8_t *)"ARNSRS", sizeof("ARNSRS") - 1);
     ble.accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LIST_128BIT_SERVICE_IDS,
                                      (const uint8_t *)UARTServiceUUID_reversed, sizeof(UARTServiceUUID_reversed));
 
@@ -307,8 +321,10 @@
         //Data LOG
         if (NEED_SD_DATA_LOG == 1) DATA_LOG();
         
-        build_send_Message("t", ppO2, co2, pression);
-        build_send_Message("u", Temp1, Temp2, Humi);
+        //En accord avec app Android
+            build_send_Message_int("t", co2, ppO2);
+            build_send_Message_float("u", Temp1, Temp2);
+            build_send_Message_float("v", Humi, pression);
         
     }
 }