diff options
| author | Michael Sparmann <theseven@rockbox.org> | 2010-02-17 15:57:53 +0000 |
|---|---|---|
| committer | Michael Sparmann <theseven@rockbox.org> | 2010-02-17 15:57:53 +0000 |
| commit | e5c815272dc8436f487c3b6ed238d80910f0fde0 (patch) | |
| tree | 9aaec54573b7abe28b5d0b4db98d36abdf3e39d5 /apps | |
| parent | b3c18aeb4da93fe07a5021ad0405c2349d7d793e (diff) | |
| download | rockbox-e5c815272dc8436f487c3b6ed238d80910f0fde0.zip rockbox-e5c815272dc8436f487c3b6ed238d80910f0fde0.tar.gz rockbox-e5c815272dc8436f487c3b6ed238d80910f0fde0.tar.bz2 rockbox-e5c815272dc8436f487c3b6ed238d80910f0fde0.tar.xz | |
Add more information to the battery debug screen for Nano2G
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24723 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/debug_menu.c | 22 | ||||
| -rw-r--r-- | apps/plugins/SOURCES | 11 | ||||
| -rw-r--r-- | apps/plugins/battery_bench.c | 2 | ||||
| -rw-r--r-- | apps/plugins/doom/doom.make | 2 | ||||
| -rw-r--r-- | apps/plugins/plugin.lds | 4 |
5 files changed, 37 insertions, 4 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index aba3964..c8f7cf1 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -1648,6 +1648,28 @@ static bool view_battery(void) #elif defined(IPOD_NANO2G) y = pmu_read_battery_current(); lcd_putsf(0, 2, "Battery current: %d mA", y); + lcd_putsf(0, 3, "PWRCON: %8x", PWRCON); + lcd_putsf(0, 4, "PWRCONEXT: %8x", PWRCONEXT); + x = pmu_read(0x1b) & 0xf; + y = pmu_read(0x1a) * 25 + 625; + lcd_putsf(0, 5, "AUTO: %x / %d mV", x, y); + x = pmu_read(0x1f) & 0xf; + y = pmu_read(0x1e) * 25 + 625; + lcd_putsf(0, 6, "DOWN1: %x / %d mV", x, y); + x = pmu_read(0x23) & 0xf; + y = pmu_read(0x22) * 25 + 625; + lcd_putsf(0, 7, "DOWN2: %x / %d mV", x, y); + x = pmu_read(0x27) & 0xf; + y = pmu_read(0x26) * 100 + 900; + lcd_putsf(0, 8, "MEMLDO: %x / %d mV", x, y); + for (i = 0; i < 6; i++) + { + x = pmu_read(0x2e + (i << 1)) & 0xf; + y = pmu_read(0x2d + (i << 1)) * 100 + 900; + lcd_putsf(0, 9 + i, "LDO%d: %x / %d mV", i + 1, x, y); + } + lcd_putsf(0, 15, "CLKCON: %8x", CLKCON); + lcd_putsf(17, 15, "PLL0: %6x", PLL0PMS); #else lcd_putsf(0, 3, "Charger: %s", charger_inserted() ? "present" : "absent"); diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index da906e6..34940b4 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES @@ -179,3 +179,14 @@ md5sum.c #ifdef USB_ENABLE_HID remote_control.c #endif + +test_codec.c +test_core_jpeg.c +test_disk.c +test_fps.c +test_gfx.c +test_mem_jpeg.c +test_resize.c +test_sampr.c +test_scanrate.c +test_viewports.c diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index e4e399f..6eda335 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -30,7 +30,7 @@ PLUGIN_HEADER #define EV_EXIT 1337 /* seems to work with 1300, but who knows... */ -#define THREAD_STACK_SIZE DEFAULT_STACK_SIZE + 0x200 +#define THREAD_STACK_SIZE DEFAULT_STACK_SIZE + 0x1200 #if CONFIG_KEYPAD == RECORDER_PAD diff --git a/apps/plugins/doom/doom.make b/apps/plugins/doom/doom.make index bdc3223..af302fa 100644 --- a/apps/plugins/doom/doom.make +++ b/apps/plugins/doom/doom.make @@ -10,7 +10,7 @@ DOOMSRCDIR := $(APPSDIR)/plugins/doom DOOMBUILDDIR := $(BUILDDIR)/apps/plugins/doom -ROCKS += $(DOOMBUILDDIR)/doom.rock +#ROCKS += $(DOOMBUILDDIR)/doom.rock DOOM_SRC := $(call preprocess, $(DOOMSRCDIR)/SOURCES) DOOM_SRC += $(ROOTDIR)/firmware/common/sscanf.c diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds index fe38b64..436f8b4 100644 --- a/apps/plugins/plugin.lds +++ b/apps/plugins/plugin.lds @@ -142,8 +142,8 @@ OUTPUT_FORMAT(elf32-littlemips) #elif CONFIG_CPU==S5L8700 #define DRAMORIG 0x08000000 -#define IRAMORIG (0x00000000 + (64*1024)) -#define IRAMSIZE (64*1024) +#define IRAMORIG (0x00000000 + (128*1024)) +#define IRAMSIZE (128*1024) #elif CONFIG_CPU==S5L8701 #define DRAMORIG 0x08000000 |