Skip to content

Commit b069d0f

Browse files
wb2oszwb2osz
committed
More config file checking.
1 parent 5d35780 commit b069d0f

File tree

1 file changed

+44
-17
lines changed

1 file changed

+44
-17
lines changed

‎src/config.c

+44-17
Original file line numberDiff line numberDiff line change
@@ -2204,6 +2204,9 @@ void config_init (char *fname, struct audio_s *p_audio_config,
22042204

22052205
/*
22062206
* DWAIT n - Extra delay for receiver squelch. n = 10 mS units.
2207+
*
2208+
* Why did I do this? Just add more to TXDELAY.
2209+
* Now undocumented in User Guide. Might disappear someday.
22072210
*/
22082211

22092212
else if (strcasecmp(t, "DWAIT") == 0) {
@@ -2239,14 +2242,20 @@ void config_init (char *fname, struct audio_s *p_audio_config,
22392242
continue;
22402243
}
22412244
n = atoi(t);
2242-
if (n >= 0 && n <= 255) {
2245+
if (n >= 5 && n < 50) {
2246+
// 0 = User has no clue. This would be no delay.
2247+
// 10 = Default.
2248+
// 50 = Half second. User might think it is mSec and use 100.
22432249
p_audio_config->achan[channel].slottime = n;
22442250
}
22452251
else {
22462252
p_audio_config->achan[channel].slottime = DEFAULT_SLOTTIME;
22472253
text_color_set(DW_COLOR_ERROR);
2248-
dw_printf ("Line %d: Invalid delay time for persist algorithm. Using default %d.\n",
2254+
dw_printf ("Line %d: Invalid delay time for persist algorithm. Using default %d.\n",
22492255
line, p_audio_config->achan[channel].slottime);
2256+
dw_printf ("Read the Dire Wolf User Guide, \"Radio Channel - Transmit Timing\"\n");
2257+
dw_printf ("section, to understand what this means.\n");
2258+
dw_printf ("Why don't you just use the default?\n");
22502259
}
22512260
}
22522261

@@ -2263,14 +2272,17 @@ void config_init (char *fname, struct audio_s *p_audio_config,
22632272
continue;
22642273
}
22652274
n = atoi(t);
2266-
if (n >= 0 && n <= 255) {
2275+
if (n >= 5 && n <= 250) {
22672276
p_audio_config->achan[channel].persist = n;
22682277
}
22692278
else {
22702279
p_audio_config->achan[channel].persist = DEFAULT_PERSIST;
22712280
text_color_set(DW_COLOR_ERROR);
2272-
dw_printf ("Line %d: Invalid probability for persist algorithm. Using default %d.\n",
2281+
dw_printf ("Line %d: Invalid probability for persist algorithm. Using default %d.\n",
22732282
line, p_audio_config->achan[channel].persist);
2283+
dw_printf ("Read the Dire Wolf User Guide, \"Radio Channel - Transmit Timing\"\n");
2284+
dw_printf ("section, to understand what this means.\n");
2285+
dw_printf ("Why don't you just use the default?\n");
22742286
}
22752287
}
22762288

@@ -2289,17 +2301,21 @@ void config_init (char *fname, struct audio_s *p_audio_config,
22892301
n = atoi(t);
22902302
if (n >= 0 && n <= 255) {
22912303
text_color_set(DW_COLOR_ERROR);
2292-
if (n == 0) {
2293-
dw_printf ("Line %d: Setting TXDELAY to 0 is a REALLY BAD idea if you want other stations to hear you.\n",
2294-
line);
2295-
dw_printf ("Line %d: See User Guide, \"Radio Channel - Transmit Timing\" for an explanation.\n",
2304+
if (n < 10) {
2305+
dw_printf ("Line %d: Setting TXDELAY this small is a REALLY BAD idea if you want other stations to hear you.\n",
22962306
line);
2307+
dw_printf ("Read the Dire Wolf User Guide, \"Radio Channel - Transmit Timing\"\n");
2308+
dw_printf ("section, to understand what this means.\n");
2309+
dw_printf ("Why don't you just use the default rather than reducing reliability?\n");
22972310
}
2298-
if (n >= 100) {
2311+
else if (n >= 100) {
22992312
dw_printf ("Line %d: Keeping with tradition, going back to the 1980s, TXDELAY is in 10 millisecond units.\n",
23002313
line);
23012314
dw_printf ("Line %d: The value %d would be %.3f seconds which seems rather excessive. Are you sure you want that?\n",
23022315
line, n, (double)n * 10. / 1000.);
2316+
dw_printf ("Read the Dire Wolf User Guide, \"Radio Channel - Transmit Timing\"\n");
2317+
dw_printf ("section, to understand what this means.\n");
2318+
dw_printf ("Why don't you just use the default?\n");
23032319
}
23042320
p_audio_config->achan[channel].txdelay = n;
23052321
}
@@ -2325,24 +2341,28 @@ void config_init (char *fname, struct audio_s *p_audio_config,
23252341
}
23262342
n = atoi(t);
23272343
if (n >= 0 && n <= 255) {
2328-
if (n == 0) {
2329-
dw_printf ("Line %d: Setting TXTAIL to 0 is a REALLY BAD idea if you want other stations to hear you.\n",
2330-
line);
2331-
dw_printf ("Line %d: See User Guide, \"Radio Channel - Transmit Timing\" for an explanation.\n",
2344+
if (n < 5) {
2345+
dw_printf ("Line %d: Setting TXTAIL that small is a REALLY BAD idea if you want other stations to hear you.\n",
23322346
line);
2347+
dw_printf ("Read the Dire Wolf User Guide, \"Radio Channel - Transmit Timing\"\n");
2348+
dw_printf ("section, to understand what this means.\n");
2349+
dw_printf ("Why don't you just use the default rather than reducing reliability?\n");
23332350
}
2334-
if (n >= 50) {
2351+
else if (n >= 50) {
23352352
dw_printf ("Line %d: Keeping with tradition, going back to the 1980s, TXTAIL is in 10 millisecond units.\n",
23362353
line);
23372354
dw_printf ("Line %d: The value %d would be %.3f seconds which seems rather excessive. Are you sure you want that?\n",
23382355
line, n, (double)n * 10. / 1000.);
2356+
dw_printf ("Read the Dire Wolf User Guide, \"Radio Channel - Transmit Timing\"\n");
2357+
dw_printf ("section, to understand what this means.\n");
2358+
dw_printf ("Why don't you just use the default?\n");
23392359
}
23402360
p_audio_config->achan[channel].txtail = n;
23412361
}
23422362
else {
23432363
p_audio_config->achan[channel].txtail = DEFAULT_TXTAIL;
23442364
text_color_set(DW_COLOR_ERROR);
2345-
dw_printf ("Line %d: Invalid time for transmit timing. Using %d.\n",
2365+
dw_printf ("Line %d: Invalid time for transmit timing. Using %d.\n",
23462366
line, p_audio_config->achan[channel].txtail);
23472367
}
23482368
}
@@ -2891,7 +2911,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
28912911
dw_printf ("Config file: FILTER IG ... on line %d.\n", line);
28922912
dw_printf ("Warning! Don't mess with IS>RF filtering unless you are an expert and have an unusual situation.\n");
28932913
dw_printf ("Warning! The default is fine for nearly all situations.\n");
2894-
dw_printf ("Warning! Be sure to read carefully and understand Successful-APRS-Gateway-Operation.pdf .\n");
2914+
dw_printf ("Warning! Be sure to read carefully and understand \"Successful-APRS-Gateway-Operation.pdf\" .\n");
28952915
dw_printf ("Warning! If you insist, be sure to add \" | i/180 \" so you don't break messaging.\n");
28962916
}
28972917
else {
@@ -2931,7 +2951,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
29312951
dw_printf ("Warning! Don't mess with RF>IS filtering unless you are an expert and have an unusual situation.\n");
29322952
dw_printf ("Warning! Expected behavior is for everything to go from RF to IS.\n");
29332953
dw_printf ("Warning! The default is fine for nearly all situations.\n");
2934-
dw_printf ("Warning! Be sure to read carefully and understand Successful-APRS-Gateway-Operation.pdf .\n");
2954+
dw_printf ("Warning! Be sure to read carefully and understand \"Successful-APRS-Gateway-Operation.pdf\" .\n");
29352955
}
29362956
else {
29372957
to_chan = isdigit(*t) ? atoi(t) : -999;
@@ -4567,6 +4587,13 @@ void config_init (char *fname, struct audio_s *p_audio_config,
45674587

45684588
if (t != NULL && strlen(t) > 0) {
45694589
p_igate_config->t2_filter = strdup (t);
4590+
4591+
text_color_set(DW_COLOR_ERROR);
4592+
dw_printf ("Line %d: Warning - IGFILTER is a rarely needed expert level feature.\n", line);
4593+
dw_printf ("If you don't have a special situation and a good understanding of\n");
4594+
dw_printf ("how this works, you probably should not be messing with it.\n");
4595+
dw_printf ("The default behavior is appropriate for most situations.\n");
4596+
dw_printf ("Please read \"Successful-APRS-IGate-Operation.pdf\".\n");
45704597
}
45714598
}
45724599

0 commit comments

Comments
 (0)