Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improved Audio Beep Test (#2026)

Browse Source
This commit is contained in:
Mark Thompson 2024-03-23 02:21:35 -05:00 committed by GitHub
parent ba4290cf0d
commit 28a5fc5915
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/application/apps/ui_sonde.cpp
View File

@ -75,7 +75,7 @@ SondeView::SondeView(NavigationView& nav)
check_beep.on_select = [this](Checkbox&, bool v) {
beep = v;
if (beep)
baseband::request_audio_beep(1000, 60); // 1khz tone for 60ms to acknowledge enablement
baseband::request_audio_beep(1000, 24000, 60); // 1khz tone for 60ms to acknowledge enablement
};
check_log.set_value(logging);

4
firmware/application/baseband_api.cpp
View File

@ -445,8 +445,8 @@ void request_beep_stop() {
request_beep(RequestSignalMessage::Signal::BeepStopRequest);
}
void request_audio_beep(uint32_t freq, uint32_t duration_ms) {
AudioBeepMessage message{freq, duration_ms};
void request_audio_beep(uint32_t freq, uint32_t sample_rate, uint32_t duration_ms) {
AudioBeepMessage message{freq, sample_rate, duration_ms};
send_message(&message);
}

2
firmware/application/baseband_api.hpp
View File

@ -93,7 +93,7 @@ void set_subghzd_config(uint8_t modulation, uint32_t sampling_rate);
void request_roger_beep();
void request_rssi_beep();
void request_beep_stop();
void request_audio_beep(uint32_t freq, uint32_t duration_ms);
void request_audio_beep(uint32_t freq, uint32_t sample_rate, uint32_t duration_ms);
void run_image(const portapack::spi_flash::image_tag_t image_tag);
void run_prepared_image(const uint32_t m4_code);

20
firmware/application/external/audio_test/ui_audio_test.cpp vendored
View File

@ -33,14 +33,26 @@ AudioTestView::AudioTestView(NavigationView& nav)
baseband::run_prepared_image(portapack::memory::map::m4_code.base()); // proc_audio_beep baseband is external too
add_children({&labels,
&options_sample_rate,
&field_frequency,
&field_duration,
&field_volume,
&toggle_speaker});
audio::set_rate(audio::Rate::Hz_24000);
options_sample_rate.on_change = [this](size_t, int32_t v) {
if (options_sample_rate.selected_index_value() == 24000) {
audio::set_rate(audio::Rate::Hz_24000);
field_frequency.set_range(100, v / 2); // 24000/128 = ~100 (audio_dma uses 128 samples)
} else {
audio::set_rate(audio::Rate::Hz_48000);
field_frequency.set_range(200, v / 2); // 48000/128 = ~200
}
update_audio_beep();
};
field_frequency.set_value(1000);
field_frequency.on_change = [this](int32_t v) {
(void)v;
field_frequency.on_change = [this](int32_t) {
update_audio_beep();
};
@ -69,12 +81,12 @@ AudioTestView::~AudioTestView() {
}
void AudioTestView::focus() {
field_frequency.focus();
toggle_speaker.focus();
}
void AudioTestView::update_audio_beep() {
if (beep)
baseband::request_audio_beep(field_frequency.value(), field_duration.value());
baseband::request_audio_beep(field_frequency.value(), options_sample_rate.selected_index_value(), field_duration.value());
else
baseband::request_beep_stop();
}

23
firmware/application/external/audio_test/ui_audio_test.hpp vendored
View File

@ -45,20 +45,27 @@ class AudioTestView : public View {
Labels labels{
{{7 * 8, 3 * 16}, "Audio Beep Test", Color::light_grey()},
{{0 * 8, 6 * 16}, "Frequency (Hz):", Color::light_grey()},
{{0 * 8, 8 * 16}, "Duration (ms):", Color::light_grey()},
{{0 * 8, 10 * 16}, "Volume:", Color::light_grey()}};
{{0 * 8, 6 * 16}, "Sample Rate (Hz):", Color::light_grey()},
{{0 * 8, 8 * 16}, "Frequency (Hz):", Color::light_grey()},
{{0 * 8, 10 * 16}, "Duration (ms):", Color::light_grey()},
{{0 * 8, 12 * 16}, "Volume:", Color::light_grey()}};
OptionsField options_sample_rate{
{18 * 8, 6 * 16},
5,
{{"24000", 24000},
{"48000", 48000}}};
NumberField field_frequency{
{16 * 8, 6 * 16},
{18 * 8, 8 * 16},
5,
{100, 24000},
{100, 24000 / 2},
100,
' ',
true};
NumberField field_duration{
{16 * 8, 8 * 16},
{18 * 8, 10 * 16},
5,
{0, 60000},
50,
@ -66,10 +73,10 @@ class AudioTestView : public View {
true};
AudioVolumeField field_volume{
{19 * 8, 10 * 16}};
{21 * 8, 12 * 16}};
ImageToggle toggle_speaker{
{19 * 8, 12 * 16, 2 * 8, 1 * 16},
{21 * 8, 14 * 16, 2 * 8, 1 * 16},
&bitmap_icon_speaker_mute,
&bitmap_icon_speaker,
Color::light_grey(),

2
firmware/baseband/proc_audio_beep.cpp
View File

@ -52,7 +52,7 @@ void AudioBeepProcessor::on_signal_message(const RequestSignalMessage& message)
}
void AudioBeepProcessor::on_beep_message(const AudioBeepMessage& message) {
audio::dma::beep_start(message.freq, AUDIO_SAMPLE_RATE, message.duration_ms);
audio::dma::beep_start(message.freq, message.sample_rate, message.duration_ms);
}
int main() {

4
firmware/baseband/proc_sonde.cpp
View File

@ -86,12 +86,12 @@ void SondeProcessor::on_signal_message(const RequestSignalMessage& message) {
beep_duration = BEEP_DURATION_RANGE + BEEP_MIN_DURATION;
}
audio::dma::beep_start(beep_freq, AUDIO_SAMPLE_RATE, beep_duration);
audio::dma::beep_start(beep_freq, DEFAULT_AUDIO_SAMPLE_RATE, beep_duration);
}
}
void SondeProcessor::on_beep_message(const AudioBeepMessage& message) {
audio::dma::beep_start(message.freq, AUDIO_SAMPLE_RATE, message.duration_ms);
audio::dma::beep_start(message.freq, message.sample_rate, message.duration_ms);
}
void SondeProcessor::on_pitch_rssi_config(const PitchRSSIConfigureMessage& message) {

2
firmware/baseband/proc_sonde.hpp
View File

@ -103,7 +103,7 @@
#define RSSI_CEILING 1000
#define PROPORTIONAL_BEEP_THRES 0.8
#define RSSI_PITCH_WEIGHT (float(BEEP_MAX_FREQ - BEEP_BASE_FREQ) / RSSI_CEILING)
#define AUDIO_SAMPLE_RATE 24000
#define DEFAULT_AUDIO_SAMPLE_RATE 24000
class SondeProcessor : public BasebandProcessor {
public:

2
firmware/baseband/tone_gen.cpp
View File

@ -27,7 +27,7 @@
// Functions for audio beep (used by Sonde RSSI)
void ToneGen::configure_beep(const uint32_t freq, const uint32_t sample_rate) {
f_delta_ = (float)(freq * sizeof(sine_table_i8)) / sample_rate;
f_tone_phase_ = 0.0;
f_tone_phase_ = sizeof(sine_table_i8) / 4; // Start at sine peak to handle case of freq=sample_rate/2
}
int16_t ToneGen::process_beep() {

3
firmware/common/message.hpp
View File

@ -1368,12 +1368,15 @@ class AudioBeepMessage : public Message {
public:
constexpr AudioBeepMessage(
uint32_t freq = 1000,
uint32_t sample_rate = 24000,
uint32_t duration_ms = 100)
: Message{ID::AudioBeep},
freq{freq},
sample_rate{sample_rate},
duration_ms{duration_ms} {
}
uint32_t freq = 1000;
uint32_t sample_rate = 24000;
uint32_t duration_ms = 100;
};
#endif /*__MESSAGE_H__*/