AudioTX, fixed about screen and an LCR address list bug

This commit is contained in:
furrtek
2016-08-17 04:17:24 +02:00
parent 6c0102abd4
commit c2fbc0c8d5
9 changed files with 31 additions and 26 deletions

View File

@@ -22,7 +22,7 @@
#include "proc_audiotx.hpp"
#include "portapack_shared_memory.hpp"
#include "sine_table.hpp"
#include "sine_table_int8.hpp"
//#include "audio_output.hpp"
#include "event_m4.hpp"
@@ -37,35 +37,32 @@ void AudioTXProcessor::execute(const buffer_c8_t& buffer){
ai = 0;
for (size_t i = 0; i<buffer.count; i++) {
//audio_fifo.out(&sample, 1);
// Audio preview sample generation: 1536000/48000 = 32
if (as >= 31) {
as = 0;
//audio_fifo.out(&sample, 1);
audio_fifo.out(sample);
//preview_audio_buffer.p[ai++] = sample << 8;
//if ((audio_fifo.len() < 1024) && (asked == false)) {
if ((audio_fifo.len() < 1024) && (asked == false)) {
// Ask application to fill up fifo
sigmessage.signaltype = 1;
shared_memory.application_queue.push(sigmessage);
asked = true;
//}
}
} else {
as++;
}
// FM
frq = (int32_t)(sample) * 4 * 2000;
frq = sample * 8000;
phase = (phase + frq);
sphase = phase + (256 << 16);
sphase = phase + (64 << 18);
re = (sine_table_f32[(sphase & 0x03FF0000)>>18]*127);
im = (sine_table_f32[(phase & 0x03FF0000)>>18]*127);
re = (sine_table_i8[(sphase & 0x03FC0000) >> 18]);
im = (sine_table_i8[(phase & 0x03FC0000) >> 18]);
buffer.p[i] = { (int8_t)re, (int8_t)im };
buffer.p[i] = {(int8_t)re, (int8_t)im};
}
//AudioOutput::fill_audio_buffer(preview_audio_buffer, true);
@@ -79,7 +76,7 @@ void AudioTXProcessor::on_message(const Message* const msg) {
break;
case Message::ID::FIFOData:
//audio_fifo.in(static_cast<const FIFODataMessage*>(msg)->data, 1024);
audio_fifo.in(static_cast<const FIFODataMessage*>(msg)->data, 1024);
asked = false;
break;

View File

@@ -25,6 +25,7 @@
#include "fifo.hpp"
#include "baseband_processor.hpp"
#include "baseband_thread.hpp"
class AudioTXProcessor : public BasebandProcessor {
public:
@@ -35,15 +36,15 @@ public:
private:
bool configured = false;
//std::unique_ptr<int8_t[]> audio_fifo_data = std::make_unique<int8_t[]>(1UL << 11);
//FIFO<int8_t> audio_fifo = { audio_fifo_data.get(), 11 }; // 43ms @ 48000Hz
BasebandThread baseband_thread { 1536000, this, NORMALPRIO + 20, baseband::Direction::Transmit };
int8_t audio_fifo_data[2048];
FIFO<int8_t> audio_fifo = { audio_fifo_data, 11 }; // 43ms @ 48000Hz
uint8_t as = 0, ai;
int8_t re, im;
int8_t sample;
int16_t st;
bool asked = false;
//int16_t audio_data[64];