aboutsummaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/stmdsp.cpp18
-rw-r--r--gui/stmdsp.hpp4
-rw-r--r--gui/wav.hpp95
-rw-r--r--gui/wxmain.cpp188
-rw-r--r--gui/wxmain.hpp2
5 files changed, 218 insertions, 89 deletions
diff --git a/gui/stmdsp.cpp b/gui/stmdsp.cpp
index 9119284..897e643 100644
--- a/gui/stmdsp.cpp
+++ b/gui/stmdsp.cpp
@@ -36,24 +36,10 @@ namespace stmdsp
}
}
- /*std::vector<adcsample_t> device::sample(unsigned long int count) {
- if (connected()) {
- uint8_t request[3] = {
- 'd',
- static_cast<uint8_t>(count),
- static_cast<uint8_t>(count >> 8)
- };
- m_serial.write(request, 3);
- std::vector<adcsample_t> data (count);
- m_serial.read(reinterpret_cast<uint8_t *>(data.data()), data.size() * sizeof(adcsample_t));
- return data;
- } else {
- return {};
- }
- }*/
-
void device::continuous_set_buffer_size(unsigned int size) {
if (connected()) {
+ m_buffer_size = size;
+
uint8_t request[3] = {
'B',
static_cast<uint8_t>(size),
diff --git a/gui/stmdsp.hpp b/gui/stmdsp.hpp
index 5dda89c..4551483 100644
--- a/gui/stmdsp.hpp
+++ b/gui/stmdsp.hpp
@@ -19,7 +19,7 @@
namespace stmdsp
{
- constexpr unsigned int SAMPLES_MAX = 4000;
+ constexpr unsigned int SAMPLES_MAX = 3000;
class scanner
{
@@ -55,6 +55,7 @@ namespace stmdsp
//std::vector<adcsample_t> sample(unsigned long int count = 1);
void continuous_set_buffer_size(unsigned int size);
+ unsigned int get_buffer_size() const { return m_buffer_size; }
void set_sample_rate(unsigned int id);
unsigned int get_sample_rate();
void continuous_start();
@@ -73,6 +74,7 @@ namespace stmdsp
private:
serial::Serial m_serial;
+ unsigned int m_buffer_size = SAMPLES_MAX;
};
}
diff --git a/gui/wav.hpp b/gui/wav.hpp
new file mode 100644
index 0000000..a87efb1
--- /dev/null
+++ b/gui/wav.hpp
@@ -0,0 +1,95 @@
+#ifndef WAV_HPP_
+#define WAV_HPP_
+
+#include <cstdint>
+#include <cstring>
+#include <fstream>
+
+namespace wav
+{
+ struct header {
+ char riff[4]; // "RIFF"
+ uint32_t filesize; // Total file size minus eight bytes
+ char wave[4]; // "WAVE"
+
+ bool valid() const {
+ return strncmp(riff, "RIFF", 4) == 0 && filesize > 8 && strncmp(wave, "WAVE", 4) == 0;
+ }
+ } __attribute__ ((packed));
+
+ struct format {
+ char fmt_[4]; // "fmt "
+ uint32_t size;
+ uint16_t type;
+ uint16_t channelcount;
+ uint32_t samplerate;
+ uint32_t byterate;
+ uint16_t unused;
+ uint16_t bps;
+
+ bool valid() const {
+ return strncmp(fmt_, "fmt ", 4) == 0;
+ }
+ } __attribute__ ((packed));
+
+ struct data {
+ char data[4]; // "data"
+ uint32_t size;
+
+ bool valid() const {
+ return strncmp(data, "data", 4) == 0;
+ }
+ } __attribute__ ((packed));
+
+ class clip {
+ public:
+ clip(const char *path) {
+ std::ifstream file (path);
+ if (!file.good())
+ return;
+ {
+ header h;
+ file.read(reinterpret_cast<char *>(&h), sizeof(header));
+ if (!h.valid())
+ return;
+ }
+ {
+ format f;
+ file.read(reinterpret_cast<char *>(&f), sizeof(format));
+ if (!f.valid() || f.type != 1) // ensure PCM
+ return;
+ }
+ {
+ wav::data d;
+ file.read(reinterpret_cast<char *>(&d), sizeof(wav::data));
+ if (!d.valid())
+ return;
+ m_data = new char[d.size + 4096 - (d.size % 4096)];
+ m_size = d.size;
+ file.read(m_data, d.size);
+ }
+ }
+
+ bool valid() const {
+ return m_data != nullptr && m_size > 0;
+ }
+ auto data() const {
+ return m_data;
+ }
+ auto next(unsigned int chunksize = 3000) {
+ if (m_pos == m_size) {
+ m_pos = 0;
+ }
+ auto ret = m_data + m_pos;
+ m_pos = std::min(m_pos + chunksize, m_size);
+ return ret;
+ }
+ private:
+ char *m_data = nullptr;
+ uint32_t m_size = 0;
+ uint32_t m_pos = 0;
+ };
+}
+
+#endif // WAV_HPP_
+
diff --git a/gui/wxmain.cpp b/gui/wxmain.cpp
index 8f2e386..cbc1f8a 100644
--- a/gui/wxmain.cpp
+++ b/gui/wxmain.cpp
@@ -24,8 +24,67 @@
#include <wx/statusbr.h>
#include <wx/textdlg.h>
+#include <array>
#include <vector>
+static const std::array<wxString, 6> srateValues {
+ "8 kS/s",
+ "16 kS/s",
+ "20 kS/s",
+ "32 kS/s",
+ "48 kS/s",
+ "96 kS/s"
+};
+static const std::array<unsigned int, 6> srateNums {
+ 8000,
+ 16000,
+ 20000,
+ 32000,
+ 48000,
+ 96000
+};
+
+static const char *makefile_text = R"make(
+all:
+ @arm-none-eabi-g++ -x c++ -Os -fno-exceptions -fno-rtti \
+ -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mtune=cortex-m4 \
+ -nostartfiles \
+ -Wl,-Ttext-segment=0x10000000 -Wl,-zmax-page-size=512 -Wl,-eprocess_data_entry \
+ $0 -o $0.o
+ @cp $0.o $0.orig.o
+ @arm-none-eabi-strip -s -S --strip-unneeded $0.o
+ @arm-none-eabi-objcopy --remove-section .ARM.attributes \
+ --remove-section .comment \
+ --remove-section .noinit \
+ $0.o
+ arm-none-eabi-size $0.o
+)make";
+
+static const char *file_header = R"cpp(
+#include <cstdint>
+
+using adcsample_t = uint16_t;
+constexpr unsigned int SIZE = $0;
+
+adcsample_t *process_data(adcsample_t *samples, unsigned int size);
+
+extern "C" void process_data_entry()
+{
+ ((void (*)())process_data)();
+}
+
+// End stmdspgui header code
+
+)cpp";
+
+static const char *file_content =
+R"cpp(adcsample_t *process_data(adcsample_t *samples, unsigned int size)
+{
+ return samples;
+}
+)cpp";
+
+
enum Id {
MeasureTimer = 1,
@@ -78,17 +137,9 @@ MainFrame::MainFrame() : wxFrame(nullptr, wxID_ANY, "stmdspgui", wxPoint(50, 50)
splitter->SetMinimumPaneSize(20);
auto comp = new wxButton(panelToolbar, Id::MCodeCompile, "Compile");
- static const wxString srateValues[] = {
- "8 kS/s",
- "16 kS/s",
- "20 kS/s",
- "32 kS/s",
- "48 kS/s",
- "96 kS/s"
- };
m_rate_select = new wxComboBox(panelToolbar, wxID_ANY,
wxEmptyString, wxDefaultPosition, wxDefaultSize,
- 6, srateValues, wxCB_READONLY);
+ srateValues.size(), srateValues.data(), wxCB_READONLY);
m_rate_select->Disable();
sizerToolbar->Add(comp, 0, wxLEFT, 4);
@@ -182,11 +233,23 @@ void MainFrame::onMeasureTimer([[maybe_unused]] wxTimerEvent&)
if (m_conv_result_log != nullptr) {
if (auto samples = m_device->continuous_read(); samples.size() > 0) {
for (auto& s : samples) {
- auto str = wxString::Format("%u\n", s);
- m_conv_result_log->Write(str.ToAscii(), str.Len());
+ auto str = std::to_string(s);
+ m_conv_result_log->Write(str.c_str(), str.size());
}
}
- } else if (m_status_bar && m_run_measure && m_run_measure->IsChecked()) {
+ }
+
+ if (m_wav_clip != nullptr) {
+ auto size = m_device->get_buffer_size();
+ auto chunk = new stmdsp::adcsample_t[size];
+ auto src = reinterpret_cast<uint16_t *>(m_wav_clip->next(size));
+ for (unsigned int i = 0; i < size; i++)
+ chunk[i] = ((uint32_t)*src++) / 16 + 2048;
+ m_device->siggen_upload(chunk, size);
+ delete[] chunk;
+ }
+
+ if (m_status_bar && m_run_measure && m_run_measure->IsChecked()) {
m_status_bar->SetStatusText(wxString::Format(wxT("Execution time: %u cycles"),
m_device->continuous_start_get_measurement()));
}
@@ -230,46 +293,16 @@ void MainFrame::prepareEditor()
onFileNew(dummy);
}
-static const char *makefile_text = R"make(
-all:
- @arm-none-eabi-g++ -x c++ -Os -fno-exceptions -fno-rtti \
- -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mtune=cortex-m4 \
- -nostartfiles \
- -Wl,-Ttext-segment=0x10000000 -Wl,-zmax-page-size=512 -Wl,-eprocess_data_entry \
- $0 -o $0.o
- @cp $0.o $0.orig.o
- @arm-none-eabi-strip -s -S --strip-unneeded $0.o
- @arm-none-eabi-objcopy --remove-section .ARM.attributes \
- --remove-section .comment \
- --remove-section .noinit \
- $0.o
- arm-none-eabi-size $0.o
-)make";
-
-static wxString file_header (R"cpp(
-#include <cstdint>
-
-using adcsample_t = uint16_t;
-constexpr unsigned int SIZE = 3000;
-
-adcsample_t *process_data(adcsample_t *samples, unsigned int size);
-
-extern "C" void process_data_entry()
-{
- ((void (*)())process_data)();
-}
-
-// End stmdspgui header code
-
-)cpp");
-
wxString MainFrame::compileEditorCode()
{
if (m_temp_file_name.IsEmpty())
m_temp_file_name = wxFileName::CreateTempFileName("stmdspgui");
wxFile file (m_temp_file_name, wxFile::write);
- file.Write(file_header + m_text_editor->GetText());
+ wxString file_text (file_header);
+ file_text.Replace("$0", std::to_string(m_device != nullptr ? m_device->get_buffer_size()
+ : stmdsp::SAMPLES_MAX));
+ file.Write(wxString(file_text) + m_text_editor->GetText());
file.Close();
wxFile makefile (m_temp_file_name + "make", wxFile::write);
@@ -301,12 +334,7 @@ wxString MainFrame::compileEditorCode()
void MainFrame::onFileNew([[maybe_unused]] wxCommandEvent&)
{
m_open_file_path = "";
- m_text_editor->SetText(
-R"cpp(adcsample_t *process_data(adcsample_t *samples, unsigned int size)
-{
- return samples;
-}
-)cpp");
+ m_text_editor->SetText(file_content);
m_text_editor->DiscardEdits();
m_status_bar->SetStatusText("Ready.");
}
@@ -444,6 +472,10 @@ void MainFrame::onRunStart(wxCommandEvent& ce)
if (m_run_measure && m_run_measure->IsChecked()) {
m_device->continuous_start_measure();
m_measure_timer->StartOnce(1000);
+ } else if (m_wav_clip != nullptr) {
+ m_device->continuous_start();
+ m_measure_timer->Start(m_device->get_buffer_size() * 500 /
+ srateNums[m_rate_select->GetSelection()]);
} else {
m_device->continuous_start();
m_measure_timer->Start(15);
@@ -458,6 +490,7 @@ void MainFrame::onRunStart(wxCommandEvent& ce)
}
} else {
m_device->continuous_stop();
+ m_measure_timer->Stop();
menuItem->SetItemLabel("&Start");
m_status_bar->SetStatusText("Ready.");
@@ -536,32 +569,43 @@ void MainFrame::onRunGenUpload([[maybe_unused]] wxCommandEvent&)
"between zero and 4095.", "Enter Generator Values");
if (dialog.ShowModal() == wxID_OK) {
if (wxString values = dialog.GetValue(); !values.IsEmpty()) {
- std::vector<stmdsp::dacsample_t> samples;
- while (!values.IsEmpty()) {
- if (auto number_end = values.find_first_not_of("0123456789");
- number_end != wxString::npos && number_end > 0)
- {
- auto number = values.Left(number_end);
- if (unsigned long n; number.ToULong(&n))
- samples.push_back(n & 4095);
-
- if (auto next = values.find_first_of("0123456789", number_end + 1);
- next != wxString::npos)
+ if (values[0] == '/') {
+ m_wav_clip = new wav::clip(values.Mid(1));
+ if (m_wav_clip->valid()) {
+ m_status_bar->SetStatusText("Generator ready.");
+ } else {
+ delete m_wav_clip;
+ m_wav_clip = nullptr;
+ m_status_bar->SetStatusText("Error: Bad WAV file.");
+ }
+ } else {
+ std::vector<stmdsp::dacsample_t> samples;
+ while (!values.IsEmpty()) {
+ if (auto number_end = values.find_first_not_of("0123456789");
+ number_end != wxString::npos && number_end > 0)
{
- values = values.Mid(next);
+ auto number = values.Left(number_end);
+ if (unsigned long n; number.ToULong(&n))
+ samples.push_back(n & 4095);
+
+ if (auto next = values.find_first_of("0123456789", number_end + 1);
+ next != wxString::npos)
+ {
+ values = values.Mid(next);
+ } else {
+ break;
+ }
} else {
break;
}
- } else {
- break;
}
- }
- if (samples.size() <= stmdsp::SAMPLES_MAX) {
- m_device->siggen_upload(&samples[0], samples.size());
- m_status_bar->SetStatusText("Generator ready.");
- } else {
- m_status_bar->SetStatusText("Error: Too many samples.");
+ if (samples.size() <= stmdsp::SAMPLES_MAX) {
+ m_device->siggen_upload(&samples[0], samples.size());
+ m_status_bar->SetStatusText("Generator ready.");
+ } else {
+ m_status_bar->SetStatusText("Error: Too many samples.");
+ }
}
} else {
m_status_bar->SetStatusText("Error: No samples given.");
diff --git a/gui/wxmain.hpp b/gui/wxmain.hpp
index ec30f1f..8068784 100644
--- a/gui/wxmain.hpp
+++ b/gui/wxmain.hpp
@@ -13,6 +13,7 @@
#define WXMAIN_HPP_
#include "stmdsp.hpp"
+#include "wav.hpp"
#include <fstream>
#include <future>
@@ -75,6 +76,7 @@ private:
wxString m_temp_file_name;
stmdsp::device *m_device = nullptr;
+ wav::clip *m_wav_clip = nullptr;
bool tryDevice();
void prepareEditor();
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 19:21:58 +0000