2 files changed, 30 insertions, 14 deletions

diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index e4fffedac0..7ed52bd188 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -82,14 +82,25 @@ extern unsigned lcd_remote_color_to_native(unsigned color);
 #define LCD_REMOTE_DEFAULT_BG LCD_REMOTE_WHITE
 #endif
 
-/* Memory copy of display bitmap */
+/* Frame buffer dimensions (format checks only cover existing targets!) */
 #if LCD_REMOTE_DEPTH == 1
-extern fb_remote_data lcd_remote_framebuffer[LCD_REMOTE_HEIGHT/8][LCD_REMOTE_WIDTH];
+#define LCD_REMOTE_FBHEIGHT ((LCD_REMOTE_HEIGHT+7)/8)
 #elif LCD_REMOTE_DEPTH == 2
 #if LCD_REMOTE_PIXELFORMAT == VERTICAL_INTERLEAVED
-extern fb_remote_data lcd_remote_framebuffer[LCD_REMOTE_HEIGHT/8][LCD_REMOTE_WIDTH];
+#define LCD_REMOTE_FBHEIGHT ((LCD_REMOTE_HEIGHT+7)/8)
 #endif
+#endif /* LCD_REMOTE_DEPTH */
+/* Set defaults if not defined different yet. The defaults apply to both
+ * dimensions for LCD_REMOTE_DEPTH >= 8 */
+#ifndef LCD_REMOTE_FBWIDTH
+#define LCD_REMOTE_FBWIDTH LCD_REMOTE_WIDTH
 #endif
+#ifndef LCD_REMOTE_FBHEIGHT
+#define LCD_REMOTE_FBHEIGHT LCD_REMOTE_HEIGHT
+#endif
+/* The actual framebuffer */
+extern fb_remote_data lcd_remote_framebuffer[LCD_REMOTE_FBHEIGHT][LCD_REMOTE_FBWIDTH];
+
 
 extern void lcd_remote_init(void);
 extern int  lcd_remote_default_contrast(void);
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index fecf3f5426..c4edc478de 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -237,25 +237,30 @@ static inline unsigned lcd_color_to_native(unsigned color)
 #define LCD_DEFAULT_BG LCD_WHITE
 #endif
 
-/* Memory copy of display bitmap */
+/* Frame buffer dimensions */
 #if LCD_DEPTH == 1
-extern fb_data lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH];
+#if LCD_PIXELFORMAT == HORIZONTAL_PACKING
+#define LCD_FBWIDTH ((LCD_WIDTH+7)/8)
+#else /* LCD_PIXELFORMAT == VERTICAL_PACKING */
+#define LCD_FBHEIGHT ((LCD_HEIGHT+7)/8)
+#endif
 #elif LCD_DEPTH == 2
 #if LCD_PIXELFORMAT == HORIZONTAL_PACKING
 #define LCD_FBWIDTH ((LCD_WIDTH+3)/4)
-extern fb_data lcd_framebuffer[LCD_HEIGHT][LCD_FBWIDTH];
-#else
-extern fb_data lcd_framebuffer[LCD_HEIGHT/4][LCD_WIDTH];
+#else /* LCD_PIXELFORMAT == VERTICAL_PACKING */
+#define LCD_FBHEIGHT ((LCD_HEIGHT+3)/4)
 #endif
-#elif LCD_DEPTH == 16
-extern fb_data lcd_framebuffer[LCD_HEIGHT][LCD_WIDTH];
-#elif LCD_DEPTH == 18
-extern fb_data lcd_framebuffer[LCD_HEIGHT][LCD_WIDTH];
-#endif
-
+#endif /* LCD_DEPTH */
+/* Set defaults if not defined different yet. The defaults apply to both
+ * dimensions for LCD_DEPTH >= 8 */
 #ifndef LCD_FBWIDTH
 #define LCD_FBWIDTH LCD_WIDTH
 #endif
+#ifndef LCD_FBHEIGHT
+#define LCD_FBHEIGHT LCD_HEIGHT
+#endif
+/* The actual framebuffer */
+extern fb_data lcd_framebuffer[LCD_FBHEIGHT][LCD_FBWIDTH];
 
 /** Port-specific functions. Enable in port config file. **/
 #ifdef HAVE_LCD_ENABLE