From 2404913f45e06fae60d15ed2bf3cfcd5e739ab51 Mon Sep 17 00:00:00 2001 From: Barry Wardell Date: Mon, 25 Sep 2006 17:03:18 +0000 Subject: Enable LCD invert setting in the menu for all targets that support it. This adds the menu option to H10 20GB and X5 builds. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11048 a1c6a512-1295-4272-9138-f99709370657 --- apps/settings_menu.c | 6 +++--- firmware/export/config-fmrecorder.h | 3 +++ firmware/export/config-gmini120.h | 3 +++ firmware/export/config-gminisp.h | 3 +++ firmware/export/config-h10.h | 3 +++ firmware/export/config-h100.h | 3 +++ firmware/export/config-h120.h | 3 +++ firmware/export/config-iaudiox5.h | 3 +++ firmware/export/config-ipod3g.h | 3 +++ firmware/export/config-ipod4g.h | 3 +++ firmware/export/config-ipodmini.h | 3 +++ firmware/export/config-ipodmini2g.h | 3 +++ firmware/export/config-ondiofm.h | 3 +++ firmware/export/config-ondiosp.h | 3 +++ firmware/export/config-recorder.h | 3 +++ firmware/export/config-recorderv2.h | 3 +++ 16 files changed, 48 insertions(+), 3 deletions(-) diff --git a/apps/settings_menu.c b/apps/settings_menu.c index ab19c820be..8f9fbe1c62 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c @@ -344,7 +344,7 @@ static bool contrast(void) #endif /* HAVE_LCD_CONTRAST */ #ifdef HAVE_LCD_BITMAP -#ifndef HAVE_LCD_COLOR +#ifdef HAVE_LCD_INVERT /** * Menu to set LCD Mode (normal/inverse) */ @@ -357,7 +357,7 @@ static bool invert(void) lcd_set_invert_display); return rc; } -#endif /* HAVE_LCD_COLOR */ +#endif /* HAVE_LCD_INVERT */ #ifdef HAVE_LCD_FLIP /** @@ -1868,7 +1868,7 @@ static bool lcd_settings_menu(void) { ID2P(LANG_CONTRAST), contrast }, #endif #ifdef HAVE_LCD_BITMAP -#ifndef HAVE_LCD_COLOR +#ifdef HAVE_LCD_INVERT { ID2P(LANG_INVERT), invert }, #endif #ifdef HAVE_LCD_FLIP diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index 4009d334ab..995ca3658b 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h @@ -7,6 +7,9 @@ /* define this if you can flip your LCD */ #define HAVE_LCD_FLIP +/* define this if you can invert the colours on your LCD */ +#define HAVE_LCD_INVERT + /* define this if you have access to the quickscreen */ #define HAVE_QUICKSCREEN /* define this if you have access to the pitchscreen */ diff --git a/firmware/export/config-gmini120.h b/firmware/export/config-gmini120.h index 66ba7af09e..5aed9a5f7d 100644 --- a/firmware/export/config-gmini120.h +++ b/firmware/export/config-gmini120.h @@ -7,6 +7,9 @@ /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP 1 +/* define this if you can invert the colours on your LCD */ +#define HAVE_LCD_INVERT + /* define this if you have a real-time clock */ #define CONFIG_RTC RTC_M41ST84W diff --git a/firmware/export/config-gminisp.h b/firmware/export/config-gminisp.h index 8df7b0f5a1..b309c173a9 100644 --- a/firmware/export/config-gminisp.h +++ b/firmware/export/config-gminisp.h @@ -4,6 +4,9 @@ /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP 1 +/* define this if you can invert the colours on your LCD */ +#define HAVE_LCD_INVERT + /* LCD dimensions */ #define LCD_WIDTH 128 #define LCD_HEIGHT 64 diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h index df778e24f0..921e31cf08 100644 --- a/firmware/export/config-h10.h +++ b/firmware/export/config-h10.h @@ -31,6 +31,9 @@ /* define this if you can flip your LCD */ #define HAVE_LCD_FLIP +/* define this if you can invert the colours on your LCD */ +#define HAVE_LCD_INVERT + /* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */ #define CONFIG_KEYPAD IRIVER_H10_PAD diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index f150e56ff0..aacb30dd44 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h @@ -16,6 +16,9 @@ /* define this if you can flip your LCD */ #define HAVE_LCD_FLIP +/* define this if you can invert the colours on your LCD */ +#define HAVE_LCD_INVERT + /* define this if you have access to the quickscreen */ #define HAVE_QUICKSCREEN /* define this if you have access to the pitchscreen */ diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index 5ef7f862f5..79ad613968 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h @@ -12,6 +12,9 @@ /* define this if you can flip your LCD */ #define HAVE_LCD_FLIP +/* define this if you can invert the colours on your LCD */ +#define HAVE_LCD_INVERT + /* define this if you have access to the quickscreen */ #define HAVE_QUICKSCREEN /* define this if you have access to the pitchscreen */ diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index cbb9992788..c3cd157781 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h @@ -15,6 +15,9 @@ /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR 1 +/* define this if you can invert the colours on your LCD */ +#define HAVE_LCD_INVERT + /* define this if you have access to the quickscreen */ #define HAVE_QUICKSCREEN diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h index 7a7000c080..2f008e17c8 100644 --- a/firmware/export/config-ipod3g.h +++ b/firmware/export/config-ipod3g.h @@ -12,6 +12,9 @@ /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP 1 +/* define this if you can invert the colours on your LCD */ +#define HAVE_LCD_INVERT + /* define this if you have access to the quickscreen */ #define HAVE_QUICKSCREEN /* define this if you have access to the pitchscreen */ diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h index 163d91c3db..a5f186782f 100644 --- a/firmware/export/config-ipod4g.h +++ b/firmware/export/config-ipod4g.h @@ -12,6 +12,9 @@ /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP 1 +/* define this if you can invert the colours on your LCD */ +#define HAVE_LCD_INVERT + /* define this if you have access to the quickscreen */ #define HAVE_QUICKSCREEN /* define this if you have access to the pitchscreen */ diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h index 12bc658610..f6d51aefaa 100644 --- a/firmware/export/config-ipodmini.h +++ b/firmware/export/config-ipodmini.h @@ -12,6 +12,9 @@ /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP 1 +/* define this if you can invert the colours on your LCD */ +#define HAVE_LCD_INVERT + /* define this if you have access to the quickscreen */ #define HAVE_QUICKSCREEN /* define this if you have access to the pitchscreen */ diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h index 2b2e967599..a7e1a3a5ee 100755 --- a/firmware/export/config-ipodmini2g.h +++ b/firmware/export/config-ipodmini2g.h @@ -12,6 +12,9 @@ /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP 1 +/* define this if you can invert the colours on your LCD */ +#define HAVE_LCD_INVERT + /* define this if you have access to the quickscreen */ #define HAVE_QUICKSCREEN /* define this if you have access to the pitchscreen */ diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h index ec20929b62..745b1ba782 100644 --- a/firmware/export/config-ondiofm.h +++ b/firmware/export/config-ondiofm.h @@ -7,6 +7,9 @@ /* define this if you can flip your LCD */ #define HAVE_LCD_FLIP +/* define this if you can invert the colours on your LCD */ +#define HAVE_LCD_INVERT + /* LCD dimensions */ #define LCD_WIDTH 112 #define LCD_HEIGHT 64 diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h index c6b70e3685..19c59c3aca 100644 --- a/firmware/export/config-ondiosp.h +++ b/firmware/export/config-ondiosp.h @@ -4,6 +4,9 @@ /* define this if you can flip your LCD */ #define HAVE_LCD_FLIP +/* define this if you can invert the colours on your LCD */ +#define HAVE_LCD_INVERT + /* LCD dimensions */ #define LCD_WIDTH 112 #define LCD_HEIGHT 64 diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h index 854b1c1ade..ca9d1f3f04 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h @@ -7,6 +7,9 @@ /* define this if you can flip your LCD */ #define HAVE_LCD_FLIP +/* define this if you can invert the colours on your LCD */ +#define HAVE_LCD_INVERT + /* define this if you have access to the quickscreen */ #define HAVE_QUICKSCREEN diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index 09823cffb2..4f0682077f 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h @@ -7,6 +7,9 @@ /* define this if you can flip your LCD */ #define HAVE_LCD_FLIP +/* define this if you can invert the colours on your LCD */ +#define HAVE_LCD_INVERT + /* define this if you have access to the quickscreen */ #define HAVE_QUICKSCREEN -- cgit v1.2.3