Revision 1:fae5b4e9987e, committed 2011-06-24

Comitter:

TP

Date:

Fri Jun 24 20:41:52 2011 +0000

Parent:

0:a4a5adb694e5

Commit message:

Changed in this revision

diff -r a4a5adb694e5 -r fae5b4e9987e HttpServerExample.cpp
--- a/HttpServerExample.cpp	Mon Jun 13 19:06:09 2011 +0000
+++ b/HttpServerExample.cpp	Fri Jun 24 20:41:52 2011 +0000
@@ -2,11 +2,14 @@
 #include "EthernetNetIf.h"
 #include "HttpServer.h"
 #include "TextLCD.h"
+//#include "HTTPRPC.h"
+//#include "HTTPFS.h"
 
 DigitalOut led1(LED1, "led1");
 DigitalOut led2(LED2, "led2");
 DigitalOut led3(LED3, "led3");
 DigitalOut led4(LED4, "led4");
+AnalogIn   ain(p15, "potm");
 
 LocalFileSystem fs("webfs");
 
@@ -14,45 +17,43 @@
 TextLCD lcd(p26,p24,p23,p22,p20,p19, TextLCD::LCD20x4);
 
 
-EthernetNetIf eth;  
+EthernetNetIf eth;
 HttpServer svr;
 
 int main() {
-  rw = 0;
+    rw = 0;
+
+    Base::add_rpc_class<DigitalOut>();
+    Base::add_rpc_class<AnalogIn>();
+    lcd.cls();
+    lcd.printf("Setting up..");
+    EthernetErr ethErr = eth.setup();
+    if (ethErr) {
+        lcd.printf("Error %d\n", ethErr);
+        return -1;
+    }
+    lcd.printf("OK\n");
+    IpAddr addr = eth.getIp();
 
-  Base::add_rpc_class<DigitalOut>();
-  lcd.cls();
-  lcd.printf("Setting up..");
-  EthernetErr ethErr = eth.setup();
-  if(ethErr)
-  {
-    lcd.printf("Error %d\n", ethErr);
-    return -1;
-  }
-  lcd.printf("OK\n");
-  
-  svr.addHandler<SimpleHandler>("/hello");
-  svr.addHandler<RpcHandler>("/rpc");
-  svr.addHandler<FSHandler>(""); //Default handler
-  //Example : Access to mbed.htm : http://a.b.c.d/webfs/demo.htm
-  //Zet demo.htm in de root van de mbed.
-  svr.bind(80);
-  
-  lcd.printf("Listening..see:\nhttp://a.b.c.d/webfs/demo.htm");
-    
-  Timer tm;
-  tm.start();
-  //Listen indefinitely
-  while(true)
-  {
-    Net::poll();
-    if(tm.read()>.5)
-    {
-      led1=!led1; //Show that we are alive
-      tm.start();
+//    svr.addHandler(new HttpServer());
+    svr.addHandler<SimpleHandler>("/hello");
+    svr.addHandler<RpcHandler>("/rpc");
+    svr.addHandler<FSHandler>(""); //Default handler
+    //Zet demo.htm in de root van de mbed.
+    svr.bind(80);
+
+    lcd.printf("Listening at http://%3d.%3d.%3d.%3d/webfs/demo.htm", addr[0], addr[1], addr[2], addr[3]);
+
+    Timer tm;
+    tm.start();
+    //Listen indefinitely
+    while (true) {
+        Net::poll();
+        if (tm.read()>.5) {
+            led1=!led1; //Show that we are alive
+            tm.start();
+        }
     }
-  }
-  
-  return 0;
+
 
 }