aboutsummaryrefslogtreecommitdiff
path: root/AT91SAM7S256/Source/c_ui.c
diff options
context:
space:
mode:
Diffstat (limited to 'AT91SAM7S256/Source/c_ui.c')
-rw-r--r--AT91SAM7S256/Source/c_ui.c40
1 files changed, 21 insertions, 19 deletions
diff --git a/AT91SAM7S256/Source/c_ui.c b/AT91SAM7S256/Source/c_ui.c
index c79dca9..7e39d6f 100644
--- a/AT91SAM7S256/Source/c_ui.c
+++ b/AT91SAM7S256/Source/c_ui.c
@@ -90,22 +90,22 @@ const HEADER cUi =
const BMPMAP *Intro[NO_OF_INTROBITMAPS] = // Picture sequence for the intro animation
{
- (BMPMAP*)RCXintro_1,
- (BMPMAP*)RCXintro_2,
- (BMPMAP*)RCXintro_3,
- (BMPMAP*)RCXintro_4,
- (BMPMAP*)RCXintro_5,
- (BMPMAP*)RCXintro_6,
- (BMPMAP*)RCXintro_7,
- (BMPMAP*)RCXintro_8,
- (BMPMAP*)RCXintro_9,
- (BMPMAP*)RCXintro_10,
- (BMPMAP*)RCXintro_11,
- (BMPMAP*)RCXintro_12,
- (BMPMAP*)RCXintro_13,
- (BMPMAP*)RCXintro_14,
- (BMPMAP*)RCXintro_15,
- (BMPMAP*)RCXintro_16
+ (BMPMAP*) POINTER_TO_DATA (RCXintro_1),
+ (BMPMAP*) POINTER_TO_DATA (RCXintro_2),
+ (BMPMAP*) POINTER_TO_DATA (RCXintro_3),
+ (BMPMAP*) POINTER_TO_DATA (RCXintro_4),
+ (BMPMAP*) POINTER_TO_DATA (RCXintro_5),
+ (BMPMAP*) POINTER_TO_DATA (RCXintro_6),
+ (BMPMAP*) POINTER_TO_DATA (RCXintro_7),
+ (BMPMAP*) POINTER_TO_DATA (RCXintro_8),
+ (BMPMAP*) POINTER_TO_DATA (RCXintro_9),
+ (BMPMAP*) POINTER_TO_DATA (RCXintro_10),
+ (BMPMAP*) POINTER_TO_DATA (RCXintro_11),
+ (BMPMAP*) POINTER_TO_DATA (RCXintro_12),
+ (BMPMAP*) POINTER_TO_DATA (RCXintro_13),
+ (BMPMAP*) POINTER_TO_DATA (RCXintro_14),
+ (BMPMAP*) POINTER_TO_DATA (RCXintro_15),
+ (BMPMAP*) POINTER_TO_DATA (RCXintro_16)
};
// ****** STATUS LINE GRAPHIC RESOURCES **************************************
@@ -1313,7 +1313,7 @@ void cUiCtrl(void)
VarsUi.State = 0;
VarsUi.Pointer = 0;
- VarsUi.Timer = -INTRO_START_TIME;
+ VarsUi.Timer = CONFIG_INTRO ? -INTRO_START_TIME : 0;
VarsUi.FNOFState = 0;
VarsUi.FBState = 0;
@@ -1325,10 +1325,10 @@ void cUiCtrl(void)
VarsUi.GUSState = 0;
IOMapUi.pMenu = (MENU*)cUiGetMenuPointer(0);
- IOMapUi.State = INIT_INTRO;
+ IOMapUi.State = CONFIG_INTRO ? INIT_INTRO : INIT_WAIT;
pMapDisplay->EraseMask = SCREEN_BIT(SCREEN_BACKGROUND);
- pMapDisplay->pBitmaps[BITMAP_1] = (BMPMAP*)Intro[VarsUi.Pointer];
+ pMapDisplay->pBitmaps[BITMAP_1] = CONFIG_INTRO ? (BMPMAP*)Intro[VarsUi.Pointer] : RCXintro_16;
pMapDisplay->UpdateMask = BITMAP_BIT(BITMAP_1);
pMapDisplay->Flags |= DISPLAY_ON;
@@ -1338,6 +1338,7 @@ void cUiCtrl(void)
}
break;
+#if CONFIG_INTRO
case INIT_LOW_BATTERY :
{
if (++VarsUi.Timer >= (INTRO_LOWBATT_TIME))
@@ -1431,6 +1432,7 @@ void cUiCtrl(void)
}
}
break;
+#endif /* CONFIG_INTRO */
case INIT_WAIT :
{