Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r54dac829fccaf4646e2e21c18226893afd3d8e73 -r64d551143d898bf2ce79cb564e5a3389eb9be91e --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 54dac829fccaf4646e2e21c18226893afd3d8e73) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) @@ -106,7 +106,7 @@ {Gui::GuiActionType::ID_DDPressuresData , 14 * 4 }, // 14 parameters each 4bytes {Gui::GuiActionType::ID_DDConductivityData , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_DDConcentratePumpData , 25 * 4 }, // 25 parameters each 4bytes - {Gui::GuiActionType::ID_DDTemperaturesData , 15 * 4 }, // 15 parameters each 4bytes + {Gui::GuiActionType::ID_DDTemperaturesData , 23 * 4 }, // 23 parameters each 4bytes {Gui::GuiActionType::ID_DDDialysatePumpData , 20 * 4 }, // 20 parameters each 4bytes {Gui::GuiActionType::ID_DDHeatersData , 8 * 4 }, // 8 parameters each 4bytes // NOTE: may contain optional 9 parameters each 4bytes {Gui::GuiActionType::ID_DDLevelData , 3 * 4 }, // 3 parameters each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -r64d551143d898bf2ce79cb564e5a3389eb9be91e --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) @@ -631,11 +631,7 @@ case Gui::GuiActionType::ID_DGDrainPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGDrainPumpData ); break; case Gui::GuiActionType::ID_DGReservoirData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGReservoirData ); break; case Gui::GuiActionType::ID_DDValvesStatesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData ); break; - case Gui::GuiActionType::ID_DDHeatersData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData ); break; case Gui::GuiActionType::ID_DGLoadCellReadingsData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGLoadCellReadingsData ); break; - case Gui::GuiActionType::ID_DDConcentratePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDConcentratePumpData ); break; - case Gui::GuiActionType::ID_DDTemperaturesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDTemperaturesData ); break; - case Gui::GuiActionType::ID_DDDialysatePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDDialysatePumpData ); break; case Gui::GuiActionType::ID_DDDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDDebugText ); break; case Gui::GuiActionType::ID_DGGeneralEvent : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGGeneralEvent ); break; case Gui::GuiActionType::ID_DGAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData ); break; @@ -656,11 +652,17 @@ /////////////////////////////////////// //// FIXME: RO LOOP TEST /////////////////////////////////////// + /// + // DD data messages - case Gui::GuiActionType::ID_DDGenDialysateData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData ); break; case Gui::GuiActionType::ID_DDConductivityData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData ); break; + case Gui::GuiActionType::ID_DDConcentratePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDConcentratePumpData ); break; + case Gui::GuiActionType::ID_DDDialysatePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDDialysatePumpData ); break; + case Gui::GuiActionType::ID_DDHeatersData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData ); break; + case Gui::GuiActionType::ID_DDTemperaturesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDTemperaturesData ); break; + case Gui::GuiActionType::ID_AdjustDDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp ); break; case Gui::GuiActionType::ID_DDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDOperationModeData ); break; case Gui::GuiActionType::ID_AdjustVersionsDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp ); break; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -r64d551143d898bf2ce79cb564e5a3389eb9be91e --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) @@ -211,7 +211,7 @@ ID_DDHeatersData = 0x2800, // 40 //// ----- @LEAHIZED ID_DDLevelData = 0x2900, // 41 //// ----- @LEAHIZED ID_DDGenDialysateData = 0x2F00, // 47 //// ----- @LEAHIZED - ID_DDBloodLeakData = 0x6000, // 96 //// ----- TODO: Payload subject to change given FW implementation + ID_DDBloodLeakData = 0x6100, // 96 //// ----- TODO: Payload subject to change given FW implementation // FP Data Messages ID_FPValvesStatesData = 0x310F, // 49 //// ----- @OBSOLETE. REMOVE? Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 -r64d551143d898bf2ce79cb564e5a3389eb9be91e --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) @@ -32,7 +32,7 @@ DebugDataColumn { id: _DDConcentratePumpColumn textObjectName :"_DDConcentratePumpData" - title : qsTr(" Conc Pump ") + title : qsTr("[0x25] Conc Pump ") anchors { top : parent.top left : parent.left @@ -95,7 +95,7 @@ DebugDataColumn { id: _DDDialysatePumpColumn textObjectName :"_DDDialysatePumpData" - title : qsTr(" Dial Pump ") + title : qsTr("[0x27] Dialysate Pump ") anchors { top : parent.top left : _DDConcentratePumpColumn.right @@ -149,7 +149,7 @@ DebugDataColumn { id: _DDHeatersColumn textObjectName :"_DDHeatersData" - title : qsTr(" Heaters ") + title : qsTr("[0x28] Heaters ") anchors { top : parent.top left : _DDDialysatePumpColumn.right @@ -197,45 +197,61 @@ DebugDataColumn { id: _DDTemperatureColumn textObjectName :"_DDTemperatureData" - title : qsTr(" Temp ") + title : qsTr("[0x26] Temperature ") anchors { top : parent.top left : _DDHeatersColumn.right leftMargin : spacing } model: [ - vDDTemperatures.inletHeatExchanger .toFixed(2) , - vDDTemperatures.outletHeatExchanger .toFixed(2) , - vDDTemperatures.hydraulicsPrimaryHeater .toFixed(2) , - vDDTemperatures.trimmerHeater .toFixed(2) , - vDDTemperatures.boardTemperature .toFixed(2) , - vDDTemperatures.barometricTemperature .toFixed(2) , - vDDTemperatures.D16Conductivity .toFixed(2) , - vDDTemperatures.D28Conductivity .toFixed(2) , - vDDTemperatures.D30Conductivity .toFixed(2) , - vDDTemperatures.D44Conductivity .toFixed(2) , - vDDTemperatures.D75Conductivity .toFixed(2) , - vDDTemperatures.D4MovingAverage .toFixed(2) , - vDDTemperatures.D50MovingAverage .toFixed(2) , - vDDTemperatures.D28MovingAverage .toFixed(2) , - vDDTemperatures.D30MovingAverage .toFixed(2) , + vDDTemperatures.d1Temperature .toFixed(2) , + vDDTemperatures.d78Temperature .toFixed(2) , + vDDTemperatures.d4Temperature .toFixed(2) , + vDDTemperatures.d50Temperature .toFixed(2) , + vDDTemperatures.d99Temperature .toFixed(2) , + vDDTemperatures.boardTemperature .toFixed(2) , + vDDTemperatures.d16Conductivity .toFixed(2) , + vDDTemperatures.d28Conductivity .toFixed(2) , + vDDTemperatures.d30Conductivity .toFixed(2) , + vDDTemperatures.d44Conductivity .toFixed(2) , + vDDTemperatures.d75Conductivity .toFixed(2) , + vDDTemperatures.d4MovingAverage .toFixed(2) , + vDDTemperatures.d50MovingAverage .toFixed(2) , + vDDTemperatures.d99MovingAverage .toFixed(2) , + vDDTemperatures.d28MovingAverage .toFixed(2) , + vDDTemperatures.d30MovingAverage .toFixed(2) , + vDDTemperatures.d78MovingAverage .toFixed(2) , + vDDTemperatures.d9PressureAverage .toFixed(2) , + vDDTemperatures.d66PressureAverage .toFixed(2) , + vDDTemperatures.d51PressureAverage .toFixed(2) , + vDDTemperatures.d18PressureAverage .toFixed(2) , + vDDTemperatures.d41PressureAverage .toFixed(2) , + vDDTemperatures.d87PressureAverage .toFixed(2) , ] label: [ - "inHE (D1) ", - "outHE (X6) ", - "hydr (D4) ", - "trim (D50) ", + "mTmp (D1) ", + "mTmp (D78) ", + "mTmp (D4) ", + "mTmp (D50) ", + "mTmp (D99) ", "board ", - "baro ", "Cond (D16) ", "Cond (D28) ", "Cond (D30) ", "Cond (D44) ", "Cond (D75) ", "mAvg (D4) ", "mAvg (D50) ", + "mAvg (D99) ", "mAvg (D28) ", "mAvg (D30) ", + "mAvg (D78) ", + "mPressAvg (D9) ", + "mPressAvg (D66) ", + "mPressAvg (D51) ", + "mPressAvg (D18) ", + "mPressAvg (D41) ", + "mPressAvg (D87) ", ] } @@ -284,7 +300,7 @@ DebugDataColumn { id: _DDOpModeColumn textObjectName :"_DDOpModeColumn" - title : qsTr(" OpMode ") + title : qsTr("[0x13] OpMode ") anchors { top : parent.top left : _DDPressureColumn.right @@ -302,7 +318,7 @@ DebugDataColumn { id: _DDGenDialColumn textObjectName :"_DDGenDialData" - title : qsTr(" GenDial ") + title : qsTr("[0x2F] GenDial ") anchors { top : _DDOpModeColumn.bottom topMargin : spacing @@ -369,7 +385,7 @@ DebugDataColumn { id: _DDCondColumn textObjectName :"_DDCondlData" - title : qsTr(" Cond ") + title : qsTr("[0x1F] Conductivity ") anchors { top : _DDDialysatePumpColumn.bottom topMargin : spacing Index: sources/model/dd/data/MDDBloodLeakData.h =================================================================== diff -u -r86c040b666b2544800274db2a18ba5374fbfd4e7 -r64d551143d898bf2ce79cb564e5a3389eb9be91e --- sources/model/dd/data/MDDBloodLeakData.h (.../MDDBloodLeakData.h) (revision 86c040b666b2544800274db2a18ba5374fbfd4e7) +++ sources/model/dd/data/MDDBloodLeakData.h (.../MDDBloodLeakData.h) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) @@ -32,7 +32,7 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x6000| 0x101 | 8 | 1 Hz | N | DD | All | DD BloodLeak Data | + * |0x6100| 0x101 | 8 | 1 Hz | N | DD | All | DD BloodLeak Data | * * | Payload || * | || Index: sources/model/dd/data/MDDTemperaturesData.cpp =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r64d551143d898bf2ce79cb564e5a3389eb9be91e --- sources/model/dd/data/MDDTemperaturesData.cpp (.../MDDTemperaturesData.cpp) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/model/dd/data/MDDTemperaturesData.cpp (.../MDDTemperaturesData.cpp) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) @@ -19,41 +19,57 @@ QVariantList MDDTemperatures::parameters() const { return { - _data.d1Temp .value, - _data.x6Temp .value, - _data.d4Temp .value, - _data.d50Temp .value, - _data.boardTemp .value, - _data.baroTemp .value, - _data.d16CondTemp .value, - _data.d28CondTemp .value, - _data.d30CondTemp .value, - _data.d44CondTemp .value, - _data.d75CondTemp .value, - _data.d4AvgTemp .value, - _data.d50AvgTemp .value, - _data.d28AvgTemp .value, - _data.d30AvgTemp .value, + _data.mD1Temperature .value, + _data.mD78Temperature .value, + _data.mD4Temperature .value, + _data.mD50Temperature .value, + _data.mD99Temperature .value, + _data.mBoardTemperature .value, + _data.mD16Conductivity .value, + _data.mD28Conductivity .value, + _data.mD30Conductivity .value, + _data.mD44Conductivity .value, + _data.mD75Conductivity .value, + _data.mD4MovingAverage .value, + _data.mD50MovingAverage .value, + _data.mD99MovingAverage .value, + _data.mD28MovingAverage .value, + _data.mD30MovingAverage .value, + _data.mD78MovingAverage .value, + _data.mD9PressureAverage .value, + _data.mD66PressureAverage .value, + _data.mD51PressureAverage .value, + _data.mD18PressureAverage .value, + _data.mD41PressureAverage .value, + _data.mD87PressureAverage .value, }; } bool MDDTemperatures::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.d1Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.x6Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d4Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d50Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.boardTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.baroTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d16CondTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d28CondTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d30CondTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d44CondTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d75CondTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d4AvgTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d50AvgTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d28AvgTemp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d30AvgTemp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD1Temperature )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD78Temperature )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD4Temperature )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD50Temperature )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD99Temperature )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBoardTemperature )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD16Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD28Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD30Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD44Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD75Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD4MovingAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD50MovingAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD99MovingAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD28MovingAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD30MovingAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD78MovingAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD9PressureAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD66PressureAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD51PressureAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD18PressureAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD41PressureAverage )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD87PressureAverage )) goto lError; return true ; @@ -70,20 +86,28 @@ */ MDDTemperatures::Data MDDTemperatures::data() const { Data data; - data.mInletHeatExchanger = _data.d1Temp .value; - data.mOutletHeatExchanger = _data.x6Temp .value; - data.mHydraulicsPrimaryHeater = _data.d4Temp .value; - data.mTrimmerHeater = _data.d50Temp .value; - data.mBoardTemperature = _data.boardTemp .value; - data.mBarometricTemperature = _data.baroTemp .value; - data.mD16Conductivity = _data.d16CondTemp .value; - data.mD28Conductivity = _data.d28CondTemp .value; - data.mD30Conductivity = _data.d30CondTemp .value; - data.mD44Conductivity = _data.d44CondTemp .value; - data.mD75Conductivity = _data.d75CondTemp .value; - data.mD4MovingAverage = _data.d4AvgTemp .value; - data.mD50MovingAverage = _data.d50AvgTemp .value; - data.mD28MovingAverage = _data.d28AvgTemp .value; - data.mD30MovingAverage = _data.d30AvgTemp .value; + data.mD1Temperature = _data.mD1Temperature .value; + data.mD78Temperature = _data.mD78Temperature .value; + data.mD4Temperature = _data.mD4Temperature .value; + data.mD50Temperature = _data.mD50Temperature .value; + data.mD99Temperature = _data.mD99Temperature .value; + data.mBoardTemperature = _data.mBoardTemperature .value; + data.mD16Conductivity = _data.mD16Conductivity .value; + data.mD28Conductivity = _data.mD28Conductivity .value; + data.mD30Conductivity = _data.mD30Conductivity .value; + data.mD44Conductivity = _data.mD44Conductivity .value; + data.mD75Conductivity = _data.mD75Conductivity .value; + data.mD4MovingAverage = _data.mD4MovingAverage .value; + data.mD50MovingAverage = _data.mD50MovingAverage .value; + data.mD99MovingAverage = _data.mD99MovingAverage .value; + data.mD28MovingAverage = _data.mD28MovingAverage .value; + data.mD30MovingAverage = _data.mD30MovingAverage .value; + data.mD78MovingAverage = _data.mD78MovingAverage .value; + data.mD9PressureAverage = _data.mD9PressureAverage .value; + data.mD66PressureAverage = _data.mD66PressureAverage .value; + data.mD51PressureAverage = _data.mD51PressureAverage .value; + data.mD18PressureAverage = _data.mD18PressureAverage .value; + data.mD41PressureAverage = _data.mD41PressureAverage .value; + data.mD87PressureAverage = _data.mD87PressureAverage .value; return data; } Index: sources/model/dd/data/MDDTemperaturesData.h =================================================================== diff -u -r3d13050e0319cf30a1686b58c8f2328f6860910a -r64d551143d898bf2ce79cb564e5a3389eb9be91e --- sources/model/dd/data/MDDTemperaturesData.h (.../MDDTemperaturesData.h) (revision 3d13050e0319cf30a1686b58c8f2328f6860910a) +++ sources/model/dd/data/MDDTemperaturesData.h (.../MDDTemperaturesData.h) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) @@ -36,21 +36,29 @@ * * | Payload || * | || - * | #01:(F32) | \ref Data::mInletHeatExchanger | - * | #02:(F32) | \ref Data::mOutletHeatExchanger | - * | #03:(F32) | \ref Data::mHydraulicsPrimaryHeater | - * | #04:(F32) | \ref Data::mTrimmerHeater | - * | #05:(F32) | \ref Data::mBoardTemperature | - * | #06:(F32) | \ref Data::mBarometricTemperature | - * | #07:(F32) | \ref Data::mD16Conductivity | - * | #08:(F32) | \ref Data::mD28Conductivity | - * | #09:(F32) | \ref Data::mD30Conductivity | - * | #10:(F32) | \ref Data::mD44Conductivity | - * | #11:(F32) | \ref Data::mD75Conductivity | - * | #12:(F32) | \ref Data::mD4MovingAverage | - * | #13:(F32) | \ref Data::mD50MovingAverage | - * | #14:(F32) | \ref Data::mD28MovingAverage | - * | #15:(F32) | \ref Data::mD30MovingAverage | + * | #01:(F32) | \ref Data::mD1Temperature | + * | #02:(F32) | \ref Data::mD78Temperature | + * | #03:(F32) | \ref Data::mD4Temperature | + * | #04:(F32) | \ref Data::mD50Temperature | + * | #05:(F32) | \ref Data::mD99Temperature | + * | #06:(F32) | \ref Data::mBoardTemperature | + * | #07:(F32) | \ref Data::mD16Conductivity | + * | #08:(F32) | \ref Data::mD28Conductivity | + * | #09:(F32) | \ref Data::mD30Conductivity | + * | #10:(F32) | \ref Data::mD44Conductivity | + * | #11:(F32) | \ref Data::mD75Conductivity | + * | #12:(F32) | \ref Data::mD4MovingAverage | + * | #13:(F32) | \ref Data::mD50MovingAverage | + * | #14:(F32) | \ref Data::mD99MovingAverage | + * | #15:(F32) | \ref Data::mD28MovingAverage | + * | #16:(F32) | \ref Data::mD30MovingAverage | + * | #17:(F32) | \ref Data::mD78MovingAverage | + * | #18:(F32) | \ref Data::mD9PressureAverage | + * | #19:(F32) | \ref Data::mD66PressureAverage | + * | #20:(F32) | \ref Data::mD51PressureAverage | + * | #21:(F32) | \ref Data::mD18PressureAverage | + * | #22:(F32) | \ref Data::mD41PressureAverage | + * | #23:(F32) | \ref Data::mD87PressureAverage | * * \sa Data * @@ -69,21 +77,29 @@ QVariantList parameters() const override; struct { - Types::F32 d1Temp ; ///< Inlet heat exchanger temperature sensor - Types::F32 x6Temp ; ///< Outlet heat exchanger temperature sensor - Types::F32 d4Temp ; ///< Hydraulics primary heater temperature sensor - Types::F32 d50Temp ; ///< Trimmer heater temperature sensor - Types::F32 boardTemp ; ///< Board temperature sensor - Types::F32 baroTemp ; ///< Barometric temperature sensor - Types::F32 d16CondTemp; ///< D16 temperature value - Types::F32 d28CondTemp; ///< D28 temperature value - Types::F32 d30CondTemp; ///< D30 temperature value - Types::F32 d44CondTemp; ///< D44 temperature value - Types::F32 d75CondTemp; ///< D75 temperature value - Types::F32 d4AvgTemp ; ///< D4 moving average temperature value - Types::F32 d50AvgTemp ; ///< D50 moving average temperature value - Types::F32 d28AvgTemp ; ///< D28 moving average temperature value - Types::F32 d30AvgTemp ; ///< D30 moving average temperature value + Types::F32 mD1Temperature ; + Types::F32 mD78Temperature ; + Types::F32 mD4Temperature ; + Types::F32 mD50Temperature ; + Types::F32 mD99Temperature ; + Types::F32 mBoardTemperature ; + Types::F32 mD16Conductivity ; + Types::F32 mD28Conductivity ; + Types::F32 mD30Conductivity ; + Types::F32 mD44Conductivity ; + Types::F32 mD75Conductivity ; + Types::F32 mD4MovingAverage ; + Types::F32 mD50MovingAverage ; + Types::F32 mD99MovingAverage ; + Types::F32 mD28MovingAverage ; + Types::F32 mD30MovingAverage ; + Types::F32 mD78MovingAverage ; + Types::F32 mD9PressureAverage ; + Types::F32 mD66PressureAverage; + Types::F32 mD51PressureAverage; + Types::F32 mD18PressureAverage; + Types::F32 mD41PressureAverage; + Types::F32 mD87PressureAverage; } _data; public: @@ -93,21 +109,29 @@ QString infoText () const override { return QString("Temperatures"); } struct Data { - float mInletHeatExchanger = 0; ///< Inlet heat exchanger temperature sensor - float mOutletHeatExchanger = 0; ///< Outlet heat exchanger temperature sensor - float mHydraulicsPrimaryHeater = 0; ///< Hydraulics primary heater temperature sensor - float mTrimmerHeater = 0; ///< Trimmer heater temperature sensor - float mBoardTemperature = 0; ///< Board temperature sensor - float mBarometricTemperature = 0; ///< Barometric temperature sensor - float mD16Conductivity = 0; ///< D16 temperature value - float mD28Conductivity = 0; ///< D28 temperature value - float mD30Conductivity = 0; ///< D30 temperature value - float mD44Conductivity = 0; ///< D44 temperature value - float mD75Conductivity = 0; ///< D75 temperature value - float mD4MovingAverage = 0; ///< D4 moving average temperature value - float mD50MovingAverage = 0; ///< D50 moving average temperature value - float mD28MovingAverage = 0; ///< D28 moving average temperature value - float mD30MovingAverage = 0; ///< D30 moving average temperature value + float mD1Temperature = 0; + float mD78Temperature = 0; + float mD4Temperature = 0; + float mD50Temperature = 0; + float mD99Temperature = 0; + float mBoardTemperature = 0; + float mD16Conductivity = 0; + float mD28Conductivity = 0; + float mD30Conductivity = 0; + float mD44Conductivity = 0; + float mD75Conductivity = 0; + float mD4MovingAverage = 0; + float mD50MovingAverage = 0; + float mD99MovingAverage = 0; + float mD28MovingAverage = 0; + float mD30MovingAverage = 0; + float mD78MovingAverage = 0; + float mD9PressureAverage = 0; + float mD66PressureAverage = 0; + float mD51PressureAverage = 0; + float mD18PressureAverage = 0; + float mD41PressureAverage = 0; + float mD87PressureAverage = 0; }; MDDTemperatures() { } Index: sources/model/td/data/treatment/MTreatmentVitalsData.h =================================================================== diff -u -rd3c42a4b5e5858503ac3102b9b1bfeab81235762 -r64d551143d898bf2ce79cb564e5a3389eb9be91e --- sources/model/td/data/treatment/MTreatmentVitalsData.h (.../MTreatmentVitalsData.h) (revision d3c42a4b5e5858503ac3102b9b1bfeab81235762) +++ sources/model/td/data/treatment/MTreatmentVitalsData.h (.../MTreatmentVitalsData.h) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) @@ -26,7 +26,7 @@ * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:| - * |0x6500| 0x100 | 7 | 1 Hz | N | TD | All | Vitals Response | + * |0x6500| 0x100 | 7 | 1 Hz | N | TD | All | Vitals Data | * * | Payload || * | || Index: sources/view/dd/data/VDDTemperaturesData.cpp =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r64d551143d898bf2ce79cb564e5a3389eb9be91e --- sources/view/dd/data/VDDTemperaturesData.cpp (.../VDDTemperaturesData.cpp) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/view/dd/data/VDDTemperaturesData.cpp (.../VDDTemperaturesData.cpp) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) @@ -21,19 +21,27 @@ void VDDTemperatures::onActionReceive(const DDTemperaturesData &vData) { - inletHeatExchanger ( vData.mInletHeatExchanger ); - outletHeatExchanger ( vData.mOutletHeatExchanger ); - hydraulicsPrimaryHeater ( vData.mHydraulicsPrimaryHeater ); - trimmerHeater ( vData.mTrimmerHeater ); - boardTemperature ( vData.mBoardTemperature ); - barometricTemperature ( vData.mBarometricTemperature ); - D16Conductivity ( vData.mD16Conductivity ); - D28Conductivity ( vData.mD28Conductivity ); - D30Conductivity ( vData.mD30Conductivity ); - D44Conductivity ( vData.mD44Conductivity ); - D75Conductivity ( vData.mD75Conductivity ); - D4MovingAverage ( vData.mD4MovingAverage ); - D50MovingAverage ( vData.mD50MovingAverage ); - D28MovingAverage ( vData.mD28MovingAverage ); - D30MovingAverage ( vData.mD30MovingAverage ); + d1Temperature ( vData.mD1Temperature ); + d78Temperature ( vData.mD78Temperature ); + d4Temperature ( vData.mD4Temperature ); + d50Temperature ( vData.mD50Temperature ); + d99Temperature ( vData.mD99Temperature ); + boardTemperature ( vData.mBoardTemperature ); + d16Conductivity ( vData.mD16Conductivity ); + d28Conductivity ( vData.mD28Conductivity ); + d30Conductivity ( vData.mD30Conductivity ); + d44Conductivity ( vData.mD44Conductivity ); + d75Conductivity ( vData.mD75Conductivity ); + d4MovingAverage ( vData.mD4MovingAverage ); + d50MovingAverage ( vData.mD50MovingAverage ); + d99MovingAverage ( vData.mD99MovingAverage ); + d28MovingAverage ( vData.mD28MovingAverage ); + d30MovingAverage ( vData.mD30MovingAverage ); + d78MovingAverage ( vData.mD78MovingAverage ); + d9PressureAverage ( vData.mD9PressureAverage ); + d66PressureAverage ( vData.mD66PressureAverage ); + d51PressureAverage ( vData.mD51PressureAverage ); + d18PressureAverage ( vData.mD18PressureAverage ); + d41PressureAverage ( vData.mD41PressureAverage ); + d87PressureAverage ( vData.mD87PressureAverage ); } Index: sources/view/dd/data/VDDTemperaturesData.h =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r64d551143d898bf2ce79cb564e5a3389eb9be91e --- sources/view/dd/data/VDDTemperaturesData.h (.../VDDTemperaturesData.h) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/view/dd/data/VDDTemperaturesData.h (.../VDDTemperaturesData.h) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) @@ -36,21 +36,29 @@ { Q_OBJECT - PROPERTY( float , inletHeatExchanger , 0) - PROPERTY( float , outletHeatExchanger , 0) - PROPERTY( float , hydraulicsPrimaryHeater , 0) - PROPERTY( float , trimmerHeater , 0) - PROPERTY( float , boardTemperature , 0) - PROPERTY( float , barometricTemperature , 0) - PROPERTY( float , D16Conductivity , 0) - PROPERTY( float , D28Conductivity , 0) - PROPERTY( float , D30Conductivity , 0) - PROPERTY( float , D44Conductivity , 0) - PROPERTY( float , D75Conductivity , 0) - PROPERTY( float , D4MovingAverage , 0) - PROPERTY( float , D50MovingAverage , 0) - PROPERTY( float , D28MovingAverage , 0) - PROPERTY( float , D30MovingAverage , 0) + PROPERTY( float , d1Temperature , 0) + PROPERTY( float , d78Temperature , 0) + PROPERTY( float , d4Temperature , 0) + PROPERTY( float , d50Temperature , 0) + PROPERTY( float , d99Temperature , 0) + PROPERTY( float , boardTemperature , 0) + PROPERTY( float , d16Conductivity , 0) + PROPERTY( float , d28Conductivity , 0) + PROPERTY( float , d30Conductivity , 0) + PROPERTY( float , d44Conductivity , 0) + PROPERTY( float , d75Conductivity , 0) + PROPERTY( float , d4MovingAverage , 0) + PROPERTY( float , d50MovingAverage , 0) + PROPERTY( float , d99MovingAverage , 0) + PROPERTY( float , d28MovingAverage , 0) + PROPERTY( float , d30MovingAverage , 0) + PROPERTY( float , d78MovingAverage , 0) + PROPERTY( float , d9PressureAverage , 0) + PROPERTY( float , d66PressureAverage , 0) + PROPERTY( float , d51PressureAverage , 0) + PROPERTY( float , d18PressureAverage , 0) + PROPERTY( float , d41PressureAverage , 0) + PROPERTY( float , d87PressureAverage , 0) VIEW_DEC(VDDTemperatures, DDTemperaturesData) }; } Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp =================================================================== diff -u -ra924fbf2e81c3c61a3e817256bca51f98d2f099c -r64d551143d898bf2ce79cb564e5a3389eb9be91e --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision a924fbf2e81c3c61a3e817256bca51f98d2f099c) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) @@ -75,7 +75,7 @@ // Consumable and cartridge installation state - bool mInstallation = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE ; + bool mInstallation = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE ; if ( mInstallation ) { // There is not state(enum) for this and it is always 0 for now. but will be used to notify UI about being in this state. installation_start ( vData.mInstallationState == 0 /* There is no other state and it is always 0 for now */ );