gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-06-10 02:44:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit for the 100219 release.

Browse Source
This commit is contained in:
Dean Camera 2010-02-19 00:07:22 +00:00
parent 42b850f2b9
commit 04d40897cf
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LUFA/ManPages/ChangeLog.txt
View File

@ -8,6 +8,8 @@
* *
* \section Sec_ChangeLogXXXXXX Version XXXXXX * \section Sec_ChangeLogXXXXXX Version XXXXXX
* *
* \section Sec_ChangeLog100219 Version 100219
*
* <b>New:</b> * <b>New:</b>
* - Added TPI programming support for 6-pin ATTINY devices to the AVRISP programmer project (thanks to Tom Light) * - Added TPI programming support for 6-pin ATTINY devices to the AVRISP programmer project (thanks to Tom Light)
* - Added command timeout counter to the AVRISP project so that the device no longer freezes when incorrectly connected * - Added command timeout counter to the AVRISP project so that the device no longer freezes when incorrectly connected

4
LUFA/ManPages/MigrationInformation.txt
View File

@ -10,7 +10,9 @@
* to the next version released. It does not indicate all new additions to the library in each version change, only * to the next version released. It does not indicate all new additions to the library in each version change, only
* areas relevant to making older projects compatible with the API changes of each new release. * areas relevant to making older projects compatible with the API changes of each new release.
* *
* \section Sec_MigrationXXXXXX Migrating from 091223 to XXXXXX * \section Sec_MigrationXXXXXX Migrating from 100219 to XXXXXX
*
* \section Sec_Migration100219 Migrating from 091223 to 100219
* *
* <b>Non-USB Library Components</b> * <b>Non-USB Library Components</b>
* - Due to some ADC channels not being identical to their ADC MUX selection masks for single-ended conversions on some AVR models, * - Due to some ADC channels not being identical to their ADC MUX selection masks for single-ended conversions on some AVR models,

6
Projects/Webserver/Lib/DHCPClientApp.c
View File

@ -41,12 +41,8 @@
/** Initialization function for the DHCP client. */ /** Initialization function for the DHCP client. */
void DHCPClientApp_Init(void) void DHCPClientApp_Init(void)
{ {
/* Create an IP address to the broadcast network address */
uip_ipaddr_t DHCPServerIPAddress;
uip_ipaddr(&DHCPServerIPAddress, 255, 255, 255, 255);
/* Create a new UDP connection to the DHCP server port for the DHCP solicitation */ /* Create a new UDP connection to the DHCP server port for the DHCP solicitation */
struct uip_udp_conn* Connection = uip_udp_new(&DHCPServerIPAddress, HTONS(DHCPC_SERVER_PORT)); struct uip_udp_conn* Connection = uip_udp_new(&uip_broadcast_addr, HTONS(DHCPC_SERVER_PORT));
/* If the connection was successfully created, bind it to the local DHCP client port */ /* If the connection was successfully created, bind it to the local DHCP client port */
if (Connection != NULL) if (Connection != NULL)

16
Projects/Webserver/Lib/HTTPServerApp.c
View File

@ -100,13 +100,9 @@ void HTTPServerApp_Callback(void)
if (uip_aborted() || uip_timedout() || uip_closed()) if (uip_aborted() || uip_timedout() || uip_closed())
{ {
/* Connection is being terminated for some reason - close file handle */
f_close(&AppState->HTTPServer.FileHandle);
AppState->HTTPServer.FileOpen = false;
/* Lock to the closed state so that no further processing will occur on the connection */ /* Lock to the closed state so that no further processing will occur on the connection */
AppState->HTTPServer.CurrentState = WEBSERVER_STATE_Closed; AppState->HTTPServer.CurrentState = WEBSERVER_STATE_Closing;
AppState->HTTPServer.NextState = WEBSERVER_STATE_Closed; AppState->HTTPServer.NextState = WEBSERVER_STATE_Closing;
} }
if (uip_connected()) if (uip_connected())
@ -148,9 +144,15 @@ void HTTPServerApp_Callback(void)
HTTPServerApp_SendData(); HTTPServerApp_SendData();
break; break;
case WEBSERVER_STATE_Closing: case WEBSERVER_STATE_Closing:
/* Connection is being terminated for some reason - close file handle */
f_close(&AppState->HTTPServer.FileHandle);
AppState->HTTPServer.FileOpen = false;
/* If connection is not already closed, close it */
uip_close(); uip_close();
AppState->HTTPServer.NextState = WEBSERVER_STATE_Closed; AppState->HTTPServer.CurrentState = WEBSERVER_STATE_Closed;
AppState->HTTPServer.NextState = WEBSERVER_STATE_Closed;
break; break;
} }
} }