Index: AlarmMapping.csv =================================================================== diff -u -rc306a4de6311e779822e6a2e5e7ac63484513fbe -r4c459425b129b58ef5333e4fda7e272c462a9fdc --- AlarmMapping.csv (.../AlarmMapping.csv) (revision c306a4de6311e779822e6a2e5e7ac63484513fbe) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision 4c459425b129b58ef5333e4fda7e272c462a9fdc) @@ -282,5 +282,5 @@ 281,"Acid concentration bottle low volume alarm." 282,"Bicarbonate concentration bottle low volume alarm." 283,"DG load cells weight out of range." - 284,"DG scheduled runs group invalid record CRC.\nTODO remove this alarm after DEN-9480 fwcommon was merged into staging." + 284,"DG load cells primary/back up drift out of range." 285,"Total number of alarms." Index: denali.pro.user =================================================================== diff -u -rcab6f784c0fa71adc3b69c9617da5721ea0daef2 -r4c459425b129b58ef5333e4fda7e272c462a9fdc --- denali.pro.user (.../denali.pro.user) (revision cab6f784c0fa71adc3b69c9617da5721ea0daef2) +++ denali.pro.user (.../denali.pro.user) (revision 4c459425b129b58ef5333e4fda7e272c462a9fdc) @@ -1,6 +1,6 @@ - + EnvironmentId Index: scripts/run.sh =================================================================== diff -u -rc306a4de6311e779822e6a2e5e7ac63484513fbe -r4c459425b129b58ef5333e4fda7e272c462a9fdc --- scripts/run.sh (.../run.sh) (revision c306a4de6311e779822e6a2e5e7ac63484513fbe) +++ scripts/run.sh (.../run.sh) (revision 4c459425b129b58ef5333e4fda7e272c462a9fdc) @@ -99,7 +99,7 @@ #test the RTC ----------------------------- RTC #may not be an accurate test but sufficient for now -#and couldn't find a way to get the rtc clock with the higher resolusion +#and could not find a way to get the rtc clock with the higher resolusion #it should not be confused with date command which is system date/time and not hwclock hwclock -r # if there is any issue with rtc hwclock will show errors if [ $? -eq 0 ]; then Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml =================================================================== diff -u -rac23b968f565c2beeb153ca2d554b8f868634512 -r4c459425b129b58ef5333e4fda7e272c462a9fdc --- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision ac23b968f565c2beeb153ca2d554b8f868634512) +++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision 4c459425b129b58ef5333e4fda7e272c462a9fdc) @@ -40,15 +40,15 @@ labelFont.pixelSize: Fonts.fontPixelVitals labelFont.weight: Font.ExtraLight labelAutoSize: true - label: Variables.notSetVariable(vTreatmentVitals.systolic, 3) + bloodSDSeparator + Variables.notSetVariable(vTreatmentVitals.diastolic, 2) + label: Variables.notSetVariable(vTreatmentVitals.systolic, 2) + bloodSDSeparator + Variables.notSetVariable(vTreatmentVitals.diastolic, 2) extra: Variables.unitTextBloodPressure } TextRect { id: _heartBeat labelHeight: 40 labelFont.pixelSize: Fonts.fontPixelVitals labelFont.weight: Font.ExtraLight labelAutoSize: true - label: Variables.notSetVariable(vTreatmentVitals.heartRate) + label: Variables.notSetVariable(vTreatmentVitals.heartRate, 2) extra: Variables.unitTextHeartBeat } } Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -rc306a4de6311e779822e6a2e5e7ac63484513fbe -r4c459425b129b58ef5333e4fda7e272c462a9fdc --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision c306a4de6311e779822e6a2e5e7ac63484513fbe) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 4c459425b129b58ef5333e4fda7e272c462a9fdc) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 12-Aug-2021 + * \date (last) 13-Aug-2021 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -311,7 +311,7 @@ /*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*/ /*0283*/case GuiAlarmID::ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE : { result = QObject::tr("DG load cells weight out of range." ); break; } /* 283*/ -/*0284*/case GuiAlarmID::ALARM_ID_DG_SCHEDULED_RUNS_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("DG scheduled runs group invalid record CRC.\nTODO remove this alarm after DEN-9480 fwcommon was merged into staging." ); break; } /* 284*/ +/*0284*/case GuiAlarmID::ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE : { result = QObject::tr("DG load cells primary/back up drift out of range." ); break; } /* 284*/ /*0285*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Total number of alarms." ); break; } /* 285*/ default: