Index: etc/reports/alarms/AlarmMapping.csv =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287 --- etc/reports/alarms/AlarmMapping.csv (.../AlarmMapping.csv) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ etc/reports/alarms/AlarmMapping.csv (.../AlarmMapping.csv) (revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287) @@ -89,13 +89,13 @@ 88,"DD balance chamber state1 fill end pressure not in range." 89,"DD balance chamber state2 fill start pressure not in range." 90,"DD balance chamber state2 fill end pressure not in range." - 91,"DD generate dialysate hydraulics chamber pressure out of range." - 92,"DD generate dialysate fresh dialysate pressure out of range." - 93,"DD generate dialysate spent dialysate pressure out of range." + 91,"Available alarms." + 92,"Available alarms." + 93,"Available alarms." 94,"DD balance chamber state1 fill initiated and pressure drop is not in range." 95,"DD balance chamber state2 fill initiated and pressure drop is not in range." - 96,"Available alarms." - 97,"Available alarms." + 96,"TD treatment paused by user." + 97,"DD D74 bicarb conductivity sensor freshness/error timeout fault." 98,"Available alarms." 99,"Available alarms." 100,"TD communication timeout." Index: etc/reports/alarms/AlarmMapping.py =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287 --- etc/reports/alarms/AlarmMapping.py (.../AlarmMapping.py) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ etc/reports/alarms/AlarmMapping.py (.../AlarmMapping.py) (revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287) @@ -90,13 +90,13 @@ 88 : "DD balance chamber state1 fill end pressure not in range." 89 : "DD balance chamber state2 fill start pressure not in range." 90 : "DD balance chamber state2 fill end pressure not in range." - 91 : "DD generate dialysate hydraulics chamber pressure out of range." - 92 : "DD generate dialysate fresh dialysate pressure out of range." - 93 : "DD generate dialysate spent dialysate pressure out of range." + 91 : "Available alarms." + 92 : "Available alarms." + 93 : "Available alarms." 94 : "DD balance chamber state1 fill initiated and pressure drop is not in range." 95 : "DD balance chamber state2 fill initiated and pressure drop is not in range." - 96 : "Available alarms." - 97 : "Available alarms." + 96 : "TD treatment paused by user." + 97 : "DD D74 bicarb conductivity sensor freshness/error timeout fault." 98 : "Available alarms." 99 : "Available alarms." 100 : "TD communication timeout." Index: etc/reports/cppcheck/cppcheck.err =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287 --- etc/reports/cppcheck/cppcheck.err (.../cppcheck.err) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ etc/reports/cppcheck/cppcheck.err (.../cppcheck.err) (revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287) @@ -1,4 +1,4 @@ -04/25/2025 20:19 +04/25/2025 23:01 Behrouz NematiPour /home/denali/Public/luis/application/sources/canbus/MessageAcknowModel.h:58:9: performance: When an object of a class is created, the constructors of all member variables are called consecutively in the order the variables are declared, even if you don't explicitly write them to the initialization list. You could avoid assigning '_sequence' a value by passing the value to the constructor in the initialization list. [useInitializationList] _sequence = vSequence ; Index: etc/reports/cppcheck/cppcheck.log =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287 --- etc/reports/cppcheck/cppcheck.log (.../cppcheck.log) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ etc/reports/cppcheck/cppcheck.log (.../cppcheck.log) (revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287) @@ -1,4 +1,4 @@ -04/25/2025 20:19 +04/25/2025 23:01 Behrouz NematiPour (information) Couldn't find path given by -I '/home/denali/Public/luis/application/sources/wifi/' Checking /home/denali/Public/luis/application/main.cpp ... Index: leahi.pro.user =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287 --- leahi.pro.user (.../leahi.pro.user) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ leahi.pro.user (.../leahi.pro.user) (revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -113,7 +113,7 @@ true - "" "" + "" 0 %{ActiveProject:ProjectDirectory}/imake.sh %{sourceDir} ProjectExplorer.ProcessStep @@ -130,8 +130,7 @@ true - -b --tag denali >> denali - + -b --tag leahi >> leahi sha256sum %{buildDir} ProjectExplorer.ProcessStep @@ -478,46 +477,44 @@ /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - 192.168.137.3 - 192.168.137.24 - 192.168.40.23 - 192.168.137.26 - 192.168.137.170 - 192.168.10.186 - 192.168.137.36 - 192.168.137.125 - 192.168.137.202 192.168.137.247 - 192.168.137.210 + 192.168.137.202 + 192.168.137.125 + 192.168.137.170 192.168.10.159 + 192.168.10.186 + 192.168.137.26 + 192.168.137.170 + 192.168.40.23 + 192.168.137.3 192.168.10.228 - 192.168.10.228 - 192.168.10.138 + 192.168.10.167 192.168.137.25 - 192.168.137.30 192.168.10.186 - 192.168.10.167 - 192.168.137.170 + 192.168.10.138 + 192.168.10.228 + 192.168.137.36 + 192.168.137.30 + 192.168.137.210 /home/root @@ -539,12 +536,13 @@ /home/root /home/root /home/root - /home/root /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots @@ -553,59 +551,54 @@ /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots - /opt/b2qt/3.1.18/sysroots - /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots - /opt/b2qt/3.1.18/sysroots - 2023-02-02T02:40:56.627 - 2023-02-02T02:05:29.947 - 2023-01-24T17:29:54.849 - 2023-02-01T05:00:56.449 - 2023-01-27T09:45:11.898 - 2023-01-18T20:13:36.296 - 2023-02-01T03:23:15.710 - 2023-02-02T02:07:25.922 - 2023-02-02T01:46:50.167 2023-02-02T02:26:33.738 - 2023-02-02T01:52:20.307 + 2023-02-02T01:46:50.167 + 2023-02-02T02:07:25.922 + 2023-01-27T10:15:15.423 2023-01-24T18:19:13.179 + 2023-01-18T20:13:36.296 + 2023-02-01T05:00:56.449 + 2023-01-27T09:45:11.898 + 2023-01-24T17:29:54.849 + 2023-02-02T02:40:56.627 2023-01-17T18:06:25.579 - 2023-01-17T18:18:03.749 - 2023-02-02T09:06:00.862 + 2023-02-02T19:40:15.813 2023-02-02T02:13:54.596 - 2023-02-02T02:30:48.337 2023-01-18T17:47:08.797 - 2023-02-02T19:40:15.813 - 2023-01-27T10:15:15.423 + 2023-02-02T09:06:00.862 + 2023-01-17T18:18:03.749 + 2023-02-01T03:23:15.710 + 2023-02-02T02:30:48.337 + 2023-02-02T01:52:20.307 - 2023-02-02T02:41:10.000 - 2023-02-02T02:05:42.000 - 2023-01-24T17:30:03.000 - 2023-02-01T05:00:51.000 - 2023-01-27T09:44:58.000 - 2023-01-18T20:13:33.000 - 2023-02-01T03:23:28.000 - 2023-02-02T02:07:21.000 - 2023-02-02T01:47:02.000 2023-02-02T02:26:46.000 - 2023-02-02T01:52:16.000 + 2023-02-02T01:47:02.000 + 2023-02-02T02:07:21.000 + 2023-01-27T10:15:08.000 2023-01-24T18:18:58.000 + 2023-01-18T20:13:33.000 + 2023-02-01T05:00:51.000 + 2023-01-27T09:44:58.000 + 2023-01-24T17:30:03.000 + 2023-02-02T02:41:10.000 2023-01-17T18:05:42.000 - 2023-01-17T18:17:25.000 - 2023-02-02T09:05:22.000 + 2023-02-02T19:39:36.000 2023-02-02T02:14:08.000 - 2023-02-02T02:31:01.000 2023-01-18T17:47:04.000 - 2023-02-02T19:39:36.000 - 2023-01-27T10:15:08.000 + 2023-02-02T09:05:22.000 + 2023-01-17T18:17:25.000 + 2023-02-01T03:23:28.000 + 2023-02-02T02:31:01.000 + 2023-02-02T01:52:16.000 2 Index: sources/gui/GuiGlobals.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287) @@ -332,7 +332,6 @@ // Ultrafiltration Q_ENUM(UF_Adjustments) Q_ENUM(UF_Commands) - Q_ENUM(UF_States) // Saline Q_ENUM(Saline_Bolus_States) Q_ENUM(Saline_Commands) @@ -351,7 +350,7 @@ Q_ENUM(Treatment_End_States) Q_ENUM(Requested_Treatment_End_User_Actions) // Treatment Stop - Q_ENUM(Treatment_Stop_States) + Q_ENUM(Treatment_Paused_States) // Pre-Treatment SubMode Q_ENUM(TD_Pre_Treatment_Mode_States) // Pre-Treatment Water Sample @@ -404,7 +403,6 @@ // Dialysis typedef GuiActions::Dialysis_States GuiDialysisState; // Ultrafiltration - typedef GuiActions::UF_States GuiUFStates; typedef GuiActions::UF_Commands GuiUFCommands; typedef GuiActions::UF_Adjustments GuiUFAdjustment; // Saline @@ -425,7 +423,7 @@ typedef GuiActions::Treatment_End_States GuiTreatmentEndStates; typedef GuiActions::Requested_Treatment_End_User_Actions GuiTreatmentEndCommands; // Treatment Stop - typedef GuiActions::Treatment_Stop_States GuiTreatmentStopStates; + typedef GuiActions::Treatment_Paused_States GuiTreatmentPausedStates; // Pre-Treatment SubMode typedef GuiActions::TD_Pre_Treatment_Mode_States GuiPreTreatmentStates; // Pre-Treatment Water Sample Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287) @@ -124,13 +124,13 @@ /*0088*/case GuiAlarmID::ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("DD balance chamber state1 fill end pressure not in range." ); break; } /* 88*/ /*0089*/case GuiAlarmID::ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE: { result = QObject::tr("DD balance chamber state2 fill start pressure not in range." ); break; } /* 89*/ /*0090*/case GuiAlarmID::ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("DD balance chamber state2 fill end pressure not in range." ); break; } /* 90*/ -/*0091*/case GuiAlarmID::ALARM_ID_DD_GEND_HYD_CHAMBER_PRESS_OUT_OF_RANGE : { result = QObject::tr("DD generate dialysate hydraulics chamber pressure out of range." ); break; } /* 91*/ -/*0092*/case GuiAlarmID::ALARM_ID_DD_GEND_FRESH_DIAL_PRESS_OUT_OF_RANGE : { result = QObject::tr("DD generate dialysate fresh dialysate pressure out of range." ); break; } /* 92*/ -/*0093*/case GuiAlarmID::ALARM_ID_DD_GEND_SPENT_DIAL_PRESS_OUT_OF_RANGE : { result = QObject::tr("DD generate dialysate spent dialysate pressure out of range." ); break; } /* 93*/ +/*0091*/case GuiAlarmID::ALARM_ID_AVAILABLE_91 : { result = QObject::tr("Available alarms." ); break; } /* 91*/ +/*0092*/case GuiAlarmID::ALARM_ID_AVAILABLE_92 : { result = QObject::tr("Available alarms." ); break; } /* 92*/ +/*0093*/case GuiAlarmID::ALARM_ID_AVAILABLE_93 : { result = QObject::tr("Available alarms." ); break; } /* 93*/ /*0094*/case GuiAlarmID::ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE : { result = QObject::tr("DD balance chamber state1 fill initiated and pressure drop is not in range." ); break; } /* 94*/ /*0095*/case GuiAlarmID::ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE : { result = QObject::tr("DD balance chamber state2 fill initiated and pressure drop is not in range." ); break; } /* 95*/ -/*0096*/case GuiAlarmID::ALARM_ID_AVAILABLE_96 : { result = QObject::tr("Available alarms." ); break; } /* 96*/ -/*0097*/case GuiAlarmID::ALARM_ID_AVAILABLE_97 : { result = QObject::tr("Available alarms." ); break; } /* 97*/ +/*0096*/case GuiAlarmID::ALARM_ID_TD_TREATMENT_STOPPED_BY_USER : { result = QObject::tr("TD treatment paused by user." ); break; } /* 96*/ +/*0097*/case GuiAlarmID::ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT : { result = QObject::tr("DD D74 bicarb conductivity sensor freshness/error timeout fault." ); break; } /* 97*/ /*0098*/case GuiAlarmID::ALARM_ID_AVAILABLE_98 : { result = QObject::tr("Available alarms." ); break; } /* 98*/ /*0099*/case GuiAlarmID::ALARM_ID_AVAILABLE_99 : { result = QObject::tr("Available alarms." ); break; } /* 99*/ /*0100*/case GuiAlarmID::ALARM_ID_TD_COMM_TIMEOUT : { result = QObject::tr("TD communication timeout." ); break; } /* 100*/ Index: sources/model/hd/data/treatment/MTreatmentStatesData.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287 --- sources/model/hd/data/treatment/MTreatmentStatesData.h (.../MTreatmentStatesData.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/data/treatment/MTreatmentStatesData.h (.../MTreatmentStatesData.h) (revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287) @@ -57,7 +57,7 @@ * \sa Rinseback_States * \sa Treatment_Recirc_States * \sa Blood_Prime_States - * \sa Treatment_Stop_States + * \sa Treatment_Paused_States * \sa Treatment_End_States * *

Logging info

@@ -102,7 +102,7 @@ quint32 mRinsebackState = 0; ///< Rinseback State - Rinseback_States quint32 mRecirculateState = 0; ///< Recirculate State - Treatment_Recirc_States quint32 mBloodPrimeState = 0; ///< BloodPrime State - Blood_Prime_States - quint32 mTreatmentEndState = 0; ///< TreatmentEnd State - Treatment_Stop_States + quint32 mTreatmentEndState = 0; ///< TreatmentEnd State - Treatment_Paused_States quint32 mTreatmentStopState = 0; ///< TreatmentStop State - Treatment_End_States quint32 mDialysisState = 0; ///< Dialysis State - Dialysis_State }; Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287 --- sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287) @@ -61,12 +61,6 @@ salineState ( vData.mSalineState ); // Ultrafiltration states - ENUM_CHECK_O( GuiUFStates, vData.mUFState ) { - ENUM_CHECK ( GuiUFStates, UF_PAUSED_STATE ) - ENUM_CHECK ( GuiUFStates, UF_RUNNING_STATE ) - ENUM_CHECK_C( GuiUFStates, NUM_OF_UF_STATES ) } - ENUM_READ ( GuiUFStates, UF_PAUSED_STATE , ufPaused ); - ENUM_READ ( GuiUFStates, UF_RUNNING_STATE, ufRunning ); // Saline Bolus states ENUM_CHECK_O( GuiSalineStates, vData.mSalineState ) { @@ -101,29 +95,30 @@ emit heparinChanged(_heparin); // Treatment states - ENUM_CHECK_O( GuiTreatmentStates, vData.mSubMode ) { - ENUM_CHECK ( GuiTreatmentStates, TREATMENT_START_STATE ) - ENUM_CHECK ( GuiTreatmentStates, TREATMENT_BLOOD_PRIME_STATE ) - ENUM_CHECK ( GuiTreatmentStates, TREATMENT_DIALYSIS_STATE ) - ENUM_CHECK ( GuiTreatmentStates, TREATMENT_STOP_STATE ) - ENUM_CHECK ( GuiTreatmentStates, TREATMENT_RINSEBACK_STATE ) - ENUM_CHECK ( GuiTreatmentStates, TREATMENT_RECIRC_STATE ) - ENUM_CHECK ( GuiTreatmentStates, TREATMENT_END_STATE ) - ENUM_CHECK_C( GuiTreatmentStates, NUM_OF_TREATMENT_STATES ) } + ENUM_CHECK_O( GuiTreatmentStates, vData.mSubMode ) { + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_START_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_BLOOD_PRIME_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_DIALYSIS_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_PAUSED_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_RINSEBACK_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_RECIRC_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_END_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_ISO_UF_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_SALINE_BOLUS_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_DIALYSATE_PAUSED_STATE ) + ENUM_CHECK_C( GuiTreatmentStates, NUM_OF_TREATMENT_STATES ) } // Treatment states - Basics ENUM_READ ( GuiTreatmentStates, TREATMENT_START_STATE , txStart ); // Treatment states - Dialysis bool mDialysis = vData.mSubMode == GuiTreatmentStates ::TREATMENT_DIALYSIS_STATE ; if ( mDialysis ) { ENUM_CHECK_O( GuiDialysisState, vData.mDialysisState ) { - ENUM_CHECK ( GuiDialysisState, DIALYSIS_START_STATE ) ENUM_CHECK ( GuiDialysisState, DIALYSIS_UF_STATE ) - ENUM_CHECK ( GuiDialysisState, DIALYSIS_SALINE_BOLUS_STATE ) + ENUM_CHECK ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE ) ENUM_CHECK_C( GuiDialysisState, NUM_OF_DIALYSIS_STATES ) } - ENUM_READ ( GuiDialysisState, DIALYSIS_START_STATE , dyStart ); ENUM_READ ( GuiDialysisState, DIALYSIS_UF_STATE , dyUltrafiltration ); - ENUM_READ ( GuiDialysisState, DIALYSIS_SALINE_BOLUS_STATE , dySalineBolus ); + ENUM_READ ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE , dySalineBolus ); } txDialysis ( mDialysis ); // it's the main dialysis event so moved last to have all the sub-dialysis-states updated prior to. @@ -142,7 +137,7 @@ // Treatment states - Rinse back // Rinseback states - bool mRinseback = vData.mSubMode == GuiTreatmentStates ::TREATMENT_RINSEBACK_STATE ; + bool mRinseback = vData.mSubMode == GuiTreatmentStates ::TREATMENT_RINSEBACK_STATE ; if ( mRinseback ) { ENUM_CHECK_O( GuiRinsebackStates, vData.mRinsebackState ) { ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_STOP_INIT_STATE ) @@ -162,7 +157,7 @@ txRinseback ( mRinseback ); // it's the main rinseback event so moved last to have all the sub-rinseback-states updated prior to. // Recirculate states - bool mRecirculate = vData.mSubMode == GuiTreatmentStates ::TREATMENT_RECIRC_STATE ; + bool mRecirculate = vData.mSubMode == GuiTreatmentStates ::TREATMENT_RECIRC_STATE ; if ( mRecirculate ) { ENUM_CHECK_O( GuiRecirculateStates, vData.mRecirculateState ) { ENUM_CHECK ( GuiRecirculateStates, TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE ) @@ -178,7 +173,7 @@ txRecirculate ( mRecirculate ); // it's the main recirculate even so moved last to have all the sub-recirculate-states updated prior to. // Blood Prime states - bool mBloodPrime = vData.mSubMode == GuiTreatmentStates ::TREATMENT_BLOOD_PRIME_STATE ; + bool mBloodPrime = vData.mSubMode == GuiTreatmentStates ::TREATMENT_BLOOD_PRIME_STATE ; if ( mBloodPrime ) { ENUM_CHECK_O( GuiBloodPrimeStates, vData.mBloodPrimeState ) { ENUM_CHECK ( GuiBloodPrimeStates, BLOOD_PRIME_RAMP_STATE ) @@ -188,7 +183,7 @@ txBloodPrime ( mBloodPrime ); // Treatment End states - bool mTreatmentEnd = vData.mSubMode == GuiTreatmentStates ::TREATMENT_END_STATE ; + bool mTreatmentEnd = vData.mSubMode == GuiTreatmentStates ::TREATMENT_END_STATE ; if ( mTreatmentEnd ) { ENUM_CHECK_O( GuiTreatmentEndStates, vData.mTreatmentEndState ) { ENUM_CHECK ( GuiTreatmentEndStates, TREATMENT_END_WAIT_FOR_RINSEBACK_STATE ) @@ -200,20 +195,20 @@ txEnd ( mTreatmentEnd ); // Treatment Stop states - bool mTreatmentStop = vData.mSubMode == GuiTreatmentStates ::TREATMENT_STOP_STATE ; + bool mTreatmentStop = vData.mSubMode == GuiTreatmentStates ::TREATMENT_PAUSED_STATE ; if ( mTreatmentStop ) { - ENUM_CHECK_O( GuiTreatmentStopStates , vData.mTreatmentStopState ) { - ENUM_CHECK ( GuiTreatmentStopStates , TREATMENT_STOP_RECIRC_STATE ) - ENUM_CHECK ( GuiTreatmentStopStates , TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE ) - ENUM_CHECK ( GuiTreatmentStopStates , TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE ) - ENUM_CHECK ( GuiTreatmentStopStates , TREATMENT_STOP_NO_RECIRC_STATE ) - ENUM_CHECK ( GuiTreatmentStopStates , TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE ) - ENUM_CHECK_C( GuiTreatmentStopStates , NUM_OF_TREATMENT_STOP_STATES ) } - ENUM_READ ( GuiTreatmentStopStates , TREATMENT_STOP_RECIRC_STATE , tsRecirculate ) - ENUM_READ ( GuiTreatmentStopStates , TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE, tsRecirculateDialysate ) - ENUM_READ ( GuiTreatmentStopStates , TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE , tsRecirculateBlood ) - ENUM_READ ( GuiTreatmentStopStates , TREATMENT_STOP_NO_RECIRC_STATE , tsRecirculateNo ) - ENUM_READ ( GuiTreatmentStopStates , TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE , tsRecoverBloodDetect ) + ENUM_CHECK_O( GuiTreatmentPausedStates, vData.mTreatmentStopState ) { + ENUM_CHECK ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_STATE ) + ENUM_CHECK ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_DIALYSATE_ONLY_STATE ) + ENUM_CHECK ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_BLOOD_ONLY_STATE ) + ENUM_CHECK ( GuiTreatmentPausedStates, TREATMENT_PAUSED_NO_RECIRC_STATE ) + ENUM_CHECK ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECOVER_BLOOD_DETECT_STATE ) + ENUM_CHECK_C( GuiTreatmentPausedStates, NUM_OF_TREATMENT_PAUSED_STATES ) } + ENUM_READ ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_STATE , tsRecirculate ) + ENUM_READ ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_DIALYSATE_ONLY_STATE, tsRecirculateDialysate ) + ENUM_READ ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_BLOOD_ONLY_STATE , tsRecirculateBlood ) + ENUM_READ ( GuiTreatmentPausedStates, TREATMENT_PAUSED_NO_RECIRC_STATE , tsRecirculateNo ) + ENUM_READ ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECOVER_BLOOD_DETECT_STATE , tsRecoverBloodDetect ) } txStop ( mTreatmentStop ); @@ -225,13 +220,7 @@ * \details message handler for the message AdjustUltrafiltrationStateResponse data * \param vData - AdjustUltrafiltrationStateResponse data */ -void VHDTreatmentStates::onActionReceive(const AdjustUltrafiltrationStateResponseData &vData) +void VHDTreatmentStates::onActionReceive(const AdjustUltrafiltrationStateResponseData &) { // Ultrafiltration states - ENUM_CHECK_O( GuiUFStates, vData.mUFState ) { - ENUM_CHECK ( GuiUFStates, UF_PAUSED_STATE ) - ENUM_CHECK ( GuiUFStates, UF_RUNNING_STATE ) - ENUM_CHECK_C( GuiUFStates, NUM_OF_UF_STATES ) } - ENUM_READ ( GuiUFStates, UF_PAUSED_STATE , ufPaused ); - ENUM_READ ( GuiUFStates, UF_RUNNING_STATE, ufRunning ); } Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287 --- sources/view/hd/data/treatment/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/view/hd/data/treatment/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287) @@ -60,8 +60,8 @@ PROPERTY( bool , txStart , false) ///< TREATMENT_START_STATE = 0 # Start treatment - initialize treatment and go to blood prime state PROPERTY( bool , txBloodPrime , false) ///< TREATMENT_BLOOD_PRIME_STATE = 1 # Prime blood-side of dialyzer with gradual ramp for 1 min. while dialyzer is bypassed. No dialysis or UF taking place. No treatment time. PROPERTY( bool , txDialysis , false) ///< TREATMENT_DIALYSIS_STATE = 2 # Perform dialysis. Deliver Heparin as prescribed. Deliver UF as prescribed. Handle saline boluses as requested - PROPERTY( bool , txStop , false) ///< TREATMENT_STOP_STATE = 3 # Treatment stopped. All pumps off. Dializer bypassed - PROPERTY( bool , txTreatment , false) ///< TREATMENT_STOP_STATE = 3 || TREATMENT_DIALYSIS_STATE = 2 + PROPERTY( bool , txStop , false) ///< TREATMENT_PAUSED_STATE = 3 # Treatment stopped. All pumps off. Dializer bypassed + PROPERTY( bool , txTreatment , false) ///< TREATMENT_PAUSED_STATE = 3 || TREATMENT_DIALYSIS_STATE = 2 PROPERTY( bool , txRinseback , false) ///< TREATMENT_RINSEBACK_STATE = 4 # Perform rinseback with saline. Dialyzer bypassed. Dialysate recirculating PROPERTY( bool , txRecirculate , false) ///< TREATMENT_RECIRC_STATE = 5 # Recirculate saline and dialysate while patient disconnected. Blood lines open and shunted. Dialyzer is bypassed PROPERTY( bool , txEnd , false) ///< TREATMENT_END_STATE = 6 # Dialysis has ended. Blood pump slowed. Dialyzer is bypassed. Dialysate is recirculated. User can rinseback