Skip to content

Commit 049614d

Browse files
wb2oszwb2osz
committed
Fix IL2P for 9600 bps.
1 parent 6442466 commit 049614d

8 files changed

+46
-6
lines changed

‎CHANGES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
### New Features: ###
99

10-
- Improved Layer 2 Protocol [(IL2P)](https://en.wikipedia.org/wiki/FX.25_Forward_Error_Correction). Use "-I 1" to enable transmit for first channel.
10+
- Improved Layer 2 Protocol [(IL2P)](https://en.wikipedia.org/wiki/FX.25_Forward_Error_Correction). Use "-I 1" on command line to enable transmit for first channel. Compatible with Nino TNC for 1200 and 9600 bps.
1111

1212
- Limited support for CM109/CM119 GPIO PTT on Windows.
1313

‎src/audio.c

+2
Original file line numberDiff line numberDiff line change
@@ -1094,6 +1094,8 @@ int audio_get (int a)
10941094
dw_printf ("This is most likely caused by the CPU being too slow to keep up with the audio stream.\n");
10951095
dw_printf ("Use the \"top\" command, in another command window, to look at CPU usage.\n");
10961096
dw_printf ("This might be a temporary condition so we will attempt to recover a few times before giving up.\n");
1097+
dw_printf ("If using a very slow CPU, try reducing the CPU load by using -P- command\n");
1098+
dw_printf ("line option for 9600 bps or -D3 for slower AFSK .\n");
10971099
}
10981100

10991101
audio_stats (a,

‎src/ax25_pad2.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@
102102
*
103103
* RR note: It seems that some implementations put a hint
104104
* in the "RR" reserved bits.
105-
* http://www.tapr.org/pipermail/ax25-layer2/2005-October/000297.html
105+
* http://www.tapr.org/pipermail/ax25-layer2/2005-October/000297.html (now broken)
106+
* https://elixir.bootlin.com/linux/latest/source/net/ax25/ax25_addr.c#L237
107+
*
106108
* The RR bits can also be used for "DAMA" which is
107109
* some sort of channel access coordination scheme.
108110
* http://internet.freepage.de/cgi-bin/feets/freepage_ext/41030x030A/rewrite/hennig/afu/afudoc/afudama.html

‎src/config.c

+1
Original file line numberDiff line numberDiff line change
@@ -4522,6 +4522,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
45224522
*
45234523
* In version 1.2 we allow 0 to disable listening.
45244524
*/
4525+
// FIXME: complain if extra parameter e.g. port as in KISSPORT
45254526

45264527
else if (strcasecmp(t, "AGWPORT") == 0) {
45274528
int n;

‎src/demod_afsk.c

+9-3
Original file line numberDiff line numberDiff line change
@@ -431,11 +431,17 @@ void demod_afsk_init (int samples_per_sec, int baud, int mark_freq,
431431

432432
TUNE("TUNE_PRE_FILTER_TAPS", D->pre_filter_taps, "pre_filter_taps", "%d")
433433

434+
// TODO: Size comes out to 417 for 1200 bps with 48000 sample rate.
435+
// The message is upsetting. Can we handle this better?
436+
434437
if (D->pre_filter_taps > MAX_FILTER_SIZE) {
435438
text_color_set (DW_COLOR_ERROR);
436-
dw_printf ("Calculated pre filter size of %d is too large.\n", D->pre_filter_taps);
437-
dw_printf ("Decrease the audio sample rate or increase the decimation factor or\n");
438-
dw_printf ("recompile the application with MAX_FILTER_SIZE larger than %d.\n", MAX_FILTER_SIZE);
439+
dw_printf ("Warning: Calculated pre filter size of %d is too large.\n", D->pre_filter_taps);
440+
dw_printf ("Decrease the audio sample rate or increase the decimation factor.\n");
441+
dw_printf ("You can use -D2 or -D3, on the command line, to down-sample the audio rate\n");
442+
dw_printf ("before demodulating. This greatly decreases the CPU requirements with little\n");
443+
dw_printf ("impact on the decoding performance. This is useful for a slow ARM processor,\n");
444+
dw_printf ("such as with a Raspberry Pi model 1.\n");
439445
D->pre_filter_taps = (MAX_FILTER_SIZE - 1) | 1;
440446
}
441447

‎src/gen_tone.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,10 @@ void tone_gen_put_bit (int chan, int dat)
360360
bit_count[chan] = 0;
361361
}
362362

363-
if (save_audio_config_p->achan[chan].modem_type == MODEM_SCRAMBLE) {
363+
// Would be logical to have MODEM_BASEBAND for IL2P rather than checking here. But...
364+
// That would mean putting in at least 3 places and testing all rather than just one.
365+
if (save_audio_config_p->achan[chan].modem_type == MODEM_SCRAMBLE &&
366+
save_audio_config_p->achan[chan].layer2_xmit != LAYER2_IL2P) {
364367
int x;
365368

366369
x = (dat ^ (lfsr[chan] >> 16) ^ (lfsr[chan] >> 11)) & 1;

‎test/CMakeLists.txt

+8
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ set(TEST_CHECK-MODEM1200_FILE "check-modem1200")
2020
set(TEST_CHECK-MODEM1200_IL2P_FILE "check-modem1200-i")
2121
set(TEST_CHECK-MODEM300_FILE "check-modem300")
2222
set(TEST_CHECK-MODEM9600_FILE "check-modem9600")
23+
set(TEST_CHECK-MODEM9600_IL2P_FILE "check-modem9600-i")
2324
set(TEST_CHECK-MODEM19200_FILE "check-modem19200")
2425
set(TEST_CHECK-MODEM2400-a_FILE "check-modem2400-a")
2526
set(TEST_CHECK-MODEM2400-b_FILE "check-modem2400-b")
@@ -64,6 +65,12 @@ configure_file(
6465
@ONLY
6566
)
6667

68+
configure_file(
69+
"${CUSTOM_TEST_SCRIPTS_DIR}/${TEST_CHECK-MODEM9600_IL2P_FILE}"
70+
"${CUSTOM_TEST_BINARY_DIR}/${TEST_CHECK-MODEM9600_IL2P_FILE}${CUSTOM_SCRIPT_SUFFIX}"
71+
@ONLY
72+
)
73+
6774
configure_file(
6875
"${CUSTOM_TEST_SCRIPTS_DIR}/${TEST_CHECK-MODEM19200_FILE}"
6976
"${CUSTOM_TEST_BINARY_DIR}/${TEST_CHECK-MODEM19200_FILE}${CUSTOM_SCRIPT_SUFFIX}"
@@ -485,6 +492,7 @@ add_test(check-modem1200 "${CUSTOM_TEST_BINARY_DIR}/${TEST_CHECK-MODEM1200_FILE}
485492
add_test(check-modem1200-i "${CUSTOM_TEST_BINARY_DIR}/${TEST_CHECK-MODEM1200_IL2P_FILE}${CUSTOM_SCRIPT_SUFFIX}")
486493
add_test(check-modem300 "${CUSTOM_TEST_BINARY_DIR}/${TEST_CHECK-MODEM300_FILE}${CUSTOM_SCRIPT_SUFFIX}")
487494
add_test(check-modem9600 "${CUSTOM_TEST_BINARY_DIR}/${TEST_CHECK-MODEM9600_FILE}${CUSTOM_SCRIPT_SUFFIX}")
495+
add_test(check-modem9600-i "${CUSTOM_TEST_BINARY_DIR}/${TEST_CHECK-MODEM9600_IL2P_FILE}${CUSTOM_SCRIPT_SUFFIX}")
488496
add_test(check-modem19200 "${CUSTOM_TEST_BINARY_DIR}/${TEST_CHECK-MODEM19200_FILE}${CUSTOM_SCRIPT_SUFFIX}")
489497
add_test(check-modem2400-a "${CUSTOM_TEST_BINARY_DIR}/${TEST_CHECK-MODEM2400-a_FILE}${CUSTOM_SCRIPT_SUFFIX}")
490498
add_test(check-modem2400-b "${CUSTOM_TEST_BINARY_DIR}/${TEST_CHECK-MODEM2400-b_FILE}${CUSTOM_SCRIPT_SUFFIX}")

‎test/scripts/check-modem9600-i

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
@CUSTOM_SHELL_SHABANG@
2+
3+
@GEN_PACKETS_BIN@ -B9600 -I1 -n 100 -o test96-il2p-I1.wav
4+
@ATEST_BIN@ -B9600 -L72 -G76 test96-il2p-I1.wav
5+
@ATEST_BIN@ -B9600 -P+ -L76 -G80 test96-il2p-I1.wav
6+
7+
@GEN_PACKETS_BIN@ -B9600 -I0 -n 100 -o test96-il2p-I0.wav
8+
@ATEST_BIN@ -B9600 -L64 -G68 test96-il2p-I0.wav
9+
10+
11+
@GEN_PACKETS_BIN@ -B9600 -i1 -n 100 -o test96-il2p-i1.wav
12+
@ATEST_BIN@ -B9600 -L70 -G74 test96-il2p-i1.wav
13+
@ATEST_BIN@ -B9600 -P+ -L73 -G77 test96-il2p-i1.wav
14+
15+
@GEN_PACKETS_BIN@ -B9600 -i0 -n 100 -o test96-il2p-i0.wav
16+
@ATEST_BIN@ -B9600 -L67 -G71 test96-il2p-i0.wav
17+
18+

0 commit comments

Comments
 (0)