Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r772bbb399f7ee2c6ccc0829443772cdd522a9976 -r2b8b5f01a15397b7a32a312f2f3d14f05ac99355 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 772bbb399f7ee2c6ccc0829443772cdd522a9976) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 2b8b5f01a15397b7a32a312f2f3d14f05ac99355) @@ -92,14 +92,14 @@ // DG Data Messages {Gui::GuiActionType::ID_DGROPumpData , 4 * 4 }, // 4 parameters each 4bytes - {Gui::GuiActionType::ID_DGPressuresData , 4 * 4 }, // 4 parameters each 4bytes + {Gui::GuiActionType::ID_DGPressuresData , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_DGDrainPumpData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_DGReservoirData , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_DGValvesStatesData , 1 * 2 }, // 1 parameters each 2bytes {Gui::GuiActionType::ID_DGHeatersData , 11 * 4 }, // 11 parameters each 4bytes {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes - {Gui::GuiActionType::ID_DGTemperaturesData , 13 * 4 }, // 13 parameters each 4bytes + {Gui::GuiActionType::ID_DGTemperaturesData , 21 * 4 }, // 21 parameters each 4bytes {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_DGConductivityData , 5 * 4 }, // 9 parameters each 4bytes // HD Data Messages Index: sources/gui/qml/components/DebugDataColumn.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r2b8b5f01a15397b7a32a312f2f3d14f05ac99355 --- sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision 2b8b5f01a15397b7a32a312f2f3d14f05ac99355) @@ -28,11 +28,11 @@ property var label: [] property string title: "Title" property int fontPixelSizeTitle: 30 - property int fontPixelSizeText : 38 + property int fontPixelSizeText : 35 property string textObjectName: "_DebugDataColumn" - property var horizontalAlignmentTitle: Text.AlignRight - property var horizontalAlignmentText : Text.AlignRight + property int horizontalAlignmentTitle: Text.AlignRight + property int horizontalAlignmentText : Text.AlignRight width : 150 spacing : -15 Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r5e9239161c20344a9c56220d6569f429a66b7c41 -r2b8b5f01a15397b7a32a312f2f3d14f05ac99355 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 5e9239161c20344a9c56220d6569f429a66b7c41) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 2b8b5f01a15397b7a32a312f2f3d14f05ac99355) @@ -186,10 +186,18 @@ vDGTemperatures.inletDialysate .toFixed(2) , vDGTemperatures.primaryHeaterThermoCouple .toFixed(2) , vDGTemperatures.trimmerHeaterThermoCouple .toFixed(2) , - // vDGTemperatures.primaryHeaterColdJunction .toFixed(2) , - // vDGTemperatures.trimmerHeaterColdJunction .toFixed(2) , + vDGTemperatures.primaryHeaterColdJunction .toFixed(2) , + vDGTemperatures.trimmerHeaterColdJunction .toFixed(2) , vDGTemperatures.primaryHeaterInternal .toFixed(2) , vDGTemperatures.trimmerHeaterInternal .toFixed(2) , + vDGTemperatures.fpgaBoard .toFixed(2) , + vDGTemperatures.loadCellA1B1 .toFixed(2) , + vDGTemperatures.loadCellA2B2 .toFixed(2) , + vDGTemperatures.internalTHDORTD .toFixed(2) , + vDGTemperatures.internalTDIRTD .toFixed(2) , + vDGTemperatures.interalTHDRTD .toFixed(2) , + vDGTemperatures.internalCondSnsrTemp .toFixed(2) , + vDGTemperatures.baroTempSensor .toFixed(2) , ] label: [ "TPi" , @@ -201,10 +209,18 @@ "TDi" , "HP.Trm", "HR.Trm", - // "HP.CJ" , - // "HR.CJ" , + "HP.Cld", + "HR.Cld", "HP.Int", "HR.Int", + "fpga" , + "cell11", + "cell22", + "iTHDO" , + "iTDI" , + "iTHD" , + "iCond" , + "baro" , ] } @@ -232,8 +248,8 @@ DebugDataColumn { id: _HDAirColumn textObjectName :"_HDAirData" title : qsTr(" Air Status ") - x: col(6) - y: row(4.1) + x: col(3.0) + y: row(5.5) model: [ vHDAirBubble .venousAirBubbleStatus , vHDAirTrap .airTrapLowerLevel , @@ -457,7 +473,7 @@ DebugDataColumn { id: _HDAlarmTopColumn textObjectName :"_HDAlarmTopData" title : qsTr(" Alarms ") - x: col(6) + x: col(5) y: row(5.5) model: [ _alarmItem.alarm_AlarmID , Index: sources/model/dg/data/MDGTemperaturesData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r2b8b5f01a15397b7a32a312f2f3d14f05ac99355 --- sources/model/dg/data/MDGTemperaturesData.cpp (.../MDGTemperaturesData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGTemperaturesData.cpp (.../MDGTemperaturesData.cpp) (revision 2b8b5f01a15397b7a32a312f2f3d14f05ac99355) @@ -19,19 +19,27 @@ QVariantList MDGTemperatures::parameters() const { return { - _data.mInletPrimaryHeater .value, - _data.mHeatDisinfect .value, - _data.mOutletPrimaryHeater .value, - _data.mConductivitySensor1 .value, - _data.mConductivitySensor2 .value, - _data.mOutletRedundancy .value, - _data.mInletDialysate .value, - _data.mPrimaryHeaterThermoCouple .value, - _data.mTrimmerHeaterThermoCouple .value, - _data.mPrimaryHeaterColdJunction .value, - _data.mTrimmerHeaterColdJunction .value, - _data.mPrimaryHeaterInternal .value, - _data.mTrimmerHeaterInternal .value + _data.mInletPrimaryHeater .value, + _data.mHeatDisinfect .value, + _data.mOutletPrimaryHeater .value, + _data.mConductivitySensor1 .value, + _data.mConductivitySensor2 .value, + _data.mOutletRedundancy .value, + _data.mInletDialysate .value, + _data.mPrimaryHeaterThermoCouple .value, + _data.mTrimmerHeaterThermoCouple .value, + _data.mPrimaryHeaterColdJunction .value, + _data.mTrimmerHeaterColdJunction .value, + _data.mPrimaryHeaterInternal .value, + _data.mTrimmerHeaterInternal .value, + _data.mFpgaBoard .value, + _data.mLoadCellA1B1 .value, + _data.mLoadCellA2B2 .value, + _data.mInternalTHDORTD .value, + _data.mInternalTDIRTD .value, + _data.mInteralTHDRTD .value, + _data.mInternalCondSnsrTemp .value, + _data.mBaroTempSensor .value, }; } @@ -50,6 +58,14 @@ if (GetValue(vByteArray, index, _data.mTrimmerHeaterColdJunction )) if (GetValue(vByteArray, index, _data.mPrimaryHeaterInternal )) if (GetValue(vByteArray, index, _data.mTrimmerHeaterInternal )) + if (GetValue(vByteArray, index, _data.mFpgaBoard )) + if (GetValue(vByteArray, index, _data.mLoadCellA1B1 )) + if (GetValue(vByteArray, index, _data.mLoadCellA2B2 )) + if (GetValue(vByteArray, index, _data.mInternalTHDORTD )) + if (GetValue(vByteArray, index, _data.mInternalTDIRTD )) + if (GetValue(vByteArray, index, _data.mInteralTHDRTD )) + if (GetValue(vByteArray, index, _data.mInternalCondSnsrTemp )) + if (GetValue(vByteArray, index, _data.mBaroTempSensor )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -64,6 +80,14 @@ else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -86,5 +110,13 @@ data.mTrimmerHeaterColdJunction = _data.mTrimmerHeaterColdJunction .value; data.mPrimaryHeaterInternal = _data.mPrimaryHeaterInternal .value; data.mTrimmerHeaterInternal = _data.mTrimmerHeaterInternal .value; + data.mFpgaBoard = _data.mFpgaBoard .value; + data.mLoadCellA1B1 = _data.mLoadCellA1B1 .value; + data.mLoadCellA2B2 = _data.mLoadCellA2B2 .value; + data.mInternalTHDORTD = _data.mInternalTHDORTD .value; + data.mInternalTDIRTD = _data.mInternalTDIRTD .value; + data.mInteralTHDRTD = _data.mInteralTHDRTD .value; + data.mInternalCondSnsrTemp = _data.mInternalCondSnsrTemp .value; + data.mBaroTempSensor = _data.mBaroTempSensor .value; return data; } Index: sources/model/dg/data/MDGTemperaturesData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r2b8b5f01a15397b7a32a312f2f3d14f05ac99355 --- sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision 2b8b5f01a15397b7a32a312f2f3d14f05ac99355) @@ -49,6 +49,14 @@ * | #11:(F32) | \ref Data::mTrimmerHeaterColdJunction | * | #12:(F32) | \ref Data::mPrimaryHeaterInternal | * | #13:(F32) | \ref Data::mTrimmerHeaterInternal | + * | #14:(F32) | \ref Data::mFpgaBoard | + * | #15:(F32) | \ref Data::mLoadCellA1B1 | + * | #16:(F32) | \ref Data::mLoadCellA2B2 | + * | #17:(F32) | \ref Data::mInternalTHDORTD | + * | #18:(F32) | \ref Data::mInternalTDIRTD | + * | #19:(F32) | \ref Data::mInteralTHDRTD | + * | #20:(F32) | \ref Data::mInternalCondSnsrTemp | + * | #21:(F32) | \ref Data::mBaroTempSensor | * * \sa Data * @@ -72,19 +80,27 @@ QVariantList parameters() const override; struct { - Types::F32 mInletPrimaryHeater ; /* 01 */ - Types::F32 mHeatDisinfect ; /* 02 */ - Types::F32 mOutletPrimaryHeater ; /* 03 */ - Types::F32 mConductivitySensor1 ; /* 04 */ - Types::F32 mConductivitySensor2 ; /* 05 */ - Types::F32 mOutletRedundancy ; /* 06 */ - Types::F32 mInletDialysate ; /* 07 */ - Types::F32 mPrimaryHeaterThermoCouple ; /* 08 */ - Types::F32 mTrimmerHeaterThermoCouple ; /* 09 */ - Types::F32 mPrimaryHeaterColdJunction ; /* 10 */ - Types::F32 mTrimmerHeaterColdJunction ; /* 11 */ - Types::F32 mPrimaryHeaterInternal ; /* 12 */ - Types::F32 mTrimmerHeaterInternal ; /* 13 */ + Types::F32 mInletPrimaryHeater ; ///< Trimmer heater internal temperature (calculated from thermocouple and cold junction) + Types::F32 mHeatDisinfect ; ///< Primary heaters internal temperature (calculated from thermocouple and cold junction) + Types::F32 mOutletPrimaryHeater ; ///< Trimmer heater cold junction temperature sensor + Types::F32 mConductivitySensor1 ; ///< Primary heaters cold junction temperature sensor + Types::F32 mConductivitySensor2 ; ///< Trimmer heater thermocouple sensor + Types::F32 mOutletRedundancy ; ///< Primary heaters thermocouple sensor + Types::F32 mInletDialysate ; ///< Inlet dialysate temperature sensor + Types::F32 mPrimaryHeaterThermoCouple ; ///< Outlet redundant temperature sensor + Types::F32 mTrimmerHeaterThermoCouple ; ///< Conductivity sensor 2 temperature sensor + Types::F32 mPrimaryHeaterColdJunction ; ///< Conductivity sensor 1 temperature sensor + Types::F32 mTrimmerHeaterColdJunction ; ///< Outlet primary heater temperature sensor + Types::F32 mPrimaryHeaterInternal ; ///< Heat Disinfect temperature sensor + Types::F32 mTrimmerHeaterInternal ; ///< Inlet primary heater temperature sensor + Types::F32 mFpgaBoard ; ///< FPGA board temperature sensor + Types::F32 mLoadCellA1B1 ; ///< Load cell A1/B1 temperature sensor + Types::F32 mLoadCellA2B2 ; ///< Load cell A2/B2 temperature sensor + Types::F32 mInternalTHDORTD ; ///< THDo RTD channel temperature sensor + Types::F32 mInternalTDIRTD ; ///< TDI RTD channel temperature sensor + Types::F32 mInteralTHDRTD ; ///< THd RTD channel temperature sensor + Types::F32 mInternalCondSnsrTemp ; ///< Conductivity Sensor internal temperature sensor + Types::F32 mBaroTempSensor ; ///< Barometric temperature sensor } _data; public: @@ -94,19 +110,27 @@ QString infoText () const override { return QString("Temperatures"); } struct Data { - float mInletPrimaryHeater = 0; ///< Inlet primary heaters temperature - float mHeatDisinfect = 0; ///< Heat Disinfect temperature - float mOutletPrimaryHeater = 0; ///< Outlet primary heaters temperature - float mConductivitySensor1 = 0; ///< Conductivity sensor 1 temperature - float mConductivitySensor2 = 0; ///< Conductivity sensor 2 temperature - float mOutletRedundancy = 0; ///< Outlet redundancy temperature - float mInletDialysate = 0; ///< Inlet dialysate temperature - float mPrimaryHeaterThermoCouple = 0; ///< Primary heaters internal temperature - float mTrimmerHeaterThermoCouple = 0; ///< Trimmer heater internal temperature - float mPrimaryHeaterColdJunction = 0; ///< Primary heaters cold junction temperature - float mTrimmerHeaterColdJunction = 0; ///< Trimmer heater cold junction temperature - float mPrimaryHeaterInternal = 0; ///< Primary heaters internal temperature - float mTrimmerHeaterInternal = 0; ///< Trimmer heater internal temperature + float mInletPrimaryHeater = 0; ///< Trimmer heater internal temperature (calculated from thermocouple and cold junction) + float mHeatDisinfect = 0; ///< Primary heaters internal temperature (calculated from thermocouple and cold junction) + float mOutletPrimaryHeater = 0; ///< Trimmer heater cold junction temperature sensor + float mConductivitySensor1 = 0; ///< Primary heaters cold junction temperature sensor + float mConductivitySensor2 = 0; ///< Trimmer heater thermocouple sensor + float mOutletRedundancy = 0; ///< Primary heaters thermocouple sensor + float mInletDialysate = 0; ///< Inlet dialysate temperature sensor + float mPrimaryHeaterThermoCouple = 0; ///< Outlet redundant temperature sensor + float mTrimmerHeaterThermoCouple = 0; ///< Conductivity sensor 2 temperature sensor + float mPrimaryHeaterColdJunction = 0; ///< Conductivity sensor 1 temperature sensor + float mTrimmerHeaterColdJunction = 0; ///< Outlet primary heater temperature sensor + float mPrimaryHeaterInternal = 0; ///< Heat Disinfect temperature sensor + float mTrimmerHeaterInternal = 0; ///< Inlet primary heater temperature sensor + float mFpgaBoard = 0; ///< FPGA board temperature sensor + float mLoadCellA1B1 = 0; ///< Load cell A1/B1 temperature sensor + float mLoadCellA2B2 = 0; ///< Load cell A2/B2 temperature sensor + float mInternalTHDORTD = 0; ///< THDo RTD channel temperature sensor + float mInternalTDIRTD = 0; ///< TDI RTD channel temperature sensor + float mInteralTHDRTD = 0; ///< THd RTD channel temperature sensor + float mInternalCondSnsrTemp = 0; ///< Conductivity Sensor internal temperature sensor + float mBaroTempSensor = 0; ///< Barometric temperature sensor }; MDGTemperatures() { } Index: sources/view/dg/data/VDGTemperaturesData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r2b8b5f01a15397b7a32a312f2f3d14f05ac99355 --- sources/view/dg/data/VDGTemperaturesData.cpp (.../VDGTemperaturesData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/dg/data/VDGTemperaturesData.cpp (.../VDGTemperaturesData.cpp) (revision 2b8b5f01a15397b7a32a312f2f3d14f05ac99355) @@ -21,17 +21,25 @@ void VDGTemperatures::onActionReceive(const DGTemperaturesData &vData) { - inletPrimaryHeater ( vData.mInletPrimaryHeater ); - heatDisinfect ( vData.mHeatDisinfect ); - outletPrimaryHeater ( vData.mOutletPrimaryHeater ); - conductivitySensor1 ( vData.mConductivitySensor1 ); - conductivitySensor2 ( vData.mConductivitySensor2 ); - outletRedundancy ( vData.mOutletRedundancy ); - inletDialysate ( vData.mInletDialysate ); - primaryHeaterThermoCouple ( vData.mPrimaryHeaterThermoCouple ); - trimmerHeaterThermoCouple ( vData.mTrimmerHeaterThermoCouple ); - primaryHeaterColdJunction ( vData.mPrimaryHeaterColdJunction ); - trimmerHeaterColdJunction ( vData.mTrimmerHeaterColdJunction ); - primaryHeaterInternal ( vData.mPrimaryHeaterInternal ); - trimmerHeaterInternal ( vData.mTrimmerHeaterInternal ); + inletPrimaryHeater ( vData.mInletPrimaryHeater ); + heatDisinfect ( vData.mHeatDisinfect ); + outletPrimaryHeater ( vData.mOutletPrimaryHeater ); + conductivitySensor1 ( vData.mConductivitySensor1 ); + conductivitySensor2 ( vData.mConductivitySensor2 ); + outletRedundancy ( vData.mOutletRedundancy ); + inletDialysate ( vData.mInletDialysate ); + primaryHeaterThermoCouple ( vData.mPrimaryHeaterThermoCouple ); + trimmerHeaterThermoCouple ( vData.mTrimmerHeaterThermoCouple ); + primaryHeaterColdJunction ( vData.mPrimaryHeaterColdJunction ); + trimmerHeaterColdJunction ( vData.mTrimmerHeaterColdJunction ); + primaryHeaterInternal ( vData.mPrimaryHeaterInternal ); + trimmerHeaterInternal ( vData.mTrimmerHeaterInternal ); + fpgaBoard ( vData.mFpgaBoard ); + loadCellA1B1 ( vData.mLoadCellA1B1 ); + loadCellA2B2 ( vData.mLoadCellA2B2 ); + internalTHDORTD ( vData.mInternalTHDORTD ); + internalTDIRTD ( vData.mInternalTDIRTD ); + interalTHDRTD ( vData.mInteralTHDRTD ); + internalCondSnsrTemp ( vData.mInternalCondSnsrTemp ); + baroTempSensor ( vData.mBaroTempSensor ); } Index: sources/view/dg/data/VDGTemperaturesData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r2b8b5f01a15397b7a32a312f2f3d14f05ac99355 --- sources/view/dg/data/VDGTemperaturesData.h (.../VDGTemperaturesData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/dg/data/VDGTemperaturesData.h (.../VDGTemperaturesData.h) (revision 2b8b5f01a15397b7a32a312f2f3d14f05ac99355) @@ -49,6 +49,14 @@ PROPERTY( float , trimmerHeaterColdJunction , 0) PROPERTY( float , primaryHeaterInternal , 0) PROPERTY( float , trimmerHeaterInternal , 0) + PROPERTY( float , fpgaBoard , 0) + PROPERTY( float , loadCellA1B1 , 0) + PROPERTY( float , loadCellA2B2 , 0) + PROPERTY( float , internalTHDORTD , 0) + PROPERTY( float , internalTDIRTD , 0) + PROPERTY( float , interalTHDRTD , 0) + PROPERTY( float , internalCondSnsrTemp , 0) + PROPERTY( float , baroTempSensor , 0) VIEW_DEC(VDGTemperatures, DGTemperaturesData) };