Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rbbb970aff112f09c189986f026055bec794afbd6 -r95c2b1e716dedddbde9aa2176e746ed485a36944 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision bbb970aff112f09c189986f026055bec794afbd6) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 95c2b1e716dedddbde9aa2176e746ed485a36944) @@ -101,7 +101,7 @@ {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 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 + {Gui::GuiActionType::ID_DGConductivityData , 13 * 4 }, // 13 parameters each 4bytes // HD Data Messages {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_HDSyringePumpData , 9 * 4 }, // 9 parameters each 4bytes Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r4910e731017ba575e1f56c04dec0bf0589538f89 -r95c2b1e716dedddbde9aa2176e746ed485a36944 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 4910e731017ba575e1f56c04dec0bf0589538f89) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 95c2b1e716dedddbde9aa2176e746ed485a36944) @@ -235,21 +235,37 @@ vDGConductivity.CPo .toFixed(1), vDGConductivity.CD1 .toFixed(1), vDGConductivity.CD2 .toFixed(1), + vDGConductivity.CPiRaw .toFixed(1), + vDGConductivity.CPoRaw .toFixed(1), + vDGConductivity.CD1Raw .toFixed(1), + vDGConductivity.CD2Raw .toFixed(1), + vDGConductivity.CPiSensorStatus .toFixed(1), + vDGConductivity.CPoSensorStatus .toFixed(1), + vDGConductivity.CD1SensorStatus .toFixed(1), + vDGConductivity.CD2SensorStatus .toFixed(1), ] label: [ "ROrr" , "CPi" , "CPo" , "CD1" , "CD2" , + "CPir" , + "CPor" , + "CD1r" , + "CD2r" , + "CPis" , + "CPos" , + "CD1s" , + "CD2s" , ] } DebugDataColumn { id: _HDAirColumn textObjectName :"_HDAirData" - title : qsTr(" Air Status ") - x: col(3.7) - y: row(5.0) + title : qsTr("Air Status") + x: col(2.4) + y: row(5.5) model: [ vHDAirBubble .venousAirBubbleStatus , vHDAirTrap .airTrapLowerLevel , @@ -278,7 +294,7 @@ textObjectName :"_HDBloodFlowData" title : qsTr(" BP ") x: col(0) - y: row(2.6) + y: row(2.5) model: [ vTreatmentBloodFlow.bloodFlow_FlowSetPoint , vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , @@ -305,7 +321,7 @@ textObjectName :"_HDDialysateInletFlowData" title : qsTr(" DPi ") x: col(1.2) - y: row(2.6) + y: row(2.5) model: [ vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , @@ -330,7 +346,7 @@ textObjectName :"_HDDialysateOutletFlowData" title : qsTr(" UF/DPo ") x: col(2.4) - y: row(2.6) + y: row(2.5) model: [ vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) , @@ -486,9 +502,9 @@ // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version. TouchRect { - x : col(4.6) + x : col(5.0) y : row(6.4) - width : 475 + width : 425 height : 80 onClicked : vAdjustmentVersions.doAdjustment() radius : 10 Index: sources/model/dg/adjustment/settings/MAdjustDGRequests.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r95c2b1e716dedddbde9aa2176e746ed485a36944 --- sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision 95c2b1e716dedddbde9aa2176e746ed485a36944) @@ -37,7 +37,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| - * | 111 | 0x110 | Req | Y | UI | DG | Set RTC Date and Time | + * | 0x6F | 0x110 | Req | Y | UI | DG | Set RTC Date and Time | * * | Payload || * | || Index: sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r95c2b1e716dedddbde9aa2176e746ed485a36944 --- sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h (.../MAdjustDGServiceDatesResponse.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h (.../MAdjustDGServiceDatesResponse.h) (revision 95c2b1e716dedddbde9aa2176e746ed485a36944) @@ -32,7 +32,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| - * |0x8A00| 0x020 | Rsp | Y | DG | UI | Service Dates | + * |0x8C00| 0x020 | Rsp | Y | DG | UI | Service Dates | * * | Payload || * | || Index: sources/model/dg/data/MDGConductivityData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r95c2b1e716dedddbde9aa2176e746ed485a36944 --- sources/model/dg/data/MDGConductivityData.cpp (.../MDGConductivityData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGConductivityData.cpp (.../MDGConductivityData.cpp) (revision 95c2b1e716dedddbde9aa2176e746ed485a36944) @@ -23,6 +23,14 @@ _data.mCPo .value, _data.mCD1 .value, _data.mCD2 .value, + _data.mCD2Raw .value, + _data.mCD1Raw .value, + _data.mCPoRaw .value, + _data.mCPiRaw .value, + _data.mCD2SensorStatus .value, + _data.mCD1SensorStatus .value, + _data.mCPoSensorStatus .value, + _data.mCPiSensorStatus .value, }; } @@ -33,12 +41,28 @@ if (GetValue(vByteArray, index, _data.mCPo )) if (GetValue(vByteArray, index, _data.mCD1 )) if (GetValue(vByteArray, index, _data.mCD2 )) + if (GetValue(vByteArray, index, _data.mCPiRaw )) + if (GetValue(vByteArray, index, _data.mCPoRaw )) + if (GetValue(vByteArray, index, _data.mCD1Raw )) + if (GetValue(vByteArray, index, _data.mCD2Raw )) + if (GetValue(vByteArray, index, _data.mCPiSensorStatus )) + if (GetValue(vByteArray, index, _data.mCPoSensorStatus )) + if (GetValue(vByteArray, index, _data.mCD1SensorStatus )) + if (GetValue(vByteArray, index, _data.mCD2SensorStatus )) return true ; 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; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -53,5 +77,13 @@ data.mCPo = _data.mCPo .value; data.mCD1 = _data.mCD1 .value; data.mCD2 = _data.mCD2 .value; + data.mCD2Raw = _data.mCD2Raw .value; + data.mCD1Raw = _data.mCD1Raw .value; + data.mCPoRaw = _data.mCPoRaw .value; + data.mCPiRaw = _data.mCPiRaw .value; + data.mCD2SensorStatus = _data.mCD2SensorStatus .value; + data.mCD1SensorStatus = _data.mCD1SensorStatus .value; + data.mCPoSensorStatus = _data.mCPoSensorStatus .value; + data.mCPiSensorStatus = _data.mCPiSensorStatus .value; return data; } Index: sources/model/dg/data/MDGConductivityData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r95c2b1e716dedddbde9aa2176e746ed485a36944 --- sources/model/dg/data/MDGConductivityData.h (.../MDGConductivityData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGConductivityData.h (.../MDGConductivityData.h) (revision 95c2b1e716dedddbde9aa2176e746ed485a36944) @@ -35,11 +35,19 @@ * * | Payload || * | || - * | #1:(F32) | \ref Data::mRORejectioRatio | - * | #2:(F32) | \ref Data::mCPi | - * | #3:(F32) | \ref Data::mCPo | - * | #4:(F32) | \ref Data::mCD1 | - * | #5:(F32) | \ref Data::mCD2 | + * | #01:(F32) | \ref Data::mRORejectioRatio | + * | #02:(F32) | \ref Data::mCPi | + * | #03:(F32) | \ref Data::mCPo | + * | #04:(F32) | \ref Data::mCD1 | + * | #05:(F32) | \ref Data::mCD2 | + * | #06:(F32) | \ref Data::mCPiRaw | + * | #07:(F32) | \ref Data::mCPoRaw | + * | #08:(F32) | \ref Data::mCD1Raw | + * | #09:(F32) | \ref Data::mCD2Raw | + * | #10:(U32) | \ref Data::mCPiSensorStatus | + * | #11:(U32) | \ref Data::mCPoSensorStatus | + * | #12:(U32) | \ref Data::mCD1SensorStatus | + * | #13:(U32) | \ref Data::mCD2SensorStatus | * * * \sa Data @@ -65,6 +73,15 @@ Types::F32 mCPo ; Types::F32 mCD1 ; Types::F32 mCD2 ; + Types::F32 mCPiRaw ; + Types::F32 mCPoRaw ; + Types::F32 mCD1Raw ; + Types::F32 mCD2Raw ; + Types::U32 mCPiSensorStatus ; + Types::U32 mCPoSensorStatus ; + Types::U32 mCD1SensorStatus ; + Types::U32 mCD2SensorStatus ; + } _data; public: @@ -73,11 +90,19 @@ QString infoText () const override { return QString("Conductivity"); } struct Data{ - float mRORejectionRatio = 0; ///< RO Rejection Ratio - float mCPi = 0; ///< CPi conductivity - float mCPo = 0; ///< CPo conductivity - float mCD1 = 0; ///< CP1 conductivity - float mCD2 = 0; ///< CP2 conductivity + float mRORejectionRatio = 0; ///< RO Rejection Ratio + float mCPi = 0; ///< CPi conductivity + float mCPo = 0; ///< CPo conductivity + float mCD1 = 0; ///< CP1 conductivity + float mCD2 = 0; ///< CP2 conductivity + float mCPiRaw = 0; ///< CPi Raw + float mCPoRaw = 0; ///< CPo Raw + float mCD1Raw = 0; ///< CD1 Raw + float mCD2Raw = 0; ///< CD2 Raw + quint32 mCPiSensorStatus = 0; ///< CPi Sensor Status + quint32 mCPoSensorStatus = 0; ///< CPo Sensor Status + quint32 mCD1SensorStatus = 0; ///< CD1 Sensor Status + quint32 mCD2SensorStatus = 0; ///< CD2 Sensor Status }; MDGConductivityData () { } Index: sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h =================================================================== diff -u -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 -r95c2b1e716dedddbde9aa2176e746ed485a36944 --- sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h (.../MTreatmentLogEventData.h) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) +++ sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h (.../MTreatmentLogEventData.h) (revision 95c2b1e716dedddbde9aa2176e746ed485a36944) @@ -33,7 +33,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:| - * |0x9500| 0x020 | Event | Y | HD | UI | Treatment Log Event Data | + * |0x9600| 0x020 | Event | Y | HD | UI | Treatment Log Event Data | * * | Payload || * | || Index: sources/view/dg/data/VDGConductivityData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r95c2b1e716dedddbde9aa2176e746ed485a36944 --- sources/view/dg/data/VDGConductivityData.cpp (.../VDGConductivityData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/dg/data/VDGConductivityData.cpp (.../VDGConductivityData.cpp) (revision 95c2b1e716dedddbde9aa2176e746ed485a36944) @@ -20,10 +20,17 @@ VIEW_DEF(VDGConductivity, DGConductivityData) void VDGConductivity::onActionReceive(const DGConductivityData &vData) { - RORejectionRatio (vData.mRORejectionRatio ); - CPi (vData.mCPi ); - CPo (vData.mCPo ); - CD1 (vData.mCD1 ); - CD2 (vData.mCD2 ); - + RORejectionRatio (vData.mRORejectionRatio ); + CPi (vData.mCPi ); + CPo (vData.mCPo ); + CD1 (vData.mCD1 ); + CD2 (vData.mCD2 ); + CPiRaw (vData.mCPiRaw ); + CPoRaw (vData.mCPoRaw ); + CD1Raw (vData.mCD1Raw ); + CD2Raw (vData.mCD2Raw ); + CPiSensorStatus (vData.mCPiSensorStatus ); + CPoSensorStatus (vData.mCPoSensorStatus ); + CD1SensorStatus (vData.mCD1SensorStatus ); + CD2SensorStatus (vData.mCD2SensorStatus ); } Index: sources/view/dg/data/VDGConductivityData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r95c2b1e716dedddbde9aa2176e746ed485a36944 --- sources/view/dg/data/VDGConductivityData.h (.../VDGConductivityData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/dg/data/VDGConductivityData.h (.../VDGConductivityData.h) (revision 95c2b1e716dedddbde9aa2176e746ed485a36944) @@ -40,6 +40,14 @@ PROPERTY( float , CPo , 0) PROPERTY( float , CD1 , 0) PROPERTY( float , CD2 , 0) + PROPERTY( float , CPiRaw , 0) + PROPERTY( float , CPoRaw , 0) + PROPERTY( float , CD1Raw , 0) + PROPERTY( float , CD2Raw , 0) + PROPERTY( quint32 , CPiSensorStatus , 0) + PROPERTY( quint32 , CPoSensorStatus , 0) + PROPERTY( quint32 , CD1SensorStatus , 0) + PROPERTY( quint32 , CD2SensorStatus , 0) VIEW_DEC(VDGConductivity, DGConductivityData) };