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

Add double-IP config for [14_m1284p_WIZNET_FTPC_FATFS]

Browse Source
This commit is contained in:
maxxir
2019-01-22 23:50:11 +04:00
parent b2b2cd46c1
commit 3543ba0903
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
14_m1284p_WIZNET_FTPC_FATFS/globals.h
View File

@@ -42,6 +42,8 @@ extern uint8_t FTP_SRV_destip[4];
#define PRINTF(...) #define PRINTF(...)
#endif #endif
//#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);

19
14_m1284p_WIZNET_FTPC_FATFS/main.c
View File

@@ -24,17 +24,30 @@
#define _MAIN_DEBUG_ #define _MAIN_DEBUG_
//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}; //Dynamic IP configuration from a DHCP sever .dhcp = NETINFO_STATIC}; //Static IP configuration
//FTP Server IP //FTP Server IP
uint8_t FTP_SRV_destip[4] = {192, 168, 0, 100}; // For FTP client examples; destination network info - WORK STATION IP uint8_t FTP_SRV_destip[4] = {192, 168, 0, 100}; // For FTP client examples; destination network info - WORK STATION IP
//uint8_t FTP_SRV_destip[4] = {192, 168, 1, 81}; // For FTP client examples; destination network info - HOME STATION IP
#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
uint8_t FTP_SRV_destip[4] = {192, 168, 1, 81}; // For FTP client examples; destination network info - HOME STATION IP
#endif
uint8_t gFTPBUF[_MAX_SS_FTP]; uint8_t gFTPBUF[_MAX_SS_FTP];