TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-08-14 09:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bias-T now works in capture mode

Browse Source 
Simplified soundboard app, still some work to do
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
furrtek
2018-12-18 16:25:21 +00:00
parent a82dc19639 8feb79c710
commit 1d13389b5a
21 changed files with 557 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/baseband/CMakeLists.txt
View File

@@ -36,7 +36,7 @@ set(USE_OPT "-O3 -g -falign-functions=16 -fno-math-errno --specs=nano.specs")
set(USE_COPT "-std=gnu99")
# C++ specific options here (added to USE_OPT).
set(USE_CPPOPT "-std=c++14 -fno-rtti -fno-exceptions -Weffc++ -Wuninitialized")
set(USE_CPPOPT "-std=c++17 -fno-rtti -fno-exceptions -Weffc++ -Wuninitialized")
# Enable this if you want the linker to remove unused code and data
set(USE_LINK_GC yes)

44
firmware/baseband/proc_audiotx.cpp
View File

@@ -23,7 +23,6 @@
#include "proc_audiotx.hpp"
#include "portapack_shared_memory.hpp"
#include "sine_table_int8.hpp"
//#include "audio_output.hpp"
#include "event_m4.hpp"
#include <cstdint>
@@ -32,17 +31,18 @@ void AudioTXProcessor::execute(const buffer_c8_t& buffer){
if (!configured) return;
if( stream ) {
const size_t bytes_to_read = (buffer.count / 32); // /32 (oversampling) should be == 64
bytes_read += stream->read(audio_buffer.p, bytes_to_read);
}
// Fill and "stretch"
// Zero-order hold (poop)
for (size_t i = 0; i < buffer.count; i++) {
if (!(i & 31))
audio_sample = audio_buffer.p[i >> 5] - 0x80;
resample_acc += resample_inc;
if (resample_acc >= 0x10000) {
resample_acc -= 0x10000;
if (stream) {
stream->read(&audio_sample, 1);
bytes_read++;
}
}
sample = tone_gen.process(audio_sample);
sample = tone_gen.process(audio_sample - 0x80);
// FM
delta = sample * fm_delta;
@@ -50,22 +50,20 @@ void AudioTXProcessor::execute(const buffer_c8_t& buffer){
phase += delta;
sphase = phase + (64 << 24);
re = (sine_table_i8[(sphase & 0xFF000000U) >> 24]);
im = (sine_table_i8[(phase & 0xFF000000U) >> 24]);
re = sine_table_i8[(sphase & 0xFF000000U) >> 24];
im = sine_table_i8[(phase & 0xFF000000U) >> 24];
buffer.p[i] = { (int8_t)re, (int8_t)im };
}
spectrum_samples += buffer.count;
if( spectrum_samples >= spectrum_interval_samples ) {
spectrum_samples -= spectrum_interval_samples;
progress_samples += buffer.count;
if (progress_samples >= progress_interval_samples) {
progress_samples -= progress_interval_samples;
txprogress_message.progress = bytes_read; // Inform UI about progress
txprogress_message.done = false;
shared_memory.application_queue.push(txprogress_message);
}
//AudioOutput::fill_audio_buffer(preview_audio_buffer, true);
}
void AudioTXProcessor::on_message(const Message* const message) {
@@ -96,12 +94,8 @@ void AudioTXProcessor::on_message(const Message* const message) {
void AudioTXProcessor::audio_config(const AudioTXConfigMessage& message) {
fm_delta = message.deviation_hz * (0xFFFFFFULL / baseband_fs);
tone_gen.configure(message.tone_key_delta, message.tone_key_mix_weight);
}
void AudioTXProcessor::samplerate_config(const SamplerateConfigMessage& message) {
baseband_fs = message.sample_rate;
baseband_thread.set_sampling_rate(baseband_fs);
spectrum_interval_samples = baseband_fs / 20;
progress_interval_samples = message.divider;
resample_acc = 0;
}
void AudioTXProcessor::replay_config(const ReplayConfigMessage& message) {
@@ -116,6 +110,10 @@ void AudioTXProcessor::replay_config(const ReplayConfigMessage& message) {
}
}
void AudioTXProcessor::samplerate_config(const SamplerateConfigMessage& message) {
resample_inc = (((uint64_t)message.sample_rate) << 16) / baseband_fs; // 16.16 fixed point message.sample_rate
}
int main() {
EventDispatcher event_dispatcher { std::make_unique<AudioTXProcessor>() };
event_dispatcher.run();

23
firmware/baseband/proc_audiotx.hpp
View File

@@ -35,35 +35,22 @@ public:
void on_message(const Message* const msg) override;
private:
size_t baseband_fs = 0;
static constexpr size_t baseband_fs = 1536000;
BasebandThread baseband_thread { baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Transmit };
std::array<uint8_t, 64> audio { };
const buffer_t<uint8_t> audio_buffer {
audio.data(),
audio.size(),
baseband_fs / 8
};
std::unique_ptr<StreamOutput> stream { };
ToneGen tone_gen { };
uint32_t resample_inc { }, resample_acc { };
uint32_t fm_delta { 0 };
uint32_t phase { 0 }, sphase { 0 };
int8_t out_sample { };
int32_t sample { 0 }, audio_sample { 0 }, delta { };
uint8_t audio_sample { };
int32_t sample { 0 }, delta { };
int8_t re { 0 }, im { 0 };
size_t spectrum_interval_samples = 0;
size_t spectrum_samples = 0;
//int16_t audio_data[64];
/*const buffer_s16_t preview_audio_buffer {
audio_data,
sizeof(int16_t)*64
};*/
size_t progress_interval_samples, progress_samples = 0;
bool configured { false };
uint32_t bytes_read { 0 };