diff --git a/15_m1284p_WIZNET_FTPD_FATFS/globals.h b/15_m1284p_WIZNET_FTPD_FATFS/globals.h index f81a61f..9b4aef5 100644 --- a/15_m1284p_WIZNET_FTPD_FATFS/globals.h +++ b/15_m1284p_WIZNET_FTPD_FATFS/globals.h @@ -49,6 +49,8 @@ FATFS Fatfs; //File system object for each logical drive. >= 2 #define SPRINTF(__S, FORMAT, args...) sprintf_P(__S, PSTR(FORMAT),##args) +//#define IP_WORK + extern unsigned long millis(void); extern int freeRam (void); extern char uart0_receive(void); diff --git a/15_m1284p_WIZNET_FTPD_FATFS/main.c b/15_m1284p_WIZNET_FTPD_FATFS/main.c index a969c07..d9f6e2b 100644 --- a/15_m1284p_WIZNET_FTPD_FATFS/main.c +++ b/15_m1284p_WIZNET_FTPD_FATFS/main.c @@ -27,13 +27,23 @@ #define CHK_RAM_LEAKAGE #define CHK_UPTIME -//NIC metrics +#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}; //Static IP configuration +#else +//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}; //Static IP configuration +#endif //uint8_t gFTPBUF[_MAX_SS_FTPD + 988]; //1500 bytes - Don't need since v1.3 uint8_t gFTPBUF[_MAX_SS_FTPD]; //512 bytes