aboutsummaryrefslogtreecommitdiff
path: root/Projects/Webserver/Lib/uIPManagement.h
diff options
context:
space:
mode:
authorDean Camera <[email protected]>2012-05-27 19:12:07 +0000
committerDean Camera <[email protected]>2012-05-27 19:12:07 +0000
commit2ff1370221d3650a6bc0523c93c2f0d37508f408 (patch)
treeb1d7f7a2a7dbebaf76e43e0f977d227d0cabf95a /Projects/Webserver/Lib/uIPManagement.h
parentb017b41e91f7eb7bb83d1466b45c24e01ac2e309 (diff)
parent1e42f7bd46fbef1e67f50741e4fe1a5ea3a70869 (diff)
downloadqmk_firmware-2ff1370221d3650a6bc0523c93c2f0d37508f408.tar.gz
qmk_firmware-2ff1370221d3650a6bc0523c93c2f0d37508f408.zip
Merge in AppConfigHeaders branch to trunk, altering all projects and demos to use configuration headers for application and LUFA compile time settings, rather than defines in the project makefiles.
Diffstat (limited to 'Projects/Webserver/Lib/uIPManagement.h')
-rw-r--r--Projects/Webserver/Lib/uIPManagement.h20
1 files changed, 2 insertions, 18 deletions
diff --git a/Projects/Webserver/Lib/uIPManagement.h b/Projects/Webserver/Lib/uIPManagement.h
index 390d3c4480..3e4e6a754c 100644
--- a/Projects/Webserver/Lib/uIPManagement.h
+++ b/Projects/Webserver/Lib/uIPManagement.h
@@ -43,30 +43,14 @@
#include <uip_arp.h>
#include <uip-split.h>
#include <timer.h>
+
+ #include "Config/AppConfig.h"
#include "DHCPClientApp.h"
#include "DHCPServerApp.h"
#include "HTTPServerApp.h"
#include "TELNETServerApp.h"
- /* Macros: */
- /** IP address that the webserver should use once connected to a RNDIS device (when DHCP is disabled). */
- #define DEVICE_IP_ADDRESS (uint8_t[]){10, 0, 0, 2}
-
- /** Netmask that the webserver should once connected to a RNDIS device (when DHCP is disabled). */
- #define DEVICE_NETMASK (uint8_t[]){255, 255, 255, 0}
-
- /** IP address of the default gateway the webserver should use when routing outside the local subnet
- * (when DHCP is disabled).
- */
- #define DEVICE_GATEWAY (uint8_t[]){10, 0, 0, 1}
-
- /** Ethernet MAC address of the virtual webserver. When in device RNDIS mode, the virtual webserver requires
- * a unique MAC address that it can use when sending packets to the RNDIS adapter, which contains a seperate
- * MAC address as set in the RNDIS class driver configuration structure.
- */
- #define SERVER_MAC_ADDRESS (uint8_t[]){1, 0, 1, 0, 1, 0}
-
/* External Variables: */
extern struct uip_eth_addr MACAddress;