From 565a4b5baadad431e63ec183a2eaea6564346940 Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Thu, 16 Feb 2012 20:49:06 +0100 Subject: rds: make programme identification (pi) decoding safer, show pi in the debug screen Change-Id: I8b547400f4a28ee387157848b9640a3361df937f --- apps/debug_menu.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'apps/debug_menu.c') diff --git a/apps/debug_menu.c b/apps/debug_menu.c index a249a9b..28f36ed 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -124,6 +124,10 @@ #include "iap.h" #endif +#ifdef HAVE_RDS_CAP +#include "rds.h" +#endif + /*---------------------------------------------------*/ /* SPECIAL DEBUG STUFF */ /*---------------------------------------------------*/ @@ -1851,15 +1855,6 @@ static int radio_callback(int btn, struct gui_synclist *lists) simplelist_addline(SIMPLELIST_ADD_LINE,"%02X: %04X %04X %04X %04X", i, nfo.regs[i], nfo.regs[i+1], nfo.regs[i+2], nfo.regs[i+3]); } -#ifdef HAVE_RDS_CAP - simplelist_addline(SIMPLELIST_ADD_LINE, ""); - simplelist_addline(SIMPLELIST_ADD_LINE, "RDS Info:"); - simplelist_addline(SIMPLELIST_ADD_LINE, - si4700_get_rds_info(RADIO_RDS_NAME)); - - simplelist_addline(SIMPLELIST_ADD_LINE, - si4700_get_rds_info(RADIO_RDS_TEXT)); -#endif } #endif /* SI4700 */ #if (CONFIG_TUNER & RDA5802) @@ -1874,6 +1869,14 @@ static int radio_callback(int btn, struct gui_synclist *lists) } } #endif /* RDA55802 */ + +#ifdef HAVE_RDS_CAP + simplelist_addline(SIMPLELIST_ADD_LINE, "RDS Info:"); + simplelist_addline(SIMPLELIST_ADD_LINE, "PI:%04X PS:'%8s'", + rds_get_pi(), rds_get_ps()); + simplelist_addline(SIMPLELIST_ADD_LINE, "RT:%s", + rds_get_rt()); +#endif return ACTION_REDRAW; } static bool dbg_fm_radio(void) -- cgit v1.1