Diff: examples/AdvancedChatServer/AdvancedChatServer.ino

Revision:

11:3fb19220d9ec

Parent:

0:e3fb1267e3c3

Child:

32:e77cbe3783e5

diff -r cd62b2205c2a -r 3fb19220d9ec examples/AdvancedChatServer/AdvancedChatServer.ino
--- a/examples/AdvancedChatServer/AdvancedChatServer.ino	Thu Dec 29 11:18:05 2016 +0000
+++ b/examples/AdvancedChatServer/AdvancedChatServer.ino	Thu Dec 29 13:07:19 2016 +0100
@@ -20,13 +20,21 @@
 
  */
 
+#if defined(__MBED__)
+  #include <mbed.h>
+  #include "mbed/millis.h"
+  #define delay(x) wait_ms(x)
+  #define PROGMEM
+  #include "mbed/Print.h"
+#endif
+
 #include <UIPEthernet.h>
 #include <utility/logging.h>
 
 // Enter a MAC address and IP address for your controller below.
 // The IP address will be dependent on your local network.
 
-byte mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
+uint8_t mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
 IPAddress ip(192,168,0,6);
 
 // telnet defaults to port 23
@@ -34,14 +42,25 @@
 
 EthernetClient clients[4];
 
+#if defined(ARDUINO)
 void setup() {
+#endif  
+#if defined(__MBED__)
+int main() {
+#endif  
   // initialize the ethernet device
   Ethernet.begin(mac, ip);
   // start listening for clients
   server.begin();
  // Open serial communications and wait for port to open:
   #if ACTLOGLEVEL>LOG_NONE
-    LogObject.begin(9600);
+
+    #if defined(ARDUINO)
+      LogObject.begin(9600);
+    #endif
+    #if defined(__MBED__)
+      Serial LogObject(SERIAL_TX,SERIAL_RX);
+    #endif
     while (!LogObject)
       {
       ; // wait for serial port to connect. Needed for Leonardo only
@@ -50,18 +69,30 @@
 
   #if ACTLOGLEVEL>=LOG_INFO
     LogObject.uart_send_str(F("Chat server address:"));
-    LogObject.println(Ethernet.localIP());
+    #if defined(ARDUINO)
+      LogObject.println(Ethernet.localIP());
+    #endif  
+    #if defined(__MBED__)
+      LogObject.printf("%d.%d.%d.%d",Ethernet.localIP()[0],Ethernet.localIP()[1],Ethernet.localIP()[2],Ethernet.localIP()[3]);
+    #endif  
   #endif
+
+#if defined(ARDUINO)
 }
 
 void loop() {
+#endif  
+
+#if defined(__MBED__)
+while(true) {
+#endif  
   // wait for a new client:
   EthernetClient client = server.available();
 
   if (client) {
 
     bool newClient = true;
-    for (byte i=0;i<4;i++) {
+    for (uint8_t i=0;i<4;i++) {
       //check whether this client refers to the same socket as one of the existing instances:
       if (clients[i]==client) {
         newClient = false;
@@ -71,7 +102,7 @@
 
     if (newClient) {
       //check which of the existing clients can be overridden:
-      for (byte i=0;i<4;i++) {
+      for (uint8_t i=0;i<4;i++) {
         if (!clients[i] && clients[i]!=client) {
           clients[i] = client;
           // clead out the input buffer:
@@ -81,9 +112,9 @@
           #if ACTLOGLEVEL>=LOG_INFO
             LogObject.uart_send_strln(F("We have a new client"));
           #endif
-          client.println(F("Hello, client!"));
-          client.print(F("my IP: "));
-          client.println(Ethernet.localIP());
+            client.println(F("Hello, client!"));
+            client.print(F("my IP: "));
+            client.println(Ethernet.localIP());
           break;
         }
       }
@@ -93,21 +124,30 @@
       // read the bytes incoming from the client:
       char thisChar = client.read();
       // echo the bytes back to all other connected clients:
-      for (byte i=0;i<4;i++) {
+      for (uint8_t i=0;i<4;i++) {
         if (clients[i] && clients[i]!=client) {
           clients[i].write(thisChar);
         }
       }
       // echo the bytes to the server as well:
       #if ACTLOGLEVEL>=LOG_INFO
-        LogObject.write(thisChar);
+        #if defined(ARDUINO)
+          LogObject.write(thisChar);
+        #endif  
+        #if defined(__MBED__)
+          LogObject.putc(thisChar);
+        #endif  
       #endif
     }
   }
-  for (byte i=0;i<4;i++) {
+  for (uint8_t i=0;i<4;i++) {
     if (!(clients[i].connected())) {
       // client.stop() invalidates the internal socket-descriptor, so next use of == will allways return false;
       clients[i].stop();
     }
   }
 }
+
+#if defined(__MBED__)
+}
+#endif