forked from mfulz_github/qmk_firmware
Update Webserver project to remove DHCP IP configuration status notification.
This commit is contained in:
Dean Camera
parent
f0ff633962
commit
edc4db41f4
File diff suppressed because one or more lines are too long
|
|
@ -21,6 +21,7 @@
|
|||
* -# Update stream APIs to use DMA transfers on supported architectures
|
||||
* -# Pull out third party libraries into a seperate folder and reference them as required
|
||||
* -# Add a LUFA_YIELD macro for integration into a third-party RTOS
|
||||
* -# Abstract out Mass Storage byte send/receive to prevent low level API use in projects
|
||||
* - Documentation/Support
|
||||
* -# Add detailed overviews of how each demo works
|
||||
* -# Add board overviews
|
||||
|
|
|
|||
|
|
@ -157,9 +157,6 @@ void DHCPClientApp_Callback(void)
|
|||
uip_setnetmask((uip_ipaddr_t*)&AppState->DHCPClient.DHCPOffer_Data.Netmask);
|
||||
uip_setdraddr((uip_ipaddr_t*)&AppState->DHCPClient.DHCPOffer_Data.GatewayIP);
|
||||
|
||||
/* Indicate to the user that we now have a valid IP configuration */
|
||||
HaveIPConfiguration = true;
|
||||
|
||||
AppState->DHCPClient.CurrentState = DHCP_STATE_AddressLeased;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ static void TELNETServerApp_DisplayTCPConnections(void)
|
|||
if (CurrConnection->tcpstateflags != UIP_CLOSED)
|
||||
{
|
||||
/* Add the current connection's details to the out buffer */
|
||||
ResponseLen += sprintf_P(&AppData[ResponseLen], PSTR("%u) %02d.%02d.%02d.%02d (Local %u, Remote %u)\r\n"),
|
||||
ResponseLen += sprintf_P(&AppData[ResponseLen], PSTR("%u) %d.%d.%d.%d (Local Port %u <=> Remote Port %u)\r\n"),
|
||||
++ActiveConnCount,
|
||||
CurrConnection->ripaddr.u8[0],
|
||||
CurrConnection->ripaddr.u8[1],
|
||||
|
|
|
|||
|
|
@ -46,9 +46,6 @@ static struct timer ARPTimer;
|
|||
/** MAC address of the RNDIS device, when enumerated. */
|
||||
struct uip_eth_addr MACAddress;
|
||||
|
||||
/** Indicates if an IP configuration has been set in the device. */
|
||||
bool HaveIPConfiguration;
|
||||
|
||||
|
||||
/** Configures the uIP stack ready for network traffic processing. */
|
||||
void uIPManagement_Init(void)
|
||||
|
|
@ -76,7 +73,6 @@ void uIPManagement_Init(void)
|
|||
DHCPServerApp_Init();
|
||||
#endif
|
||||
|
||||
HaveIPConfiguration = true;
|
||||
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(&Netmask, DEVICE_NETMASK[0], DEVICE_NETMASK[1], DEVICE_NETMASK[2], DEVICE_NETMASK[3]);
|
||||
|
|
@ -88,10 +84,8 @@ void uIPManagement_Init(void)
|
|||
else
|
||||
{
|
||||
#if defined(ENABLE_DHCP_CLIENT)
|
||||
HaveIPConfiguration = false;
|
||||
DHCPClientApp_Init();
|
||||
#else
|
||||
HaveIPConfiguration = true;
|
||||
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(&Netmask, DEVICE_NETMASK[0], DEVICE_NETMASK[1], DEVICE_NETMASK[2], DEVICE_NETMASK[3]);
|
||||
|
|
@ -228,7 +222,7 @@ static void uIPManagement_ProcessIncomingPacket(void)
|
|||
}
|
||||
}
|
||||
|
||||
LEDs_SetAllLEDs(LEDMASK_USB_READY | ((HaveIPConfiguration) ? LEDMASK_UIP_READY_CONFIG : LEDMASK_UIP_READY_NOCONFIG));
|
||||
LEDs_SetAllLEDs(LEDMASK_USB_READY);
|
||||
}
|
||||
|
||||
/** Manages the currently open network connections, including TCP and (if enabled) UDP. */
|
||||
|
|
|
|||
|
|
@ -70,8 +70,6 @@
|
|||
/* External Variables: */
|
||||
extern struct uip_eth_addr MACAddress;
|
||||
|
||||
extern bool HaveIPConfiguration;
|
||||
|
||||
/* Function Prototypes: */
|
||||
void uIPManagement_Init(void);
|
||||
void uIPManagement_ManageNetwork(void);
|
||||
|
|
|
|||
|
|
@ -48,15 +48,15 @@ USB_ClassInfo_RNDIS_Device_t Ethernet_RNDIS_Interface_Device =
|
|||
|
||||
.DataINEndpointNumber = CDC_TX_EPNUM,
|
||||
.DataINEndpointSize = CDC_TXRX_EPSIZE,
|
||||
.DataINEndpointDoubleBank = false,
|
||||
.DataINEndpointDoubleBank = true,
|
||||
|
||||
.DataOUTEndpointNumber = CDC_RX_EPNUM,
|
||||
.DataOUTEndpointSize = CDC_TXRX_EPSIZE,
|
||||
.DataOUTEndpointDoubleBank = false,
|
||||
.DataOUTEndpointDoubleBank = true,
|
||||
|
||||
.NotificationEndpointNumber = CDC_NOTIFICATION_EPNUM,
|
||||
.NotificationEndpointSize = CDC_NOTIFICATION_EPSIZE,
|
||||
.NotificationEndpointDoubleBank = false,
|
||||
.NotificationEndpointDoubleBank = true,
|
||||
|
||||
.AdapterVendorDescription = "LUFA RNDIS Adapter",
|
||||
.AdapterMACAddress = {{0x02, 0x00, 0x02, 0x00, 0x02, 0x00}},
|
||||
|
|
|
|||
|
|
@ -68,12 +68,6 @@
|
|||
/** LED mask for the library LED driver, to indicate that the USB interface is busy. */
|
||||
#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: */
|
||||
void SetupHardware(void);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue