Index: denali.pro.user =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- denali.pro.user (.../denali.pro.user) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ denali.pro.user (.../denali.pro.user) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/model/dg/data/MDGDrainPumpData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/dg/data/MDGDrainPumpData.h (.../MDGDrainPumpData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/dg/data/MDGDrainPumpData.h (.../MDGDrainPumpData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -29,9 +29,9 @@ * \brief The MDGDrainPump class * \details The DG drain pump data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: | + * |0x2400| 0x080 | 8 | 1 Hz | N | DG | All | DG Drain Pump Data | mRPM | mDAC | * * \sa Data * @@ -41,7 +41,6 @@ // friends friend class ::tst_models; - // DG Drain Pump Data (U32) Set pt. RPM (U32) DAC value QVariantList parameters() const override; struct { @@ -56,8 +55,8 @@ QString infoText () const override { return QString("DrainPump"); } struct Data { - quint32 mRPM = 0; /*!< Reservoir1 Prim value of type float extracted out */ - quint32 mDAC = 0; /*!< Reservoir2 Bkup value of type float extracted out */ + quint32 mRPM = 0; ///< Set pt. RPM + quint32 mDAC = 0; ///< DAC value }; MDGDrainPump () { } Index: sources/model/dg/data/MDGHeatersData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/dg/data/MDGHeatersData.h (.../MDGHeatersData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/dg/data/MDGHeatersData.h (.../MDGHeatersData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -29,9 +29,9 @@ * \brief The MDGHeaters class * \details The DG heaters data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(U32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | + * |0x2C00| 0x080 | 8 | 2 Hz | N | DG | All | DG Heaters Data | mMainPrimaryDC | mSmallPrimaryDC | mTrimmerDC | * * \sa Data * @@ -57,9 +57,9 @@ QString infoText () const override { return QString("Heaters"); } struct Data { - quint32 mMainPrimaryDC = 0; /*!< Reservoir1 Prim value of type float extracted out */ - quint32 mSmallPrimaryDC = 0; /*!< Reservoir1 Bkup value of type float extracted out */ - quint32 mTrimmerDC = 0; /*!< Reservoir2 Prim value of type float extracted out */ + quint32 mMainPrimaryDC = 0; ///< main Primary DC + quint32 mSmallPrimaryDC = 0; ///< small Primary DC + quint32 mTrimmerDC = 0; ///< trimmer DC }; MDGHeaters () {} Index: sources/model/dg/data/MDGLoadCellReadingsData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/dg/data/MDGLoadCellReadingsData.h (.../MDGLoadCellReadingsData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/dg/data/MDGLoadCellReadingsData.h (.../MDGLoadCellReadingsData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -27,11 +27,11 @@ /*! * \brief The MDGLoadCellReadings class - * \details The DG load cells reading data model + * \details The DG load cell readings data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(F32) | #2:(F32) | #3:(F32) | #4:(F32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: | + * |0x0C00| 0x080 | 8 | 10 Hz | N | DG | All | DG Load Cell Readings Data | mReservoir1Prim | mReservoir1Bkup | mReservoir2Prim | mReservoir2Bkup | * * \sa Data * @@ -41,7 +41,6 @@ // friends friend class ::tst_models; - // Load Cell Readings Data Rs1 Prim. (F32) Rs1 Bkup (F32) Rs2 Prim. (F32) Rs2 Bkup (F32) QVariantList parameters() const override; struct { @@ -58,10 +57,10 @@ QString infoText () const override { return QString("LoadCell"); } struct Data { - float mReservoir1Prim = 0; /*!< Reservoir1 Prim value of type float extracted out */ - float mReservoir1Bkup = 0; /*!< Reservoir1 Bkup value of type float extracted out */ - float mReservoir2Prim = 0; /*!< Reservoir2 Prim value of type float extracted out */ - float mReservoir2Bkup = 0; /*!< Reservoir2 Bkup value of type float extracted out */ + float mReservoir1Prim = 0; ///< Reservoir1 Primary + float mReservoir1Bkup = 0; ///< Reservoir1 Back up + float mReservoir2Prim = 0; ///< Reservoir2 Primary + float mReservoir2Bkup = 0; ///< Reservoir2 Back up }; MDGLoadCellReadings () {} Index: sources/model/dg/data/MDGOperationModeData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/dg/data/MDGOperationModeData.h (.../MDGOperationModeData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/dg/data/MDGOperationModeData.h (.../MDGOperationModeData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -29,9 +29,9 @@ * \brief The MDGOperationMode class * \details The DG operation mode data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | + * |0x2700| 0x080 | 8 | 1 Hz | N | DG | All | DG Operation Mode Data | mOpMode | * * \sa Data * @@ -55,7 +55,7 @@ QString infoText () const override { return QString("OpMode"); } struct Data { - quint32 mOpMode = 0; /*!< Reservoir1 Prim value of type float extracted out */ + quint32 mOpMode = 0; ///< DG operation }; MDGOperationMode () {} Index: sources/model/dg/data/MDGPressuresData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/dg/data/MDGPressuresData.h (.../MDGPressuresData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/dg/data/MDGPressuresData.h (.../MDGPressuresData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -27,11 +27,11 @@ /*! * \brief The MDGPressures class - * \details The DG pressure data model + * \details The DG pressures data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(F32) | #2:(F32) | #3:(F32) | #4:(F32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: | + * |0x2000| 0x080 | 8 | 1 Hz | N | DG | All | DG Pressures Data | mROInletPSI | mROOutletPSI | mDrainInletPSI | mDrainOutletPSI | * * \sa Data * @@ -41,7 +41,6 @@ // friends friend class ::tst_models; - // DG Pressures Data (F32) RO inlet PSI (F32) RO outlet PSI (F32) Drain inlet PSI (F32) Drain outlet PSI QVariantList parameters() const override; struct { @@ -58,10 +57,10 @@ QString infoText () const override { return QString("Pressures"); } struct Data { - float mROInletPSI = 0; /*!< Reservoir1 Prim value of type float extracted out */ - float mROOutletPSI = 0; /*!< Reservoir1 Bkup value of type float extracted out */ - float mDrainInletPSI = 0; /*!< Reservoir2 Prim value of type float extracted out */ - float mDrainOutletPSI = 0; /*!< Reservoir2 Bkup value of type float extracted out */ + float mROInletPSI = 0; ///< RO inlet PSI + float mROOutletPSI = 0; ///< RO outlet PSI + float mDrainInletPSI = 0; ///< Drain inlet PSI + float mDrainOutletPSI = 0; ///< Drain outlet PSI }; MDGPressures () {} Index: sources/model/dg/data/MDGROPumpData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -27,11 +27,11 @@ /*! * \brief The MDGROPump class - * \details The DG reverse osmosis pump data model + * \details The DG RO pump data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(F32) | #3:(F32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | + * |0x1F00| 0x080 | 8 | 1 Hz | N | DG | All | DG RO Pump Data | mPressure | mFlowRate | mPWM | * * \sa Data * @@ -41,7 +41,6 @@ // friends friend class ::tst_models; - // DG RO Pump Data (U32) Set pt. pressure (F32) flow rate (F32) PWM QVariantList parameters() const override; struct { @@ -57,9 +56,9 @@ QString infoText () const override { return QString("ROPump"); } struct Data { - quint32 mPressure = 0; /*!< ArterialPressure value of type float extracted out */ - float mFlowRate = 0; /*!< VenousPressure value of type float extracted out */ - float mPWM = 0; /*!< BloodPumpOcclusion value of type float extracted out */ + quint32 mPressure = 0; ///< Set pt. pressure + float mFlowRate = 0; ///< flow rate + float mPWM = 0; ///< PWM }; MDGROPump () { } Index: sources/model/dg/data/MDGReservoirData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/dg/data/MDGReservoirData.h (.../MDGReservoirData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/dg/data/MDGReservoirData.h (.../MDGReservoirData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -29,9 +29,9 @@ * \brief The MDGReservoir class * \details The DG reservoir data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(U32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | + * |0x2800| 0x080 | 8 | 1 Hz | N | DG | All | DG Reservoir Data | mActiveReservoir | mFillToVol | mDrainToVol | * * \sa Data * @@ -41,7 +41,6 @@ // friends friend class ::tst_models; - // DG Reservoir Data (U32) active reservoir (U32) Fill to vol (mL) (U32) Drain to vol (mL) QVariantList parameters() const override; struct { @@ -57,9 +56,9 @@ QString infoText () const override { return QString("Reservoir"); } struct Data { - quint32 mActiveReservoir = 0; - quint32 mFillToVol = 0; - quint32 mDrainToVol = 0; + quint32 mActiveReservoir = 0; ///< Active reservoir + quint32 mFillToVol = 0; ///< Fill to vol (mL) + quint32 mDrainToVol = 0; ///< Drain to vol (mL) }; MDGReservoir () {} Index: sources/model/dg/data/MDGTemperaturesData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -29,9 +29,9 @@ * \brief The MDGTemperatures class * \details The DG temperatures data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(F32) | #2:(F32) | #3:(F32) | #4:(F32) | #5:(F32) | #6:(F32) | #7:(F32) | #8:(F32) | #9:(F32) | #10:(F32) | #11:(F32) | #12:(F32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: |:--: |:--: |:--: |:--: |:--: |:--: |:--: | + * |0x2D00| 0x080 | 8 | 2 Hz | N | DG | All | DG Temperatures Data | mInletPrimaryHeater | mOutletPrimaryHeater | mConductivitySensor1 | mConductivitySensor2 | mOutletRedundancy | mInletDialysate | mPrimaryHeaterThermoCouple | mTrimmerHeaterThermoCouple | mPrimaryHeaterColdJunction | mTrimmerHeaterColdJunction | mPrimaryHeaterInternal | mTrimmerHeaterInternal | * * \sa Data * @@ -48,18 +48,18 @@ QVariantList parameters() const override; struct { - Types::F32 mInletPrimaryHeater ; - Types::F32 mOutletPrimaryHeater ; - Types::F32 mConductivitySensor1 ; - Types::F32 mConductivitySensor2 ; - Types::F32 mOutletRedundancy ; - Types::F32 mInletDialysate ; - Types::F32 mPrimaryHeaterThermoCouple ; - Types::F32 mTrimmerHeaterThermoCouple ; - Types::F32 mPrimaryHeaterColdJunction ; - Types::F32 mTrimmerHeaterColdJunction ; - Types::F32 mPrimaryHeaterInternal ; - Types::F32 mTrimmerHeaterInternal ; + Types::F32 mInletPrimaryHeater ; /* 01 */ + Types::F32 mOutletPrimaryHeater ; /* 02 */ + Types::F32 mConductivitySensor1 ; /* 03 */ + Types::F32 mConductivitySensor2 ; /* 04 */ + Types::F32 mOutletRedundancy ; /* 05 */ + Types::F32 mInletDialysate ; /* 06 */ + Types::F32 mPrimaryHeaterThermoCouple ; /* 07 */ + Types::F32 mTrimmerHeaterThermoCouple ; /* 08 */ + Types::F32 mPrimaryHeaterColdJunction ; /* 09 */ + Types::F32 mTrimmerHeaterColdJunction ; /* 10 */ + Types::F32 mPrimaryHeaterInternal ; /* 11 */ + Types::F32 mTrimmerHeaterInternal ; /* 12 */ } _data; public: Index: sources/model/dg/data/MDGValvesStatesData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -29,13 +29,14 @@ * \brief The MDGValvesStates class * \details The DG valves states data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U16) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | + * |0x2A00| 0x080 | 8 | 2 Hz | N | DG | All | DG Valves States Data | mStates | * * \sa Data - * + * \sa Flag */ + class MDGValvesStates : public MAbstract { // friends Index: sources/model/hd/alarm/MAlarmCleared.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/hd/alarm/MAlarmCleared.h (.../MAlarmCleared.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/hd/alarm/MAlarmCleared.h (.../MAlarmCleared.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -26,11 +26,11 @@ /*! * \brief The MAlarmCleared class - * \details The alarm cleared data model + * \details The alarm cleared model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | + * |0x0400| 0x001 | 1 | Event | Y | HD | All | Alarm Cleared | mAlarmID | * * \sa Data * @@ -43,7 +43,7 @@ public: QString stringPrefix = "Alarm Cleared"; struct Data { - quint32 mAlarmID = 0; /*!< Alarm ID value of type quint32 extracted out */ + quint32 mAlarmID = 0; ///< Alarm ID }; private: Index: sources/model/hd/alarm/MAlarmStatusData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -27,11 +27,11 @@ /*! * \brief The MAlarmStatus class - * \details The alarm status data model + * \details The alarm status model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(U32) | #4:(U32) | #5:(U16) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: | + * |0x0200| 0x001 | 1 | 1 Hz | N | HD | All | Alarm Status | mState | mTop | mEscalatesIn | mMuteTimeout | mFlags | * * \sa Data * @@ -58,11 +58,11 @@ QString stringPrefix = "Alarm Status"; struct Data { - quint32 mState = 0; /*!< State - Alarm Priority value of type unsigned int as 4 bytes extracted out */ - quint32 mTop = 0; /*!< Top - Top value of type unsigned int as 4 bytes extracted out */ - quint32 mEscalatesIn = 0; /*!< EscalatesIn - EscalatesIn value of type unsigned int as 4 bytes extracted out */ - quint32 mMuteTimeout = 0; /*!< MuteTimeout - MuteTimeout value of type unsigned int as 4 bytes extracted out */ - QBitArray mFlags ; /*!< Flags - Flags value of type unsigned int as 1 byte extracted out */ + quint32 mState = 0; ///< State - Alarm Priority + quint32 mTop = 0; ///< Top - Top + quint32 mEscalatesIn = 0; ///< EscalatesIn - EscalatesIn + quint32 mMuteTimeout = 0; ///< MuteTimeout - MuteTimeout + QBitArray mFlags ; ///< Flags - Flags }; private: Index: sources/model/hd/alarm/MAlarmTriggered.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -26,11 +26,11 @@ /*! * \brief The MAlarmTriggered class - * \details The alarm triggered data model + * \details The alarm triggered model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | + * |0x0300| 0x001 | 1 | Event | Y | HD | All | Alarm Triggered | mAlarmID | * * \sa Data * @@ -43,7 +43,7 @@ public: QString stringPrefix = "Alarm Triggered"; struct Data { - quint32 mAlarmID = 0; /*!< Alarm ID value of type quint32 extracted out */ + quint32 mAlarmID = 0; ///< Alarm ID }; private: Index: sources/model/hd/data/MHDOperationModeData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/hd/data/MHDOperationModeData.h (.../MHDOperationModeData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/hd/data/MHDOperationModeData.h (.../MHDOperationModeData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -29,9 +29,9 @@ * \brief The MHDOperationMode class * \details The HD operation mode data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: | + * |0x2500| 0x040 | 7 | 1 Hz | N | HD | All | HD Operation Mode Data | mOpMode | * * \sa Data * @@ -55,7 +55,7 @@ QString infoText () const override { return QString("OpMode"); } struct Data { - quint32 mOpMode = 0; /*!< Reservoir1 Prim value of type float extracted out */ + quint32 mOpMode = 0; ///< HD operation mode }; MHDOperationMode () {} Index: sources/model/hd/data/MTreatmentFlowsData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/hd/data/MTreatmentFlowsData.h (.../MTreatmentFlowsData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/hd/data/MTreatmentFlowsData.h (.../MTreatmentFlowsData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -36,13 +36,13 @@ protected: struct Data { - Types::S32 mFlowSetPoint ; /*!< vFlowSetPoint - Flow Set Point value of type signed int extracted out */ - Types::F32 mMeasuredFlow ; /*!< vMeasuredFlow - Measured Flow value of type float extracted out */ - Types::F32 mRotorSpeed ; /*!< vRotorSpeed - Rotor Speed value of type float extracted out */ - Types::F32 mMotorSpeed ; /*!< vMotorSpeed - Motor Speed value of type float extracted out */ - Types::F32 mMotorCtlSpeed ; /*!< vMotorCtlSpeed - Motor Controller Speed value of type float extracted out */ - Types::F32 mMotorCtlCurrent ; /*!< vMotorCtlCurrent - Motor Controller Current value of type float extracted out */ - Types::F32 mPWMDutyCycle ; /*!< vPWMDtCycle - PWM Duty Cycle in % value of type float extracted out */ + Types::S32 mFlowSetPoint ; ///< Flow Set Point + Types::F32 mMeasuredFlow ; ///< Measured Flow + Types::F32 mRotorSpeed ; ///< Rotor Speed + Types::F32 mMotorSpeed ; ///< Motor Speed + Types::F32 mMotorCtlSpeed ; ///< Motor Controller Speed + Types::F32 mMotorCtlCurrent ; ///< Motor Controller Current + Types::F32 mPWMDutyCycle ; ///< PWM Duty Cycle in % } _data; public: @@ -59,9 +59,9 @@ * \brief The MBloodFlow class * \details The blood flow data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(S32) | #2:(F32) | #3:(F32) | #4:(F32) | #5:(F32) | #6:(F32) | #7:(F32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: |:--: |:--: | + * |0x0500| 0x040 | 7 | 1 Hz | N | HD | All | Blood Flow Data | mFlowSetPoint | mMeasuredFlow | mRotorSpeed | mMotorSpeed | mMotorCtlSpeed | mMotorCtlCurrent | mPWMDutyCycle | * * \sa Data * @@ -75,13 +75,13 @@ QString infoText () const override { return QString("BloodFlow"); } struct Data { - qint32 mFlowSetPoint = 0; /*!< vFlowSetPoint - Flow Set Point value of type signed int extracted out */ - float mMeasuredFlow = 0; /*!< vMeasuredFlow - Measured Flow value of type float extracted out */ - float mRotorSpeed = 0; /*!< vRotorSpeed - Rotor Speed value of type float extracted out */ - float mMotorSpeed = 0; /*!< vMotorSpeed - Motor Speed value of type float extracted out */ - float mMotorCtlSpeed = 0; /*!< vMotorCtlSpeed - Motor Controller Speed value of type float extracted out */ - float mMotorCtlCurrent = 0; /*!< vMotorCtlCurrent - Motor Controller Current value of type float extracted out */ - float mPWMDutyCycle = 0; /*!< vPWMDtCycle - PWM Duty Cycle in % value of type float extracted out */ + qint32 mFlowSetPoint = 0; ///< Flow Set Point + float mMeasuredFlow = 0; ///< Measured Flow + float mRotorSpeed = 0; ///< Rotor Speed + float mMotorSpeed = 0; ///< Motor Speed + float mMotorCtlSpeed = 0; ///< Motor Controller Speed + float mMotorCtlCurrent = 0; ///< Motor Controller Current + float mPWMDutyCycle = 0; ///< PWM Duty Cycle in % }; MBloodFlow() { } @@ -93,9 +93,9 @@ * \brief The MDialysateFlow class * \details The dialysate flow data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(S32) | #2:(F32) | #3:(F32) | #4:(F32) | #5:(F32) | #6:(F32) | #7:(F32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: |:--: |:--: | + * |0x0800| 0x040 | 7 | 1 Hz | N | HD | All | Dialysate Flow Data | mFlowSetPoint | mMeasuredFlow | mRotorSpeed | mMotorSpeed | mMotorCtlSpeed | mMotorCtlCurrent | mPWMDutyCycle | * * \sa Data * @@ -109,13 +109,13 @@ QString infoText () const override { return QString("DialysateFlow"); } struct Data { - qint32 mFlowSetPoint = 0; /*!< vFlowSetPoint - Flow Set Point value of type signed int extracted out */ - float mMeasuredFlow = 0; /*!< vMeasuredFlow - Measured Flow value of type float extracted out */ - float mRotorSpeed = 0; /*!< vRotorSpeed - Rotor Speed value of type float extracted out */ - float mMotorSpeed = 0; /*!< vMotorSpeed - Motor Speed value of type float extracted out */ - float mMotorCtlSpeed = 0; /*!< vMotorCtlSpeed - Motor Controller Speed value of type float extracted out */ - float mMotorCtlCurrent = 0; /*!< vMotorCtlCurrent - Motor Controller Current value of type float extracted out */ - float mPWMDutyCycle = 0; /*!< vPWMDtCycle - PWM Duty Cycle in % value of type float extracted out */ + qint32 mFlowSetPoint = 0; ///< Flow Set Point + float mMeasuredFlow = 0; ///< Measured Flow + float mRotorSpeed = 0; ///< Rotor Speed + float mMotorSpeed = 0; ///< Motor Speed + float mMotorCtlSpeed = 0; ///< Motor Controller Speed + float mMotorCtlCurrent = 0; ///< Motor Controller Current + float mPWMDutyCycle = 0; ///< PWM Duty Cycle in % }; MDialysateFlow() { } Index: sources/model/hd/data/MTreatmentOutletFlowData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/hd/data/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/hd/data/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -29,9 +29,9 @@ * \brief The MOutletFlow class * \details The outlet flow data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(F32) | #2:(F32) | #3:(F32) | #4:(F32) | #5:(F32) | #6:(F32) | #7:(F32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: |:--: |:--: | + * |0x0B00| 0x040 | 7 | 1 Hz | N | HD | All | Outlet Flow Data | mRefUFVol | mMeasUFVol | mRotorSpeed | mMotorSpeed | mMotorCtlSpeed | mMotorCtlCurrent | mPWMDtCycle | * * \sa Data * @@ -60,13 +60,13 @@ QString infoText () const override { return QString("OutletFlow"); } struct Data { - float mRefUFVol = 0; /*!< Reference UF Volume value of type float extracted out */ - float mMeasUFVol = 0; /*!< Measured UF Volume value of type float extracted out */ - float mRotorSpeed = 0; /*!< Rotor Speed value of type float extracted out */ - float mMotorSpeed = 0; /*!< Motor Speed value of type float extracted out */ - float mMotorCtlSpeed = 0; /*!< Motor Controller Speed value of type float extracted out */ - float mMotorCtlCurrent = 0; /*!< Motor Controller Current value of type float extracted out */ - float mPWMDtCycle = 0; /*!< PWM Duty Cycle in % value of type float extracted out */ + float mRefUFVol = 0; ///< Reference UF Volume + float mMeasUFVol = 0; ///< Measured UF Volume + float mRotorSpeed = 0; ///< Rotor Speed + float mMotorSpeed = 0; ///< Motor Speed + float mMotorCtlSpeed = 0; ///< Motor Controller Speed + float mMotorCtlCurrent = 0; ///< Motor Controller Current + float mPWMDtCycle = 0; ///< PWM Duty Cycle in % }; MOutletFlow () { } Index: sources/model/hd/data/MTreatmentPressureOcclusionData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/hd/data/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/hd/data/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -26,12 +26,12 @@ namespace Model { /*! - * \brief The MPressureOcclusion class - * \details The pressure/occlusion data model + * \brief The MPressureOcclusionData class + * \details The pressureocclusion data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(F32) | #2:(F32) | #3:(F32) | #4:(F32) | #5:(F32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: | + * |0x0900| 0x040 | 7 | 1 Hz | N | HD | All | PressureOcclusion Data | mArterialPressure | mVenousPressure | mBloodPumpOcclusion | mDialysateInletPumpOcclusion | mDialysateOutletPumpOcclusion | * * \sa Data * @@ -58,11 +58,11 @@ QString infoText () const override { return QString("Pressure/Occlusion"); } struct Data { - float mArterialPressure = 0; /*!< ArterialPressure value of type float extracted out */ - float mVenousPressure = 0; /*!< VenousPressure value of type float extracted out */ - float mBloodPumpOcclusion = 0; /*!< BloodPumpOcclusion value of type float extracted out */ - float mDialysateInletPumpOcclusion = 0; /*!< DialysateInletPumpOcclusion value of type float extracted out */ - float mDialysateOutletPumpOcclusion = 0; /*!< DialysateOutletPumpOcclusion value of type float extracted out */ + float mArterialPressure = 0; ///< ArterialPressure + float mVenousPressure = 0; ///< VenousPressure + float mBloodPumpOcclusion = 0; ///< BloodPumpOcclusion + float mDialysateInletPumpOcclusion = 0; ///< DialysateInletPumpOcclusion + float mDialysateOutletPumpOcclusion = 0; ///< DialysateOutletPumpOcclusion }; MPressureOcclusion () { } Index: sources/model/hd/data/MTreatmentRangesData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/hd/data/MTreatmentRangesData.h (.../MTreatmentRangesData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/hd/data/MTreatmentRangesData.h (.../MTreatmentRangesData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -28,12 +28,11 @@ /*! * \brief The MTreatmentRanges class - * \details The treatment ranges data model - * The ranges are used for adjustments and these values are ranges of adjustment. + * \details The treatment adjustment parameter ranges data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(F32) | #4:(F32) | #5:(U32) | #6:(U32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: |:--: |:--: |:--: | + * |0x1A00| 0x020 | 6 | 1/60 Hz| Y | HD | UI | Treatment adjustment param ranges Data | mDuration_Min | mDuration_Max | mUltrafiltration_Volume_Min | mUltrafiltration_Volume_Max | mDialysate_Flow_Min | mDialysate_Flow_Max | * * \sa Data * @@ -61,12 +60,12 @@ QString infoText () const override { return QString("TreatmentRanges"); } struct Data { - quint32 mDuration_Min = 0; /*!< mDuration_Min value of type U32 extracted out */ - quint32 mDuration_Max = 0; /*!< mDuration_Max value of type U32 extracted out */ - float mUltrafiltration_Volume_Min = 0; /*!< mUltrafiltration_Volume_Min value of type float extracted out */ - float mUltrafiltration_Volume_Max = 0; /*!< mUltrafiltration_Volume_Max value of type float extracted out */ - quint32 mDialysate_Flow_Min = 0; /*!< mDialysate_Flow_Min value of type U32 extracted out */ - quint32 mDialysate_Flow_Max = 0; /*!< mDialysate_Flow_Max value of type U32 extracted out */ + quint32 mDuration_Min = 0; ///< mDuration_Min + quint32 mDuration_Max = 0; ///< mDuration_Max + float mUltrafiltration_Volume_Min = 0; ///< mUltrafiltration_Volume_Min + float mUltrafiltration_Volume_Max = 0; ///< mUltrafiltration_Volume_Max + quint32 mDialysate_Flow_Min = 0; ///< mDialysate_Flow_Min + quint32 mDialysate_Flow_Max = 0; ///< mDialysate_Flow_Max }; MTreatmentRanges () { } Index: sources/model/hd/data/MTreatmentSalineData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/hd/data/MTreatmentSalineData.h (.../MTreatmentSalineData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/hd/data/MTreatmentSalineData.h (.../MTreatmentSalineData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -25,13 +25,14 @@ class tst_models; namespace Model { + /*! * \brief The MTreatmentSaline class - * \details The saline bolus data model + * \details The treatment saline bolus data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1:mTarget | #2:mCumulative | #3:mDelivered | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:------------------------------------:|:-------------:|:--------------:|:-----------------:| - * | 47 | 0x040 | 7 | 1 Hz | N | HD | All | Treatment Saline Bolus Data (all mL) | Max vol (U32) | Cum. vol (F32) | In-prog vol (F32) | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(F32) | #3:(F32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | + * |0x2F00| 0x040 | 7 | 1 Hz | N | HD | All | Treatment Saline Bolus Data | mTarget | mCumulative | mDelivered | * * \sa Data * \sa MAdjustSalineReq : Saline Bolus Request @@ -58,9 +59,9 @@ QString infoText() const override { return QString("SalineData") ; } struct Data { - quint32 mTarget = 0; /*!< Target Target volume for the current started saline bolus */ - float mCumulative = 0; /*!< Cumulative Cumulative volume of all saline deliveries during current treatment */ - float mDelivered = 0; /*!< Delivered Current delivered saline volume */ + quint32 mTarget = 0; ///< Target volume for the current started saline bolus + float mCumulative = 0; ///< Cumulative volume of all saline deliveries during current treatment + float mDelivered = 0; ///< Current delivered saline volume }; public: Index: sources/model/hd/data/MTreatmentStatesData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/hd/data/MTreatmentStatesData.h (.../MTreatmentStatesData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/hd/data/MTreatmentStatesData.h (.../MTreatmentStatesData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -31,9 +31,9 @@ * These are states of the current treatment. * It also includes the ultrafiltration states, saline bolus states. * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(U32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | + * |0x0F00| 0x040 | 7 | 1 Hz | N | HD | All | Treatment States Data | mSubMode | mUFState | mSalineState | * * \sa Data * @@ -58,9 +58,9 @@ QString infoText () const override { return QString("TreatmentStates"); } struct Data { - quint32 mSubMode = 0; /*!< Sub-Mode value of type quint32 extracted out */ - quint32 mUFState = 0; /*!< UF State value of type quint32 extracted out */ - quint32 mSalineState = 0; /*!< Saline State value of type quint32 extracted out */ + quint32 mSubMode = 0; ///< Sub-Mode + quint32 mUFState = 0; ///< UF State + quint32 mSalineState = 0; ///< Saline State }; MTreatmentStates() { } Index: sources/model/hd/data/MTreatmentTimeData.h =================================================================== diff -u -rbb74da05f81b82dad3ec844c1feb1135b949f1c2 -rd8027c74c31ed6c4212d3fbb9a1523eedb7d685d --- sources/model/hd/data/MTreatmentTimeData.h (.../MTreatmentTimeData.h) (revision bb74da05f81b82dad3ec844c1feb1135b949f1c2) +++ sources/model/hd/data/MTreatmentTimeData.h (.../MTreatmentTimeData.h) (revision d8027c74c31ed6c4212d3fbb9a1523eedb7d685d) @@ -30,9 +30,9 @@ * \brief The MTreatmentTime class * \details The treatment time data model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| - * | | | | | | | | | | | | | | | | | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(U32) | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--: |:--: |:--: | + * |0x0D00| 0x040 | 7 | 1 Hz | N | HD | All | Treatment Time Data | mTotal | mElapsed | mRemaining | * * \sa Data * @@ -57,9 +57,9 @@ QString infoText () const override { return QString("TreatmentTime"); } struct Data { - quint32 mTotal = 0; /*!< Total treatment time in sec */ - quint32 mElapsed = 0; /*!< Elapsed treatment time in sec */ - quint32 mRemaining = 0; /*!< Remaining treatment time in sec */ + quint32 mTotal = 0; ///< Total treatment time in sec */ + quint32 mElapsed = 0; ///< Elapsed treatment time in sec */ + quint32 mRemaining = 0; ///< Remaining treatment time in sec */ }; public: