Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -129,7 +129,7 @@ ID_PowerOff = 0x010F, // 010F //// ----- @CRAPIZED ID_ShuttingDown = 0x0E0F, // 35 //// ----- @CRAPIZED: had to change to avoid duplication ID_TreatmentTime = 0x3B00, // 59 //// ----- @LEAHIZED - ID_BloodFlow = 0x1100, // 11 //// ----- @LEAHIZED + ID_BloodFlow = 0x1100, // 17 //// ----- @LEAHIZED ID_DialysateInletFlow = 0x0800, ID_DialysateOutletFlow = 0x0B00, ID_PressureOcclusion = 0x2400, // 36 //// ----- @LEAHIZED Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -59,29 +59,29 @@ onClicked : close() } - DebugDataColumn { id: _TDBloodPumpColumn - textObjectName :"_TDBloodPumpData" + DebugDataColumn { id: _TDBloodFlowColumn + textObjectName :"_TDBloodFlowData" title : qsTr(" BP(H4)") x: col(0) y: row(0) model: [ - vTreatmentBloodFlow.flowSetPoint , - vTreatmentBloodFlow.measuredFlow .toFixed(2) , - vTreatmentBloodFlow.rotorSpeed .toFixed(2) , - vTreatmentBloodFlow.motorSpeed .toFixed(2) , - vTreatmentBloodFlow.motorCtlCurrent .toFixed(2) , - vTreatmentBloodFlow.rPM .toFixed(2) , - vTreatmentBloodFlow.rotorCount , - vTreatmentBloodFlow.presFlow , - vTreatmentBloodFlow.rotorHall , + vTreatmentBloodFlow.setFlowRate , + vTreatmentBloodFlow.measFlow .toFixed(2) , + vTreatmentBloodFlow.measRotorSpd .toFixed(2) , + vTreatmentBloodFlow.measPumpSpd .toFixed(2) , + vTreatmentBloodFlow.measCurr .toFixed(2) , + vTreatmentBloodFlow.setRPM .toFixed(2) , + vTreatmentBloodFlow.rotorCount , + vTreatmentBloodFlow.presFlow , + vTreatmentBloodFlow.rotorHallState , ] label: [ "sFLow (H4) ", "mFlow (H4) ", "rSpd (H4) ", "mSpd (H4) ", - "mCurr (H4) ", + "mCurr (H4) ", "RPM (H4) ", "rCnt (H4) ", "pFlow (H4) ", @@ -110,7 +110,7 @@ "rATH (H16)", "IState (H13)", "OState (H20)", - "ctrl", + "ctrl ", ] } @@ -158,7 +158,7 @@ x: col(6) y: row(0) model: [ - vTDSwitches.door , + vTDSwitches.door , vTreatmentBloodFlow.rotorHall, ] @@ -175,7 +175,7 @@ x: col(0) y: row(3.5) model: [ - vTDBattery.aCPower , + vTDBattery.acPower , vTDBattery.capacity , ] label: [ @@ -203,7 +203,7 @@ vTDVoltage.fpgaVpvn .toFixed(2) ] label: [ - "1.2V", + "1.2V" , "3.3V" , "L5V" , "S5V" , @@ -213,7 +213,7 @@ "Ref" , "VCC" , "Vaux" , - "VPN" + "VPN" , ] } @@ -233,23 +233,33 @@ DebugDataColumn { id: _TDTXStatesColumn textObjectName :"_TDTxStatesData" - title : "" - horizontalAlignmentText: Text.AlignLeft - fontPixelSizeText: Fonts.fontPixelDebugTitle + title : qsTr(" TXStates ") x: col(0) y: row(7) - model: [ "TX States: %1 %2 %3 %4 %5 %6 %7 %8 %9 %10" - .arg(vTDTreatmentStates.subMode ) - .arg(vTDTreatmentStates.txBloodPrime ) - .arg(vTDTreatmentStates.txDialysis ) - .arg(vTDTreatmentStates.ufState ) - .arg(vTDTreatmentStates.txStop ) - .arg(vTDTreatmentStates.txRinseback ) - .arg(vTDTreatmentStates.txRecirculate ) - .arg(vTDTreatmentStates.txEnd ) - .arg(vTDTreatmentStates.salineState ) - .arg(vTDTreatmentStates.heparin ) + model: [ + vTDTreatmentStates.subMode , + vTDTreatmentStates.txBloodPrime , + vTDTreatmentStates.txDialysis , + vTDTreatmentStates.ufState , + vTDTreatmentStates.txStop , + vTDTreatmentStates.txRinseback , + vTDTreatmentStates.txRecirculate, + vTDTreatmentStates.txEnd , + vTDTreatmentStates.salineState , + vTDTreatmentStates.heparin , ] + label: [ + "subMode " , + "BPrime " , + "Dial " , + "UF " , + "Stop " , + "RB " , + "Recirc " , + "End " , + "Saline " , + "Hep " , + ] } Index: sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml =================================================================== diff -u -r86274f18e9356126c41d848bc78bfba318638aee -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision 86274f18e9356126c41d848bc78bfba318638aee) +++ sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -61,7 +61,7 @@ horizontalCenter: parent.horizontalCenter } color: Colors.textMain - text: vTreatmentBloodFlow.flowSetPoint.toFixed(0) + " " + qsTr(Variables.unitTextFlowRate) + text: vTreatmentBloodFlow.setFlowRate.toFixed(0) + " " + qsTr(Variables.unitTextFlowRate) font.pixelSize: 23 } } Index: sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h (.../MAdjustDDSerialNumberResponse.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h (.../MAdjustDDSerialNumberResponse.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -29,9 +29,9 @@ * \brief The MAdjustSerialNumberDDResponse class * \details The DD serial number response data model * - * | MSG | CAN ID | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x8800| 0x101 | Rsp | Y | DD | UI | DD Serial Number | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x8800| 0x101 | Rsp | Y | DD | UI | DD Serial Number | * * | Payload || * | || Index: sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h (.../MAdjustDDVersionsResponse.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h (.../MAdjustDDVersionsResponse.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -30,9 +30,9 @@ * \brief The MAdjustVersionsDDResponse class * \details The DD versions data model * - * | MSG | CAN ID | Type | Ack | Src | Dest | Description | - * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------:| - * | 0x0F00 | 0x101 | Rsp | Y | DD | All | DD Versions Data | + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------: | + * | 0x0F00 | 0x101 | Rsp | Y | DD | All | DD Versions Data | * * | Payload || * | || @@ -65,15 +65,15 @@ QVariantList parameters() const override; struct { - Types::U08 mMajor ; - Types::U08 mMinor ; - Types::U08 mMicro ; - Types::U16 mBuild ; - Types::U08 mFPGAId ; - Types::U08 mFPGAMajor ; - Types::U08 mFPGAMinor ; - Types::U08 mFPGALab ; - Types::U32 mCompatibilityRev ; + Types::U08 mMajor ; + Types::U08 mMinor ; + Types::U08 mMicro ; + Types::U16 mBuild ; + Types::U08 mFPGAId ; + Types::U08 mFPGAMajor ; + Types::U08 mFPGAMinor ; + Types::U08 mFPGALab ; + Types::U32 mCompatibilityRev ; } _data; public: @@ -83,14 +83,14 @@ QString infoText () const override { return QString("VersionRsp") ; } struct Data { - quint8 mMajor = 0; /*!< DD Versions Major value of type quint8 extracted out */ - quint8 mMinor = 0; /*!< DD Versions Minor value of type quint8 extracted out */ - quint8 mMicro = 0; /*!< DD Versions Micro value of type quint8 extracted out */ + quint8 mMajor = 0; /*!< DD Versions Major value of type quint8 extracted out */ + quint8 mMinor = 0; /*!< DD Versions Minor value of type quint8 extracted out */ + quint8 mMicro = 0; /*!< DD Versions Micro value of type quint8 extracted out */ quint16 mBuild = 0; /*!< DD Versions Build value of type quint16 extracted out */ - quint8 mFPGAId = 0; /*!< DD Versions FPGA ID value of type quint8 extracted out */ - quint8 mFPGAMajor = 0; /*!< DD Versions FPGA Major value of type quint8 extracted out */ - quint8 mFPGAMinor = 0; /*!< DD Versions FPGA Minor value of type quint8 extracted out */ - quint8 mFPGALab = 0; /*!< DD Versions FPGA Lab value of type quint8 extracted out */ + quint8 mFPGAId = 0; /*!< DD Versions FPGA ID value of type quint8 extracted out */ + quint8 mFPGAMajor = 0; /*!< DD Versions FPGA Major value of type quint8 extracted out */ + quint8 mFPGAMinor = 0; /*!< DD Versions FPGA Minor value of type quint8 extracted out */ + quint8 mFPGALab = 0; /*!< DD Versions FPGA Lab value of type quint8 extracted out */ quint32 mCompatibilityRev = 0; /*!< DD Compatibility Revision */ }; Index: sources/model/dd/data/MDDGenDialysateData.cpp =================================================================== diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/dd/data/MDDGenDialysateData.cpp (.../MDDGenDialysateData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) +++ sources/model/dd/data/MDDGenDialysateData.cpp (.../MDDGenDialysateData.cpp) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -25,7 +25,7 @@ _data.mD9Pressure .value, _data.mD18Pressure .value, _data.mD51Pressure .value, - _data.mDialGood .value, + _data.mIsDialGood .value, }; } @@ -39,7 +39,7 @@ if ( ! GetValue(vByteArray, index, _data.mD9Pressure )) goto lError; if ( ! GetValue(vByteArray, index, _data.mD18Pressure )) goto lError; if ( ! GetValue(vByteArray, index, _data.mD51Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDialGood )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mIsDialGood )) goto lError; return true ; @@ -64,6 +64,6 @@ data.mHydNegativePressure = _data.mD9Pressure .value; data.mHydPositivePressure = _data.mD18Pressure .value; data.mSpendPressure = _data.mD51Pressure .value; - data.mDialGood = _data.mDialGood .value; + data.mIsDialGood = _data.mIsDialGood .value; return data; } Index: sources/model/dd/data/MDDGenDialysateData.h =================================================================== diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/dd/data/MDDGenDialysateData.h (.../MDDGenDialysateData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) +++ sources/model/dd/data/MDDGenDialysateData.h (.../MDDGenDialysateData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -43,7 +43,7 @@ * | #06:(F32) | \ref Data::mHydNegativePressure | * | #07:(F32) | \ref Data::mHydPositivePressure | * | #08:(F32) | \ref Data::mSpendPressure | - * | #09:(U32) | \ref Data::mDialGood | + * | #09:(U32) | \ref Data::mIsDialGood | * * * \sa Data @@ -72,7 +72,7 @@ Types::F32 mD9Pressure ; Types::F32 mD18Pressure ; Types::F32 mD51Pressure ; - Types::U32 mDialGood ; + Types::U32 mIsDialGood ; } _data; @@ -90,7 +90,7 @@ float mHydNegativePressure = 0; ///< Hydraulics chamber negative pressure float mHydPositivePressure = 0; ///< Hydraulics chamber positive pressure float mSpendPressure = 0; ///< Spent Dialysate positive pressure - quint32 mDialGood = 0; ///< Ready to deliver dialysate or not + quint32 mIsDialGood = 0; ///< Ready to deliver dialysate or not }; MDDGenDialysateData () { } Index: sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h (.../MAdjustTDSerialNumberResponse.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h (.../MAdjustTDSerialNumberResponse.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -29,8 +29,8 @@ * \brief The MAdjustSerialNumberTDResponse class * \details The TD serial number response data model * - * | MSG | CAN ID | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:| + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | * |0x9900| 0x040 | Rsp | Y | TD | UI | TD Serial Number | * * | Payload || Index: sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h (.../MAdjustTDVersionsRequest.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h (.../MAdjustTDVersionsRequest.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -30,8 +30,8 @@ * \brief The MAdjustVersionsTDRequest class * \details The TD versions data model * - * | MSG | CAN ID | Type | Ack | Src | Dest | Description | - * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------: | * | 0x1500 | 0x040 | Req | Y | TD | UI | TD Versions Request Data | * * | Payload || Index: sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h (.../MAdjustTDVersionsResponse.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h (.../MAdjustTDVersionsResponse.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -83,14 +83,14 @@ QString infoText () const override { return QString("VersionRsp") ; } struct Data { - quint8 mMajor = 0; /*!< TD Versions Major value of type quint8 extracted out */ - quint8 mMinor = 0; /*!< TD Versions Minor value of type quint8 extracted out */ - quint8 mMicro = 0; /*!< TD Versions Micro value of type quint8 extracted out */ + quint8 mMajor = 0; /*!< TD Versions Major value of type quint8 extracted out */ + quint8 mMinor = 0; /*!< TD Versions Minor value of type quint8 extracted out */ + quint8 mMicro = 0; /*!< TD Versions Micro value of type quint8 extracted out */ quint16 mBuild = 0; /*!< TD Versions Build value of type quint16 extracted out */ - quint8 mFPGAId = 0; /*!< TD Versions FPGA ID value of type quint8 extracted out */ - quint8 mFPGAMajor = 0; /*!< TD Versions FPGA Major value of type quint8 extracted out */ - quint8 mFPGAMinor = 0; /*!< TD Versions FPGA Minor value of type quint8 extracted out */ - quint8 mFPGALab = 0; /*!< TD Versions FPGA Lab value of type quint8 extracted out */ + quint8 mFPGAId = 0; /*!< TD Versions FPGA ID value of type quint8 extracted out */ + quint8 mFPGAMajor = 0; /*!< TD Versions FPGA Major value of type quint8 extracted out */ + quint8 mFPGAMinor = 0; /*!< TD Versions FPGA Minor value of type quint8 extracted out */ + quint8 mFPGALab = 0; /*!< TD Versions FPGA Lab value of type quint8 extracted out */ quint32 mCompatibilityRev = 0; /*!< TD Versions Compatibility Revision */ }; Index: sources/model/td/data/MTDAirTrapData.h =================================================================== diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/data/MTDAirTrapData.h (.../MTDAirTrapData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) +++ sources/model/td/data/MTDAirTrapData.h (.../MTDAirTrapData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -29,8 +29,8 @@ * \brief The MTDAirTrapData class * \details The TD Air Trap data model * - * | MSG | CAN ID | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | * |0x2A00| 0x100 | 1 Hz | N | TD | All | TD Air Trap Data | * * | Payload || Index: sources/model/td/data/MTDBatteryData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/data/MTDBatteryData.cpp (.../MTDBatteryData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/MTDBatteryData.cpp (.../MTDBatteryData.cpp) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -43,7 +43,7 @@ */ MTDBatteryData::Data MTDBatteryData::data() const{ Data data; - data.mACPower = _data.mCapacity .value; - data.mCapacity = _data.mACPower .value; + data.mCapacity = _data.mCapacity .value; + data.mACPower = _data.mACPower .value; return data; } Index: sources/model/td/data/MTDBatteryData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/data/MTDBatteryData.h (.../MTDBatteryData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/MTDBatteryData.h (.../MTDBatteryData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -30,8 +30,8 @@ * \brief The MTDBatteryData class * \details The TD Battery data model * - * | MSG | CAN ID | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | * |0x9400| 0x100 | 1 Hz | N | TD | All | TD Battery Data | * * | Payload || Index: sources/model/td/data/MTDEjectorData.h =================================================================== diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/data/MTDEjectorData.h (.../MTDEjectorData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) +++ sources/model/td/data/MTDEjectorData.h (.../MTDEjectorData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -29,8 +29,8 @@ * \brief The MTDEjectorData class * \details The TD Ejector data model * - * | MSG | CAN ID | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | * |0x4E00| 0x100 | 1 Hz | N | TD | All | TD Ejector Data | * * | Payload || Index: sources/model/td/data/MTDSwitchesData.h =================================================================== diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/data/MTDSwitchesData.h (.../MTDSwitchesData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) +++ sources/model/td/data/MTDSwitchesData.h (.../MTDSwitchesData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -29,8 +29,8 @@ * \brief The MTDSwitchesData class * \details The TD Switches data model * - * | MSG | CAN ID | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | * |0x2100| 0x100 | 1 Hz | N | TD | All | TD Switches Data | * * | Payload || @@ -60,8 +60,8 @@ public: - Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eTD ; } + Type_Enum typeText() const override { return Type_Enum::eDatum ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("Switches") ; } Index: sources/model/td/data/MTDTemperatureData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/data/MTDTemperatureData.h (.../MTDTemperatureData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/MTDTemperatureData.h (.../MTDTemperatureData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -30,8 +30,8 @@ * \brief The MTDTemperatureData class * \details The TD Temparature data model * - * | MSG | CAN ID | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | * |0x9100| 0x100 | 1 Hz | N | TD | All | TD Temperature Data | * * | Payload || @@ -61,8 +61,8 @@ public: - Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eTD ; } + Type_Enum typeText() const override { return Type_Enum::eDatum ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("Temperature") ; } Index: sources/model/td/data/MTDValvesData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/data/MTDValvesData.h (.../MTDValvesData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/MTDValvesData.h (.../MTDValvesData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -29,9 +29,9 @@ * \brief The MTDValvesData class * \details The TD Valves data model * - * | MSG | CAN ID | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x2B00| 0x100 | 1 Hz | N | TD | All | TD Valves Data | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x2B00| 0x100 | 1 Hz | N | TD | All | TD Valves Data | * * | Payload || * | || @@ -70,7 +70,7 @@ Type_Enum typeText() const override { return Type_Enum::eDatum ; } Unit_Enum unitText() const override { return Unit_Enum::eTD ; } - QString infoText() const override { return QString("Valves") ; } + QString infoText() const override { return QString("Valves") ; } struct Data { Index: sources/model/td/data/MTDVoltageData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/data/MTDVoltageData.h (.../MTDVoltageData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/MTDVoltageData.h (.../MTDVoltageData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -29,8 +29,8 @@ * \brief The MTDVoltageData class * \details The TD Voltage data model * - * | MSG | CAN ID | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | * |0x1D00| 0x100 | 1 Hz | N | TD | All | TD Voltage Data | * * | Payload || Index: sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp =================================================================== diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) +++ sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -18,29 +18,29 @@ QVariantList MBloodFlow::parameters() const { return { - _data.mH4FlowSetPoint .value, - _data.mH4MeasuredFlow .value, - _data.mH4RotorSpeed .value, - _data.mH4MotorSpeed .value, - _data.mH4MotorCtlCurrent .value, - _data.mH4RPM .value, - _data.mH4RotorCount .value, - _data.mH4PresFlow .value, - _data.mH4RotorHall .value, + _data. mH4SetFlowRate .value, + _data. mH4MeasFlow .value, + _data. mH4MeasRotorSpd .value, + _data. mH4MeasPumpSpd .value, + _data. mH4MeasCurr .value, + _data. mH4SetRPM .value, + _data. mH4RotorCount .value, + _data. mH4PresFlow .value, + _data. mH6RotorHallState .value, }; } bool MBloodFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mH4FlowSetPoint )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mH4MeasuredFlow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mH4RotorSpeed )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mH4MotorSpeed )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mH4MotorCtlCurrent )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mH4RPM )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mH4RotorCount )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mH4PresFlow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mH4RotorHall )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4SetFlowRate )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4MeasFlow )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4MeasRotorSpd )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4MeasPumpSpd )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4MeasCurr )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4SetRPM )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4RotorCount )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4PresFlow )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH6RotorHallState )) goto lError; return true ; @@ -58,14 +58,14 @@ */ MBloodFlow::Data MBloodFlow::data() const { Data data; - data.mFlowSetPoint = _data.mH4FlowSetPoint .value; - data.mMeasuredFlow = _data.mH4MeasuredFlow .value; - data.mRotorSpeed = _data.mH4RotorSpeed .value; - data.mMotorSpeed = _data.mH4MotorSpeed .value; - data.mMotorCtlCurrent = _data.mH4MotorCtlCurrent .value; - data.mRPM = _data.mH4RPM .value; - data.mRotorCount = _data.mH4RotorCount .value; - data.mPresFlow = _data.mH4PresFlow .value; - data.mRotorHall = _data.mH4RotorHall .value; + data.mSetFlowRate = _data. mH4SetFlowRate .value; + data.mMeasFlow = _data. mH4MeasFlow .value; + data.mMeasRotorSpd = _data. mH4MeasRotorSpd .value; + data.mMeasPumpSpd = _data. mH4MeasPumpSpd .value; + data.mMeasCurr = _data. mH4MeasCurr .value; + data.mSetRPM = _data. mH4SetRPM .value; + data.mRotorCount = _data. mH4RotorCount .value; + data.mPresFlow = _data. mH4PresFlow .value; + data.mRotorHallState = _data. mH6RotorHallState .value; return data; } Index: sources/model/td/data/treatment/MTreatmentBloodFlowData.h =================================================================== diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) +++ sources/model/td/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -35,15 +35,15 @@ * * | Payload || * | || - * | #1 :(S32) | \ref Data::mFlowSetPoint | - * | #2 :(F32) | \ref Data::mMeasuredFlow | - * | #3 :(F32) | \ref Data::mRotorSpeed | - * | #4 :(F32) | \ref Data::mMotorSpeed | - * | #5 :(F32) | \ref Data::mMotorCtlCurrent | - * | #6 :(F32) | \ref Data::mRPM | - * | #7 :(U32) | \ref Data::mRotorCount | - * | #8 :(U32) | \ref Data::mPresFlow | - * | #9 :(U32) | \ref Data::mRotorHall | + * | #1 :(S32) | \ref Data:: mH4SetFlowRate | + * | #2 :(F32) | \ref Data:: mH4MeasFlow | + * | #3 :(F32) | \ref Data:: mH4MeasRotorSpd | + * | #4 :(F32) | \ref Data:: mH4MeasPumpSpd | + * | #5 :(F32) | \ref Data:: mH4MeasCurr | + * | #6 :(F32) | \ref Data:: mH4SetRPM | + * | #7 :(U32) | \ref Data:: mH4RotorCount | + * | #8 :(U32) | \ref Data:: mH4PresFlow | + * | #9 :(U32) | \ref Data:: mH6RotorHallState | * * \sa Data * @@ -61,33 +61,33 @@ friend class ::tst_models; struct { - Types::S32 mH4FlowSetPoint ; ///< Flow Set Point - Types::F32 mH4MeasuredFlow ; ///< Measured Flow - Types::F32 mH4RotorSpeed ; ///< Rotor Speed - Types::F32 mH4MotorSpeed ; ///< Motor Speed - Types::F32 mH4MotorCtlCurrent ; ///< Motor Controller Current - Types::F32 mH4RPM ; ///< RPM - Types::U32 mH4RotorCount ; ///< Rotor Count - Types::U32 mH4PresFlow ; ///< Prescribed flow rate - Types::U32 mH4RotorHall ; ///< Rotor Hall Sensor Value + Types::S32 mH4SetFlowRate ; ///< Set flow rate in mL/min. + Types::F32 mH4MeasFlow ; ///< Measured flow rate in mL/min. + Types::F32 mH4MeasRotorSpd ; ///< Measured rotor speed in RPM. + Types::F32 mH4MeasPumpSpd ; ///< Measured pump speed in RPM. + Types::F32 mH4MeasCurr ; ///< Measure motor current in Amps. + Types::F32 mH4SetRPM ; ///< Set motor speed in RPM. + Types::U32 mH4RotorCount ; ///< Rotor count. + Types::U32 mH4PresFlow ; ///< Prescribed blood flow in mL/min. + Types::U32 mH6RotorHallState ; ///< Rotor hall state (1=home, 0=not home) } _data; QVariantList parameters() const override; public: - Type_Enum typeText () const override { return Type_Enum::eDatum; } - Unit_Enum unitText () const override { return Unit_Enum::eTD ; } + Type_Enum typeText () const override { return Type_Enum::eDatum ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("BloodFlow"); } struct Data { - qint32 mFlowSetPoint = 0; ///< Flow Set Point - float mMeasuredFlow = 0; ///< Measured Flow - float mRotorSpeed = 0; ///< Rotor Speed - float mMotorSpeed = 0; ///< Motor Speed - float mMotorCtlCurrent = 0; ///< Motor Controller Current - float mRPM = 0; ///< RPM - quint32 mRotorCount = 0; ///< Rotor Count - quint32 mPresFlow = 0; ///< Prescribed flow rate - quint32 mRotorHall = 0; ///< Rotor Hall Sensor Value + qint32 mSetFlowRate = 0; ///< Set flow rate in mL/min. + float mMeasFlow = 0; ///< Measured flow rate in mL/min. + float mMeasRotorSpd = 0; ///< Measured rotor speed in RPM. + float mMeasPumpSpd = 0; ///< Measured pump speed in RPM. + float mMeasCurr = 0; ///< Measure motor current in Amps. + float mSetRPM = 0; ///< Set motor speed in RPM. + quint32 mRotorCount = 0; ///< Rotor count. + quint32 mPresFlow = 0; ///< Prescribed blood flow in mL/min. + quint32 mRotorHallState = 0; ///< Rotor hall state (1=home, 0=not home) }; MBloodFlow() { } Index: sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h =================================================================== diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) +++ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -86,7 +86,7 @@ Type_Enum typeText () const override { return Type_Enum::eDatum ; } Unit_Enum unitText () const override { return Unit_Enum::eTD ; } - QString infoText () const override { return QString("Occlusion"); } + QString infoText () const override { return QString("Occlusion") ; } struct Data { float mArterialPressure = 0; Index: sources/model/td/data/treatment/MTreatmentTimeData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/data/treatment/MTreatmentTimeData.h (.../MTreatmentTimeData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/treatment/MTreatmentTimeData.h (.../MTreatmentTimeData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -67,7 +67,7 @@ Type_Enum typeText () const override { return Type_Enum::eDatum ; } Unit_Enum unitText () const override { return Unit_Enum::eTD ; } - QString infoText () const override { return QString("TreatmentTime"); } + QString infoText () const override { return QString("TreatmentTime") ; } struct Data { quint32 mTotal = 0; ///< Total treatment time in sec */ Index: sources/model/td/data/treatment/MTreatmentUltrafiltrationData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/model/td/data/treatment/MTreatmentUltrafiltrationData.h (.../MTreatmentUltrafiltrationData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/treatment/MTreatmentUltrafiltrationData.h (.../MTreatmentUltrafiltrationData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -67,8 +67,8 @@ public: - Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eTD ; } + Type_Enum typeText() const override { return Type_Enum::eDatum ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("Ultrafiltration") ; } struct Data { Index: sources/view/dd/data/VDDGenDialysateData.cpp =================================================================== diff -u -r3428dfd1fb3372d8de9a7c1afc55e4860b70ec89 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/view/dd/data/VDDGenDialysateData.cpp (.../VDDGenDialysateData.cpp) (revision 3428dfd1fb3372d8de9a7c1afc55e4860b70ec89) +++ sources/view/dd/data/VDDGenDialysateData.cpp (.../VDDGenDialysateData.cpp) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -29,5 +29,5 @@ hydNegativePressure ( vData. mHydNegativePressure ); hydPositivePressure ( vData. mHydPositivePressure ); spendPressure ( vData. mSpendPressure ); - dialGood ( vData. mDialGood ); + isDialGood ( vData. mIsDialGood ); } Index: sources/view/dd/data/VDDGenDialysateData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/view/dd/data/VDDGenDialysateData.h (.../VDDGenDialysateData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/dd/data/VDDGenDialysateData.h (.../VDDGenDialysateData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -38,13 +38,12 @@ PROPERTY( quint32 , genDialysateExec , 0) PROPERTY( quint32 , ddInProgress , 0) PROPERTY( quint32 , fltLevel1 , 0) - PROPERTY( quint32 , fltLevel2 , 0) PROPERTY( quint32 , bicarbLevel , 0) PROPERTY( quint32 , spentLevel , 0) PROPERTY( float , hydNegativePressure , 0) PROPERTY( float , hydPositivePressure , 0) PROPERTY( float , spendPressure , 0) - PROPERTY( quint32 , dialGood , 0) + PROPERTY( quint32 , isDialGood , 0) VIEW_DEC(VDDGenDialysate, DDGenDialysateData) }; Index: sources/view/td/data/VTDBatteryData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/view/td/data/VTDBatteryData.cpp (.../VTDBatteryData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/td/data/VTDBatteryData.cpp (.../VTDBatteryData.cpp) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -20,6 +20,6 @@ VIEW_DEF(VTDBattery, TDBatteryData) void VTDBattery::onActionReceive(const TDBatteryData &vData) { - aCPower (vData.mACPower ); - capacity (vData.mCapacity ); + capacity (vData.mCapacity ); + acPower (vData.mACPower ); } Index: sources/view/td/data/VTDBatteryData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/view/td/data/VTDBatteryData.h (.../VTDBatteryData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/td/data/VTDBatteryData.h (.../VTDBatteryData.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -35,8 +35,8 @@ class VTDBattery : public QObject { Q_OBJECT - PROPERTY( quint32 , aCPower , 0) PROPERTY( quint32 , capacity , 0) + PROPERTY( quint32 , acPower , 0) VIEW_DEC(VTDBattery, TDBatteryData) }; Index: sources/view/td/data/treatment/VTreatmentBloodFlow.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/view/td/data/treatment/VTreatmentBloodFlow.cpp (.../VTreatmentBloodFlow.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/td/data/treatment/VTreatmentBloodFlow.cpp (.../VTreatmentBloodFlow.cpp) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -21,13 +21,13 @@ void VTreatmentBloodFlow::onActionReceive(const BloodFlowData &vData) { - flowSetPoint (vData. mFlowSetPoint ); - measuredFlow (vData. mMeasuredFlow ); - rotorSpeed (vData. mRotorSpeed ); - motorSpeed (vData. mMotorSpeed ); - motorCtlCurrent (vData. mMotorCtlCurrent ); - rPM (vData. mRPM ); - rotorCount (vData. mRotorCount ); - presFlow (vData. mPresFlow ); - rotorHall (vData. mRotorHall ); + setFlowRate (vData.mSetFlowRate ); + measFlow (vData.mMeasFlow ); + measRotorSpd (vData.mMeasRotorSpd ); + measPumpSpd (vData.mMeasPumpSpd ); + measCurr (vData.mMeasCurr ); + setRPM (vData.mSetRPM ); + rotorCount (vData.mRotorCount ); + presFlow (vData.mPresFlow ); + rotorHallState (vData.mRotorHallState ); } Index: sources/view/td/data/treatment/VTreatmentBloodFlow.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r9d27f14c2b528c0f199004614f10d55589e08614 --- sources/view/td/data/treatment/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/td/data/treatment/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision 9d27f14c2b528c0f199004614f10d55589e08614) @@ -36,15 +36,15 @@ { Q_OBJECT - PROPERTY( qint32 , flowSetPoint , 0) - PROPERTY( float , measuredFlow , 0) - PROPERTY( float , rotorSpeed , 0) - PROPERTY( float , motorSpeed , 0) - PROPERTY( float , motorCtlCurrent , 0) - PROPERTY( float , rPM , 0) - PROPERTY( quint32, rotorCount , 0) - PROPERTY( quint32, presFlow , 0) - PROPERTY( quint32, rotorHall , 0) + PROPERTY( qint32 , setFlowRate , 0) + PROPERTY( float , measFlow , 0) + PROPERTY( float , measRotorSpd , 0) + PROPERTY( float , measPumpSpd , 0) + PROPERTY( float , measCurr , 0) + PROPERTY( float , setRPM , 0) + PROPERTY( quint32, rotorCount , 0) + PROPERTY( quint32, presFlow , 0) + PROPERTY( quint32, rotorHallState , 0) VIEW_DEC(VTreatmentBloodFlow, BloodFlowData) };