Revision 6:aa2b63dc24f3, committed 2011-11-15

Comitter:

samux

Date:

Tue Nov 15 19:40:28 2011 +0000

Parent:

5:f34f1ae8de92

Child:

7:ecad5b72fa16

Commit message:

Changed in this revision

--- a/ADXL345.lib	Tue Oct 25 06:57:32 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/users/aberk/code/ADXL345/#bd8f0f20f433

--- a/Websocket.lib	Tue Oct 25 06:57:32 2011 +0000
+++ b/Websocket.lib	Tue Nov 15 19:40:28 2011 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/samux/code/Websocket/#ca8c5ad59850
+http://mbed.org/users/samux/code/Websocket/#2c4462ca74fa

--- a/Wifly.lib	Tue Oct 25 06:57:32 2011 +0000
+++ b/Wifly.lib	Tue Nov 15 19:40:28 2011 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/samux/code/Wifly/#92ee976db7b9
+http://mbed.org/users/samux/code/Wifly/#f524a28790b1

--- a/main.cpp	Tue Oct 25 06:57:32 2011 +0000
+++ b/main.cpp	Tue Nov 15 19:40:28 2011 +0000
@@ -1,51 +1,29 @@
-#include "mbed.h"
-#include "Websocket.h"
-#include "ADXL345.h"
-
-Serial pc(USBTX, USBRX);
-
-ADXL345 accelerometer(p5, p6, p7, p8);
-
-//Here, we create a Websocket instance in 'wo' (write) mode
-//on the 'samux' channel
-Websocket ws("ws://sockets.mbed.org/ws/samux/wo");
-
-int main() {
-    char json_str[100];
-
-    int readings[3] = {0, 0, 0};
-
-    pc.printf("Starting ADXL345 test...\r\n");
-    pc.printf("Device ID is: 0x%02x\r\n", accelerometer.getDevId());
-
-    //Go into standby mode to configure the device.
-    accelerometer.setPowerControl(0x00);
-
-    //Full resolution, +/-16g, 4mg/LSB.
-    accelerometer.setDataFormatControl(0x0B);
-
-    //3.2kHz data rate.
-    accelerometer.setDataRate(ADXL345_3200HZ);
-
-    //Measurement mode.
-    accelerometer.setPowerControl(0x08);
-
-
-    while (1) {
-    
-        while(!ws.connect())
-            pc.printf("cannot connect websocket, retrying\r\n");
-        
-        while (1) {
-            wait(0.1);
-
-            //we read accelerometers values
-            accelerometer.getOutput(readings);
-
-            //Here, we format the string we will be sending to the server
-            //the format we are sending in is JSON
-            sprintf(json_str, "{\"id\":\"wifly_acc\",\"ax\":\"%d\",\"ay\":\"%d\",\"az\":\"%d\"}", (int16_t)readings[0], (int16_t)readings[1], (int16_t)readings[2]);
-            ws.send(json_str);
-        }
-    }
+#include "mbed.h"
+#include "Websocket.h"
+
+Serial pc(USBTX, USBRX);
+Timer tmr;
+
+//Here, we create a Websocket instance in 'rw' (write) mode
+//on the 'test' channel
+Websocket ws("ws://sockets.mbed.org/ws/test/rw");
+
+int main() {
+    while (1) {
+    
+        while(!ws.connect())
+            pc.printf("cannot connect websocket, retrying\r\n");
+        
+        tmr.start();
+        while (1) {
+            if(tmr.read() > 1)
+            {
+                //Here, we format the string we will be sending to the server
+                //the format we are sending in is JSON
+                ws.send("Hello World");
+                tmr.start();
+            }
+            Net::poll();
+        }
+    }
 }
\ No newline at end of file