Merge pull request #101 from kennygarreau/dma-branch

add DMA display capability

Author: lewisxhe

src/LV_Helper.cpp

@@ -30,6 +30,16 @@ static void disp_flush( lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color
     lv_disp_flush_ready( disp_drv );
 }
 
+static void disp_flushDMA( lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p )
+{
+    uint32_t w = ( area->x2 - area->x1 + 1 );
+    uint32_t h = ( area->y2 - area->y1 + 1 );
+    static_cast<LilyGo_Display *>(disp_drv->user_data)->setAddrWindow(area->x1, area->y1, area->x2, area->y2);
+    static_cast<LilyGo_Display *>(disp_drv->user_data)->pushColorsDMA((uint16_t *)color_p, w * h);
+
+    lv_disp_flush_ready( disp_drv );
+}
+
 /*Read the touchpad*/
 static void touchpad_read( lv_indev_drv_t *indev_driver, lv_indev_data_t *data )
 {
@@ -109,6 +119,52 @@ static void lv_rounder_cb(lv_disp_drv_t *disp_drv, lv_area_t *area)
         area->y2++;
 }
 
+void beginLvglHelperDMA(LilyGo_Display &board, bool debug) {
+    lv_init();
+
+#if LV_USE_LOG
+    if (debug) {
+        lv_log_register_print_cb(lv_log_print_g_cb);
+    }
+#endif
+
+    size_t lv_buffer_size = (board.width() * board.height() / 10) * sizeof(lv_color_t);
+
+    lv_color_t *buf1 = (lv_color_t *)heap_caps_malloc(lv_buffer_size, MALLOC_CAP_DMA);
+    lv_color_t *buf2 = (lv_color_t *)heap_caps_malloc(lv_buffer_size, MALLOC_CAP_DMA);
+
+    assert (buf1 && buf2);
+
+    if (!esp_ptr_dma_capable(buf1) || !esp_ptr_dma_capable(buf2)) {
+        Serial.println("Error: Buffers are not DMA-capable!");
+    }
+
+    /*Initialize the display*/
+    lv_disp_drv_init( &disp_drv );
+    /* display resolution */
+    disp_drv.hor_res = board.width();
+    disp_drv.ver_res = board.height();
+    disp_drv.flush_cb = disp_flushDMA;
+    disp_drv.draw_buf = &draw_buf;
+    bool full_refresh = board.needFullRefresh();
+    disp_drv.full_refresh = full_refresh;
+    disp_drv.user_data = &board;
+    if (!full_refresh) {
+        disp_drv.rounder_cb = lv_rounder_cb;
+    }
+    lv_disp_drv_register( &disp_drv );
+
+    if (board.hasTouch()) {
+        lv_indev_drv_init( &indev_drv );
+        indev_drv.type = LV_INDEV_TYPE_POINTER;
+        indev_drv.read_cb = touchpad_read;
+        indev_drv.user_data = &board;
+        lv_indev_drv_register( &indev_drv );
+    }
+
+    lv_group_set_default(lv_group_create());
+}
+
 void beginLvglHelper(LilyGo_Display &board, bool debug)
 {
 

src/LV_Helper.h

@@ -14,7 +14,7 @@
 
 
 void beginLvglHelper(LilyGo_Display &board, bool debug = false);
-
+void beginLvglHelperDMA(LilyGo_Display &board, bool debug);
 void beginLvglInputDevice(struct InputParams prams);
 
 

src/LilyGo_AMOLED.cpp

@@ -971,6 +971,53 @@ void LilyGo_AMOLED::pushColors(uint16_t x, uint16_t y, uint16_t width, uint16_t
     }
 }
 
+void LilyGo_AMOLED::pushColorsDMA(uint16_t *data, uint32_t len) {
+    if (!spi) return;
+
+    bool first_send = true;
+    setCS();
+
+    while (len > 0) {
+        size_t chunk_size = len;
+        if (chunk_size > SEND_BUF_SIZE) {
+            chunk_size = SEND_BUF_SIZE;
+        }
+
+        spi_transaction_ext_t t = {0};
+        memset(&t, 0, sizeof(t));
+
+        if (first_send) {
+            t.base.flags = SPI_TRANS_MODE_QIO;
+            t.base.cmd = 0x32;
+            t.base.addr = 0x002C00;
+            first_send = 0;
+        } else {
+            t.base.flags = SPI_TRANS_MODE_QIO | SPI_TRANS_VARIABLE_CMD | SPI_TRANS_VARIABLE_ADDR | SPI_TRANS_VARIABLE_DUMMY;
+            t.command_bits = 0;
+            t.address_bits = 0;
+            t.dummy_bits = 0;
+        }
+
+        t.base.tx_buffer = data;
+        t.base.length = chunk_size * 16;
+
+        esp_err_t ret = spi_device_queue_trans(spi, &t.base, portMAX_DELAY);
+        if (ret != ESP_OK) {
+            log_e("DMA transfer failed!");
+        }
+
+        spi_transaction_t *trans_result;
+        ret = spi_device_get_trans_result(spi, &trans_result, portMAX_DELAY);
+        if (ret != ESP_OK) {
+            log_e("DMA SPI transfer failed!");
+        }
+
+        data += chunk_size;
+        len -= chunk_size;
+    }
+
+    clrCS();
+}
 
 void LilyGo_AMOLED::beginCore()
 {

src/LilyGo_AMOLED.h

@@ -353,6 +353,7 @@ class LilyGo_AMOLED:
     void setAddrWindow(uint16_t xs, uint16_t ys, uint16_t xe, uint16_t ye);
     void pushColors(uint16_t *data, uint32_t len);
     void pushColors(uint16_t x, uint16_t y, uint16_t width, uint16_t hight, uint16_t *data);
+    void pushColorsDMA(uint16_t *data, uint32_t len);
 
     /**
      * @brief   Hang on SD card

src/LilyGo_Display.h

@@ -24,6 +24,7 @@ class LilyGo_Display
     virtual void setAddrWindow(uint16_t xs, uint16_t ys, uint16_t xe, uint16_t ye) = 0;
     virtual void pushColors(uint16_t *data, uint32_t len) = 0;
     virtual void pushColors(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t *data) = 0;
+    virtual void pushColorsDMA(uint16_t *data, uint32_t len) = 0;
     virtual uint16_t  width() = 0;
     virtual uint16_t  height() = 0;