mirror of
https://github.com/eried/portapack-mayhem.git
synced 2025-08-13 17:05:37 -04:00
Recovered lost ctcss/roger beep/correct mic gain in mic app from 1.5.1 without ALC (Auto mic Limit Control-AK) (#633)
* Update spectrum_collector.cpp lower case correction * Update spectrum_collector.cpp Description changed , better explanation. * Revert "Update spectrum_collector.cpp" This reverts commit4a6fc35384. * Revert "Update spectrum_collector.cpp" This reverts commit35cece1cb0. * Revert "Solving Compile error on gcc10 . Keeping same safety protection about the size of the array ,but with slightly different sintax." This reverts commitf4db4e2b53. * Recovered CTCSS-Roger_beep-MIC-GAIN from 1.5.1 * Temporary removing ALC-( for AK4951 platorm)
This commit is contained in:
Brumi-2021
GitHub
parent
c9db1aab30
commit
1027e80d53
13 changed files with 334 additions and 433 deletions
|
|
@ -21,6 +21,8 @@
|
|||
|
||||
#include "dsp_modulate.hpp"
|
||||
#include "sine_table_int8.hpp"
|
||||
#include "portapack_shared_memory.hpp"
|
||||
#include "tonesets.hpp"
|
||||
|
||||
namespace dsp {
|
||||
namespace modulate {
|
||||
|
|
@ -40,13 +42,42 @@ void Modulator::set_over(uint32_t new_over) {
|
|||
over = new_over;
|
||||
}
|
||||
|
||||
void Modulator::set_gain_vumeter_beep(float new_audio_gain , bool new_play_beep ) {
|
||||
audio_gain = new_audio_gain ;
|
||||
play_beep = new_play_beep;
|
||||
|
||||
}
|
||||
|
||||
int32_t Modulator::apply_beep(int32_t sample_in, bool& configured_in, uint32_t& new_beep_index, uint32_t& new_beep_timer, TXProgressMessage& new_txprogress_message ) {
|
||||
|
||||
if (play_beep) { // We need to add audio beep sample.
|
||||
if (new_beep_timer) {
|
||||
new_beep_timer--;
|
||||
} else {
|
||||
new_beep_timer = baseband_fs * 0.05; // 50ms
|
||||
|
||||
if (new_beep_index == BEEP_TONES_NB) {
|
||||
configured_in = false;
|
||||
shared_memory.application_queue.push(new_txprogress_message);
|
||||
} else {
|
||||
beep_gen.configure(beep_deltas[new_beep_index], 1.0); // config sequentially the audio beep tone.
|
||||
new_beep_index++;
|
||||
}
|
||||
}
|
||||
sample_in = beep_gen.process(0); // Get sample of the selected sequence of 6 beep tones , and overwrite audio sample. Mix 0%.
|
||||
}
|
||||
return sample_in; // Return audio mic scaled with gain , 8 bit sample or audio beep sample.
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
|
||||
SSB::SSB() : hilbert() {
|
||||
mode = Mode::LSB;
|
||||
}
|
||||
|
||||
void SSB::execute(const buffer_s16_t& audio, const buffer_c8_t& buffer) {
|
||||
void SSB::execute(const buffer_s16_t& audio, const buffer_c8_t& buffer, bool& configured_in, uint32_t& new_beep_index, uint32_t& new_beep_timer,TXProgressMessage& new_txprogress_message, AudioLevelReportMessage& new_level_message, uint32_t& new_power_acc_count, uint32_t& new_divider ) {
|
||||
// No way to activate correctly the roger beep in this option, Maybe not enough M4 CPU power , Let's block roger beep in SSB selection by now .
|
||||
int32_t sample = 0;
|
||||
int8_t re = 0, im = 0;
|
||||
|
||||
|
|
@ -55,7 +86,9 @@ void SSB::execute(const buffer_s16_t& audio, const buffer_c8_t& buffer) {
|
|||
float i = 0.0, q = 0.0;
|
||||
|
||||
sample = audio.p[counter / over] >> 2;
|
||||
//switch (mode) {
|
||||
sample *= audio_gain; // Apply GAIN Scale factor to the audio TX modulation.
|
||||
|
||||
//switch (mode) {
|
||||
//case Mode::LSB:
|
||||
hilbert.execute(sample / 32768.0f, i, q);
|
||||
//case Mode::USB: hilbert.execute(sample / 32768.0f, q, i);
|
||||
|
|
@ -72,9 +105,23 @@ void SSB::execute(const buffer_s16_t& audio, const buffer_c8_t& buffer) {
|
|||
//re = q;
|
||||
//im = i;
|
||||
//break;
|
||||
|
||||
}
|
||||
|
||||
buffer.p[counter] = { re, im };
|
||||
|
||||
// Update vu-meter bar in the LCD screen.
|
||||
power_acc += (sample < 0) ? -sample : sample; // Power average for UI vu-meter
|
||||
|
||||
if (new_power_acc_count) {
|
||||
new_power_acc_count--;
|
||||
} else { // power_acc_count = 0
|
||||
new_power_acc_count = new_divider;
|
||||
new_level_message.value = power_acc / (new_divider *8); // Why ? . This division is to adj vu-meter sentitivity, to match saturation point to red-muter .
|
||||
shared_memory.application_queue.push(new_level_message);
|
||||
power_acc = 0;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -88,15 +135,39 @@ void FM::set_fm_delta(uint32_t new_delta) {
|
|||
fm_delta = new_delta;
|
||||
}
|
||||
|
||||
void FM::execute(const buffer_s16_t& audio, const buffer_c8_t& buffer) {
|
||||
void FM::set_tone_gen_configure(const uint32_t set_delta, const float set_tone_mix_weight) {
|
||||
tone_gen.configure(set_delta, set_tone_mix_weight);
|
||||
}
|
||||
|
||||
void FM::execute(const buffer_s16_t& audio, const buffer_c8_t& buffer, bool& configured_in, uint32_t& new_beep_index, uint32_t& new_beep_timer, TXProgressMessage& new_txprogress_message, AudioLevelReportMessage& new_level_message, uint32_t& new_power_acc_count, uint32_t& new_divider ) {
|
||||
int32_t sample = 0;
|
||||
int8_t re, im;
|
||||
|
||||
for (size_t counter = 0; counter < buffer.count; counter++) {
|
||||
if (counter % over == 0) {
|
||||
sample = audio.p[counter / over] >> 8;
|
||||
delta = sample * fm_delta;
|
||||
}
|
||||
|
||||
sample = audio.p[counter>>6] >> 8; // sample = audio.p[counter / over] >> 8; (not enough efficient running code, over = 1536000/240000= 64 )
|
||||
sample *= audio_gain; // Apply GAIN Scale factor to the audio TX modulation.
|
||||
|
||||
if (play_beep) {
|
||||
sample = apply_beep(sample, configured_in, new_beep_index, new_beep_timer, new_txprogress_message ); // Apply beep -if selected - atom ,sample by sample.
|
||||
} else {
|
||||
// Update vu-meter bar in the LCD screen.
|
||||
power_acc += (sample < 0) ? -sample : sample; // Power average for UI vu-meter
|
||||
|
||||
if (new_power_acc_count) {
|
||||
new_power_acc_count--;
|
||||
} else { // power_acc_count = 0
|
||||
new_power_acc_count = new_divider;
|
||||
new_level_message.value = power_acc / (new_divider / 4); // Why ? . This division is to adj vu-meter sentitivity, to match saturation point to red-muter .
|
||||
shared_memory.application_queue.push(new_level_message);
|
||||
power_acc = 0;
|
||||
}
|
||||
// TODO: pending to optimize CPU running code.
|
||||
// So far , we can not handle all 3 issues at the same time (vu-meter , CTCSS, beep).
|
||||
sample = tone_gen.process(sample); // Add selected Key_Tone or CTCSS subtone , atom function() , sample by sample.
|
||||
}
|
||||
|
||||
delta = sample * fm_delta; // Modulate FM
|
||||
|
||||
phase += delta;
|
||||
sphase = phase >> 24;
|
||||
|
|
@ -112,16 +183,33 @@ AM::AM() {
|
|||
mode = Mode::AM;
|
||||
}
|
||||
|
||||
void AM::execute(const buffer_s16_t& audio, const buffer_c8_t& buffer) {
|
||||
void AM::execute(const buffer_s16_t& audio, const buffer_c8_t& buffer, bool& configured_in, uint32_t& new_beep_index, uint32_t& new_beep_timer, TXProgressMessage& new_txprogress_message, AudioLevelReportMessage& new_level_message, uint32_t& new_power_acc_count, uint32_t& new_divider ) {
|
||||
int32_t sample = 0;
|
||||
int8_t re = 0, im = 0;
|
||||
float q = 0.0;
|
||||
float q = 0.0;
|
||||
|
||||
for (size_t counter = 0; counter < buffer.count; counter++) {
|
||||
if (counter % 128 == 0) {
|
||||
sample = audio.p[counter / over] >> 2;
|
||||
sample *= audio_gain; // Apply GAIN Scale factor to the audio TX modulation.
|
||||
}
|
||||
|
||||
if (play_beep) {
|
||||
sample = apply_beep(sample, configured_in, new_beep_index, new_beep_timer, new_txprogress_message )<<5; // Apply beep -if selected - atom sample by sample.
|
||||
} else {
|
||||
// Update vu-meter bar in the LCD screen.
|
||||
power_acc += (sample < 0) ? -sample : sample; // Power average for UI vu-meter
|
||||
|
||||
if (new_power_acc_count) {
|
||||
new_power_acc_count--;
|
||||
} else { // power_acc_count = 0
|
||||
new_power_acc_count = new_divider;
|
||||
new_level_message.value = power_acc / (new_divider *8); // Why ?orig / (new_divider / 4); // Why ?
|
||||
shared_memory.application_queue.push(new_level_message);
|
||||
power_acc = 0;
|
||||
}
|
||||
}
|
||||
|
||||
q = sample / 32768.0f;
|
||||
q *= 256.0f; // Original 64.0f,now x4 (+12 dB's BB_modulation in AM & DSB)
|
||||
switch (mode) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue