Projet_S5 / Mbed 2 deprecated Repo_Noeud_Mobile_refactor

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   mbed-rtos mbed

Fork of Repo_Noeud_Mobile by Projet_S5

Diff: Communication/Xbee.h

Revision:
21:98232c148ed6
Parent:
19:19adf49351b0
Parent:
20:96280625532c
Child:
22:cccb77300fd5
--- a/Communication/Xbee.h	Sat Mar 21 19:44:42 2015 +0000
+++ b/Communication/Xbee.h	Sun Mar 22 17:32:47 2015 +0000
@@ -1,19 +1,6 @@
 #include "mbed.h"
 #include "rtos.h"
-
-typedef char GantsID;
-
-typedef struct {
-    GantsID     gants;
-    char     xyz[6];    // donnée accéléromètre.
-    char       majeur;  //Might actually be booleans (to discuss)
-    char       index;
-    char       annulaire;
-} Mobile_Vers_Fixe;
-
-struct message {
-    Mobile_Vers_Fixe donnees;
-};
+#include "Structure.h"
 
 class Xbee
 {
@@ -21,15 +8,16 @@
         Xbee();
         Xbee(short panId, PinName pinTx, PinName pinRx);
         ~Xbee();
-        
         Mail<message,32> Mailbox;
+<<<<<<< local
     
         void EnvoyerDonnees(char data[], int messageSize);
+=======
+>>>>>>> other
         void Envoyer(char array[], int size);
         void Recevoir();
     private:
         Serial* XbeePin;
         short PanId;
-    
         void SetPanId(short panId);
 };
\ No newline at end of file