Implement FS operations (read/write/delete)

Author: facchinm

src/WiFi.h

@@ -34,6 +34,7 @@ extern "C" {
 #include "WiFiClient.h"
 #include "WiFiSSLClient.h"
 #include "WiFiServer.h"
+#include "WiFiStorage.h"
 
 class WiFiClass
 {

src/WiFiStorage.cpp

@@ -0,0 +1,7 @@
+#include "WiFiStorage.h"
+
+WiFiStorageFile WiFiStorageClass::open(const char *filename) {
+	WiFiStorageFile file(filename);
+	file.size();
+	return file;
+}

src/WiFiStorage.h

@@ -0,0 +1,96 @@
+#include "utility/wifi_drv.h"
+
+class WiFiStorageFile;
+
+class WiFiStorageClass
+{
+public:
+	static bool begin();
+
+	static WiFiStorageFile open(const char *filename);
+	static bool exists(const char *filename, size_t* len) {
+		return (WiFiDrv::existsFile(filename, strlen(filename), len) > 0);
+	}
+	static bool remove(const char *filename) {
+		WiFiDrv::deleteFile(filename, strlen(filename));
+		return true;
+	}
+	static bool read(const char *filename, size_t offset, uint8_t* buffer, size_t buffer_len) {
+		WiFiDrv::readFile(filename, strlen(filename), offset, buffer, buffer_len);
+		return true;
+	}
+	static bool write(const char *filename, size_t offset, uint8_t* buffer, size_t buffer_len) {
+		WiFiDrv::writeFile(filename, strlen(filename), offset, buffer, buffer_len);
+		return true;
+	}
+	static bool download(const char* url, const char *filename) {
+		WiFiDrv::downloadFile(url, strlen(url), filename, strlen(filename));
+		return true;
+	}
+
+    static bool remove(String filename) {
+    	return remove(filename.c_str());
+	}
+	static bool read(String filename, size_t offset, uint8_t* buffer, size_t buffer_len) {
+		return read(filename.c_str(), offset, buffer, buffer_len);
+	}
+	static bool write(String filename, size_t offset, uint8_t* buffer, size_t buffer_len) {
+		return write(filename.c_str(), offset, buffer, buffer_len);
+	}
+    static bool download(String url, String filename) {
+    	return download(url.c_str(), filename.c_str());
+    }
+};
+
+extern WiFiStorageClass WiFiStorage;
+
+
+class WiFiStorageFile
+{
+public:
+	constexpr WiFiStorageFile(const char* _filename) : filename(_filename) { }
+	operator bool() {
+		return WiFiStorage.exists(filename, &length);
+	}
+	uint32_t read(void *buf, uint32_t rdlen) {
+		if (offset + rdlen > length) {
+			if (offset >= length) return 0;
+			rdlen = length - offset;
+		}
+		WiFiStorage.read(filename, offset, (uint8_t*)buf, rdlen);
+		offset += rdlen;
+		return rdlen;
+	}
+	uint32_t write(const void *buf, uint32_t wrlen) {
+		WiFiStorage.write(filename, offset, (uint8_t*)buf, wrlen);
+		offset += wrlen;
+		return wrlen;
+	}
+	void seek(uint32_t n) {
+		offset = n;
+	}
+	uint32_t position() {
+		return offset;
+	}
+	uint32_t size() {
+		WiFiStorage.exists(filename, &length);
+		return length;
+	}
+	uint32_t available() {
+		WiFiStorage.exists(filename, &length);
+		return length - offset;
+	}
+	void erase() {
+		offset = 0;
+		WiFiStorage.remove(filename);
+	}
+	void flush();
+	void close() {
+		offset = 0;
+	}
+protected:
+	friend class WiFiStorageClass;
+	size_t offset = 0;
+	size_t length = 0;
+	const char* filename;
+};

src/utility/wifi_drv.cpp

@@ -1078,4 +1078,69 @@ void WiFiDrv::analogWrite(uint8_t pin, uint8_t value)
     SpiDrv::spiSlaveDeselect();
 }
 
+int8_t WiFiDrv::downloadFile(const char* url, uint8_t url_len, const char *filename, uint8_t filename_len)
+{
+	WAIT_FOR_SLAVE_SELECT();
+    // Send Command
+    SpiDrv::sendCmd(DOWNLOAD_FILE, PARAM_NUMS_2);
+    SpiDrv::sendParam((uint8_t*)url, url_len, NO_LAST_PARAM);
+    SpiDrv::sendParam((uint8_t*)filename, filename_len, LAST_PARAM);
+
+    // pad to multiple of 4
+    int commandSize = 6 + url_len + filename_len;
+    while (commandSize % 4) {
+        SpiDrv::readChar();
+        commandSize++;
+    }
+
+    SpiDrv::spiSlaveDeselect();
+    //Wait the reply elaboration
+    SpiDrv::waitForSlaveReady();
+    SpiDrv::spiSlaveSelect();
+
+    // Wait for reply
+    uint8_t _data = 0;
+    uint8_t _dataLen = 0;
+    if (!SpiDrv::waitResponseCmd(DOWNLOAD_FILE, PARAM_NUMS_1, &_data, &_dataLen))
+    {
+        WARN("error waitResponse");
+        _data = WL_FAILURE;
+    }
+    SpiDrv::spiSlaveDeselect();
+    return _data;
+}
+
+int8_t WiFiDrv::fileOperation(uint8_t operation, const char *filename, uint8_t filename_len, size_t offset, uint8_t* buffer, uint8_t len)
+{
+    WAIT_FOR_SLAVE_SELECT();
+    // Send Command
+    SpiDrv::sendCmd(operation, PARAM_NUMS_3);
+    SpiDrv::sendParam((uint8_t*)&offset, sizeof(offset), NO_LAST_PARAM);
+    SpiDrv::sendParam((uint8_t*)&len, sizeof(len), NO_LAST_PARAM);
+    SpiDrv::sendParam((uint8_t*)filename, filename_len, (operation == WRITE_FILE) ? NO_LAST_PARAM : LAST_PARAM);
+    if (operation == WRITE_FILE) {
+        SpiDrv::sendParam((uint8_t*)buffer, len, LAST_PARAM);
+    }
+
+    // pad to multiple of 4
+    int commandSize = 7 + sizeof(offset) + sizeof(len) + filename_len;
+    while (commandSize % 4) {
+        SpiDrv::readChar();
+        commandSize++;
+    }
+
+    SpiDrv::spiSlaveDeselect();
+    //Wait the reply elaboration
+    SpiDrv::waitForSlaveReady();
+    SpiDrv::spiSlaveSelect();
+
+    // Wait for reply
+    uint8_t _data = 0;
+    uint8_t _dataLen = 0;
+    SpiDrv::waitResponseCmd(operation, PARAM_NUMS_1, (operation == WRITE_FILE) ? &_data : buffer, &_dataLen);
+
+    SpiDrv::spiSlaveDeselect();
+    return _dataLen;
+}
+
 WiFiDrv wiFiDrv;

src/utility/wifi_drv.h

@@ -286,6 +286,26 @@ class WiFiDrv
     static void digitalWrite(uint8_t pin, uint8_t value);
     static void analogWrite(uint8_t pin, uint8_t value);
 
+    static int8_t downloadFile(const char* url, uint8_t url_len, const char *filename, uint8_t filename_len);
+
+    static int8_t fileOperation(uint8_t operation, const char *filename, uint8_t filename_len, size_t offset, uint8_t* buffer, uint8_t len);
+
+    static int8_t readFile(const char *filename, uint8_t filename_len, size_t offset, uint8_t* buffer, size_t buffer_len) {
+        return fileOperation(READ_FILE, filename, filename_len, offset, buffer, buffer_len);
+    };
+    static int8_t writeFile(const char *filename, uint8_t filename_len, size_t offset, uint8_t* buffer, size_t buffer_len) {
+        return fileOperation(WRITE_FILE, filename, filename_len, offset, buffer, buffer_len);
+    };
+    static int8_t deleteFile(const char *filename, uint8_t filename_len)  {
+        return fileOperation(DELETE_FILE, filename, filename_len, 0, NULL, 0);
+    };
+    static int8_t existsFile(const char *filename, uint8_t filename_len, size_t* len)  {
+        int32_t length = 0;
+        fileOperation(EXISTS_FILE, filename, filename_len, 0, (uint8_t*)&length, sizeof(length));
+        *len = length;
+        return length >= 0;
+    };
+
     friend class WiFiUDP;
     friend class WiFiClient;
 };

src/utility/wifi_spi.h

@@ -101,6 +101,13 @@ enum {
     SET_PIN_MODE		= 0x50,
     SET_DIGITAL_WRITE	= 0x51,
     SET_ANALOG_WRITE	= 0x52,
+
+    // regular format commands
+    WRITE_FILE			= 0x53,
+    READ_FILE			= 0x54,
+    DELETE_FILE			= 0x55,
+    EXISTS_FILE			= 0x56,
+    DOWNLOAD_FILE		= 0x57,
 };