Adjusted telemetry to FPGA changes

doc/version-history.rst

@@ -4,7 +4,7 @@ Version History
 
 v1.12.0
 -------
-* simplified MPU commonication
+* simplified MPU communication
 
 v1.11.1
 -------

include/cRIO/MPUTelemetry.h

@@ -38,41 +38,12 @@ class MPUTelemetry {
      *
      * @param data[45] data as received from FPGA
      */
-    MPUTelemetry(uint8_t* data);
-    uint32_t writeBytes;    /// Number of bytes written
-    uint32_t readBytes;     /// Number of bytes read
-    uint16_t readTimedout;  /// read timedout counter
+    MPUTelemetry() : writeBytes(0), readBytes(0), readTimedout(false) {}
+    uint32_t writeBytes;  /// Number of bytes written
+    uint32_t readBytes;   /// Number of bytes read
+    bool readTimedout;    /// read timedout counter
 
     friend std::ostream& operator<<(std::ostream& os, const MPUTelemetry& tel);
-
-    /**
-     * Updates MPU telemetry SAL message structure.
-     *
-     * @tparam message class with telemetry filed. Shall be SAL declared class
-     * @param msg message to check and update
-     *
-     * @return true if message shall be send, false if updates are minor and it should not be send
-     */
-    template <class message>
-    bool sendUpdates(message* msg) {
-        return false;
-
-        /**
-    if (msg->readBytes != readBytes || msg->writeTimedout != writeTimedout ||
-        msg->instructionPointerOnError != instructionPointerOnError || msg->errorCode != errorCode) {
-        send = true;
-    }
-    msg->instructionPointer = instructionPointer;
-    msg->outputCounter = outputCounter;
-    msg->inputCounter = inputCounter;
-    msg->outputTimeouts = outputTimeouts;
-    msg->inputTimeouts = inputTimeouts;
-    msg->instructionPointerOnError = instructionPointerOnError;
-    msg->writeTimeout = writeTimeout;
-    msg->readTimeout = readTimeout;
-    msg->errorCode = errorCode;
-    return send; */
-    }
 };
 
 }  // namespace cRIO

src/LSST/cRIO/MPUTelemetry.cpp

@@ -31,16 +31,10 @@
 namespace LSST {
 namespace cRIO {
 
-MPUTelemetry::MPUTelemetry(uint8_t *data) {
-    writeBytes = be32toh(*(reinterpret_cast<uint32_t *>(data + 0)));
-    readBytes = be32toh(*(reinterpret_cast<uint32_t *>(data + 4)));
-    readTimedout = be16toh(*(reinterpret_cast<uint16_t *>(data + 8)));
-}
-
 std::ostream &operator<<(std::ostream &os, const MPUTelemetry &tel) {
     os << std::setw(20) << "Write bytes: " << tel.writeBytes << std::endl
        << std::setw(20) << "Read bytes: " << tel.readBytes << std::endl
-       << std::setw(20) << "Read timedout: " << tel.readTimedout << std::endl;
+       << std::setw(20) << "Read timedout: " << (tel.readTimedout ? "yes" : "no") << std::endl;
     return os;
 }