Added new CONCAT() and CONCAT_EXPANDED() convenience macros.

[pub/USBasp.git] / Projects / Webserver / Config / AppConfig.h

diff --git a/Projects/Webserver/Config/AppConfig.h b/Projects/Webserver/Config/AppConfig.h
index e2a9cd4..933b108 100644 (file)
--- a/Projects/Webserver/Config/AppConfig.h
+++ b/Projects/Webserver/Config/AppConfig.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2012.
+     Copyright (C) Dean Camera, 2013.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this

   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages


@@ -48,6 +48,11 @@
        #define ENABLE_TELNET_SERVER
        #define MAX_URI_LENGTH                50
 
        #define ENABLE_TELNET_SERVER
        #define MAX_URI_LENGTH                50
 

+       #define DEVICE_IP_ADDRESS             (uint8_t[]){ 10,   0,   0,   2}
+       #define DEVICE_NETMASK                (uint8_t[]){255, 255, 255,   0}
+       #define DEVICE_GATEWAY                (uint8_t[]){ 10,   0,   0,   1}
+       #define SERVER_MAC_ADDRESS            (uint8_t[]){  1,   0,   1,   0,   1,   0}
+       

        #define UIP_CONF_UDP                  (defined(ENABLE_DHCP_CLIENT) || defined(ENABLE_DHCP_SERVER))
        #define UIP_CONF_BROADCAST            1
        #define UIP_CONF_TCP                  1
        #define UIP_CONF_UDP                  (defined(ENABLE_DHCP_CLIENT) || defined(ENABLE_DHCP_SERVER))
        #define UIP_CONF_BROADCAST            1
        #define UIP_CONF_TCP                  1