Rob Dobson / RdWebServer

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependents:   RdBlindsServer SpideyWallWeb RdGasUseMonitor

Files at this revision

API Documentation at this revision

Revision 29:46998f2e458f, committed 2016-02-08

Comitter:
Bobty
Date:
Mon Feb 08 14:08:42 2016 +0000
Parent:
28:99036ff32459
Commit message:
Fixed RTOS namespace issue

Changed in this revision

RdWebServer.h Show annotated file Show diff for this revision Revisions of this file
RdWebServerDefs.h Show annotated file Show diff for this revision Revisions of this file 
--- a/RdWebServer.h	Mon Feb 08 13:47:29 2016 +0000
+++ b/RdWebServer.h	Mon Feb 08 14:08:42 2016 +0000
@@ -125,7 +125,7 @@
 
 class TCPSocketServer;
 class TCPSocketConnection;
-class Mutex;
+class rtos::Mutex;
 
 class RdWebServer
 {
@@ -134,7 +134,7 @@
         static const int METHOD_GET = 1;
         static const int METHOD_POST = 2;
         static const int METHOD_OPTIONS = 3;
-        RdWebServer(TCPSocketServer& tcpServerSocket, Mutex* pSdCardMutex = NULL);
+        RdWebServer(TCPSocketServer& tcpServerSocket, rtos::Mutex* pSdCardMutex = NULL);
         virtual ~RdWebServer();
         
         bool init(int port, DigitalOut* pStatusLed, char* pBaseWebFolder);

--- a/RdWebServerDefs.h	Mon Feb 08 13:47:29 2016 +0000
+++ b/RdWebServerDefs.h	Mon Feb 08 14:08:42 2016 +0000
@@ -18,8 +18,15 @@
 // Change this to support display of files on the server
 // #define SUPPORT_FOLDER_VIEW 1
 
+// IP Stack choice (if not defined use standard Ethernet library
+//#define RD_WEB_SERVER_USE_CC3000 1
+
+#ifdef RD_WEB_SERVER_CC3000
 #include "cc3000.h"
 #include "TCPSocketConnection.h"
 #include "TCPSocketServer.h"
+#else
+#include "EthernetInterface.h"
+#endif
 
 #endif