summaryrefslogtreecommitdiff
path: root/firmware
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 /firmware
parent09e6b890e64312f1d11d2e529d405b4df615b3bd (diff)
downloadrockbox-7fddc2327b8cee7ad8ce1a6d53fe66cde94a0edf.tar.gz
rockbox-7fddc2327b8cee7ad8ce1a6d53fe66cde94a0edf.zip
fuze+: add lcd debug screen (display kind)
Change-Id: I08ffcfb8e4cf516aae1c23740eedf80d2cfcea41
Diffstat (limited to 'firmware')
-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 e9f626d1c2..745488c9d0 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 @@
21 21
22#include "system.h" 22#include "system.h"
23#include "button-target.h" 23#include "button-target.h"
24#include "lcd-target.h"
24 25
25bool dbg_hw_target_info(void) 26bool dbg_hw_target_info(void)
26{ 27{
27 return button_debug_screen(); 28 return lcd_debug_screen() && button_debug_screen();
28} 29}
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c
index 39469028a0..85ab6cd365 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 @@
29#include "pinctrl-imx233.h" 29#include "pinctrl-imx233.h"
30#include "dcp-imx233.h" 30#include "dcp-imx233.h"
31#include "logf.h" 31#include "logf.h"
32#include "button.h"
33#include "font.h"
34#include "action.h"
32 35
33#ifdef HAVE_LCD_ENABLE 36#ifdef HAVE_LCD_ENABLE
34static bool lcd_on; 37static bool lcd_on;
@@ -762,3 +765,34 @@ void lcd_blit_yuv(unsigned char * const src[3],
762 lcd_update_rect(LCD_WIDTH - y - height, x, height, width); 765 lcd_update_rect(LCD_WIDTH - y - height, x, height, width);
763 #endif 766 #endif
764} 767}
768
769bool lcd_debug_screen(void)
770{
771 lcd_setfont(FONT_SYSFIXED);
772
773 while(1)
774 {
775 int button = get_action(CONTEXT_STD, HZ / 10);
776 switch(button)
777 {
778 case ACTION_STD_NEXT:
779 case ACTION_STD_PREV:
780 case ACTION_STD_OK:
781 case ACTION_STD_MENU:
782 lcd_setfont(FONT_UI);
783 return true;
784 case ACTION_STD_CANCEL:
785 lcd_setfont(FONT_UI);
786 return false;
787 }
788
789 lcd_clear_display();
790 lcd_putsf(0, 0, "lcd kind: %s",
791 lcd_kind == LCD_KIND_7783 ? "st7783" :
792 lcd_kind == LCD_KIND_9325 ? "ili9325" : "unknown");
793 lcd_update();
794 yield();
795 }
796
797 return true;
798}
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/lcd-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/lcd-target.h
index 5c1ecdd406..dbdbf9ae5c 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 @@
21#ifndef LCD_TARGET_H 21#ifndef LCD_TARGET_H
22#define LCD_TARGET_H 22#define LCD_TARGET_H
23 23
24bool lcd_debug_screen(void);
25
24#endif /* LCD_TARGET_H */ 26#endif /* LCD_TARGET_H */