From fc9695eb47732e1c189e2f033dbd55e5c346e8c4 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Mon, 30 Jan 2017 09:52:05 -0500 Subject: Improve radio RDS driver and framework * Remove unused bits like the radio event and simplify basic radio interface. It can be more self-contained with rds.h only required by radio and tuner code. * Add post-processing to text a-la Silicon Labs AN243. The chip's error correction can only do so much; additional checks are highly recommended. Simply testing for two identical messages in a row is extremely effective and I've never seen corrupted text since doing that, even with mediocre reception. Groups segments must arrive in order, not randomly; logic change only accepts them in order, starting at 0. Time readout was made a bit better but really we'd need to use verbose mode and ensure that no errors were seen during receiving of time and more checks would be need to have a stable PI. The text is the important bit anyway. * Time out of stale text. * Text is no longer updated until a complete group has been received, as is specified in the standard. Perhaps go back to scrolling text lines in the radio screen? * Add proper character conversion to UTF-8. Only the default G0 table for the moment. The other two could be added in. * Add variants "RDS_CFG_PROCESS" and "RDS_CFG_PUSH" to allow the option for processed RDS data to be pushed to the driver and still do proper post-processing (only text conversion for now for the latter). Change-Id: I4d83f8b2e89a209a5096d15ec266477318c66925 --- firmware/export/rds.h | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) (limited to 'firmware/export/rds.h') diff --git a/firmware/export/rds.h b/firmware/export/rds.h index ff1608f5c4..6c42e16f56 100644 --- a/firmware/export/rds.h +++ b/firmware/export/rds.h @@ -18,18 +18,45 @@ * KIND, either express or implied. * ****************************************************************************/ +#ifndef RDS_H +#define RDS_H + #include #include #include "time.h" void rds_init(void); - void rds_reset(void); -bool rds_process(uint16_t data[4]); +void rds_sync(void); + +#if (CONFIG_RDS & RDS_CFG_PROCESS) +/* RDS raw data processing */ +void rds_process(const uint16_t data[4]); +#endif /* (CONFIG_RDS & RDS_CFG_PROCESS) */ + +enum rds_info_id +{ + RDS_INFO_NULL = 0, + RDS_INFO_CODEABLE, /* code table, right now only G0 */ + RDS_INFO_PI, /* programme identifier */ + RDS_INFO_PS, /* programme service name */ + RDS_INFO_RT, /* radio text */ + RDS_INFO_CT, /* clock time */ +}; + +enum rds_code_table +{ + RDS_CT_G0, /* default code table G0 */ + RDS_CT_G1, /* alternate code table G1 */ + RDS_CT_G2, /* alternate code table G2 */ +}; -uint16_t rds_get_pi(void); -char* rds_get_ps(void); -char* rds_get_rt(void); -time_t rds_get_ct(void); +#if (CONFIG_RDS & RDS_CFG_PUSH) +/* pushes preprocesed RDS information */ +void rds_push_info(enum rds_info_id info_id, uintptr_t data, size_t size); +#endif /* (CONFIG_RDS & RDS_CFG_PUSH) */ +/* read fully-processed RDS data */ +size_t rds_pull_info(enum rds_info_id info_id, uintptr_t data, size_t size); +#endif /* RDS_H */ -- cgit v1.2.3