board: code clean up

Author: redchenjs

main/Kconfig.projbuild

@@ -126,18 +126,18 @@ config SCREEN_PANEL_ST7789
     bool "ST7789 135x240 LCD Panel"
 endchoice
 
-config SCREEN_PANEL_RST_PIN
-    int "Screen Panel RST Pin"
+config DEVICE_RST_PIN
+    int "Device RST Pin"
     default 14
     depends on ENABLE_GUI
 
-config SCREEN_PANEL_DC_PIN
-    int "Screen Panel DC Pin"
+config DEVICE_DC_PIN
+    int "Device DC Pin"
     default 23
     depends on ENABLE_GUI
 
-config SCREEN_PANEL_BL_PIN
-    int "Screen Panel BL Pin"
+config DEVICE_BL_PIN
+    int "Device BL Pin"
     default 4
     depends on ENABLE_GUI
 

main/src/board/st7735.c

@@ -26,10 +26,10 @@ void st7735_init_board(void)
 {
     memset(hspi_trans, 0x00, sizeof(hspi_trans));
 
-    gpio_set_direction(CONFIG_SCREEN_PANEL_DC_PIN,  GPIO_MODE_OUTPUT);
-    gpio_set_direction(CONFIG_SCREEN_PANEL_RST_PIN, GPIO_MODE_OUTPUT);
-    gpio_set_level(CONFIG_SCREEN_PANEL_DC_PIN,  0);
-    gpio_set_level(CONFIG_SCREEN_PANEL_RST_PIN, 0);
+    gpio_set_direction(CONFIG_DEVICE_DC_PIN,  GPIO_MODE_OUTPUT);
+    gpio_set_direction(CONFIG_DEVICE_RST_PIN, GPIO_MODE_OUTPUT);
+    gpio_set_level(CONFIG_DEVICE_DC_PIN,  0);
+    gpio_set_level(CONFIG_DEVICE_RST_PIN, 0);
 
     ledc_timer_config_t ledc_timer = {
         .duty_resolution = LEDC_TIMER_8_BIT,
@@ -43,7 +43,7 @@ void st7735_init_board(void)
     ledc_channel_config_t ledc_channel = {
         .channel    = LEDC_CHANNEL_0,
         .duty       = 0,
-        .gpio_num   = CONFIG_SCREEN_PANEL_BL_PIN,
+        .gpio_num   = CONFIG_DEVICE_BL_PIN,
         .speed_mode = LEDC_HIGH_SPEED_MODE,
         .hpoint     = 0,
         .timer_sel  = LEDC_TIMER_0,
@@ -52,7 +52,7 @@ void st7735_init_board(void)
 
     ledc_fade_func_install(0);
 
-    ESP_LOGI(TAG, "initialized, bl: %d, dc: %d, rst: %d", CONFIG_SCREEN_PANEL_BL_PIN, CONFIG_SCREEN_PANEL_DC_PIN, CONFIG_SCREEN_PANEL_RST_PIN);
+    ESP_LOGI(TAG, "initialized, bl: %d, dc: %d, rst: %d", CONFIG_DEVICE_BL_PIN, CONFIG_DEVICE_DC_PIN, CONFIG_DEVICE_RST_PIN);
 }
 
 void st7735_set_backlight(uint8_t val)
@@ -64,12 +64,13 @@ void st7735_set_backlight(uint8_t val)
 void st7735_setpin_dc(spi_transaction_t *t)
 {
     int dc = (int)t->user;
-    gpio_set_level(CONFIG_SCREEN_PANEL_DC_PIN, dc);
+
+    gpio_set_level(CONFIG_DEVICE_DC_PIN, dc);
 }
 
 void st7735_setpin_reset(uint8_t val)
 {
-    gpio_set_level(CONFIG_SCREEN_PANEL_RST_PIN, val);
+    gpio_set_level(CONFIG_DEVICE_RST_PIN, val);
 }
 
 void st7735_write_cmd(uint8_t cmd)
@@ -106,13 +107,12 @@ void st7735_refresh_gram(uint8_t *gram)
     hspi_trans[0].user = (void*)0;
     hspi_trans[0].flags = SPI_TRANS_USE_TXDATA;
 
+    spi_device_queue_trans(hspi, &hspi_trans[0], portMAX_DELAY);
+
     hspi_trans[1].length = ST7735_SCREEN_WIDTH*ST7735_SCREEN_HEIGHT*2*8;
     hspi_trans[1].tx_buffer = gram;
     hspi_trans[1].user = (void*)1;
 
-    // Queue all transactions.
-    for (int x=0; x<2; x++) {
-        spi_device_queue_trans(hspi, &hspi_trans[x], portMAX_DELAY);
-    }
+    spi_device_queue_trans(hspi, &hspi_trans[1], portMAX_DELAY);
 }
 #endif

main/src/board/st7789.c

@@ -26,10 +26,10 @@ void st7789_init_board(void)
 {
     memset(hspi_trans, 0x00, sizeof(hspi_trans));
 
-    gpio_set_direction(CONFIG_SCREEN_PANEL_DC_PIN,  GPIO_MODE_OUTPUT);
-    gpio_set_direction(CONFIG_SCREEN_PANEL_RST_PIN, GPIO_MODE_OUTPUT);
-    gpio_set_level(CONFIG_SCREEN_PANEL_DC_PIN,  0);
-    gpio_set_level(CONFIG_SCREEN_PANEL_RST_PIN, 0);
+    gpio_set_direction(CONFIG_DEVICE_DC_PIN,  GPIO_MODE_OUTPUT);
+    gpio_set_direction(CONFIG_DEVICE_RST_PIN, GPIO_MODE_OUTPUT);
+    gpio_set_level(CONFIG_DEVICE_DC_PIN,  0);
+    gpio_set_level(CONFIG_DEVICE_RST_PIN, 0);
 
     ledc_timer_config_t ledc_timer = {
         .duty_resolution = LEDC_TIMER_8_BIT,
@@ -43,7 +43,7 @@ void st7789_init_board(void)
     ledc_channel_config_t ledc_channel = {
         .channel    = LEDC_CHANNEL_0,
         .duty       = 0,
-        .gpio_num   = CONFIG_SCREEN_PANEL_BL_PIN,
+        .gpio_num   = CONFIG_DEVICE_BL_PIN,
         .speed_mode = LEDC_HIGH_SPEED_MODE,
         .hpoint     = 0,
         .timer_sel  = LEDC_TIMER_0,
@@ -52,7 +52,7 @@ void st7789_init_board(void)
 
     ledc_fade_func_install(0);
 
-    ESP_LOGI(TAG, "initialized, bl: %d, dc: %d, rst: %d", CONFIG_SCREEN_PANEL_BL_PIN, CONFIG_SCREEN_PANEL_DC_PIN, CONFIG_SCREEN_PANEL_RST_PIN);
+    ESP_LOGI(TAG, "initialized, bl: %d, dc: %d, rst: %d", CONFIG_DEVICE_BL_PIN, CONFIG_DEVICE_DC_PIN, CONFIG_DEVICE_RST_PIN);
 }
 
 void st7789_set_backlight(uint8_t val)
@@ -64,12 +64,13 @@ void st7789_set_backlight(uint8_t val)
 void st7789_setpin_dc(spi_transaction_t *t)
 {
     int dc = (int)t->user;
-    gpio_set_level(CONFIG_SCREEN_PANEL_DC_PIN, dc);
+
+    gpio_set_level(CONFIG_DEVICE_DC_PIN, dc);
 }
 
 void st7789_setpin_reset(uint8_t val)
 {
-    gpio_set_level(CONFIG_SCREEN_PANEL_RST_PIN, val);
+    gpio_set_level(CONFIG_DEVICE_RST_PIN, val);
 }
 
 void st7789_write_cmd(uint8_t cmd)
@@ -106,13 +107,12 @@ void st7789_refresh_gram(uint8_t *gram)
     hspi_trans[0].user = (void*)0;
     hspi_trans[0].flags = SPI_TRANS_USE_TXDATA;
 
+    spi_device_queue_trans(hspi, &hspi_trans[0], portMAX_DELAY);
+
     hspi_trans[1].length = ST7789_SCREEN_WIDTH*ST7789_SCREEN_HEIGHT*2*8;
     hspi_trans[1].tx_buffer = gram;
     hspi_trans[1].user = (void*)1;
 
-    // Queue all transactions.
-    for (int x=0; x<2; x++) {
-        spi_device_queue_trans(hspi, &hspi_trans[x], portMAX_DELAY);
-    }
+    spi_device_queue_trans(hspi, &hspi_trans[1], portMAX_DELAY);
 }
 #endif