mirror of
https://github.com/eried/portapack-mayhem.git
synced 2025-08-10 07:30:08 -04:00
Implemented correct display of the filter indicator on the waterfall
This commit is contained in:
Белоусов Олег
parent
608c8c3597
commit
63f6a885d8
17 changed files with 153 additions and 73 deletions
|
|
@ -32,6 +32,9 @@ template<size_t N>
|
|||
struct fir_taps_real {
|
||||
float pass_frequency_normalized;
|
||||
float stop_frequency_normalized;
|
||||
float low_frequency_normalized;
|
||||
float high_frequency_normalized;
|
||||
float transition_normalized;
|
||||
std::array<int16_t, N> taps;
|
||||
};
|
||||
|
||||
|
|
@ -39,6 +42,9 @@ template<size_t N>
|
|||
struct fir_taps_complex {
|
||||
float pass_frequency_normalized;
|
||||
float stop_frequency_normalized;
|
||||
float low_frequency_normalized;
|
||||
float high_frequency_normalized;
|
||||
float transition_normalized;
|
||||
std::array<complex16_t, N> taps;
|
||||
};
|
||||
|
||||
|
|
@ -48,6 +54,9 @@ struct fir_taps_complex {
|
|||
constexpr fir_taps_real<24> taps_16k0_decim_0 {
|
||||
.pass_frequency_normalized = 8000.0f / 3072000.0f,
|
||||
.stop_frequency_normalized = 344000.0f / 3072000.0f,
|
||||
.low_frequency_normalized = -8000.0f / 3072000.0f,
|
||||
.high_frequency_normalized = 8000.0f / 3072000.0f,
|
||||
.transition_normalized = 336000.0f / 3072000.0f,
|
||||
.taps = { {
|
||||
1, 67, 165, 340, 599, 944, 1361, 1820,
|
||||
2278, 2684, 2988, 3152, 3152, 2988, 2684, 2278,
|
||||
|
|
@ -59,6 +68,9 @@ constexpr fir_taps_real<24> taps_16k0_decim_0 {
|
|||
constexpr fir_taps_real<32> taps_16k0_decim_1 {
|
||||
.pass_frequency_normalized = 8000.0f / 384000.0f,
|
||||
.stop_frequency_normalized = 40000.0f / 384000.0f,
|
||||
.low_frequency_normalized = -8000.0f / 384000.0f,
|
||||
.high_frequency_normalized = 8000.0f / 384000.0f,
|
||||
.transition_normalized = 32000.0f / 384000.0f,
|
||||
.taps = { {
|
||||
-26, -125, -180, -275, -342, -359, -286, -90,
|
||||
250, 733, 1337, 2011, 2688, 3289, 3740, 3982,
|
||||
|
|
@ -71,6 +83,9 @@ constexpr fir_taps_real<32> taps_16k0_decim_1 {
|
|||
constexpr fir_taps_real<32> taps_16k0_channel {
|
||||
.pass_frequency_normalized = 8000.0f / 48000.0f,
|
||||
.stop_frequency_normalized = 12400.0f / 48000.0f,
|
||||
.low_frequency_normalized = -8000.0f / 48000.0f,
|
||||
.high_frequency_normalized = 8000.0f / 48000.0f,
|
||||
.transition_normalized = 4400.0f / 48000.0f,
|
||||
.taps = { {
|
||||
-73, -285, -376, -8, 609, 538, -584, -1387,
|
||||
-148, 2173, 1959, -2146, -5267, -297, 12915, 24737,
|
||||
|
|
@ -85,6 +100,9 @@ constexpr fir_taps_real<32> taps_16k0_channel {
|
|||
constexpr fir_taps_real<24> taps_11k0_decim_0 {
|
||||
.pass_frequency_normalized = 5500.0f / 3072000.0f,
|
||||
.stop_frequency_normalized = 341500.0f / 3072000.0f,
|
||||
.low_frequency_normalized = -5500.0f / 3072000.0f,
|
||||
.high_frequency_normalized = 5500.0f / 3072000.0f,
|
||||
.transition_normalized = 336000.0f / 3072000.0f,
|
||||
.taps = { {
|
||||
38, 102, 220, 406, 668, 1004, 1397, 1822,
|
||||
2238, 2603, 2875, 3020, 3020, 2875, 2603, 2238,
|
||||
|
|
@ -96,6 +114,9 @@ constexpr fir_taps_real<24> taps_11k0_decim_0 {
|
|||
constexpr fir_taps_real<32> taps_11k0_decim_1 {
|
||||
.pass_frequency_normalized = 5500.0f / 384000.0f,
|
||||
.stop_frequency_normalized = 42500.0f / 384000.0f,
|
||||
.low_frequency_normalized = -5500.0f / 384000.0f,
|
||||
.high_frequency_normalized = 5500.0f / 384000.0f,
|
||||
.transition_normalized = 37000.0f / 384000.0f,
|
||||
.taps = { {
|
||||
-42, -87, -157, -234, -298, -318, -255, -75,
|
||||
246, 713, 1306, 1976, 2656, 3265, 3724, 3971,
|
||||
|
|
@ -108,6 +129,9 @@ constexpr fir_taps_real<32> taps_11k0_decim_1 {
|
|||
constexpr fir_taps_real<32> taps_11k0_channel {
|
||||
.pass_frequency_normalized = 5500.0f / 48000.0f,
|
||||
.stop_frequency_normalized = 8900.0f / 48000.0f,
|
||||
.low_frequency_normalized = -5500.0f / 48000.0f,
|
||||
.high_frequency_normalized = 5500.0f / 48000.0f,
|
||||
.transition_normalized = 3400.0f / 48000.0f,
|
||||
.taps = { {
|
||||
-68, -345, -675, -867, -582, 247, 1222, 1562,
|
||||
634, -1379, -3219, -3068, 310, 6510, 13331, 17795,
|
||||
|
|
@ -122,6 +146,9 @@ constexpr fir_taps_real<32> taps_11k0_channel {
|
|||
constexpr fir_taps_real<24> taps_4k25_decim_0 {
|
||||
.pass_frequency_normalized = 4250.0f / 3072000.0f,
|
||||
.stop_frequency_normalized = 340250.0f / 3072000.0f,
|
||||
.low_frequency_normalized = -4250.0f / 3072000.0f,
|
||||
.high_frequency_normalized = 4250.0f / 3072000.0f,
|
||||
.transition_normalized = 33600.0f / 3072000.0f,
|
||||
.taps = { {
|
||||
38, 103, 222, 409, 671, 1006, 1399, 1821,
|
||||
2236, 2599, 2868, 3012, 3012, 2868, 2599, 2236,
|
||||
|
|
@ -133,6 +160,9 @@ constexpr fir_taps_real<24> taps_4k25_decim_0 {
|
|||
constexpr fir_taps_real<32> taps_4k25_decim_1 {
|
||||
.pass_frequency_normalized = 4250.0f / 384000.0f,
|
||||
.stop_frequency_normalized = 43750.0f / 384000.0f,
|
||||
.low_frequency_normalized = -4250.0f / 384000.0f,
|
||||
.high_frequency_normalized = 4250.0f / 384000.0f,
|
||||
.transition_normalized = 39500.0f / 384000.0f,
|
||||
.taps = { {
|
||||
-33, -74, -139, -214, -280, -306, -254, -87,
|
||||
222, 682, 1274, 1951, 2644, 3268, 3741, 3996,
|
||||
|
|
@ -145,6 +175,9 @@ constexpr fir_taps_real<32> taps_4k25_decim_1 {
|
|||
constexpr fir_taps_real<32> taps_4k25_channel {
|
||||
.pass_frequency_normalized = 4250.0f / 48000.0f,
|
||||
.stop_frequency_normalized = 7900.0f / 48000.0f,
|
||||
.low_frequency_normalized = -4250.0f / 48000.0f,
|
||||
.high_frequency_normalized = 4250.0f / 48000.0f,
|
||||
.transition_normalized = 3650.0f / 48000.0f,
|
||||
.taps = { {
|
||||
-58, -14, 153, 484, 871, 1063, 770, -141,
|
||||
-1440, -2488, -2435, -614, 3035, 7771, 12226, 14927,
|
||||
|
|
@ -185,6 +218,9 @@ constexpr fir_taps_real<32> taps_4k25_channel {
|
|||
constexpr fir_taps_real<64> taps_64_lp_025_025 {
|
||||
.pass_frequency_normalized = 0.0125f,
|
||||
.stop_frequency_normalized = 0.0125f,
|
||||
.low_frequency_normalized = 0,
|
||||
.high_frequency_normalized = 0,
|
||||
.transition_normalized = 0,
|
||||
.taps = { {
|
||||
0, 0, 2, 6, 12, 20, 32, 46,
|
||||
64, 85, 110, 138, 169, 204, 241, 281,
|
||||
|
|
@ -203,6 +239,9 @@ constexpr fir_taps_real<64> taps_64_lp_025_025 {
|
|||
constexpr fir_taps_real<24> taps_6k0_decim_0 {
|
||||
.pass_frequency_normalized = 3000.0f / 3072000.0f,
|
||||
.stop_frequency_normalized = 339000.0f / 3072000.0f,
|
||||
.low_frequency_normalized = -3000.0f / 3072000.0f,
|
||||
.high_frequency_normalized = 3000.0f / 3072000.0f,
|
||||
.transition_normalized = 336000.0f / 3072000.0f,
|
||||
.taps = { {
|
||||
39, 104, 224, 412, 674, 1008, 1400, 1821,
|
||||
2234, 2594, 2863, 3006, 3006, 2863, 2594, 2234,
|
||||
|
|
@ -214,6 +253,9 @@ constexpr fir_taps_real<24> taps_6k0_decim_0 {
|
|||
constexpr fir_taps_real<32> taps_6k0_decim_1 {
|
||||
.pass_frequency_normalized = 3000.0f / 384000.0f,
|
||||
.stop_frequency_normalized = 45000.0f / 384000.0f,
|
||||
.low_frequency_normalized = -3000.0f / 384000.0f,
|
||||
.high_frequency_normalized = 3000.0f / 384000.0f,
|
||||
.transition_normalized = 43000.0f / 384000.0f,
|
||||
.taps = { {
|
||||
-26, -63, -123, -195, -263, -295, -253, -99,
|
||||
199, 651, 1242, 1927, 2633, 3273, 3760, 4023,
|
||||
|
|
@ -226,6 +268,9 @@ constexpr fir_taps_real<32> taps_6k0_decim_1 {
|
|||
constexpr fir_taps_real<32> taps_6k0_decim_2 {
|
||||
.pass_frequency_normalized = 3000.0f / 48000.0f,
|
||||
.stop_frequency_normalized = 6700.0f / 48000.0f,
|
||||
.low_frequency_normalized = -3000.0f / 48000.0f,
|
||||
.high_frequency_normalized = 3000.0f / 48000.0f,
|
||||
.transition_normalized = 3700.0f / 48000.0f,
|
||||
.taps = { {
|
||||
95, 178, 247, 208, -21, -474, -1080, -1640,
|
||||
-1857, -1411, -83, 2134, 4978, 7946, 10413, 11815,
|
||||
|
|
@ -241,6 +286,9 @@ constexpr fir_taps_real<32> taps_6k0_decim_2 {
|
|||
constexpr fir_taps_complex<64> taps_6k0_dsb_channel {
|
||||
.pass_frequency_normalized = 3000.0f / 12000.0f,
|
||||
.stop_frequency_normalized = 3300.0f / 12000.0f,
|
||||
.low_frequency_normalized = -3000.0f / 12000.0f,
|
||||
.high_frequency_normalized = 3000.0f / 12000.0f,
|
||||
.transition_normalized = 300.0f / 12000.0f,
|
||||
.taps = { {
|
||||
{ -69, 0 }, { -140, 0 }, { 119, 0 }, { 89, 0 },
|
||||
{ -132, 0 }, { -134, 0 }, { 197, 0 }, { 167, 0 },
|
||||
|
|
@ -267,6 +315,9 @@ constexpr fir_taps_complex<64> taps_6k0_dsb_channel {
|
|||
constexpr fir_taps_complex<64> taps_2k8_usb_channel {
|
||||
.pass_frequency_normalized = 3000.0f / 12000.0f,
|
||||
.stop_frequency_normalized = 3300.0f / 12000.0f,
|
||||
.low_frequency_normalized = 0,
|
||||
.high_frequency_normalized = 3000.0f / 12000.0f,
|
||||
.transition_normalized = 300.0f / 12000.0f,
|
||||
.taps = { {
|
||||
{ -146, 0 }, { -41, -45 }, { -1, 10 }, { -95, 69 },
|
||||
{ -194, -41 }, { -91, -158 }, { 14, -43 }, { -150, 67 },
|
||||
|
|
@ -293,6 +344,9 @@ constexpr fir_taps_complex<64> taps_2k8_usb_channel {
|
|||
constexpr fir_taps_complex<64> taps_2k8_lsb_channel {
|
||||
.pass_frequency_normalized = 3000.0f / 12000.0f,
|
||||
.stop_frequency_normalized = 3300.0f / 12000.0f,
|
||||
.low_frequency_normalized = -3000.0f / 12000.0f,
|
||||
.high_frequency_normalized = 0,
|
||||
.transition_normalized = 300.0f / 12000.0f,
|
||||
.taps = { {
|
||||
{ -146, 0 }, { -41, 45 }, { -1, -10 }, { -95, -69 },
|
||||
{ -194, 41 }, { -91, 158 }, { 14, 43 }, { -150, -67 },
|
||||
|
|
@ -318,6 +372,9 @@ constexpr fir_taps_complex<64> taps_2k8_lsb_channel {
|
|||
constexpr fir_taps_complex<64> taps_0k7_usb_channel {
|
||||
.pass_frequency_normalized = 3000.0f / 12000.0f,
|
||||
.stop_frequency_normalized = 3300.0f / 12000.0f,
|
||||
.low_frequency_normalized = 600.0f / 12000.0f,
|
||||
.high_frequency_normalized = 800.0f / 12000.0f,
|
||||
.transition_normalized = 200.0f / 12000.0f,
|
||||
.taps = { {
|
||||
{ 531, 0 }, { 192, 73 }, { 181, 163 }, { 129, 254 },
|
||||
{ 34, 328 }, { -97, 364 }, { -251, 345 }, { -403, 261 },
|
||||
|
|
@ -344,6 +401,9 @@ constexpr fir_taps_complex<64> taps_0k7_usb_channel {
|
|||
constexpr fir_taps_real<24> taps_200k_wfm_decim_0 = {
|
||||
.pass_frequency_normalized = 100000.0f / 3072000.0f,
|
||||
.stop_frequency_normalized = 484000.0f / 3072000.0f,
|
||||
.low_frequency_normalized = -100000.0f / 3072000.0f,
|
||||
.high_frequency_normalized = 100000.0f / 3072000.0f,
|
||||
.transition_normalized = 384000.0f / 3072000.0f,
|
||||
.taps = { {
|
||||
48, -18, -151, -364, -557, -548, -139, 789,
|
||||
2187, 3800, 5230, 6071, 6071, 5230, 3800, 2187,
|
||||
|
|
@ -355,6 +415,9 @@ constexpr fir_taps_real<24> taps_200k_wfm_decim_0 = {
|
|||
constexpr fir_taps_real<16> taps_200k_wfm_decim_1 = {
|
||||
.pass_frequency_normalized = 100000.0f / 768000.0f,
|
||||
.stop_frequency_normalized = 284000.0f / 768000.0f,
|
||||
.low_frequency_normalized = -100000.0f / 768000.0f,
|
||||
.high_frequency_normalized = 100000.0f / 768000.0f,
|
||||
.transition_normalized = 184000.0f / 768000.0f,
|
||||
.taps = { {
|
||||
-67, -123, 388, 622, -1342, -2185, 4599, 14486,
|
||||
14486, 4599, -2185, -1342, 622, 388, -123, -67,
|
||||
|
|
@ -371,6 +434,9 @@ constexpr fir_taps_real<16> taps_200k_wfm_decim_1 = {
|
|||
constexpr fir_taps_real<64> taps_64_lp_156_198 {
|
||||
.pass_frequency_normalized = 0.156f,
|
||||
.stop_frequency_normalized = 0.196f,
|
||||
.low_frequency_normalized = -0.156f,
|
||||
.high_frequency_normalized = 0.156f,
|
||||
.transition_normalized = 0.04f,
|
||||
.taps = { {
|
||||
-27, 166, 104, -36, -174, -129, 109, 287,
|
||||
148, -232, -430, -130, 427, 597, 49, -716,
|
||||
|
|
@ -389,6 +455,9 @@ constexpr fir_taps_real<64> taps_64_lp_156_198 {
|
|||
static constexpr fir_taps_real<24> taps_200k_decim_0 = {
|
||||
.pass_frequency_normalized = 100000.0f / 2457600.0f,
|
||||
.stop_frequency_normalized = 407200.0f / 2457600.0f,
|
||||
.low_frequency_normalized = -100000.0f / 2457600.0f,
|
||||
.high_frequency_normalized = 100000.0f / 2457600.0f,
|
||||
.transition_normalized = 307200.0f / 2457600.0f,
|
||||
.taps = { {
|
||||
90, 94, 4, -240, -570, -776, -563, 309,
|
||||
1861, 3808, 5618, 6710, 6710, 5618, 3808, 1861,
|
||||
|
|
@ -400,6 +469,9 @@ static constexpr fir_taps_real<24> taps_200k_decim_0 = {
|
|||
static constexpr fir_taps_real<16> taps_200k_decim_1 = {
|
||||
.pass_frequency_normalized = 100000.0f / 614400.0f,
|
||||
.stop_frequency_normalized = 207200.0f / 614400.0f,
|
||||
.low_frequency_normalized = -100000.0f / 614400.0f,
|
||||
.high_frequency_normalized = 100000.0f / 614400.0f,
|
||||
.transition_normalized = 107200.0f / 614400.0f,
|
||||
.taps = { {
|
||||
-132, -256, 545, 834, -1507, -2401, 4666, 14583,
|
||||
14583, 4666, -2401, -1507, 834, 545, -256, -132,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue