Skip to content

Commit a08d093

Browse files
wb2oszwb2osz
committed
Add FEC type to station heard line.
1 parent 7a8e432 commit a08d093

10 files changed

+80
-59
lines changed

‎src/atest.c

+22-20
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ int audio_get (int a)
757757
* This is called when we have a good frame.
758758
*/
759759

760-
void dlq_rec_frame (int chan, int subchan, int slice, packet_t pp, alevel_t alevel, int is_fx25, retry_t retries, char *spectrum)
760+
void dlq_rec_frame (int chan, int subchan, int slice, packet_t pp, alevel_t alevel, fec_type_t fec_type, retry_t retries, char *spectrum)
761761
{
762762

763763
char stemp[500];
@@ -826,29 +826,31 @@ void dlq_rec_frame (int chan, int subchan, int slice, packet_t pp, alevel_t alev
826826
strlcat (heard, ")", sizeof(heard));
827827
}
828828

829-
if (my_audio_config.achan[chan].fix_bits == RETRY_NONE && my_audio_config.achan[chan].passall == 0) {
830-
dw_printf ("%s audio level = %s %s\n", heard, alevel_text, spectrum);
831-
}
832-
else if (is_fx25) {
833-
dw_printf ("%s audio level = %s %s\n", heard, alevel_text, spectrum);
834-
}
835-
else {
836-
assert (retries >= RETRY_NONE && retries <= RETRY_MAX);
837-
dw_printf ("%s audio level = %s [%s] %s\n", heard, alevel_text, retry_text[(int)retries], spectrum);
829+
switch (fec_type) {
830+
831+
case fec_type_fx25:
832+
dw_printf ("%s audio level = %s FX.25 %s\n", heard, alevel_text, spectrum);
833+
break;
834+
835+
case fec_type_il2p:
836+
dw_printf ("%s audio level = %s IL2P %s\n", heard, alevel_text, spectrum);
837+
break;
838+
839+
case fec_type_none:
840+
default:
841+
if (my_audio_config.achan[chan].fix_bits == RETRY_NONE && my_audio_config.achan[chan].passall == 0) {
842+
// No fix_bits or passall specified.
843+
dw_printf ("%s audio level = %s %s\n", heard, alevel_text, spectrum);
844+
}
845+
else {
846+
assert (retries >= RETRY_NONE && retries <= RETRY_MAX); // validate array index.
847+
dw_printf ("%s audio level = %s [%s] %s\n", heard, alevel_text, retry_text[(int)retries], spectrum);
848+
}
849+
break;
838850
}
839851

840852
#endif
841853

842-
//#if defined(EXPERIMENT_G) || defined(EXPERIMENT_H)
843-
// int j;
844-
//
845-
// for (j=0; j<MAX_SUBCHANS; j++) {
846-
// if (spectrum[j] == '|') {
847-
// count[j]++;
848-
// }
849-
// }
850-
//#endif
851-
852854

853855
// Display non-APRS packets in a different color.
854856

‎src/direwolf.c

+23-12
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
#include "il2p.h"
129129
#include "dwsock.h"
130130
#include "dns_sd_dw.h"
131+
#include "dlq.h" // for fec_type_t definition.
131132

132133

133134
//static int idx_decoded = 0;
@@ -300,7 +301,7 @@ int main (int argc, char *argv[])
300301

301302
text_color_init(t_opt);
302303
text_color_set(DW_COLOR_INFO);
303-
dw_printf ("Dire Wolf version %d.%d (%s) BETA TEST 5\n", MAJOR_VERSION, MINOR_VERSION, __DATE__);
304+
dw_printf ("Dire Wolf version %d.%d (%s) BETA TEST 7\n", MAJOR_VERSION, MINOR_VERSION, __DATE__);
304305
//dw_printf ("Dire Wolf DEVELOPMENT version %d.%d %s (%s)\n", MAJOR_VERSION, MINOR_VERSION, "G", __DATE__);
305306
//dw_printf ("Dire Wolf version %d.%d\n", MAJOR_VERSION, MINOR_VERSION);
306307

@@ -1179,7 +1180,7 @@ int main (int argc, char *argv[])
11791180

11801181
// TODO: Use only one printf per line so output doesn't get jumbled up with stuff from other threads.
11811182

1182-
void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alevel_t alevel, int is_fx25, retry_t retries, char *spectrum)
1183+
void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alevel_t alevel, fec_type_t fec_type, retry_t retries, char *spectrum)
11831184
{
11841185

11851186
char stemp[500];
@@ -1188,7 +1189,8 @@ void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alev
11881189
char heard[AX25_MAX_ADDR_LEN];
11891190
//int j;
11901191
int h;
1191-
char display_retries[32];
1192+
char display_retries[32]; // Extra stuff before slice indicators.
1193+
// Can indicate FX.25/IL2P or fix_bits.
11921194

11931195
assert (chan >= 0 && chan < MAX_TOTAL_CHANS); // TOTAL for virtual channels
11941196
assert (subchan >= -2 && subchan < MAX_SUBCHANS);
@@ -1197,12 +1199,21 @@ void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alev
11971199

11981200
strlcpy (display_retries, "", sizeof(display_retries));
11991201

1200-
if (is_fx25) {
1201-
;
1202-
}
1203-
else if (audio_config.achan[chan].fix_bits != RETRY_NONE || audio_config.achan[chan].passall) {
1204-
assert (retries >= RETRY_NONE && retries <= RETRY_MAX);
1205-
snprintf (display_retries, sizeof(display_retries), " [%s] ", retry_text[(int)retries]);
1202+
switch (fec_type) {
1203+
case fec_type_fx25:
1204+
strlcpy (display_retries, " FX.25 ", sizeof(display_retries));
1205+
break;
1206+
case fec_type_il2p:
1207+
strlcpy (display_retries, " IL2P ", sizeof(display_retries));
1208+
break;
1209+
case fec_type_none:
1210+
default:
1211+
// Possible fix_bits indication.
1212+
if (audio_config.achan[chan].fix_bits != RETRY_NONE || audio_config.achan[chan].passall) {
1213+
assert (retries >= RETRY_NONE && retries <= RETRY_MAX);
1214+
snprintf (display_retries, sizeof(display_retries), " [%s] ", retry_text[(int)retries]);
1215+
}
1216+
break;
12061217
}
12071218

12081219
ax25_format_addrs (pp, stemp);
@@ -1567,7 +1578,7 @@ void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alev
15671578
* However, if it used FEC mode (FX.25. IL2P), we have much higher level of
15681579
* confidence that it is correct.
15691580
*/
1570-
if (ax25_is_aprs(pp) && ( retries == RETRY_NONE || is_fx25) ) {
1581+
if (ax25_is_aprs(pp) && ( retries == RETRY_NONE || fec_type == fec_type_fx25 || fec_type == fec_type_il2p) ) {
15711582

15721583
igate_send_rec_packet (chan, pp);
15731584
}
@@ -1588,7 +1599,7 @@ void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alev
15881599
* However, if it used FEC mode (FX.25. IL2P), we have much higher level of
15891600
* confidence that it is correct.
15901601
*/
1591-
if (ax25_is_aprs(pp) && ( retries == RETRY_NONE || is_fx25) ) {
1602+
if (ax25_is_aprs(pp) && ( retries == RETRY_NONE || fec_type == fec_type_fx25 || fec_type == fec_type_il2p) ) {
15921603

15931604
digipeater (chan, pp);
15941605
}
@@ -1598,7 +1609,7 @@ void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alev
15981609
* Use only those with correct CRC (or using FEC.)
15991610
*/
16001611

1601-
if (retries == RETRY_NONE || is_fx25) {
1612+
if (retries == RETRY_NONE || fec_type == fec_type_fx25 || fec_type == fec_type_il2p) {
16021613

16031614
cdigipeater (chan, pp);
16041615
}

‎src/dlq.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,10 @@ void dlq_init (void)
215215
* display of audio level line.
216216
* Use -2 to indicate DTMF message.)
217217
*
218-
* is_fx25 - Was it from FX.25? Need to know because
218+
* fec_type - Was it from FX.25 or IL2P? Need to know because
219219
* meaning of retries is different.
220220
*
221-
* retries - Level of bit correction used.
221+
* retries - Level of correction used.
222222
*
223223
* spectrum - Display of how well multiple decoders did.
224224
*
@@ -228,7 +228,7 @@ void dlq_init (void)
228228
*
229229
*--------------------------------------------------------------------*/
230230

231-
void dlq_rec_frame (int chan, int subchan, int slice, packet_t pp, alevel_t alevel, int is_fx25, retry_t retries, char *spectrum)
231+
void dlq_rec_frame (int chan, int subchan, int slice, packet_t pp, alevel_t alevel, fec_type_t fec_type, retry_t retries, char *spectrum)
232232
{
233233

234234
struct dlq_item_s *pnew;
@@ -278,7 +278,7 @@ void dlq_rec_frame (int chan, int subchan, int slice, packet_t pp, alevel_t alev
278278
pnew->subchan = subchan;
279279
pnew->pp = pp;
280280
pnew->alevel = alevel;
281-
pnew->is_fx25 = is_fx25;
281+
pnew->fec_type = fec_type;
282282
pnew->retries = retries;
283283
if (spectrum == NULL)
284284
strlcpy(pnew->spectrum, "", sizeof(pnew->spectrum));

‎src/dlq.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,13 @@ typedef struct cdata_s {
3333

3434

3535

36+
3637
/* Types of things that can be in queue. */
3738

3839
typedef enum dlq_type_e {DLQ_REC_FRAME, DLQ_CONNECT_REQUEST, DLQ_DISCONNECT_REQUEST, DLQ_XMIT_DATA_REQUEST, DLQ_REGISTER_CALLSIGN, DLQ_UNREGISTER_CALLSIGN, DLQ_OUTSTANDING_FRAMES_REQUEST, DLQ_CHANNEL_BUSY, DLQ_SEIZE_CONFIRM, DLQ_CLIENT_CLEANUP} dlq_type_t;
3940

41+
typedef enum fec_type_e {fec_type_none=0, fec_type_fx25=1, fec_type_il2p=2} fec_type_t;
42+
4043

4144
/* A queue item. */
4245

@@ -68,7 +71,7 @@ typedef struct dlq_item_s {
6871

6972
alevel_t alevel; /* Audio level. */
7073

71-
int is_fx25; /* Was it from FX.25? */
74+
fec_type_t fec_type; // Type of FEC for received signal: none, FX.25, or IL2P.
7275

7376
retry_t retries; /* Effort expended to get a valid CRC. */
7477
/* Bits changed for regular AX.25. */
@@ -106,7 +109,7 @@ void dlq_init (void);
106109

107110

108111

109-
void dlq_rec_frame (int chan, int subchan, int slice, packet_t pp, alevel_t alevel, int is_fx25, retry_t retries, char *spectrum);
112+
void dlq_rec_frame (int chan, int subchan, int slice, packet_t pp, alevel_t alevel, fec_type_t fec_type, retry_t retries, char *spectrum);
110113

111114
void dlq_connect_request (char addrs[AX25_MAX_ADDRS][AX25_MAX_ADDR_LEN], int num_addr, int chan, int client, int pid);
112115

‎src/hdlc_rec2.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "ax25_pad.h" /* for packet_t, alevel_t */
77
#include "rrbb.h"
88
#include "audio.h" /* for struct audio_s */
9+
#include "dlq.h" // for fec_type_t definition.
910

1011

1112

@@ -62,6 +63,6 @@ int hdlc_rec2_try_to_fix_later (rrbb_t block, int chan, int subchan, int slice,
6263

6364
/* Provided by the top level application to process a complete frame. */
6465

65-
void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alevel_t level, int is_fx25, retry_t retries, char *spectrum);
66+
void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alevel_t level, fec_type_t fec_type, retry_t retries, char *spectrum);
6667

6768
#endif

‎src/igate.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1564,9 +1564,9 @@ static void * igate_recv_thread (void *arg)
15641564
// See what happens with -2 and follow up on this.
15651565
// Do we need something else here?
15661566
int slice = 0;
1567-
int is_fx25 = 0;
1567+
fec_type_t fec_type = fec_type_none;
15681568
char spectrum[] = "APRS-IS";
1569-
dlq_rec_frame (ichan, subchan, slice, pp3, alevel, is_fx25, RETRY_NONE, spectrum);
1569+
dlq_rec_frame (ichan, subchan, slice, pp3, alevel, fec_type, RETRY_NONE, spectrum);
15701570
}
15711571
else {
15721572
text_color_set(DW_COLOR_ERROR);

‎src/il2p_test.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ void tone_gen_put_bit (int chan, int data)
943943

944944
// This is called when a complete frame has been deserialized.
945945

946-
void multi_modem_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alevel_t alevel, retry_t retries, int is_fx25)
946+
void multi_modem_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alevel_t alevel, retry_t retries, fec_type_t fec_type)
947947
{
948948
if (rec_count < 0) return; // Skip check before serdes test.
949949

‎src/multi_modem.c

+18-14
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ static struct audio_s *save_audio_config_p;
116116
static struct {
117117
packet_t packet_p;
118118
alevel_t alevel;
119-
int is_fx25; // 1 for FX.25, 0 for regular AX.25.
119+
float speed_error;
120+
fec_type_t fec_type; // Type of FEC: none(0), fx25, il2p
120121
retry_t retries; // For the old "fix bits" strategy, this is the
121122
// number of bits that were modified to get a good CRC.
122123
// It would be 0 to something around 4.
@@ -306,14 +307,14 @@ void multi_modem_process_sample (int chan, int audio_sample)
306307
* display of audio level line.
307308
* Use -2 to indicate DTMF message.)
308309
* retries - Level of correction used.
309-
* is_fx25 - 1 for FX.25, 0 for normal AX.25.
310+
* fec_type - none(0), fx25, il2p
310311
*
311312
* Description: Add to list of candidates. Best one will be picked later.
312313
*
313314
*--------------------------------------------------------------------*/
314315

315316

316-
void multi_modem_process_rec_frame (int chan, int subchan, int slice, unsigned char *fbuf, int flen, alevel_t alevel, retry_t retries, int is_fx25)
317+
void multi_modem_process_rec_frame (int chan, int subchan, int slice, unsigned char *fbuf, int flen, alevel_t alevel, retry_t retries, fec_type_t fec_type)
317318
{
318319
packet_t pp;
319320

@@ -346,12 +347,12 @@ void multi_modem_process_rec_frame (int chan, int subchan, int slice, unsigned c
346347
pp = ax25_from_frame (fbuf, flen, alevel);
347348
}
348349

349-
multi_modem_process_rec_packet (chan, subchan, slice, pp, alevel, retries, is_fx25);
350+
multi_modem_process_rec_packet (chan, subchan, slice, pp, alevel, retries, fec_type);
350351
}
351352

352353
// TODO: Eliminate function above and move code elsewhere?
353354

354-
void multi_modem_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alevel_t alevel, retry_t retries, int is_fx25)
355+
void multi_modem_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alevel_t alevel, retry_t retries, fec_type_t fec_type)
355356
{
356357
if (pp == NULL) {
357358
text_color_set(DW_COLOR_ERROR);
@@ -386,7 +387,7 @@ void multi_modem_process_rec_packet (int chan, int subchan, int slice, packet_t
386387
ax25_delete (pp);
387388
}
388389
else {
389-
dlq_rec_frame (chan, subchan, slice, pp, alevel, is_fx25, retries, "");
390+
dlq_rec_frame (chan, subchan, slice, pp, alevel, fec_type, retries, "");
390391
}
391392
return;
392393
}
@@ -406,7 +407,7 @@ void multi_modem_process_rec_packet (int chan, int subchan, int slice, packet_t
406407

407408
candidate[chan][subchan][slice].packet_p = pp;
408409
candidate[chan][subchan][slice].alevel = alevel;
409-
candidate[chan][subchan][slice].is_fx25 = is_fx25;
410+
candidate[chan][subchan][slice].fec_type = fec_type;
410411
candidate[chan][subchan][slice].retries = retries;
411412
candidate[chan][subchan][slice].age = 0;
412413
candidate[chan][subchan][slice].crc = ax25_m_m_crc(pp);
@@ -443,6 +444,9 @@ static void pick_best_candidate (int chan)
443444
int best_n, best_score;
444445
char spectrum[MAX_SUBCHANS*MAX_SLICERS+1];
445446
int n, j, k;
447+
if (save_audio_config_p->achan[chan].num_slicers < 1) {
448+
save_audio_config_p->achan[chan].num_slicers = 1;
449+
}
446450
int num_bars = save_audio_config_p->achan[chan].num_slicers * save_audio_config_p->achan[chan].num_subchan;
447451

448452
memset (spectrum, 0, sizeof(spectrum));
@@ -456,15 +460,15 @@ static void pick_best_candidate (int chan)
456460
if (candidate[chan][j][k].packet_p == NULL) {
457461
spectrum[n] = '_';
458462
}
459-
else if (candidate[chan][j][k].is_fx25) {
463+
else if (candidate[chan][j][k].fec_type != fec_type_none) { // FX.25 or IL2P
460464
// FIXME: using retries both as an enum and later int too.
461465
if ((int)(candidate[chan][j][k].retries) <= 9) {
462466
spectrum[n] = '0' + candidate[chan][j][k].retries;
463467
}
464468
else {
465469
spectrum[n] = '+';
466470
}
467-
}
471+
} // AX.25 below
468472
else if (candidate[chan][j][k].retries == RETRY_NONE) {
469473
spectrum[n] = '|';
470474
}
@@ -481,8 +485,8 @@ static void pick_best_candidate (int chan)
481485
candidate[chan][j][k].score = 0;
482486
}
483487
else {
484-
if (candidate[chan][j][k].is_fx25) {
485-
candidate[chan][j][k].score = 9000 - 100 * candidate[chan][j][k].retries;
488+
if (candidate[chan][j][k].fec_type != fec_type_none) {
489+
candidate[chan][j][k].score = 9000 - 100 * candidate[chan][j][k].retries; // has FEC
486490
}
487491
else {
488492
/* Originally, this produced 0 for the PASSALL case. */
@@ -550,9 +554,9 @@ static void pick_best_candidate (int chan)
550554
candidate[chan][j][k].packet_p);
551555
}
552556
else {
553-
dw_printf ("%d.%d.%d: ptr=%p, is_fx25=%d, retry=%d, age=%3d, crc=%04x, score=%d %s\n", chan, j, k,
557+
dw_printf ("%d.%d.%d: ptr=%p, fec_type=%d, retry=%d, age=%3d, crc=%04x, score=%d %s\n", chan, j, k,
554558
candidate[chan][j][k].packet_p,
555-
candidate[chan][j][k].is_fx25,
559+
(int)(candidate[chan][j][k].fec_type),
556560
(int)(candidate[chan][j][k].retries),
557561
candidate[chan][j][k].age,
558562
candidate[chan][j][k].crc,
@@ -611,7 +615,7 @@ static void pick_best_candidate (int chan)
611615
dlq_rec_frame (chan, j, k,
612616
candidate[chan][j][k].packet_p,
613617
candidate[chan][j][k].alevel,
614-
candidate[chan][j][k].is_fx25,
618+
candidate[chan][j][k].fec_type,
615619
(int)(candidate[chan][j][k].retries),
616620
spectrum);
617621

‎src/multi_modem.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ void multi_modem_process_sample (int c, int audio_sample);
1717
int multi_modem_get_dc_average (int chan);
1818

1919
// Deprecated. Replace with ...packet
20-
void multi_modem_process_rec_frame (int chan, int subchan, int slice, unsigned char *fbuf, int flen, alevel_t alevel, retry_t retries, int is_fx25);
20+
void multi_modem_process_rec_frame (int chan, int subchan, int slice, unsigned char *fbuf, int flen, alevel_t alevel, retry_t retries, fec_type_t fec_type);
2121

22-
void multi_modem_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alevel_t alevel, retry_t retries, int is_fx25);
22+
void multi_modem_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alevel_t alevel, retry_t retries, fec_type_t fec_type);
2323

2424
#endif

‎src/recv.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ void recv_process (void)
339339
* - Digipeater.
340340
*/
341341

342-
app_process_rec_packet (pitem->chan, pitem->subchan, pitem->slice, pitem->pp, pitem->alevel, pitem->is_fx25, pitem->retries, pitem->spectrum);
342+
app_process_rec_packet (pitem->chan, pitem->subchan, pitem->slice, pitem->pp, pitem->alevel, pitem->fec_type, pitem->retries, pitem->spectrum);
343343

344344

345345
/*

0 commit comments

Comments
 (0)