diff --git a/shared-module/epaperdisplay/epaper_core.c b/shared-module/epaperdisplay/epaper_core.c index a053b73b5b4..299488c626d 100644 --- a/shared-module/epaperdisplay/epaper_core.c +++ b/shared-module/epaperdisplay/epaper_core.c @@ -416,11 +416,13 @@ void epaperdisplay_epaper_core_background(epaperdisplay_epaper_core_t *self) { self->refreshing = false; #if CIRCUITPY_EPAPERDISPLAY_FAST if (!self->fast) { - // Run stop sequence but don't wait for busy because busy is set when sleeping. + // Run stop sequence but don't wait for busy after it, because some panels set busy + // when sleeping. epaperdisplay_epaper_core_send_command_sequence(self, false, self->stop_sequence, self->stop_sequence_len); } #else - // Run stop sequence but don't wait for busy because busy is set when sleeping. + // Run stop sequence but don't wait for busy after it, because some panels set busy + // when sleeping. epaperdisplay_epaper_core_send_command_sequence(self, false, self->stop_sequence, self->stop_sequence_len); #endif } diff --git a/shared-module/epaperdisplay/legacy/EPaperDisplay.c b/shared-module/epaperdisplay/legacy/EPaperDisplay.c index 979042b57d6..725c42ab96f 100644 --- a/shared-module/epaperdisplay/legacy/EPaperDisplay.c +++ b/shared-module/epaperdisplay/legacy/EPaperDisplay.c @@ -409,11 +409,13 @@ bool common_hal_epaperdisplay_epaperdisplay_refresh(epaperdisplay_epaperdisplay_ self->epaper.refreshing = false; #if CIRCUITPY_EPAPERDISPLAY_FAST if (!self->epaper.fast) { - // Run stop sequence but don't wait for busy because busy is set when sleeping. + // Run stop sequence but don't wait for busy after it, because some panels set busy + // when sleeping. epaperdisplay_epaper_core_send_command_sequence(&self->epaper, false, self->epaper.stop_sequence, self->epaper.stop_sequence_len); } #else - // Run stop sequence but don't wait for busy because busy is set when sleeping. + // Run stop sequence but don't wait for busy after it, because some panels set busy + // when sleeping. epaperdisplay_epaper_core_send_command_sequence(&self->epaper, false, self->epaper.stop_sequence, self->epaper.stop_sequence_len); #endif } else { @@ -477,10 +479,15 @@ void release_epaperdisplay(epaperdisplay_epaperdisplay_obj_t *self) { epaperdisplay_lag_free(&self->epaper); #endif // CIRCUITPY_EPAPERDISPLAY_FAST if (self->epaper.refreshing) { - epaperdisplay_epaper_core_wait_for_busy(&self->epaper); + // Mark the refresh as done before waiting for busy. Otherwise the background task could + // end the refresh during the wait by running the stop sequence, and on panels that set + // busy when sleeping, such as the SSD1680, the wait would never end. supervisor_disable_tick(); self->epaper.refreshing = false; - // Run stop sequence but don't wait for busy because busy is set when sleeping. + epaperdisplay_epaper_core_wait_for_busy(&self->epaper); + + // Run stop sequence but don't wait for busy after it, because some panels set busy when + // sleeping. #if CIRCUITPY_EPAPERDISPLAY_FAST if (self->epaper.fast) { epaperdisplay_epaper_core_send_stop_sequence_guarded(&self->epaper); diff --git a/shared-module/epaperdisplay/lvgl/EPaperDisplay.c b/shared-module/epaperdisplay/lvgl/EPaperDisplay.c index eb9a1459f5f..69ecc180586 100644 --- a/shared-module/epaperdisplay/lvgl/EPaperDisplay.c +++ b/shared-module/epaperdisplay/lvgl/EPaperDisplay.c @@ -712,11 +712,13 @@ bool common_hal_epaperdisplay_epaperdisplay_refresh(epaperdisplay_epaperdisplay_ self->epaper.refreshing = false; #if CIRCUITPY_EPAPERDISPLAY_FAST if (!self->epaper.fast) { - // Run stop sequence but don't wait for busy because busy is set when sleeping. + // Run stop sequence but don't wait for busy after it, because some panels set busy + // when sleeping. epaperdisplay_epaper_core_send_command_sequence(&self->epaper, false, self->epaper.stop_sequence, self->epaper.stop_sequence_len); } #else - // Run stop sequence but don't wait for busy because busy is set when sleeping. + // Run stop sequence but don't wait for busy after it, because some panels set busy + // when sleeping. epaperdisplay_epaper_core_send_command_sequence(&self->epaper, false, self->epaper.stop_sequence, self->epaper.stop_sequence_len); #endif } else { @@ -817,10 +819,15 @@ void release_epaperdisplay(epaperdisplay_epaperdisplay_obj_t *self) { epaperdisplay_lag_free(&self->epaper); #endif // CIRCUITPY_EPAPERDISPLAY_FAST if (self->epaper.refreshing) { - epaperdisplay_epaper_core_wait_for_busy(&self->epaper); + // Mark the refresh as done before waiting for busy. Otherwise the background task could + // end the refresh during the wait by running the stop sequence, and on panels that set + // busy when sleeping, such as the SSD1680, the wait would never end. supervisor_disable_tick(); self->epaper.refreshing = false; - // Run stop sequence but don't wait for busy because busy is set when sleeping. + epaperdisplay_epaper_core_wait_for_busy(&self->epaper); + + // Run stop sequence but don't wait for busy after it, because some panels set busy when + // sleeping. #if CIRCUITPY_EPAPERDISPLAY_FAST if (self->epaper.fast) { epaperdisplay_epaper_core_send_stop_sequence_guarded(&self->epaper);