Filamentstr/04_zumbach
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add double-IP config for [17_m1284p_BTLD_WIZNET_HTTPD_FTPD_FATFS_SDCARD]

Browse Source
This commit is contained in:
maxxir
2019-02-04 22:27:27 +04:00
parent 97f18142f2
commit 27470111dc
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
17_m1284p_BTLD_WIZNET_HTTPD_FTPD_FATFS_SDCARD/globals.h
View File

@@ -58,6 +58,8 @@ FATFS Fatfs; //File system object for each logical drive. >= 2
#define SPRINTF(__S, FORMAT, args...) sprintf_P(__S, PSTR(FORMAT),##args) #define SPRINTF(__S, FORMAT, args...) sprintf_P(__S, PSTR(FORMAT),##args)
//#define IP_WORK
extern unsigned long millis(void); extern unsigned long millis(void);
extern int freeRam (void); extern int freeRam (void);
extern char uart0_receive(void); extern char uart0_receive(void);

14
17_m1284p_BTLD_WIZNET_HTTPD_FTPD_FATFS_SDCARD/main.c
View File

@@ -28,13 +28,23 @@
#define CHK_RAM_LEAKAGE #define CHK_RAM_LEAKAGE
#define CHK_UPTIME #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 wiz_NetInfo netInfo = { .mac = {0x00, 0x08, 0xdc, 0xab, 0xcd, 0xef}, // Mac address
.ip = {192, 168, 0, 199}, // IP address .ip = {192, 168, 0, 199}, // IP address
.sn = {255, 255, 255, 0}, // Subnet mask .sn = {255, 255, 255, 0}, // Subnet mask
.dns = {8,8,8,8}, // DNS address (google dns) .dns = {8,8,8,8}, // DNS address (google dns)
.gw = {192, 168, 0, 1}, // Gateway address .gw = {192, 168, 0, 1}, // Gateway address
.dhcp = NETINFO_STATIC}; //Static IP configuration .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 uint8_t gFTPBUF[_MAX_SS_FTPD]; //512 bytes
@@ -151,7 +161,7 @@ volatile unsigned char sig_reset_board; // Flag to reset board
//*********Program metrics //*********Program metrics
const char compile_date[] PROGMEM = __DATE__; // Mmm dd yyyy - Дата компиляции const char compile_date[] PROGMEM = __DATE__; // Mmm dd yyyy - Дата компиляции
const char compile_time[] PROGMEM = __TIME__; // hh:mm:ss - Время компиляции const char compile_time[] PROGMEM = __TIME__; // hh:mm:ss - Время компиляции
const char str_prog_name[] PROGMEM = "\r\nAtMega1284p v1.2b BootLoaded HTTPD and FTPD servers && FATFS SDCARD WIZNET_5500 ETHERNET 16/01/2019\r\n"; // Program name const char str_prog_name[] PROGMEM = "\r\nAtMega1284p v1.2c BootLoaded HTTPD and FTPD servers && FATFS SDCARD WIZNET_5500 ETHERNET 16/01/2019\r\n"; // Program name
#if defined(__AVR_ATmega128__) #if defined(__AVR_ATmega128__)
const char PROGMEM str_mcu[] = "ATmega128"; //CPU is m128 const char PROGMEM str_mcu[] = "ATmega128"; //CPU is m128