diff options
Diffstat (limited to 'Projects')
| -rw-r--r-- | Projects/TemperatureDataLogger/makefile | 1 | ||||
| -rw-r--r-- | Projects/Webserver/Webserver.c | 6 | ||||
| -rw-r--r-- | Projects/Webserver/Webserver.h | 6 | ||||
| -rw-r--r-- | Projects/Webserver/makefile | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/Projects/TemperatureDataLogger/makefile b/Projects/TemperatureDataLogger/makefile index ab29bb1be..990156f26 100644 --- a/Projects/TemperatureDataLogger/makefile +++ b/Projects/TemperatureDataLogger/makefile @@ -132,6 +132,7 @@ SRC = $(TARGET).c \ Lib/FATFs/ff.c \
Lib/DS1307.c \
$(LUFA_PATH)/LUFA/Drivers/Board/Temperature.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/TWI.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \
diff --git a/Projects/Webserver/Webserver.c b/Projects/Webserver/Webserver.c index 15eb73358..d1764ee84 100644 --- a/Projects/Webserver/Webserver.c +++ b/Projects/Webserver/Webserver.c @@ -245,9 +245,9 @@ void SetupHardware(void) /* uIP Stack Initialization */
uip_init();
uip_ipaddr_t IPAddress, Netmask, GatewayIPAddress;
- uip_ipaddr(&IPAddress, DEVICE_IP_ADDRESS);
- uip_ipaddr(&Netmask, DEVICE_NETMASK);
- uip_ipaddr(&GatewayIPAddress, );
+ uip_ipaddr(&IPAddress, DEVICE_IP_ADDRESS[0], DEVICE_IP_ADDRESS[1], DEVICE_IP_ADDRESS[2], DEVICE_IP_ADDRESS[3]);
+ uip_ipaddr(&Netmask, DEVICE_NETMASK[0], DEVICE_NETMASK[1], DEVICE_NETMASK[2], DEVICE_NETMASK[3]);
+ uip_ipaddr(&GatewayIPAddress, DEVICE_GATEWAY[0], DEVICE_GATEWAY[1], DEVICE_GATEWAY[2], DEVICE_GATEWAY[3]);
uip_sethostaddr(&IPAddress);
uip_setnetmask(&Netmask);
uip_setdraddr(&GatewayIPAddress);
diff --git a/Projects/Webserver/Webserver.h b/Projects/Webserver/Webserver.h index f3aa8d7b8..8d23bc1d5 100644 --- a/Projects/Webserver/Webserver.h +++ b/Projects/Webserver/Webserver.h @@ -56,13 +56,13 @@ /* Macros: */
/** IP address that the webserver should use once connected to a RNDIS device. */
- #define DEVICE_IP_ADDRESS 192, 168, 1, 10
+ #define DEVICE_IP_ADDRESS (uint8_t[]){192, 168, 1, 10}
/** Netmask that the webserver should once connected to a RNDIS device. */
- #define DEVICE_NETMASK 255, 255, 255, 0
+ #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. */
- #define DEVICE_GATEWAY 192, 168, 1, 1
+ #define DEVICE_GATEWAY (uint8_t[]){192, 168, 1, 1}
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
#define LEDMASK_USB_NOTREADY LEDS_LED1
diff --git a/Projects/Webserver/makefile b/Projects/Webserver/makefile index d3b3667c7..27a7850aa 100644 --- a/Projects/Webserver/makefile +++ b/Projects/Webserver/makefile @@ -112,7 +112,7 @@ OBJDIR = . # Path to the LUFA library
-LUFA_PATH = ../../../
+LUFA_PATH = ../../
# LUFA library compile-time options
|