diff --git a/LUFA/ManPages/LUFAPoweredProjects.txt b/LUFA/ManPages/LUFAPoweredProjects.txt index dfcd712d68..e7561e603a 100644 --- a/LUFA/ManPages/LUFAPoweredProjects.txt +++ b/LUFA/ManPages/LUFAPoweredProjects.txt @@ -33,6 +33,7 @@ * can be incorporated into many different applications. * * - Arcade Controller: http://fletchtronics.net/arcade-controller-made-petunia + * - AVR USB Modem, a 3G Wireless Modem host: http://code.google.com/p/avrusbmodem/ * - Bicycle POV: http://www.code.google.com/p/bicycleledpov/ * - CAMTRIG, a remote Camera Trigger device: http://code.astraw.com/projects/motmot/camtrig * - ClockTamer, a configurable clock generator: http://code.google.com/p/clock-tamer/ diff --git a/Projects/Webserver/Lib/DHCPClientApp.c b/Projects/Webserver/Lib/DHCPClientApp.c index 64cd70709b..2097062f8f 100644 --- a/Projects/Webserver/Lib/DHCPClientApp.c +++ b/Projects/Webserver/Lib/DHCPClientApp.c @@ -36,7 +36,7 @@ #include "DHCPClientApp.h" -#if defined(ENABLE_DHCP) || defined(__DOXYGEN__) +#if defined(ENABLE_DHCP_CLIENT) || defined(__DOXYGEN__) /** Timer for managing the timeout period for a DHCP server to respond */ struct timer DHCPTimer; diff --git a/Projects/Webserver/Lib/uIPManagement.c b/Projects/Webserver/Lib/uIPManagement.c index c7773c4559..ba2a505e95 100644 --- a/Projects/Webserver/Lib/uIPManagement.c +++ b/Projects/Webserver/Lib/uIPManagement.c @@ -212,7 +212,7 @@ static void uIPManagement_ManageConnections(void) } } - #if defined(ENABLE_DHCP) + #if defined(ENABLE_DHCP_CLIENT) for (uint8_t i = 0; i < UIP_UDP_CONNS; i++) { /* Run periodic connection management for each UDP connection */ diff --git a/Projects/Webserver/Lib/uip/uipopt.h b/Projects/Webserver/Lib/uip/uipopt.h index c8b3ad59e3..c8d0cd2028 100644 --- a/Projects/Webserver/Lib/uip/uipopt.h +++ b/Projects/Webserver/Lib/uip/uipopt.h @@ -689,7 +689,7 @@ typedef union uint8_t CurrentState; uint8_t NextState; - char FileName[30]; + char FileName[50]; FIL FileHandle; bool FileOpen; uint32_t ACKedFilePos; diff --git a/Projects/Webserver/Webserver.txt b/Projects/Webserver/Webserver.txt index 59b5302489..9cee32e8a7 100644 --- a/Projects/Webserver/Webserver.txt +++ b/Projects/Webserver/Webserver.txt @@ -55,15 +55,17 @@ * To use this project, plug the USB AVR into a computer, so that it enumerates as a standard Mass Storage device. Load * HTML files onto the disk, so that they can be served out to clients -- the default file to serve should be called * index.htm. Filenames must be in 8.3 format for them to be retrieved correctly by the webserver, and the total - * requested file path must be equal to or less than 50 characters. + * requested file path must be equal to or less than 50 characters (set in uipopt.h). * * When attached to a RNDIS class device, such as a USB (desktop) modem, the system will enumerate the device, set the - * appropriate parameters needed for connectivity and begin listening for new HTTP connections on port 80. The device IP, - * netmask and default gateway IP must be set to values appropriate for the RNDIS device being used for this project to - * work, if the DHCP client is disabled (see \ref SSec_Options). + * appropriate parameters needed for connectivity and begin listening for new HTTP connections on port 80 and TELNET + * connections on port 23. The device IP, netmask and default gateway IP must be set to values appropriate for the RNDIS + * device being used for this project to work if the DHCP client is disabled (see \ref SSec_Options) - otherwise, the device + * will query the network's DHCP server for these parameters automatically. * - * When properly configured, the webserver can be accessed from any HTTP webrowser by typing in the device's static or - * dynamically allocated IP address. + * When properly configured, the webserver can be accessed from any HTTP webrowser by typing in the device's statically or + * dynamically allocated IP address. The TELNET client can be accessed via any network socket app by connecting to the device + * on port 23 on the device's statically or dynamically allocated IP address. * * \section SSec_Options Project Options * @@ -76,7 +78,7 @@ *