diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-27 19:12:07 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-27 19:12:07 +0000 |
| commit | 2ff1370221d3650a6bc0523c93c2f0d37508f408 (patch) | |
| tree | b1d7f7a2a7dbebaf76e43e0f977d227d0cabf95a /Projects/Webserver/Webserver.txt | |
| parent | b017b41e91f7eb7bb83d1466b45c24e01ac2e309 (diff) | |
| parent | 1e42f7bd46fbef1e67f50741e4fe1a5ea3a70869 (diff) | |
| download | lufa-2ff1370221d3650a6bc0523c93c2f0d37508f408.tar.gz lufa-2ff1370221d3650a6bc0523c93c2f0d37508f408.tar.bz2 lufa-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/Webserver.txt')
| -rw-r--r-- | Projects/Webserver/Webserver.txt | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Projects/Webserver/Webserver.txt b/Projects/Webserver/Webserver.txt index 56e9d25fa..2ec836906 100644 --- a/Projects/Webserver/Webserver.txt +++ b/Projects/Webserver/Webserver.txt @@ -81,41 +81,46 @@ * </tr> * <tr> * <td>ENABLE_TELNET_SERVER</td> - * <td>Makefile LUFA_OPTS</td> + * <td>AppConfig.h</td> * <td>When defined, this enables the TELNET server in addition to the HTTP webserver, which listens for incoming connections * and processes user commands.</td> * </tr> * <tr> * <td>ENABLE_DHCP_CLIENT</td> - * <td>Makefile LUFA_OPTS</td> + * <td>AppConfig.h</td> * <td>When defined, this enables the DHCP client for dynamic IP allocation of the network settings from a DHCP server.</td> * </tr> * <tr> * <td>ENABLE_DHCP_SERVER</td> - * <td>Makefile LUFA_OPTS</td> + * <td>AppConfig.h</td> * <td>When defined, this enables the DHCP server for dynamic IP allocation of the network settings to a DHCP client.</td> * </tr> * <tr> * <td>DEVICE_IP_ADDRESS</td> - * <td>Lib/uIPManagement.h</td> + * <td>AppConfig.h</td> * <td>IP address that the webserver should use when connected to a RNDIS device (when ENABLE_DHCP_CLIENT is not defined).</td> * </tr> * <tr> * <td>DEVICE_NETMASK</td> - * <td>Lib/uIPManagement.h</td> + * <td>AppConfig.h</td> * <td>Netmask that the webserver should use when connected to a RNDIS device (when ENABLE_DHCP_CLIENT is not defined).</td> * </tr> * <tr> * <td>DEVICE_GATEWAY</td> - * <td>Lib/uIPManagement.h</td> + * <td>AppConfig.h</td> * <td>Default routing gateway that the webserver should use when connected to a RNDIS device (when ENABLE_DHCP_CLIENT * is not defined).</td> * </tr> * <tr> * <td>MAX_URI_LENGTH</td> - * <td>Makefile LUFA_OPTS</td> + * <td>AppConfig.h</td> * <td>Maximum length of a URI for the Webserver. This is the maximum file path, including subdirectories and separators.</td> * </tr> + * <tr> + * <td>SERVER_MAC_ADDRESS</td> + * <td>AppConfig.h</td> + * <td>MAC address of the server used when sending Ethernet packets onto the bus.</td> + * </tr> * </table> */ |