1 files changed, 43 insertions, 30 deletions

diff --git a/source/device.cpp b/source/device.cpp
index edd950c..9c50a0d 100644
--- a/source/device.cpp
+++ b/source/device.cpp
@@ -33,6 +33,7 @@
 extern void log(const std::string& str);
 extern std::vector<stmdsp::dacsample_t> deviceGenLoadFormulaEval(const std::string&);
 extern std::ifstream compileOpenBinaryFile();
+extern void deviceRenderDisconnect();
 
 std::shared_ptr<stmdsp::device> m_device;
 
@@ -45,9 +46,15 @@ static std::deque<stmdsp::dacsample_t> drawSamplesInputQueue;
 static bool drawSamplesInput = false;
 static unsigned int drawSamplesBufferSize = 1;
 
+bool deviceConnect();
+
 void deviceSetInputDrawing(bool enabled)
 {
     drawSamplesInput = enabled;
+    if (enabled) {
+        drawSamplesQueue.clear();
+        drawSamplesInputQueue.clear();
+    }
 }
 
 static void measureCodeTask(std::shared_ptr<stmdsp::device> device)
@@ -55,7 +62,7 @@ static void measureCodeTask(std::shared_ptr<stmdsp::device> device)
     std::this_thread::sleep_for(std::chrono::seconds(1));
 
     if (device) {
-        const auto cycles = device->continuous_start_get_measurement();
+        const auto cycles = device->measurement_read();
         log(std::string("Execution time: ") + std::to_string(cycles) + " cycles.");
     }
 }
@@ -111,11 +118,20 @@ static void drawSamplesTask(std::shared_ptr<stmdsp::device> device)
         const auto next = std::chrono::high_resolution_clock::now() + bufferTime;
 
         if (lockDevice.try_lock_until(next)) {
-            const auto chunk = tryReceiveChunk(device,
+            std::vector<stmdsp::dacsample_t> chunk, chunk2;
+
+            chunk = tryReceiveChunk(device,
                 std::mem_fn(&stmdsp::device::continuous_read));
+            if (drawSamplesInput) {
+                chunk2 = tryReceiveChunk(device,
+                    std::mem_fn(&stmdsp::device::continuous_read_input));
+            }
+
             lockDevice.unlock();
 
             addToQueue(drawSamplesQueue, chunk);
+            if (drawSamplesInput)
+                addToQueue(drawSamplesInputQueue, chunk2);
 
             if (logSamplesFile.is_open()) {
                 for (const auto& s : chunk)
@@ -126,16 +142,6 @@ static void drawSamplesTask(std::shared_ptr<stmdsp::device> device)
             std::this_thread::sleep_for(std::chrono::milliseconds(50));
         }
 
-        if (drawSamplesInput) {
-            if (lockDevice.try_lock_for(std::chrono::milliseconds(1))) {
-                const auto chunk2 = tryReceiveChunk(device,
-                    std::mem_fn(&stmdsp::device::continuous_read_input));
-                lockDevice.unlock();
-
-                addToQueue(drawSamplesInputQueue, chunk2);
-            }
-        }
-
         std::this_thread::sleep_until(next);
     }
 }
@@ -196,6 +202,12 @@ static void statusTask(std::shared_ptr<stmdsp::device> device)
             case stmdsp::Error::ConversionAborted:
                 log("Error: Algorithm unloaded, a fault occurred!");
                 break;
+            case stmdsp::Error::GUIDisconnect:
+                // Do GUI events for disconnect if device was lost.
+                deviceConnect();
+                deviceRenderDisconnect();
+                return;
+                break;
             default:
                 log("Error: Device had an issue...");
                 break;
@@ -304,7 +316,7 @@ bool deviceConnect()
     return false;
 }
 
-void deviceStart(bool measureCodeTime, bool logResults, bool drawSamples)
+void deviceStart(bool logResults, bool drawSamples)
 {
     if (!m_device) {
         log("No device connected.");
@@ -323,18 +335,22 @@ void deviceStart(bool measureCodeTime, bool logResults, bool drawSamples)
         }
         log("Ready.");
     } else {
-        if (measureCodeTime) {
-            m_device->continuous_start_measure();
-            std::thread(measureCodeTask, m_device).detach();
-        } else {
-            m_device->continuous_start();
-            if (drawSamples || logResults || wavOutput.valid())
-                std::thread(drawSamplesTask, m_device).detach();
-        }
+        m_device->continuous_start();
+        if (drawSamples || logResults || wavOutput.valid())
+            std::thread(drawSamplesTask, m_device).detach();
+
         log("Running.");
     }
 }
 
+void deviceStartMeasurement()
+{
+    if (m_device && m_device->is_running()) {
+        m_device->measurement_start();
+        std::thread(measureCodeTask, m_device).detach();
+    }
+}
+
 void deviceAlgorithmUpload()
 {
     if (!m_device) {
@@ -390,7 +406,7 @@ void deviceGenLoadList(const std::string_view list)
             }
         }
 
-        it = itend;
+        it = std::find_if(itend, list.cend(), isdigit);
     }
 
     if (it == list.cend()) {
@@ -417,8 +433,7 @@ void deviceGenLoadFormula(const std::string& formula)
 
 std::size_t pullFromQueue(
     std::deque<stmdsp::dacsample_t>& queue,
-    CircularBuffer<std::vector, stmdsp::dacsample_t>& circ,
-    double timeframe)
+    CircularBuffer<std::vector, stmdsp::dacsample_t>& circ)
 {
     // We know how big the circular buffer should be to hold enough samples to
     // fill the current draw samples view.
@@ -453,16 +468,14 @@ std::size_t pullFromQueue(
  * the samples to the given buffer.
  */
 std::size_t pullFromDrawQueue(
-    CircularBuffer<std::vector, stmdsp::dacsample_t>& circ,
-    double timeframe)
+    CircularBuffer<std::vector, stmdsp::dacsample_t>& circ)
 {
-    return pullFromQueue(drawSamplesQueue, circ, timeframe);
+    return pullFromQueue(drawSamplesQueue, circ);
 }
 
 std::size_t pullFromInputDrawQueue(
-    CircularBuffer<std::vector, stmdsp::dacsample_t>& circ,
-    double timeframe)
+    CircularBuffer<std::vector, stmdsp::dacsample_t>& circ)
 {
-    return pullFromQueue(drawSamplesInputQueue, circ, timeframe);
+    return pullFromQueue(drawSamplesInputQueue, circ);
 }