Index: AlarmMapping.csv =================================================================== diff -u -rec7f919fdb70ff29a8de627937e4ad7008e59c1c -r13a271ff9262b297f76fa2f97110ff5e0f3f1e1b --- AlarmMapping.csv (.../AlarmMapping.csv) (revision ec7f919fdb70ff29a8de627937e4ad7008e59c1c) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision 13a271ff9262b297f76fa2f97110ff5e0f3f1e1b) @@ -5,11 +5,11 @@ 4,"HD Watchdog POST failure." 5,"DG Watchdog POST failure." 6,"UI communication POST failure.\nUI failed to communicate within a reasonable time after power up." - 7,"Alarm ID available for use." + 7,"HD RTC battery low." 8,"HD accelerometer failed POST." 9,"DG accelerometer failed POST." 10,"Alarm ID available for use." - 11,"DG heaters failed POST." + 11,"Alarm ID available for use." 12,"HD firmware image integrity POST test failed." 13,"DG firmware image integrity POST test failed." 14,"HD blood flow invalid calibration." @@ -104,13 +104,13 @@ 103,"HD non-volatile calibration group invalid record CRC." 104,"Air trap level sensors reporting illegal combination of air/fluid." 105,"DG non-volatile system group invalid record CRC." - 106,"DG inlet water conductivity is greater than threshold." + 106,"Unused." 107,"HD reports DG restarted fault." 108,"HD syringe pump ADC error." 109,"HD syringe pump volume check error." 110,"HD syringe pump speed check error." 111,"HD syringe pump not stopped in off state error." - 112,"HD blood leak detector fault." + 112,"HD blood leak zero command timeout." 113,"Unused." 114,"HD venous air bubble detector self-test failure." 115,"DG temperature sensor out of range." @@ -154,7 +154,7 @@ 153,"HD prime completed high priority alarm." 154,"EEPROM operations (read, write, erase) failure." 155,"Alarm ID available for use." - 156,"HW usage data (treatment time in HD and total consumed water in DG) failure." + 156,"Alarm ID available for use." 157,"DG chemical disinfect prime acid line timeout." 158,"Inlet water temperature is in the low range." 159,"Dialysate inlet pump failed flow vs motor speed check." @@ -191,13 +191,13 @@ 190,"DG drain pump off fault." 191,"DG flow rate out of upper range." 192,"DG flow rate out of lower range." - 193,"RO pump flow rate out of range." + 193,"." 194,"DG RO pump duty cycle out of range." 195,"DG RO pump pressure out of range." 196,"DG temperature sensor error flag fault." 197,"DG temperature sensors ADC fault." 198,"Alarm ID available for use." - 199,"DG heaters fault." + 199,"." 200,"DG thermistors/sensors temperature out of range." 201,"HD pre-treatment mode wet self-test lc vs FMD failure." 202,"HD pre-treatment mode dry pressure normal self-test failure." Index: denali.pro.user =================================================================== diff -u -rec7f919fdb70ff29a8de627937e4ad7008e59c1c -r13a271ff9262b297f76fa2f97110ff5e0f3f1e1b --- denali.pro.user (.../denali.pro.user) (revision ec7f919fdb70ff29a8de627937e4ad7008e59c1c) +++ denali.pro.user (.../denali.pro.user) (revision 13a271ff9262b297f76fa2f97110ff5e0f3f1e1b) @@ -1,6 +1,6 @@ - + EnvironmentId Index: scripts/setup.sh =================================================================== diff -u -rec7f919fdb70ff29a8de627937e4ad7008e59c1c -r13a271ff9262b297f76fa2f97110ff5e0f3f1e1b --- scripts/setup.sh (.../setup.sh) (revision ec7f919fdb70ff29a8de627937e4ad7008e59c1c) +++ scripts/setup.sh (.../setup.sh) (revision 13a271ff9262b297f76fa2f97110ff5e0f3f1e1b) @@ -47,6 +47,8 @@ mv autostart /etc/init.d/ update-rc.d autostart defaults +chmod a+x $HOME/denali + echo "Syncing file system updates" sync Index: scripts/start.sh =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r13a271ff9262b297f76fa2f97110ff5e0f3f1e1b --- scripts/start.sh (.../start.sh) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ scripts/start.sh (.../start.sh) (revision 13a271ff9262b297f76fa2f97110ff5e0f3f1e1b) @@ -82,7 +82,7 @@ function copyFolderTo() { echo $1 - scp -r $SSH_QUIET $1/* $DST_USER@$DST_IP:$2 + scp -r $SSH_QUIET $1/. $DST_USER@$DST_IP:$2 if [ ! $? -eq 0 ];then echo "copy of folder $1 unsuccessful" Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -rec7f919fdb70ff29a8de627937e4ad7008e59c1c -r13a271ff9262b297f76fa2f97110ff5e0f3f1e1b --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision ec7f919fdb70ff29a8de627937e4ad7008e59c1c) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 13a271ff9262b297f76fa2f97110ff5e0f3f1e1b) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 08-Jun-2022 + * \date (last) 22-Jun-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -40,11 +40,11 @@ /*0004*/case GuiAlarmID::ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED : { result = QObject::tr("HD Watchdog POST failure." ); break; } /* 4*/ /*0005*/case GuiAlarmID::ALARM_ID_DG_WATCHDOG_POST_TEST_FAILED : { result = QObject::tr("DG Watchdog POST failure." ); break; } /* 5*/ /*0006*/case GuiAlarmID::ALARM_ID_UI_COMM_POST_FAILED : { result = QObject::tr("UI communication POST failure.\nUI failed to communicate within a reasonable time after power up." ); break; } /* 6*/ -/*0007*/case GuiAlarmID::ALARM_ID__AVAILABLE_1 : { result = QObject::tr("Alarm ID available for use." ); break; } /* 7*/ +/*0007*/case GuiAlarmID::ALARM_ID_HD_RTC_BATTERY_LOW : { result = QObject::tr("HD RTC battery low." ); break; } /* 7*/ /*0008*/case GuiAlarmID::ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE : { result = QObject::tr("HD accelerometer failed POST." ); break; } /* 8*/ /*0009*/case GuiAlarmID::ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE : { result = QObject::tr("DG accelerometer failed POST." ); break; } /* 9*/ /*0010*/case GuiAlarmID::ALARM_ID__AVAILABLE_2 : { result = QObject::tr("Alarm ID available for use." ); break; } /* 10*/ -/*0011*/case GuiAlarmID::ALARM_ID_DG_HEATERS_SELF_TEST_FAILURE : { result = QObject::tr("DG heaters failed POST." ); break; } /* 11*/ +/*0011*/case GuiAlarmID::ALARM_ID__AVAILABLE_11 : { result = QObject::tr("Alarm ID available for use." ); break; } /* 11*/ /*0012*/case GuiAlarmID::ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED : { result = QObject::tr("HD firmware image integrity POST test failed." ); break; } /* 12*/ /*0013*/case GuiAlarmID::ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED : { result = QObject::tr("DG firmware image integrity POST test failed." ); break; } /* 13*/ /*0014*/case GuiAlarmID::ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION : { result = QObject::tr("HD blood flow invalid calibration." ); break; } /* 14*/ @@ -139,13 +139,13 @@ /*0103*/case GuiAlarmID::ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("HD non-volatile calibration group invalid record CRC." ); break; } /* 103*/ /*0104*/case GuiAlarmID::ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS : { result = QObject::tr("Air trap level sensors reporting illegal combination of air/fluid." ); break; } /* 104*/ /*0105*/case GuiAlarmID::ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("DG non-volatile system group invalid record CRC." ); break; } /* 105*/ -/*0106*/case GuiAlarmID::ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY : { result = QObject::tr("DG inlet water conductivity is greater than threshold." ); break; } /* 106*/ +/*0106*/case GuiAlarmID::ALARM_ID__AVAILABLE_12 : { result = QObject::tr("Unused." ); break; } /* 106*/ /*0107*/case GuiAlarmID::ALARM_ID_DG_RESTARTED_FAULT : { result = QObject::tr("HD reports DG restarted fault." ); break; } /* 107*/ /*0108*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR : { result = QObject::tr("HD syringe pump ADC error." ); break; } /* 108*/ /*0109*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR : { result = QObject::tr("HD syringe pump volume check error." ); break; } /* 109*/ /*0110*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR : { result = QObject::tr("HD syringe pump speed check error." ); break; } /* 110*/ /*0111*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR : { result = QObject::tr("HD syringe pump not stopped in off state error." ); break; } /* 111*/ -/*0112*/case GuiAlarmID::ALARM_ID_HD_BLOOD_LEAK_FAULT : { result = QObject::tr("HD blood leak detector fault." ); break; } /* 112*/ +/*0112*/case GuiAlarmID::ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_TIMEOUT : { result = QObject::tr("HD blood leak zero command timeout." ); break; } /* 112*/ /*0113*/case GuiAlarmID::ALARM_ID__AVAILABLE_4 : { result = QObject::tr("Unused." ); break; } /* 113*/ /*0114*/case GuiAlarmID::ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE : { result = QObject::tr("HD venous air bubble detector self-test failure." ); break; } /* 114*/ /*0115*/case GuiAlarmID::ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE : { result = QObject::tr("DG temperature sensor out of range." ); break; } /* 115*/ @@ -189,7 +189,7 @@ /*0153*/case GuiAlarmID::ALARM_ID_PRIME_COMPLETED_HIGH : { result = QObject::tr("HD prime completed high priority alarm." ); break; } /* 153*/ /*0154*/case GuiAlarmID::ALARM_ID_NVDATA_EEPROM_OPS_FAILURE : { result = QObject::tr("EEPROM operations (read, write, erase) failure." ); break; } /* 154*/ /*0155*/case GuiAlarmID::ALARM_ID__AVAILABLE_6 : { result = QObject::tr("Alarm ID available for use." ); break; } /* 155*/ -/*0156*/case GuiAlarmID::ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR : { result = QObject::tr("HW usage data (treatment time in HD and total consumed water in DG) failure." ); break; } /* 156*/ +/*0156*/case GuiAlarmID::ALARM_ID__AVAILABLE_20 : { result = QObject::tr("Alarm ID available for use." ); break; } /* 156*/ /*0157*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_PRIME_ACID_LINE_TIME_OUT : { result = QObject::tr("DG chemical disinfect prime acid line timeout." ); break; } /* 157*/ /*0158*/case GuiAlarmID::ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE : { result = QObject::tr("Inlet water temperature is in the low range." ); break; } /* 158*/ /*0159*/case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK : { result = QObject::tr("Dialysate inlet pump failed flow vs motor speed check." ); break; } /* 159*/ @@ -226,13 +226,13 @@ /*0190*/case GuiAlarmID::ALARM_ID_DRAIN_PUMP_OFF_FAULT : { result = QObject::tr("DG drain pump off fault." ); break; } /* 190*/ /*0191*/case GuiAlarmID::ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE : { result = QObject::tr("DG flow rate out of upper range." ); break; } /* 191*/ /*0192*/case GuiAlarmID::ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE : { result = QObject::tr("DG flow rate out of lower range." ); break; } /* 192*/ -/*0193*/case GuiAlarmID::ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE : { result = QObject::tr("RO pump flow rate out of range." ); break; } /* 193*/ +/*0193*/case GuiAlarmID::ALARM_ID__AVAILABLE_13 : { result = QObject::tr("." ); break; } /* 193*/ /*0194*/case GuiAlarmID::ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE : { result = QObject::tr("DG RO pump duty cycle out of range." ); break; } /* 194*/ /*0195*/case GuiAlarmID::ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("DG RO pump pressure out of range." ); break; } /* 195*/ /*0196*/case GuiAlarmID::ALARM_ID_DG_TEMPERATURE_SENSOR_FAULT : { result = QObject::tr("DG temperature sensor error flag fault." ); break; } /* 196*/ /*0197*/case GuiAlarmID::ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT : { result = QObject::tr("DG temperature sensors ADC fault." ); break; } /* 197*/ /*0198*/case GuiAlarmID::ALARM_ID__AVAILABLE_10 : { result = QObject::tr("Alarm ID available for use." ); break; } /* 198*/ -/*0199*/case GuiAlarmID::ALARM_ID_DG_HEATERS_FAULT : { result = QObject::tr("DG heaters fault." ); break; } /* 199*/ +/*0199*/case GuiAlarmID::ALARM_ID__AVAILABLE_14 : { result = QObject::tr("." ); break; } /* 199*/ /*0200*/case GuiAlarmID::ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE : { result = QObject::tr("DG thermistors/sensors temperature out of range." ); break; } /* 200*/ /*0201*/case GuiAlarmID::ALARM_ID_PRE_TREATMENT_WET_FLOW_TEST_FAILURE : { result = QObject::tr("HD pre-treatment mode wet self-test lc vs FMD failure." ); break; } /* 201*/ /*0202*/case GuiAlarmID::ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_NORMAL_TEST_FAILURE : { result = QObject::tr("HD pre-treatment mode dry pressure normal self-test failure." ); break; } /* 202*/