ESP IDF 5.0 compatibility

README.md

@@ -8,3 +8,10 @@ original Tetris, or do some die-hard computing on 2.11BSD.
 
 Well, someone had to put back the 'mini' in 'minicomputer', right?
 
+This fork contains a set of patches to correct build errors in IDF 5.0
+Ian Schofield (Isysxp)
+October 2023
+
+---
+
+**>> changes to integrate sunton 2832S028 board and ESP-IDF 5.2.1 currently in Sunton_2832S028 branch <<**

firmware/CMakeLists.txt

@@ -6,3 +6,6 @@ cmake_minimum_required(VERSION 3.5)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(esppdp)
 spiffs_create_partition_image(storage spiffs/ FLASH_IN_PROJECT)
+set_target_properties(${COMPONENT_LIB} PROPERTIES COMPILE_FLAGS -Wformat=n)
+idf_build_set_property(COMPILE_OPTIONS "-Wno-error" APPEND)
+

firmware/components/hid_server/CMakeLists.txt

@@ -1,5 +1,5 @@
 
 idf_component_register(SRCS "hci_server.cpp" "hci_transport_esp32.cpp" "hid_server.cpp"
                     REQUIRES bt
-                    INCLUDE_DIRS ".")
+                    INCLUDE_DIRS "." $ENV{IDF_PATH}/components/nvs_flash/include )
 

firmware/components/hid_server/hid_server.cpp

@@ -14,7 +14,7 @@
 ** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 ** SOFTWARE.
 */
-
+#pragma GCC diagnostic ignored  "-Wformat"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

firmware/components/ie15term/CMakeLists.txt

@@ -1,5 +1,5 @@
 
 idf_component_register(SRCS "ie15lcd.c"
-                    INCLUDE_DIRS "."
+                    INCLUDE_DIRS "."  $ENV{IDF_PATH}/components/nvs_flash/include $ENV{IDF_PATH}/components/esp_ringbuf/include $ENV{IDF_PATH}/components/driver/include $ENV{IDF_PATH}/components/vfs/include
                     EMBED_FILES chargen.bin)
 

firmware/components/ie15term/ie15lcd.c

@@ -221,9 +221,9 @@ static void lcd_init(spi_device_handle_t spi) {
 
 	//Reset the display
 	gpio_set_level(PIN_NUM_RST, 0);
-	vTaskDelay(100 / portTICK_RATE_MS);
+	vTaskDelay(100 / portTICK_PERIOD_MS);
 	gpio_set_level(PIN_NUM_RST, 1);
-	vTaskDelay(100 / portTICK_RATE_MS);
+	vTaskDelay(100 / portTICK_PERIOD_MS);
 
 	//detect LCD type
 #if CONFIG_ESPPDP_HW_WROVER_KIT
@@ -234,7 +234,7 @@ static void lcd_init(spi_device_handle_t spi) {
 	int lcd_detected_type = 0;
 	int lcd_type;
 
-	printf("LCD ID: %08X\n", lcd_id);
+	printf("LCD ID: %08X\n", (unsigned int)lcd_id);
 	if ( lcd_id == 0 ) {
 		//zero, ili
 		lcd_detected_type = LCD_TYPE_ILI;
@@ -259,7 +259,7 @@ static void lcd_init(spi_device_handle_t spi) {
 		lcd_cmd(spi, lcd_init_cmds[cmd].cmd);
 		lcd_data(spi, lcd_init_cmds[cmd].data, lcd_init_cmds[cmd].databytes&0x1F);
 		if (lcd_init_cmds[cmd].databytes&0x80) {
-			vTaskDelay(100 / portTICK_RATE_MS);
+			vTaskDelay(100 / portTICK_PERIOD_MS);
 		}
 		cmd++;
 	}

firmware/main/pdp11_cpu.c

@@ -3609,8 +3609,8 @@ if (cptr) {
     if (r == SCPE_OK) {
         pa = relocC (va, sim_switches);                 /* relocate */
         if (pa < MAXMEMSIZE)
-            fprintf (of, "Virtual %-o = physical %-o\n", va, pa);
-        else fprintf (of, "Virtual %-o is not valid\n", va);
+            fprintf (of, "Virtual %-lo = physical %-o\n", va, pa);
+        else fprintf (of, "Virtual %-lo is not valid\n", va);
         return SCPE_OK;
         }
     }

firmware/main/pdp11_defs.h

@@ -77,7 +77,7 @@
    05-Apr-01    RMS     Added TS11/TSV05 support
    10-Feb-01    RMS     Added DECtape support
 */
-
+#pragma GCC diagnostic ignored  "-Wformat"
 #ifndef PDP11_DEFS_H
 #define PDP11_DEFS_H   0
 

firmware/main/sim_defs.h

@@ -104,7 +104,8 @@
         print_sym               print symbolic output
         parse_sym               parse symbolic input
 */
-
+#pragma GCC diagnostic ignored  "-Wformat"
+#pragma GCC diagnostic ignored  "-Wchar-subscripts"
 #ifndef SIM_DEFS_H_
 #define SIM_DEFS_H_    0
 

firmware/main/wifi_if_esp32.c

@@ -66,6 +66,7 @@ typedef struct {
 QueueHandle_t rxqueue;
 
 static esp_netif_t *netif;
+void esp_read_mac(uint8_t *,int);
 
 //Gets called whenever the local tcp/ip stack wants to transmit something
 static esp_err_t wifi_netif_tx(void *driver, void *buffer, size_t len) {

firmware/main/wifid.c

@@ -144,9 +144,9 @@ void wifid_parse_packet(uint8_t *buffer, int len) {
 	} else if (wcmd->cmd == CMD_QUIT) {
 		//Ignore, we aren't the one needing to quit here.
 	} else {
-		printf("WiFiD: Got unknown commmand %d\n", wcmd->cmd);
+		printf("WiFiD: Got unknown commmand %ld\n", wcmd->cmd);
 		char buff[32];
-		sprintf(buff, "Unknown cmd %d", wcmd->cmd);
+		sprintf(buff, "Unknown cmd %ld", wcmd->cmd);
 		send_error_msg(buff);
 	}
 }