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

Some minor changes and add double-IP config for

Browse Source 
[11_m1284p_WIZNET_HTTPServer_FLASH_pages]
This commit is contained in:
maxxir
2019-01-20 23:26:56 +04:00
parent f543fe92ee
commit 0debc594c8
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
11_m1284p_WIZNET_HTTPServer_FLASH_pages/globals.h
View File

@@ -16,13 +16,15 @@
//#define HTTPD_MAX_BUF_SIZE 2048 //For Mega1284p(16kb RAM)/Mega2560(8kb RAM) //#define HTTPD_MAX_BUF_SIZE 2048 //For Mega1284p(16kb RAM)/Mega2560(8kb RAM)
#define HTTPD_MAX_BUF_SIZE 512 //For Mega644p(4kb RAM)/Mega128(4kb RAM) #define HTTPD_MAX_BUF_SIZE 512 //For Mega644p(4kb RAM)/Mega128(4kb RAM)
#define PRINTF_EN 0 #define PRINTF_EN 1
#if PRINTF_EN #if PRINTF_EN
#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args) #define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
#else #else
#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);

30
11_m1284p_WIZNET_HTTPServer_FLASH_pages/main.c
View File

@@ -102,14 +102,25 @@
* Author of porting to AVR Mega: * Author of porting to AVR Mega:
* Ibragimov Maxim, Russia Togliatty ~10..12.2018 * Ibragimov Maxim, Russia Togliatty ~10..12.2018
*/ */
/*
#define PRINTF_EN 1 #ifdef IP_WORK
#if PRINTF_EN //NIC metrics for WORK PC
#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args) 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 #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 #endif
*/
//*********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 - Время компиляции
@@ -288,13 +299,6 @@ unsigned char ethBuf1[ETH_MAX_BUF_SIZE];
unsigned char ethBuf2_WEBSRV[WEBSRV_DATA_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() { void cs_sel() {
SPI_WIZNET_ENABLE(); SPI_WIZNET_ENABLE();
} }