Index: AlarmMapping.csv =================================================================== diff -u -r108450c58851ff7c48c4607494b8cdae59952908 -r200398eaf784dd2965023151086ba1939d2eb746 --- AlarmMapping.csv (.../AlarmMapping.csv) (revision 108450c58851ff7c48c4607494b8cdae59952908) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision 200398eaf784dd2965023151086ba1939d2eb746) @@ -86,7 +86,7 @@ 85,"HD venous pressure sensor temperature out of range error." 86,"HD BP occlusion sensor not being read." 87,"DG heating invalid calibration record." - 88,"This alarm ID is available for use." + 88,"DG concentrate pumps hall sensor out of range." 89,"HD BP occlusion sensor error." 90,"This alarm ID is available for use." 91,"HD No dialysate flow data receive in the last 3 seconds." Index: denali.pro.user =================================================================== diff -u -r0eef8c0e5d714969603943a2e719c95533e701d7 -r200398eaf784dd2965023151086ba1939d2eb746 --- denali.pro.user (.../denali.pro.user) (revision 0eef8c0e5d714969603943a2e719c95533e701d7) +++ denali.pro.user (.../denali.pro.user) (revision 200398eaf784dd2965023151086ba1939d2eb746) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -1213,7 +1213,7 @@ denali Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro - -l + -l -q 3768 false true Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r7b34653589ba6e4f4705fb4026fcd9319c41c352 -r200398eaf784dd2965023151086ba1939d2eb746 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 7b34653589ba6e4f4705fb4026fcd9319c41c352) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 200398eaf784dd2965023151086ba1939d2eb746) @@ -44,6 +44,10 @@ * */ const QHash payloadLen { + // FixMe: This has to be move to each model. + // it has been observed that these length can only check the payload length is correct. + // but if the model still needs more the model will fail. + // so it is better to keep them next to each other to make sure they are in sync. // ---- {Gui::GuiActionType::ID_PowerOff , 1 }, {Gui::GuiActionType::ID_ShuttingDown , 0 }, Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r093155324dda47cba65693b72a2d1b0290d0c29a -r200398eaf784dd2965023151086ba1939d2eb746 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 093155324dda47cba65693b72a2d1b0290d0c29a) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 200398eaf784dd2965023151086ba1939d2eb746) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 01-Feb-2022 + * \date (last) 07-Feb-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -121,9 +121,9 @@ /*0085*/case GuiAlarmID::ALARM_ID_HD_VENOUS_PRESSURE_SENSOR_TEMP_OUT_OF_RANGE : { result = QObject::tr("HD venous pressure sensor temperature out of range error." ); break; } /* 85*/ /*0086*/case GuiAlarmID::ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR : { result = QObject::tr("HD BP occlusion sensor not being read." ); break; } /* 86*/ /*0087*/case GuiAlarmID::ALARM_ID_DG_HEATING_INVALID_CAL_RECORD : { result = QObject::tr("DG heating invalid calibration record." ); break; } /* 87*/ -/*0088*/case GuiAlarmID::ALARM_ID____AVAILABLE_11 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 88*/ +/*0088*/case GuiAlarmID::ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE : { result = QObject::tr("DG concentrate pumps hall sensor out of range." ); break; } /* 88*/ /*0089*/case GuiAlarmID::ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR : { result = QObject::tr("HD BP occlusion sensor error." ); break; } /* 89*/ -/*0090*/case GuiAlarmID::ALARM_ID____AVAILABLE_12 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 90*/ +/*0090*/case GuiAlarmID::ALARM_ID____AVAILABLE_25 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 90*/ /*0091*/case GuiAlarmID::ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE : { result = QObject::tr("HD No dialysate flow data receive in the last 3 seconds." ); break; } /* 91*/ /*0092*/case GuiAlarmID::ALARM_ID____AVAILABLE_14 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 92*/ /*0093*/case GuiAlarmID::ALARM_ID____AVAILABLE_15 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 93*/ Index: sources/view/dg/data/post/VDGPOSTData.h =================================================================== diff -u -rfc329c788fe9453983072bee937ccbc95b4ed6e4 -r200398eaf784dd2965023151086ba1939d2eb746 --- sources/view/dg/data/post/VDGPOSTData.h (.../VDGPOSTData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) +++ sources/view/dg/data/post/VDGPOSTData.h (.../VDGPOSTData.h) (revision 200398eaf784dd2965023151086ba1939d2eb746) @@ -45,7 +45,7 @@ // has been manually tested that it works perfectly fine TRIGGER ( bool , adjustment , 0) // coco end - CONSTANT(quint32 , itemCount , GuiDGPOSTStates::NUM_OF_DG_POST_STATES) + CONSTANT(quint32 , itemCount , GuiDGPOSTStates::DG_POST_STATE_COMPLETED - 1 ) PROPERTY(bool , start , 0) PROPERTY(quint32 , itemIndex , 0)