forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Webserver project now uses the board LEDs to indicate the current IP configuration state.

Browse Source 
Don't double-read data from the attached disk in the incomplete StandaloneProgrammer project when in host mode.
pull/1469/head
Dean Camera 15 years ago
parent a61c7f671d
commit ce260ae786
9 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File

1
LUFA/ManPages/ChangeLog.txt
Unescape View File

@ -16,6 +16,7 @@
* for PDI and TPI programming * for PDI and TPI programming
* - Increased the speed of both software and hardware TPI/PDI programming modes of the AVRISP project * - Increased the speed of both software and hardware TPI/PDI programming modes of the AVRISP project
* - Added a timeout value to the TWI_StartTransmission() function, within which the addressed device must respond * - Added a timeout value to the TWI_StartTransmission() function, within which the addressed device must respond
* - Webserver project now uses the board LEDs to indicate the current IP configuration state
* *
* <b>Fixed:</b> * <b>Fixed:</b>
* - Fixed software PDI/TPI programming mode in the AVRISP project not correctly toggling just the clock pin * - Fixed software PDI/TPI programming mode in the AVRISP project not correctly toggling just the clock pin

1
LUFA/ManPages/LUFAPoweredProjects.txt
Unescape View File

@ -24,6 +24,7 @@
* - Micropendous, an open design/source set of AVR USB development boards: http://micropendous.org/ * - Micropendous, an open design/source set of AVR USB development boards: http://micropendous.org/
* - Nanduino, a do-it-yourself AT90USB162 board: http://www.makestuff.eu/wordpress/?page_id=569 * - Nanduino, a do-it-yourself AT90USB162 board: http://www.makestuff.eu/wordpress/?page_id=569
* - Teensy and Teensy++, two other AVR USB development boards: http://www.pjrc.com/teensy/index.html * - Teensy and Teensy++, two other AVR USB development boards: http://www.pjrc.com/teensy/index.html
* - U2DIL/U4DIL, a set of DIP layout USB AVR boards: http://www.reworld.eu/re/en/products/u2dil/
* - USB10 AKA "The Ferret", a AT90USB162 development board: http://www.soc-machines.com * - USB10 AKA "The Ferret", a AT90USB162 development board: http://www.soc-machines.com
* - USBFoo, an AT90USB162 based development board: http://shop.kernelconcepts.de/product_info.php?products_id=102 * - USBFoo, an AT90USB162 based development board: http://shop.kernelconcepts.de/product_info.php?products_id=102
* *

2
Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c
Unescape View File

@ -41,8 +41,6 @@ DRESULT disk_readp (
ErrorCode = RES_NOTRDY; ErrorCode = RES_NOTRDY;
else if (MS_Host_ReadDeviceBlocks(&DiskHost_MS_Interface, 0, sector, 1, 512, BlockTemp)) else if (MS_Host_ReadDeviceBlocks(&DiskHost_MS_Interface, 0, sector, 1, 512, BlockTemp))
ErrorCode = RES_ERROR; ErrorCode = RES_ERROR;
MS_Host_ReadDeviceBlocks(&DiskHost_MS_Interface, 0, sector, 1, 512, BlockTemp);
#endif #endif
} }
else else

5
Projects/Webserver/Lib/DHCPClientApp.c
Unescape View File

@ -156,7 +156,10 @@ void DHCPClientApp_Callback(void)
uip_setnetmask((uip_ipaddr_t*)&AppState->DHCPClient.DHCPOffer_Data.Netmask); uip_setnetmask((uip_ipaddr_t*)&AppState->DHCPClient.DHCPOffer_Data.Netmask);
uip_setdraddr((uip_ipaddr_t*)&AppState->DHCPClient.DHCPOffer_Data.GatewayIP); uip_setdraddr((uip_ipaddr_t*)&AppState->DHCPClient.DHCPOffer_Data.GatewayIP);
AppState->DHCPClient.CurrentState = DHCP_STATE_AddressLeased; /* Indicate to the user that we now have a valid IP configuration */
HaveIPConfiguration = true;
AppState->DHCPClient.CurrentState = DHCP_STATE_AddressLeased;
} }
break; break;

2
Projects/Webserver/Lib/HTTPServerApp.c
Unescape View File

@ -77,7 +77,7 @@ const MIME_Type_t MIMETypes[] =
{.Extension = "pdf", .MIMEType = "application/pdf"}, {.Extension = "pdf", .MIMEType = "application/pdf"},
}; };
/** FAT Fs structure to hold the internal state of the FAT driver for the dataflash contents. */ /** FATFs structure to hold the internal state of the FAT driver for the dataflash contents. */
FATFS DiskFATState; FATFS DiskFATState;

5
Projects/Webserver/Lib/uIPManagement.c
Unescape View File

@ -46,6 +46,7 @@ struct timer ARPTimer;
/** MAC address of the RNDIS device, when enumerated */ /** MAC address of the RNDIS device, when enumerated */
struct uip_eth_addr MACAddress; struct uip_eth_addr MACAddress;
bool HaveIPConfiguration;
/** Configures the uIP stack ready for network traffic. */ /** Configures the uIP stack ready for network traffic. */
void uIPManagement_Init(void) void uIPManagement_Init(void)
@ -62,8 +63,10 @@ void uIPManagement_Init(void)
/* DHCP/Server IP Settings Initialization */ /* DHCP/Server IP Settings Initialization */
#if defined(ENABLE_DHCP_CLIENT) #if defined(ENABLE_DHCP_CLIENT)
HaveIPConfiguration = false;
DHCPClientApp_Init(); DHCPClientApp_Init();
#else #else
HaveIPConfiguration = true;
uip_ipaddr_t IPAddress, Netmask, GatewayIPAddress; uip_ipaddr_t IPAddress, Netmask, GatewayIPAddress;
uip_ipaddr(&IPAddress, DEVICE_IP_ADDRESS[0], DEVICE_IP_ADDRESS[1], DEVICE_IP_ADDRESS[2], DEVICE_IP_ADDRESS[3]); 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(&Netmask, DEVICE_NETMASK[0], DEVICE_NETMASK[1], DEVICE_NETMASK[2], DEVICE_NETMASK[3]);
@ -169,7 +172,7 @@ static void uIPManagement_ProcessIncomingPacket(void)
} }
} }
LEDs_SetAllLEDs(LEDMASK_USB_READY); LEDs_SetAllLEDs(LEDMASK_USB_READY | ((HaveIPConfiguration) ? LEDMASK_UIP_READY : LEDMASK_UIP_READY_NOCONFIG));
} }
/** Manages the currently open network connections, including TCP and (if enabled) UDP. */ /** Manages the currently open network connections, including TCP and (if enabled) UDP. */

2
Projects/Webserver/Lib/uIPManagement.h
Unescape View File

@ -63,6 +63,8 @@
/* External Variables: */ /* External Variables: */
extern struct uip_eth_addr MACAddress; extern struct uip_eth_addr MACAddress;
extern bool HaveIPConfiguration;
/* Function Prototypes: */ /* Function Prototypes: */
void uIPManagement_Init(void); void uIPManagement_Init(void);
void uIPManagement_ManageNetwork(void); void uIPManagement_ManageNetwork(void);

16
Projects/Webserver/Webserver.h
Unescape View File

@ -53,19 +53,25 @@
/* Macros: */ /* Macros: */
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
#define LEDMASK_USB_NOTREADY LEDS_LED1 #define LEDMASK_USB_NOTREADY LEDS_LED1
/** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */ /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */
#define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3) #define LEDMASK_USB_ENUMERATING (LEDS_LED1 | LEDS_LED2)
/** LED mask for the library LED driver, to indicate that the USB interface is ready. */ /** LED mask for the library LED driver, to indicate that the USB interface is ready. */
#define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4) #define LEDMASK_USB_READY LEDS_LED2
/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */ /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
#define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3) #define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
/** LED mask for the library LED driver, to indicate that the USB interface is busy. */ /** LED mask for the library LED driver, to indicate that the USB interface is busy. */
#define LEDMASK_USB_BUSY LEDS_LED2 #define LEDMASK_USB_BUSY (LEDS_LED1 | LEDS_LED3 | LEDS_LED4)
/** LED mask for the uIP stack idling with no IP configuration */
#define LEDMASK_UIP_READY_NOCONFIG LEDS_LED3
/** LED mask for the uIP stack idling with a valid IP configuration */
#define LEDMASK_UIP_READY_CONFIG LEDS_LED4
/* Function Prototypes: */ /* Function Prototypes: */
void SetupHardware(void); void SetupHardware(void);

12
makefile
Unescape View File

@ -13,18 +13,14 @@
# "make doxygen" to document everything with DoxyGen (if installed) and # "make doxygen" to document everything with DoxyGen (if installed) and
# "make clean_doxygen" to remove generated Doxygen documentation from everything. # "make clean_doxygen" to remove generated Doxygen documentation from everything.
# It is suggested that for the master build, the --quiet switch is passed to make,
# to remove all the commands from the output. This gives a much easier to read
# report of the entire build process.
all: all:
%: %:
@echo Executing \"make $@\" on all LUFA library elements. @echo Executing \"make $@\" on all LUFA library elements.
@echo @echo
make -C LUFA/ $@ make -C LUFA/ $@ -s
make -C Demos/ $@ make -C Demos/ $@ -s
make -C Projects/ $@ make -C Projects/ $@ -s
make -C Bootloaders/ $@ make -C Bootloaders/ $@ -s
@echo @echo
@echo LUFA \"make $@\" operation complete. @echo LUFA \"make $@\" operation complete.

Write Preview
Loading…
Cancel
Save