From 0c4f89370d05056faa789aa9cabcccc4e509fb9f Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Sun, 19 Jul 2020 19:38:45 -0400 Subject: [2/4] get rid of HAVE_LCD_CHARCELLS HAVE_LCD_BITMAP is now redundant. lcd_bitmap is always-on in features.txt so manual and lang strings don't have to change Change-Id: I08eeb20de48099ffc2dc23782711af368c2ec794 --- apps/gui/usb_screen.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'apps/gui/usb_screen.c') diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index 1b6f9c3b2a..dd1d97df3c 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c @@ -269,12 +269,7 @@ void gui_usb_screen_run(bool early_usb) * generic cleanup here */ screen->set_viewport(NULL); screen->scroll_stop(); -#ifdef HAVE_LCD_CHARCELLS - /* Quick fix. Viewports should really be enabled proper for charcell */ - viewport_set_defaults(&usb_screen_vps_ar[i].parent, i); -#else usb_screen_fix_viewports(screen, &usb_screen_vps_ar[i]); -#endif } /* update the UI before disabling fonts, this maximizes the propability @@ -327,10 +322,6 @@ void gui_usb_screen_run(bool early_usb) touchscreen_set_mode(old_mode); #endif -#ifdef HAVE_LCD_CHARCELLS - status_set_usb(false); -#endif /* HAVE_LCD_CHARCELLS */ - #ifdef HAVE_LCD_BITMAP if(!early_usb) { -- cgit v1.2.3