radio95/rds95
0
1
Fork 0
mirror of https://github.com/radio95-rnt/rds95.git synced 2026-02-26 20:33:53 +01:00
Code Issues Wiki Activity

ascii g

Browse Source
This commit is contained in:
KubaPro010
2026-01-03 15:32:21 +01:00
parent 748ca29c48
commit b4bdd36332
5 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/1-ert.lua
View File

@@ -34,7 +34,7 @@ local function init_ert()
end end
end end
local function unregister_ert() function unregister_ert()
if _Ert_oda_id ~= nil then if _Ert_oda_id ~= nil then
unregister_oda(_Ert_oda_id) unregister_oda(_Ert_oda_id)
_Ert_oda_id = nil _Ert_oda_id = nil

2
scripts/1-rtp.lua
View File

@@ -79,7 +79,7 @@ function get_rds_rtplus_tags(ertp)
return string.byte(get_userdata_offset(ertp and (USERDATA_RTP_OFFSET+8) or (USERDATA_RTP_OFFSET+1), 6), 1, 6) return string.byte(get_userdata_offset(ertp and (USERDATA_RTP_OFFSET+8) or (USERDATA_RTP_OFFSET+1), 6), 1, 6)
end end
local function unregister_rtp(ertp) function unregister_rtp(ertp)
if ertp and _Ertp_oda_id ~= nil then if ertp and _Ertp_oda_id ~= nil then
unregister_oda(_Ertp_oda_id) unregister_oda(_Ertp_oda_id)
_Ertp_oda_id = nil _Ertp_oda_id = nil

2
src/rds.c
View File

@@ -119,7 +119,7 @@ static uint8_t check_rds_good_group(RDSEncoder* enc, char* grp) {
return good_group; return good_group;
} }
static void get_rds_group(RDSEncoder* enc, RDSGroup *group, uint8_t stream) { void get_rds_group(RDSEncoder* enc, RDSGroup *group, uint8_t stream) {
group->a = enc->data[enc->program].pi; group->a = enc->data[enc->program].pi;
group->b = 0; group->b = 0;
group->c = 0; group->c = 0;

1
src/rds.h
View File

@@ -190,6 +190,7 @@ void reset_rds_state(RDSEncoder* enc, uint8_t program);
void set_rds_defaults(RDSEncoder* enc, uint8_t program); void set_rds_defaults(RDSEncoder* enc, uint8_t program);
void init_rds_encoder(RDSEncoder* enc); void init_rds_encoder(RDSEncoder* enc);
void add_checkwords(RDSGroup *group, uint8_t *bits); void add_checkwords(RDSGroup *group, uint8_t *bits);
void get_rds_group(RDSEncoder* enc, RDSGroup *group, uint8_t stream);
void get_rds_bits(RDSEncoder* enc, uint8_t *bits, uint8_t stream); void get_rds_bits(RDSEncoder* enc, uint8_t *bits, uint8_t stream);
void set_rds_rt1(RDSEncoder* enc, const char *rt1); void set_rds_rt1(RDSEncoder* enc, const char *rt1);

42
src/rds95.c
View File

@@ -41,7 +41,7 @@ static inline void show_help(char *name) {
"Usage: %s [options]\n" "Usage: %s [options]\n"
"\n" "\n"
"\t-c,--config\tSet the config path [default: %s]\n" "\t-c,--config\tSet the config path [default: %s]\n"
"\t-b,--bitstream\tEnable bitstream mode where the RDS modulator will be disabled and encoded RDS bits with checkwords will be sent from stderr\n" "\t-a,--asciig\tEnable asciig mode where the RDS modulator will be disabled and encoded RDS ASCII G data will be sent from stderr\n"
"\n", "\n",
name, name,
DEFAULT_CONFIG_PATH DEFAULT_CONFIG_PATH
@@ -53,7 +53,7 @@ typedef struct
uint16_t udp_port; uint16_t udp_port;
char rds_device_name[48]; char rds_device_name[48];
uint8_t num_streams : 3; uint8_t num_streams : 3;
uint8_t bitstream : 1; uint8_t asciig : 1;
} RDS95_Config; } RDS95_Config;
static int config_handler(void* user, const char* section, const char* name, const char* value) { static int config_handler(void* user, const char* section, const char* name, const char* value) {
@@ -69,10 +69,10 @@ static int config_handler(void* user, const char* section, const char* name, con
int streams = atoi(value); int streams = atoi(value);
if (streams > MAX_STREAMS || streams == 0) return 0; if (streams > MAX_STREAMS || streams == 0) return 0;
config->num_streams = (uint8_t)streams; config->num_streams = (uint8_t)streams;
} else if (MATCH("rds95", "bitstream")) { } else if (MATCH("rds95", "asciig")) {
int bitstream = atoi(value); int asciig = atoi(value);
if (bitstream > 1 || bitstream < 0) return 0; if (asciig > 1 || asciig < 0) return 0;
config->bitstream = (uint8_t)bitstream; config->asciig = (uint8_t)asciig;
} else return 0; } else return 0;
return 1; return 1;
} }
@@ -85,7 +85,7 @@ int main(int argc, char **argv) {
.udp_port = 0, .udp_port = 0,
.rds_device_name = "\0", .rds_device_name = "\0",
.num_streams = DEFAULT_STREAMS, .num_streams = DEFAULT_STREAMS,
.bitstream = false .asciig = 0
}; };
pa_simple *rds_device = NULL; pa_simple *rds_device = NULL;
@@ -95,12 +95,12 @@ int main(int argc, char **argv) {
pthread_attr_t attr; pthread_attr_t attr;
pthread_t udp_server_thread; pthread_t udp_server_thread;
const char *short_opt = "c:bh"; const char *short_opt = "c:ah";
struct option long_opt[] = struct option long_opt[] =
{ {
{"config", required_argument, NULL, 'c'}, {"config", required_argument, NULL, 'c'},
{"bitstream", no_argument, NULL, 'b'}, {"asciig", no_argument, NULL, 'a'},
{"help", no_argument, NULL, 'h'}, {"help", no_argument, NULL, 'h'},
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
@@ -112,8 +112,8 @@ int main(int argc, char **argv) {
memcpy(config_path, optarg, 62); memcpy(config_path, optarg, 62);
config_path[48] = '\0'; config_path[48] = '\0';
break; break;
case 'b': case 'a':
config.bitstream = 1; config.asciig = 1;
break; break;
case 'h': case 'h':
show_help(argv[0]); show_help(argv[0]);
@@ -155,7 +155,7 @@ int main(int argc, char **argv) {
buffer.prebuf = 0; buffer.prebuf = 0;
buffer.tlength = buffer.maxlength = NUM_MPX_FRAMES * config.num_streams; buffer.tlength = buffer.maxlength = NUM_MPX_FRAMES * config.num_streams;
if(config.bitstream == 0) { if(config.asciig == 0) {
rds_device = pa_simple_new( rds_device = pa_simple_new(
NULL, NULL,
"rds95", "rds95",
@@ -193,7 +193,7 @@ int main(int argc, char **argv) {
config.udp_port = 0; config.udp_port = 0;
} }
if(config.bitstream == 0) { if(config.asciig == 0) {
int pulse_error; int pulse_error;
float *rds_buffer = (float*)malloc(NUM_MPX_FRAMES * config.num_streams * sizeof(float)); float *rds_buffer = (float*)malloc(NUM_MPX_FRAMES * config.num_streams * sizeof(float));
@@ -213,18 +213,20 @@ int main(int argc, char **argv) {
free(rds_buffer); free(rds_buffer);
} else { } else {
uint8_t bit_buffer[BITS_PER_GROUP] = {0}; RDSGroup group;
#ifdef _WIN32 #ifdef _WIN32
_setmode(_fileno(stderr), _O_BINARY); _setmode(_fileno(stderr), _O_BINARY);
#endif #endif
setvbuf(stderr, NULL, _IONBF, 0); setvbuf(stderr, NULL, _IONBF, 0);
while(!stop_rds) { while(!stop_rds) {
unsigned char end = 0xff; char starts[4][4] = {"G:\r\n", "H:\r\n", "I:\r\n", "J:\r\n"};
for(uint8_t i = 0; i < config.num_streams; i++) { for(uint8_t i = 0; i < config.num_streams; i++) {
get_rds_bits(&rdsEncoder, bit_buffer, i); get_rds_group(&rdsEncoder, &group, i);
fwrite(&i, 1, 1, stderr); fwrite(starts[i], 1, 4, stderr);
fwrite(bit_buffer, 1, BITS_PER_GROUP, stderr); for(uint8_t j = 0; j < GROUP_LENGTH; j++) {
fwrite(&end, 1, 1, stderr); fprintf(stderr, "%04X", get_block_from_group(&group, j));
}
fprintf(stderr, "\r\n\r\n");
fflush(stderr); fflush(stderr);
} }
} }
@@ -242,7 +244,7 @@ exit:
cleanup_rds_modulator(&rdsModulator); cleanup_rds_modulator(&rdsModulator);
pthread_attr_destroy(&attr); pthread_attr_destroy(&attr);
if (rds_device != NULL && config.bitstream == 0) pa_simple_free(rds_device); if (rds_device != NULL && config.asciig == 0) pa_simple_free(rds_device);
return 0; return 0;
} }