Transportation flush commnad

lsst-ts · Oct 29, 2024 · 14fd325 · 14fd325
1 parent ebf8964
commit 14fd325
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 2 deletions.
diff --git a/include/Transports/FPGASerialDevice.h b/include/Transports/FPGASerialDevice.h
@@ -53,6 +53,8 @@ class FPGASerialDevice : public Transport {
     void commands(Modbus::BusList& bus_list, std::chrono::microseconds timeout,
                   LSST::cRIO::Thread* calling_thread = NULL) override;
 
+    void flush() override;
+
     void telemetry(uint64_t& write_bytes, uint64_t& read_bytes) override;
 
 private:

diff --git a/include/Transports/SimulatedTransport.h b/include/Transports/SimulatedTransport.h
@@ -55,6 +55,8 @@ class SimulatedTransport : public Transport {
     void commands(Modbus::BusList& bus_list, std::chrono::microseconds timeout,
                   LSST::cRIO::Thread* calling_thread = NULL) override;
 
+    void flush() override;
+
     void telemetry(uint64_t& write_bytes, uint64_t& read_bytes) override;
 
 protected:

diff --git a/include/Transports/Transport.h b/include/Transports/Transport.h
@@ -88,6 +88,11 @@ class Transport {
     virtual void commands(Modbus::BusList& bus_list, std::chrono::microseconds timeout,
                           LSST::cRIO::Thread* calling_thread = NULL) = 0;
 
+    /**
+     * Flush transport buffers.
+     */
+    virtual void flush() = 0;
+
     /**
      * Retrieve transport telemetry.
      *

diff --git a/src/Transports/FPGASerialDevice.cpp b/src/Transports/FPGASerialDevice.cpp
@@ -113,6 +113,22 @@ void FPGASerialDevice::commands(Modbus::BusList& bus_list, std::chrono::microsec
     bus_list.clear();
 }
 
+void FPGASerialDevice::flush() {
+    uint8_t req = 3;
+    NiThrowError("Reading FIFO requesting port flush",
+                 NiFpga_WriteFifoU8(_fpga_session, _write_fifo, &req, 1, 0, NULL));
+
+    uint8_t response;
+    NiThrowError("Reading FIFO flush response ",
+                 NiFpga_ReadFifoU8(_fpga_session, _read_fifo, &response, 1, 1, NULL));
+
+    if (response != req) {
+        throw std::runtime_error(
+                fmt::format("Invalid response from FIFO #{} on flush request - expected 3, recieved {}",
+                            _read_fifo, response));
+    }
+}
+
 void FPGASerialDevice::telemetry(uint64_t& write_bytes, uint64_t& read_bytes) {
     uint8_t req = 0;
     NiThrowError("Reading FIFO requesting telemetry",
@@ -123,8 +139,9 @@ void FPGASerialDevice::telemetry(uint64_t& write_bytes, uint64_t& read_bytes) {
                  NiFpga_ReadFifoU8(_fpga_session, _read_fifo, response, 17, 1, NULL));
 
     if (response[0] != 0) {
-        throw std::runtime_error(fmt::format("Invalid response from FIFO #{} - expected 3, received ",
-                                             _read_fifo, response[0]));
+        throw std::runtime_error(
+                fmt::format("Invalid response from FIFO #{} on telemetry request - expected 0, received {}",
+                            _read_fifo, response[0]));
     }
 
     write_bytes = be64toh(*(reinterpret_cast<const uint64_t*>(response + 1)));

diff --git a/src/Transports/SimulatedTransport.cpp b/src/Transports/SimulatedTransport.cpp
@@ -60,6 +60,8 @@ void SimulatedTransport::commands(Modbus::BusList& bus_list, std::chrono::micros
     bus_list.clear();
 }
 
+void SimulatedTransport::flush() {}
+
 void SimulatedTransport::telemetry(uint64_t& write_bytes, uint64_t& read_bytes) {
     write_bytes = _bytes_written;
     read_bytes = _bytes_read;