Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -r9392f5be540bb428dc64757ef2e50a4d4e5090a8 -r12f922a6c61b7014345a441e2836e12fd3b0d00e --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 9392f5be540bb428dc64757ef2e50a4d4e5090a8) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 12f922a6c61b7014345a441e2836e12fd3b0d00e) @@ -134,7 +134,7 @@ } case GuiActionType::BloodFlow: { - types::U32 mFlowSetPoint ; + types::S32 mFlowSetPoint ; types::F32 mMeasuredFlow ; types::F32 mRotorSpeed ; types::F32 mMotorSpeed ; @@ -198,15 +198,19 @@ * \details This is the method which interprets the Blood Flow message data in vMessage of type Message * to its elements of data. * \param vMessage - The vMessage of type Message which contains all the data, require to be interpreted. - * \param vFlowSetPoint - Flow Set Point value of type unsigned int extracted out. + * \param vFlowSetPoint - Flow Set Point value of type signed int extracted out. * \param vMeasuredFlow - Measured Flow value of type float extracted out * \param vRotorSpeed - Rotor Speed value of type float extracted out * \param vMotorSpeed - Motor Speed value of type float extracted out * \param vMotorCtlSpeed - Motor Controller Speed value of type float extracted out * \param vMotorCtlCurrent - Motor Controller Current value of type float extracted out * \return true if the message can be successfully converted to the Blood Flow data elements. */ -bool MessageInterpreter::getBloodFlowData(const Message &vMessage, types::U32 &vFlowSetPoint, types::F32 &vMeasuredFlow, types::F32 &vRotorSpeed, types::F32 &vMotorSpeed, types::F32 &vMotorCtlSpeed, types::F32 &vMotorCtlCurrent) +bool MessageInterpreter::getBloodFlowData( + const Message &vMessage , + types::S32 &vFlowSetPoint , + types::F32 &vMeasuredFlow , types::F32 &vRotorSpeed , types::F32 &vMotorSpeed, + types::F32 &vMotorCtlSpeed , types::F32 &vMotorCtlCurrent , types::F32 &vPWMDtCycle) { if ( vMessage.actionId != GuiActionType::BloodFlow ) { return false; Index: sources/canbus/messageinterpreter.h =================================================================== diff -u -rc5389647e2259e67f8e6d923f3481d7d3f4eab68 -r12f922a6c61b7014345a441e2836e12fd3b0d00e --- sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision c5389647e2259e67f8e6d923f3481d7d3f4eab68) +++ sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision 12f922a6c61b7014345a441e2836e12fd3b0d00e) @@ -38,10 +38,10 @@ bool interpretMessage_HD(const Message &vMessage, GuiActionType &vActionId, QVariantList &vData) __attribute_warn_unused_result__; bool interpretMessage_DG(const Message &vMessage, GuiActionType &vActionId, QVariantList &vData) __attribute_warn_unused_result__; - bool getBloodFlowData (const Message &vMessage, - types::U32 &vFlowSetPoint, - types::F32 &vMeasuredFlow, types::F32 &vRotorSpeed, types::F32 &vMotorSpeed, - types::F32 &vMotorCtlSpeed, types::F32 &vMotorCtlCurrent ) __attribute_warn_unused_result__; + bool getBloodFlowData (const Message &vMessage , + types::S32 &vFlowSetPoint , + types::F32 &vMeasuredFlow , types::F32 &vRotorSpeed , types::F32 &vMotorSpeed, + types::F32 &vMotorCtlSpeed , types::F32 &vMotorCtlCurrent , types::F32 &vPWMDtCycle) __attribute_warn_unused_result__; bool getPowerOffData (const Message &vMessage, quint8 &vShowHide) __attribute_warn_unused_result__; void printUnhandled (const Message &vMessage); Index: sources/gui/qml/pages/TreatmentStart.qml =================================================================== diff -u -rfee7fabf49befb065c89248c19e15efc9ca194e4 -r12f922a6c61b7014345a441e2836e12fd3b0d00e --- sources/gui/qml/pages/TreatmentStart.qml (.../TreatmentStart.qml) (revision fee7fabf49befb065c89248c19e15efc9ca194e4) +++ sources/gui/qml/pages/TreatmentStart.qml (.../TreatmentStart.qml) (revision 12f922a6c61b7014345a441e2836e12fd3b0d00e) @@ -47,7 +47,7 @@ topPadding: 100 leftPadding: 10 Text { - id: _U32 + id: _S32 text: qsTr("") width: 250 horizontalAlignment: Text.AlignRight @@ -102,12 +102,13 @@ switch(vAction) { case GuiActions.BloodFlow: //console.debug(vData) - _U32 .text = vData[0]; - _F32_1.text = vData[1].toFixed(2); - _F32_2.text = vData[2].toFixed(2); - _F32_3.text = vData[3].toFixed(2); - _F32_4.text = vData[4].toFixed(2); - _F32_5.text = vData[5].toFixed(2); + _S32 .text = vData[GuiActions.BloodFlow_FlowSetPoint ]; + _F32_1.text = vData[GuiActions.BloodFlow_MeasuredFlow ].toFixed(2); + _F32_2.text = vData[GuiActions.BloodFlow_RotorSpeed ].toFixed(2); + _F32_3.text = vData[GuiActions.BloodFlow_MotorSpeed ].toFixed(2); + _F32_4.text = vData[GuiActions.BloodFlow_MotorCtlSpeed ].toFixed(2); + _F32_5.text = vData[GuiActions.BloodFlow_MotorCtlCurrent].toFixed(2); + _F32_6.text = vData[GuiActions.BloodFlow_PWMDtCycle ].toFixed(2) + "%"; break; } }