Index: AlarmMapping.csv =================================================================== diff -u -r9ae3b0d6624904693329309aaf8ff02784c17184 -r3779eaac00ecfa03d5b0405171ab68a0e0ff5538 --- AlarmMapping.csv (.../AlarmMapping.csv) (revision 9ae3b0d6624904693329309aaf8ff02784c17184) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision 3779eaac00ecfa03d5b0405171ab68a0e0ff5538) @@ -85,17 +85,17 @@ 84,"HD venous pressure sensor not being read." 85,"HD venous pressure sensor temperature out of range error." 86,"HD BP occlusion sensor not being read." - 87,"HD DPi occlusion sensor not being read." - 88,"HD DPo occlusion sensor not being read." + 87,"This alarm ID is available for use." + 88,"This alarm ID is available for use." 89,"HD BP occlusion sensor error." - 90,"HD DPi occlusion sensor error." - 91,"HD DPo occlusion sensor error." - 92,"HD blood flow sensor not being read." - 93,"HD blood flow sensor error." - 94,"HD dialysate flow sensor not being read." - 95,"HD dialysate flow sensor error." - 96,"HD blood flow sensor not being read - slow packet." - 97,"HD dialysate flow sensor not being read - slow packet." + 90,"This alarm ID is available for use." + 91,"HD No dialysate flow data receive in the last 3 seconds." + 92,"This alarm ID is available for use." + 93,"This alarm ID is available for use." + 94,"This alarm ID is available for use." + 95,"This alarm ID is available for use." + 96,"This alarm ID is available for use." + 97,"This alarm ID is available for use." 98,"HD battery communication fault." 99,"HD syringe pump stall alarm." 100,"HD no cartridge self-test timeout." @@ -277,7 +277,7 @@ 276,"HD venous pressure sensor is reading out of range." 277,"HD BP occlusion sensor is reading out of range." 278,"This alarm ID is available for use." - 279,"This alarm ID is available for use." + 279,"DG dialysate drain time out." 280,"HD arterial pressure sensor read timeout error." 281,"Acid concentration bottle low volume alarm." 282,"Bicarbonate concentration bottle low volume alarm." Index: denali.pro.user =================================================================== diff -u -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c -r3779eaac00ecfa03d5b0405171ab68a0e0ff5538 --- denali.pro.user (.../denali.pro.user) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) +++ denali.pro.user (.../denali.pro.user) (revision 3779eaac00ecfa03d5b0405171ab68a0e0ff5538) @@ -1,6 +1,6 @@ - + EnvironmentId Index: scripts/start.sh =================================================================== diff -u -r16805304205c7f4de46cc7fbbba68d3b7a32b3a9 -r3779eaac00ecfa03d5b0405171ab68a0e0ff5538 --- scripts/start.sh (.../start.sh) (revision 16805304205c7f4de46cc7fbbba68d3b7a32b3a9) +++ scripts/start.sh (.../start.sh) (revision 3779eaac00ecfa03d5b0405171ab68a0e0ff5538) @@ -52,7 +52,7 @@ if [ "$1" = "-q" -o "$2" = "-q" ]; then FLG_QUIET=1 - SSH_QUIET="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=ERROR" + SSH_QUIET="-oUserKnownHostsFile=/dev/null -oStrictHostKeyChecking=no -oLogLevel=ERROR -oConnectTimeout=5 -oHostKeyAlgorithms=+ssh-rsa" echo -e "Running in quiet mode." fi @@ -83,7 +83,7 @@ function copyFolderTo() { echo $1 scp -r $SSH_QUIET $1/* $DST_USER@$DST_IP:$2 - + if [ ! $? -eq 0 ];then echo "copy of folder $1 unsuccessful" return 1 @@ -134,14 +134,14 @@ else if [ ! $FLG_QUIET -eq 1 ]; then read -p "Please enter the device Ip address: " -e -i "$DST_IP" -r DST_IP - fi + fi fi if [ ! -z "$DST_IP" ]; then echo "removing device Ip Address from known hosts" removeIPFromHost echo "Testing connection on IP $DST_IP" - - ping "$DST_IP" -c1 -W1 + + runssh "exit 0" if [ $? -eq 0 ]; then break else Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r2b50aa01bb3081f5663eaf5be73085fc53ef73ca -r3779eaac00ecfa03d5b0405171ab68a0e0ff5538 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 2b50aa01bb3081f5663eaf5be73085fc53ef73ca) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 3779eaac00ecfa03d5b0405171ab68a0e0ff5538) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 01-Nov-2021 + * \date (last) 04-Nov-2021 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -120,17 +120,17 @@ /*0084*/case GuiAlarmID::ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR : { result = QObject::tr("HD venous pressure sensor not being read." ); break; } /* 84*/ /*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____AVAILABLE_10 : { result = QObject::tr("HD DPi occlusion sensor not being read." ); break; } /* 87*/ -/*0088*/case GuiAlarmID::ALARM_ID____AVAILABLE_11 : { result = QObject::tr("HD DPo occlusion sensor not being read." ); break; } /* 88*/ +/*0087*/case GuiAlarmID::ALARM_ID____AVAILABLE_10 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 87*/ +/*0088*/case GuiAlarmID::ALARM_ID____AVAILABLE_11 : { result = QObject::tr("This alarm ID is available for use." ); 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("HD DPi occlusion sensor error." ); break; } /* 90*/ -/*0091*/case GuiAlarmID::ALARM_ID____AVAILABLE_13 : { result = QObject::tr("HD DPo occlusion sensor error." ); break; } /* 91*/ -/*0092*/case GuiAlarmID::ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR : { result = QObject::tr("HD blood flow sensor not being read." ); break; } /* 92*/ -/*0093*/case GuiAlarmID::ALARM_ID_HD_BP_FLOW_SENSOR_ERROR : { result = QObject::tr("HD blood flow sensor error." ); break; } /* 93*/ -/*0094*/case GuiAlarmID::ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR : { result = QObject::tr("HD dialysate flow sensor not being read." ); break; } /* 94*/ -/*0095*/case GuiAlarmID::ALARM_ID_HD_DP_FLOW_SENSOR_ERROR : { result = QObject::tr("HD dialysate flow sensor error." ); break; } /* 95*/ -/*0096*/case GuiAlarmID::ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR : { result = QObject::tr("HD blood flow sensor not being read - slow packet." ); break; } /* 96*/ -/*0097*/case GuiAlarmID::ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR : { result = QObject::tr("HD dialysate flow sensor not being read - slow packet." ); break; } /* 97*/ +/*0090*/case GuiAlarmID::ALARM_ID____AVAILABLE_12 : { 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*/ +/*0094*/case GuiAlarmID::ALARM_ID____AVAILABLE_16 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 94*/ +/*0095*/case GuiAlarmID::ALARM_ID____AVAILABLE_17 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 95*/ +/*0096*/case GuiAlarmID::ALARM_ID____AVAILABLE_18 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 96*/ +/*0097*/case GuiAlarmID::ALARM_ID____AVAILABLE_19 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 97*/ /*0098*/case GuiAlarmID::ALARM_ID_HD_BATTERY_COMM_FAULT : { result = QObject::tr("HD battery communication fault." ); break; } /* 98*/ /*0099*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_STALL : { result = QObject::tr("HD syringe pump stall alarm." ); break; } /* 99*/ /*0100*/case GuiAlarmID::ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT : { result = QObject::tr("HD no cartridge self-test timeout." ); break; } /* 100*/ @@ -202,7 +202,7 @@ /*0166*/case GuiAlarmID::ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM : { result = QObject::tr("HD in treatment re-circ sub-mode for too long." ); break; } /* 166*/ /*0167*/case GuiAlarmID::ALARM_ID_CARTRIDGE_DOOR_OPENED : { result = QObject::tr("HD cartridge door opened alarm." ); break; } /* 167*/ /*0168*/case GuiAlarmID::ALARM_ID____AVAILABLE_1 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 168*/ -/*0169*/case GuiAlarmID::ALARM_ID____AVAILABLE_2 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 169*/ +/*0169*/case GuiAlarmID::ALARM_ID_DIALYSATE_FLOW_RATE_OUT_OF_RANGE : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 169*/ /*0170*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY : { result = QObject::tr("HD syringe empty alarm." ); break; } /* 170*/ /*0171*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION : { result = QObject::tr("HD syringe pump occlusion alarm." ); break; } /* 171*/ /*0172*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM : { result = QObject::tr("HD syringe pump not enough Heparin alarm." ); break; } /* 172*/ @@ -312,7 +312,7 @@ /*0276*/case GuiAlarmID::ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("HD venous pressure sensor is reading out of range." ); break; } /* 276*/ /*0277*/case GuiAlarmID::ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE : { result = QObject::tr("HD BP occlusion sensor is reading out of range." ); break; } /* 277*/ /*0278*/case GuiAlarmID::ALARM_ID____AVAILABLE_3 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 278*/ -/*0279*/case GuiAlarmID::ALARM_ID____AVAILABLE_4 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 279*/ +/*0279*/case GuiAlarmID::ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT : { result = QObject::tr("DG dialysate drain time out." ); break; } /* 279*/ /*0280*/case GuiAlarmID::ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR : { result = QObject::tr("HD arterial pressure sensor read timeout error." ); break; } /* 280*/ /*0281*/case GuiAlarmID::ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME : { result = QObject::tr("Acid concentration bottle low volume alarm." ); break; } /* 281*/ /*0282*/case GuiAlarmID::ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME : { result = QObject::tr("Bicarbonate concentration bottle low volume alarm." ); break; } /* 282*/