waveform bin reader supports file ystem.

Author: yxGC

epdiy-epub/src/boards/display_dbi/epd_configs_opm060d.c

@@ -112,26 +112,49 @@ void epd_wave_table_fill_lut(uint32_t *p_epic_lut, uint32_t frame_num)
 
 #include "mem_map.h"
 #include "epd_waveform_bin_reader.h"
+#include "drv_flash.h"
 #ifndef CUSTOM_EPD_WAVE_TABLE_START_ADDR
 #error "CUSTOM_EPD_WAVE_TABLE_START_ADDR is not defined!!!"
 #endif
-
 void epd_wave_table(void)
 {
-    int ret = waveform_bin_reader_init(CUSTOM_EPD_WAVE_TABLE_START_ADDR, CUSTOM_EPD_WAVE_TABLE_SIZE);
+    static uint8_t initialized = 0;
 
-    if(ret != 0)
+    if(0 == initialized)
     {
-        rt_kprintf("Failed to initialize custom EPD wave table reader! err=%d\n", ret);
+        int ret = waveform_bin_reader_init(CUSTOM_EPD_WAVE_TABLE_SIZE);
+
+        if(ret != 0)
+        {
+            rt_kprintf("Failed to initialize custom EPD wave table reader! err=%d\n", ret);
+        }
+        else
+        {
+            initialized = 1;
+        }
     }
 }
 
 uint32_t epd_wave_table_get_frames(int temperature, EpdDrawMode mode)
 {
     uint32_t frames;
 
-    frames = waveform_bin_reader_get_frames(temperature, mode);
+    //Convert EpdDrawMode to WAVE_TABLE_MODE_T
+    WAVE_TABLE_MODE_T wave_table_mode;
+    switch(mode) {
+        case EPD_DRAW_MODE_FULL:
+            wave_table_mode = WAVE_MODE_FULL;
+            break;
+        case EPD_DRAW_MODE_PARTIAL:
+            wave_table_mode = WAVE_MODE_PARTIAL;
+            break;
+        default:
+            rt_kprintf("Unknown EPD draw mode: %d, use WAVE_MODE_FULL mode\n", mode);
+            wave_table_mode = WAVE_MODE_FULL;
+            break;
+    }
 
+    frames = waveform_bin_reader_get_frames(temperature, wave_table_mode);
     return frames;
 }
 
@@ -140,6 +163,32 @@ void epd_wave_table_fill_lut(uint32_t *p_epic_lut, uint32_t frame_num)
     waveform_bin_reader_fill_lut(p_epic_lut, frame_num);
 }
 
+int waveform_bin_reader_read_data(uint32_t offset, uint8_t *buf, uint32_t size)
+{
+    int read_size = 0;
+    #ifdef BSP_USING_SPI_NAND
+        read_size = rt_nand_read(CUSTOM_EPD_WAVE_TABLE_START_ADDR + offset,buf,size);
+    #else
+        read_size = rt_flash_read(CUSTOM_EPD_WAVE_TABLE_START_ADDR + offset,buf,size);
+    #endif
+
+    if (read_size != size) {
+        rt_kprintf("Failed to read data at offset 0x%08X, expected %d bytes, got %zu bytes\n", offset, size, read_size);
+        return -1;
+    }
+
+    return read_size;
+}
+void *waveform_bin_reader_malloc(size_t size)
+{
+    return rt_malloc(size);
+}
+
+void waveform_bin_reader_free(void *ptr)
+{
+    rt_free(ptr);
+}
+
 #endif /*EPD_WAVEFORM_USE_BIN*/
 
 uint16_t epd_get_vcom_voltage(void)

epdiy-epub/waveform/SConscript

@@ -10,7 +10,7 @@ inc = [cwd]
 obj = []
 lib = []
 
-if os.path.isfile(os.path.join(cwd, 'epd_waveform_bin_reader_rvds.lib')):
+if os.path.isfile(os.path.join(cwd, 'epd_waveform_bin_reader_rvds.lib')) or os.path.isfile(os.path.join(cwd, 'libepd_waveform_bin_reader_gcc.a')):
     lib = [GroupLibName("epd_waveform_bin_reader")]
 else:
     src = src + Glob('*.c')

epdiy-epub/waveform/epd_waveform.bin

@@ -5,12 +5,28 @@ typedef enum{
     EPD_WAVEFORM_ERR_OK = 0,
     EPD_WAVEFORM_ERR_INVALID_MAGIC_NUMBER = -1,
     EPD_WAVEFORM_ERR_INVALID_VERSION = -2,
-    EPD_WAVEFORM_ERR_INVALID_FULL_TABLE_OFFSET = -3,
+    EPD_WAVEFORM_ERR_MALLOC_FAILED = -3,
+    EPD_WAVEFORM_ERR_READ_FAILED = -4,
+    EPD_WAVEFORM_ERR_INVALID_FIRST_TABLE_OFFSET = -10, //-10 ~ -25 for mode 0~15
 
-    EPD_WAVEFORM_ERR_INVALID_PARTIAL_TABLE_OFFSET = -4,
+    EPD_WAVEFORM_ERR_INVALID_TABLE_OFFSET       = -1000, //
 }EPD_WAVEFORM_ERR_TYPEDEF;
 
 
-int waveform_bin_reader_init(uint32_t addr, uint32_t max_size);
-uint32_t waveform_bin_reader_get_frames(int temperature, EpdDrawMode mode);
-void waveform_bin_reader_fill_lut(uint32_t *p_epic_lut, uint32_t frame_num);
+typedef enum{
+    WAVE_MODE_NONE    = 0,
+    WAVE_MODE_PARTIAL = 1,
+    WAVE_MODE_FULL    = 2,
+    /* 2~15 为待确定的波形模式 */
+    WAVE_MODE_MAX = 16
+} WAVE_TABLE_MODE_T;
+
+int waveform_bin_reader_init(uint32_t max_size);
+uint32_t waveform_bin_reader_get_frames(int temperature, WAVE_TABLE_MODE_T mode);
+void waveform_bin_reader_fill_lut(uint32_t *p_epic_lut, uint32_t frame_num);
+
+
+/* 依赖外部接口 */
+extern int waveform_bin_reader_read_data(uint32_t offset, uint8_t *buf, uint32_t size);
+extern void *waveform_bin_reader_malloc(size_t size);
+extern void waveform_bin_reader_free(void *ptr);