Skip to content

Commit

Permalink
fix: sdmount fail after USB storage
Browse files Browse the repository at this point in the history
  • Loading branch information
3djc committed Jun 30, 2024
1 parent 2aa011b commit 1cf9ee4
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 20 deletions.
39 changes: 20 additions & 19 deletions radio/src/gui/colorlcd/lcd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,25 +104,26 @@ static void flushLcd(lv_disp_drv_t* disp_drv, const lv_area_t* area,
#if defined(RADIO_F16)
if (hardwareOptions.pcbrev > 0)
#endif
{
uint16_t* src = (uint16_t*)color_p;
uint16_t* dst = nullptr;
if ((uint16_t*)color_p == LCD_FIRST_FRAME_BUFFER)
dst = LCD_SECOND_FRAME_BUFFER;
else
dst = LCD_FIRST_FRAME_BUFFER;

lv_disp_t* disp = _lv_refr_get_disp_refreshing();
for (int i = 0; i < disp->inv_p; i++) {
if (disp->inv_area_joined[i]) continue;

const lv_area_t& refr_area = disp->inv_areas[i];

auto area_w = refr_area.x2 - refr_area.x1 + 1;
auto area_h = refr_area.y2 - refr_area.y1 + 1;

DMACopyBitmap(dst, LCD_W, LCD_H, refr_area.x1, refr_area.y1, src, LCD_W,
LCD_H, refr_area.x1, refr_area.y1, area_w, area_h);
{
uint16_t *src = (uint16_t *) color_p;
uint16_t *dst = nullptr;
if ((uint16_t *) color_p == LCD_FIRST_FRAME_BUFFER)
dst = LCD_SECOND_FRAME_BUFFER;
else
dst = LCD_FIRST_FRAME_BUFFER;

lv_disp_t *disp = _lv_refr_get_disp_refreshing();
for (int i = 0; i < disp->inv_p; i++) {
if (disp->inv_area_joined[i]) continue;

const lv_area_t &refr_area = disp->inv_areas[i];

auto area_w = refr_area.x2 - refr_area.x1 + 1;
auto area_h = refr_area.y2 - refr_area.y1 + 1;

DMACopyBitmap(dst, LCD_W, LCD_H, refr_area.x1, refr_area.y1, src, LCD_W,
LCD_H, refr_area.x1, refr_area.y1, area_w, area_h);
}
}
#endif
}
Expand Down
2 changes: 1 addition & 1 deletion radio/src/hal/fatfs_diskio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ void ff_mutex_delete(int vol) { }
DSTATUS disk_initialize(BYTE pdrv)
{
if (pdrv >= _fatfs_n_drives) {
return STA_NOINIT;
return STA_NODISK;
}

DSTATUS stat = RES_OK;
Expand Down

0 comments on commit 1cf9ee4

Please sign in to comment.