From e809d354431697a27acf3e742e2ef07ee5f89b60 Mon Sep 17 00:00:00 2001 From: sh123 Date: Thu, 4 Aug 2022 23:38:24 +0300 Subject: [PATCH] Frequency limits --- .../java/com/radio/codec2talkie/transport/SoundModem.java | 4 ++-- libcodec2-android/src/main/cpp/Codec2JNI.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/transport/SoundModem.java b/codec2talkie/src/main/java/com/radio/codec2talkie/transport/SoundModem.java index d63a585..16dfc51 100644 --- a/codec2talkie/src/main/java/com/radio/codec2talkie/transport/SoundModem.java +++ b/codec2talkie/src/main/java/com/radio/codec2talkie/transport/SoundModem.java @@ -60,8 +60,8 @@ public class SoundModem implements Transport, Runnable { String type = _sharedPreferences.getString(PreferenceKeys.PORTS_SOUND_MODEM_TYPE, "1200"); _name = "SoundModem" + type; if (type.equals("300")) { - // XXX, use 230 tone spacing, <230 spacing for 300 bps does not work with codec2 fsk for receive - _fskModem = Codec2.fskCreate(SAMPLE_RATE, 300, 1600, disableRx ? 200 : 230); + // <230 spacing for 300 bps does not work with codec2 fsk for receive + _fskModem = Codec2.fskCreate(SAMPLE_RATE, 300, 1600, 200); } else { _fskModem = Codec2.fskCreate(SAMPLE_RATE, 1200, 1200, 1000); } diff --git a/libcodec2-android/src/main/cpp/Codec2JNI.cpp b/libcodec2-android/src/main/cpp/Codec2JNI.cpp index bde17aa..a516ec5 100644 --- a/libcodec2-android/src/main/cpp/Codec2JNI.cpp +++ b/libcodec2-android/src/main/cpp/Codec2JNI.cpp @@ -74,7 +74,7 @@ namespace Java_com_ustadmobile_codec2_Codec2 { conFsk->demodBits = (uint8_t*)malloc(sizeof(uint8_t) * fsk->Nbits); conFsk->demodBuf = (int16_t*)malloc(sizeof(short) * (fsk->N + 2 * fsk->Ts)); - fsk_set_freq_est_limits(fsk, 500, sampleFrequency / 2); + fsk_set_freq_est_limits(fsk, 500, sampleFrequency / 4); fsk_set_freq_est_alg(fsk, 0); auto pv = (unsigned long) conFsk;