Dependencies:   W5500Interface mbed-rpc mbed

Fork of HTTP-Server by Francois Berder

Files at this revision

API Documentation at this revision

Comitter:
embeddist
Date:
Tue Apr 28 13:54:18 2015 +0000
Parent:
10:8b4c3d605bf0
Commit message:
ported HTTP-Server with W5500 Ethernet Shield

Changed in this revision

EthernetInterface.lib Show diff for this revision Revisions of this file
Formatter.cpp Show annotated file Show diff for this revision Revisions of this file
Formatter.h Show annotated file Show diff for this revision Revisions of this file
W5500Interface.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
mbed-rpc.lib Show annotated file Show diff for this revision Revisions of this file
mbed-rtos.lib Show diff for this revision Revisions of this file
mbed.bld Show annotated file Show diff for this revision Revisions of this file
diff -r 8b4c3d605bf0 -r ac3569846176 EthernetInterface.lib
--- a/EthernetInterface.lib	Thu Jul 18 10:10:14 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/users/feb11/code/EthernetInterface/#f533841d34cb
diff -r 8b4c3d605bf0 -r ac3569846176 Formatter.cpp
--- a/Formatter.cpp	Thu Jul 18 10:10:14 2013 +0000
+++ b/Formatter.cpp	Tue Apr 28 13:54:18 2015 +0000
@@ -142,12 +142,16 @@
 Formatter(3)
 {
 }
+extern char ipaddr_backup[17];
 
 void InteractiveHTMLFormatter::get_chunk(const int c, char *reply)
 {
     if(c == 0)
-        sprintf(chunk, INTERACTIVE_HTML_CODE_1, EthernetInterface::getIPAddress());
-
+    {
+        //srintf(chunk, INTERACTIVE_HTML_CODE_1, "192.168.77.34");
+        sprintf(chunk, INTERACTIVE_HTML_CODE_1, ipaddr_backup);
+        //sprintf(chunk, INTERACTIVE_HTML_CODE_1, EthernetInterface::getIPAddress());
+    }
     else if(c == 1)
     {
         if(reply != NULL && strlen(reply) != 0)
@@ -167,7 +171,8 @@
                 strcat(chunk, "<li>");
                 strcat(chunk, *itor);
                 strcat(chunk, " (<a href=\"http://");
-                strcat(chunk, EthernetInterface::getIPAddress());
+                //strcat(chunk, EthernetInterface::getIPAddress());
+                strcat(chunk, "192.168.77.34");
                 strcat(chunk, "/");
                 strcat(chunk, *itor);
                 strcat(chunk, "/delete\">delete</a>)");
diff -r 8b4c3d605bf0 -r ac3569846176 Formatter.h
--- a/Formatter.h	Thu Jul 18 10:10:14 2013 +0000
+++ b/Formatter.h	Tue Apr 28 13:54:18 2015 +0000
@@ -1,7 +1,6 @@
 #ifndef FORMATTER
 #define FORMATTER
 
-
 class Formatter
 {
     public :
@@ -41,6 +40,7 @@
     protected :
         
         virtual void get_chunk(const int c, char *reply);
+
 };
 
 
diff -r 8b4c3d605bf0 -r ac3569846176 W5500Interface.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/W5500Interface.lib	Tue Apr 28 13:54:18 2015 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/teams/EthernetInterfaceW5500-makers/code/W5500Interface/#5499fa2d8898
diff -r 8b4c3d605bf0 -r ac3569846176 main.cpp
--- a/main.cpp	Thu Jul 18 10:10:14 2013 +0000
+++ b/main.cpp	Tue Apr 28 13:54:18 2015 +0000
@@ -9,6 +9,9 @@
 
 #define SERVER_PORT 80
 
+char ipaddr_backup[17];
+uint8_t mac_addr[6] = {0x00, 0x08, 0xDC, 0x00, 0x01, 0x02};
+
 HTTPServer create_simple_server()
 {    
     HTTPServer srv;
@@ -28,9 +31,20 @@
 int main(void)
 {
     RPCType::instance().register_types();    
+ /* //for LPC1768
+    SPI spi(p5, p6, p7); // mosi, miso, sclk
+    spi.frequency(12500000);     
+    EthernetInterface eth(&spi, p8, p11); // spi, cs, reset
+*/    
+    SPI spi(D11, D12, D13); // mosi, miso, sclk
+    //spi.frequency(12500000);     
+    EthernetInterface eth(&spi, D10, D9); // spi, cs, reset
 
-    EthernetInterface eth;
-    if(eth.init())
+    //EthernetInterface eth;
+    //if(eth.init())
+//    int ret = eth.init("192.168.77.34", "255.255.255.0", "192.168.77.1");    
+    int ret = eth.init(mac_addr, "192.168.77.34", "255.255.255.0", "192.168.77.1");    
+    if(ret)
     {
         printf("Error while initializing the ethernet interface.\n");
         return -1;
@@ -42,7 +56,7 @@
     }
     
     printf("IP Address is %s\n", eth.getIPAddress());
-    
+    strcpy(ipaddr_backup,eth.getIPAddress());
     HTTPServer srv = create_interactive_server();
 
     if(!srv.init(SERVER_PORT))
diff -r 8b4c3d605bf0 -r ac3569846176 mbed-rpc.lib
--- a/mbed-rpc.lib	Thu Jul 18 10:10:14 2013 +0000
+++ b/mbed-rpc.lib	Tue Apr 28 13:54:18 2015 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/mbed-rpc/#1ecadde1c929
+http://mbed.org/users/mbed_official/code/mbed-rpc/#fece2d5e8d96
diff -r 8b4c3d605bf0 -r ac3569846176 mbed-rtos.lib
--- a/mbed-rtos.lib	Thu Jul 18 10:10:14 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/users/mbed_official/code/mbed-rtos/#58b30ac3f00e
diff -r 8b4c3d605bf0 -r ac3569846176 mbed.bld
--- a/mbed.bld	Thu Jul 18 10:10:14 2013 +0000
+++ b/mbed.bld	Tue Apr 28 13:54:18 2015 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/mbed/builds/b3110cd2dd17
\ No newline at end of file
+http://mbed.org/users/mbed_official/code/mbed/builds/4fc01daae5a5
\ No newline at end of file