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/Application.h

@@ -237,7 +237,7 @@ class Application {
      * Prints preamble for commands help. Can include tips which commands to
      * use,..
      */
-    virtual void printGenericHelp() {};
+    virtual void printGenericHelp(){};
 
     /**
      * Process option from command line parsing.

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(const uint8_t* data);
 
-    friend std::ostream& operator<<(std::ostream& os, const MPUTelemetry& tel);
+    uint64_t writeBytes;  /// Number of bytes written
+    uint64_t readBytes;   /// Number of bytes read
 
-    /**
-     * 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; */
-    }
+    friend std::ostream& operator<<(std::ostream& os, const MPUTelemetry& tel);
 };
 
 }  // namespace cRIO

include/cRIO/ModbusBuffer.h

@@ -411,13 +411,13 @@ class ModbusBuffer {
      * Called before responses are processed (before processXX methods are
      * called).
      */
-    virtual void preProcess() {};
+    virtual void preProcess(){};
 
     /**
      * Called after responses are processed (after processXX methods are
      * called).
      */
-    virtual void postProcess() {};
+    virtual void postProcess(){};
 
     /**
      * Thrown when an unknown response function is received. As unknown function

include/cRIO/Task.h

@@ -54,7 +54,7 @@ class Task {
      *
      * @param ex exception raised during processing
      */
-    virtual void reportException(const std::exception &ex) {};
+    virtual void reportException(const std::exception &ex){};
 
     static constexpr task_return_t DONT_RESCHEDULE = 0xFFFFFFFF;
 

src/LSST/cRIO/ElectromechanicalPneumaticILC.cpp

@@ -103,7 +103,8 @@ ElectromechanicalPneumaticILC::ElectromechanicalPneumaticILC(uint8_t bus) : ILC:
 
     addResponse(ILC_EM_CMD::STEPPER_FORCE_STATUS, stepperForceStatus, 195);
 
-    addResponse(ILC_EM_CMD::SET_DCA_GAIN, [this](Modbus::Parser parser) { parser.checkCRC(); }, 201);
+    addResponse(
+            ILC_EM_CMD::SET_DCA_GAIN, [this](Modbus::Parser parser) { parser.checkCRC(); }, 201);
 
     addResponse(ILC_EM_CMD::REPORT_DCA_GAIN, dcaGain, 202);
 

src/LSST/cRIO/FPGACliApp.cpp

@@ -44,8 +44,10 @@ FPGACliApp::FPGACliApp(const char* name, const char* description)
                   "Temporary disable given ILC in * commands");
     addILCCommand("@enable", std::bind(&FPGACliApp::enableILC, this, std::placeholders::_1),
                   "Re-enable given ILC in * commands");
-    addILCCommand("info", [](ILCUnit u) { u.first->reportServerID(u.second); }, "Print ILC info");
-    addILCCommand("status", [](ILCUnit u) { u.first->reportServerStatus(u.second); }, "Print ILC status");
+    addILCCommand(
+            "info", [](ILCUnit u) { u.first->reportServerID(u.second); }, "Print ILC info");
+    addILCCommand(
+            "status", [](ILCUnit u) { u.first->reportServerStatus(u.second); }, "Print ILC status");
     addILCCommand(
             "standby", [](ILCUnit u) { u.first->changeILCMode(u.second, ILC::Mode::Standby); },
             "Change ILC mode to standby");
@@ -61,7 +63,8 @@ FPGACliApp::FPGACliApp(const char* name, const char* description)
     addILCCommand(
             "clear-faults", [](ILCUnit u) { u.first->changeILCMode(u.second, ILC::Mode::ClearFaults); },
             "Clear ILC faults");
-    addILCCommand("reset", [](ILCUnit u) { u.first->resetServer(u.second); }, "Reset server");
+    addILCCommand(
+            "reset", [](ILCUnit u) { u.first->resetServer(u.second); }, "Reset server");
 
     addCommand("program-ilc", std::bind(&FPGACliApp::programILC, this, std::placeholders::_1), "FS?",
                NEED_FPGA, "<firmware hex file> <ILC...>", "Program ILC with new firmware.");

src/LSST/cRIO/MPUTelemetry.cpp

@@ -31,16 +31,14 @@
 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)));
+MPUTelemetry::MPUTelemetry(const uint8_t *data) {
+    writeBytes = be64toh(*(reinterpret_cast<const uint64_t *>(data + 0)));
+    readBytes = be64toh(*(reinterpret_cast<const uint64_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 bytes: " << tel.readBytes << std::endl;
     return os;
 }