Projet_S5 / Mbed 2 deprecated Repo_Noeud_Mobile_refactor

Dependencies:   mbed-rtos mbed

Fork of Repo_Noeud_Mobile by Projet_S5

Committer:
llarose
Date:
Sun Mar 22 17:32:47 2015 +0000
Revision:
21:98232c148ed6
Parent:
19:19adf49351b0
Parent:
20:96280625532c
Child:
22:cccb77300fd5
merging

Who changed what in which revision?

UserRevisionLine numberNew contents of line
pete1801 9:b8503f5ad3bd 1 #include "mbed.h"
pete1801 9:b8503f5ad3bd 2 #include "rtos.h"
llarose 20:96280625532c 3 #include "Structure.h"
pete1801 9:b8503f5ad3bd 4
pete1801 9:b8503f5ad3bd 5 class Xbee
pete1801 9:b8503f5ad3bd 6 {
pete1801 9:b8503f5ad3bd 7 public :
pete1801 9:b8503f5ad3bd 8 Xbee();
pete1801 9:b8503f5ad3bd 9 Xbee(short panId, PinName pinTx, PinName pinRx);
pete1801 9:b8503f5ad3bd 10 ~Xbee();
pete1801 9:b8503f5ad3bd 11 Mail<message,32> Mailbox;
llarose 21:98232c148ed6 12 <<<<<<< local
pete1801 9:b8503f5ad3bd 13
Thierry19 19:19adf49351b0 14 void EnvoyerDonnees(char data[], int messageSize);
llarose 21:98232c148ed6 15 =======
llarose 21:98232c148ed6 16 >>>>>>> other
pete1801 9:b8503f5ad3bd 17 void Envoyer(char array[], int size);
pete1801 9:b8503f5ad3bd 18 void Recevoir();
pete1801 9:b8503f5ad3bd 19 private:
pete1801 9:b8503f5ad3bd 20 Serial* XbeePin;
pete1801 9:b8503f5ad3bd 21 short PanId;
pete1801 9:b8503f5ad3bd 22 void SetPanId(short panId);
pete1801 9:b8503f5ad3bd 23 };