From 40a93c2432d2284db1296c361fbf4ba1898892ac Mon Sep 17 00:00:00 2001 From: maxxir Date: Sun, 20 Jan 2019 23:34:38 +0400 Subject: [PATCH] Some minor changes and add double-IP config for [11_m644p_WIZNET_HTTPServer_FLASH_pages] --- 11_m644p_WIZNET_HTTPServer_FLASH_pages/globals.h | 2 ++ 11_m644p_WIZNET_HTTPServer_FLASH_pages/main.c | 32 +++++++++++++----------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/11_m644p_WIZNET_HTTPServer_FLASH_pages/globals.h b/11_m644p_WIZNET_HTTPServer_FLASH_pages/globals.h index d24a2da..0e68a16 100644 --- a/11_m644p_WIZNET_HTTPServer_FLASH_pages/globals.h +++ b/11_m644p_WIZNET_HTTPServer_FLASH_pages/globals.h @@ -23,6 +23,8 @@ #define PRINTF(...) #endif +//#define IP_WORK + extern unsigned long millis(void); extern int freeRam (void); diff --git a/11_m644p_WIZNET_HTTPServer_FLASH_pages/main.c b/11_m644p_WIZNET_HTTPServer_FLASH_pages/main.c index 247a04e..4c9f75a 100644 --- a/11_m644p_WIZNET_HTTPServer_FLASH_pages/main.c +++ b/11_m644p_WIZNET_HTTPServer_FLASH_pages/main.c @@ -102,18 +102,29 @@ * Author of porting to AVR Mega: * Ibragimov Maxim, Russia Togliatty ~10..12.2018 */ -/* -#define PRINTF_EN 1 -#if PRINTF_EN -#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args) + +#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}; //Dynamic IP configuration from a DHCP sever #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 -*/ + //*********Program metrics const char compile_date[] PROGMEM = __DATE__; // Mmm dd yyyy - Дата компиляции const char compile_time[] PROGMEM = __TIME__; // hh:mm:ss - Время компиляции -const char str_prog_name[] PROGMEM = "\r\nAtMega1284p v2.3d Static IP HTTP_server FLASH Pages WIZNET_5500 ETHERNET 12/12/2018\r\n"; // Program name +const char str_prog_name[] PROGMEM = "\r\nAtMega644p v2.3d Static IP HTTP_server FLASH Pages WIZNET_5500 ETHERNET 12/12/2018\r\n"; // Program name /* * m1284p minimum template, with one button & one led @@ -288,13 +299,6 @@ unsigned char ethBuf1[ETH_MAX_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() { SPI_WIZNET_ENABLE(); }