Merge branch 'eried:next' into next

This commit is contained in:
Brumi-2021
2022-04-30 16:22:45 +02:00
committed by GitHub
79 changed files with 831 additions and 486 deletions
+2 -2
View File
@@ -35,8 +35,8 @@ public:
private:
uint8_t n = 0;
SOSFilter<5> sos_i;
SOSFilter<5> sos_q;
SOSFilter<5> sos_i = {};
SOSFilter<5> sos_q = {};
};
} /* namespace dsp */
+1 -1
View File
@@ -120,7 +120,7 @@ void ADSBRXProcessor::execute(const buffer_c8_t& buffer) {
// the high levels as signals can be out of phase so part of the
// energy can be in the near samples
int32_t thisAmp = (shifter[1] + shifter[3] + shifter[8] + shifter[10]);
int32_t high = thisAmp / 9;
uint32_t high = thisAmp / 9;
if (
shifter[5] < high &&
shifter[6] < high &&
+5 -5
View File
@@ -125,18 +125,18 @@ private:
uint32_t sample_bits { 0 };
uint32_t phase { }, phase_inc { };
int32_t sample_mixed { }, prev_mixed { }, sample_filtered { }, prev_filtered { };
uint8_t last_bit;
uint8_t ones_count = 0;
uint8_t last_bit = 0;
uint8_t ones_count = 0 ;
uint8_t current_byte = 0;
uint8_t byte_index = 0;
uint8_t packet_buffer[256];
size_t packet_buffer_size = 0;
bool configured { false };
bool wait_start { };
bool bit_value { };
bool wait_start { 0 };
bool bit_value { 0 };
aprs::APRSPacket aprs_packet;
aprs::APRSPacket aprs_packet { };
void configure(const APRSRxConfigureMessage& message);
void capture_config(const CaptureConfigMessage& message);
+1 -1
View File
@@ -51,7 +51,7 @@ private:
AudioInput audio_input { };
ToneGen tone_gen { };
ToneGen beep_gen { };
dsp::modulate::Modulator *modulator;
dsp::modulate::Modulator *modulator = NULL ;
bool am_enabled { false };
bool fm_enabled { true };
+11 -1
View File
@@ -68,6 +68,16 @@ public:
delete[] m_lastVals;
}
SmoothVals(const SmoothVals<float, float>&)
{
}
SmoothVals & operator=(const SmoothVals<float, float>&)
{
return *this ;
}
// --------------------------------------------------
// Set size of smoothing
// --------------------------------------------------
@@ -154,7 +164,7 @@ private:
dsp::decimate::FIRC16xR16x32Decim8 decim_1 { };
dsp::decimate::FIRAndDecimateComplex channel_filter { };
dsp::demodulate::FM demod { };
SmoothVals<float, float> smooth;
SmoothVals<float, float> smooth = { };
AudioOutput audio_output { };