Merge branch 'develop' of github.com:us4useu/arrus into develop

api/python/arrus/ops/us4r.py

@@ -143,7 +143,7 @@ class Scheme:
     :param rx_buffer_size: number of elements the rx buffer (allocated on \
       us4r ddr internal memory) should consists of
     :param output_buffer: specification of the output buffer
-    :param work_mode: determines the system work mode, available values: 'ASYNC', 'HOST'
+    :param work_mode: determines the system work mode, available values: 'ASYNC', 'HOST', 'MANUAL'
     :param processing: data processing to perform on the raw channel RF data \
       currently only arrus.utils.imaging is supported
     """

api/python/arrus/session.py

@@ -201,6 +201,17 @@ def stop_scheme(self):
         if self._current_processing is not None:
             self._current_processing.stop()
 
+    def run(self):
+        """
+        Runs the uploaded scheme.
+
+        The behaviour of this method depends on the work mode:
+        - MANUAL: triggers execution of batch of sequences only ONCE,
+        - HOST, ASYNC: triggers execution of batch of sequences IN A LOOP (Host: trigger is on buffer element release).
+         The run function can be called only once (before the scheme is stopped).
+        """
+        self._session_handle.run()
+
     def get_device(self, path: str):
         """
         Returns a device identified by a given id.

api/python/arrus/utils/core.py

@@ -109,7 +109,8 @@ def convert_to_core_scheme(scheme):
 
     core_work_mode = {
         "ASYNC": arrus.core.Scheme.WorkMode_ASYNC,
-        "HOST": arrus.core.Scheme.WorkMode_HOST
+        "HOST": arrus.core.Scheme.WorkMode_HOST,
+        "MANUAL": arrus.core.Scheme.WorkMode_MANUAL
     }[scheme.work_mode]
 
     return arrus.core.Scheme(core_seq, rx_buffer_size, data_buffer_spec,

arrus/core/api/devices/us4r/Us4OEM.h

@@ -17,6 +17,8 @@ class Us4OEM : public Device, public TriggerGenerator {
 
     virtual double getSamplingFrequency() = 0;
 
+    virtual float getFPGATemperature() = 0;
+
     Us4OEM(Us4OEM const&) = delete;
     Us4OEM(Us4OEM const&&) = delete;
     void operator=(Us4OEM const&) = delete;

arrus/core/api/devices/us4r/Us4R.h

@@ -138,6 +138,8 @@ class Us4R : public DeviceWithComponents {
     virtual void start() = 0;
     virtual void stop() = 0;
 
+    virtual uint8_t getNumberOfUs4OEMs() = 0;
+
     Us4R(Us4R const&) = delete;
     Us4R(Us4R const&&) = delete;
     void operator=(Us4R const&) = delete;

arrus/core/api/ops/us4r/Scheme.h

@@ -25,7 +25,9 @@ class Scheme {
         /** Trigger generated by us4r, error on overflow. */
         ASYNC,
         /** Trigger generated by host, no error on overflow. */
-        HOST
+        HOST,
+        /** New data acquisition and processing is manually triggered by user. */
+        MANUAL
     };
 
     /**

arrus/core/api/session/Session.h

@@ -57,6 +57,16 @@ class Session {
      */
     virtual void stopScheme() = 0;
 
+    /**
+     * Runs the uploaded scheme.
+     *
+     * The behaviour of this method depends on the work mode:
+     * - MANUAL: triggers execution of batch of sequences only ONCE,
+     * - HOST, ASYNC: triggers execution of batch of sequences IN A LOOP (Host: trigger is on buffer element release).
+     *   The run function can be called only once (before the scheme is stopped).
+     */
+    virtual void run() = 0;
+
     virtual ~Session() = default;
 };
 

arrus/core/devices/probe/ProbeImpl.cpp

@@ -139,8 +139,8 @@ void ProbeImpl::syncTrigger() {
 
 void ProbeImpl::registerOutputBuffer(Us4ROutputBuffer *buffer,
                                      const Us4RBuffer::Handle &us4rBuffer,
-                                     bool isTriggerSync) {
-    adapter->registerOutputBuffer(buffer, us4rBuffer, isTriggerSync);
+                                     ::arrus::ops::us4r::Scheme::WorkMode workMode) {
+    adapter->registerOutputBuffer(buffer, us4rBuffer, workMode);
 }
 
 // Remaps FCM according to given rx aperture active channels mappings.

arrus/core/devices/probe/ProbeImpl.h

@@ -36,7 +36,8 @@ class ProbeImpl : public ProbeImplBase {
 
     void syncTrigger() override;
 
-    void registerOutputBuffer(Us4ROutputBuffer *buffer, const Us4RBuffer::Handle &us4rBuffer, bool isTriggerSync) override;
+    void registerOutputBuffer(Us4ROutputBuffer *buffer, const Us4RBuffer::Handle &us4rBuffer,
+                              ::arrus::ops::us4r::Scheme::WorkMode workMode) override;
 
     static FrameChannelMapping::Handle remapFcm(const FrameChannelMapping::Handle &adapterFcm,
                                                 const std::vector<std::vector<ChannelIdx>> &adapterActiveChannels,

arrus/core/devices/probe/ProbeImplBase.h

@@ -2,6 +2,7 @@
 #define ARRUS_CORE_DEVICES_PROBE_PROBEIMPLBASE_H
 
 #include "arrus/core/api/devices/probe/Probe.h"
+#include "arrus/core/api/ops/us4r/Scheme.h"
 #include "arrus/core/devices/us4r/Us4RBuffer.h"
 #include "arrus/core/devices/UltrasoundDevice.h"
 
@@ -18,7 +19,8 @@ class ProbeImplBase : public Probe, public UltrasoundDevice {
     setTxRxSequence(const std::vector<TxRxParameters> &seq, const ops::us4r::TGCCurve &tgcSamples, uint16 rxBufferSize,
                     uint16 rxBatchSize, std::optional<float> sri, bool triggerSync) = 0;
 
-    virtual void registerOutputBuffer(Us4ROutputBuffer *, const Us4RBuffer::Handle &, bool isTriggerSync) = 0;
+    virtual void registerOutputBuffer(Us4ROutputBuffer *, const Us4RBuffer::Handle &,
+                                      ::arrus::ops::us4r::Scheme::WorkMode workMode) = 0;
 };
 
 }

arrus/core/devices/us4r/Us4RImpl.cpp

@@ -13,6 +13,7 @@
 namespace arrus::devices {
 
 using ::arrus::ops::us4r::TxRxSequence;
+using ::arrus::ops::us4r::Scheme;
 using ::arrus::ops::us4r::Tx;
 using ::arrus::ops::us4r::Rx;
 using ::arrus::ops::us4r::Pulse;
@@ -95,8 +96,8 @@ Us4RImpl::upload(const ops::us4r::TxRxSequence &seq,
     }
 
     // Upload and register buffers.
-    bool isTriggerSync = workMode == ::arrus::ops::us4r::Scheme::WorkMode::HOST;
-    auto[rxBuffer, fcm] = uploadSequence(seq, rxBufferNElements, 1, isTriggerSync);
+    bool useTriggerSync = workMode == Scheme::WorkMode::HOST || workMode == Scheme::WorkMode::MANUAL;
+    auto[rxBuffer, fcm] = uploadSequence(seq, rxBufferNElements, 1, useTriggerSync);
     ARRUS_REQUIRES_TRUE(!rxBuffer->empty(), "Us4R Rx buffer cannot be empty.");
 
     // Calculate how much of the data each Us4OEM produces.
@@ -115,7 +116,7 @@ Us4RImpl::upload(const ops::us4r::TxRxSequence &seq,
     }
     // Create output buffer.
     this->buffer = std::make_shared<Us4ROutputBuffer>(us4oemComponentSize, shape, dataType, hostBufferNElements);
-    getProbeImpl()->registerOutputBuffer(this->buffer.get(), rxBuffer, isTriggerSync);
+    getProbeImpl()->registerOutputBuffer(this->buffer.get(), rxBuffer, workMode);
     return {this->buffer, std::move(fcm)};
 }
 
@@ -184,7 +185,7 @@ Us4RImpl::uploadSequence(const ops::us4r::TxRxSequence &seq, uint16_t rxBufferSi
                                            triggerSync);
 }
 
-void Us4RImpl::syncTrigger() {
+void Us4RImpl::trigger() {
     this->getDefaultComponent()->syncTrigger();
 }
 
@@ -270,4 +271,8 @@ void Us4RImpl::setActiveTermination(std::optional<uint16> value) {
     setRxSettings(newRxSettings);
 }
 
+uint8_t Us4RImpl::getNumberOfUs4OEMs() {
+    return us4oems.size();
+}
+
 }

arrus/core/devices/us4r/Us4RImpl.h

@@ -106,6 +106,8 @@ class Us4RImpl : public Us4R {
 
     void stop() override;
 
+    void trigger();
+
     void setVoltage(Voltage voltage) override;
 
     void disableHV() override;
@@ -120,14 +122,13 @@ class Us4RImpl : public Us4R {
     void setLpfCutoff(uint32 value) override;
     void setDtgcAttenuation(std::optional<uint16> value) override;
     void setActiveTermination(std::optional<uint16> value) override;
+    uint8_t getNumberOfUs4OEMs() override;
 
 private:
     UltrasoundDevice *getDefaultComponent();
 
     void stopDevice();
 
-    void syncTrigger();
-
     std::tuple<Us4RBuffer::Handle, FrameChannelMapping::Handle>
     uploadSequence(const ops::us4r::TxRxSequence &seq, uint16_t rxBufferSize, uint16_t rxBatchSize, bool triggerSync);
 

arrus/core/devices/us4r/probeadapter/ProbeAdapterImpl.cpp

@@ -12,6 +12,7 @@
 namespace arrus::devices {
 
 using namespace ::arrus::ops::us4r;
+using ::arrus::ops::us4r::Scheme;
 
 ProbeAdapterImpl::ProbeAdapterImpl(DeviceId deviceId,
                                    ProbeAdapterModelId modelId,
@@ -292,18 +293,18 @@ void ProbeAdapterImpl::syncTrigger() {
 }
 
 void ProbeAdapterImpl::registerOutputBuffer(Us4ROutputBuffer *buffer, const Us4RBuffer::Handle &us4rBuffer,
-                                            bool isTriggerSync) {
+                                            ::arrus::ops::us4r::Scheme::WorkMode workMode) {
     Ordinal us4oemOrdinal = 0;
     for (auto &us4oem: us4oems) {
         auto us4oemBuffer = us4rBuffer->getUs4oemBuffer(us4oemOrdinal);
-        registerOutputBuffer(buffer, us4oemBuffer, us4oem,
-                             isTriggerSync);
+        registerOutputBuffer(buffer, us4oemBuffer, us4oem, workMode);
         ++us4oemOrdinal;
     }
 }
 
 void ProbeAdapterImpl::registerOutputBuffer(Us4ROutputBuffer *outputBuffer, const Us4OEMBuffer &us4oemBuffer,
-                                            Us4OEMImplBase::RawHandle us4oem, bool isTriggerSync) {
+                                            Us4OEMImplBase::RawHandle us4oem,
+                                            ::arrus::ops::us4r::Scheme::WorkMode workMode) {
     // Each transfer should have the same size.
     std::unordered_set<size_t> sizes;
     for (auto &element: us4oemBuffer.getElements()) {
@@ -398,7 +399,8 @@ void ProbeAdapterImpl::registerOutputBuffer(Us4ROutputBuffer *outputBuffer, cons
 
         for (size_t i = 0; i < nRepeats; ++i) {
             std::function<void()> releaseFunc;
-            if (!isTriggerSync) {
+            if (workMode == Scheme::WorkMode::ASYNC || workMode == Scheme::WorkMode::MANUAL) {
+                // The TX/RX is triggered by us4OEM or user.
                 releaseFunc = [this, nUs4OEM, startFiring, endFiring]() {
                     for (auto &us4oem: this->us4oems) {
                         us4oem->getIUs4oem()->MarkEntriesAsReadyForTransfer(startFiring, endFiring);

arrus/core/devices/us4r/probeadapter/ProbeAdapterImpl.h

@@ -45,10 +45,8 @@ class ProbeAdapterImpl : public ProbeAdapterImplBase {
 
     void syncTrigger() override;
 
-    void
-    registerOutputBuffer(Us4ROutputBuffer *buffer,
-                         const Us4RBuffer::Handle &us4rBuffer,
-                         bool isTriggerSync);
+    void registerOutputBuffer(Us4ROutputBuffer *buffer, const Us4RBuffer::Handle &us4rBuffer,
+                              ::arrus::ops::us4r::Scheme::WorkMode workMode) override;
 
 private:
     Logger::Handle logger;
@@ -57,10 +55,8 @@ class ProbeAdapterImpl : public ProbeAdapterImplBase {
     ChannelIdx numberOfChannels;
     ChannelMapping channelMapping;
 
-    void registerOutputBuffer(Us4ROutputBuffer *outputBuffer,
-                              const Us4OEMBuffer &us4oemBuffer,
-                              Us4OEMImplBase::RawHandle us4oem,
-                              bool isTriggerSync);
+    void registerOutputBuffer(Us4ROutputBuffer *outputBuffer, const Us4OEMBuffer &us4oemBuffer,
+                              Us4OEMImplBase::RawHandle us4oem, ::arrus::ops::us4r::Scheme::WorkMode workMode);
 
     Us4OEMImplBase::RawHandle getMasterUs4oem() const {
         return this->us4oems[0];

arrus/core/devices/us4r/probeadapter/ProbeAdapterImplBase.h

@@ -4,6 +4,7 @@
 #include "arrus/core/api/devices/us4r/ProbeAdapter.h"
 #include "arrus/core/api/devices/us4r/FrameChannelMapping.h"
 #include "arrus/core/api/ops/us4r/tgc.h"
+#include "arrus/core/api/ops/us4r/Scheme.h"
 #include "arrus/core/devices/TxRxParameters.h"
 #include "arrus/core/devices/us4r/DataTransfer.h"
 #include "arrus/core/devices/us4r/Us4ROutputBuffer.h"
@@ -26,9 +27,8 @@ class ProbeAdapterImplBase : public ProbeAdapter {
                     bool triggerSync) = 0;
 
     virtual
-    void registerOutputBuffer(Us4ROutputBuffer *buffer,
-                              const Us4RBuffer::Handle &transfers,
-                              bool isTriggerSync) = 0;
+    void registerOutputBuffer(Us4ROutputBuffer *buffer, const Us4RBuffer::Handle &transfers,
+                              ::arrus::ops::us4r::Scheme::WorkMode workMode) = 0;
 
     virtual Ordinal getNumberOfUs4OEMs() = 0;
 

arrus/core/devices/us4r/probeadapter/ProbeAdapterImplTest.cpp

@@ -104,6 +104,7 @@ class MockUs4OEM : public Us4OEMImplBase {
     MOCK_METHOD(Ius4OEMRawHandle, getIUs4oem, (), (override));
     MOCK_METHOD(void, enableSequencer, (), (override));
     MOCK_METHOD(std::vector<uint8_t>, getChannelMapping, (), (override));
+    MOCK_METHOD(float, getFPGATemperature, (), (override));
 };
 
 class AbstractProbeAdapterImplTest : public ::testing::Test {

arrus/core/devices/us4r/us4oem/Us4OEMImpl.cpp

@@ -639,6 +639,8 @@ inline void Us4OEMImpl::setActiveTerminationAfe(std::optional<uint16> param, boo
     }
 }
 
-
+float Us4OEMImpl::getFPGATemperature() {
+    return ius4oem->GetFPGATemp();
+}
 
 }

arrus/core/devices/us4r/us4oem/Us4OEMImpl.h

@@ -117,6 +117,7 @@ class Us4OEMImpl : public Us4OEMImplBase {
 
     std::vector<uint8_t> getChannelMapping() override;
     void setRxSettings(const RxSettings &newSettings) override;
+    float getFPGATemperature() override;
 
 private:
     using Us4OEMBitMask = std::bitset<Us4OEMImpl::N_ADDR_CHANNELS>;

arrus/core/session/SessionImpl.cpp

@@ -106,6 +106,10 @@ SessionImpl::~SessionImpl() {
 }
 
 UploadResult SessionImpl::upload(const ops::us4r::Scheme &scheme) {
+    std::lock_guard<std::recursive_mutex> guard(stateMutex);
+    if(state == State::STARTED) {
+        throw IllegalStateException("Stop the scheme first, before uploading new scheme");
+    }
     auto us4r = (::arrus::devices::Us4R *) getDevice(DeviceId(DeviceType::Us4R, 0));
     auto &outputBufferSpec = scheme.getOutputBuffer();
     auto[buffer, fcm] = us4r->upload(scheme.getTxRxSequence(), scheme.getRxBufferSize(),
@@ -114,18 +118,40 @@ UploadResult SessionImpl::upload(const ops::us4r::Scheme &scheme) {
     std::unordered_map<std::string, std::shared_ptr<void>> metadataMap;
     metadataMap.emplace("frameChannelMapping", std::move(fcm));
     auto constMetadata = std::make_shared<UploadConstMetadata>(metadataMap);
+    currentScheme = scheme;
     return UploadResult(buffer, constMetadata);
 }
 
 void SessionImpl::startScheme() {
+    std::lock_guard<std::recursive_mutex> guard(stateMutex);
     auto us4r = (::arrus::devices::Us4R *) getDevice(DeviceId(DeviceType::Us4R, 0));
     us4r->start();
+    state = State::STARTED;
 }
 
 void SessionImpl::stopScheme() {
+    std::lock_guard<std::recursive_mutex> guard(stateMutex);
     auto us4r = (::arrus::devices::Us4R *) getDevice(DeviceId(DeviceType::Us4R, 0));
     us4r->stop();
+    state = State::STOPPED;
 }
 
+void SessionImpl::run() {
+    std::lock_guard<std::recursive_mutex> guard(stateMutex);
+    if(!currentScheme.has_value()) {
+        throw IllegalStateException("Upload scheme before running.");
+    }
+    if(state == State::STOPPED) {
+        startScheme();
+    } else {
+        if(currentScheme.value().getWorkMode() == ops::us4r::Scheme::WorkMode::MANUAL) {
+            auto us4r = (::arrus::devices::Us4RImpl *)getDevice(DeviceId(DeviceType::Us4R, 0));
+            us4r->trigger();
+        }
+        else {
+            throw IllegalStateException("Scheme already started.");
+        }
+    }
+}
 
 }