Clean_LCD_beat_in_NOAA_Rx_App (#2678)

This commit is contained in:
Brumi-2021 2025-06-03 21:10:58 +02:00 committed by GitHub
parent dfdd52c667
commit fecfe8b8fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 6 deletions

View File

@ -143,7 +143,7 @@ class WFMAMAptOptionsView : public View {
}; };
OptionsField options_config{ OptionsField options_config{
{3 * 8, 0 * 16}, {3 * 8, 0 * 16},
19, // Max option char length "80k-NOAA Apt LPF-2K" , example. 16, // Max option char length "80k-NOAA Apt LPF" , example.
{ {
// Using common messages from freqman_ui.cpp // Using common messages from freqman_ui.cpp
}}; }};

View File

@ -108,9 +108,9 @@ options_t freqman_bandwidths[6] = {
}, },
{ {
// WFMAM for NOAA satellites, 137 Mhz band // WFMAM for NOAA satellites, 137 Mhz band
{"80k-NOAA Apt LPF-2K", 0}, {"80k-NOAA Apt LPF", 0}, // Captured RF IQ filtered BW 80K, APT baseband filtered with Low Pass Filter 4k5 fc -3dB
{"38k-NOAA Apt LPF-2K", 1}, {"38k-NOAA Apt LPF", 1}, // Captured RF IQ filtered BW 38K, APT baseband filtered with Low Pass Filter 4k5 fc -3dB
{"38k-NOAA Apt BPF-2K", 2}, // Symetrical BPF centred to the 2k4 AM subcarrier, BW = 2KHz {"38k-NOAA Apt BPF", 2}, // Captured RF IQ filtered BW 38K, APT baseband filtered BPF centred to the 2k4 AM subcarrier, BW = 2KHz
}, },
}; };

View File

@ -157,7 +157,7 @@ void NoaaAptRx::configure(const NoaaAptRxConfigureMessage& message) {
channel_filter_high_f = taps_38k_wfmam_decim_1.high_frequency_normalized * decim_1_input_fs; channel_filter_high_f = taps_38k_wfmam_decim_1.high_frequency_normalized * decim_1_input_fs;
channel_filter_transition = taps_38k_wfmam_decim_1.transition_normalized * decim_1_input_fs; channel_filter_transition = taps_38k_wfmam_decim_1.transition_normalized * decim_1_input_fs;
demod.configure(demod_input_fs, 17000); demod.configure(demod_input_fs, 17000);
audio_filter.configure(taps_64_lp_1875_2166.taps); audio_filter.configure(taps_64_bpf_2k4_bw_2k.taps);
audio_output.configure(apt_audio_12k_notch_2k4_config, apt_audio_12k_lpf_2000hz_config); audio_output.configure(apt_audio_12k_notch_2k4_config, apt_audio_12k_lpf_2000hz_config);
// channel_spectrum.set_decimation_factor(1); // channel_spectrum.set_decimation_factor(1);
update_params(); update_params();

View File

@ -1498,7 +1498,7 @@ constexpr fir_taps_real<64> taps_64_lp_1875_2166{
* -> 12kHz int16_t output, gain of 1.0 (I think). * -> 12kHz int16_t output, gain of 1.0 (I think).
*/ */
constexpr fir_taps_real<64> taps_64_bpf_2k4_bw_2k{ constexpr fir_taps_real<64> taps_64_bpf_2k4_bw_2k{
.low_frequency_normalized = -0.1875f, // not updated, this is just for LPF , waterfall GUI, we are not using in HPF NOAA app. .low_frequency_normalized = -0.1875f, // not updated, this is just for LPF , waterfall GUI, we are not using in BPF NOAA app.
.high_frequency_normalized = 0.1875f, // not used GUI in NOAA App. .high_frequency_normalized = 0.1875f, // not used GUI in NOAA App.
.transition_normalized = 0.03f, // not used GUI in NOAA app. .transition_normalized = 0.03f, // not used GUI in NOAA app.
.taps = {{-45, -29, 32, 63, 0, -125, -181, -81, 61, .taps = {{-45, -29, 32, 63, 0, -125, -181, -81, 61,