From c455227e24483395fafdb9f43e8febd7e20317f2 Mon Sep 17 00:00:00 2001 From: maxxir Date: Tue, 29 Jan 2019 00:28:45 +0400 Subject: [PATCH] Add double-IP config for [16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD] --- 16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/globals.h | 2 ++ 16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/main.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/globals.h b/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/globals.h index 8e87bb1..7a57451 100644 --- a/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/globals.h +++ b/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/globals.h @@ -48,6 +48,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/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/main.c b/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/main.c index 3b48906..c3ae40a 100644 --- a/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/main.c +++ b/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/main.c @@ -28,13 +28,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]; //512 bytes