Index: etc/reports/alarms/AlarmMapping.csv =================================================================== diff -u -ra924fbf2e81c3c61a3e817256bca51f98d2f099c -ra796bf6ecbf985b00412db76fa81ad4f7a8b2dd2 --- etc/reports/alarms/AlarmMapping.csv (.../AlarmMapping.csv) (revision a924fbf2e81c3c61a3e817256bca51f98d2f099c) +++ etc/reports/alarms/AlarmMapping.csv (.../AlarmMapping.csv) (revision a796bf6ecbf985b00412db76fa81ad4f7a8b2dd2) @@ -189,4 +189,114 @@ 188,"TD ejector failed to extend or retract during auto-eject operation." 189,"TD ejector POST homing failure." 190,"TD high blood pump torque during auto-load\eject operation." - 191,"Number of alarms." + 191,"TD air pump stall detected." + 192,"TD CPU RAM error." + 193,"DD CPU RAM error." + 194,"TD integrity post test fault." + 195,"TD integrity post test fault." + 196,"TD saline bag volume low alarm." + 197,"DD D92 pump rpm out of range." + 198,"TD prime completed medium priority alarm." + 199,"TD repeated air trap lower events." + 200,"TD tubeset mismatch alarm." + 201,"FW reserved for use." + 202,"FW reserved for use." + 203,"FW reserved for use." + 204,"FW reserved for use." + 205,"TD UI POST failed." + 206,"TD and UI software builds are not compatible." + 207,"TD POST Safety Shutdown failure." + 208,"TD initial rev blood circuit prime limit reached." + 209,"TD initial blood circuit prime timeout." + 210,"TD prime complete." + 211,"FW reserved for use." + 212,"FW reserved for use." + 213,"TD blood pressure systolic low." + 214,"TD blood pressure systolic high." + 215,"TD blood pressure systolic high." + 216,"TD blood pressure heart rate low." + 217,"TD blood pressure heart rate high." + 218,"TD blood pressure module error." + 219,"FW reserved for use." + 220,"DD invalid NVM System record." + 221,"DD invalid NVM Service record." + 222,"DD invalid NVM calibration record." + 223,"DD invalid NVM institutional record." + 224,"DD invalid NVM Usage Info record." + 225,"DD invalid serial number." + 226,"DD invalid pressure sensor calibration record." + 227,"DD invalid temperature sensor calibration record." + 228,"DD invalid concentrate pump calibration record." + 229,"DD invalid d12 dialysate pump calibration record." + 230,"DD invalid d48 dialysate pump calibration record." + 231,"DD invalid acid concentrate calibration record." + 232,"DD invalid bicarbonate concentrate calibration record." + 233,"DD invalid accelerometer sensor calibration record." + 234,"DD invalid blood leak sensor calibration record." + 235,"TD recirculate timeout warning." + 236,"TD recirculate timeout." + 237,"FW reserved for use." + 238,"FW reserved for use." + 239,"FW reserved for use." + 240,"FW reserved for use." + 241,"FW reserved for use." + 242,"FW reserved for use." + 243,"FW reserved for use." + 244,"FW reserved for use." + 245,"FW reserved for use." + 246,"FW reserved for use." + 247,"FW reserved for use." + 248,"FW reserved for use." + 249,"FW reserved for use." + 250,"FW reserved for use." + 251,"FW reserved for use." + 252,"FW reserved for use." + 253,"FW reserved for use." + 254,"FW reserved for use." + 255,"FW reserved for use." + 256,"FW reserved for use." + 257,"FW reserved for use." + 258,"FW reserved for use." + 259,"FW reserved for use." + 260,"FW reserved for use." + 261,"FW reserved for use." + 262,"FW reserved for use." + 263,"FW reserved for use." + 264,"FW reserved for use." + 265,"FW reserved for use." + 266,"FW reserved for use." + 267,"FW reserved for use." + 268,"FW reserved for use." + 269,"FW reserved for use." + 270,"FW reserved for use." + 271,"FW reserved for use." + 272,"FW reserved for use." + 273,"FW reserved for use." + 274,"FW reserved for use." + 275,"FW reserved for use." + 276,"FW reserved for use." + 277,"FW reserved for use." + 278,"FW reserved for use." + 279,"FW reserved for use." + 280,"FW reserved for use." + 281,"FW reserved for use." + 282,"FW reserved for use." + 283,"FW reserved for use." + 284,"FW reserved for use." + 285,"FW reserved for use." + 286,"FW reserved for use." + 287,"FW reserved for use." + 288,"FW reserved for use." + 289,"FW reserved for use." + 290,"FW reserved for use." + 291,"FW reserved for use." + 292,"FW reserved for use." + 293,"FW reserved for use." + 294,"FW reserved for use." + 295,"FW reserved for use." + 296,"FW reserved for use." + 297,"FW reserved for use." + 298,"FW reserved for use." + 299,"FW reserved for use." + 300,"FW reserved for use." + 301,"Number of alarms." Index: etc/reports/alarms/AlarmMapping.py =================================================================== diff -u -ra924fbf2e81c3c61a3e817256bca51f98d2f099c -ra796bf6ecbf985b00412db76fa81ad4f7a8b2dd2 --- etc/reports/alarms/AlarmMapping.py (.../AlarmMapping.py) (revision a924fbf2e81c3c61a3e817256bca51f98d2f099c) +++ etc/reports/alarms/AlarmMapping.py (.../AlarmMapping.py) (revision a796bf6ecbf985b00412db76fa81ad4f7a8b2dd2) @@ -190,7 +190,117 @@ 188 : "TD ejector failed to extend or retract during auto-eject operation." 189 : "TD ejector POST homing failure." 190 : "TD high blood pump torque during auto-load\eject operation." - 191 : "Number of alarms." + 191 : "TD air pump stall detected." + 192 : "TD CPU RAM error." + 193 : "DD CPU RAM error." + 194 : "TD integrity post test fault." + 195 : "TD integrity post test fault." + 196 : "TD saline bag volume low alarm." + 197 : "DD D92 pump rpm out of range." + 198 : "TD prime completed medium priority alarm." + 199 : "TD repeated air trap lower events." + 200 : "TD tubeset mismatch alarm." + 201 : "FW reserved for use." + 202 : "FW reserved for use." + 203 : "FW reserved for use." + 204 : "FW reserved for use." + 205 : "TD UI POST failed." + 206 : "TD and UI software builds are not compatible." + 207 : "TD POST Safety Shutdown failure." + 208 : "TD initial rev blood circuit prime limit reached." + 209 : "TD initial blood circuit prime timeout." + 210 : "TD prime complete." + 211 : "FW reserved for use." + 212 : "FW reserved for use." + 213 : "TD blood pressure systolic low." + 214 : "TD blood pressure systolic high." + 215 : "TD blood pressure systolic high." + 216 : "TD blood pressure heart rate low." + 217 : "TD blood pressure heart rate high." + 218 : "TD blood pressure module error." + 219 : "FW reserved for use." + 220 : "DD invalid NVM System record." + 221 : "DD invalid NVM Service record." + 222 : "DD invalid NVM calibration record." + 223 : "DD invalid NVM institutional record." + 224 : "DD invalid NVM Usage Info record." + 225 : "DD invalid serial number." + 226 : "DD invalid pressure sensor calibration record." + 227 : "DD invalid temperature sensor calibration record." + 228 : "DD invalid concentrate pump calibration record." + 229 : "DD invalid d12 dialysate pump calibration record." + 230 : "DD invalid d48 dialysate pump calibration record." + 231 : "DD invalid acid concentrate calibration record." + 232 : "DD invalid bicarbonate concentrate calibration record." + 233 : "DD invalid accelerometer sensor calibration record." + 234 : "DD invalid blood leak sensor calibration record." + 235 : "TD recirculate timeout warning." + 236 : "TD recirculate timeout." + 237 : "FW reserved for use." + 238 : "FW reserved for use." + 239 : "FW reserved for use." + 240 : "FW reserved for use." + 241 : "FW reserved for use." + 242 : "FW reserved for use." + 243 : "FW reserved for use." + 244 : "FW reserved for use." + 245 : "FW reserved for use." + 246 : "FW reserved for use." + 247 : "FW reserved for use." + 248 : "FW reserved for use." + 249 : "FW reserved for use." + 250 : "FW reserved for use." + 251 : "FW reserved for use." + 252 : "FW reserved for use." + 253 : "FW reserved for use." + 254 : "FW reserved for use." + 255 : "FW reserved for use." + 256 : "FW reserved for use." + 257 : "FW reserved for use." + 258 : "FW reserved for use." + 259 : "FW reserved for use." + 260 : "FW reserved for use." + 261 : "FW reserved for use." + 262 : "FW reserved for use." + 263 : "FW reserved for use." + 264 : "FW reserved for use." + 265 : "FW reserved for use." + 266 : "FW reserved for use." + 267 : "FW reserved for use." + 268 : "FW reserved for use." + 269 : "FW reserved for use." + 270 : "FW reserved for use." + 271 : "FW reserved for use." + 272 : "FW reserved for use." + 273 : "FW reserved for use." + 274 : "FW reserved for use." + 275 : "FW reserved for use." + 276 : "FW reserved for use." + 277 : "FW reserved for use." + 278 : "FW reserved for use." + 279 : "FW reserved for use." + 280 : "FW reserved for use." + 281 : "FW reserved for use." + 282 : "FW reserved for use." + 283 : "FW reserved for use." + 284 : "FW reserved for use." + 285 : "FW reserved for use." + 286 : "FW reserved for use." + 287 : "FW reserved for use." + 288 : "FW reserved for use." + 289 : "FW reserved for use." + 290 : "FW reserved for use." + 291 : "FW reserved for use." + 292 : "FW reserved for use." + 293 : "FW reserved for use." + 294 : "FW reserved for use." + 295 : "FW reserved for use." + 296 : "FW reserved for use." + 297 : "FW reserved for use." + 298 : "FW reserved for use." + 299 : "FW reserved for use." + 300 : "FW reserved for use." + 301 : "Number of alarms." } # dictionary of rejection reason from application source code. @@ -212,11 +322,11 @@ 13 : "REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_MINIMUM" # Treatment time change is less than minimum treatment time. 14 : "REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS" # Ultrafiltration is not currently in progress. 15 : "REQUEST_REJECT_REASON_UF_NOT_PAUSED" # Ultrafiltration is not currently paused. - 16 : "REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS" # A saline bolus is in progress. + 16 : "REQUEST_REJECT_REASON_FLUID_BOLUS_IN_PROGRESS" # A fluid bolus is in progress. 17 : "REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE" # A treatment parameter is out of range. 18 : "REQUEST_REJECT_REASON_FILTER_FLUSH_HAS_BEEN_EXPIRED" # Filter flush time has been expired. 19 : "REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED" # Saline bolus volume maximum has been reached. - 20 : "REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS" # A saline bolus is not in progress. + 20 : "REQUEST_REJECT_REASON_FLUID_BOLUS_NOT_IN_PROGRESS" # A fluid bolus is not in progress. 21 : "REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE" # Requested user action is disabled in current state. 22 : "REQUEST_REJECT_REASON_ALARM_IS_ACTIVE" # Requested user action not allowed while alarm is active. 23 : "REQUEST_REJECT_REASON_INVALID_COMMAND" # Requested user action invalid. @@ -239,7 +349,7 @@ 40 : "REQUEST_REJECT_REASON_TD_SERVICE_IS_DUE" # TD service is due. 41 : "REQUEST_REJECT_REASON_RO_FILTER_TEMPERATURE_OUT_OF_RANGE" # RO filter temperature out of range. 42 : "REQUEST_REJECT_REASON_DD_INCOMPATIBLE" # DD firmware version is not compatible with TD firmware. - 43 : "REQUEST_REJECT_REASON_DIALYZER_REPRIME_IN_PROGRESS" # Saline bolus is not allowed during dialyzer reprime. + 43 : "REQUEST_REJECT_REASON_DIALYZER_REPRIME_IN_PROGRESS" # Fluid bolus is not allowed during dialyzer reprime. 44 : "REQUEST_REJECT_REASON_RO_ONLY_MODE_DD_BUSY" # RO only mode DD is busy. 45 : "REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PARAMETER" # RO only mode invalid parameter. 46 : "REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PAYLOAD_LENGTH" # RO only mode invalid payload length. @@ -253,6 +363,14 @@ 54 : "REQUEST_REJECT_REASON_ACID_CONV_FACTOR_MISMATCH" # Acid conversion factor from UI mismatch with FW. 55 : "REQUEST_REJECT_REASON_INVALID_PATIENT_WEIGHTS" # Patient pre and estimated target weights are invalid. 56 : "REQUEST_REJECT_REASON_UF_VOL_AND_WEIGHTS_INCONSISTENT" # UF volume and the patient weights are not consistent. - 57 : "NUM_OF_REQUEST_REJECT_REASONS" # Number of settings change reject codes. + 57 : "REQUEST_REJECT_REASON_TD_AUTHENTICATION_INVALID" # TD authentication invalid. + 58 : "REQUEST_REJECT_REASON_CONFIRMATION_NOT_EXPECTED" # Confirmation received without prior validation. + 59 : "REQUEST_REJECT_REASON_CONFIRMATION_MISMATCH" # Confirmed value does not match validated value. + 60 : "REQUEST_REJECT_REASON_INVALID_TREATMENT_SUB_STATE" # Request is not allowed in current treatment sub-state. + 61 : "REQUEST_REJECT_REASON_MODALITY_MISMATCH" # Mismatched modality (Rx entered vs reatment initiation modality ). + 62 : "REQUEST_REJECT_REASON_NVM_JOB_QUEUE_BUSY" # NVM Job queue is busy sending other records. + 63 : "REQUEST_REJECT_REASON_NVM_INVALID_CRC" # NVM received CRC of the record is invalid. + 64 : "REQUEST_REJECT_REASON_NVM_INVALID_OPERATION_MODE" # NVM Operation Mode is not Service mode. + 65 : "NUM_OF_REQUEST_REJECT_REASONS" # Number of settings change reject codes. } Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r506b391d1652eb5e1942adf1c173ef9cfb31a3f0 -ra796bf6ecbf985b00412db76fa81ad4f7a8b2dd2 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 506b391d1652eb5e1942adf1c173ef9cfb31a3f0) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision a796bf6ecbf985b00412db76fa81ad4f7a8b2dd2) @@ -15,7 +15,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 // Project // Qml imports Index: sources/gui/qml/main.qml =================================================================== diff -u -r16aaf5ab7e1c58199754a132d624a470295d3440 -ra796bf6ecbf985b00412db76fa81ad4f7a8b2dd2 --- sources/gui/qml/main.qml (.../main.qml) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) +++ sources/gui/qml/main.qml (.../main.qml) (revision a796bf6ecbf985b00412db76fa81ad4f7a8b2dd2) @@ -456,7 +456,7 @@ PowerItem { id: _powerItem ; z: 997 } ConfirmDialog { id: _confirmDialog ; z: 998 } DryDemoDialog { id: _dryDemoDialog ; z: 999 } - DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } + //DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } // Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem // then cannot be anchored. Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r694c0c4eeca83802b1e05c2ef1d38e4eb56bc27e -ra796bf6ecbf985b00412db76fa81ad4f7a8b2dd2 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 694c0c4eeca83802b1e05c2ef1d38e4eb56bc27e) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision a796bf6ecbf985b00412db76fa81ad4f7a8b2dd2) @@ -229,7 +229,7 @@ /*0193*/case GuiAlarmID::ALARM_ID_DD_CPU_RAM_ERROR : { result = QObject::tr("DD CPU RAM error." ); break; } /* 193*/ /*0194*/case GuiAlarmID::ALARM_ID_TD_INTEGRITY_POST_TEST_FAILED : { result = QObject::tr("TD integrity post test fault." ); break; } /* 194*/ /*0195*/case GuiAlarmID::ALARM_ID_DD_INTEGRITY_POST_TEST_FAILED : { result = QObject::tr("TD integrity post test fault." ); break; } /* 195*/ -/*0196*/case GuiAlarmID::ALARM_ID_TD_EMPTY_SALINE_BAG : { result = QObject::tr("TD saline bag volume low alarm." ); break; } /* 196*/ +/*0196*/case GuiAlarmID::ALARM_ID_TD_SALINE_BAG_VOLUME_LOW_ALARM : { result = QObject::tr("TD saline bag volume low alarm." ); break; } /* 196*/ /*0197*/case GuiAlarmID::ALARM_ID_DD_D92_PUMP_RPM_OUT_OF_RANGE : { result = QObject::tr("DD D92 pump rpm out of range." ); break; } /* 197*/ /*0198*/case GuiAlarmID::ALARM_ID_TD_PRIME_COMPLETED_MEDIUM : { result = QObject::tr("TD prime completed medium priority alarm." ); break; } /* 198*/ /*0199*/case GuiAlarmID::ALARM_ID_TD_REPEATED_AIR_TRAP_LOWER_EVENTS : { result = QObject::tr("TD repeated air trap lower events." ); break; } /* 199*/ @@ -241,17 +241,17 @@ /*0205*/case GuiAlarmID::ALARM_ID_TD_UI_POST_TIMEOUT : { result = QObject::tr("TD UI POST failed." ); break; } /* 205*/ /*0206*/case GuiAlarmID::ALARM_ID_TD_UI_COMPATIBILITY_ERROR : { result = QObject::tr("TD and UI software builds are not compatible." ); break; } /* 206*/ /*0207*/case GuiAlarmID::ALARM_ID_TD_SAFETY_SHUTDOWN_POST_TEST_FAILED : { result = QObject::tr("TD POST Safety Shutdown failure." ); break; } /* 207*/ -/*0208*/case GuiAlarmID::ALARM_ID_FW_RESERVED_208 : { result = QObject::tr("FW reserved for use." ); break; } /* 208*/ -/*0209*/case GuiAlarmID::ALARM_ID_FW_RESERVED_209 : { result = QObject::tr("FW reserved for use." ); break; } /* 209*/ -/*0210*/case GuiAlarmID::ALARM_ID_FW_RESERVED_210 : { result = QObject::tr("FW reserved for use." ); break; } /* 210*/ +/*0208*/case GuiAlarmID::ALARM_ID_TD_INITIAL_BC_REV_PRIME_LIMIT_REACHED : { result = QObject::tr("TD initial rev blood circuit prime limit reached." ); break; } /* 208*/ +/*0209*/case GuiAlarmID::ALARM_ID_TD_INITIAL_BC_REV_PRIME_TIMEOUT : { result = QObject::tr("TD initial blood circuit prime timeout." ); break; } /* 209*/ +/*0210*/case GuiAlarmID::ALARM_ID_TD_PRIME_COMPLETE : { result = QObject::tr("TD prime complete." ); break; } /* 210*/ /*0211*/case GuiAlarmID::ALARM_ID_FW_RESERVED_211 : { result = QObject::tr("FW reserved for use." ); break; } /* 211*/ /*0212*/case GuiAlarmID::ALARM_ID_FW_RESERVED_212 : { result = QObject::tr("FW reserved for use." ); break; } /* 212*/ -/*0213*/case GuiAlarmID::ALARM_ID_FW_RESERVED_213 : { result = QObject::tr("FW reserved for use." ); break; } /* 213*/ -/*0214*/case GuiAlarmID::ALARM_ID_FW_RESERVED_214 : { result = QObject::tr("FW reserved for use." ); break; } /* 214*/ -/*0215*/case GuiAlarmID::ALARM_ID_FW_RESERVED_215 : { result = QObject::tr("FW reserved for use." ); break; } /* 215*/ -/*0216*/case GuiAlarmID::ALARM_ID_FW_RESERVED_216 : { result = QObject::tr("FW reserved for use." ); break; } /* 216*/ -/*0217*/case GuiAlarmID::ALARM_ID_FW_RESERVED_217 : { result = QObject::tr("FW reserved for use." ); break; } /* 217*/ -/*0218*/case GuiAlarmID::ALARM_ID_FW_RESERVED_218 : { result = QObject::tr("FW reserved for use." ); break; } /* 218*/ +/*0213*/case GuiAlarmID::ALARM_ID_TD_BP_SYSTOLIC_LOW : { result = QObject::tr("TD blood pressure systolic low." ); break; } /* 213*/ +/*0214*/case GuiAlarmID::ALARM_ID_TD_BP_SYSTOLIC_LOW_TOO_MANY : { result = QObject::tr("TD blood pressure systolic high." ); break; } /* 214*/ +/*0215*/case GuiAlarmID::ALARM_ID_TD_BP_SYSTOLIC_HIGH : { result = QObject::tr("TD blood pressure systolic high." ); break; } /* 215*/ +/*0216*/case GuiAlarmID::ALARM_ID_TD_BP_HEART_RATE_LOW : { result = QObject::tr("TD blood pressure heart rate low." ); break; } /* 216*/ +/*0217*/case GuiAlarmID::ALARM_ID_TD_BP_HEART_RATE_HIGH : { result = QObject::tr("TD blood pressure heart rate high." ); break; } /* 217*/ +/*0218*/case GuiAlarmID::ALARM_ID_TD_BP_MODULE_ERROR : { result = QObject::tr("TD blood pressure module error." ); break; } /* 218*/ /*0219*/case GuiAlarmID::ALARM_ID_FW_RESERVED_219 : { result = QObject::tr("FW reserved for use." ); break; } /* 219*/ /*0220*/case GuiAlarmID::ALARM_ID_DD_NVM_INVALID_SYSTEM_RECORD_CRC : { result = QObject::tr("DD invalid NVM System record." ); break; } /* 220*/ /*0221*/case GuiAlarmID::ALARM_ID_DD_NVM_INVALID_SERVICE_RECORD_CRC : { result = QObject::tr("DD invalid NVM Service record." ); break; } /* 221*/