diff --git a/10_m1284p_WIZNET_HTTPServer_RAM_pages/globals.h b/10_m1284p_WIZNET_HTTPServer_RAM_pages/globals.h index 2618084..7e6b137 100644 --- a/10_m1284p_WIZNET_HTTPServer_RAM_pages/globals.h +++ b/10_m1284p_WIZNET_HTTPServer_RAM_pages/globals.h @@ -21,6 +21,8 @@ #define PRINTF(...) #endif +//#define IP_WORK + extern unsigned long millis(void); extern int freeRam (void); diff --git a/10_m1284p_WIZNET_HTTPServer_RAM_pages/main.c b/10_m1284p_WIZNET_HTTPServer_RAM_pages/main.c index f9c94ac..bc4478b 100644 --- a/10_m1284p_WIZNET_HTTPServer_RAM_pages/main.c +++ b/10_m1284p_WIZNET_HTTPServer_RAM_pages/main.c @@ -63,11 +63,22 @@ * */ -#define PRINTF_EN 1 -#if PRINTF_EN -#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args) +#ifdef IP_WORK +//NIC metrics for WORK PC +wiz_NetInfo netInfo = { .mac = {0x00, 0x08, 0xdc, 0xab, 0xcd, 0xef}, // Mac address + .ip = {192, 168, 0, 199}, // IP address + .sn = {255, 255, 255, 0}, // Subnet mask + .dns = {8,8,8,8}, // DNS address (google dns) + .gw = {192, 168, 0, 1}, // Gateway address + .dhcp = NETINFO_STATIC}; //Dynamic IP configuration from a DHCP sever #else -#define PRINTF(...) +//NIC metrics for another PC (second IP configuration) +wiz_NetInfo netInfo = { .mac = {0x00, 0x08, 0xdc, 0xab, 0xcd, 0xef}, // Mac address + .ip = {192, 168, 1, 199}, // IP address + .sn = {255, 255, 255, 0}, // Subnet mask + .dns = {8,8,8,8}, // DNS address (google dns) + .gw = {192, 168, 1, 1}, // Gateway address + .dhcp = NETINFO_STATIC}; //Dynamic IP configuration from a DHCP sever #endif //*********Program metrics @@ -248,13 +259,6 @@ unsigned char ethBuf1[ETH_MAX_BUF_SIZE]; unsigned char ethBuf2_WEBSRV[WEBSRV_DATA_BUF_SIZE]; */ -wiz_NetInfo netInfo = { .mac = {0x00, 0x08, 0xdc, 0xab, 0xcd, 0xef}, // Mac address - .ip = {192, 168, 0, 199}, // IP address - .sn = {255, 255, 255, 0}, // Subnet mask - .dns = {8,8,8,8}, // DNS address (google dns) - .gw = {192, 168, 0, 1}, // Gateway address - .dhcp = NETINFO_STATIC}; //Dynamic IP configruation from a DHCP sever - void cs_sel() { SPI_WIZNET_ENABLE(); }