Merge pull request #48 from mcer12/master

deinit function
vroland · Dec 7, 2020 · 331383c · 331383c
2 parents 86dc98a + 48ab585
commit 331383c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/components/epd_driver/ed097oc4.c b/components/epd_driver/ed097oc4.c
@@ -88,6 +88,11 @@ void epd_poweron() { cfg_poweron(&config_reg); }
 
 void epd_poweroff() { cfg_poweroff(&config_reg); }
 
+void epd_base_deinit(){
+  epd_poweroff();
+  i2s_deinit();
+}
+
 void epd_start_frame() {
   while (i2s_is_busy() || rmt_busy()) {
   };

diff --git a/components/epd_driver/ed097oc4.h b/components/epd_driver/ed097oc4.h
@@ -27,6 +27,7 @@
 #define D0 GPIO_NUM_33
 
 void epd_base_init(uint32_t epd_row_width);
+void epd_base_deinit();
 void epd_poweron();
 void epd_poweroff();
 

diff --git a/components/epd_driver/epd_driver.c b/components/epd_driver/epd_driver.c
@@ -939,3 +939,7 @@ void epd_init() {
   assert(conversion_lut != NULL);
   output_queue = xQueueCreate(32, EPD_WIDTH / 2);
 }
+
+void epd_deinit(){
+  epd_base_deinit();
+}
diff --git a/components/epd_driver/i2s_data_bus.c b/components/epd_driver/i2s_data_bus.c
@@ -250,6 +250,7 @@ void i2s_deinit() {
   free(i2s_state.buf_b);
   free((void *)i2s_state.dma_desc_a);
   free((void *)i2s_state.dma_desc_b);
-
+
+  rtc_clk_apll_enable(0, 0, 0, 8, 0);
   periph_module_disable(PERIPH_I2S1_MODULE);
 }
diff --git a/components/epd_driver/include/epd_driver.h b/components/epd_driver/include/epd_driver.h
@@ -81,6 +81,9 @@ typedef struct {
 /** Initialize the ePaper display */
 void epd_init();
 
+/** Deinit the ePaper display */
+void epd_deinit();
+
 /** Enable display power supply. */
 void epd_poweron();