Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-08-03 12:06:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Enable Sample Rate to be spec'd in .ini file for Weather & SubGhzDecoder apps (#1659)

Browse source
This commit is contained in:
Mark Thompson 2023-12-21 12:33:06 -06:00 • committed by GitHub
parent 36e1b9a36e
commit 19a66fac20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

9
firmware/baseband/proc_subghzd.cpp
View file

@ -47,7 +47,7 @@ void SubGhzDProcessor::execute(const buffer_c8_t& buffer) {
tm += mag;
if (meashl == currentHiLow && currentDuration < 30'000'000) // allow pass 'end' signal
{
if (currentDuration < UINT32_MAX) currentDuration += nsPerDecSamp;
currentDuration += nsPerDecSamp;
} else { // called on change, so send the last duration and dir.
if (protoList) protoList->feed(currentHiLow, currentDuration / 1000);
currentDuration = nsPerDecSamp;
@ -73,7 +73,12 @@ void SubGhzDProcessor::on_message(const Message* const message) {
void SubGhzDProcessor::configure(const SubGhzFPRxConfigureMessage& message) {
// constexpr size_t decim_0_output_fs = baseband_fs / decim_0.decimation_factor; //unused
// constexpr size_t decim_1_output_fs = decim_0_output_fs / decim_1.decimation_factor; //unused
(void)message; // unused
modulation = message.modulation; // TODO: add support for FM (currently AM only)
baseband_fs = message.sampling_rate;
baseband_thread.set_sampling_rate(baseband_fs);
nsPerDecSamp = 1'000'000'000 / baseband_fs * 8; // Scaled it due to less array buffer sampes due to /8 decimation. 250 nseg (4Mhz) * 8
decim_0.configure(taps_200k_wfm_decim_0.taps);
decim_1.configure(taps_200k_wfm_decim_1.taps);

5
firmware/baseband/proc_subghzd.hpp
View file

@ -40,8 +40,9 @@ class SubGhzDProcessor : public BasebandProcessor {
void on_message(const Message* const message) override;
private:
static constexpr size_t baseband_fs = 4'000'000; // it works, I think we need to write that master clock in the baseband_threat , even later we decimate it.
static constexpr uint32_t nsPerDecSamp = 1'000'000'000 / baseband_fs * 8; // 10 exp9/baseband_fs * 8
size_t baseband_fs = 0; // will be set later by configure message
uint32_t nsPerDecSamp = 0;
uint8_t modulation = 0;
/* Array Buffer aux. used in decim0 and decim1 IQ c16 signed data ; (decim0 defines the max length of the array) */
std::array<complex16_t, 512> dst{}; // decim0 /4 , 2048/4 = 512 complex I,Q

7
firmware/baseband/proc_weather.cpp
View file

@ -47,7 +47,7 @@ void WeatherProcessor::execute(const buffer_c8_t& buffer) {
tm += mag;
if (meashl == currentHiLow && currentDuration < 30'000'000) // allow pass 'end' signal
{
if (currentDuration < UINT32_MAX) currentDuration += nsPerDecSamp;
currentDuration += nsPerDecSamp;
} else { // called on change, so send the last duration and dir.
if (protoList) protoList->feed(currentHiLow, currentDuration / 1000);
currentDuration = nsPerDecSamp;
@ -71,9 +71,12 @@ void WeatherProcessor::on_message(const Message* const message) {
}
void WeatherProcessor::configure(const SubGhzFPRxConfigureMessage& message) {
baseband_fs = message.sampling_rate;
baseband_thread.set_sampling_rate(baseband_fs);
nsPerDecSamp = 1'000'000'000 / baseband_fs * 8; // Scaled it due to less array buffer sampes due to /8 decimation. 250 nseg (4Mhz) * 8
// constexpr size_t decim_0_output_fs = baseband_fs / decim_0.decimation_factor; //unused
// constexpr size_t decim_1_output_fs = decim_0_output_fs / decim_1.decimation_factor; //unused
(void)message; // unused
decim_0.configure(taps_200k_wfm_decim_0.taps);
decim_1.configure(taps_200k_wfm_decim_1.taps);

4
firmware/baseband/proc_weather.hpp
View file

@ -40,8 +40,8 @@ class WeatherProcessor : public BasebandProcessor {
void on_message(const Message* const message) override;
private:
static constexpr size_t baseband_fs = 4'000'000; // it works, I think we need to write that master clock in the baseband_threat , even later we decimate it.
static constexpr uint32_t nsPerDecSamp = 1'000'000'000 / baseband_fs * 8; // Scaled it due to less array buffer sampes due to /8 decimation. 250 nseg (4Mhz) * 8
size_t baseband_fs = 0; // will be set later by configure message.
uint32_t nsPerDecSamp = 0;
/* Array Buffer aux. used in decim0 and decim1 IQ c16 signed data ; (decim0 defines the max length of the array) */
std::array<complex16_t, 512> dst{}; // decim0 /4 , 2048/4 = 512 complex I,Q