From 8913a852fd805e62b5312c055645da624b85ba2c Mon Sep 17 00:00:00 2001 From: wb2osz Date: Sat, 1 Oct 2022 02:32:43 +0100 Subject: [PATCH] clean up --- src/config.c | 11 +++++++++-- src/config.h | 2 +- src/direwolf.h | 4 +--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/config.c b/src/config.c index 194d96a..5e7b372 100644 --- a/src/config.c +++ b/src/config.c @@ -4987,7 +4987,7 @@ void config_init (char *fname, struct audio_s *p_audio_config, text_color_set(DW_COLOR_ERROR); dw_printf ("Config file, line %d: Old style 'BEACON' has been replaced with new commands.\n", line); - dw_printf ("Use PBEACON, OBEACON, or CBEACON instead.\n"); + dw_printf ("Use PBEACON, OBEACON, TBEACON, or CBEACON instead.\n"); } @@ -5002,6 +5002,9 @@ void config_init (char *fname, struct audio_s *p_audio_config, * New style with keywords for options. */ +// TODO: maybe add proportional pathing so multiple beacon timing does not need to be manually constructed? +// http://www.aprs.org/newN/ProportionalPathing.txt + else if (strcasecmp(t, "PBEACON") == 0 || strcasecmp(t, "OBEACON") == 0 || strcasecmp(t, "TBEACON") == 0 || @@ -5455,7 +5458,7 @@ void config_init (char *fname, struct audio_s *p_audio_config, for (j=0; jchan_medium[j] == MEDIUM_RADIO || p_audio_config->chan_medium[j] == MEDIUM_NETTNC) { if (p_digi_config->filter_str[MAX_CHANS][j] == NULL) { - p_digi_config->filter_str[MAX_CHANS][j] = strdup("i/60"); + p_digi_config->filter_str[MAX_CHANS][j] = strdup("i/180"); } } } @@ -5822,6 +5825,10 @@ static int beacon_options(char *cmd, struct beacon_s *b, int line, struct audio_ /* * Process symbol now that we have any later overlay. + * + * FIXME: Someone who used this was surprized to end up with Solar Powser (S-). + * overlay=S symbol="/-" + * We should complain if overlay used with symtab other than \. */ if (strlen(temp_symbol) > 0) { diff --git a/src/config.h b/src/config.h index 5ab2ae9..360ac49 100644 --- a/src/config.h +++ b/src/config.h @@ -214,7 +214,7 @@ struct misc_config_s { char symbol; /* Symbol code. */ float power; /* For PHG. */ - float height; + float height; /* HAAT in feet */ float gain; /* Original protocol spec was unclear. */ /* Addendum 1.1 clarifies it is dBi not dBd. */ diff --git a/src/direwolf.h b/src/direwolf.h index 8351e1a..3a47398 100644 --- a/src/direwolf.h +++ b/src/direwolf.h @@ -38,9 +38,7 @@ #endif /* - * Previously, we could handle only a single audio device. - * This meant we could have only two radio channels. - * In version 1.2, we relax this restriction and allow more audio devices. + * Maximum number of audio devices. * Three is probably adequate for standard version. * Larger reasonable numbers should also be fine. *