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

Added FSM for TFTP client in main loop, and WIZNET standard TCP/UDP

Browse Source 
loopback
This commit is contained in:
maxxir
2019-03-31 20:30:09 +04:00
parent c99b2d6822
commit 81e2295950
3 changed files with 126 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
21_m1284p_WIZNET_TFTP_client_FATFS/Application/loopback/loopback.c
View File

@@ -24,7 +24,7 @@ int32_t loopback_tcps(uint8_t sn, uint8_t* buf, uint16_t port)
getSn_DIPR(sn, destip); getSn_DIPR(sn, destip);
destport = getSn_DPORT(sn); destport = getSn_DPORT(sn);
printf("%d:Connected - %d.%d.%d.%d : %d\r\n",sn, destip[0], destip[1], destip[2], destip[3], destport); PRINTF("%d:Connected - %d.%d.%d.%d : %u\r\n",sn, destip[0], destip[1], destip[2], destip[3], destport);
#endif #endif
setSn_IR(sn,Sn_IR_CON); setSn_IR(sn,Sn_IR_CON);
} }
@@ -55,12 +55,12 @@ int32_t loopback_tcps(uint8_t sn, uint8_t* buf, uint16_t port)
#endif #endif
if((ret = disconnect(sn)) != SOCK_OK) return ret; if((ret = disconnect(sn)) != SOCK_OK) return ret;
#ifdef _LOOPBACK_DEBUG_ #ifdef _LOOPBACK_DEBUG_
printf("%d:Socket Closed\r\n", sn); PRINTF("%d:Socket Closed\r\n", sn);
#endif #endif
break; break;
case SOCK_INIT : case SOCK_INIT :
#ifdef _LOOPBACK_DEBUG_ #ifdef _LOOPBACK_DEBUG_
printf("%d:Listen, TCP server loopback, port [%d]\r\n", sn, port); PRINTF("%d:Listen, TCP server loopback, port [%u]\r\n", sn, port);
#endif #endif
if( (ret = listen(sn)) != SOCK_OK) return ret; if( (ret = listen(sn)) != SOCK_OK) return ret;
break; break;
@@ -102,7 +102,7 @@ int32_t loopback_tcpc(uint8_t sn, uint8_t* buf, uint8_t* destip, uint16_t destpo
if(getSn_IR(sn) & Sn_IR_CON) // Socket n interrupt register mask; TCP CON interrupt = connection with peer is successful if(getSn_IR(sn) & Sn_IR_CON) // Socket n interrupt register mask; TCP CON interrupt = connection with peer is successful
{ {
#ifdef _LOOPBACK_DEBUG_ #ifdef _LOOPBACK_DEBUG_
printf("%d:Connected to - %d.%d.%d.%d : %d\r\n",sn, destip[0], destip[1], destip[2], destip[3], destport); PRINTF("%d:Connected to - %d.%d.%d.%d : %u\r\n",sn, destip[0], destip[1], destip[2], destip[3], destport);
#endif #endif
setSn_IR(sn, Sn_IR_CON); // this interrupt should be write the bit cleared to '1' setSn_IR(sn, Sn_IR_CON); // this interrupt should be write the bit cleared to '1'
} }
@@ -140,13 +140,13 @@ int32_t loopback_tcpc(uint8_t sn, uint8_t* buf, uint8_t* destip, uint16_t destpo
#endif #endif
if((ret=disconnect(sn)) != SOCK_OK) return ret; if((ret=disconnect(sn)) != SOCK_OK) return ret;
#ifdef _LOOPBACK_DEBUG_ #ifdef _LOOPBACK_DEBUG_
printf("%d:Socket Closed\r\n", sn); PRINTF("%d:Socket Closed\r\n", sn);
#endif #endif
break; break;
case SOCK_INIT : case SOCK_INIT :
#ifdef _LOOPBACK_DEBUG_ #ifdef _LOOPBACK_DEBUG_
printf("%d:Try to connect to the %d.%d.%d.%d : %d\r\n", sn, destip[0], destip[1], destip[2], destip[3], destport); PRINTF("%d:Try to connect to the %d.%d.%d.%d : %u\r\n", sn, destip[0], destip[1], destip[2], destip[3], destport);
#endif #endif
if( (ret = connect(sn, destip, destport)) != SOCK_OK) return ret; // Try to TCP connect to the TCP server (destination) if( (ret = connect(sn, destip, destport)) != SOCK_OK) return ret; // Try to TCP connect to the TCP server (destination)
break; break;
@@ -186,7 +186,7 @@ int32_t loopback_udps(uint8_t sn, uint8_t* buf, uint16_t port)
if(ret <= 0) if(ret <= 0)
{ {
#ifdef _LOOPBACK_DEBUG_ #ifdef _LOOPBACK_DEBUG_
printf("%d: recvfrom error. %ld\r\n",sn,ret); PRINTF("%d: recvfrom error. %ld\r\n",sn,ret);
#endif #endif
return ret; return ret;
} }
@@ -198,7 +198,7 @@ int32_t loopback_udps(uint8_t sn, uint8_t* buf, uint16_t port)
if(ret < 0) if(ret < 0)
{ {
#ifdef _LOOPBACK_DEBUG_ #ifdef _LOOPBACK_DEBUG_
printf("%d: sendto error. %ld\r\n",sn,ret); PRINTF("%d: sendto error. %ld\r\n",sn,ret);
#endif #endif
return ret; return ret;
} }
@@ -213,7 +213,7 @@ int32_t loopback_udps(uint8_t sn, uint8_t* buf, uint16_t port)
if((ret = socket(sn, Sn_MR_UDP, port, 0x00)) != sn) if((ret = socket(sn, Sn_MR_UDP, port, 0x00)) != sn)
return ret; return ret;
#ifdef _LOOPBACK_DEBUG_ #ifdef _LOOPBACK_DEBUG_
printf("%d:Opened, UDP loopback, port [%d]\r\n", sn, port); PRINTF("%d:Opened, UDP loopback, port [%u]\r\n", sn, port);
#endif #endif
break; break;
default : default :

2
21_m1284p_WIZNET_TFTP_client_FATFS/Application/loopback/loopback.h
View File

@@ -6,6 +6,8 @@ extern "C" {
#endif #endif
#include <stdint.h> #include <stdint.h>
#include <stdio.h>
#include "../../globals.h"
/* Loopback test debug message printout enable */ /* Loopback test debug message printout enable */
#define _LOOPBACK_DEBUG_ #define _LOOPBACK_DEBUG_

91
21_m1284p_WIZNET_TFTP_client_FATFS/main.c
View File

@@ -6,7 +6,7 @@
*/ */
/* /*
* 21.Example TFTP client + SD card FATFS (for reading and saving a file from PC TFTP server). * 21.Example TFTP client + SD card FATFS (for reading and saving a file from PC TFTP server).
** After pressing the SW1 button, it reads the “readme.txt” file from the PC TFTP server and saves it on the SD card. ** After pressing the SW1 button, it reads the “readme.txt” (and another commented patterns) file from the PC TFTP server and saves it on the SD card.
* Then prints out it contents head in a serial terminal. * Then prints out it contents head in a serial terminal.
* TODO: * TODO:
* OK(v1.1) 1. Print-out received file from TFTP to serial console (small file < 512 bytes OK). * OK(v1.1) 1. Print-out received file from TFTP to serial console (small file < 512 bytes OK).
@@ -14,8 +14,9 @@
* OK(v1.3) 3. Write-in data to SD-card file "test.txt" and another patterns. * OK(v1.3) 3. Write-in data to SD-card file "test.txt" and another patterns.
* OK(v1.4) 4. Print out "test.txt" contents head (from SD-Card ) in a serial terminal. * OK(v1.4) 4. Print out "test.txt" contents head (from SD-Card ) in a serial terminal.
* OK(v1.5) 5. Add handlers for CHK_RAM_LEAKAGE && CHK_UPTIME. * OK(v1.5) 5. Add handlers for CHK_RAM_LEAKAGE && CHK_UPTIME.
* 6. Add FSM for TFTP client in main loop * OK(v1.7) 6. Add FSM for TFTP client in main loop
* OK(v1.6) 7. All my debug code in tftp.c replace PRINTF(..) to DBG_PRINT(INFO_DBG, ..) * OK(v1.6) 7. All my debug code in tftp.c replace PRINTF(..) to DBG_PRINT(INFO_DBG, ..)
* OK(v1.7) 8. Add and check standard WIZNET TCP/UDP loopback
* *
* Remark: * Remark:
* Checked with PC tftp-server (WIN7) - tftpd64.exe * Checked with PC tftp-server (WIN7) - tftpd64.exe
@@ -67,7 +68,7 @@ volatile unsigned long _millis; // for millis tick !! Overflow every ~49.7 days
//*********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.6 Static IP TFTP Client && FATFS SDCARD WIZNET_5500 ETHERNET 31/03/2019\r\n"; // Program name const char str_prog_name[] PROGMEM = "\r\nAtMega1284p v1.7 Static IP TFTP Client && FATFS SDCARD WIZNET_5500 ETHERNET 31/03/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
@@ -227,6 +228,15 @@ uint8_t g_tftp_socket_rcv_buf[MAX_MTU_SIZE];
uint8_t g_tftp_op_mode = NORMAL_MODE; uint8_t g_tftp_op_mode = NORMAL_MODE;
uint8_t tftp_filename[TFTP_FILE_NAME_SIZE]; uint8_t tftp_filename[TFTP_FILE_NAME_SIZE];
uint32_t tftp_server; uint32_t tftp_server;
typedef enum
{
TFTPC_STOPPED = 0, ///< Stop processing TFTPC protocol
TFTPC_RUNNING, ///<Begin Processing TFTPC protocol
TFTPC_DATA_TRANSFER ///<TFTPC transfer data stage
}tftpc_type;
tftpc_type tftpc_state = TFTPC_STOPPED;
//***************** TFTP client INIT: END //***************** TFTP client INIT: END
//***************** WIZCHIP INIT: BEGIN //***************** WIZCHIP INIT: BEGIN
@@ -482,18 +492,30 @@ int main()
// Test for Ethernet data transfer validation // Test for Ethernet data transfer validation
uint32_t timer_link_1sec = millis(); uint32_t timer_link_1sec = millis();
uint32_t timer_sw1_1sec = millis();
uint32_t timer_uptime_60sec = millis(); uint32_t timer_uptime_60sec = millis();
uint8_t _ret = 0;
while(1) while(1)
{ {
//Here at least every 1sec //Here at least every 1sec
wdt_reset(); // WDT reset at least every sec wdt_reset(); // WDT reset at least every sec
if((millis()-timer_link_1sec)> 1000) //Use Hercules Terminal to check loopback tcp:5000 and udp:3000
/*
* https://www.hw-group.com/software/hercules-setup-utility
* */
loopback_tcps(SOCK_TCPS,ethBuf0,PORT_TCPS);
loopback_udps(SOCK_UDPS,ethBuf0,PORT_UDPS);
//TFTPC FSM state
switch(tftpc_state)
{
case TFTPC_STOPPED:
//Wait here (unblocking) SW1 pressing
if((millis()-timer_sw1_1sec)> 1000)
{ {
//here every 1 sec //here every 1 sec
timer_link_1sec = millis(); timer_sw1_1sec = millis();
//!! SW1 pressing action //!! SW1 pressing action
if(!sw1_read())// Check for SW1 pressed every second if(!sw1_read())// Check for SW1 pressed every second
{ {
@@ -503,15 +525,31 @@ int main()
{ {
//!! Здесь по факту нажатия кнопки (1->0 SW1) //!! Здесь по факту нажатия кнопки (1->0 SW1)
PRINTF("\r\n########## SW1 was pressed.\r\n"); PRINTF("\r\n########## SW1 was pressed.\r\n");
tftpc_state = TFTPC_RUNNING;
//!! Debug only
//PRINTF("SW1 is pressed\r\n");
}//if(prev_sw1)
prev_sw1 = 0; // Store SW1 state for next iteration
}//if(!sw1_read())
else
{
// SW1 is unpressed
//led1_low(); // LED1 OFF
prev_sw1 = 1;// Store SW1 state for next iteration
}//if(!sw1_read())else..
}
break;
case TFTPC_RUNNING:
memset(tftp_filename, 0x0, TFTP_FILE_NAME_SIZE); memset(tftp_filename, 0x0, TFTP_FILE_NAME_SIZE);
//!!Don't forget about 8.3 file name rule!! //!!Don't forget about 8.3 file name rule!!
strncpy(tftp_filename, "test.txt", TFTP_FILE_NAME_SIZE); //pattern#1 test strncpy(tftp_filename, "test.txt", TFTP_FILE_NAME_SIZE); //pattern#1 test
//strncpy(tftp_filename, "README.md", TFTP_FILE_NAME_SIZE);//pattern#2 test //strncpy(tftp_filename, "README.md", TFTP_FILE_NAME_SIZE);//pattern#2 test
//strncpy(tftp_filename, "tftpd32.ini", TFTP_FILE_NAME_SIZE);//pattern#3 test //strncpy(tftp_filename, "tftpd32.ini", TFTP_FILE_NAME_SIZE);//pattern#3 test
//strncpy(tftp_filename, "ff_lfn.txt", TFTP_FILE_NAME_SIZE);//pattern#4 test //strncpy(tftp_filename, "ff_lfn.txt", TFTP_FILE_NAME_SIZE);//pattern#4 test
strncpy(tftp_filename, "dir.txt", TFTP_FILE_NAME_SIZE);//pattern#5 test //strncpy(tftp_filename, "dir.txt", TFTP_FILE_NAME_SIZE);//pattern#5 test
tftp_server = ((uint32_t)tftp_destip[0] << 24) | ((uint32_t)tftp_destip[1] << 16) | ((uint32_t)tftp_destip[2] << 8) | ((uint32_t)tftp_destip[3]); tftp_server = ((uint32_t)tftp_destip[0] << 24) | ((uint32_t)tftp_destip[1] << 16) | ((uint32_t)tftp_destip[2] << 8) | ((uint32_t)tftp_destip[3]);
@@ -523,10 +561,11 @@ int main()
TFTP_read_request(tftp_server, tftp_filename); TFTP_read_request(tftp_server, tftp_filename);
clear_tftp_received_size(); clear_tftp_received_size();
uint8_t _ret = 0; tftpc_state = TFTPC_DATA_TRANSFER;
while(1){ break;
case TFTPC_DATA_TRANSFER:
wdt_reset(); wdt_reset();
_ret = TFTP_run(); _ret = TFTP_run(); //Proceed TFTPC transfer data
if(_ret != TFTP_PROGRESS) if(_ret != TFTP_PROGRESS)
{ {
//Print-out result TFTP complete //Print-out result TFTP complete
@@ -546,22 +585,24 @@ int main()
{ {
PRINTF("\r\n??TFTP transfer complete:[%u] UNKNOWN, received %lu bytes\r\n\r\n", _ret, get_tftp_received_size()); PRINTF("\r\n??TFTP transfer complete:[%u] UNKNOWN, received %lu bytes\r\n\r\n", _ret, get_tftp_received_size());
} }
break; tftpc_state = TFTPC_STOPPED;
timer_sw1_1sec = millis();
} }
}
_delay_ms(1000);
//!! Debug only
//PRINTF("SW1 is pressed\r\n");
}//if(prev_sw1)
prev_sw1 = 0; // Store SW1 state for next iteration
}//if(!sw1_read())
else else
{ {
// SW1 is unpressed tftpc_state = TFTPC_DATA_TRANSFER; //bulletproof
//led1_low(); // LED1 OFF }
prev_sw1 = 1;// Store SW1 state for next iteration break;
}//if(!sw1_read())else.. default:
tftpc_state = TFTPC_STOPPED;
break;
}//switch(tftpc_state)
if((millis()-timer_link_1sec)> 1000)
{
//here every 1 sec
timer_link_1sec = millis();
//Check ETHERNET PHY link //Check ETHERNET PHY link
if(wizphy_getphylink() == PHY_LINK_ON) if(wizphy_getphylink() == PHY_LINK_ON)