diff -r 64886971967b -r 31f9d3e4a85f components/tft/tftspi.c --- a/components/tft/tftspi.c Mon Feb 19 15:07:28 2024 +0100 +++ b/components/tft/tftspi.c Mon Jun 24 17:05:20 2024 +0200 @@ -606,14 +606,14 @@ void stmpe610_Init() { stmpe610_write_reg(STMPE610_REG_SYS_CTRL1, 0x02); // Software chip reset - vTaskDelay(10 / portTICK_RATE_MS); + vTaskDelay(10 / portTICK_PERIOD_MS); stmpe610_write_reg(STMPE610_REG_SYS_CTRL2, 0x04); // Temperature sensor clock off, GPIO clock off, touch clock on, ADC clock on stmpe610_write_reg(STMPE610_REG_INT_EN, 0x00); // Don't Interrupt on INT pin stmpe610_write_reg(STMPE610_REG_ADC_CTRL1, 0x48); // ADC conversion time = 80 clock ticks, 12-bit ADC, internal voltage refernce - vTaskDelay(2 / portTICK_RATE_MS); + vTaskDelay(2 / portTICK_PERIOD_MS); stmpe610_write_reg(STMPE610_REG_ADC_CTRL2, 0x01); // ADC speed 3.25MHz stmpe610_write_reg(STMPE610_REG_GPIO_AF, 0x00); // GPIO alternate function - OFF stmpe610_write_reg(STMPE610_REG_TSC_CFG, 0xE3); // Averaging 8, touch detect delay 1ms, panel driver settling time 1ms @@ -761,7 +761,7 @@ if(ms) { ms = *addr++; // Read post-command delay time (ms) if(ms == 255) ms = 500; // If 255, delay for 500 ms - vTaskDelay(ms / portTICK_RATE_MS); + vTaskDelay(ms / portTICK_PERIOD_MS); } } } @@ -863,11 +863,11 @@ void TFT_PinsInit() { // Route all used pins to GPIO control - gpio_pad_select_gpio(PIN_NUM_CS); - gpio_pad_select_gpio(PIN_NUM_MISO); - gpio_pad_select_gpio(PIN_NUM_MOSI); - gpio_pad_select_gpio(PIN_NUM_CLK); - gpio_pad_select_gpio(PIN_NUM_DC); + esp_rom_gpio_pad_select_gpio(PIN_NUM_CS); + esp_rom_gpio_pad_select_gpio(PIN_NUM_MISO); + esp_rom_gpio_pad_select_gpio(PIN_NUM_MOSI); + esp_rom_gpio_pad_select_gpio(PIN_NUM_CLK); + esp_rom_gpio_pad_select_gpio(PIN_NUM_DC); gpio_set_direction(PIN_NUM_MISO, GPIO_MODE_INPUT); gpio_set_pull_mode(PIN_NUM_MISO, GPIO_PULLUP_ONLY); @@ -877,17 +877,17 @@ gpio_set_direction(PIN_NUM_DC, GPIO_MODE_OUTPUT); gpio_set_level(PIN_NUM_DC, 0); #if USE_TOUCH - gpio_pad_select_gpio(PIN_NUM_TCS); + esp_rom_gpio_pad_select_gpio(PIN_NUM_TCS); gpio_set_direction(PIN_NUM_TCS, GPIO_MODE_OUTPUT); #endif #if PIN_NUM_BCKL - gpio_pad_select_gpio(PIN_NUM_BCKL); + esp_rom_gpio_pad_select_gpio(PIN_NUM_BCKL); gpio_set_direction(PIN_NUM_BCKL, GPIO_MODE_OUTPUT); gpio_set_level(PIN_NUM_BCKL, PIN_BCKL_OFF); #endif #if PIN_NUM_RST - gpio_pad_select_gpio(PIN_NUM_RST); + esp_rom_gpio_pad_select_gpio(PIN_NUM_RST); gpio_set_direction(PIN_NUM_RST, GPIO_MODE_OUTPUT); gpio_set_level(PIN_NUM_RST, 0); #endif