mirror of
https://github.com/HASwitchPlate/openHASP.git
synced 2025-07-24 11:46:34 +00:00
Update to SimpleFTPServer 2.1.5 #283
This commit is contained in:
fvanroie
parent
7c0bc16629
commit
321407238d
File diff suppressed because it is too large
Load Diff
@ -15,12 +15,15 @@
|
||||
** **
|
||||
*******************************************************************************/
|
||||
|
||||
#include <FtpServerKey.h>
|
||||
|
||||
#ifndef FTP_SERVER_H
|
||||
#define FTP_SERVER_H
|
||||
|
||||
#define FTP_SERVER_VERSION "2021-11-09"
|
||||
#define FTP_SERVER_VERSION "2.1.5 (2023-01-13)"
|
||||
|
||||
#include "ArduinoLog.h"
|
||||
|
||||
#include <FtpServerKey.h>
|
||||
#if ARDUINO >= 100
|
||||
#include "Arduino.h"
|
||||
#else
|
||||
@ -50,6 +53,12 @@
|
||||
#elif defined(ESP32)
|
||||
#define FTP_SERVER_NETWORK_TYPE DEFAULT_FTP_SERVER_NETWORK_TYPE_ESP32
|
||||
#define STORAGE_TYPE DEFAULT_STORAGE_TYPE_ESP32
|
||||
#elif defined(ARDUINO_ARCH_STM32)
|
||||
#define FTP_SERVER_NETWORK_TYPE DEFAULT_FTP_SERVER_NETWORK_TYPE_STM32
|
||||
#define STORAGE_TYPE DEFAULT_STORAGE_TYPE_STM32
|
||||
#elif defined(ARDUINO_ARCH_RP2040)
|
||||
#define FTP_SERVER_NETWORK_TYPE DEFAULT_FTP_SERVER_NETWORK_TYPE_RP2040
|
||||
#define STORAGE_TYPE DEFAULT_STORAGE_TYPE_RP2040
|
||||
#elif defined(ARDUINO_ARCH_SAMD)
|
||||
#define FTP_SERVER_NETWORK_TYPE DEFAULT_FTP_SERVER_NETWORK_TYPE_SAMD
|
||||
#define STORAGE_TYPE DEFAULT_STORAGE_TYPE_SAMD
|
||||
@ -89,72 +98,96 @@
|
||||
// Includes and defined based on Network Type
|
||||
#if(FTP_SERVER_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
|
||||
|
||||
// Note:
|
||||
// No SSL/WSS support for client in Async mode
|
||||
// TLS lib need a sync interface!
|
||||
// Note:
|
||||
// No SSL/WSS support for client in Async mode
|
||||
// TLS lib need a sync interface!
|
||||
|
||||
#if defined(ESP8266)
|
||||
#include <ESP8266WiFi.h>
|
||||
//#include <WiFiClientSecure.h>
|
||||
#elif defined(ESP32)
|
||||
#include <WiFi.h>
|
||||
//#include <WiFiClientSecure.h>
|
||||
#if defined(ESP8266)
|
||||
#include <ESP8266WiFi.h>
|
||||
//#include <WiFiClientSecure.h>
|
||||
#define FTP_CLIENT_NETWORK_CLASS WiFiClient
|
||||
//#define FTP_CLIENT_NETWORK_SSL_CLASS WiFiClientSecure
|
||||
#define FTP_SERVER_NETWORK_SERVER_CLASS WiFiServer
|
||||
|
||||
#define FTP_CLIENT_NETWORK_CLASS WiFiClient
|
||||
//#define FTP_CLIENT_NETWORK_SSL_CLASS WiFiClientSecure
|
||||
#define FTP_SERVER_NETWORK_SERVER_CLASS WiFiServer
|
||||
#elif defined(ESP32)
|
||||
#include <WiFi.h>
|
||||
//#include <WiFiClientSecure.h>
|
||||
|
||||
#elif defined(ESP31B)
|
||||
#include <ESP31BWiFi.h>
|
||||
#else
|
||||
#error "network type ESP8266 ASYNC only possible on the ESP mcu!"
|
||||
#endif
|
||||
#define FTP_CLIENT_NETWORK_CLASS WiFiClient
|
||||
//#define FTP_CLIENT_NETWORK_SSL_CLASS WiFiClientSecure
|
||||
#define FTP_SERVER_NETWORK_SERVER_CLASS WiFiServer
|
||||
#elif defined(ESP31B)
|
||||
#include <ESP31BWiFi.h>
|
||||
|
||||
#define FTP_CLIENT_NETWORK_CLASS WiFiClient
|
||||
//#define FTP_CLIENT_NETWORK_SSL_CLASS WiFiClientSecure
|
||||
#define FTP_SERVER_NETWORK_SERVER_CLASS WiFiServer
|
||||
#else
|
||||
#error "network type ESP8266 ASYNC only possible on the ESP mcu!"
|
||||
#endif
|
||||
|
||||
#elif(FTP_SERVER_NETWORK_TYPE == NETWORK_ESP8266 || FTP_SERVER_NETWORK_TYPE == NETWORK_ESP8266_242)
|
||||
|
||||
#if !defined(ESP8266) && !defined(ESP31B)
|
||||
#error "network type ESP8266 only possible on the ESP mcu!"
|
||||
#if !defined(ESP8266) && !defined(ESP31B)
|
||||
#error "network type ESP8266 only possible on the ESP mcu!"
|
||||
#endif
|
||||
|
||||
#ifdef ESP8266
|
||||
#include <ESP8266WiFi.h>
|
||||
#include <ESP8266WiFi.h>
|
||||
#else
|
||||
#include <ESP31BWiFi.h>
|
||||
#include <ESP31BWiFi.h>
|
||||
#endif
|
||||
#define FTP_CLIENT_NETWORK_CLASS WiFiClient
|
||||
//#define FTP_CLIENT_NETWORK_SSL_CLASS WiFiClientSecure
|
||||
#define FTP_SERVER_NETWORK_SERVER_CLASS WiFiServer
|
||||
#define NET_CLASS WiFi
|
||||
#define CommandIs( a ) (command != NULL && ! strcmp_P( command, PSTR( a )))
|
||||
#define ParameterIs( a ) ( parameter != NULL && ! strcmp_P( parameter, PSTR( a )))
|
||||
#elif(FTP_SERVER_NETWORK_TYPE == NETWORK_W5100)
|
||||
// #define CommandIs( a ) (command != NULL && ! strcmp_P( command, PSTR( a )))
|
||||
// #define ParameterIs( a ) ( parameter != NULL && ! strcmp_P( parameter, PSTR( a )))
|
||||
#elif(FTP_SERVER_NETWORK_TYPE == NETWORK_W5100 || FTP_SERVER_NETWORK_TYPE == NETWORK_ETHERNET_ENC)
|
||||
|
||||
#ifdef STM32_DEVICE
|
||||
#define FTP_CLIENT_NETWORK_CLASS TCPClient
|
||||
#define FTP_SERVER_NETWORK_SERVER_CLASS TCPServer
|
||||
#define CommandIs( a ) ( ! strcmp_PF( command, PSTR( a )))
|
||||
#define ParameterIs( a ) ( ! strcmp_PF( parameter, PSTR( a )))
|
||||
#define NET_CLASS Ethernet
|
||||
#else
|
||||
#include <Ethernet.h>
|
||||
#include <SPI.h>
|
||||
#define FTP_CLIENT_NETWORK_CLASS EthernetClient
|
||||
#define FTP_SERVER_NETWORK_SERVER_CLASS EthernetServer
|
||||
#define NET_CLASS Ethernet
|
||||
#define CommandIs( a ) ( ! strcmp_PF( command, PSTR( a )))
|
||||
#define ParameterIs( a ) ( ! strcmp_PF( parameter, PSTR( a )))
|
||||
#endif
|
||||
|
||||
#elif(FTP_SERVER_NETWORK_TYPE == NETWORK_ENC28J60)
|
||||
// #if defined(ESP8266) || defined(ESP32)
|
||||
// #define CommandIs( a ) (command != NULL && ! strcmp_P( command, PSTR( a )))
|
||||
// #define ParameterIs( a ) ( parameter != NULL && ! strcmp_P( parameter, PSTR( a )))
|
||||
// #else
|
||||
// #define CommandIs( a ) ( ! strcmp_PF( command, PSTR( a )))
|
||||
// #define ParameterIs( a ) ( ! strcmp_PF( parameter, PSTR( a )))
|
||||
// #endif
|
||||
#elif(FTP_SERVER_NETWORK_TYPE == NETWORK_ENC28J60 || FTP_SERVER_NETWORK_TYPE == NETWORK_UIPETHERNET)
|
||||
|
||||
#include <UIPEthernet.h>
|
||||
|
||||
#define FTP_CLIENT_NETWORK_CLASS UIPClient
|
||||
#define FTP_SERVER_NETWORK_SERVER_CLASS UIPServer
|
||||
#define NET_CLASS Ethernet
|
||||
#define CommandIs( a ) ( ! strcmp_PF( command, PSTR( a )))
|
||||
#define ParameterIs( a ) ( ! strcmp_PF( parameter, PSTR( a )))
|
||||
//SSLClient client(base_client, TAs, (size_t)TAs_NUM, A5);
|
||||
// #if define(ESP8266) || define(ESP32)
|
||||
// #define CommandIs( a ) (command != NULL && ! strcmp_P( command, PSTR( a )))
|
||||
// #define ParameterIs( a ) ( parameter != NULL && ! strcmp_P( parameter, PSTR( a )))
|
||||
// #else
|
||||
// #define CommandIs( a ) ( ! strcmp_PF( command, PSTR( a )))
|
||||
// #define ParameterIs( a ) ( ! strcmp_PF( parameter, PSTR( a )))
|
||||
// #endif
|
||||
#elif(EMAIL_NETWORK_TYPE == NETWORK_ETHERNET_LARGE)
|
||||
|
||||
#include <EthernetLarge.h>
|
||||
#include <SPI.h>
|
||||
#define FTP_CLIENT_NETWORK_CLASS EthernetClient
|
||||
#define FTP_SERVER_NETWORK_SERVER_CLASS EthernetServer
|
||||
#define NET_CLASS Ethernet
|
||||
|
||||
#elif(EMAIL_NETWORK_TYPE == NETWORK_ETHERNET_STM)
|
||||
|
||||
#include <Ethernet_STM.h>
|
||||
#include <SPI.h>
|
||||
#define FTP_CLIENT_NETWORK_CLASS EthernetClient
|
||||
#define FTP_SERVER_NETWORK_SERVER_CLASS EthernetServer
|
||||
#define NET_CLASS Ethernet
|
||||
|
||||
#elif(FTP_SERVER_NETWORK_TYPE == NETWORK_ESP32)
|
||||
|
||||
#include <WiFi.h>
|
||||
@ -163,16 +196,16 @@
|
||||
//#define FTP_CLIENT_NETWORK_SSL_CLASS WiFiClientSecure
|
||||
#define FTP_SERVER_NETWORK_SERVER_CLASS WiFiServer
|
||||
#define NET_CLASS WiFi
|
||||
#define CommandIs( a ) (command != NULL && ! strcmp_P( command, PSTR( a )))
|
||||
#define ParameterIs( a ) ( parameter != NULL && ! strcmp_P( parameter, PSTR( a )))
|
||||
// #define CommandIs( a ) (command != NULL && ! strcmp_P( command, PSTR( a )))
|
||||
// #define ParameterIs( a ) ( parameter != NULL && ! strcmp_P( parameter, PSTR( a )))
|
||||
#elif(FTP_SERVER_NETWORK_TYPE == NETWORK_ESP32_ETH)
|
||||
|
||||
#include <ETH.h>
|
||||
#define FTP_CLIENT_NETWORK_CLASS WiFiClient
|
||||
#define FTP_SERVER_NETWORK_SERVER_CLASS WiFiServer
|
||||
#define NET_CLASS Ethernet
|
||||
#define CommandIs( a ) ( ! strcmp_PF( command, PSTR( a )))
|
||||
#define ParameterIs( a ) ( ! strcmp_PF( parameter, PSTR( a )))
|
||||
// #define CommandIs( a ) ( ! strcmp_PF( command, PSTR( a )))
|
||||
// #define ParameterIs( a ) ( ! strcmp_PF( parameter, PSTR( a )))
|
||||
#elif(FTP_SERVER_NETWORK_TYPE == NETWORK_WiFiNINA)
|
||||
|
||||
#include <WiFiNINA.h>
|
||||
@ -180,8 +213,8 @@
|
||||
//#define FTP_CLIENT_NETWORK_SSL_CLASS WiFiSSLClient
|
||||
#define FTP_SERVER_NETWORK_SERVER_CLASS WiFiServer
|
||||
#define NET_CLASS WiFi
|
||||
#define CommandIs( a ) ( ! strcmp_PF( command, PSTR( a )))
|
||||
#define ParameterIs( a ) ( ! strcmp_PF( parameter, PSTR( a )))
|
||||
// #define CommandIs( a ) ( ! strcmp_PF( command, PSTR( a )))
|
||||
// #define ParameterIs( a ) ( ! strcmp_PF( parameter, PSTR( a )))
|
||||
#elif(FTP_SERVER_NETWORK_TYPE == NETWORK_SEEED_RTL8720DN)
|
||||
|
||||
#include <rpcWiFi.h>
|
||||
@ -189,12 +222,20 @@
|
||||
//#define FTP_CLIENT_NETWORK_SSL_CLASS WiFiSSLClient
|
||||
#define FTP_SERVER_NETWORK_SERVER_CLASS WiFiServer
|
||||
#define NET_CLASS WiFi
|
||||
#define CommandIs( a ) ( ! strcmp_PF( command, PSTR( a )))
|
||||
#define ParameterIs( a ) ( ! strcmp_PF( parameter, PSTR( a )))
|
||||
// #define CommandIs( a ) ( ! strcmp_PF( command, PSTR( a )))
|
||||
// #define ParameterIs( a ) ( ! strcmp_PF( parameter, PSTR( a )))
|
||||
#else
|
||||
#error "no network type selected!"
|
||||
#endif
|
||||
|
||||
#if defined(ESP8266) || defined(ESP32) || defined(ARDUINO_ARCH_RP2040)
|
||||
#define CommandIs( a ) (command != NULL && ! strcmp_P( command, PSTR( a )))
|
||||
#define ParameterIs( a ) ( parameter != NULL && ! strcmp_P( parameter, PSTR( a )))
|
||||
#else
|
||||
#define CommandIs( a ) ( ! strcmp_PF( command, PSTR( a )))
|
||||
#define ParameterIs( a ) ( ! strcmp_PF( parameter, PSTR( a )))
|
||||
#endif
|
||||
|
||||
#if(STORAGE_TYPE == STORAGE_SPIFFS)
|
||||
#if defined(ESP32)
|
||||
// #define FS_NO_GLOBALS
|
||||
@ -216,7 +257,6 @@
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#if ESP8266
|
||||
#define FTP_FILE_READ "r"
|
||||
#define FTP_FILE_READ_ONLY "r"
|
||||
@ -231,7 +271,9 @@
|
||||
#define FTP_FILE_WRITE_CREATE "w"
|
||||
#endif
|
||||
|
||||
#define STORAGE_MANAGER SPIFFS
|
||||
#define STORAGE_MANAGER SPIFFS
|
||||
|
||||
#define FILENAME_LENGTH 32
|
||||
#elif(STORAGE_TYPE == STORAGE_FFAT)
|
||||
#include "FS.h"
|
||||
#include "FFat.h"
|
||||
@ -247,8 +289,9 @@
|
||||
#define FTP_FILE_WRITE_APPEND "a"
|
||||
#define FTP_FILE_WRITE_CREATE "w"
|
||||
|
||||
#define FILENAME_LENGTH 255
|
||||
#elif(STORAGE_TYPE == STORAGE_LITTLEFS)
|
||||
#if ESP8266
|
||||
#if ESP8266 || ARDUINO_ARCH_RP2040
|
||||
#include "LittleFS.h"
|
||||
#define STORAGE_MANAGER LittleFS
|
||||
#define FTP_FILE File
|
||||
@ -260,13 +303,18 @@
|
||||
#define FTP_FILE_WRITE_APPEND "a+"
|
||||
#define FTP_FILE_WRITE_CREATE "w+"
|
||||
#else
|
||||
#if ESP_ARDUINO_VERSION_MAJOR >= 2
|
||||
#include "FS.h"
|
||||
#include "LittleFS.h"
|
||||
#define STORAGE_MANAGER LittleFS
|
||||
#ifdef ESP32
|
||||
#if ESP_ARDUINO_VERSION_MAJOR >= 2
|
||||
#include "FS.h"
|
||||
#include "LittleFS.h"
|
||||
#define STORAGE_MANAGER LittleFS
|
||||
#else
|
||||
#include "LITTLEFS.h"
|
||||
#define STORAGE_MANAGER LITTLEFS
|
||||
#endif
|
||||
#else
|
||||
#include "LITTLEFS.h"
|
||||
#define STORAGE_MANAGER LITTLEFS
|
||||
#include "LittleFS.h"
|
||||
#define STORAGE_MANAGER LittleFS
|
||||
#endif
|
||||
#define FTP_FILE File
|
||||
#define FTP_DIR File
|
||||
@ -277,6 +325,7 @@
|
||||
#define FTP_FILE_WRITE_APPEND "a"
|
||||
#define FTP_FILE_WRITE_CREATE "w"
|
||||
#endif
|
||||
#define FILENAME_LENGTH 32
|
||||
#elif(STORAGE_TYPE == STORAGE_SD)
|
||||
#include <SPI.h>
|
||||
#include <SD.h>
|
||||
@ -287,16 +336,37 @@
|
||||
|
||||
#define FTP_FILE_READ FILE_READ
|
||||
#define FTP_FILE_READ_ONLY FILE_READ
|
||||
#define FTP_FILE_READ_WRITE FILE_WRITE
|
||||
#ifdef ESP8266
|
||||
#define FTP_FILE_READ_WRITE FILE_WRITE
|
||||
#define FTP_FILE_WRITE_APPEND FILE_WRITE
|
||||
#else
|
||||
#ifdef ESP32
|
||||
#define FTP_FILE_READ_WRITE FILE_WRITE
|
||||
#define FTP_FILE_WRITE_APPEND FILE_APPEND
|
||||
#else
|
||||
#define FTP_FILE_READ_WRITE FILE_WRITE
|
||||
#define FTP_FILE_WRITE_APPEND FILE_WRITE
|
||||
#endif
|
||||
#define FTP_FILE_WRITE_CREATE FILE_WRITE
|
||||
|
||||
#define FILENAME_LENGTH 255
|
||||
#elif(STORAGE_TYPE == STORAGE_SD_MMC)
|
||||
#include <SPI.h>
|
||||
#include <SD_MMC.h>
|
||||
|
||||
#define STORAGE_MANAGER SD_MMC
|
||||
#define FTP_FILE File
|
||||
#define FTP_DIR File
|
||||
|
||||
#define FTP_FILE_READ FILE_READ
|
||||
#define FTP_FILE_READ_ONLY FILE_READ
|
||||
#define FTP_FILE_READ_WRITE FILE_WRITE
|
||||
#ifdef ESP32
|
||||
#define FTP_FILE_READ_WRITE FILE_WRITE
|
||||
#define FTP_FILE_WRITE_APPEND FILE_APPEND
|
||||
#else
|
||||
#define FTP_FILE_READ_WRITE FILE_WRITE
|
||||
#define FTP_FILE_WRITE_APPEND FILE_WRITE
|
||||
#endif
|
||||
#define FTP_FILE_WRITE_CREATE FILE_WRITE
|
||||
|
||||
#define FILENAME_LENGTH 255
|
||||
#elif(STORAGE_TYPE == STORAGE_SEEED_SD)
|
||||
#include <Seeed_FS.h>
|
||||
#define STORAGE_MANAGER SD
|
||||
@ -317,6 +387,8 @@
|
||||
#define FTP_FILE_WRITE_APPEND FILE_APPEND
|
||||
#define FTP_FILE_WRITE_CREATE FILE_WRITE
|
||||
|
||||
#define FILENAME_LENGTH 255
|
||||
|
||||
#elif (STORAGE_TYPE == STORAGE_SDFAT1)
|
||||
#include <SdFat.h>
|
||||
#include <sdios.h>
|
||||
@ -331,6 +403,8 @@
|
||||
#define FTP_FILE_READ_WRITE O_RDWR
|
||||
#define FTP_FILE_WRITE_APPEND O_WRITE | O_APPEND
|
||||
#define FTP_FILE_WRITE_CREATE O_WRITE | O_CREAT
|
||||
#define FILENAME_LENGTH 255
|
||||
|
||||
#elif (STORAGE_TYPE == STORAGE_SDFAT2)
|
||||
#include <SdFat.h>
|
||||
#include <sdios.h>
|
||||
@ -345,6 +419,7 @@
|
||||
#define FTP_FILE_READ_WRITE O_RDWR
|
||||
#define FTP_FILE_WRITE_APPEND O_WRITE | O_APPEND
|
||||
#define FTP_FILE_WRITE_CREATE O_WRITE | O_CREAT
|
||||
#define FILENAME_LENGTH 255
|
||||
#elif (STORAGE_TYPE == STORAGE_SPIFM)
|
||||
#include <SdFat.h>
|
||||
#include <Adafruit_SPIFlash.h>
|
||||
@ -355,12 +430,12 @@
|
||||
#define FTP_DIR File
|
||||
extern FatFileSystem STORAGE_MANAGER;
|
||||
extern Adafruit_SPIFlash flash;
|
||||
#define FTP_FILE_READ O_READ
|
||||
#define FTP_FILE_READ_ONLY O_RDONLY
|
||||
#define FTP_FILE_READ_WRITE O_RDWR
|
||||
#define FTP_FILE_WRITE_APPEND O_WRITE | O_APPEND
|
||||
#define FTP_FILE_WRITE_CREATE O_WRITE | O_CREAT
|
||||
|
||||
#define FTP_FILE_READ FILE_READ
|
||||
#define FTP_FILE_READ_ONLY FILE_READ
|
||||
#define FTP_FILE_READ_WRITE FILE_WRITE
|
||||
#define FTP_FILE_WRITE_APPEND FILE_WRITE
|
||||
#define FTP_FILE_WRITE_CREATE FILE_WRITE
|
||||
#define FILENAME_LENGTH 255
|
||||
#elif (STORAGE_TYPE == STORAGE_FATFS)
|
||||
#include <FatFs.h>
|
||||
#include <sdios.h>
|
||||
@ -380,6 +455,7 @@
|
||||
#define FTP_FILE_READ_WRITE O_RDWR
|
||||
#define FTP_FILE_WRITE_APPEND O_WRITE | O_APPEND
|
||||
#define FTP_FILE_WRITE_CREATE O_WRITE | O_CREAT
|
||||
#define FILENAME_LENGTH 255
|
||||
#endif
|
||||
|
||||
//#ifdef FTP_CLIENT_NETWORK_SSL_CLASS
|
||||
@ -391,25 +467,24 @@
|
||||
|
||||
// Setup debug printing macros.
|
||||
#ifdef FTP_SERVER_DEBUG
|
||||
#define DEBUG_PRINT(...) { DEBUG_PRINTER.print(__VA_ARGS__); }
|
||||
#define DEBUG_PRINTLN(...) { DEBUG_PRINTER.println(__VA_ARGS__); }
|
||||
// #define DEBUG_PRINT(...) { DEBUG_PRINTER.print(__VA_ARGS__); }
|
||||
// #define DEBUG_PRINTLN(...) { DEBUG_PRINTER.println(__VA_ARGS__); }
|
||||
#define DEBUG_PRINT(...) { Log.verbose(68 /* FTP_TAG */, __VA_ARGS__); }
|
||||
#define DEBUG_PRINTLN(...) { Log.verbose(68 /* FTP_TAG */, __VA_ARGS__); }
|
||||
#else
|
||||
#define DEBUG_PRINT(...) {}
|
||||
#define DEBUG_PRINTLN(...) {}
|
||||
#endif
|
||||
|
||||
#define FTP_USER "arduino" // Default user'name
|
||||
#define FTP_PASS "test" // Default password
|
||||
|
||||
#define FTP_CMD_PORT 21 // Command port on wich server is listening
|
||||
#define FTP_DATA_PORT_DFLT 20 // Default data port in active mode
|
||||
#define FTP_DATA_PORT_PASV 50009 // Data port in passive mode
|
||||
|
||||
#define FF_MAX_LFN 255 // max size of a long file name
|
||||
#define FF_MAX_LFN 255 // max size of a long file name
|
||||
#define FTP_CMD_SIZE FF_MAX_LFN+8 // max size of a command
|
||||
#define FTP_CWD_SIZE FF_MAX_LFN+8 // max size of a directory name
|
||||
#define FTP_FIL_SIZE FF_MAX_LFN // max size of a file name
|
||||
#define FTP_CRED_SIZE 16 // max size of username and password
|
||||
#define FTP_FIL_SIZE FF_MAX_LFN // max size of a file name
|
||||
#define FTP_CRED_SIZE 255 // max size of username and password
|
||||
#define FTP_NULLIP() IPAddress(0,0,0,0)
|
||||
|
||||
enum ftpCmd { FTP_Stop = 0, // In this stage, stop any connection
|
||||
@ -458,8 +533,11 @@ class FtpServer
|
||||
public:
|
||||
FtpServer( uint16_t _cmdPort = FTP_CMD_PORT, uint16_t _pasvPort = FTP_DATA_PORT_PASV );
|
||||
|
||||
void begin( const char * _user = FTP_USER, const char * _pass = FTP_PASS, const char * welcomeMessage = "Welcome to Simply FTP server" );
|
||||
void end();
|
||||
void begin( const char * _user, const char * _pass, const char * welcomeMessage = "Welcome to Simply FTP server" );
|
||||
void begin( const char * welcomeMessage = "Welcome to Simply FTP server" );
|
||||
|
||||
void end();
|
||||
void setLocalIp(IPAddress localIp);
|
||||
void credentials( const char * _user, const char * _pass );
|
||||
uint8_t handleFTP();
|
||||
|
||||
@ -515,11 +593,7 @@ private:
|
||||
#elif STORAGE_TYPE == STORAGE_FATFS
|
||||
return file->fileName();
|
||||
#else
|
||||
#if ESP_ARDUINO_VERSION_MAJOR >= 2
|
||||
return file->path();
|
||||
#else
|
||||
return file->name();
|
||||
#endif
|
||||
return file->name();
|
||||
#endif
|
||||
}
|
||||
bool exists( const char * path ) {
|
||||
@ -542,7 +616,7 @@ private:
|
||||
bool removeDir( const char * path ) { return STORAGE_MANAGER.rmdir( path ); };
|
||||
#endif
|
||||
|
||||
#if STORAGE_TYPE == STORAGE_SD
|
||||
#if STORAGE_TYPE == STORAGE_SD || STORAGE_TYPE == STORAGE_SD_MMC
|
||||
bool rename( const char * path, const char * newpath );
|
||||
#else
|
||||
bool rename( const char * path, const char * newpath ) { return STORAGE_MANAGER.rename( path, newpath ); };
|
||||
@ -554,7 +628,7 @@ private:
|
||||
#elif (STORAGE_TYPE == STORAGE_SPIFFS || STORAGE_TYPE == STORAGE_LITTLEFS || STORAGE_TYPE == STORAGE_FFAT )
|
||||
bool openFile( const char * path, const char * readType );
|
||||
// bool openFile( char path[ FTP_CWD_SIZE ], int readTypeInt );
|
||||
#elif STORAGE_TYPE <= STORAGE_SDFAT2
|
||||
#elif STORAGE_TYPE <= STORAGE_SDFAT2 || STORAGE_TYPE == STORAGE_SPIFM || (STORAGE_TYPE == STORAGE_SD && ARDUINO_ARCH_SAMD)
|
||||
bool openFile( char path[ FTP_CWD_SIZE ], int readTypeInt );
|
||||
#else
|
||||
bool openFile( char path[ FTP_CWD_SIZE ], const char * readType );
|
||||
@ -563,10 +637,10 @@ private:
|
||||
#endif
|
||||
// bool openFile( char path[ FTP_CWD_SIZE ], const char * readType );
|
||||
// bool openFile( const char * path, const char * readType );
|
||||
uint16_t fileSize( FTP_FILE file );
|
||||
uint32_t fileSize( FTP_FILE file );
|
||||
|
||||
#if STORAGE_TYPE == STORAGE_SPIFFS || STORAGE_TYPE == STORAGE_LITTLEFS
|
||||
#if ESP8266
|
||||
#if ESP8266 || ARDUINO_ARCH_RP2040
|
||||
uint32_t capacity() {
|
||||
FSInfo fi;
|
||||
STORAGE_MANAGER.info(fi);
|
||||
@ -577,8 +651,7 @@ private:
|
||||
FSInfo fi;
|
||||
STORAGE_MANAGER.info(fi);
|
||||
|
||||
return fi.totalBytes -
|
||||
fi.usedBytes >> 1;
|
||||
return (fi.totalBytes - fi.usedBytes) >> 1;
|
||||
};
|
||||
#else
|
||||
uint32_t capacity() {
|
||||
@ -589,7 +662,7 @@ private:
|
||||
STORAGE_MANAGER.usedBytes()) >> 1;
|
||||
};
|
||||
#endif
|
||||
#elif STORAGE_TYPE == STORAGE_SD
|
||||
#elif STORAGE_TYPE == STORAGE_SD || STORAGE_TYPE == STORAGE_SD_MMC
|
||||
uint32_t capacity() { return true; };
|
||||
uint32_t free() { return true; };
|
||||
#elif STORAGE_TYPE == STORAGE_SEEED_SD
|
||||
@ -620,7 +693,7 @@ private:
|
||||
#endif
|
||||
bool legalChar( char c ) // Return true if char c is allowed in a long file name
|
||||
{
|
||||
if( c == '"' || c == '*' || c == '?' || c == ':' ||
|
||||
if( c == '"' || c == '*' || c == '?' || c == ':' ||
|
||||
c == '<' || c == '>' || c == '|' )
|
||||
return false;
|
||||
#if STORAGE_TYPE == STORAGE_FATFS
|
||||
@ -629,7 +702,7 @@ private:
|
||||
return 0x1f < c && c < 0x7f;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
IPAddress localIp; // IP address of server as seen by clients
|
||||
IPAddress dataIp; // IP address of client for data
|
||||
FTP_SERVER_NETWORK_SERVER_CLASS ftpServer;
|
||||
@ -638,15 +711,17 @@ private:
|
||||
|
||||
FTP_CLIENT_NETWORK_CLASS client;
|
||||
FTP_CLIENT_NETWORK_CLASS data;
|
||||
|
||||
|
||||
FTP_FILE file;
|
||||
FTP_DIR dir;
|
||||
|
||||
|
||||
ftpCmd cmdStage; // stage of ftp command connexion
|
||||
ftpTransfer transferStage; // stage of data connexion
|
||||
ftpDataConn dataConn; // type of data connexion
|
||||
|
||||
uint8_t __attribute__((packed, aligned(4))) // need to be aligned to 32bit for Esp8266 SPIClass::transferBytes()
|
||||
bool anonymousConnection = false;
|
||||
|
||||
uint8_t __attribute__((aligned(4))) // need to be aligned to 32bit for Esp8266 SPIClass::transferBytes()
|
||||
buf[ FTP_BUF_SIZE ]; // data buffer for transfers
|
||||
char cmdLine[ FTP_CMD_SIZE ]; // where to store incoming char from client
|
||||
char cwdName[ FTP_CWD_SIZE ]; // name of current directory
|
||||
@ -664,7 +739,7 @@ private:
|
||||
uint16_t nbMatch;
|
||||
|
||||
uint32_t millisDelay, //
|
||||
millisEndConnection, //
|
||||
millisEndConnection, //
|
||||
millisBeginTrans, // store time of beginning of a transaction
|
||||
bytesTransfered; //
|
||||
};
|
||||
|
||||
@ -18,52 +18,76 @@
|
||||
#define FTP_SERVER_CONFIG_H
|
||||
|
||||
// Uncomment to enable printing out nice debug messages.
|
||||
//#define FTP_SERVER_DEBUG
|
||||
// #define FTP_SERVER_DEBUG
|
||||
|
||||
// Define where debug output will be printed.
|
||||
#define DEBUG_PRINTER Serial
|
||||
|
||||
#define STORAGE_SDFAT1 0 // Library SdFat version 1.4.x
|
||||
#define STORAGE_SDFAT2 1 // Library SdFat version >= 2.0.2
|
||||
#define STORAGE_SPIFM 2 // Libraries Adafruit_SPIFlash and SdFat-Adafruit-Fork
|
||||
#define STORAGE_FATFS 3 // Library FatFs
|
||||
#define STORAGE_SD 4 // Standard SD library (suitable for Arduino esp8266 and esp32
|
||||
#define STORAGE_SPIFFS 5 // SPIFFS
|
||||
#define STORAGE_LITTLEFS 6 // LITTLEFS
|
||||
#define STORAGE_SEEED_SD 7 // Seeed_SD library
|
||||
#define STORAGE_FFAT 8 // ESP32 FFAT
|
||||
#define STORAGE_SDFAT1 1 // Library SdFat version 1.4.x
|
||||
#define STORAGE_SDFAT2 2 // Library SdFat version >= 2.0.2
|
||||
#define STORAGE_SPIFM 3 // Libraries Adafruit_SPIFlash and SdFat-Adafruit-Fork
|
||||
#define STORAGE_FATFS 4 // Library FatFs
|
||||
#define STORAGE_SD 5 // Standard SD library (suitable for Arduino esp8266 and esp32
|
||||
#define STORAGE_SPIFFS 6 // SPIFFS
|
||||
#define STORAGE_LITTLEFS 7 // LITTLEFS
|
||||
#define STORAGE_SEEED_SD 8 // Seeed_SD library
|
||||
#define STORAGE_FFAT 9 // ESP32 FFAT
|
||||
#define STORAGE_SD_MMC 10 // SD_MMC library
|
||||
|
||||
#define NETWORK_ESP8266_ASYNC (0)
|
||||
#define NETWORK_ESP8266 (1)
|
||||
#define NETWORK_ESP8266_242 (6)
|
||||
#define NETWORK_W5100 (2)
|
||||
#define NETWORK_ENC28J60 (3)
|
||||
#define NETWORK_ESP32 (4)
|
||||
#define NETWORK_ESP32_ETH (5)
|
||||
#define NETWORK_WiFiNINA (7)
|
||||
#define NETWORK_SEEED_RTL8720DN (8)
|
||||
#define NETWORK_ESP8266_ASYNC (1)
|
||||
#define NETWORK_ESP8266 (2) // Standard ESP8266WiFi
|
||||
#define NETWORK_ESP8266_242 (3) // ESP8266WiFi before 2.4.2 core
|
||||
#define NETWORK_W5100 (4) // Standard Arduino Ethernet library
|
||||
#define NETWORK_ENC28J60 (5) // UIPEthernet library
|
||||
#define NETWORK_ESP32 (6) // Standard WiFi library
|
||||
#define NETWORK_RP2040_WIFI (6) // Raspberry Pi Pico W standard WiFi library
|
||||
#define NETWORK_ESP32_ETH (7) // Standard ETH library
|
||||
#define NETWORK_WiFiNINA (8) // Standard WiFiNINA library
|
||||
#define NETWORK_SEEED_RTL8720DN (9) // Standard SEED WiFi library
|
||||
#define NETWORK_ETHERNET_LARGE (10)
|
||||
#define NETWORK_ETHERNET_ENC (11) // EthernetENC library (evolution of UIPEthernet
|
||||
#define NETWORK_ETHERNET_STM (12)
|
||||
#define NETWORK_UIPETHERNET (13) // UIPEthernet library same of NETWORK_ENC28J60
|
||||
|
||||
// esp8266 configuration
|
||||
#ifndef DEFAULT_FTP_SERVER_NETWORK_TYPE_ESP8266
|
||||
#define DEFAULT_FTP_SERVER_NETWORK_TYPE_ESP8266 NETWORK_ESP8266
|
||||
#define DEFAULT_STORAGE_TYPE_ESP8266 STORAGE_LITTLEFS
|
||||
#define DEFAULT_STORAGE_TYPE_ESP8266 STORAGE_LITTLEFS
|
||||
#endif
|
||||
// esp32 configuration
|
||||
#ifndef DEFAULT_FTP_SERVER_NETWORK_TYPE_ESP32
|
||||
#define DEFAULT_FTP_SERVER_NETWORK_TYPE_ESP32 NETWORK_ESP32
|
||||
#define DEFAULT_STORAGE_TYPE_ESP32 STORAGE_SPIFFS
|
||||
#define DEFAULT_FTP_SERVER_NETWORK_TYPE_ESP32 NETWORK_ESP32
|
||||
#define DEFAULT_STORAGE_TYPE_ESP32 STORAGE_FFAT
|
||||
#endif
|
||||
// Standard AVR Arduino configuration
|
||||
#ifndef DEFAULT_FTP_SERVER_NETWORK_TYPE_ARDUINO
|
||||
#define DEFAULT_FTP_SERVER_NETWORK_TYPE_ARDUINO NETWORK_W5100
|
||||
#define DEFAULT_STORAGE_TYPE_ARDUINO STORAGE_SDFAT2
|
||||
#define DEFAULT_STORAGE_TYPE_ARDUINO STORAGE_SD
|
||||
#endif
|
||||
// STM32 configuration
|
||||
#ifndef DEFAULT_FTP_SERVER_NETWORK_TYPE_STM32
|
||||
#define DEFAULT_FTP_SERVER_NETWORK_TYPE_STM32 NETWORK_W5100
|
||||
#define DEFAULT_STORAGE_TYPE_STM32 STORAGE_SDFAT2
|
||||
#endif
|
||||
// Raspberry Pi Pico (rp2040) configuration
|
||||
#ifndef DEFAULT_FTP_SERVER_NETWORK_TYPE_RP2040
|
||||
#define DEFAULT_FTP_SERVER_NETWORK_TYPE_RP2040 NETWORK_RP2040_WIFI
|
||||
#define DEFAULT_STORAGE_TYPE_RP2040 STORAGE_LITTLEFS
|
||||
#endif
|
||||
|
||||
// Arduino SAMD21 like Arduino MKR Nano 33 IoT or Wio Terminal
|
||||
#ifndef DEFAULT_FTP_SERVER_NETWORK_TYPE_ARDUINO_SAMD
|
||||
// Wio Terminal
|
||||
// #define DEFAULT_FTP_SERVER_NETWORK_TYPE_SAMD NETWORK_SEEED_RTL8720DN
|
||||
// #define DEFAULT_STORAGE_TYPE_SAMD STORAGE_SEEED_SD
|
||||
|
||||
// Arduino SAMD
|
||||
#define DEFAULT_FTP_SERVER_NETWORK_TYPE_SAMD NETWORK_WiFiNINA // NETWORK_SEEED_RTL8720DN // NETWORK_WiFiNINA
|
||||
#define DEFAULT_STORAGE_TYPE_SAMD STORAGE_SD // STORAGE_SDFAT2 // STORAGE_SD
|
||||
#define DEFAULT_FTP_SERVER_NETWORK_TYPE_SAMD NETWORK_WiFiNINA
|
||||
#define DEFAULT_STORAGE_TYPE_SAMD STORAGE_SD
|
||||
#endif
|
||||
|
||||
#define UTF8_SUPPORT
|
||||
|
||||
//#define SD_CS_PIN 4
|
||||
// Disconnect client after 5 minutes of inactivity (expressed in seconds)
|
||||
#define FTP_TIME_OUT 5 * 60
|
||||
@ -77,6 +101,6 @@
|
||||
// Transfer speed depends of this value
|
||||
// Best value depends on many factors: SD card, client side OS, ...
|
||||
// But it can be reduced to 512 if memory usage is critical.
|
||||
#define FTP_BUF_SIZE 2048 //1024 // 512
|
||||
#define FTP_BUF_SIZE 1024 //2048 //1024 // 512
|
||||
|
||||
#endif // FTP_SERVER_CONFIG_H
|
||||
|
||||
@ -3,11 +3,26 @@
|
||||
[Instruction on FTP server on esp8266 and esp32](https://www.mischianti.org/2020/02/08/ftp-server-on-esp8266-and-esp32)
|
||||
[Simple FTP Server library now with support for Wio Terminal and SD](https://www.mischianti.org/2021/07/01/simple-ftp-server-library-now-with-support-for-wio-terminal-and-sd/)
|
||||
|
||||
Simple FTP Server for
|
||||
#### Simple FTP Server for
|
||||
- Raspberry Pi Pico W (Flash: LittleFS) (To test SD and SdFat)
|
||||
- esp8266 (Flash: SPIFFs, LittleFS. SD: SD, SdFat 2)
|
||||
- esp32 (SPIFFS, LITTLEFS, FFAT, SdFat)
|
||||
- Arduino (SD with 8.3 file format, SdFat 2)
|
||||
- Wio Terminal (SdFat 2, and native FAT)
|
||||
- esp32 (SPIFFS, LITTLEFS, FFAT, SD: SD, SdFat)
|
||||
- stm32 (SdFat, SPI flash)
|
||||
- Arduino (SD with 8.3 file format, SD: SD, SdFat 2)
|
||||
- Wio Terminal (SdFat 2, Seed SD, and native FAT)
|
||||
|
||||
#### Changelog
|
||||
- 2022-01-13 2.1.5 Fix SPIFM external SPI Flash date management (add SPIFM esp32 example)
|
||||
- 2022-09-21 2.1.4 Add support for Raspberry Pi Pico W and rp2040 boards, Fix SD card config
|
||||
- 2022-09-20 2.1.3 Soft AP IP management, more disconnect event and SD_MCC
|
||||
- 2022-05-21 2.1.2 Fix SD path (#19)
|
||||
- 2022-05-21 2.1.1 Minor fix
|
||||
- 2022-03-30 2.1.0 Add UTF8 support and enabled It by default (Thanks to @plaber)
|
||||
- 2022-03-30 2.0.0 Complete support for STM32 with SD and SPI Flash minor bux fix and HELP command support
|
||||
- 2022-03-17 1.3.0 Fix enc28j60 and w5500 support and restructuring for local settings
|
||||
- 2022-02-25 1.2.1 Fix anonymous user begin and fix SPIFFS wrong display
|
||||
- 2022-02-22 1.2.0 Add anonymous user and implement correct RFC (#9 now work correctly with File Explorer)
|
||||
- 2022-02-01 1.1.1 Add workaround to start FTP server before connection, add end and setLocalIP method.
|
||||
|
||||
<!-- wp:paragraph -->
|
||||
<p>When I develop a new solution I'd like to divide the application in layer, and so I'd like focus my attention in only one aspect at time. </p>
|
||||
@ -87,4 +102,6 @@ void loop(void){
|
||||
// server.handleClient(); //example if running a webserver you still need to call .handleClient();
|
||||
|
||||
}
|
||||
```
|
||||
```
|
||||
|
||||
https://downloads.arduino.cc/libraries/logs/github.com/xreef/SimpleFTPServer/
|
||||
@ -11,7 +11,7 @@
|
||||
#ifndef SIMPLE_FTP_SERVER_H
|
||||
#define SIMPLE_FTP_SERVER_H
|
||||
|
||||
#include "FtpServer.h"
|
||||
#include <FtpServer.h>
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
/*
|
||||
* FtpServer Arduino with Ethernet library and w5100 shield
|
||||
*
|
||||
* AUTHOR: Renzo Mischianti
|
||||
*
|
||||
* https://www.mischianti.org/2020/02/08/ftp-server-on-esp8266-and-esp32
|
||||
*
|
||||
*/
|
||||
|
||||
#include <SPI.h>
|
||||
#include <Ethernet.h>
|
||||
#include "SD.h"
|
||||
|
||||
#include <SimpleFtpServer.h>
|
||||
|
||||
// Enter a MAC address for your controller below.
|
||||
// Newer Ethernet shields have a MAC address printed on a sticker on the shield
|
||||
byte mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xE1 };
|
||||
|
||||
// Set the static IP address to use if the DHCP fails to assign
|
||||
byte macAddr[] = {0x5e, 0xa4, 0x18, 0xf0, 0x8a, 0xf2};
|
||||
IPAddress arduinoIP(192, 168, 1, 177);
|
||||
IPAddress dnsIP(192, 168, 1, 1);
|
||||
IPAddress gatewayIP(192, 168, 1, 1);
|
||||
IPAddress subnetIP(255, 255, 255, 0);
|
||||
|
||||
FtpServer ftpSrv;
|
||||
|
||||
void setup(void){
|
||||
Serial.begin(115200);
|
||||
delay(2000);
|
||||
// If other chips are connected to SPI bus, set to high the pin connected
|
||||
// to their CS before initializing Flash memory
|
||||
pinMode( 4, OUTPUT );
|
||||
digitalWrite( 4, HIGH );
|
||||
pinMode( 10, OUTPUT );
|
||||
digitalWrite( 10, HIGH );
|
||||
|
||||
Serial.print("Starting SD.");
|
||||
while (!SD.begin(4)) {
|
||||
Serial.print(".");
|
||||
}
|
||||
Serial.println("finish!");
|
||||
|
||||
// start the Ethernet connection:
|
||||
Serial.print("Starting ethernet.");
|
||||
if (Ethernet.begin(mac) == 0) {
|
||||
Serial.println("Failed to configure Ethernet using DHCP");
|
||||
Ethernet.begin(macAddr, arduinoIP, dnsIP, gatewayIP, subnetIP);
|
||||
}else{
|
||||
Serial.println("ok to configure Ethernet using DHCP");
|
||||
}
|
||||
|
||||
Serial.print("IP address ");
|
||||
Serial.println(Ethernet.localIP());
|
||||
|
||||
Serial.println("SPIFFS opened!");
|
||||
ftpSrv.begin("esp8266","esp8266"); //username, password for ftp.
|
||||
}
|
||||
void loop(void){
|
||||
ftpSrv.handleFTP(); //make sure in loop you call handleFTP()!!
|
||||
}
|
||||
@ -1,96 +0,0 @@
|
||||
/*
|
||||
* FtpServer esp8266 and esp32 with SD
|
||||
*
|
||||
* AUTHOR: Renzo Mischianti
|
||||
*
|
||||
* https://www.mischianti.org/2020/02/08/ftp-server-on-esp8266-and-esp32
|
||||
*
|
||||
*/
|
||||
|
||||
#include <WiFi.h>
|
||||
#include "SD.h"
|
||||
|
||||
#include <SimpleFTPServer.h>
|
||||
|
||||
const char* ssid = "<YOUR-SSID>";
|
||||
const char* password = "<YOUR-PASSWD>";
|
||||
|
||||
|
||||
FtpServer ftpSrv; //set #define FTP_DEBUG in ESP8266FtpServer.h to see ftp verbose on serial
|
||||
|
||||
void _callback(FtpOperation ftpOperation, unsigned int freeSpace, unsigned int totalSpace){
|
||||
Serial.print(">>>>>>>>>>>>>>> _callback " );
|
||||
Serial.print(ftpOperation);
|
||||
/* FTP_CONNECT,
|
||||
* FTP_DISCONNECT,
|
||||
* FTP_FREE_SPACE_CHANGE
|
||||
*/
|
||||
Serial.print(" ");
|
||||
Serial.print(freeSpace);
|
||||
Serial.print(" ");
|
||||
Serial.println(totalSpace);
|
||||
|
||||
// freeSpace : totalSpace = x : 360
|
||||
|
||||
if (ftpOperation == FTP_CONNECT) Serial.println(F("CONNECTED"));
|
||||
if (ftpOperation == FTP_DISCONNECT) Serial.println(F("DISCONNECTED"));
|
||||
};
|
||||
void _transferCallback(FtpTransferOperation ftpOperation, const char* name, unsigned int transferredSize){
|
||||
Serial.print(">>>>>>>>>>>>>>> _transferCallback " );
|
||||
Serial.print(ftpOperation);
|
||||
/* FTP_UPLOAD_START = 0,
|
||||
* FTP_UPLOAD = 1,
|
||||
*
|
||||
* FTP_DOWNLOAD_START = 2,
|
||||
* FTP_DOWNLOAD = 3,
|
||||
*
|
||||
* FTP_TRANSFER_STOP = 4,
|
||||
* FTP_DOWNLOAD_STOP = 4,
|
||||
* FTP_UPLOAD_STOP = 4,
|
||||
*
|
||||
* FTP_TRANSFER_ERROR = 5,
|
||||
* FTP_DOWNLOAD_ERROR = 5,
|
||||
* FTP_UPLOAD_ERROR = 5
|
||||
*/
|
||||
Serial.print(" ");
|
||||
Serial.print(name);
|
||||
Serial.print(" ");
|
||||
Serial.println(transferredSize);
|
||||
};
|
||||
|
||||
void setup(void){
|
||||
Serial.begin(115200);
|
||||
WiFi.begin(ssid, password);
|
||||
Serial.println("");
|
||||
|
||||
// Wait for connection
|
||||
while (WiFi.status() != WL_CONNECTED) {
|
||||
delay(500);
|
||||
Serial.print(".");
|
||||
}
|
||||
Serial.println("");
|
||||
Serial.print("Connected to ");
|
||||
Serial.println(ssid);
|
||||
Serial.print("IP address: ");
|
||||
Serial.println(WiFi.localIP());
|
||||
|
||||
|
||||
/////FTP Setup, ensure SPIFFS is started before ftp; /////////
|
||||
|
||||
/////FTP Setup, ensure SPIFFS is started before ftp; /////////
|
||||
SPI.begin(14, 2, 15, 13); //SCK, MISO, MOSI,SS
|
||||
|
||||
if (SD.begin(13, SPI)) {
|
||||
Serial.println("SD opened!");
|
||||
|
||||
ftpSrv.setCallback(_callback);
|
||||
ftpSrv.setTransferCallback(_transferCallback);
|
||||
|
||||
ftpSrv.begin("esp8266","esp8266"); //username, password for ftp. (default 21, 50009 for PASV)
|
||||
}
|
||||
}
|
||||
void loop(void){
|
||||
ftpSrv.handleFTP(); //make sure in loop you call handleFTP()!!
|
||||
// server.handleClient(); //example if running a webserver you still need to call .handleClient();
|
||||
|
||||
}
|
||||
@ -1,110 +0,0 @@
|
||||
/*
|
||||
* FtpServer esp8266 and esp32 with SPIFFS
|
||||
*
|
||||
* AUTHOR: Renzo Mischianti
|
||||
*
|
||||
* https://www.mischianti.org/2020/02/08/ftp-server-on-esp8266-and-esp32
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef ESP8266
|
||||
#include <ESP8266WiFi.h>
|
||||
#elif defined ESP32
|
||||
#include <WiFi.h>
|
||||
#include "SPIFFS.h"
|
||||
#endif
|
||||
|
||||
#include <SimpleFTPServer.h>
|
||||
|
||||
const char* ssid = "YOUR_SSID";
|
||||
const char* password = "YOUR_PASS";
|
||||
|
||||
|
||||
FtpServer ftpSrv; //set #define FTP_DEBUG in ESP8266FtpServer.h to see ftp verbose on serial
|
||||
|
||||
void _callback(FtpOperation ftpOperation, unsigned int freeSpace, unsigned int totalSpace){
|
||||
switch (ftpOperation) {
|
||||
case FTP_CONNECT:
|
||||
Serial.println(F("FTP: Connected!"));
|
||||
break;
|
||||
case FTP_DISCONNECT:
|
||||
Serial.println(F("FTP: Disconnected!"));
|
||||
break;
|
||||
case FTP_FREE_SPACE_CHANGE:
|
||||
Serial.printf("FTP: Free space change, free %u of %u!\n", freeSpace, totalSpace);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
};
|
||||
void _transferCallback(FtpTransferOperation ftpOperation, const char* name, unsigned int transferredSize){
|
||||
switch (ftpOperation) {
|
||||
case FTP_UPLOAD_START:
|
||||
Serial.println(F("FTP: Upload start!"));
|
||||
break;
|
||||
case FTP_UPLOAD:
|
||||
Serial.printf("FTP: Upload of file %s byte %u\n", name, transferredSize);
|
||||
break;
|
||||
case FTP_TRANSFER_STOP:
|
||||
Serial.println(F("FTP: Finish transfer!"));
|
||||
break;
|
||||
case FTP_TRANSFER_ERROR:
|
||||
Serial.println(F("FTP: Transfer error!"));
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
/* FTP_UPLOAD_START = 0,
|
||||
* FTP_UPLOAD = 1,
|
||||
*
|
||||
* FTP_DOWNLOAD_START = 2,
|
||||
* FTP_DOWNLOAD = 3,
|
||||
*
|
||||
* FTP_TRANSFER_STOP = 4,
|
||||
* FTP_DOWNLOAD_STOP = 4,
|
||||
* FTP_UPLOAD_STOP = 4,
|
||||
*
|
||||
* FTP_TRANSFER_ERROR = 5,
|
||||
* FTP_DOWNLOAD_ERROR = 5,
|
||||
* FTP_UPLOAD_ERROR = 5
|
||||
*/
|
||||
};
|
||||
|
||||
void setup(void){
|
||||
Serial.begin(115200);
|
||||
WiFi.begin(ssid, password);
|
||||
Serial.println("");
|
||||
|
||||
// Wait for connection
|
||||
while (WiFi.status() != WL_CONNECTED) {
|
||||
delay(500);
|
||||
Serial.print(".");
|
||||
}
|
||||
Serial.println("");
|
||||
Serial.print("Connected to ");
|
||||
Serial.println(ssid);
|
||||
Serial.print("IP address: ");
|
||||
Serial.println(WiFi.localIP());
|
||||
|
||||
|
||||
/////FTP Setup, ensure SPIFFS is started before ftp; /////////
|
||||
|
||||
/////FTP Setup, ensure SPIFFS is started before ftp; /////////
|
||||
#ifdef ESP32 //esp32 we send true to format spiffs if cannot mount
|
||||
if (SPIFFS.begin(true)) {
|
||||
#elif defined ESP8266
|
||||
if (SPIFFS.begin()) {
|
||||
#endif
|
||||
ftpSrv.setCallback(_callback);
|
||||
ftpSrv.setTransferCallback(_transferCallback);
|
||||
|
||||
Serial.println("SPIFFS opened!");
|
||||
ftpSrv.begin("esp8266","esp8266"); //username, password for ftp. (default 21, 50009 for PASV)
|
||||
}
|
||||
}
|
||||
void loop(void){
|
||||
ftpSrv.handleFTP(); //make sure in loop you call handleFTP()!!
|
||||
// server.handleClient(); //example if running a webserver you still need to call .handleClient();
|
||||
|
||||
}
|
||||
@ -1,102 +0,0 @@
|
||||
/*
|
||||
* This sketch sends data via HTTP GET requests to examle.com service.
|
||||
*/
|
||||
|
||||
#include <Seeed_FS.h>
|
||||
#include "SD/Seeed_SD.h"
|
||||
|
||||
// #define DEFAULT_FTP_SERVER_NETWORK_TYPE_SAMD NETWORK_SEEED_RTL8720DN
|
||||
// #define DEFAULT_STORAGE_TYPE_SAMD STORAGE_SEEED_SD
|
||||
|
||||
#include <rpcWiFi.h>
|
||||
|
||||
#include <FtpServer.h>
|
||||
|
||||
FtpServer ftpSrv;
|
||||
|
||||
const char *ssid = "<YOUR-SSID>";
|
||||
const char *password = "<YOUR-PASSWD>";
|
||||
|
||||
void listDir(const char* dirname, uint8_t levels) {
|
||||
Serial.print("Listing directory: ");
|
||||
Serial.println(dirname);
|
||||
|
||||
File root = SD.open(dirname);
|
||||
if (!root) {
|
||||
Serial.println("Failed to open directory");
|
||||
return;
|
||||
}
|
||||
if (!root.isDirectory()) {
|
||||
Serial.println("Not a directory");
|
||||
return;
|
||||
}
|
||||
|
||||
File file = root.openNextFile();
|
||||
while (file) {
|
||||
if (file.isDirectory()) {
|
||||
Serial.print(" DIR : ");
|
||||
Serial.println(file.name());
|
||||
if (levels) {
|
||||
listDir(file.name(), levels - 1);
|
||||
}
|
||||
} else {
|
||||
Serial.print(" FILE: ");
|
||||
Serial.print(file.name());
|
||||
Serial.print(" SIZE: ");
|
||||
Serial.println(file.size());
|
||||
}
|
||||
file = root.openNextFile();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void setup()
|
||||
{
|
||||
Serial.begin(115200);
|
||||
delay(1000);
|
||||
|
||||
pinMode(5, OUTPUT);
|
||||
digitalWrite(5, HIGH);
|
||||
|
||||
while (!SD.begin(SDCARD_SS_PIN,SDCARD_SPI,4000000UL)) {
|
||||
Serial.println("Card Mount Failed");
|
||||
return;
|
||||
}
|
||||
|
||||
// We start by connecting to a WiFi network
|
||||
Serial.println();
|
||||
Serial.println();
|
||||
Serial.print("Connecting to ");
|
||||
Serial.print(ssid);
|
||||
|
||||
WiFi.mode(WIFI_STA);
|
||||
|
||||
WiFi.begin(ssid, password);
|
||||
|
||||
while (WiFi.status() != WL_CONNECTED)
|
||||
{
|
||||
Serial.print("Connecting to ");
|
||||
Serial.println(ssid);
|
||||
WiFi.begin(ssid, password);
|
||||
Serial.print(".");
|
||||
delay(500);
|
||||
}
|
||||
|
||||
Serial.println("");
|
||||
Serial.println("WiFi connected");
|
||||
Serial.println("IP address: ");
|
||||
Serial.println(WiFi.localIP());
|
||||
delay(1000);
|
||||
|
||||
Serial.print("Starting SD.");
|
||||
|
||||
Serial.println("finish!");
|
||||
|
||||
listDir("/", 0);
|
||||
|
||||
ftpSrv.begin("esp8266","esp8266"); //username, password for ftp.
|
||||
}
|
||||
|
||||
void loop(void) {
|
||||
ftpSrv.handleFTP(); //make sure in loop you call handleFTP()!!
|
||||
}
|
||||
@ -1,98 +0,0 @@
|
||||
/*
|
||||
* This sketch sends data via HTTP GET requests to examle.com service.
|
||||
*/
|
||||
|
||||
#include "SdFat.h"
|
||||
|
||||
#include <rpcWiFi.h>
|
||||
|
||||
#include <FtpServer.h>
|
||||
|
||||
// #define DEFAULT_FTP_SERVER_NETWORK_TYPE_SAMD NETWORK_SEEED_RTL8720DN
|
||||
// #define DEFAULT_STORAGE_TYPE_SAMD STORAGE_SDFAT2
|
||||
|
||||
#define SD_CONFIG SdSpiConfig(SDCARD_SS_PIN, 2)
|
||||
SdFs sd;
|
||||
|
||||
FtpServer ftpSrv;
|
||||
|
||||
const char *ssid = "<YOUR-SSID>";
|
||||
const char *password = "<YOUR-PASSWD>";
|
||||
|
||||
void setup()
|
||||
{
|
||||
Serial.begin(115200);
|
||||
delay(1000);
|
||||
|
||||
pinMode(5, OUTPUT);
|
||||
digitalWrite(5, HIGH);
|
||||
|
||||
// Initialize the SD.
|
||||
if (!sd.begin(SD_CONFIG)) {
|
||||
sd.initErrorHalt(&Serial);
|
||||
}
|
||||
FsFile dir;
|
||||
FsFile file;
|
||||
|
||||
// Open root directory
|
||||
if (!dir.open("/")){
|
||||
Serial.println("dir.open failed");
|
||||
}
|
||||
|
||||
// We start by connecting to a WiFi network
|
||||
|
||||
Serial.println();
|
||||
Serial.println();
|
||||
Serial.print("Connecting to ");
|
||||
Serial.print(ssid);
|
||||
|
||||
WiFi.mode(WIFI_STA);
|
||||
|
||||
|
||||
WiFi.begin(ssid, password);
|
||||
|
||||
while (WiFi.status() != WL_CONNECTED)
|
||||
{
|
||||
Serial.print("Connecting to ");
|
||||
Serial.println(ssid);
|
||||
WiFi.begin(ssid, password);
|
||||
Serial.print(".");
|
||||
delay(500);
|
||||
}
|
||||
|
||||
Serial.println("");
|
||||
Serial.println("WiFi connected");
|
||||
Serial.println("IP address: ");
|
||||
Serial.println(WiFi.localIP());
|
||||
delay(1000);
|
||||
|
||||
Serial.print("Starting SD.");
|
||||
|
||||
Serial.println("finish!");
|
||||
|
||||
while (file.openNext(&dir, O_RDONLY)) {
|
||||
file.printFileSize(&Serial);
|
||||
Serial.write(' ');
|
||||
file.printModifyDateTime(&Serial);
|
||||
Serial.write(' ');
|
||||
file.printName(&Serial);
|
||||
if (file.isDir()) {
|
||||
// Indicate a directory.
|
||||
Serial.write('/');
|
||||
}
|
||||
Serial.println();
|
||||
file.close();
|
||||
}
|
||||
if (dir.getError()) {
|
||||
Serial.println("openNext failed");
|
||||
} else {
|
||||
Serial.println("Done!");
|
||||
}
|
||||
|
||||
|
||||
ftpSrv.begin("esp8266","esp8266"); //username, password for ftp.
|
||||
}
|
||||
|
||||
void loop(void) {
|
||||
ftpSrv.handleFTP(); //make sure in loop you call handleFTP()!!
|
||||
}
|
||||
@ -1,367 +0,0 @@
|
||||
/*
|
||||
* FtpServer Wio Terminal with SdFat library
|
||||
* and with callbacks to the main actions of FTP server
|
||||
* and a monitor on TFT
|
||||
*
|
||||
* AUTHOR: Renzo Mischianti
|
||||
*
|
||||
* https://www.mischianti.org/
|
||||
*
|
||||
*/
|
||||
|
||||
#include "SdFat.h"
|
||||
|
||||
#include <rpcWiFi.h>
|
||||
|
||||
|
||||
#include <TFT_eSPI.h> // Hardware-specific library
|
||||
#include <SPI.h>
|
||||
|
||||
#include <FtpServer.h>
|
||||
|
||||
TFT_eSPI tft = TFT_eSPI(); // Invoke custom library
|
||||
|
||||
#define DEG2RAD 0.0174532925
|
||||
|
||||
byte inc = 0;
|
||||
unsigned int col = 0;
|
||||
|
||||
#define SD_CONFIG SdSpiConfig(SDCARD_SS_PIN, 2)
|
||||
SdFs sd;
|
||||
|
||||
FtpServer ftpSrv;
|
||||
|
||||
const char *ssid = "reef-casa-sopra";
|
||||
const char *password = "aabbccdd77";
|
||||
|
||||
#define MAIN_TOP 110
|
||||
|
||||
#define FREE_SPACE_PIE_X 80
|
||||
#define FREE_SPACE_PIE_Y MAIN_TOP+40
|
||||
#define FREE_SPACE_PIE_RADIUS 50
|
||||
|
||||
void freeSpacePieData(unsigned int freeSpace, unsigned int totalSpace) {
|
||||
int pieFree = 360 - (freeSpace * 360 / totalSpace);
|
||||
|
||||
fillSegment(FREE_SPACE_PIE_X, FREE_SPACE_PIE_Y, 0, pieFree, FREE_SPACE_PIE_RADIUS, TFT_RED);
|
||||
fillSegment(FREE_SPACE_PIE_X, FREE_SPACE_PIE_Y, pieFree, 360 - pieFree, FREE_SPACE_PIE_RADIUS, TFT_BLUE);
|
||||
|
||||
// Set "cursor" at top left corner of display (0,0) and select font 2
|
||||
// (cursor will move to next line automatically during printing with 'tft.println'
|
||||
// or stay on the line is there is room for the text with tft.print)
|
||||
tft.setCursor(FREE_SPACE_PIE_X + 80, MAIN_TOP, 2);
|
||||
// Set the font colour to be white with a black background, set text size multiplier to 1
|
||||
tft.setTextColor(TFT_WHITE, TFT_BLACK); tft.setTextSize(1);
|
||||
// We can now plot text on screen using the "print" class
|
||||
Serial.print(freeSpace/1000);Serial.print("Mb/");Serial.print(String(totalSpace/1000));Serial.println("Mb");
|
||||
tft.print(freeSpace/1000);tft.print("Mb/");tft.print(String(totalSpace/1000));tft.println("Mb");
|
||||
}
|
||||
|
||||
void connectedDisconnected(bool connected) {
|
||||
tft.fillCircle(FREE_SPACE_PIE_X + 80 + 10, MAIN_TOP+25+7, 10, (connected)?TFT_GREEN:TFT_RED);
|
||||
|
||||
tft.setCursor(FREE_SPACE_PIE_X + 80 + 25, MAIN_TOP+25, 2);
|
||||
tft.println(" ");
|
||||
|
||||
tft.setCursor(FREE_SPACE_PIE_X + 80 + 25, MAIN_TOP+25, 2);
|
||||
(connected)?tft.println("Connected!"):tft.println("Disconnected!");
|
||||
}
|
||||
|
||||
void transfer(bool transfer, bool upload) {
|
||||
tft.fillCircle(FREE_SPACE_PIE_X + 80 + 10, MAIN_TOP+25+25+7, 10, (transfer)?(upload)?TFT_GREEN:TFT_BLUE:TFT_RED);
|
||||
|
||||
tft.setCursor(FREE_SPACE_PIE_X + 80 + 25, MAIN_TOP+25+25, 2);
|
||||
tft.println(" ");
|
||||
|
||||
tft.setCursor(FREE_SPACE_PIE_X + 80 + 25, MAIN_TOP+25+25, 2);
|
||||
(transfer)?tft.println((upload)?"Upload!":"Download!"):tft.println("Idle!");
|
||||
}
|
||||
|
||||
//index - starting at, n- how many chars
|
||||
char* subString(const char *s, int index, int n){
|
||||
char* b = (char*) malloc((strlen(s) + 1) * sizeof(char));
|
||||
strcpy(b,s);
|
||||
|
||||
Serial.println("--------------------------------------");
|
||||
Serial.println(s);
|
||||
Serial.println(index);
|
||||
Serial.println(n);
|
||||
char *res = new char[n + 1];
|
||||
Serial.println(res);
|
||||
sprintf(res, "%.*s", n, b + index);
|
||||
Serial.println(res);
|
||||
free(b);
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
void fileTransfer(FtpTransferOperation ftpOperation, const char* filename, unsigned int transferredSize) {
|
||||
int yoffset = 2;
|
||||
|
||||
tft.setCursor(20, MAIN_TOP+(FREE_SPACE_PIE_RADIUS*2)+yoffset, 2);
|
||||
tft.println(F(" "));
|
||||
|
||||
tft.setCursor(20, MAIN_TOP+(FREE_SPACE_PIE_RADIUS*2)+yoffset, 2);
|
||||
int lenfile = strlen(filename);
|
||||
Serial.println(lenfile);
|
||||
if (lenfile>22) {
|
||||
|
||||
tft.print(subString(filename, 0, 16));tft.print(F("~"));
|
||||
tft.print( subString(filename, (lenfile-4), 4) );
|
||||
} else {
|
||||
tft.print(filename);
|
||||
}
|
||||
tft.setCursor(20+160, MAIN_TOP+(FREE_SPACE_PIE_RADIUS*2)+yoffset, 2);
|
||||
tft.print(F(" "));
|
||||
tft.setCursor(20+160, MAIN_TOP+(FREE_SPACE_PIE_RADIUS*2)+yoffset, 2);
|
||||
tft.print(transferredSize);tft.print("Kb");
|
||||
|
||||
tft.setCursor(320-55, MAIN_TOP+(FREE_SPACE_PIE_RADIUS*2)+yoffset, 2);
|
||||
switch (ftpOperation) {
|
||||
case FTP_UPLOAD:
|
||||
tft.setTextColor(TFT_GREEN, TFT_BLACK);
|
||||
tft.print(F("Upload"));
|
||||
tft.setTextColor(TFT_WHITE, TFT_BLACK);
|
||||
break;
|
||||
case FTP_DOWNLOAD:
|
||||
tft.setTextColor(TFT_BLUE, TFT_BLACK);
|
||||
tft.print(F("Down"));
|
||||
tft.setTextColor(TFT_WHITE, TFT_BLACK);
|
||||
|
||||
break;
|
||||
case FTP_TRANSFER_STOP:
|
||||
tft.setTextColor(TFT_GREEN, TFT_BLACK);
|
||||
tft.print(F("OK"));
|
||||
tft.setTextColor(TFT_WHITE, TFT_BLACK);
|
||||
|
||||
break;
|
||||
case FTP_TRANSFER_ERROR:
|
||||
tft.setTextColor(TFT_RED, TFT_BLACK);
|
||||
tft.print(F("Error"));
|
||||
tft.setTextColor(TFT_WHITE, TFT_BLACK);
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void wifiStrenght (int8_t RSSI, bool connection = false) {
|
||||
Serial.print("RSSI --> ");Serial.println(RSSI);
|
||||
int marginX = 30;
|
||||
|
||||
int startX = 90;
|
||||
int widthW = 320-(startX+marginX);
|
||||
|
||||
int startY = 60;
|
||||
int heightY = 10;
|
||||
|
||||
tft.setCursor(marginX, startY - 5, 2);
|
||||
tft.print(F(" "));
|
||||
tft.setCursor(marginX, startY - 5, 2);
|
||||
|
||||
if (connection) {
|
||||
tft.print(F("Connectint to: "));
|
||||
tft.print(ssid);
|
||||
}else{
|
||||
tft.println("WiFi str: ");
|
||||
|
||||
// 120 : 120-RSSI = 300 : x
|
||||
|
||||
tft.drawRoundRect(startX, startY, widthW, heightY, 5, TFT_WHITE);
|
||||
|
||||
uint32_t colorRSSI = TFT_GREEN;
|
||||
if (abs(RSSI)<55) {
|
||||
colorRSSI = TFT_GREEN;
|
||||
} else if (abs(RSSI)<75) {
|
||||
colorRSSI = TFT_YELLOW;
|
||||
} else if (abs(RSSI)<75) {
|
||||
colorRSSI = TFT_RED;
|
||||
}
|
||||
|
||||
tft.fillRoundRect(startX+1, startY+1, (120+RSSI)*widthW/120, heightY-2, 5, colorRSSI);
|
||||
|
||||
tft.setCursor(marginX, startY + 15, 2);
|
||||
|
||||
tft.print("IP: ");
|
||||
tft.println(WiFi.localIP());
|
||||
}
|
||||
}
|
||||
|
||||
void _callback(FtpOperation ftpOperation, unsigned int freeSpace, unsigned int totalSpace){
|
||||
Serial.print(">>>>>>>>>>>>>>> _callback " );
|
||||
Serial.print(ftpOperation);
|
||||
/* FTP_CONNECT,
|
||||
* FTP_DISCONNECT,
|
||||
* FTP_FREE_SPACE_CHANGE
|
||||
*/
|
||||
Serial.print(" ");
|
||||
Serial.print(freeSpace);
|
||||
Serial.print(" ");
|
||||
Serial.println(totalSpace);
|
||||
|
||||
// freeSpace : totalSpace = x : 360
|
||||
|
||||
freeSpacePieData(freeSpace, totalSpace);
|
||||
|
||||
if (ftpOperation == FTP_CONNECT) connectedDisconnected(true);
|
||||
if (ftpOperation == FTP_DISCONNECT) connectedDisconnected(false);
|
||||
};
|
||||
void _transferCallback(FtpTransferOperation ftpOperation, const char* name, unsigned int transferredSize){
|
||||
Serial.print(">>>>>>>>>>>>>>> _transferCallback " );
|
||||
Serial.print(ftpOperation);
|
||||
/* FTP_UPLOAD_START = 0,
|
||||
* FTP_UPLOAD = 1,
|
||||
*
|
||||
* FTP_DOWNLOAD_START = 2,
|
||||
* FTP_DOWNLOAD = 3,
|
||||
*
|
||||
* FTP_TRANSFER_STOP = 4,
|
||||
* FTP_DOWNLOAD_STOP = 4,
|
||||
* FTP_UPLOAD_STOP = 4,
|
||||
*
|
||||
* FTP_TRANSFER_ERROR = 5,
|
||||
* FTP_DOWNLOAD_ERROR = 5,
|
||||
* FTP_UPLOAD_ERROR = 5
|
||||
*/
|
||||
Serial.print(" ");
|
||||
Serial.print(name);
|
||||
Serial.print(" ");
|
||||
Serial.println(transferredSize);
|
||||
|
||||
(ftpOperation==FTP_UPLOAD || ftpOperation==FTP_DOWNLOAD)?transfer(true, ftpOperation==FTP_UPLOAD):transfer(false, false);
|
||||
|
||||
fileTransfer(ftpOperation, name, transferredSize);
|
||||
};
|
||||
|
||||
|
||||
void setup()
|
||||
{
|
||||
ftpSrv.setCallback(_callback);
|
||||
ftpSrv.setTransferCallback(_transferCallback);
|
||||
|
||||
Serial.begin(115200);
|
||||
delay(1000);
|
||||
|
||||
tft.init();
|
||||
|
||||
tft.begin();
|
||||
|
||||
tft.setRotation(3);
|
||||
|
||||
tft.fillScreen(TFT_BLACK);
|
||||
|
||||
tft.setCursor(0, 0);
|
||||
|
||||
tft.setTextColor(TFT_BLACK, TFT_WHITE); tft.setTextSize(2);
|
||||
|
||||
tft.fillRoundRect(3, 3, 320-6, 40, 5, TFT_WHITE);
|
||||
|
||||
tft.drawCentreString("www.mischianti.org", 160, 14,1);
|
||||
tft.setTextColor(TFT_WHITE, TFT_BLACK);
|
||||
|
||||
|
||||
freeSpacePieData(0, 0);
|
||||
connectedDisconnected(false);
|
||||
transfer(false, false);
|
||||
|
||||
wifiStrenght(0, true);
|
||||
|
||||
Serial.println();
|
||||
Serial.println();
|
||||
Serial.print("Connecting to ");
|
||||
Serial.print(ssid);
|
||||
|
||||
WiFi.mode(WIFI_STA);
|
||||
|
||||
|
||||
WiFi.begin(ssid, password);
|
||||
|
||||
while (WiFi.status() != WL_CONNECTED)
|
||||
{
|
||||
Serial.print(".");
|
||||
WiFi.begin(ssid, password);
|
||||
Serial.print(".");
|
||||
tft.print(F("."));
|
||||
delay(500);
|
||||
}
|
||||
|
||||
Serial.println("");
|
||||
Serial.println("WiFi connected");
|
||||
Serial.println("IP address: ");
|
||||
Serial.println(WiFi.localIP());
|
||||
|
||||
wifiStrenght(WiFi.RSSI());
|
||||
|
||||
delay(1000);
|
||||
|
||||
if (!sd.begin(SD_CONFIG)) {
|
||||
sd.initErrorHalt(&Serial);
|
||||
}
|
||||
FsFile dir;
|
||||
FsFile file;
|
||||
|
||||
// Open root directory
|
||||
if (!dir.open("/")){
|
||||
Serial.println("dir.open failed");
|
||||
}
|
||||
|
||||
ftpSrv.begin("wioterminal","wioterminal"); //username, password for ftp.
|
||||
|
||||
}
|
||||
|
||||
void loop() {
|
||||
ftpSrv.handleFTP(); //make sure in loop you call handleFTP()!!
|
||||
}
|
||||
|
||||
|
||||
// #########################################################################
|
||||
// Draw circle segments
|
||||
// #########################################################################
|
||||
|
||||
// x,y == coords of centre of circle
|
||||
// start_angle = 0 - 359
|
||||
// sub_angle = 0 - 360 = subtended angle
|
||||
// r = radius
|
||||
// colour = 16 bit colour value
|
||||
|
||||
int fillSegment(int x, int y, int start_angle, int sub_angle, int r, unsigned int colour) {
|
||||
// Calculate first pair of coordinates for segment start
|
||||
float sx = cos((start_angle - 90) * DEG2RAD);
|
||||
float sy = sin((start_angle - 90) * DEG2RAD);
|
||||
uint16_t x1 = sx * r + x;
|
||||
uint16_t y1 = sy * r + y;
|
||||
|
||||
// Draw colour blocks every inc degrees
|
||||
for (int i = start_angle; i < start_angle + sub_angle; i++) {
|
||||
|
||||
// Calculate pair of coordinates for segment end
|
||||
int x2 = cos((i + 1 - 90) * DEG2RAD) * r + x;
|
||||
int y2 = sin((i + 1 - 90) * DEG2RAD) * r + y;
|
||||
|
||||
tft.fillTriangle(x1, y1, x2, y2, x, y, colour);
|
||||
|
||||
// Copy segment end to sgement start for next segment
|
||||
x1 = x2;
|
||||
y1 = y2;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// #########################################################################
|
||||
// Return the 16 bit colour with brightness 0-100%
|
||||
// #########################################################################
|
||||
unsigned int brightness(unsigned int colour, int brightness) {
|
||||
byte red = colour >> 11;
|
||||
byte green = (colour & 0x7E0) >> 5;
|
||||
byte blue = colour & 0x1F;
|
||||
|
||||
blue = (blue * brightness) / 100;
|
||||
green = (green * brightness) / 100;
|
||||
red = (red * brightness) / 100;
|
||||
|
||||
return (red << 11) + (green << 5) + blue;
|
||||
}
|
||||
|
||||
@ -9,6 +9,8 @@ SimpleFtpServer KEYWORD1
|
||||
#######################################
|
||||
|
||||
begin KEYWORD2
|
||||
end KEYWORD2
|
||||
setLocalIp KEYWORD2
|
||||
credentials KEYWORD2
|
||||
setCallback KEYWORD2
|
||||
setTransferCallback KEYWORD2
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
{
|
||||
"name": "SimpleFTPServer",
|
||||
"description": "Simple FTP Server for using esp8266 and esp32 SPIFFs",
|
||||
"keywords": "esp8266, ftp, spiffs",
|
||||
"description": "Simple FTP Server for using esp8266, esp32, STM32, Arduino",
|
||||
"keywords": "arduino, esp8266, esp32, stm32, rp2040, Raspberry Pi, ftp, FtpServer, spiffs, Fat, LittleFS, Ethernet, WiFi, WiFiNINA",
|
||||
"homepage": "https://www.mischianti.org/category/my-libraries/simple-ftp-server/",
|
||||
"authors":
|
||||
{
|
||||
"name": "Renzo Mischianti",
|
||||
@ -15,5 +16,6 @@
|
||||
},
|
||||
"url": "https://www.mischianti.org",
|
||||
"frameworks": "Arduino",
|
||||
"version": "2.1.5",
|
||||
"platforms": "*"
|
||||
}
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
name=SimpleFTPServer
|
||||
version=1.0.1
|
||||
version=2.1.5
|
||||
author=Renzo Mischianti <renzo.mischianti@gmail.com>
|
||||
maintainer=Renzo Mischianti <renzo.mischianti@gmail.com>
|
||||
sentence=Simple FTP server for esp8266, esp32 and Arduino
|
||||
paragraph=Simple FTP server for esp8266 (SPIFFS and LittleFS), esp32 (SPIFFS, LittleFS ans FFAT) and Arduino (SD basic lib with 8.3 file format), Wio Terminal (SdFat 2), Arduino MKR (SdFat 2). With internal callback to chck the phase of communication.
|
||||
sentence=Simple FTP server for esp8266, esp32, STM32, Raspberry Pi Pico and Arduino
|
||||
paragraph=Simple FTP server for Raspberry Pi Pico W (LittleFS), esp8266 (SPIFFS and LittleFS or SD, SdFat 2.x), esp32 (SPIFFS, LittleFS and FFAT or SD, SdFat 2.x) and Arduino (SdFat, SD basic lib with 8.3 file format), Wio Terminal (Seed_SD, SdFat 2.x), Arduino MKR (SdFat 2), STM32 (Flash >64K SdFat 2.x and SPI Flash). Support w5500, w5100 and enc28j60. With internal callback to chck the phase of communication.
|
||||
category=Communication
|
||||
url=https://www.mischianti.org/category/my-libraries/simple-ftp-server/
|
||||
repository=https://github.com/xreef/SimpleFTPServer.git
|
||||
|
||||
@ -502,7 +502,7 @@ void dispatch_config(const char* topic, const char* payload, uint8_t source)
|
||||
timeGetConfig(settings);
|
||||
}
|
||||
#if HASP_USE_MQTT > 0
|
||||
else if(strcasecmp_P(topic, PSTR("mqtt")) == 0) {
|
||||
else if(strcasecmp_P(topic, PSTR(FP_MQTT)) == 0) {
|
||||
if(update)
|
||||
mqttSetConfig(settings);
|
||||
else
|
||||
@ -522,15 +522,23 @@ void dispatch_config(const char* topic, const char* payload, uint8_t source)
|
||||
}
|
||||
#endif
|
||||
#if HASP_USE_HTTP > 0 || HASP_USE_HTTP_ASYNC > 0
|
||||
else if(strcasecmp_P(topic, PSTR("http")) == 0) {
|
||||
else if(strcasecmp_P(topic, PSTR(FP_HTTP)) == 0) {
|
||||
if(update)
|
||||
httpSetConfig(settings);
|
||||
else
|
||||
httpGetConfig(settings);
|
||||
}
|
||||
#endif
|
||||
#if HASP_USE_FTP > 0
|
||||
else if(strcasecmp_P(topic, PSTR(FP_FTP)) == 0) {
|
||||
if(update)
|
||||
ftpSetConfig(settings);
|
||||
else
|
||||
ftpGetConfig(settings);
|
||||
}
|
||||
#endif
|
||||
#if HASP_USE_ARDUINOOTA > 0 || HASP_USE_HTTP_UPDATE > 0
|
||||
else if(strcasecmp_P(topic, PSTR("ota")) == 0) {
|
||||
else if(strcasecmp_P(topic, PSTR(FP_OTA)) == 0) {
|
||||
if(update)
|
||||
otaSetConfig(settings);
|
||||
else
|
||||
@ -542,7 +550,7 @@ void dispatch_config(const char* topic, const char* payload, uint8_t source)
|
||||
// Send output
|
||||
if(!update) {
|
||||
char subtopic[8];
|
||||
settings.remove(F("pass")); // hide password in output
|
||||
settings.remove(FP_CONFIG_PASS); // hide password in output
|
||||
|
||||
/* size_t size = */ serializeJson(doc, buffer, sizeof(buffer));
|
||||
memcpy_P(subtopic, PSTR("config"), 7);
|
||||
|
||||
@ -22,12 +22,12 @@ bool nvs_user_begin(Preferences& preferences, const char* key, bool readonly)
|
||||
|
||||
bool nvs_clear_user_config()
|
||||
{
|
||||
const char* name[8] = {"time", "ota", "http", "mqtt", "wifi"};
|
||||
const char* name[8] = {FP_TIME, FP_OTA, FP_HTTP, FP_FTP, FP_MQTT, FP_WIFI};
|
||||
Preferences preferences;
|
||||
|
||||
for(int i = 0; i < 5; i++) {
|
||||
preferences.begin(name[i], false);
|
||||
preferences.clear();
|
||||
for(int i = 0; i < 6; i++) {
|
||||
if(!preferences.begin(name[i], false)) return false;
|
||||
if(!preferences.clear()) return false;
|
||||
preferences.end();
|
||||
}
|
||||
|
||||
@ -72,6 +72,25 @@ bool nvsUpdateUInt(Preferences& preferences, const char* key, JsonVariant value)
|
||||
return changed;
|
||||
}
|
||||
|
||||
bool nvsUpdateUShort(Preferences& preferences, const char* key, JsonVariant value)
|
||||
{
|
||||
bool changed = false;
|
||||
uint32_t val = value.as<uint32_t>();
|
||||
|
||||
if(!value.isNull()) { // Json key exists
|
||||
if(preferences.isKey(key)) { // Nvs key exists
|
||||
changed = preferences.getUShort(key, 0) != val; // Value changed
|
||||
} else
|
||||
changed = true; // Nvs key doesnot exist, create it
|
||||
if(changed) {
|
||||
size_t len = preferences.putUShort(key, val);
|
||||
LOG_DEBUG(TAG_TIME, F(D_BULLET "Wrote %s => %d"), key, val);
|
||||
}
|
||||
}
|
||||
|
||||
return changed;
|
||||
}
|
||||
|
||||
// Show_nvs_keys.ino
|
||||
// Read all the keys from nvs partition and dump this information.
|
||||
// 04-dec-2017, Ed Smallenburg.
|
||||
@ -202,10 +221,10 @@ void nvs_setup()
|
||||
nvs_stats.free_entries, nvs_stats.total_entries);
|
||||
|
||||
{ // TODO: remove migratrion of keys from default NVS partition to CONFIG partition
|
||||
const char* name[8] = {"time", "ota", "http", "mqtt", "wifi"};
|
||||
const char* name[8] = {FP_TIME, FP_OTA, FP_HTTP, FP_FTP, FP_MQTT, FP_WIFI};
|
||||
Preferences oldPrefs, newPrefs;
|
||||
|
||||
for(int i = 0; i < 5; i++) {
|
||||
for(int i = 0; i < 6; i++) {
|
||||
if(oldPrefs.begin(name[i], false) && newPrefs.begin(name[i], false, "config")) {
|
||||
LOG_INFO(TAG_NVS, "opened %s", name[i]);
|
||||
String password = oldPrefs.getString(FP_CONFIG_PASS, D_PASSWORD_MASK);
|
||||
@ -253,7 +272,7 @@ void nvs_setup2()
|
||||
dbgprint("Partition %s not found!", partname);
|
||||
return;
|
||||
}
|
||||
namespace_ID = FindNsID(nvs, "mqtt"); // Find ID of our namespace in NVS
|
||||
namespace_ID = FindNsID(nvs, FP_MQTT); // Find ID of our namespace in NVS
|
||||
dbgprint("Namespace ID of ESP32Radio is %d", namespace_ID);
|
||||
while(offset < nvs->size) {
|
||||
result = esp_partition_read(nvs, offset, // Read 1 page in nvs partition
|
||||
|
||||
@ -14,6 +14,7 @@ bool nvs_user_begin(Preferences& preferences, const char* key, bool readonly);
|
||||
bool nvs_clear_user_config();
|
||||
bool nvsUpdateString(Preferences& preferences, const char* key, JsonVariant value);
|
||||
bool nvsUpdateUInt(Preferences& preferences, const char* key, JsonVariant value);
|
||||
bool nvsUpdateUShort(Preferences& preferences, const char* key, JsonVariant value);
|
||||
|
||||
#endif // ESP32
|
||||
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
#define HASP_CONFIG_H
|
||||
|
||||
#include "hasplib.h"
|
||||
#include "hasp_debug.h" // for TAG_CONF
|
||||
|
||||
/* ===== Default Event Processors ===== */
|
||||
void configSetup(void);
|
||||
@ -20,7 +19,7 @@ void configStop(void);
|
||||
DeserializationError configParseFile(String& configFile, JsonDocument& settings);
|
||||
DeserializationError configRead(JsonDocument& settings, bool setupdebug);
|
||||
void configWrite(void);
|
||||
void configOutput(const JsonObject& settings, uint8_t tag = TAG_CONF);
|
||||
void configOutput(const JsonObject& settings, uint8_t tag);
|
||||
bool configClearEeprom(void);
|
||||
|
||||
/* ===== Getter and Setter Functions ===== */
|
||||
@ -48,6 +47,7 @@ const char FP_CONFIG_COLOR2[] PROGMEM = "color2";
|
||||
const char FP_CONFIG_ENABLE[] PROGMEM = "enable";
|
||||
const char FP_CONFIG_HOST[] PROGMEM = "host";
|
||||
const char FP_CONFIG_PORT[] PROGMEM = "port";
|
||||
const char FP_CONFIG_PASV[] PROGMEM = "pasv";
|
||||
const char FP_CONFIG_NAME[] PROGMEM = "name";
|
||||
const char FP_CONFIG_USER[] PROGMEM = "user";
|
||||
const char FP_CONFIG_PASS[] PROGMEM = "pass";
|
||||
@ -76,6 +76,7 @@ const char FP_HASP_CONFIG_FILE[] PROGMEM = "/config.json";
|
||||
const char FP_WIFI[] PROGMEM = "wifi";
|
||||
const char FP_MQTT[] PROGMEM = "mqtt";
|
||||
const char FP_HTTP[] PROGMEM = "http";
|
||||
const char FP_FTP[] PROGMEM = "ftp";
|
||||
const char FP_GPIO[] PROGMEM = "gpio";
|
||||
const char FP_MDNS[] PROGMEM = "mdns";
|
||||
const char FP_HASP[] PROGMEM = "hasp";
|
||||
|
||||
@ -122,6 +122,7 @@
|
||||
#define D_HTTP_HASP_DESIGN "HASP Design"
|
||||
#define D_HTTP_INFORMATION "Information"
|
||||
#define D_HTTP_HTTP_SETTINGS "HTTP Settings"
|
||||
#define D_HTTP_FTP_SETTINGS "FTP Settings"
|
||||
#define D_HTTP_WIFI_SETTINGS "Wifi Settings"
|
||||
#define D_HTTP_MQTT_SETTINGS "MQTT Settings"
|
||||
#define D_HTTP_GPIO_SETTINGS "GPIO Settings"
|
||||
|
||||
@ -122,6 +122,7 @@
|
||||
#define D_HTTP_HASP_DESIGN "Diseño de HASP"
|
||||
#define D_HTTP_INFORMATION "Información"
|
||||
#define D_HTTP_HTTP_SETTINGS "Ajustes HTTP"
|
||||
#define D_HTTP_HTTP_SETTINGS "Ajustes FTP"
|
||||
#define D_HTTP_WIFI_SETTINGS "Ajustes Wifi"
|
||||
#define D_HTTP_MQTT_SETTINGS "Ajustes MQTT"
|
||||
#define D_HTTP_GPIO_SETTINGS "Ajustes GPIO"
|
||||
|
||||
@ -122,6 +122,7 @@
|
||||
#define D_HTTP_HASP_DESIGN "Conception HASP"
|
||||
#define D_HTTP_INFORMATION "Information"
|
||||
#define D_HTTP_HTTP_SETTINGS "Paramètres HTTP"
|
||||
#define D_HTTP_FTP_SETTINGS "Paramètres FTP"
|
||||
#define D_HTTP_WIFI_SETTINGS "Paramètres Wifi"
|
||||
#define D_HTTP_MQTT_SETTINGS "Paramètres MQTT"
|
||||
#define D_HTTP_GPIO_SETTINGS "Paramètres GPIO"
|
||||
|
||||
@ -122,6 +122,7 @@
|
||||
#define D_HTTP_HASP_DESIGN "Képernyő dizájn"
|
||||
#define D_HTTP_INFORMATION "Információk"
|
||||
#define D_HTTP_HTTP_SETTINGS "HTTP beállítások"
|
||||
#define D_HTTP_FTP_SETTINGS "FTP beállítások"
|
||||
#define D_HTTP_WIFI_SETTINGS "WiFi beállítások"
|
||||
#define D_HTTP_MQTT_SETTINGS "MQTT beállítások"
|
||||
#define D_HTTP_GPIO_SETTINGS "GPIO beállítások"
|
||||
|
||||
@ -122,6 +122,7 @@
|
||||
#define D_HTTP_HASP_DESIGN "HASP Ontwerp"
|
||||
#define D_HTTP_INFORMATION "Informatie"
|
||||
#define D_HTTP_HTTP_SETTINGS "HTTP Instellingen"
|
||||
#define D_HTTP_FTP_SETTINGS "FTP Instellingen"
|
||||
#define D_HTTP_WIFI_SETTINGS "Wifi Instellingen"
|
||||
#define D_HTTP_MQTT_SETTINGS "MQTT Instellingen"
|
||||
#define D_HTTP_GPIO_SETTINGS "GPIO Instellingen"
|
||||
|
||||
@ -123,6 +123,7 @@
|
||||
#define D_HTTP_HASP_DESIGN "Design do HASP"
|
||||
#define D_HTTP_INFORMATION "Informação"
|
||||
#define D_HTTP_HTTP_SETTINGS "Configurar HTTP"
|
||||
#define D_HTTP_FTP_SETTINGS "Configurar FTP"
|
||||
#define D_HTTP_WIFI_SETTINGS "Configurar Wifi"
|
||||
#define D_HTTP_MQTT_SETTINGS "Configurar MQTT"
|
||||
#define D_HTTP_GPIO_SETTINGS "Configurar GPIO"
|
||||
|
||||
@ -122,6 +122,7 @@
|
||||
#define D_HTTP_HASP_DESIGN "Desenul ecranului"
|
||||
#define D_HTTP_INFORMATION "Informații"
|
||||
#define D_HTTP_HTTP_SETTINGS "Setări HTTP"
|
||||
#define D_HTTP_FTP_SETTINGS "Setări FTP"
|
||||
#define D_HTTP_WIFI_SETTINGS "Setări WiFi"
|
||||
#define D_HTTP_MQTT_SETTINGS "Setări MQTT"
|
||||
#define D_HTTP_GPIO_SETTINGS "Setări GPIO"
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
|
||||
#include "hasp_debug.h"
|
||||
#include "hasp_ftp.h"
|
||||
#include "hasp_http.h"
|
||||
#include "hasp_filesystem.h"
|
||||
|
||||
#include "../../hasp/hasp_dispatch.h"
|
||||
@ -15,12 +14,10 @@
|
||||
#include "FtpServerKey.h"
|
||||
#include "SimpleFTPServer.h"
|
||||
|
||||
#if HASP_USE_HTTP > 0 || HASP_USE_HTTP_ASYNC > 0
|
||||
extern hasp_http_config_t http_config;
|
||||
#endif
|
||||
|
||||
FtpServer* ftpSrv; // set #define FTP_DEBUG in ESP8266FtpServer.h to see ftp verbose on serial
|
||||
|
||||
String ftpUsername = "";
|
||||
String ftpPassword = "";
|
||||
uint16_t ftpCtrlPort = 21;
|
||||
uint16_t ftpDataPort = 50009;
|
||||
uint8_t ftpEnabled = true;
|
||||
@ -52,13 +49,13 @@ void ftp_transfer_callback(FtpTransferOperation ftpOperation, const char* name,
|
||||
case FTP_UPLOAD_START: {
|
||||
char size[16];
|
||||
Parser::format_bytes(transferredSize, size, sizeof(size));
|
||||
LOG_VERBOSE(TAG_FTP, "Start upload of file %s (%s)", name, size);
|
||||
LOG_VERBOSE(TAG_FTP, "Receiving file %s (%s)", name, size);
|
||||
return;
|
||||
}
|
||||
case FTP_DOWNLOAD_START: {
|
||||
char size[16];
|
||||
Parser::format_bytes(transferredSize, size, sizeof(size));
|
||||
LOG_VERBOSE(TAG_FTP, "Start download of file %s (%s)", name, size);
|
||||
LOG_VERBOSE(TAG_FTP, "Sending file %s (%s)", name, size);
|
||||
return;
|
||||
}
|
||||
case FTP_UPLOAD:
|
||||
@ -67,11 +64,11 @@ void ftp_transfer_callback(FtpTransferOperation ftpOperation, const char* name,
|
||||
case FTP_TRANSFER_STOP: {
|
||||
char size[16];
|
||||
Parser::format_bytes(transferredSize, size, sizeof(size));
|
||||
LOG_VERBOSE(TAG_FTP, "Completed transfer of file %s (%s)", name, size);
|
||||
LOG_VERBOSE(TAG_FTP, "Completed file %s (%s)", name, size);
|
||||
break;
|
||||
}
|
||||
case FTP_TRANSFER_ERROR:
|
||||
LOG_VERBOSE(TAG_FTP, ("Transfer error!"));
|
||||
LOG_ERROR(TAG_FTP, ("Transfer error!"));
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@ -79,23 +76,18 @@ void ftp_transfer_callback(FtpTransferOperation ftpOperation, const char* name,
|
||||
|
||||
transferName = NULL;
|
||||
transferSize = 0;
|
||||
|
||||
/* FTP_UPLOAD_START = 0,
|
||||
* FTP_UPLOAD = 1,
|
||||
*
|
||||
* FTP_DOWNLOAD_START = 2,
|
||||
* FTP_DOWNLOAD = 3,
|
||||
*
|
||||
* FTP_TRANSFER_STOP = 4,
|
||||
* FTP_DOWNLOAD_STOP = 4,
|
||||
* FTP_UPLOAD_STOP = 4,
|
||||
*
|
||||
* FTP_TRANSFER_ERROR = 5,
|
||||
* FTP_DOWNLOAD_ERROR = 5,
|
||||
* FTP_UPLOAD_ERROR = 5
|
||||
*/
|
||||
};
|
||||
|
||||
static void ftpInitializePorts()
|
||||
{
|
||||
Preferences preferences;
|
||||
|
||||
nvs_user_begin(preferences, FP_FTP, true);
|
||||
ftpCtrlPort = preferences.getUShort(FP_CONFIG_PORT, ftpCtrlPort); // Read from NVS if it exists
|
||||
ftpDataPort = preferences.getUShort(FP_CONFIG_PASV, ftpDataPort); // Read from NVS if it exists
|
||||
preferences.end();
|
||||
}
|
||||
|
||||
void ftpStop(void)
|
||||
{
|
||||
if(ftpSrv) {
|
||||
@ -106,35 +98,47 @@ void ftpStop(void)
|
||||
|
||||
transferSize = 0;
|
||||
transferName = NULL;
|
||||
ftpInitializePorts();
|
||||
|
||||
LOG_INFO(TAG_FTP, F(D_SERVICE_STOPPED));
|
||||
}
|
||||
|
||||
void ftpStart()
|
||||
{
|
||||
LOG_TRACE(TAG_FTP, F(D_SERVICE_STARTING));
|
||||
|
||||
ftpSrv = new FtpServer(ftpCtrlPort, ftpDataPort);
|
||||
if(!ftpSrv) {
|
||||
LOG_INFO(TAG_FTP, F(D_SERVICE_START_FAILED));
|
||||
return;
|
||||
LOG_TRACE(TAG_FTP, F(D_SERVICE_STARTING));
|
||||
Preferences preferences;
|
||||
|
||||
nvs_user_begin(preferences, FP_FTP, true);
|
||||
ftpUsername = preferences.getString(FP_CONFIG_USER, ftpUsername); // Read from NVS if it exists
|
||||
ftpPassword = preferences.getString(FP_CONFIG_PASS, ftpPassword); // Read from NVS if it exists
|
||||
preferences.end();
|
||||
|
||||
if(!ftpEnabled || ftpUsername == "" || ftpUsername == "anonymous" || ftpCtrlPort == 0) {
|
||||
LOG_INFO(TAG_FTP, F(D_SERVICE_DISABLED));
|
||||
return;
|
||||
}
|
||||
|
||||
ftpSrv = new FtpServer(ftpCtrlPort, ftpDataPort);
|
||||
if(!ftpSrv) {
|
||||
LOG_INFO(TAG_FTP, F(D_SERVICE_START_FAILED));
|
||||
return;
|
||||
}
|
||||
|
||||
ftpSrv->setCallback(ftp_callback);
|
||||
ftpSrv->setTransferCallback(ftp_transfer_callback);
|
||||
ftpSrv->begin(ftpUsername.c_str(), ftpPassword.c_str(), D_MANUFACTURER); // Password must be non-empty
|
||||
|
||||
LOG_VERBOSE(TAG_FTP, F(FTP_SERVER_VERSION));
|
||||
}
|
||||
|
||||
ftpSrv->setCallback(ftp_callback);
|
||||
ftpSrv->setTransferCallback(ftp_transfer_callback);
|
||||
|
||||
#if HASP_USE_HTTP > 0 || HASP_USE_HTTP_ASYNC > 0
|
||||
ftpSrv->begin(http_config.username, http_config.password, D_MANUFACTURER); // Password must be non-empty
|
||||
#else
|
||||
ftpSrv->begin("ftpuser", "haspadmin"); // username, password for ftp. (default 21, 50009 for PASV)
|
||||
#endif
|
||||
|
||||
LOG_VERBOSE(TAG_FTP, F(FTP_SERVER_VERSION));
|
||||
LOG_INFO(TAG_FTP, F(D_SERVICE_STARTED));
|
||||
}
|
||||
|
||||
void ftpSetup()
|
||||
{
|
||||
ftpInitializePorts();
|
||||
|
||||
#if HASP_START_FTP
|
||||
ftpStart();
|
||||
#endif
|
||||
@ -154,10 +158,33 @@ void ftpEverySecond(void)
|
||||
LOG_VERBOSE(TAG_FTP, D_BULLET "%s (%s)", transferName, size);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
#if HASP_USE_CONFIG > 0
|
||||
bool ftpGetConfig(const JsonObject& settings)
|
||||
{
|
||||
bool changed = false;
|
||||
Preferences preferences;
|
||||
|
||||
nvs_user_begin(preferences, FP_FTP, true);
|
||||
String nvsUsername = preferences.getString(FP_CONFIG_USER, ftpUsername); // Read from NVS if it exists
|
||||
String nvsPassword = preferences.getString(FP_CONFIG_PASS, ftpPassword); // Read from NVS if it exists
|
||||
uint16_t nvsPort = preferences.getUShort(FP_CONFIG_PORT, ftpCtrlPort); // Read from NVS if it exists
|
||||
uint16_t nvsData = preferences.getUShort(FP_CONFIG_PASV, ftpDataPort); // Read from NVS if it exists
|
||||
preferences.end();
|
||||
|
||||
settings[FPSTR(FP_CONFIG_ENABLE)] = ftpEnabled;
|
||||
|
||||
if(nvsPort != settings[FPSTR(FP_CONFIG_PORT)].as<uint16_t>()) changed = true;
|
||||
settings[FPSTR(FP_CONFIG_PORT)] = nvsPort;
|
||||
|
||||
if(nvsData != settings[FPSTR(FP_CONFIG_PASV)].as<uint16_t>()) changed = true;
|
||||
settings[FPSTR(FP_CONFIG_PASV)] = nvsData;
|
||||
|
||||
if(strcmp(nvsUsername.c_str(), settings[FP_CONFIG_USER].as<String>().c_str()) != 0) changed = true;
|
||||
settings[FP_CONFIG_USER] = nvsUsername;
|
||||
|
||||
if(strcmp(D_PASSWORD_MASK, settings[FP_CONFIG_PASS].as<String>().c_str()) != 0) changed = true;
|
||||
settings[FP_CONFIG_PASS] = D_PASSWORD_MASK;
|
||||
|
||||
if(changed) configOutput(settings, TAG_FTP);
|
||||
return changed;
|
||||
@ -167,15 +194,31 @@ bool ftpGetConfig(const JsonObject& settings)
|
||||
*
|
||||
* Read the settings from json and sets the application variables.
|
||||
*
|
||||
* @note: read config.json into memory
|
||||
* @note: data pixel should be formated to uint32_t RGBA. Imagemagick requirements.
|
||||
*
|
||||
* @param[in] settings JsonObject with the config settings.
|
||||
**/
|
||||
bool ftpSetConfig(const JsonObject& settings)
|
||||
{
|
||||
Preferences preferences;
|
||||
nvs_user_begin(preferences, FP_FTP, false);
|
||||
|
||||
configOutput(settings, TAG_FTP);
|
||||
bool changed = false;
|
||||
|
||||
changed |= nvsUpdateUShort(preferences, FP_CONFIG_PORT, settings[FPSTR(FP_CONFIG_PORT)]);
|
||||
changed |= nvsUpdateUShort(preferences, FP_CONFIG_PASV, settings[FPSTR(FP_CONFIG_PASV)]);
|
||||
|
||||
if(!settings[FPSTR(FP_CONFIG_USER)].isNull()) {
|
||||
changed |= nvsUpdateString(preferences, FP_CONFIG_USER, settings[FPSTR(FP_CONFIG_USER)]);
|
||||
}
|
||||
|
||||
if(!settings[FPSTR(FP_CONFIG_PASS)].isNull() &&
|
||||
settings[FPSTR(FP_CONFIG_PASS)].as<String>() != String(FPSTR(D_PASSWORD_MASK))) {
|
||||
changed |= nvsUpdateString(preferences, FP_CONFIG_PASS, settings[FPSTR(FP_CONFIG_PASS)]);
|
||||
}
|
||||
|
||||
preferences.end();
|
||||
return changed;
|
||||
}
|
||||
#endif // HASP_USE_CONFIG
|
||||
|
||||
@ -72,12 +72,12 @@ ESP8266WebServer webServer(80);
|
||||
WebServer webServer(80);
|
||||
|
||||
#if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
|
||||
extern const uint8_t EDIT_HTM_GZ_START[] asm("_binary_data_edit_htm_gz_start");
|
||||
extern const uint8_t EDIT_HTM_GZ_END[] asm("_binary_data_edit_htm_gz_end");
|
||||
extern const uint8_t STYLE_CSS_GZ_START[] asm("_binary_data_style_css_gz_start");
|
||||
extern const uint8_t STYLE_CSS_GZ_END[] asm("_binary_data_style_css_gz_end");
|
||||
extern const uint8_t SCRIPT_JS_GZ_START[] asm("_binary_data_script_js_gz_start");
|
||||
extern const uint8_t SCRIPT_JS_GZ_END[] asm("_binary_data_script_js_gz_end");
|
||||
extern const uint8_t EDIT_HTM_GZ_START[] asm("_binary_data_static_edit_htm_gz_start");
|
||||
extern const uint8_t EDIT_HTM_GZ_END[] asm("_binary_data_static_edit_htm_gz_end");
|
||||
extern const uint8_t STYLE_CSS_GZ_START[] asm("_binary_data_static_style_css_gz_start");
|
||||
extern const uint8_t STYLE_CSS_GZ_END[] asm("_binary_data_static_style_css_gz_end");
|
||||
extern const uint8_t SCRIPT_JS_GZ_START[] asm("_binary_data_static_script_js_gz_start");
|
||||
extern const uint8_t SCRIPT_JS_GZ_END[] asm("_binary_data_static_script_js_gz_end");
|
||||
extern const uint8_t LOGO_SVG_GZ_START[] asm("_binary_data_static_logo_svg_gz_start");
|
||||
extern const uint8_t LOGO_SVG_GZ_END[] asm("_binary_data_static_logo_svg_gz_end");
|
||||
extern const uint8_t ACE_JS_GZ_START[] asm("_binary_data_static_ace_1_9_6_min_js_gz_start");
|
||||
@ -331,9 +331,13 @@ bool http_save_config()
|
||||
updated = haspSetConfig(settings.as<JsonObject>());
|
||||
|
||||
#if HASP_USE_MQTT > 0
|
||||
} else if(save == String(PSTR("mqtt"))) {
|
||||
} else if(save == String(PSTR(FP_MQTT))) {
|
||||
updated = mqttSetConfig(settings.as<JsonObject>());
|
||||
#endif
|
||||
#if HASP_USE_FTP > 0
|
||||
} else if(save == String(PSTR(FP_FTP))) {
|
||||
updated = ftpSetConfig(settings.as<JsonObject>());
|
||||
#endif
|
||||
|
||||
} else if(save == String(PSTR("gui"))) {
|
||||
settings[FPSTR(FP_GUI_POINTER)] = webServer.hasArg(PSTR("cursor"));
|
||||
@ -345,7 +349,7 @@ bool http_save_config()
|
||||
settings[FPSTR(FP_DEBUG_ANSI)] = webServer.hasArg(PSTR("ansi"));
|
||||
updated = debugSetConfig(settings.as<JsonObject>());
|
||||
|
||||
} else if(save == String(PSTR("http"))) {
|
||||
} else if(save == String(PSTR(FP_HTTP))) {
|
||||
updated = httpSetConfig(settings.as<JsonObject>());
|
||||
|
||||
// Password might have changed
|
||||
@ -659,6 +663,11 @@ static void webHandleApi()
|
||||
settings.createNestedObject(module);
|
||||
mqttGetConfig(settings[module]);
|
||||
#endif
|
||||
#if HASP_USE_FTP > 0
|
||||
module = FPSTR(FP_FTP);
|
||||
settings.createNestedObject(module);
|
||||
ftpGetConfig(settings[module]);
|
||||
#endif
|
||||
#if HASP_USE_HTTP > 0
|
||||
module = FPSTR(FP_HTTP);
|
||||
settings.createNestedObject(module);
|
||||
@ -752,12 +761,17 @@ static void webHandleApiConfig()
|
||||
} else
|
||||
#endif
|
||||
#if HASP_USE_MQTT > 0
|
||||
if(!strcasecmp_P(endpoint_key, PSTR("mqtt"))) {
|
||||
if(!strcasecmp_P(endpoint_key, PSTR(FP_MQTT))) {
|
||||
mqttSetConfig(settings);
|
||||
} else
|
||||
#endif
|
||||
#if HASP_USE_FTP > 0
|
||||
if(!strcasecmp_P(endpoint_key, PSTR(FP_FTP))) {
|
||||
ftpSetConfig(settings);
|
||||
} else
|
||||
#endif
|
||||
#if HASP_USE_HTTP > 0
|
||||
if(!strcasecmp_P(endpoint_key, PSTR("http"))) {
|
||||
if(!strcasecmp_P(endpoint_key, PSTR(FP_HTTP))) {
|
||||
httpSetConfig(settings);
|
||||
} else
|
||||
#endif
|
||||
@ -788,12 +802,17 @@ static void webHandleApiConfig()
|
||||
} else
|
||||
#endif
|
||||
#if HASP_USE_MQTT > 0
|
||||
if(!strcasecmp_P(endpoint_key, PSTR("mqtt"))) {
|
||||
if(!strcasecmp_P(endpoint_key, PSTR(FP_MQTT))) {
|
||||
mqttGetConfig(settings);
|
||||
} else
|
||||
#endif
|
||||
#if HASP_USE_FTP > 0
|
||||
if(!strcasecmp_P(endpoint_key, PSTR(FP_FTP))) {
|
||||
ftpGetConfig(settings);
|
||||
} else
|
||||
#endif
|
||||
#if HASP_USE_HTTP > 0
|
||||
if(!strcasecmp_P(endpoint_key, PSTR("http"))) {
|
||||
if(!strcasecmp_P(endpoint_key, PSTR(FP_HTTP))) {
|
||||
httpGetConfig(settings);
|
||||
} else
|
||||
#endif
|
||||
@ -1324,6 +1343,9 @@ static void webHandleConfig()
|
||||
httpMessage += F("<a href='/config/mqtt'>" D_HTTP_MQTT_SETTINGS "</a>");
|
||||
#endif
|
||||
httpMessage += F("<a href='/config/http'>" D_HTTP_HTTP_SETTINGS "</a>");
|
||||
#if HASP_USE_FTP > 0
|
||||
httpMessage += F("<a href='/config/ftp'>" D_HTTP_FTP_SETTINGS "</a>");
|
||||
#endif
|
||||
httpMessage += F("<a href='/config/gui'>" D_HTTP_GUI_SETTINGS "</a>");
|
||||
|
||||
#if HASP_USE_GPIO > 0
|
||||
@ -1552,6 +1574,57 @@ static void webHandleHttpConfig()
|
||||
webSendFooter();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
static void webHandleFtpConfig()
|
||||
{ // http://plate01/config/http
|
||||
if(!http_is_authenticated(F("config/ftp"))) return;
|
||||
|
||||
{ // Send Content
|
||||
String httpMessage((char*)0);
|
||||
httpMessage.reserve(HTTP_PAGE_SIZE);
|
||||
httpMessage += F("<h1>");
|
||||
httpMessage += haspDevice.get_hostname();
|
||||
httpMessage += F("</h1><hr>");
|
||||
httpMessage += F("<h2>" D_HTTP_FTP_SETTINGS "</h2>");
|
||||
|
||||
// Form
|
||||
httpMessage += F("<div class='container'><form method='POST' action='/config' id='ftp'>");
|
||||
|
||||
// Username
|
||||
httpMessage += F("<div class='row'><div class='col-25'><label for='user'>Username</label></div>");
|
||||
httpMessage += F("<div class='col-75'><input type='text' id='user' name='user' maxlength=31 "
|
||||
"placeholder='Username' value='");
|
||||
httpMessage += F("'></div></div>");
|
||||
|
||||
// Password
|
||||
httpMessage += F("<div class='row'><div class='col-25'><label for='pass'>Password</label></div>");
|
||||
httpMessage += F("<div class='col-75'><input type='password' id='pass' name='pass' maxlength=63 "
|
||||
"placeholder='Password' value='");
|
||||
httpMessage += F("'></div></div>");
|
||||
|
||||
// Ftp Port
|
||||
httpMessage += F("<div class='row gap'><div class='col-25'><label for='port'>Port</label></div>");
|
||||
httpMessage += F("<div class='col-75'><input type='number' id='port' name='port' min='0' max='65535' "
|
||||
"placeholder='21' value=''></div></div>");
|
||||
|
||||
// Passiv Port
|
||||
httpMessage += F("<div class='row'><div class='col-25'><label for='pasv'>Passif Port</label></div>");
|
||||
httpMessage += F("<div class='col-75'><input type='number' id='pasv' name='pasv' min='0' max='65535' "
|
||||
"placeholder='50009' value=''></div></div>");
|
||||
|
||||
// Submit & End Form
|
||||
httpMessage += F("<button type='submit' name='save' value='ftp'>" D_HTTP_SAVE_SETTINGS "</button>");
|
||||
httpMessage += F("</form></div>");
|
||||
|
||||
httpMessage += F("<a href='/config'>" D_HTTP_CONFIGURATION "</a>");
|
||||
|
||||
webSendHtmlHeader(haspDevice.get_hostname(), httpMessage.length(), 0);
|
||||
webServer.sendContent(httpMessage);
|
||||
}
|
||||
webSendFooter();
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
#if HASP_USE_GPIO > 0
|
||||
static void webHandleGpioConfig()
|
||||
@ -2505,7 +2578,7 @@ static inline void webStartConfigPortal()
|
||||
void httpSetup()
|
||||
{
|
||||
Preferences preferences;
|
||||
nvs_user_begin(preferences,"http", true);
|
||||
nvs_user_begin(preferences, FP_HTTP, true);
|
||||
String password = preferences.getString(FP_CONFIG_PASS, HTTP_PASSWORD);
|
||||
strncpy(http_config.password, password.c_str(), sizeof(http_config.password));
|
||||
LOG_DEBUG(TAG_HTTP, F(D_BULLET "Read %s => %s (%d bytes)"), FP_CONFIG_PASS, password.c_str(), password.length());
|
||||
@ -2593,6 +2666,9 @@ void httpSetup()
|
||||
#if HASP_USE_MQTT > 0
|
||||
webServer.on(F("/config/mqtt"), webHandleMqttConfig);
|
||||
#endif
|
||||
#if HASP_USE_FTP > 0
|
||||
webServer.on(F("/config/ftp"), webHandleFtpConfig);
|
||||
#endif
|
||||
#if HASP_USE_WIFI > 0
|
||||
webServer.on(F("/config/wifi"), webHandleWifiConfig);
|
||||
#endif
|
||||
@ -2653,7 +2729,7 @@ bool httpGetConfig(const JsonObject& settings)
|
||||
bool httpSetConfig(const JsonObject& settings)
|
||||
{
|
||||
Preferences preferences;
|
||||
nvs_user_begin(preferences,"http", false);
|
||||
nvs_user_begin(preferences, FP_HTTP, false);
|
||||
|
||||
configOutput(settings, TAG_HTTP);
|
||||
bool changed = false;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user