Revision 2:28d134cf84f8, committed 2017-04-10

Comitter:

bellavanceo

Date:

Mon Apr 10 21:07:48 2017 +0000

Parent:

1:30d760c7478e

Child:

3:030d126dabab

Commit message:

bob;

Changed in this revision

--- a/main.cpp	Mon Apr 10 19:00:02 2017 +0000
+++ b/main.cpp	Mon Apr 10 21:07:48 2017 +0000
@@ -13,13 +13,16 @@
 DigitalOut myled(LED1);
 Serial pc(USBTX, USBRX);
 //static char* WEBSOCKET_URL= "ws://braceletus.herokuapp.com:8080/"; // Adresse Serveur M-A
-static char* WEBSOCKET_URL = "ws://24.203.139.78:8080/"; // Adresse Serveur M-A
+//static char* WEBSOCKET_URL = "ws://24.203.139.78:8080/"; // Adresse Serveur M-A
+static char* WEBSOCKET_URL = "ws://192.168.0.20:3000/"; // Adresse Serveur M-A
 bool IsReponseRecu;
 char* Reponse = "";
 bool frameIsOk = true;
+int ID;
+
 
 ID12RFID rfid(p10); // uart rx
-
+//EthernetInterface eth;
 Websocket ws(WEBSOCKET_URL);
 
 static void receive_cb(const RemoteXBeeZB& remote, bool broadcast, const uint8_t *const data, uint16_t len)
@@ -31,24 +34,38 @@
     for (int i = 0; i < len; i++)
         pc.printf("%02x ", data[i]);
     int x ;
-    ((char*)&x)[2] = data[1];
-    ((char*)&x)[1] = data[2];
-    ((char*)&x)[0] = data[3];
+    ((char*)&x)[2] = (char)data[1];
+    ((char*)&x)[1] = (char)data[2];
+    ((char*)&x)[0] = (char)data[3];
     pc.printf("%d ", x);
-    ws.send("WS Test"); //envoie de message de chute
+    char message[64];
+    sprintf(message,"1,%d,%d",x,data[0]) ;
+    ws.send(message); //envoie de message de chute
     pc.printf("\r\n");
 }
 
-
+void ReadConfig()
+{
+    char key[10];
+   int panID;
+    FILE * f = fopen("/local/coor.cfg", "r");
+    fscanf(f,"%s %x", key, &panID);
+    //fscanf(f,"%s %x", key, &ID); //lecture du panid
+    //fscanf(f,"%s %d",key, &ID); //lecture du panid
+   
+    fclose(f);
+}
 
 int main()
 {
+    //ReadConfig();
+     
     // Setup du port ethernet
     EthernetInterface eth;
     eth.init(); //Use DHCP
     //eth.init(mbedIp, mbedMask, mbedGateway); //Use config
     eth.connect();
-
+    //printf("IP Address is %s\n\r", eth.getIPAddress());
 
     IsReponseRecu = false;
     XBeeZB xbee = XBeeZB(RADIO_TX, RADIO_RX, RADIO_RESET, NC, NC, 9600);
@@ -57,13 +74,12 @@
     xbee.register_receive_cb(&receive_cb);
 
     RadioStatus const radioStatus = xbee.init();
-    if(ws.connect())
-    {
+    //ws = new Websocket(WEBSOCKET_URL, &eth);
+    if(ws.connect()) {
         pc.printf("ok");
-        }
-        else{
-            pc.printf("bad");
-            }
+    } else {
+        pc.printf("bad");
+    }
 
     myled = false;
 
@@ -73,7 +89,10 @@
         if(rfid.readable()) {
             int i = rfid.read();
             printf("RFID Tag number : %d\n", i);
-            ws.send("WS Test");   //envoie de commande rfid
+            char message[64];
+            sprintf(message,"0,%d,1",i) ;
+            //sprintf(message,"0,%d,%d",i,ID) ;
+            ws.send(message); //envoie de commande rfid
         }
         wait_ms(100);
         // IsReponseRecu = false;