Skip to content

Commit

Permalink
Improve display & formatting of RDS data
Browse files Browse the repository at this point in the history
  • Loading branch information
argilo committed Nov 8, 2024
1 parent 0418221 commit d4dbf62
Show file tree
Hide file tree
Showing 8 changed files with 226 additions and 100 deletions.
1 change: 1 addition & 0 deletions resources/news.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

IMPROVED: Save I/Q recording format to settings.
IMPROVED: Reduced CPU utilization of plot and waterfall display.
IMPROVED: Display and formatting of RDS data.
FIXED: Decoding of RDS flags.
CHANGED: DMG release requires macOS 13.7 or later.

Expand Down
20 changes: 7 additions & 13 deletions src/dsp/rds/api.h
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
/*
* Copyright (C) 2013 Bastian Bloessl <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This file was generated by gr_modtool, a tool from the GNU Radio framework
* This file is a part of gr-rds
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* SPDX-License-Identifier: GPL-3.0-or-later
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef INCLUDED_RDS_API_H
#define INCLUDED_RDS_API_H

#include <gnuradio/attributes.h>

#ifdef gnuradio_RDS_EXPORTS
# define RDS_API __GR_ATTR_EXPORT
#ifdef gnuradio_rds_EXPORTS
#define RDS_API __GR_ATTR_EXPORT
#else
# define RDS_API __GR_ATTR_IMPORT
#define RDS_API __GR_ATTR_IMPORT
#endif

#endif /* INCLUDED_RDS_API_H */
4 changes: 3 additions & 1 deletion src/dsp/rds/decoder_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ decoder_impl::decoder_impl(bool log, bool debug)
: gr::sync_block ("gr_rds_decoder",
gr::io_signature::make (1, 1, sizeof(char)),
gr::io_signature::make (0, 0, 0)),
bit_counter(0),
reg(0),
log(log),
debug(debug)
{
Expand Down Expand Up @@ -82,7 +84,7 @@ unsigned int decoder_impl::calc_syndrome(unsigned long message,

void decoder_impl::decode_group(unsigned int *group) {
// raw data bytes, as received from RDS.
// 8 info bytes, followed by 4 RDS offset chars: ABCD/ABcD/EEEE (in US)
// 8 info bytes, followed by 4 RDS offset chars: ABCD/ABcD
unsigned char bytes[12];

// RDS information words
Expand Down
2 changes: 1 addition & 1 deletion src/dsp/rds/decoder_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class decoder_impl : public decoder
unsigned int blocks_counter;
unsigned int group_good_blocks_counter;
unsigned int group[4];
unsigned char offset_chars[4]; // [ABCcDEx] (x=error)
unsigned char offset_chars[4]; // [ABCcDx] (x=error)
bool log;
bool debug;
bool presync;
Expand Down
1 change: 1 addition & 0 deletions src/dsp/rds/parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ class RDS_API parser : virtual public gr::block
} // namespace gr

#endif /* INCLUDED_RDS_PARSER_H */

Loading

0 comments on commit d4dbf62

Please sign in to comment.