Commit 04d40897 authored by Dean Camera's avatar Dean Camera
Browse files

Commit for the 100219 release.

parent 42b850f2
......@@ -8,6 +8,8 @@
*
* \section Sec_ChangeLogXXXXXX Version XXXXXX
*
* \section Sec_ChangeLog100219 Version 100219
*
* <b>New:</b>
* - 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
......
......@@ -10,7 +10,9 @@
* 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.
*
* \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>
* - Due to some ADC channels not being identical to their ADC MUX selection masks for single-ended conversions on some AVR models,
......
......@@ -41,12 +41,8 @@
/** Initialization function for the DHCP client. */
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 */
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 (Connection != NULL)
......
......@@ -100,13 +100,9 @@ void HTTPServerApp_Callback(void)
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 */
AppState->HTTPServer.CurrentState = WEBSERVER_STATE_Closed;
AppState->HTTPServer.NextState = WEBSERVER_STATE_Closed;
AppState->HTTPServer.CurrentState = WEBSERVER_STATE_Closing;
AppState->HTTPServer.NextState = WEBSERVER_STATE_Closing;
}
if (uip_connected())
......@@ -148,9 +144,15 @@ void HTTPServerApp_Callback(void)
HTTPServerApp_SendData();
break;
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();
AppState->HTTPServer.NextState = WEBSERVER_STATE_Closed;
AppState->HTTPServer.CurrentState = WEBSERVER_STATE_Closed;
AppState->HTTPServer.NextState = WEBSERVER_STATE_Closed;
break;
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment