Filamentstr/05_wickler
Archived
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Fixed globals.h/globals.c

Browse Source
This commit is contained in:
maxxir_w
2019-03-23 13:24:43 +04:00
parent f8b0b06fe4
commit bc3943bdc0
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
20_m1284p_BTLD_WIZNET_BLYNK_FTPD_FATFS_SDCARD/globals.c
View File

@@ -8,6 +8,7 @@
#ifdef IP_WORK
//NIC metrics for WORK PC
uint8_t DNS_2nd[4] = {192, 168, 0, 1}; // Secondary DNS server IP
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
@@ -16,6 +17,7 @@ wiz_NetInfo netInfo = { .mac = {0x00, 0x08, 0xdc, 0xab, 0xcd, 0xef}, // Mac add
.dhcp = NETINFO_STATIC}; //Static IP configuration
#else
//NIC metrics for another PC (second IP configuration)
uint8_t DNS_2nd[4] = {192, 168, 1, 1}; // Secondary DNS server IP
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
@@ -28,4 +30,8 @@ wiz_NetInfo netInfo = { .mac = {0x00, 0x08, 0xdc, 0xab, 0xcd, 0xef}, // Mac add
#ifdef FTPD_AUTH_EN
const char ftpd_user[] = "user1234";
const char ftpd_pass[] = "open_sesame";
//My auth token for my android test application "m1284 + W5500":
uint8_t auth[] = "add_your_own_token_here"; // You should get your own Auth Token in the BLYNK App
#endif

20
20_m1284p_BTLD_WIZNET_BLYNK_FTPD_FATFS_SDCARD/globals.h
View File

@@ -13,6 +13,9 @@
#include <avr/pgmspace.h>
#include "avr/wdt.h" // WatchDog
#include "Ethernet/socket.h"
#include "Ethernet/wizchip_conf.h"
//******************************* Fat FS declare related: BEGIN
#include "string.h"
@@ -79,13 +82,20 @@ extern char uart0_receive(void);
extern void uart0_rx_flash(void);
extern void ls_dir(char* path);
//M644P/M1284p Users LEDS:
//LED1/PORTC.4- m644p/m1284p maxxir
//LED1/PORTC.4/20 - m644p/m1284p maxxir brd
#define led1_conf() DDRC |= (1<<DDC4)
#define led1_high() PORTC |= (1<<PORTC4)
#define led1_low() PORTC &= ~(1<<PORTC4)
#define led1_tgl() PORTC ^= (1<<PORTC4)
#define led1_read() (PORTC & (1<<PORTC4))
//LED2/PORTD.5/13 - m644p/m1284p maxxir brd
#define led2_conf() DDRD |= (1<<DDD5)
#define led2_high() PORTD |= (1<<PORTD5)
#define led2_low() PORTD &= ~(1<<PORTD5)
#define led2_tgl() PORTD ^= (1<<PORTD5)
#define led2_read() (PORTD & (1<<PORTD5))
#define sw1_conf() {DDRC &= ~(1<<DDC5); PORTC |= (1<<PORTC5);}
#define sw1_read() (PINC & (1<<PINC5))
@@ -99,10 +109,18 @@ extern volatile unsigned char sig_reset_board; // Flag to reset board
#endif
extern wiz_NetInfo netInfo;
extern uint8_t DNS_2nd[4];
//#define _MAIN_DEBUG_ //Not used here
#define CHK_RAM_LEAKAGE
#define CHK_UPTIME
#define BLYNK_DATA_BUF_SIZE 1024
extern uint16_t adc_read(uint8_t channel);
extern uint8_t auth[];
extern uint8_t v15_changed;
extern uint8_t v20_changed;
#endif /* GLOBALS_H_ */