Diff: Example/echoserver.cpp

Revision:

13:1adb19edf716

Parent:

12:52170a866d4a

Child:

15:ae9aff693b07

--- a/Example/echoserver.cpp	Fri Aug 19 02:17:01 2011 +0000
+++ b/Example/echoserver.cpp	Fri Aug 19 02:42:25 2011 +0000
@@ -2,38 +2,34 @@
 #include "EthernetNetIf.h"
 #include "SimpleSocket.h"
 
-void blink(DigitalOut& led, Timer& timer, float interval = 1.0);
-
 int echoserver(int port) {
-    printf("** echoserver **\n");
-    
     DigitalOut led1(LED1);
     DigitalOut led2(LED2);
-
+    
     ServerSocket server(port);
 
     Timer timer;
     timer.start();
 
     while (true) {
-        if (ClientSocket *socket = server.accept()) {
-            while (socket->connected()) {
-                if (socket->available()) {
-                    char buf[8];
-                    int len = socket->read(buf, sizeof(buf));
-                    if (len > 0) socket->write(buf, len);
-                    blink(led1, timer);
+        if (ClientSocket *clientSocket = server.accept()) {
+            while (clientSocket->connected()) {
+                char buf[8];
+                int len = clientSocket->read(buf, sizeof(buf));
+                if (len > 0)
+                    clientSocket->write(buf, len);
+
+                if (timer.read() > 10) {
+                    timer.reset();
+                    timer.start();
+                    led1 = !led1;
                 }
             }
         }
-        blink(led2, timer);
-    }
-}
-
-void blink(DigitalOut& led, Timer& timer, float interval) {
-    if (timer.read() > interval) {
-        timer.reset();
-        timer.start();
-        led = !led;
+        if (timer.read() > 1) {
+            timer.reset();
+            timer.start();
+            led2 = !led2;
+        }
     }
 }
\ No newline at end of file