From 658026e6267277b27d297c481728f74d160a8481 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Fri, 17 Jul 2020 10:31:31 -0400 Subject: [4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice. Note: I left behind lcd_bitmap in features.txt, because removing it would require considerable work in the manual and the translations. Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a --- firmware/export/scroll_engine.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'firmware/export/scroll_engine.h') diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h index 051e367506..f13e2efca7 100644 --- a/firmware/export/scroll_engine.h +++ b/firmware/export/scroll_engine.h @@ -58,11 +58,7 @@ extern bool lcd_remote_scroll_now(struct scrollinfo *scroll); * larger than the normal linebuffer since it holds the line a second * time (+3 spaces) for non-bidir scrolling */ #define SCROLL_SPACING 3 -#ifdef HAVE_LCD_BITMAP #define SCROLL_LINE_SIZE (MAX_PATH + SCROLL_SPACING + 3*LCD_WIDTH/2 + 2) -#else -#define SCROLL_LINE_SIZE (MAX_PATH + SCROLL_SPACING + 3*LCD_WIDTH + 2) -#endif struct scrollinfo { @@ -95,20 +91,14 @@ struct scroll_screen_info long ticks; /* # of ticks between updates*/ long delay; /* ticks delay before start */ int bidir_limit; /* percent */ -#if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) int step; /* pixels per scroll step */ -#endif #if defined(HAVE_REMOTE_LCD) long last_scroll; #endif }; /** main lcd **/ -#ifdef HAVE_LCD_BITMAP #define LCD_SCROLLABLE_LINES ((LCD_HEIGHT+4)/5 < 32 ? (LCD_HEIGHT+4)/5 : 32) -#else -#define LCD_SCROLLABLE_LINES LCD_HEIGHT * 2 -#endif extern struct scroll_screen_info lcd_scroll_info; -- cgit v1.2.3