From f19815ee2675322325b18b7b689d6dc6260fa562 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Wed, 25 Nov 2015 23:15:29 +0100
Subject: [PATCH] Cosmetics

---
 radio/src/gui/9X/gui.h      |  9 +++++----
 radio/src/gui/Horus/gui.h   |  8 ++++++++
 radio/src/gui/Taranis/gui.h | 16 ++++++++++++----
 radio/src/opentx.h          | 20 --------------------
 4 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/radio/src/gui/9X/gui.h b/radio/src/gui/9X/gui.h
index b6f1f0e07..1147d90b3 100644
--- a/radio/src/gui/9X/gui.h
+++ b/radio/src/gui/9X/gui.h
@@ -37,16 +37,17 @@
 #include "lcd.h"
 #include "menus.h"
 
-#define NUM_BODY_LINES      (LCD_LINES-1)
-#define MENU_HEADER_HEIGHT  FH
-#define MENU_INIT_VPOS      0
+#define NUM_BODY_LINES                 (LCD_LINES-1)
+#define MENU_HEADER_HEIGHT             FH
+#define MENU_INIT_VPOS                 0
+#define DEFAULT_SCROLLBAR_X            (LCD_W-1)
 
 void displaySplash();
 void displayScreenIndex(uint8_t index, uint8_t count, uint8_t attr);
 
 #if !defined(CPUM64)
-  #define DEFAULT_SCROLLBAR_X (LCD_W-1)
   void drawVerticalScrollbar(coord_t x, coord_t y, coord_t h, uint16_t offset, uint16_t count, uint8_t visible);
 #endif
 
 #define SET_SCROLLBAR_X(x)
+#define LOAD_MODEL_BITMAP()
diff --git a/radio/src/gui/Horus/gui.h b/radio/src/gui/Horus/gui.h
index cad76ac86..ee2b9b3fc 100644
--- a/radio/src/gui/Horus/gui.h
+++ b/radio/src/gui/Horus/gui.h
@@ -71,6 +71,14 @@
 #define MENU_ICONS_SPACING             31
 #define SUBMENU_LINE_WIDTH             230
 
+#define BITMAP_BUFFER_SIZE(width, height)   (4 + (width)*(height)*3)
+#define MODEL_BITMAP_WIDTH             (3*64)
+#define MODEL_BITMAP_HEIGHT            (3*32)
+#define MODEL_BITMAP_SIZE              BITMAP_BUFFER_SIZE(MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)
+extern uint8_t modelBitmap[MODEL_BITMAP_SIZE];
+bool loadModelBitmap(char * name, uint8_t * bitmap);
+#define LOAD_MODEL_BITMAP()            loadModelBitmap(g_model.header.bitmap, modelBitmap)
+
 void displaySplash();
 void displayScreenIndex(uint8_t index, uint8_t count);
 void drawVerticalScrollbar(coord_t x, coord_t y, coord_t h, uint16_t offset, uint16_t count, uint8_t visible);
diff --git a/radio/src/gui/Taranis/gui.h b/radio/src/gui/Taranis/gui.h
index 07da5cf27..1316ff6cb 100644
--- a/radio/src/gui/Taranis/gui.h
+++ b/radio/src/gui/Taranis/gui.h
@@ -37,10 +37,18 @@
 #include "lcd.h"
 #include "menus.h"
 
-#define DEFAULT_SCROLLBAR_X  (LCD_W-1)
-#define NUM_BODY_LINES       (LCD_LINES-1)
-#define MENU_HEADER_HEIGHT   FH
-#define MENU_INIT_VPOS       0
+#define DEFAULT_SCROLLBAR_X            (LCD_W-1)
+#define NUM_BODY_LINES                 (LCD_LINES-1)
+#define MENU_HEADER_HEIGHT             FH
+#define MENU_INIT_VPOS                 0
+
+#define BITMAP_BUFFER_SIZE(width, height)   (2 + (width) * (((height)+7)/8)*4)
+#define MODEL_BITMAP_WIDTH             64
+#define MODEL_BITMAP_HEIGHT            32
+#define MODEL_BITMAP_SIZE              BITMAP_BUFFER_SIZE(MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)
+extern uint8_t modelBitmap[MODEL_BITMAP_SIZE];
+bool loadModelBitmap(char * name, uint8_t * bitmap);
+#define LOAD_MODEL_BITMAP()            loadModelBitmap(g_model.header.bitmap, modelBitmap)
 
 struct MenuItem {
   const char *name;
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 2b9638420..2d7705a8e 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -456,26 +456,6 @@
 #include "storage/storage.h"
 #include "pulses/pulses.h"
 
-#if defined(PCBHORUS)
-  #define BITMAP_BUFFER_SIZE(width, height)   (4 + (width)*(height)*3)
-  #define MODEL_BITMAP_WIDTH  (3*64) // 171
-  #define MODEL_BITMAP_HEIGHT (3*32) // 101
-  #define MODEL_BITMAP_SIZE   BITMAP_BUFFER_SIZE(MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)
-  extern uint8_t modelBitmap[MODEL_BITMAP_SIZE];
-  bool loadModelBitmap(char * name, uint8_t * bitmap);
-  #define LOAD_MODEL_BITMAP() loadModelBitmap(g_model.header.bitmap, modelBitmap)
-#elif defined(PCBTARANIS)
-  #define BITMAP_BUFFER_SIZE(width, height)   (2 + (width) * (((height)+7)/8)*4)
-  #define MODEL_BITMAP_WIDTH  64
-  #define MODEL_BITMAP_HEIGHT 32
-  #define MODEL_BITMAP_SIZE   BITMAP_BUFFER_SIZE(MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)
-  extern uint8_t modelBitmap[MODEL_BITMAP_SIZE];
-  bool loadModelBitmap(char * name, uint8_t * bitmap);
-  #define LOAD_MODEL_BITMAP() loadModelBitmap(g_model.header.bitmap, modelBitmap)
-#else
-  #define LOAD_MODEL_BITMAP()
-#endif
-
 #if defined(XCURVES)
   void loadCurves();
   #define LOAD_MODEL_CURVES() loadCurves()