Skip to content

Commit debe703

Browse files
wb2oszwb2osz
committed
MAX_ADEVS==4 enabled debug output options.
1 parent a83a1ca commit debe703

File tree

1 file changed

+93
-6
lines changed

1 file changed

+93
-6
lines changed

‎src/config.c

+93-6
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#define CONFIG_C 1 // influences behavior of aprs_tt.h
2121

22-
23-
// #define DEBUG 1
22+
// FIXME:
23+
#define DEBUG 1
2424

2525
/*------------------------------------------------------------------
2626
*
@@ -716,6 +716,7 @@ static void rtfm()
716716
dw_printf (" stable release: https://github.com/wb2osz/direwolf/tree/master/doc\n");
717717
dw_printf (" development version: https://github.com/wb2osz/direwolf/tree/dev/doc\n");
718718
dw_printf (" additional topics: https://github.com/wb2osz/direwolf-doc\n");
719+
dw_printf (" general APRS info: https://how.aprs.works\n");
719720
}
720721

721722
void config_init (char *fname, struct audio_s *p_audio_config,
@@ -763,12 +764,17 @@ void config_init (char *fname, struct audio_s *p_audio_config,
763764

764765
p_audio_config->adev[0].defined = 2; // 2 means it was done by default and not the user's config file.
765766

767+
// MAX_TOTAL_CHANS
766768
for (channel=0; channel<MAX_TOTAL_CHANS; channel++) {
767-
int ot, it;
768-
769769
p_audio_config->chan_medium[channel] = MEDIUM_NONE; /* One or both channels will be */
770770
/* set to radio when corresponding */
771771
/* audio device is defined. */
772+
}
773+
774+
// MAX_RADIO_CHANS for achan[]
775+
for (channel=0; channel<MAX_RADIO_CHANS; channel++) {
776+
int ot, it;
777+
772778
p_audio_config->achan[channel].modem_type = MODEM_AFSK;
773779
p_audio_config->achan[channel].v26_alternative = V26_UNSPECIFIED;
774780
p_audio_config->achan[channel].mark_freq = DEFAULT_MARK_FREQ; /* -m option */
@@ -980,8 +986,13 @@ void config_init (char *fname, struct audio_s *p_audio_config,
980986
if (fp == NULL) {
981987
// TODO: not exactly right for all situations.
982988
text_color_set(DW_COLOR_ERROR);
983-
dw_printf ("ERROR - Could not open config file %s\n", filepath);
989+
dw_printf ("ERROR - Could not open configuration file %s\n", filepath);
984990
dw_printf ("Try using -c command line option for alternate location.\n");
991+
#ifndef __WIN32__
992+
dw_printf ("A sample direwolf.conf file should be found in one of:\n");
993+
dw_printf (" /usr/local/share/doc/direwolf/conf/\n");
994+
dw_printf (" /usr/share/doc/direwolf/conf/\n");
995+
#endif
985996
rtfm();
986997
exit(EXIT_FAILURE);
987998
}
@@ -1423,6 +1434,12 @@ void config_init (char *fname, struct audio_s *p_audio_config,
14231434
*/
14241435

14251436
else if (strcasecmp(t, "MODEM") == 0) {
1437+
if (channel < 0 || channel >= MAX_RADIO_CHANS) {
1438+
text_color_set(DW_COLOR_ERROR);
1439+
dw_printf ("Line %d: MODEM can only be used with radio channel 0 - %d.\n", line, MAX_RADIO_CHANS-1);
1440+
continue;
1441+
}
1442+
14261443
int n;
14271444
t = split(NULL,0);
14281445
if (t == NULL) {
@@ -1758,6 +1775,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
17581775

17591776

17601777
else if (strcasecmp(t, "DTMF") == 0) {
1778+
if (channel < 0 || channel >= MAX_RADIO_CHANS) {
1779+
text_color_set(DW_COLOR_ERROR);
1780+
dw_printf ("Line %d: DTMF can only be used with radio channel 0 - %d.\n", line, MAX_RADIO_CHANS-1);
1781+
continue;
1782+
}
17611783

17621784
p_audio_config->achan[channel].dtmf_decode = DTMF_DECODE_ON;
17631785

@@ -1773,6 +1795,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
17731795
*/
17741796

17751797
else if (strcasecmp(t, "FIX_BITS") == 0) {
1798+
if (channel < 0 || channel >= MAX_RADIO_CHANS) {
1799+
text_color_set(DW_COLOR_ERROR);
1800+
dw_printf ("Line %d: FIX_BITS can only be used with radio channel 0 - %d.\n", line, MAX_RADIO_CHANS-1);
1801+
continue;
1802+
}
17761803
int n;
17771804
t = split(NULL,0);
17781805
if (t == NULL) {
@@ -1851,6 +1878,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
18511878
*/
18521879

18531880
else if (strcasecmp(t, "PTT") == 0 || strcasecmp(t, "DCD") == 0 || strcasecmp(t, "CON") == 0) {
1881+
if (channel < 0 || channel >= MAX_RADIO_CHANS) {
1882+
text_color_set(DW_COLOR_ERROR);
1883+
dw_printf ("Line %d: PTT can only be used with radio channel 0 - %d.\n", line, MAX_RADIO_CHANS-1);
1884+
continue;
1885+
}
18541886
int ot;
18551887
char otname[8];
18561888

@@ -2222,6 +2254,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
22222254
*/
22232255

22242256
else if (strcasecmp(t, "TXINH") == 0) {
2257+
if (channel < 0 || channel >= MAX_RADIO_CHANS) {
2258+
text_color_set(DW_COLOR_ERROR);
2259+
dw_printf ("Line %d: TXINH can only be used with radio channel 0 - %d.\n", line, MAX_RADIO_CHANS-1);
2260+
continue;
2261+
}
22252262
char itname[8];
22262263

22272264
strlcpy (itname, "TXINH", sizeof(itname));
@@ -2268,6 +2305,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
22682305
*/
22692306

22702307
else if (strcasecmp(t, "DWAIT") == 0) {
2308+
if (channel < 0 || channel >= MAX_RADIO_CHANS) {
2309+
text_color_set(DW_COLOR_ERROR);
2310+
dw_printf ("Line %d: DWAIT can only be used with radio channel 0 - %d.\n", line, MAX_RADIO_CHANS-1);
2311+
continue;
2312+
}
22712313
int n;
22722314
t = split(NULL,0);
22732315
if (t == NULL) {
@@ -2292,6 +2334,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
22922334
*/
22932335

22942336
else if (strcasecmp(t, "SLOTTIME") == 0) {
2337+
if (channel < 0 || channel >= MAX_RADIO_CHANS) {
2338+
text_color_set(DW_COLOR_ERROR);
2339+
dw_printf ("Line %d: SLOTTIME can only be used with radio channel 0 - %d.\n", line, MAX_RADIO_CHANS-1);
2340+
continue;
2341+
}
22952342
int n;
22962343
t = split(NULL,0);
22972344
if (t == NULL) {
@@ -2322,6 +2369,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
23222369
*/
23232370

23242371
else if (strcasecmp(t, "PERSIST") == 0) {
2372+
if (channel < 0 || channel >= MAX_RADIO_CHANS) {
2373+
text_color_set(DW_COLOR_ERROR);
2374+
dw_printf ("Line %d: PERSIST can only be used with radio channel 0 - %d.\n", line, MAX_RADIO_CHANS-1);
2375+
continue;
2376+
}
23252377
int n;
23262378
t = split(NULL,0);
23272379
if (t == NULL) {
@@ -2349,6 +2401,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
23492401
*/
23502402

23512403
else if (strcasecmp(t, "TXDELAY") == 0) {
2404+
if (channel < 0 || channel >= MAX_RADIO_CHANS) {
2405+
text_color_set(DW_COLOR_ERROR);
2406+
dw_printf ("Line %d: TXDELAY can only be used with radio channel 0 - %d.\n", line, MAX_RADIO_CHANS-1);
2407+
continue;
2408+
}
23522409
int n;
23532410
t = split(NULL,0);
23542411
if (t == NULL) {
@@ -2390,6 +2447,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
23902447
*/
23912448

23922449
else if (strcasecmp(t, "TXTAIL") == 0) {
2450+
if (channel < 0 || channel >= MAX_RADIO_CHANS) {
2451+
text_color_set(DW_COLOR_ERROR);
2452+
dw_printf ("Line %d: TXTAIL can only be used with radio channel 0 - %d.\n", line, MAX_RADIO_CHANS-1);
2453+
continue;
2454+
}
23932455
int n;
23942456
t = split(NULL,0);
23952457
if (t == NULL) {
@@ -2430,6 +2492,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
24302492
*/
24312493
else if (strcasecmp(t, "FULLDUP") == 0) {
24322494

2495+
if (channel < 0 || channel >= MAX_RADIO_CHANS) {
2496+
text_color_set(DW_COLOR_ERROR);
2497+
dw_printf ("Line %d: FULLDUP can only be used with radio channel 0 - %d.\n", line, MAX_RADIO_CHANS-1);
2498+
continue;
2499+
}
24332500
t = split(NULL,0);
24342501
if (t == NULL) {
24352502
text_color_set(DW_COLOR_ERROR);
@@ -2457,6 +2524,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
24572524

24582525
else if (strcasecmp(t, "SPEECH") == 0) {
24592526

2527+
if (channel < 0 || channel >= MAX_RADIO_CHANS) {
2528+
text_color_set(DW_COLOR_ERROR);
2529+
dw_printf ("Line %d: SPEECH can only be used with radio channel 0 - %d.\n", line, MAX_RADIO_CHANS-1);
2530+
continue;
2531+
}
24602532
t = split(NULL,0);
24612533
if (t == NULL) {
24622534
text_color_set(DW_COLOR_ERROR);
@@ -2488,6 +2560,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
24882560
*/
24892561

24902562
else if (strcasecmp(t, "FX25TX") == 0) {
2563+
if (channel < 0 || channel >= MAX_RADIO_CHANS) {
2564+
text_color_set(DW_COLOR_ERROR);
2565+
dw_printf ("Line %d: FX25TX can only be used with radio channel 0 - %d.\n", line, MAX_RADIO_CHANS-1);
2566+
continue;
2567+
}
24912568
int n;
24922569
t = split(NULL,0);
24932570
if (t == NULL) {
@@ -2510,7 +2587,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
25102587
}
25112588

25122589
/*
2513-
* FX25AUTO n - Enable Automatic use of FX.25 for connected mode.
2590+
* FX25AUTO n - Enable Automatic use of FX.25 for connected mode. *** Not Implemented ***
25142591
* Automatically enable, for that session only, when an identical
25152592
* frame is sent more than this number of times.
25162593
* Default 5 based on half of default RETRY.
@@ -2519,6 +2596,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
25192596
*/
25202597

25212598
else if (strcasecmp(t, "FX25AUTO") == 0) {
2599+
if (channel < 0 || channel >= MAX_RADIO_CHANS) {
2600+
text_color_set(DW_COLOR_ERROR);
2601+
dw_printf ("Line %d: FX25AUTO can only be used with radio channel 0 - %d.\n", line, MAX_RADIO_CHANS-1);
2602+
continue;
2603+
}
25222604
int n;
25232605
t = split(NULL,0);
25242606
if (t == NULL) {
@@ -2550,6 +2632,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
25502632

25512633
else if (strcasecmp(t, "IL2PTX") == 0) {
25522634

2635+
if (channel < 0 || channel >= MAX_RADIO_CHANS) {
2636+
text_color_set(DW_COLOR_ERROR);
2637+
dw_printf ("Line %d: IL2PTX can only be used with radio channel 0 - %d.\n", line, MAX_RADIO_CHANS-1);
2638+
continue;
2639+
}
25532640
p_audio_config->achan[channel].layer2_xmit = LAYER2_IL2P;
25542641
p_audio_config->achan[channel].il2p_max_fec = 1;
25552642
p_audio_config->achan[channel].il2p_invert_polarity = 0;

0 commit comments

Comments
 (0)