aboutsummaryrefslogtreecommitdiffstats
path: root/source/stmdsp
diff options
context:
space:
mode:
Diffstat (limited to 'source/stmdsp')
-rw-r--r--source/stmdsp/stmdsp.cpp40
-rw-r--r--source/stmdsp/stmdsp.hpp21
-rw-r--r--source/stmdsp/stmdsp_code.hpp58
3 files changed, 63 insertions, 56 deletions
diff --git a/source/stmdsp/stmdsp.cpp b/source/stmdsp/stmdsp.cpp
index c835257..294e98f 100644
--- a/source/stmdsp/stmdsp.cpp
+++ b/source/stmdsp/stmdsp.cpp
@@ -92,8 +92,7 @@ namespace stmdsp
m_serial->write(cmd.data(), cmd.size());
success = true;
} catch (...) {
- m_serial.release();
- log("Lost connection!");
+ handle_disconnect();
}
}
@@ -110,8 +109,7 @@ namespace stmdsp
m_serial->read(dest, dest_size);
success = true;
} catch (...) {
- m_serial.release();
- log("Lost connection!");
+ handle_disconnect();
}
}
@@ -160,12 +158,11 @@ namespace stmdsp
m_is_running = true;
}
- void device::continuous_start_measure() {
- if (try_command({'M'}))
- m_is_running = true;
+ void device::measurement_start() {
+ try_command({'M'});
}
- uint32_t device::continuous_start_get_measurement() {
+ uint32_t device::measurement_read() {
uint32_t count = 0;
try_read({'m'}, reinterpret_cast<uint8_t *>(&count), sizeof(uint32_t));
return count / 2;
@@ -195,8 +192,7 @@ namespace stmdsp
}
} catch (...) {
- m_serial.release();
- log("Lost connection!");
+ handle_disconnect();
}
}
@@ -227,8 +223,7 @@ namespace stmdsp
}
} catch (...) {
- m_serial.release();
- log("Lost connection!");
+ handle_disconnect();
}
}
@@ -253,8 +248,7 @@ namespace stmdsp
m_serial->write(request, 3);
m_serial->write((uint8_t *)buffer, size * sizeof(dacsample_t));
} catch (...) {
- m_serial.release();
- log("Lost connection!");
+ handle_disconnect();
}
} else {
try {
@@ -264,8 +258,7 @@ namespace stmdsp
else
m_serial->write((uint8_t *)buffer, size * sizeof(dacsample_t));
} catch (...) {
- m_serial.release();
- log("Lost connection!");
+ handle_disconnect();
}
}
@@ -297,8 +290,7 @@ namespace stmdsp
m_serial->write(request, 3);
m_serial->write(buffer, size);
} catch (...) {
- m_serial.release();
- log("Lost connection!");
+ handle_disconnect();
}
}
}
@@ -320,9 +312,19 @@ namespace stmdsp
bool running = ret.first == RunStatus::Running;
if (m_is_running != running)
m_is_running = running;
+ } else if (m_disconnect_error_flag) {
+ m_disconnect_error_flag = false;
+ return {RunStatus::Idle, Error::GUIDisconnect};
}
return ret;
}
-}
+
+ void device::handle_disconnect()
+ {
+ m_disconnect_error_flag = true;
+ m_serial.release();
+ log("Lost connection!");
+ }
+} // namespace stmdsp
diff --git a/source/stmdsp/stmdsp.hpp b/source/stmdsp/stmdsp.hpp
index e0fca90..efed8a3 100644
--- a/source/stmdsp/stmdsp.hpp
+++ b/source/stmdsp/stmdsp.hpp
@@ -63,12 +63,15 @@ namespace stmdsp
*/
enum class Error : char {
None = 0,
- BadParam, /* An invalid parameter was passed for a command. */
- BadParamSize, /* An invaild param. size was given for a command. */
- BadUserCodeLoad, /* Device failed to load the given algorithm. */
- BadUserCodeSize, /* The given algorithm is too large for the device. */
- NotIdle, /* An idle-only command was received while not Idle. */
- ConversionAborted /* A conversion was aborted due to a fault. */
+ BadParam, /* An invalid parameter was passed for a command. */
+ BadParamSize, /* An invaild param. size was given for a command. */
+ BadUserCodeLoad, /* Device failed to load the given algorithm. */
+ BadUserCodeSize, /* The given algorithm is too large for the device. */
+ NotIdle, /* An idle-only command was received while not Idle. */
+ ConversionAborted, /* A conversion was aborted due to a fault. */
+ NotRunning, /* A running-only command was received while not Running. */
+
+ GUIDisconnect = 100 /* The GUI lost connection with the device. */
};
/**
@@ -123,8 +126,8 @@ namespace stmdsp
void continuous_start();
void continuous_stop();
- void continuous_start_measure();
- uint32_t continuous_start_get_measurement();
+ void measurement_start();
+ uint32_t measurement_read();
std::vector<adcsample_t> continuous_read();
std::vector<adcsample_t> continuous_read_input();
@@ -149,11 +152,13 @@ namespace stmdsp
unsigned int m_sample_rate = 0;
bool m_is_siggening = false;
bool m_is_running = false;
+ bool m_disconnect_error_flag = false;
std::mutex m_lock;
bool try_command(std::basic_string<uint8_t> data);
bool try_read(std::basic_string<uint8_t> cmd, uint8_t *dest, unsigned int dest_size);
+ void handle_disconnect();
};
}
diff --git a/source/stmdsp/stmdsp_code.hpp b/source/stmdsp/stmdsp_code.hpp
index 6850459..7ba0ed2 100644
--- a/source/stmdsp/stmdsp_code.hpp
+++ b/source/stmdsp/stmdsp_code.hpp
@@ -118,67 +118,67 @@ return s;
)cpp";
static std::string file_header_l4 = R"cpp(
#include <cstdint>
-#include <span>
using Sample = uint16_t;
-using Samples = std::span<Sample, $0>;
+using Samples = Sample[$0];
+constexpr unsigned int SIZE = $0;
Sample *process_data(Samples samples);
extern "C" void process_data_entry()
{
Sample *samples;
asm("mov %0, r0" : "=r" (samples));
- process_data(Samples(samples, $0));
+ process_data(samples);
}
-static float PI = 3.14159265358979L;
+static inline float PI = 3.14159265358979L;
__attribute__((naked))
-auto sin(float x) {
-asm("vmov.f32 r1, s0;"
+static inline auto sin(float x) {
+ asm("vmov.f32 r1, s0;"
"eor r0, r0;"
"svc 1;"
"vmov.f32 s0, r1;"
"bx lr");
-return 0;
+ return 0;
}
__attribute__((naked))
-auto cos(float x) {
-asm("vmov.f32 r1, s0;"
+static inline auto cos(float x) {
+ asm("vmov.f32 r1, s0;"
"mov r0, #1;"
"svc 1;"
"vmov.f32 s0, r1;"
"bx lr");
-return 0;
+ return 0;
}
__attribute__((naked))
-auto tan(float x) {
-asm("vmov.f32 r1, s0;"
+static inline auto tan(float x) {
+ asm("vmov.f32 r1, s0;"
"mov r0, #2;"
"svc 1;"
"vmov.f32 s0, r1;"
"bx lr");
-return 0;
+ return 0;
}
__attribute__((naked))
-auto sqrt(float) {
-asm("vsqrt.f32 s0, s0; bx lr");
-return 0;
+static inline auto sqrt(float) {
+ asm("vsqrt.f32 s0, s0; bx lr");
+ return 0;
}
-auto readpot1() {
-Sample s;
-asm("push {r4-r11}; eor r0, r0; svc 3; mov %0, r0; pop {r4-r11}" : "=r"(s));
-return s;
+static inline auto param1() {
+ Sample s;
+ asm("eor r0, r0; svc 3; mov %0, r0" : "=r" (s) :: "r0");
+ return s;
}
-auto readpot2() {
-Sample s;
-asm("push {r4-r11}; mov r0, #1; svc 3; mov %0, r0; pop {r4-r11}" : "=r"(s));
-return s;
+static inline auto param2() {
+ Sample s;
+ asm("mov r0, #1; svc 3; mov %0, r0" : "=r" (s) :: "r0");
+ return s;
}
-//void puts(const char *s) {
-// 's' will already be in r0.
-//asm("push {r4-r6}; svc 4; pop {r4-r6}");
+//static inline void puts(const char *s) {
+// // 's' will already be in r0.
+// asm("push {r4-r6}; svc 4; pop {r4-r6}");
//}
// End stmdspgui header code
@@ -187,9 +187,9 @@ return s;
static std::string file_content =
-R"cpp(Sample *process_data(Samples samples)
+R"cpp(Sample* process_data(Samples samples)
{
- return samples.data();
+ return samples;
}
)cpp";
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 01:40:29 +0000