Diff: LiaisonBluetooth.cpp

Revision:

14:7118ea22e01f

Parent:

13:20c2439438dd

Child:

15:7d159715eb14

--- a/LiaisonBluetooth.cpp	Tue May 01 10:08:41 2018 +0000
+++ b/LiaisonBluetooth.cpp	Mon May 07 13:43:57 2018 +0000
@@ -87,6 +87,12 @@
     m_bluetooth->putc(MARQUEUR_FIN_TRAME);
 }
 
+void envoyer_short(char indentifiant, short data) {
+    char buffer[7];
+    memset(buffer, '\0', 7);
+    sprintf(buffer, "%hd", data);
+    envoyer(identifiant, 7, buffer);
+}
 
 PaquetDomotique *creer_paquetdomotique(int identifiant, unsigned int longueur_data, char *data)
 {
@@ -107,18 +113,9 @@
     free(paquet);
 }
 
-char *convertir_int_en_4char(unsigned int integer)
-{
-    char *data = new char[4];
-
-    data[3] = (integer>>24) & 0xFF;
-    data[2] = (integer>>16) & 0xFF;
-    data[1] = (integer>>8) & 0xFF;
-    data[0] = integer & 0xFF;
-
-    return data;
+short convertir_score(Paquet *paquet) {
+    char buff[20];
+    memset(buff, '\0', 20);
+    strncpy(buff, paquet->data, paquet->longueur);
+    return atoi(buff);
 }
-unsigned int convertir_4char_en_int(char data[4])
-{
-    return (data[3] << 24) | (data[2] << 16) | (data[1] << 8) | data[0];
-}