LV_VDB_TRUE_DOUBLE_BUFFERED: improvements

lv_core/lv_refr.c

@@ -191,14 +191,10 @@ static void lv_refr_task(void * param)
 
     lv_refr_areas();
 
-    bool refr_done = false;
+    /*If refresh happened ...*/
-    if(inv_buf_p != 0) refr_done = true;
+    if(inv_buf_p != 0) {
-    memset(inv_buf, 0, sizeof(inv_buf));
-    inv_buf_p = 0;
 
-    /* In the callback lv_obj_inv can occur
+        /*In true double buffered mode copy the refreshed areas to the new VDB to keep it up to date*/
-     * therefore be sure the inv_buf is cleared prior to it*/
-    if(refr_done) {
 #if LV_VDB_TRUE_DOUBLE_BUFFERED
         lv_vdb_t * vdb_p = lv_vdb_get();
         vdb_p->area.x1 = 0;
@@ -208,9 +204,41 @@ static void lv_refr_task(void * param)
 
         /*Flush the content of the VDB*/
         lv_vdb_flush();
+
+        /* With true double buffering the flushing should be only the address change of the current frame buffer
+         * Wait until the address change is ready and copy the active content to the other frame buffer (new active VDB)
+         * The changes will be written to the new VDB.*/
+        //            while(vdb_flushing);
+        lv_vdb_t * vdb_act = lv_vdb_get_active();
+        lv_vdb_t * vdb_ina = lv_vdb_get_inactive();
+
+        uint8_t * buf_act = (uint8_t *) vdb_act->buf;
+        uint8_t * buf_inv = (uint8_t *) vdb_ina->buf;
+
+
+        uint16_t a;
+        for(a = 0; a < inv_buf_p; a++) {
+            if(inv_buf[a].joined == 0) {
+                lv_coord_t y;
+                uint32_t start_offs = ((LV_HOR_RES * inv_buf[a].area.y1 + inv_buf[a].area.x1) * LV_VDB_PX_BPP) >> 3;
+                uint32_t line_length = (lv_area_get_width(&inv_buf[a].area) * LV_VDB_PX_BPP) >> 3;
+
+                for(y = inv_buf[a].area.y1; y <= inv_buf[a].area.y2; y++) {
+
+                    memcpy(buf_act + start_offs, buf_inv + start_offs, line_length);
+
+                    start_offs += (LV_HOR_RES * LV_VDB_PX_BPP) >> 3;
+                }
+            }
+        }
+
 #endif
 
+        /*Clean up*/
+        memset(inv_buf, 0, sizeof(inv_buf));
+        inv_buf_p = 0;
 
+        /*Call monitor cb if present*/
         if(monitor_cb != NULL) {
             monitor_cb(lv_tick_elaps(start), px_num);
         }

lv_core/lv_vdb.c

@@ -118,14 +118,6 @@ void lv_vdb_flush(void)
         memset(vdb[vdb_active].buf, 0x00, LV_VDB_SIZE_IN_BYTES);
 #  endif  /*LV_COLOR_SCREEN_TRANSP*/
 
-    /* With true double buffering the flushing should be only the address change of the current frame buffer
-     * Wait until the address change is ready and copy the active content to the other frame buffer (new active VDB)
-     * The changes will be written to the new VDB.*/
-#  if LV_VDB_TRUE_DOUBLE_BUFFERED
-        while(vdb_flushing);
-        memcpy(vdb[vdb_active].buf, vdb[(vdb_active + 1) & 0x1].buf, LV_VDB_SIZE_IN_BYTES);
-#  endif
-
 #endif  /*#if LV_VDB_DOUBLE*/
 
 }
@@ -160,6 +152,34 @@ LV_ATTRIBUTE_FLUSH_READY void lv_flush_ready(void)
 #endif
 }
 
+/**
+ * Get currently active VDB, where the drawing happens. Used with `LV_VDB_DOUBLE  1`
+ * @return pointer to the active VDB. If `LV_VDB_DOUBLE  0` give the single VDB
+ */
+lv_vdb_t * lv_vdb_get_active(void)
+{
+    return &vdb[vdb_active];
+}
+
+/**
+ * Get currently inactive VDB, which is being displayed or being flushed. Used with `LV_VDB_DOUBLE  1`
+ * @return pointer to the inactive VDB. If `LV_VDB_DOUBLE  0` give the single VDB
+ */
+lv_vdb_t * lv_vdb_get_inactive(void)
+{
+    return &vdb[(vdb_active + 1) & 0x1];
+
+}
+
+/**
+ * Whether the flushing is in progress or not
+ * @return true: flushing is in progress; false: flushing ready
+ */
+bool lv_vdb_is_flushing(void)
+{
+    return vdb_flushing;
+}
+
 /**********************
  *   STATIC FUNCTIONS
  **********************/

lv_core/lv_vdb.h

@@ -85,6 +85,24 @@ void lv_vdb_set_adr(void * buf1, void * buf2);
  */
 void lv_flush_ready(void);
 
+/**
+ * Get currently active VDB, where the drawing happens. Used with `LV_VDB_DOUBLE  1`
+ * @return pointer to the active VDB. If `LV_VDB_DOUBLE  0` give the single VDB
+ */
+lv_vdb_t * lv_vdb_get_active(void);
+
+/**
+ * Get currently inactive VDB, which is being displayed or being flushed. Used with `LV_VDB_DOUBLE  1`
+ * @return pointer to the inactive VDB. If `LV_VDB_DOUBLE  0` give the single VDB
+ */
+lv_vdb_t * lv_vdb_get_inactive(void);
+
+/**
+ * Whether the flushing is in progress or not
+ * @return true: flushing is in progress; false: flushing ready
+ */
+bool lv_vdb_is_flushing(void);
+
 /**********************
  *      MACROS
  **********************/