Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-12-24 23:09:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update/consolidate AIS RRC matched filter taps.

Browse Source
This commit is contained in:
Jared Boone 2015-11-03 11:08:53 -08:00
parent be94c9fa9b
commit 015e5516d5
2 changed files with 106 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/baseband/proc_fsk.hpp
View File

@ -57,7 +57,7 @@ private:
const fir_taps_real<64>& channel_filter_taps = taps_64_lp_031_070_tfilter; const fir_taps_real<64>& channel_filter_taps = taps_64_lp_031_070_tfilter;
dsp::decimate::FIRAndDecimateBy2Complex<64> channel_filter { channel_filter_taps.taps }; dsp::decimate::FIRAndDecimateBy2Complex<64> channel_filter { channel_filter_taps.taps };
dsp::matched_filter::MatchedFilter mf { baseband::ais::rrc_taps_32_p, 1 }; dsp::matched_filter::MatchedFilter mf { baseband::ais::rrc_taps_128_decim_4_p, 1 };
clock_recovery::ClockRecovery<clock_recovery::FixedErrorFilter> clock_recovery { clock_recovery::ClockRecovery<clock_recovery::FixedErrorFilter> clock_recovery {
static_cast<float>(sampling_rate / 4), static_cast<float>(sampling_rate / 4),

108
firmware/common/baseband_ais.hpp
View File

@ -70,14 +70,14 @@ constexpr std::array<std::complex<float>, 8> rrc_taps_8_p { {
// These came from GRC directly, and have a bit more gain, it appears. // These came from GRC directly, and have a bit more gain, it appears.
// //
constexpr std::array<std::complex<float>, 8> rrc_taps_8_p { { constexpr std::array<std::complex<float>, 8> rrc_taps_128_decim_16_p { {
{ 2.1046938375e-02f, 0.0000000000e+00f }, { -2.6308671336e-02f, -2.6308671336e-02f }, { 2.1046938375e-02f, 0.0000000000e+00f }, { -2.6308671336e-02f, -2.6308671336e-02f },
{ -3.2218829289e-18f, -5.2617341280e-02f }, { -2.0290270482e-01f, 2.0290270482e-01f }, { -3.2218829289e-18f, -5.2617341280e-02f }, { -2.0290270482e-01f, 2.0290270482e-01f },
{ -5.6365746260e-01f, 6.9028130738e-17f }, { -2.0290270482e-01f, -2.0290270482e-01f }, { -5.6365746260e-01f, 6.9028130738e-17f }, { -2.0290270482e-01f, -2.0290270482e-01f },
{ 9.6656487867e-18f, 5.2617341280e-02f }, { -2.6308671336e-02f, 2.6308671336e-02f }, { 9.6656487867e-18f, 5.2617341280e-02f }, { -2.6308671336e-02f, 2.6308671336e-02f },
} }; } };
constexpr std::array<std::complex<float>, 16> rrc_taps_16_p { { constexpr std::array<std::complex<float>, 16> rrc_taps_128_decim_8_p { {
{ -5.0682835281e-03f, 0.0000000000e+00f }, { 3.8012127427e-03f, 3.8012127427e-03f }, { -5.0682835281e-03f, 0.0000000000e+00f }, { 3.8012127427e-03f, 3.8012127427e-03f },
{ 9.3102863700e-20f, 1.5204851516e-03f }, { 5.3216978397e-03f, -5.3216978397e-03f }, { 9.3102863700e-20f, 1.5204851516e-03f }, { 5.3216978397e-03f, -5.3216978397e-03f },
{ -2.1286793053e-02f, 2.6068802977e-18f }, { 2.6608490845e-02f, 2.6608490845e-02f }, { -2.1286793053e-02f, 2.6068802977e-18f }, { 2.6608490845e-02f, 2.6608490845e-02f },
@ -88,7 +88,7 @@ constexpr std::array<std::complex<float>, 16> rrc_taps_16_p { {
{ -6.5172004590e-19f, -1.5204851516e-03f }, { 3.8012127427e-03f, -3.8012127427e-03f }, { -6.5172004590e-19f, -1.5204851516e-03f }, { 3.8012127427e-03f, -3.8012127427e-03f },
} }; } };
constexpr std::array<std::complex<float>, 32> rrc_taps_32_p { { constexpr std::array<std::complex<float>, 32> rrc_taps_128_decim_4_p { {
{ -1.2495006667e-03f, 0.0000000000e+00f }, { 7.5862532786e-04f, 7.5862532786e-04f }, { -1.2495006667e-03f, 0.0000000000e+00f }, { 7.5862532786e-04f, 7.5862532786e-04f },
{ 7.1465238505e-21f, 1.1671159155e-04f }, { 8.7533694842e-04f, -8.7533694842e-04f }, { 7.1465238505e-21f, 1.1671159155e-04f }, { 8.7533694842e-04f, -8.7533694842e-04f },
{ -2.2281305864e-03f, 2.7286729908e-19f }, { 1.4482847468e-03f, 1.4482847468e-03f }, { -2.2281305864e-03f, 2.7286729908e-19f }, { 1.4482847468e-03f, 1.4482847468e-03f },
@ -107,6 +107,108 @@ constexpr std::array<std::complex<float>, 32> rrc_taps_32_p { {
{ -3.1451929164e-19f, -1.1671159155e-04f }, { 7.5862532786e-04f, -7.5862532786e-04f }, { -3.1451929164e-19f, -1.1671159155e-04f }, { 7.5862532786e-04f, -7.5862532786e-04f },
} }; } };
constexpr std::array<std::complex<float>, 64> rrc_taps_128_decim_2_p { {
{ -6.2437308952e-04f, 0.0000000000e+00f }, { -2.2010185825e-04f, -9.1169174792e-05f },
{ 3.7908365508e-04f, 3.7908365508e-04f }, { 2.8756602409e-04f, 6.9424579543e-04f },
{ 3.5711042529e-21f, 5.8320558310e-05f }, { 2.8756602409e-04f, -6.9424579543e-04f },
{ 4.3740419207e-04f, -4.3740419207e-04f }, { -3.9158988624e-04f, 1.6220184177e-04f },
{ -1.1133925291e-03f, 1.3635125969e-19f }, { -3.9158988624e-04f, -1.6220184177e-04f },
{ 7.2370509982e-04f, 7.2370509982e-04f }, { 5.6432127027e-04f, 1.3623920642e-03f },
{ 2.9542774240e-20f, 1.6082337243e-04f }, { 5.6432127027e-04f, -1.3623920642e-03f },
{ 8.8452850107e-04f, -8.8452850107e-04f }, { -8.8299684291e-04f, 3.6574926787e-04f },
{ -2.5272241328e-03f, 6.1899138899e-19f }, { -8.8299684291e-04f, -3.6574926787e-04f },
{ 1.8954181931e-03f, 1.8954181931e-03f }, { 1.5745747777e-03f, 3.8013597832e-03f },
{ 2.3212178869e-19f, 7.5816729805e-04f }, { 1.5745747777e-03f, -3.8013597832e-03f },
{ 2.6535855032e-03f, -2.6535855032e-03f }, { -3.5740348583e-03f, 1.4804137107e-03f },
{ -1.0614342056e-02f, 3.8996460073e-18f }, { -3.5740348583e-03f, -1.4804137107e-03f },
{ 1.3267928010e-02f, 1.3267928010e-02f }, { 1.5010946154e-02f, 3.6239629790e-02f },
{ 1.1373966922e-17f, 2.6535853744e-02f }, { 1.5010946154e-02f, -3.6239629790e-02f },
{ 1.0232741681e-01f, -1.0232741681e-01f }, { 2.2516419801e-01f, -9.3266064576e-02f },
{ 2.8426241875e-01f, -1.3924842449e-16f }, { 2.2516419801e-01f, 9.3266064576e-02f },
{ 1.0232741681e-01f, 1.0232741681e-01f }, { 1.5010946154e-02f, 3.6239629790e-02f },
{ -1.4623671757e-17f, -2.6535853744e-02f }, { 1.5010946154e-02f, -3.6239629790e-02f },
{ 1.3267928010e-02f, -1.3267928010e-02f }, { -3.5740348583e-03f, 1.4804137107e-03f },
{ -1.0614342056e-02f, 6.4994100121e-18f }, { -3.5740348583e-03f, -1.4804137107e-03f },
{ 2.6535855032e-03f, 2.6535855032e-03f }, { 1.5745747777e-03f, 3.8013597832e-03f },
{ -1.8574436004e-18f, -7.5816729805e-04f }, { 1.5745747777e-03f, -3.8013597832e-03f },
{ 1.8954181931e-03f, -1.8954181931e-03f }, { -8.8299684291e-04f, 3.6574926787e-04f },
{ -2.5272241328e-03f, 1.8569741670e-18f }, { -8.8299684291e-04f, -3.6574926787e-04f },
{ 8.8452850107e-04f, 8.8452850107e-04f }, { 5.6432127027e-04f, 1.3623920642e-03f },
{ 1.5766100917e-19f, -1.6082337243e-04f }, { 5.6432127027e-04f, -1.3623920642e-03f },
{ 7.2370509982e-04f, -7.2370509982e-04f }, { -3.9158988624e-04f, 1.6220184177e-04f },
{ -1.1133925291e-03f, 9.5445881785e-19f }, { -3.9158988624e-04f, -1.6220184177e-04f },
{ 4.3740419207e-04f, 4.3740419207e-04f }, { 2.8756602409e-04f, 6.9424579543e-04f },
{ -1.5716468643e-19f, -5.8320558310e-05f }, { 2.8756602409e-04f, -6.9424579543e-04f },
{ 3.7908365508e-04f, -3.7908365508e-04f }, { -2.2010185825e-04f, 9.1169174792e-05f },
} };
constexpr std::array<std::complex<float>, 128> rrc_taps_128_decim_1_p { {
{ -3.1209018198e-04f, 0.0000000000e+00f }, { -2.5877077742e-04f, -5.1472707944e-05f },
{ -1.1001696231e-04f, -4.5570517881e-05f }, { 6.6159029602e-05f, 4.4206050285e-05f },
{ 1.8948331997e-04f, 1.8948331997e-04f }, { 2.1174839450e-04f, 3.1690386745e-04f },
{ 1.4373864003e-04f, 3.4701577420e-04f }, { 4.7976800158e-05f, 2.4119566214e-04f },
{ 1.7850010134e-21f, 2.9151278795e-05f }, { 3.9977422839e-05f, -2.0098007663e-04f },
{ 1.4373864003e-04f, -3.4701577420e-04f }, { 2.3252332220e-04f, -3.4799574396e-04f },
{ 2.1863459522e-04f, -2.1863459522e-04f }, { 6.2056194319e-05f, -4.1464623394e-05f },
{ -1.9573451137e-04f, 8.1075889233e-05f }, { -4.4372297073e-04f, 8.8261986569e-05f },
{ -5.5652443552e-04f, 6.8154586861e-20f }, { -4.6404687472e-04f, -9.2304662425e-05f },
{ -1.9573451137e-04f, -8.1075889233e-05f }, { 1.2883682237e-04f, 8.6086012482e-05f },
{ 3.6174088546e-04f, 3.6174088546e-04f }, { 4.0837232524e-04f, 6.1117237526e-04f },
{ 2.8207356174e-04f, 6.8098581834e-04f }, { 9.7165906259e-05f, 4.8848599782e-04f },
{ 1.4766828074e-20f, 8.0386867921e-05f }, { 7.5098076010e-05f, -3.7754352331e-04f },
{ 2.8207356174e-04f, -6.8098581834e-04f }, { 4.6580996103e-04f, -6.9713387199e-04f },
{ 4.4212772603e-04f, -4.4212772603e-04f }, { 1.1524044836e-04f, -7.7001205821e-05f },
{ -4.4136215088e-04f, 1.8281818881e-04f }, { -9.9526783374e-04f, 1.9797108099e-04f },
{ -1.2632220751e-03f, 3.0940017417e-19f }, { -1.0655584755e-03f, -2.1195275894e-04f },
{ -4.4136215088e-04f, -1.8281818881e-04f }, { 3.4870278890e-04f, 2.3299575453e-04f },
{ 9.4741662045e-04f, 9.4741662045e-04f }, { 1.0953310298e-03f, 1.6392787312e-03f },
{ 7.8704441197e-04f, 1.9000932936e-03f }, { 2.9063040056e-04f, 1.4610976903e-03f },
{ 1.1602507422e-19f, 3.7896665162e-04f }, { 1.8643098041e-04f, -9.3725183036e-04f },
{ 7.8704441197e-04f, -1.9000932936e-03f }, { 1.3689220250e-03f, -2.0487365913e-03f },
{ 1.3263832192e-03f, -1.3263832192e-03f }, { 2.3975916158e-04f, -1.6020195001e-04f },
{ -1.7864658936e-03f, 7.3997840184e-04f }, { -4.0136172125e-03f, 7.9835810150e-04f },
{ -5.3055332974e-03f, 1.9492213111e-18f }, { -4.6575086796e-03f, -9.2643607755e-04f },
{ -1.7864658936e-03f, -7.3997840184e-04f }, { 2.5328987415e-03f, 1.6924288311e-03f },
{ 6.6319165901e-03f, 6.6319165901e-03f }, { 8.6449647610e-03f, 1.2938104079e-02f },
{ 7.5031564661e-03f, 1.8114222101e-02f }, { 3.7891721988e-03f, 1.9049455038e-02f },
{ 5.6852282253e-18f, 1.3263831846e-02f }, { -3.6723852463e-05f, 1.8462327379e-04f },
{ 7.5031564661e-03f, -1.8114222101e-02f }, { 2.4807723598e-02f, -3.7127382095e-02f },
{ 5.1147919140e-02f, -5.1147919140e-02f }, { 8.2531291606e-02f, -5.5145646011e-02f },
{ 1.1254735140e-01f, -4.6618639361e-02f }, { 1.3419687671e-01f, -2.6693418442e-02f },
{ 1.4208734035e-01f, -6.9602722626e-17f }, { 1.3419687671e-01f, 2.6693418442e-02f },
{ 1.1254735140e-01f, 4.6618639361e-02f }, { 8.2531291606e-02f, 5.5145646011e-02f },
{ 5.1147919140e-02f, 5.1147919140e-02f }, { 2.4807723598e-02f, 3.7127382095e-02f },
{ 7.5031564661e-03f, 1.8114222101e-02f }, { -3.6723852463e-05f, -1.8462327379e-04f },
{ -7.3095791468e-18f, -1.3263831846e-02f }, { 3.7891721988e-03f, -1.9049455038e-02f },
{ 7.5031564661e-03f, -1.8114222101e-02f }, { 8.6449647610e-03f, -1.2938104079e-02f },
{ 6.6319165901e-03f, -6.6319165901e-03f }, { 2.5328987415e-03f, -1.6924288311e-03f },
{ -1.7864658936e-03f, 7.3997840184e-04f }, { -4.6575086796e-03f, 9.2643607755e-04f },
{ -5.3055332974e-03f, 3.2487021852e-18f }, { -4.0136172125e-03f, -7.9835810150e-04f },
{ -1.7864658936e-03f, -7.3997840184e-04f }, { 2.3975916158e-04f, 1.6020195001e-04f },
{ 1.3263832192e-03f, 1.3263832192e-03f }, { 1.3689220250e-03f, 2.0487365913e-03f },
{ 7.8704441197e-04f, 1.9000932936e-03f }, { 1.8643098041e-04f, 9.3725183036e-04f },
{ -9.2843516681e-19f, -3.7896665162e-04f }, { 2.9063040056e-04f, -1.4610976903e-03f },
{ 7.8704441197e-04f, -1.9000932936e-03f }, { 1.0953310298e-03f, -1.6392787312e-03f },
{ 9.4741662045e-04f, -9.4741662045e-04f }, { 3.4870278890e-04f, -2.3299575453e-04f },
{ -4.4136215088e-04f, 1.8281818881e-04f }, { -1.0655584755e-03f, 2.1195275894e-04f },
{ -1.2632220751e-03f, 9.2820052251e-19f }, { -9.9526783374e-04f, -1.9797108099e-04f },
{ -4.4136215088e-04f, -1.8281818881e-04f }, { 1.1524044836e-04f, 7.7001205821e-05f },
{ 4.4212772603e-04f, 4.4212772603e-04f }, { 4.6580996103e-04f, 6.9713387199e-04f },
{ 2.8207356174e-04f, 6.8098581834e-04f }, { 7.5098076010e-05f, 3.7754352331e-04f },
{ 7.8806174309e-20f, -8.0386867921e-05f }, { 9.7165906259e-05f, -4.8848599782e-04f },
{ 2.8207356174e-04f, -6.8098581834e-04f }, { 4.0837232524e-04f, -6.1117237526e-04f },
{ 3.6174088546e-04f, -3.6174088546e-04f }, { 1.2883682237e-04f, -8.6086012482e-05f },
{ -1.9573451137e-04f, 8.1075889233e-05f }, { -4.6404687472e-04f, 9.2304662425e-05f },
{ -5.5652443552e-04f, 4.7708210803e-19f }, { -4.4372297073e-04f, -8.8261986569e-05f },
{ -1.9573451137e-04f, -8.1075889233e-05f }, { 6.2056194319e-05f, 4.1464623394e-05f },
{ 2.1863459522e-04f, 2.1863459522e-04f }, { 2.3252332220e-04f, 3.4799574396e-04f },
{ 1.4373864003e-04f, 3.4701577420e-04f }, { 3.9977422839e-05f, 2.0098007663e-04f },
{ -7.8558088666e-20f, -2.9151278795e-05f }, { 4.7976800158e-05f, -2.4119566214e-04f },
{ 1.4373864003e-04f, -3.4701577420e-04f }, { 2.1174839450e-04f, -3.1690386745e-04f },
{ 1.8948331997e-04f, -1.8948331997e-04f }, { 6.6159029602e-05f, -4.4206050285e-05f },
{ -1.1001696231e-04f, 4.5570517881e-05f }, { -2.5877077742e-04f, 5.1472707944e-05f },
} };
struct BitRemap { struct BitRemap {
size_t operator()(const size_t bit_index) const { size_t operator()(const size_t bit_index) const {
return bit_index ^ 7; return bit_index ^ 7;