ESP-IDF Release v4.0 Support & Open PR Consolidation

.gitignore

@@ -26,9 +26,12 @@ sdkconfig.lobo
 BUILD
 PBUILD
 build/
+cmake-build-debug/
+.idea/
 temp/
 local/
 *.dis
 *.elf
 *.map
 **/.DS_Store
+mkspiffs/

CMakeLists.txt

@@ -0,0 +1,7 @@
+# The following lines of boilerplate have to be in your project's
+# CMakeLists in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.5)
+
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --save-temps")
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(tft_demo)

components/mkspiffs/CMakeLists.txt

@@ -0,0 +1,3 @@
+set(COMPONENT_SRCDIRS "")
+set(COMPONENT_ADD_INCLUDEDIRS "")
+register_component()

components/mkspiffs/src/spiffs/esp_spiffs.c

@@ -34,7 +34,12 @@
 
 #include "spiffs.h"
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+#include <esp_flash.h>
+#include <spi_flash_mmap.h>
+#else
 #include <esp_spi_flash.h>
+#endif
 
 s32_t esp32_spi_flash_read(u32_t addr, u32_t size, u8_t *dst) {
 	u32_t aaddr;
@@ -63,7 +68,11 @@ s32_t esp32_spi_flash_read(u32_t addr, u32_t size, u8_t *dst) {
 
 		abuff = (u8_t *)(((ptrdiff_t)buff + (4 - 1)) & (u32_t)-4);
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+		if (esp_flash_read(NULL, (void *)abuff, aaddr, asize) != ESP_OK) {
+#else
 		if (spi_flash_read(aaddr, (void *)abuff, asize) != 0) {
+#endif
 			free(buff);
 			return SPIFFS_ERR_INTERNAL;
 		}
@@ -72,7 +81,11 @@ s32_t esp32_spi_flash_read(u32_t addr, u32_t size, u8_t *dst) {
 
 		free(buff);
 	} else {
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+		if (esp_flash_read(NULL, (void *)dst, addr, size) != ESP_OK) {
+#else
 		if (spi_flash_read(addr, (void *)dst, size) != 0) {
+#endif
 			return SPIFFS_ERR_INTERNAL;
 		}
 	}
@@ -87,7 +100,7 @@ s32_t esp32_spi_flash_write(u32_t addr, u32_t size, const u8_t *src) {
 	u32_t asize;
 
 	asize = size;
-	
+
 	// Align address to 4 byte
 	aaddr = (addr + (4 - 1)) & -4;
 	if (aaddr != addr) {
@@ -107,21 +120,33 @@ s32_t esp32_spi_flash_write(u32_t addr, u32_t size, const u8_t *src) {
 
 		abuff = (u8_t *)(((ptrdiff_t)buff + (4 - 1)) & -4);
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+		if (esp_flash_read(NULL, (void *)abuff, aaddr, asize) != ESP_OK) {
+#else
 		if (spi_flash_read(aaddr, (void *)abuff, asize) != 0) {
+#endif
 			free(buff);
 			return SPIFFS_ERR_INTERNAL;
 		}
 
 		memcpy(abuff + (addr - aaddr), src, size);
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+		if (esp_flash_write(NULL, (uint32_t *)abuff, aaddr, asize) != ESP_OK) {
+#else
 		if (spi_flash_write(aaddr, (uint32_t *)abuff, asize) != 0) {
+#endif
 			free(buff);
 			return SPIFFS_ERR_INTERNAL;
 		}
 
 		free(buff);
 	} else {
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+		if (esp_flash_write(NULL, (uint32_t *)src, addr, size) != ESP_OK) {
+#else
 		if (spi_flash_write(addr, (uint32_t *)src, size) != 0) {
+#endif
 			return SPIFFS_ERR_INTERNAL;
 		}
 	}
@@ -130,7 +155,11 @@ s32_t esp32_spi_flash_write(u32_t addr, u32_t size, const u8_t *src) {
 }
 
 s32_t IRAM_ATTR esp32_spi_flash_erase(u32_t addr, u32_t size) {
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+	if (esp_flash_erase_region(NULL, addr, size) != ESP_OK) {
+#else
 	if (spi_flash_erase_sector(addr >> 12) != 0) {
+#endif
 		return SPIFFS_ERR_INTERNAL;
 	}
 

components/spidriver/CMakeLists.txt

@@ -0,0 +1,3 @@
+FILE(GLOB SOURCES *.c)
+idf_component_register(SRCS ${SOURCES} INCLUDE_DIRS "."
+                       PRIV_REQUIRES driver)

components/spidriver/spi_master_lobo.c

@@ -60,30 +60,16 @@ Main driver's function is 'spi_lobo_transfer_data()'
 */
 #include "freertos/FreeRTOS.h"
 #include <string.h>
-#include <stdio.h>
-#include "soc/gpio_sig_map.h"
 #include "soc/spi_reg.h"
 #include "soc/dport_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "rom/ets_sys.h"
-#include "esp_types.h"
-#include "esp_attr.h"
 #include "esp_log.h"
-#include "esp_err.h"
 #include "freertos/semphr.h"
-#include "freertos/xtensa_api.h"
-#include "freertos/task.h"
-#include "freertos/ringbuf.h"
-#include "soc/soc.h"
-#include "soc/dport_reg.h"
-#include "soc/uart_struct.h"
 #include "driver/uart.h"
 #include "driver/gpio.h"
-#include "driver/periph_ctrl.h"
-#include "esp_heap_caps.h"
-#include "driver/periph_ctrl.h"
 #include "spi_master_lobo.h"
-
+#include "driver/periph_ctrl.h"
+#include "soc/gpio_periph.h"
+#include "rom/gpio.h"
 
 static spi_lobo_host_t *spihost[3] = {NULL};
 
@@ -635,8 +621,8 @@ esp_err_t spi_lobo_bus_remove_device(spi_lobo_device_handle_t handle)
 		if (spihost[handle->host_dev]->device[x] !=NULL) break;
 	}
 	if (x == NO_DEV) {
-		free(handle);
 		spi_lobo_bus_free(handle->host_dev, 1);
+		free(handle);
 	}
 	else free(handle);
 

components/spidriver/spi_master_lobo.h

@@ -21,9 +21,8 @@
 #include "freertos/semphr.h"
 #include "soc/spi_struct.h"
 
-#include "esp_intr.h"
 #include "esp_intr_alloc.h"
-#include "rom/lldesc.h"
+#include "esp32/rom/lldesc.h"
 
 
 #ifdef __cplusplus

components/spiffs/CMakeLists.txt

@@ -0,0 +1,3 @@
+FILE(GLOB SOURCES *.c)
+idf_component_register(SRCS ${SOURCES} INCLUDE_DIRS "."
+                       REQUIRES vfs spi_flash)

components/spiffs/Kconfig

@@ -0,0 +1,27 @@
+menu "TFT SPIFFS"
+
+config SPIFFS_BASE_ADDR
+    int "SPIFFS Base address"
+    range 1048576 33546240
+    default 0x180000
+    help
+	Starting address of the SPIFFS area in ESP32 Flash
+
+config SPIFFS_SIZE
+    int "SPIFFS Size in bytes"
+    range 262144 2097152
+    default 1048576
+
+config SPIFFS_LOG_BLOCK_SIZE
+    int "SPIFFS Logical block size"
+    range 4096 65536
+    default 8192
+
+config SPIFFS_LOG_PAGE_SIZE
+    int "SPIFFS Logical page size"
+    range 256 2048
+    default 256
+    help
+	Set it to the physical page size og the used SPI Flash chip.
+
+endmenu

components/spiffs/esp_spiffs.c

@@ -34,7 +34,12 @@
 
 #include "spiffs.h"
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+#include <esp_flash.h>
+#include <spi_flash_mmap.h>
+#else
 #include <esp_spi_flash.h>
+#endif
 
 s32_t IRAM_ATTR esp32_spi_flash_read(u32_t addr, u32_t size, u8_t *dst) {
 	u32_t aaddr;
@@ -63,7 +68,11 @@ s32_t IRAM_ATTR esp32_spi_flash_read(u32_t addr, u32_t size, u8_t *dst) {
 
 		abuff = (u8_t *)(((ptrdiff_t)buff + (4 - 1)) & (u32_t)-4);
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+		if (esp_flash_read(NULL, (void *)abuff, aaddr, asize) != ESP_OK) {
+#else
 		if (spi_flash_read(aaddr, (void *)abuff, asize) != 0) {
+#endif
 			free(buff);
 			return SPIFFS_ERR_INTERNAL;
 		}
@@ -72,7 +81,11 @@ s32_t IRAM_ATTR esp32_spi_flash_read(u32_t addr, u32_t size, u8_t *dst) {
 
 		free(buff);
 	} else {
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+		if (esp_flash_read(NULL, (void *)dst, addr, size) != ESP_OK) {
+#else
 		if (spi_flash_read(addr, (void *)dst, size) != 0) {
+#endif
 			return SPIFFS_ERR_INTERNAL;
 		}
 	}
@@ -107,21 +120,33 @@ s32_t IRAM_ATTR esp32_spi_flash_write(u32_t addr, u32_t size, const u8_t *src) {
 
 		abuff = (u8_t *)(((ptrdiff_t)buff + (4 - 1)) & -4);
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+		if (esp_flash_read(NULL, (void *)abuff, aaddr, asize) != ESP_OK) {
+#else
 		if (spi_flash_read(aaddr, (void *)abuff, asize) != 0) {
+#endif
 			free(buff);
 			return SPIFFS_ERR_INTERNAL;
 		}
 
 		memcpy(abuff + (addr - aaddr), src, size);
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+		if (esp_flash_write(NULL, (uint32_t *)abuff, aaddr, asize) != ESP_OK) {
+#else
 		if (spi_flash_write(aaddr, (uint32_t *)abuff, asize) != 0) {
+#endif
 			free(buff);
 			return SPIFFS_ERR_INTERNAL;
 		}
 
 		free(buff);
 	} else {
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+		if (esp_flash_write(NULL, (uint32_t *)src, addr, size) != ESP_OK) {
+#else
 		if (spi_flash_write(addr, (uint32_t *)src, size) != 0) {
+#endif
 			return SPIFFS_ERR_INTERNAL;
 		}
 	}
@@ -130,7 +155,11 @@ s32_t IRAM_ATTR esp32_spi_flash_write(u32_t addr, u32_t size, const u8_t *src) {
 }
 
 s32_t IRAM_ATTR esp32_spi_flash_erase(u32_t addr, u32_t size) {
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+	if (esp_flash_erase_region(NULL, addr, size) != ESP_OK) {
+#else
 	if (spi_flash_erase_sector(addr >> 12) != 0) {
+#endif
 		return SPIFFS_ERR_INTERNAL;
 	}
 

components/spiffs/spiffs_nucleus.c

@@ -679,7 +679,7 @@ static s32_t spiffs_populate_ix_map_v(
   res = _spiffs_rd(fs, SPIFFS_OP_T_OBJ_LU2 | SPIFFS_OP_C_READ,
       0, SPIFFS_PAGE_TO_PADDR(fs, pix), sizeof(spiffs_page_object_ix), (u8_t *)objix);
   SPIFFS_CHECK_RES(res);
-  SPIFFS_VALIDATE_OBJIX(objix->p_hdr, obj_id, objix->p_hdr.span_ix);
+  //SPIFFS_VALIDATE_OBJIX(objix->p_hdr, obj_id, objix->p_hdr.span_ix);
 
   // check if hdr is ok, and if objix range overlap with ix map range
   if ((objix->p_hdr.flags & (SPIFFS_PH_FLAG_DELET | SPIFFS_PH_FLAG_FINAL | SPIFFS_PH_FLAG_IXDELE)) ==

components/spiffs/spiffs_vfs.c

@@ -47,12 +47,12 @@ int spiffs_is_mounted = 0;
 
 QueueHandle_t spiffs_mutex = NULL;
 
-static int IRAM_ATTR vfs_spiffs_open(const char *path, int flags, int mode);
-static ssize_t IRAM_ATTR vfs_spiffs_write(int fd, const void *data, size_t size);
-static ssize_t IRAM_ATTR vfs_spiffs_read(int fd, void * dst, size_t size);
-static int IRAM_ATTR vfs_spiffs_fstat(int fd, struct stat * st);
-static int IRAM_ATTR vfs_spiffs_close(int fd);
-static off_t IRAM_ATTR vfs_spiffs_lseek(int fd, off_t size, int mode);
+static int vfs_spiffs_open(const char *path, int flags, int mode);
+static ssize_t vfs_spiffs_write(int fd, const void *data, size_t size);
+static ssize_t vfs_spiffs_read(int fd, void * dst, size_t size);
+static int vfs_spiffs_fstat(int fd, struct stat * st);
+static int vfs_spiffs_close(int fd);
+static off_t vfs_spiffs_lseek(int fd, off_t size, int mode);
 
 typedef struct {
 	DIR dir;
@@ -92,7 +92,7 @@ static u8_t *my_spiffs_cache;
 
 //----------------------------------------------------
 void spiffs_fs_stat(uint32_t *total, uint32_t *used) {
-	if (SPIFFS_info(&fs, total, used) != SPIFFS_OK) {
+	if (SPIFFS_info(&fs, (u32_t *)total, (u32_t *)used) != SPIFFS_OK) {
 		*total = 0;
 		*used = 0;
 	}

components/spiffs_image/CMakeLists.txt

@@ -0,0 +1,3 @@
+set(COMPONENT_SRCDIRS "")
+set(COMPONENT_ADD_INCLUDEDIRS "")
+register_component()

components/tft/CMakeLists.txt

@@ -0,0 +1,5 @@
+FILE(GLOB SOURCES *.c)
+idf_component_register(SRCS ${SOURCES}
+                       INCLUDE_DIRS "."
+                       REQUIRES spidriver
+                       PRIV_REQUIRES driver)