Index: AlarmMapping.csv =================================================================== diff -u -r6c6f1f5d466badd9b4fd67be7c907234c342b2a2 -rf571021c16fd304c37e027c5ffc38eb21f5382ba --- AlarmMapping.csv (.../AlarmMapping.csv) (revision 6c6f1f5d466badd9b4fd67be7c907234c342b2a2) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision f571021c16fd304c37e027c5ffc38eb21f5382ba) @@ -45,7 +45,7 @@ 44,"HD UI communication timeout." 45,"HD too many bad communications CRC." 46,"HD didn't get ACK on message to UI that required acknowledgment." - 47,"Available for use." + 47,"DG maximum RO Pump PWM exceeded." 48,"HD ultrafiltration volume accuracy error during treatment." 49,"HD FPGA communication down for too long." 50,"DG FPGA not accepting commanded valve states." @@ -61,7 +61,7 @@ 60,"HD valve not functional." 61,"HD valve current out of range." 62,"HD valve position out of target." - 63,"HD blood leak FPGA fault." + 63,"HD syringe pump prime timeout." 64,"DG barometric pressure sensor out of range." 65,"HD DG requests DG command with invalid parameter fault." 66,"HD blood leak sensor set point set failure." @@ -127,7 +127,7 @@ 126,"HD blood leak detected alarm." 127,"HD venous pressure too low during treatment." 128,"HD venous air bubble detected alarm." - 129,"Available for use." + 129,"HD blood leak recovering please wait." 130,"HD venous pressure too high during treatment." 131,"HD arterial pressure too low during treatment." 132,"HD arterial pressure too high during treatment." @@ -235,7 +235,7 @@ 234,"DG inlet water pressure in high range." 235,"HD in treatment stopped sub-mode after rinseback completed (no escalation)." 236,"HD needs new cartridge to be installed." - 237,"Available for useALARM_ID_AVAILABLE_13." + 237,"Available for use." 238,"HD no cartridge loaded or installed improperly alarm." 239,"HD fail to remove cartridge alarm." 240,"DG bicarb conductivity out of range during bicarb pump check alarm." @@ -256,7 +256,7 @@ 255,"HD and UI software builds are not compatible." 256,"HD processor is in Disinfect Chemical Flush mode." 257,"Alarm ID available for use." - 258,"Alarm Id available." + 258,"HD UI POST OS version compatibility failure." 259,"HD temperatures out of range." 260,"HD UI POST Application Integrity (Sha256Sum) failure." 261,"HD UI POST CANBus failure." @@ -321,4 +321,5 @@ 320,"DG chemical disinfect flush sample timeout." 321,"DG outlet UV reactor not healthy." 322,"HD UI POST Year check failure." - 323,"Total number of alarms." + 323,"HD UI POST Configuration check failure." + 324,"Total number of alarms." Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rddd4cdc839b671226eba060eefbdcc5e6efad95f -rf571021c16fd304c37e027c5ffc38eb21f5382ba --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision ddd4cdc839b671226eba060eefbdcc5e6efad95f) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision f571021c16fd304c37e027c5ffc38eb21f5382ba) @@ -74,7 +74,7 @@ {Gui::GuiActionType::ID_TreatmentTime , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_BloodFlow , 8 * 4 }, // 8 parameters each 4bytes {Gui::GuiActionType::ID_DialysateInletFlow , 7 * 4 }, // 7 parameters each 4bytes - {Gui::GuiActionType::ID_DialysateOutletFlow , 12 * 4 }, //10 parameters each 4bytes + {Gui::GuiActionType::ID_DialysateOutletFlow , 13 * 4 }, //13 parameters each 4bytes {Gui::GuiActionType::ID_PressureOcclusion , 8 * 4 }, // 8 parameters each 4bytes {Gui::GuiActionType::ID_Saline , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -rcac64cdcdc2f507b4a2fed0c0f3aa87f431438ab -rf571021c16fd304c37e027c5ffc38eb21f5382ba --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision cac64cdcdc2f507b4a2fed0c0f3aa87f431438ab) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision f571021c16fd304c37e027c5ffc38eb21f5382ba) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 09-Oct-2023 + * \date (last) 18-Jan-2024 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * Index: sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp =================================================================== diff -u -ra7c580f0998ee781c47314384f677249cea4c4b4 -rf571021c16fd304c37e027c5ffc38eb21f5382ba --- sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp (.../MTreatmentOutletFlowData.cpp) (revision a7c580f0998ee781c47314384f677249cea4c4b4) +++ sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp (.../MTreatmentOutletFlowData.cpp) (revision f571021c16fd304c37e027c5ffc38eb21f5382ba) @@ -30,6 +30,7 @@ _data.mUfCalcRate .value, _data.mRotorHall .value, _data.mCurrentSetUFRate.value, + _data.mDialOutPumpState.value, }; } @@ -47,6 +48,7 @@ if (GetValue(vByteArray, index, _data.mUfCalcRate )) if (GetValue(vByteArray, index, _data.mRotorHall )) if (GetValue(vByteArray, index, _data.mCurrentSetUFRate)) + if (GetValue(vByteArray, index, _data.mDialOutPumpState)) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -60,6 +62,7 @@ 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; } } /*! @@ -81,5 +84,6 @@ data.mUfCalcRate = _data.mUfCalcRate .value; data.mRotorHall = _data.mRotorHall .value; data.mCurrentSetUFRate=_data.mCurrentSetUFRate.value; + data.mDialOutPumpState=_data.mDialOutPumpState.value; return data; } Index: sources/model/hd/data/treatment/MTreatmentOutletFlowData.h =================================================================== diff -u -ra7c580f0998ee781c47314384f677249cea4c4b4 -rf571021c16fd304c37e027c5ffc38eb21f5382ba --- sources/model/hd/data/treatment/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision a7c580f0998ee781c47314384f677249cea4c4b4) +++ sources/model/hd/data/treatment/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision f571021c16fd304c37e027c5ffc38eb21f5382ba) @@ -48,6 +48,7 @@ * | # :(F32) | \ref Data::mUfCalcRate | * | # :(U32) | \ref Data::mRotorHall | * | # :(F32) | \ref Data::mCurrentSetUFRate| + * | # :(U32) | \ref Data::mDialOutPumpState| * * \sa Data * @@ -79,6 +80,7 @@ Types::F32 mUfCalcRate ; Types::U32 mRotorHall ; Types::F32 mCurrentSetUFRate ; + Types::U32 mDialOutPumpState ; } _data; public: @@ -100,6 +102,7 @@ float mUfCalcRate = 0; ///< int mRotorHall = 0; ///< float mCurrentSetUFRate = 0; ///< Current Set UF Rate + int mDialOutPumpState = 0; ///< Dialout pump state }; MOutletFlow () { } Index: sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp =================================================================== diff -u -ra7c580f0998ee781c47314384f677249cea4c4b4 -rf571021c16fd304c37e027c5ffc38eb21f5382ba --- sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp (.../VTreatmentUltrafiltration.cpp) (revision a7c580f0998ee781c47314384f677249cea4c4b4) +++ sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp (.../VTreatmentUltrafiltration.cpp) (revision f571021c16fd304c37e027c5ffc38eb21f5382ba) @@ -33,4 +33,5 @@ ultrafiltration_UfCalcRate ( vData.mUfCalcRate ); ultrafiltration_RotorHall ( vData.mRotorHall ); ultrafiltration_UfCurrentRate ( vData.mCurrentSetUFRate); + ultrafiltration_dialOutPumpState( vData.mDialOutPumpState); } Index: sources/view/hd/data/treatment/VTreatmentUltrafiltration.h =================================================================== diff -u -ra7c580f0998ee781c47314384f677249cea4c4b4 -rf571021c16fd304c37e027c5ffc38eb21f5382ba --- sources/view/hd/data/treatment/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision a7c580f0998ee781c47314384f677249cea4c4b4) +++ sources/view/hd/data/treatment/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision f571021c16fd304c37e027c5ffc38eb21f5382ba) @@ -53,6 +53,7 @@ PROPERTY( float, ultrafiltration_UfCalcRate , 0) PROPERTY( int, ultrafiltration_RotorHall , 0) PROPERTY( float, ultrafiltration_UfCurrentRate , 0) + PROPERTY( int, ultrafiltration_dialOutPumpState,0) VIEW_DEC(VTreatmentUltrafiltration, OutletFlowData) };