Update to support ESP-IDF v5 in develop branch
This commit is contained in:
parent
7c6bdc5635
commit
44342b653f
13 changed files with 55 additions and 46 deletions
|
@ -121,7 +121,7 @@ void GC9A01_init(void)
|
|||
GC9A01_send_cmd(GC_init_cmds[cmd].cmd);
|
||||
GC9A01_send_data(GC_init_cmds[cmd].data, GC_init_cmds[cmd].databytes&0x1F);
|
||||
if (GC_init_cmds[cmd].databytes & 0x80) {
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
}
|
||||
cmd++;
|
||||
}
|
||||
|
@ -235,8 +235,8 @@ static void GC9A01_reset(void)
|
|||
#if GC9A01_USE_RST
|
||||
//Reset the display
|
||||
gpio_set_level(GC9A01_RST, 0);
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
gpio_set_level(GC9A01_RST, 1);
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -176,7 +176,7 @@ void hx8357_init(void)
|
|||
}
|
||||
}
|
||||
if (x & 0x80) { // If high bit set...
|
||||
vTaskDelay(numArgs * 5 / portTICK_RATE_MS); // numArgs is actually a delay time (5ms units)
|
||||
vTaskDelay(numArgs * pdMS_TO_TICKS(5)); // numArgs is actually a delay time (5ms units)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -278,8 +278,8 @@ static void hx8357_reset(void)
|
|||
{
|
||||
#if HX8357_USE_RST
|
||||
gpio_set_level(HX8357_RST, 0);
|
||||
vTaskDelay(10 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(10));
|
||||
gpio_set_level(HX8357_RST, 1);
|
||||
vTaskDelay(120 / portTICK_RATE_MS);
|
||||
vTaskDelaypdMS_TO_TICKS(120);
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -30,6 +30,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR TH
|
|||
*********************/
|
||||
#include "disp_spi.h"
|
||||
#include "driver/gpio.h"
|
||||
#include "rom/gpio.h"
|
||||
#include "freertos/FreeRTOS.h"
|
||||
#include "freertos/task.h"
|
||||
|
||||
|
@ -249,14 +250,14 @@ static void il3820_waitbusy(int wait_ms)
|
|||
{
|
||||
int i = 0;
|
||||
|
||||
vTaskDelay(10 / portTICK_RATE_MS); // 10ms delay
|
||||
vTaskDelay(pdMS_TO_TICKS(10)); // 10ms delay
|
||||
|
||||
for(i = 0; i < (wait_ms * 10); i++) {
|
||||
if(gpio_get_level(IL3820_BUSY_PIN) != IL3820_BUSY_LEVEL) {
|
||||
return;
|
||||
}
|
||||
|
||||
vTaskDelay(10 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(10));
|
||||
}
|
||||
|
||||
LV_LOG_ERROR("Busy exceeded %dms", i*10 );
|
||||
|
@ -404,9 +405,9 @@ static void il3820_reset(void)
|
|||
#if IL3820_USE_RST
|
||||
/* Harware reset */
|
||||
gpio_set_level( IL3820_RST_PIN, 0);
|
||||
vTaskDelay(IL3820_RESET_DELAY / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(IL3820_RESET_DELAY));
|
||||
gpio_set_level( IL3820_RST_PIN, 1);
|
||||
vTaskDelay(IL3820_RESET_DELAY / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(IL3820_RESET_DELAY));
|
||||
#endif
|
||||
|
||||
/* Software reset */
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
#include "ili9163c.h"
|
||||
#include "disp_spi.h"
|
||||
#include "driver/gpio.h"
|
||||
#include "rom/gpio.h"
|
||||
#include "freertos/FreeRTOS.h"
|
||||
#include "freertos/task.h"
|
||||
#include "assert.h"
|
||||
|
@ -144,7 +145,7 @@ void ili9163c_init(void)
|
|||
ili9163c_send_data(ili_init_cmds[cmd].data, ili_init_cmds[cmd].databytes & 0x1F);
|
||||
if (ili_init_cmds[cmd].databytes & 0x80)
|
||||
{
|
||||
vTaskDelay(150 / portTICK_RATE_MS);
|
||||
vTaskDelaypdMS_TO_TICKS(150);
|
||||
}
|
||||
cmd++;
|
||||
}
|
||||
|
@ -239,9 +240,9 @@ static void ili9163c_reset(void)
|
|||
{
|
||||
#if CONFIG_LV_DISP_USE_RST
|
||||
gpio_set_level(ILI9163C_RST, 0);
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
gpio_set_level(ILI9163C_RST, 1);
|
||||
vTaskDelay(150 / portTICK_RATE_MS);
|
||||
vTaskDelaypdMS_TO_TICKS(150);
|
||||
#else
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -81,7 +81,7 @@ void ili9481_init(void)
|
|||
ili9481_send_cmd(ili_init_cmds[cmd].cmd);
|
||||
ili9481_send_data(ili_init_cmds[cmd].data, ili_init_cmds[cmd].databytes&0x1F);
|
||||
if (ili_init_cmds[cmd].databytes & 0x80) {
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
}
|
||||
cmd++;
|
||||
}
|
||||
|
@ -195,12 +195,12 @@ static void ili9481_reset(void)
|
|||
{
|
||||
#if ILI9481_USE_RST
|
||||
gpio_set_level(ILI9481_RST, 0);
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
gpio_set_level(ILI9481_RST, 1);
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
#else
|
||||
// Exit sleep, software reset
|
||||
ili9481_send_cmd(0x01);
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -73,7 +73,7 @@ void ili9486_init(void)
|
|||
ili9486_send_cmd(ili_init_cmds[cmd].cmd);
|
||||
ili9486_send_data(ili_init_cmds[cmd].data, ili_init_cmds[cmd].databytes&0x1F);
|
||||
if (ili_init_cmds[cmd].databytes & 0x80) {
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
}
|
||||
cmd++;
|
||||
}
|
||||
|
@ -169,8 +169,8 @@ static void ili9486_reset(void)
|
|||
{
|
||||
#if ILI9486_USE_RST
|
||||
gpio_set_level(ILI9486_RST, 0);
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
gpio_set_level(ILI9486_RST, 1);
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
#include "ra8875.h"
|
||||
#include "disp_spi.h"
|
||||
#include "driver/gpio.h"
|
||||
#include "rom/gpio.h"
|
||||
#include "freertos/FreeRTOS.h"
|
||||
#include "freertos/task.h"
|
||||
|
||||
|
@ -284,21 +285,21 @@ void ra8875_sleep_in(void)
|
|||
ra8875_configure_clocks(false);
|
||||
|
||||
ra8875_write_cmd(RA8875_REG_PWRR, 0x00); // Power and Display Control Register (PWRR)
|
||||
vTaskDelay(DIV_ROUND_UP(20, portTICK_RATE_MS));
|
||||
vTaskDelay(DIV_ROUND_UP(20, portTICK_PERIOD_MS));
|
||||
ra8875_write_cmd(RA8875_REG_PWRR, 0x02); // Power and Display Control Register (PWRR)
|
||||
}
|
||||
|
||||
void ra8875_sleep_out(void)
|
||||
{
|
||||
ra8875_write_cmd(RA8875_REG_PWRR, 0x00); // Power and Display Control Register (PWRR)
|
||||
vTaskDelay(DIV_ROUND_UP(20, portTICK_RATE_MS));
|
||||
vTaskDelay(DIV_ROUND_UP(20, portTICK_PERIOD_MS));
|
||||
|
||||
ra8875_configure_clocks(true);
|
||||
|
||||
disp_spi_change_device_speed(-1);
|
||||
|
||||
ra8875_write_cmd(RA8875_REG_PWRR, 0x80); // Power and Display Control Register (PWRR)
|
||||
vTaskDelay(DIV_ROUND_UP(20, portTICK_RATE_MS));
|
||||
vTaskDelay(DIV_ROUND_UP(20, portTICK_PERIOD_MS));
|
||||
}
|
||||
|
||||
uint8_t ra8875_read_cmd(uint8_t cmd)
|
||||
|
@ -331,7 +332,7 @@ void ra8875_configure_clocks(bool high_speed)
|
|||
vTaskDelay(1);
|
||||
|
||||
ra8875_write_cmd(RA8875_REG_PCSR, PCSR_VAL); // Pixel Clock Setting Register (PCSR)
|
||||
vTaskDelay(DIV_ROUND_UP(20, portTICK_RATE_MS));
|
||||
vTaskDelay(DIV_ROUND_UP(20, portTICK_PERIOD_MS));
|
||||
}
|
||||
|
||||
static void ra8875_set_window(unsigned int xs, unsigned int xe, unsigned int ys, unsigned int ye)
|
||||
|
@ -370,8 +371,8 @@ static void ra8875_reset(void)
|
|||
{
|
||||
#if RA8875_USE_RST
|
||||
gpio_set_level(RA8875_RST, 0);
|
||||
vTaskDelay(DIV_ROUND_UP(100, portTICK_RATE_MS));
|
||||
vTaskDelay(DIV_ROUND_UP(100, portTICK_PERIOD_MS));
|
||||
gpio_set_level(RA8875_RST, 1);
|
||||
vTaskDelay(DIV_ROUND_UP(100, portTICK_RATE_MS));
|
||||
vTaskDelay(DIV_ROUND_UP(100, portTICK_PERIOD_MS));
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -102,7 +102,7 @@ void sh1107_init(void)
|
|||
sh1107_send_cmd(init_cmds[cmd].cmd);
|
||||
sh1107_send_data(init_cmds[cmd].data, init_cmds[cmd].databytes&0x1F);
|
||||
if (init_cmds[cmd].databytes & 0x80) {
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
}
|
||||
cmd++;
|
||||
}
|
||||
|
@ -250,8 +250,8 @@ static void sh1107_reset(void)
|
|||
{
|
||||
#if SH1107_USE_RST
|
||||
gpio_set_level(SH1107_RST, 0);
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
gpio_set_level(SH1107_RST, 1);
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -109,7 +109,7 @@ void st7735s_init(void)
|
|||
st7735s_send_cmd(init_cmds[cmd].cmd);
|
||||
st7735s_send_data(init_cmds[cmd].data, init_cmds[cmd].databytes&0x1F);
|
||||
if (init_cmds[cmd].databytes & 0x80) {
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
}
|
||||
cmd++;
|
||||
}
|
||||
|
@ -219,9 +219,9 @@ static void st7735s_reset(void)
|
|||
{
|
||||
#if ST7735S_USE_RST
|
||||
gpio_set_level(ST7735S_RST, 0);
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
gpio_set_level(ST7735S_RST, 1);
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
@ -92,7 +92,7 @@ void st7796s_init(void)
|
|||
st7796s_send_data(init_cmds[cmd].data, init_cmds[cmd].databytes & 0x1F);
|
||||
if (init_cmds[cmd].databytes & 0x80)
|
||||
{
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
}
|
||||
cmd++;
|
||||
}
|
||||
|
@ -203,8 +203,8 @@ static void st7796s_reset(void)
|
|||
{
|
||||
#if ST7796S_USE_RST
|
||||
gpio_set_level(ST7796S_RST, 0);
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
gpio_set_level(ST7796S_RST, 1);
|
||||
vTaskDelay(100 / portTICK_RATE_MS);
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
#endif
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue