summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2012-12-26 02:38:56 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2012-12-26 02:38:56 +0100
commit7fddc2327b8cee7ad8ce1a6d53fe66cde94a0edf (patch)
tree7c1d57e244676d63e97d7d8a2293a7fa9c2243e6
parent09e6b890e64312f1d11d2e529d405b4df615b3bd (diff)
downloadrockbox-7fddc2327b8cee7ad8ce1a6d53fe66cde94a0edf.zip
rockbox-7fddc2327b8cee7ad8ce1a6d53fe66cde94a0edf.tar.gz
rockbox-7fddc2327b8cee7ad8ce1a6d53fe66cde94a0edf.tar.bz2
rockbox-7fddc2327b8cee7ad8ce1a6d53fe66cde94a0edf.tar.xz
fuze+: add lcd debug screen (display kind)
Change-Id: I08ffcfb8e4cf516aae1c23740eedf80d2cfcea41
-rw-r--r--firmware/target/arm/imx233/sansa-fuzeplus/debug-fuzeplus.c3
-rw-r--r--firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c34
-rw-r--r--firmware/target/arm/imx233/sansa-fuzeplus/lcd-target.h2
3 files changed, 38 insertions, 1 deletions
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/debug-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/debug-fuzeplus.c
index e9f626d..745488c 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/debug-fuzeplus.c
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/debug-fuzeplus.c
@@ -21,8 +21,9 @@
#include "system.h"
#include "button-target.h"
+#include "lcd-target.h"
bool dbg_hw_target_info(void)
{
- return button_debug_screen();
+ return lcd_debug_screen() && button_debug_screen();
}
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c
index 3946902..85ab6cd 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c
@@ -29,6 +29,9 @@
#include "pinctrl-imx233.h"
#include "dcp-imx233.h"
#include "logf.h"
+#include "button.h"
+#include "font.h"
+#include "action.h"
#ifdef HAVE_LCD_ENABLE
static bool lcd_on;
@@ -762,3 +765,34 @@ void lcd_blit_yuv(unsigned char * const src[3],
lcd_update_rect(LCD_WIDTH - y - height, x, height, width);
#endif
}
+
+bool lcd_debug_screen(void)
+{
+ lcd_setfont(FONT_SYSFIXED);
+
+ while(1)
+ {
+ int button = get_action(CONTEXT_STD, HZ / 10);
+ switch(button)
+ {
+ case ACTION_STD_NEXT:
+ case ACTION_STD_PREV:
+ case ACTION_STD_OK:
+ case ACTION_STD_MENU:
+ lcd_setfont(FONT_UI);
+ return true;
+ case ACTION_STD_CANCEL:
+ lcd_setfont(FONT_UI);
+ return false;
+ }
+
+ lcd_clear_display();
+ lcd_putsf(0, 0, "lcd kind: %s",
+ lcd_kind == LCD_KIND_7783 ? "st7783" :
+ lcd_kind == LCD_KIND_9325 ? "ili9325" : "unknown");
+ lcd_update();
+ yield();
+ }
+
+ return true;
+}
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/lcd-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/lcd-target.h
index 5c1ecdd..dbdbf9a 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/lcd-target.h
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/lcd-target.h
@@ -21,4 +21,6 @@
#ifndef LCD_TARGET_H
#define LCD_TARGET_H
+bool lcd_debug_screen(void);
+
#endif /* LCD_TARGET_H */