PierMesh
/
direwolf
mirror of https://github.com/wb2osz/direwolf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up

This commit is contained in:
wb2osz 2022-10-01 02:32:43 +01:00
parent d0fc24aa5d
commit 8913a852fd
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/config.c
View File

@ -4987,7 +4987,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
text_color_set(DW_COLOR_ERROR); 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 ("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. * 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 || else if (strcasecmp(t, "PBEACON") == 0 ||
strcasecmp(t, "OBEACON") == 0 || strcasecmp(t, "OBEACON") == 0 ||
strcasecmp(t, "TBEACON") == 0 || strcasecmp(t, "TBEACON") == 0 ||
@ -5455,7 +5458,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
for (j=0; j<MAX_CHANS; j++) { for (j=0; j<MAX_CHANS; j++) {
if (p_audio_config->chan_medium[j] == MEDIUM_RADIO || p_audio_config->chan_medium[j] == MEDIUM_NETTNC) { if (p_audio_config->chan_medium[j] == MEDIUM_RADIO || p_audio_config->chan_medium[j] == MEDIUM_NETTNC) {
if (p_digi_config->filter_str[MAX_CHANS][j] == NULL) { 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. * 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) { if (strlen(temp_symbol) > 0) {

2
src/config.h
View File

@ -214,7 +214,7 @@ struct misc_config_s {
char symbol; /* Symbol code. */ char symbol; /* Symbol code. */
float power; /* For PHG. */ float power; /* For PHG. */
float height; float height; /* HAAT in feet */
float gain; /* Original protocol spec was unclear. */ float gain; /* Original protocol spec was unclear. */
/* Addendum 1.1 clarifies it is dBi not dBd. */ /* Addendum 1.1 clarifies it is dBi not dBd. */

4
src/direwolf.h
View File

@ -38,9 +38,7 @@
#endif #endif
/* /*
* Previously, we could handle only a single audio device. * Maximum number of audio devices.
* This meant we could have only two radio channels.
* In version 1.2, we relax this restriction and allow more audio devices.
* Three is probably adequate for standard version. * Three is probably adequate for standard version.
* Larger reasonable numbers should also be fine. * Larger reasonable numbers should also be fine.
* *