Index: sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h
===================================================================
diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4
--- sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3)
+++ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4)
@@ -32,30 +32,30 @@
*
* | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description |
* |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |
- * |0x0900| 0x040 | 7 | 1 Hz | N | HD | All | PressureOcclusion Data |
+ * |0x2400| 0x100 | 7 | 1 Hz | N | TD | All | PressureOcclusion Data |
*
* | Payload ||
* | ||
* | #1: (F32) | \ref Data::mArterialPressure |
* | #2: (F32) | \ref Data::mVenousPressure |
- * | #3: (U32) | \ref Data::mBloodPumpOcclusion |
- * | #4: (U32) | \ref Data::mPressureLimitState |
- * | #5: (S32) | \ref Data::mArterialLimitLow |
- * | #6: (S32) | \ref Data::mArterialLimitHigh |
- * | #7: (S32) | \ref Data::mVenousLimitLow |
- * | #8: (S32) | \ref Data::mVenousLimitHigh |
- * | #9: (F32) | \ref Data::mArtLongFilter |
- * | #10:(F32) | \ref Data::mVenousLongFilter |
- * | #11:(F32) | \ref Data::mBloodOcclLongFilter |
- * | #12:(F32) | \ref Data::mPartialOcclBaseline |
+ * | #3: (U32) | \ref Data::mLimitState |
+ * | #4: (S32) | \ref Data::mArterialMin |
+ * | #5: (S32) | \ref Data::mArterialMax |
+ * | #6: (S32) | \ref Data::mVenousMin |
+ * | #7: (S32) | \ref Data::mVenousMax |
+ * | #8: (F32) | \ref Data::mArterialLongFilter |
+ * | #9: (F32) | \ref Data::mVenousLongFilter |
+ * | #10:(F32) | \ref Data::mTmpPressure |
+ * | #11:(F32) | \ref Data::mTmpMin |
+ * | #12:(F32) | \ref Data::mTmpMax |
*
* \sa Data
*
*
* | ||
* | ||
* | typeText | Datum |
- * | unitText | HD |
+ * | unitText | TD |
* | infoText | Occlusion |
*
*/
@@ -67,18 +67,18 @@
QVariantList parameters() const override;
struct {
- Types::F32 mArterialPressure ; ///< Latest arterial pressure (mmHg)
- Types::F32 mVenousPressure ; ///< Latest venous pressure (mmHg)
- Types::U32 mBloodPumpOcclusion ; ///< Latest BP occlusion (no units)
- Types::U32 mPressureLimitState ; ///< Current pressure limits state (enum-stabilization or stable)
- Types::S32 mArterialLimitLow ; ///< Current arterial minimum pressure limit (mmHg)
- Types::S32 mArterialLimitHigh ; ///< Current arterial maximum pressure limit (mmHg)
- Types::S32 mVenousLimitLow ; ///< Current venous minimum pressure limit (mmHg)
- Types::S32 mVenousLimitHigh ; ///< Current venous maximum pressure limit (mmHg)
- Types::F32 mArtLongFilter ; ///< Arterial long filter (mmHg)
- Types::F32 mVenousLongFilter ; ///< Venous long filter (mmHg)
- Types::F32 mBloodOcclLongFilter ; ///< Blood pump occlusion long filter
- Types::F32 mPartialOcclBaseline ; ///< Partial Occlusion base line
+ Types::F32 mArterialPressure ; ///< Latest arterial pressure (mmHg)
+ Types::F32 mVenousPressure ; ///< Latest venous pressure (mmHg)
+ Types::U32 mLimitState ; ///< Latest BP occlusion (no units)
+ Types::S32 mArterialMin ; ///< Current pressure limits state (enum-stabilization or stable)
+ Types::S32 mArterialMax ; ///< Current arterial minimum pressure limit (mmHg)
+ Types::S32 mVenousMin ; ///< Current arterial maximum pressure limit (mmHg)
+ Types::S32 mVenousMax ; ///< Current venous minimum pressure limit (mmHg)
+ Types::F32 mArterialLongFilter ; ///< Current venous maximum pressure limit (mmHg)
+ Types::F32 mVenousLongFilter ; ///< Arterial long filter (mmHg)
+ Types::F32 mTmpPressure ; ///< Venous long filter (mmHg)
+ Types::F32 mTmpMin ; ///< Blood pump occlusion long filter
+ Types::F32 mTmpMax ; ///< Partial Occlusion base line
} _data;
public:
@@ -88,18 +88,18 @@
QString infoText () const override { return QString("Occlusion"); }
struct Data {
- float mArterialPressure = 0;
- float mVenousPressure = 0;
- quint32 mBloodPumpOcclusion = 0;
- quint32 mPressureLimitState = 0;
- qint32 mArterialLimitLow = 0;
- qint32 mArterialLimitHigh = 0;
- qint32 mVenousLimitLow = 0;
- qint32 mVenousLimitHigh = 0;
- float mArtLongFilter = 0;
- float mVenousLongFilter = 0;
- float mBloodOcclLongFilter = 0;
- float mPartialOcclBaseline = 0;
+ float mArterialPressure = 0;
+ float mVenousPressure = 0;
+ quint32 mLimitState = 0;
+ qint32 mArterialMin = 0;
+ qint32 mArterialMax = 0;
+ qint32 mVenousMin = 0;
+ qint32 mVenousMax = 0;
+ float mArterialLongFilter = 0;
+ float mVenousLongFilter = 0;
+ float mTmpPressure = 0;
+ float mTmpMin = 0;
+ float mTmpMax = 0;
};
MPressureOcclusion () { }