Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -r69cb2956a2d5a7f0e88ae681b5e035ae9d1af6a5 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 38ae7b93679d05a54fc460dac68891562d7da72d) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 69cb2956a2d5a7f0e88ae681b5e035ae9d1af6a5) @@ -92,8 +92,8 @@ // ----- Settings // Service Mode - ID_AdjustServiceModeReq = 0xB000, // 176 - ID_AdjustServiceModeRsp = 0xB100, // 177 + ID_AdjustServiceModeReq = 0xB000, // 176 + ID_AdjustServiceModeRsp = 0xB100, // 177 // Version ID_AdjustVersionsUIReq = 0x1C00, // 28 Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r69cb2956a2d5a7f0e88ae681b5e035ae9d1af6a5 --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp (.../MPostTreatmentAdjustTreatmentLogResponse.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp (.../MPostTreatmentAdjustTreatmentLogResponse.cpp) (revision 69cb2956a2d5a7f0e88ae681b5e035ae9d1af6a5) @@ -71,8 +71,8 @@ if (GetValue(vByteArray, index, _data.mActualTreatmentDuration )) // U32 actualTreatmentDur_sec; ///< Actual treatment duration (in sec) if (GetValue(vByteArray, index, _data.mAcidConcentrateType )) // U32 acidConcentrate; ///< Acid concentrate option if (GetValue(vByteArray, index, _data.mBicarbonateConcentrateType )) // U32 bicarbConcentrate; ///< Bicarbonate concentrate option - if (GetValue(vByteArray, index, _data.mPotassiumConcentration )) // U32 potassiumConcentration; ///< Potassium concentration value in mEq/L. - if (GetValue(vByteArray, index, _data.mCalciumConcentration )) // U32 calciumConcentration; ///< Calcium concentration value in mEq/L. + if (GetValue(vByteArray, index, _data.mPotassiumConcentration )) // F32 potassiumConcentration; ///< Potassium concentration value in mEq/L. + if (GetValue(vByteArray, index, _data.mCalciumConcentration )) // F32 calciumConcentration; ///< Calcium concentration value in mEq/L. if (GetValue(vByteArray, index, _data.mBicarbonateConcentration )) // U32 bicarbonateConcentration; ///< Bicarbonate concentration value in mEq/L. if (GetValue(vByteArray, index, _data.mSodiumConcentration )) // U32 sodiumConcentration; ///< Sodium concentration value in mEq/L. if (GetValue(vByteArray, index, _data.mDialysateTemperature )) // F32 dialysateTemperature_degC; ///< Dialysate temperature (in deg C) Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r69cb2956a2d5a7f0e88ae681b5e035ae9d1af6a5 --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision 69cb2956a2d5a7f0e88ae681b5e035ae9d1af6a5) @@ -100,8 +100,8 @@ Types::U32 mActualTreatmentDuration ; ///< 06 - (U32) Actual Treatment Duration (sec) Types::U32 mAcidConcentrateType ; ///< 07 - (U32) Acid Concentrate Type Types::U32 mBicarbonateConcentrateType ; ///< 08 - (U32) Bicarbonate Concentrate Type - Types::U32 mPotassiumConcentration ; ///< 09 - (U32) Potassium Concentration (mEq/L) - Types::U32 mCalciumConcentration ; ///< 10 - (U32) Calcium Concentration (mEq/L) + Types::F32 mPotassiumConcentration ; ///< 09 - (F32) Potassium Concentration (mEq/L) + Types::F32 mCalciumConcentration ; ///< 10 - (F32) Calcium Concentration (mEq/L) Types::U32 mBicarbonateConcentration ; ///< 11 - (U32) Bicarbonate Concentration (mEq/L) Types::U32 mSodiumConcentration ; ///< 12 - (U32) SodiumConcentration (mEq/L) Types::F32 mDialysateTemperature ; ///< 13 - (F32) Dialysate Temperature (Celsius) @@ -146,8 +146,8 @@ quint32 mActualTreatmentDuration = 0; ///< 06 - (U32) Actual Treatment Duration (sec) quint32 mAcidConcentrateType = 0; ///< 07 - (U32) Acid Concentrate Type quint32 mBicarbonateConcentrateType = 0; ///< 08 - (U32) Bicarbonate Concentrate Type - quint32 mPotassiumConcentration = 0; ///< 09 - (U32) Potassium Concentration (mEq/L) - quint32 mCalciumConcentration = 0; ///< 10 - (U32) Calcium Concentration (mEq/L) + float mPotassiumConcentration = 0; ///< 09 - (F32) Potassium Concentration (mEq/L) + float mCalciumConcentration = 0; ///< 10 - (F32) Calcium Concentration (mEq/L) quint32 mBicarbonateConcentration = 0; ///< 11 - (U32) Bicarbonate Concentration (mEq/L) quint32 mSodiumConcentration = 0; ///< 12 - (U32) SodiumConcentration (mEq/L) float mDialysateTemperature = 0; ///< 13 - (F32) Dialysate Temperature (Celsius)