From 13957219b9aea7444c3e473e09442797166e74dd Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Fri, 11 Jan 2013 08:37:28 +0000
Subject: [PATCH] [ACT] Remaining LCD260

---
 src/lcd.cpp    |  2 +-
 src/lcd.h      | 36 ++++++++++++++++++------------------
 src/myeeprom.h |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/lcd.cpp b/src/lcd.cpp
index db43bce68..46176b8f1 100644
--- a/src/lcd.cpp
+++ b/src/lcd.cpp
@@ -45,7 +45,7 @@ void lcd_clear()
 void lcd_img(xcoord_t x, uint8_t y, const pm_uchar * img, uint8_t idx, LcdFlags att)
 {
   const pm_uchar *q = img;
-#if defined(LCD260)
+#if LCD >= 260
   xcoord_t w   = pgm_read_byte(q++);
   if (w == 255) w += pgm_read_byte(q++);
 #else
diff --git a/src/lcd.h b/src/lcd.h
index 640608a3d..9c1a3024e 100644
--- a/src/lcd.h
+++ b/src/lcd.h
@@ -34,29 +34,29 @@
 #ifndef lcd_h
 #define lcd_h
 
-#if defined(LCD260)
-#define DISPLAY_W 260
-#define DISPLAY_H  75
-#define xcoord_t uint16_t
-#define CENTER      "\015"
-#define CENTER_OFS  (7*FW-FW/2)
+#if LCD >= 260
+#define DISPLAY_W     260
+#define DISPLAY_H     75
+#define xcoord_t      uint16_t
+#define CENTER        "\015"
+#define CENTER_OFS    (7*FW-FW/2)
 #elif LCD >= 212
-#define DISPLAY_W 212
-#define DISPLAY_H  64
-#define xcoord_t uint16_t
-#define CENTER      "\015"
-#define CENTER_OFS  (7*FW-FW/2)
+#define DISPLAY_W     212
+#define DISPLAY_H     64
+#define xcoord_t      uint16_t
+#define CENTER        "\015"
+#define CENTER_OFS    (7*FW-FW/2)
 #else
-#define DISPLAY_W 128
-#define DISPLAY_H  64
-#define xcoord_t uint8_t
+#define DISPLAY_W     128
+#define DISPLAY_H     64
+#define xcoord_t      uint8_t
 #define CENTER
-#define CENTER_OFS 0
+#define CENTER_OFS    0
 #endif
 
-#define FW          6
-#define FWNUM       5
-#define FH          8
+#define FW            6
+#define FWNUM         5
+#define FH            8
 
 /* lcd common flags */
 #define BLINK         0x01
diff --git a/src/myeeprom.h b/src/myeeprom.h
index 80f54c92d..c80ed20c1 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -80,7 +80,7 @@ PACK(typedef struct t_FrSkyRSSIAlarm {
   int8_t    value:6;
 }) FrSkyRSSIAlarm;
 
-#if LCD >= 212 || defined(LCD260)
+#if LCD >= 212
 enum MainViews {
   VIEW_INPUTS,
   VIEW_SWITCHES,