Index: AlarmMapping.csv
===================================================================
diff -u -ra7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa -rf7ca683570f12ffe06ba685d0ad2cb79b1ecba36
--- AlarmMapping.csv (.../AlarmMapping.csv) (revision a7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa)
+++ AlarmMapping.csv (.../AlarmMapping.csv) (revision f7ca683570f12ffe06ba685d0ad2cb79b1ecba36)
@@ -44,11 +44,11 @@
43,"DG main primary heater FPGA fault."
44,"User interface communication timeout."
45,"HD too many bad communications CRC."
- 46,"System message that required acknowledgment was not acknowledged."
+ 46,"HD System message that required acknowledgment was not acknowledged."
47,"Ultrafiltration rate is too high error during treatment."
48,"Ultrafiltration volume accuracy error during treatment."
49,"HD FPGA communication down for too long."
- 50,"FPGA not accepting commanded valve states."
+ 50,"DG FPGA not accepting commanded valve states."
51,"Blood pump failed motor speed check.\nMeasured vs commanded."
52,"Dialysate inlet pump failed motor speed check.\nMeasured vs commanded."
53,"Dialysate outlet pump failed motor speed check.\nMeasured vs commanded."
@@ -142,7 +142,7 @@
141,"Air trap fill timeout during treatment."
142,"Blood pump occlusion detected."
143,"DG dialysate temperature sensors out of range."
- 144,"DG RO flow sensor invalid calibration record."
+ 144,"Alarm ID available for use."
145,"Concentrate conductivity after adding acid out of range alarm."
146,"DG RTC or timer accuracy failure."
147,"Wait for the DG to produce dialysate."
@@ -306,4 +306,9 @@
305,"HD processor RAM error."
306,"HD air trap over-fill alarm."
307,"HD AC power lost second alarm."
- 308,"Total number of alarms."
+ 308,"DG CPi conductivity sensor invalid character received."
+ 309,"DG CPo conductivity sensor invalid character received."
+ 310,"DG CD1 conductivity sensor invalid character received."
+ 311,"DG CD2 conductivity sensor invalid character received."
+ 312,"HD Dialysate In flow rate to too low."
+ 313,"Total number of alarms."
Index: denali.pro.user
===================================================================
diff -u -rfde18b0e9684a491bdef054b9057159ca36afad7 -rf7ca683570f12ffe06ba685d0ad2cb79b1ecba36
--- denali.pro.user (.../denali.pro.user) (revision fde18b0e9684a491bdef054b9057159ca36afad7)
+++ denali.pro.user (.../denali.pro.user) (revision f7ca683570f12ffe06ba685d0ad2cb79b1ecba36)
@@ -1250,7 +1250,7 @@
Qt 5.12.5 (iMX8)
Qt 5.12.5 (iMX8)
{5d6458ef-f917-4aef-a092-c77bbe106149}
- 0
+ 1
0
0
@@ -1333,6 +1333,15 @@
true
+ staging
+ /home/denali/Projects/application/alarmMapping.sh
+ %{sourceDir}
+ Custom Process Step
+
+ ProjectExplorer.ProcessStep
+
+
+ true
qmake
QtProjectManager.QMakeBuildStep
@@ -1342,7 +1351,7 @@
false
false
-
+
true
Make
@@ -1353,7 +1362,7 @@
false
-
+
true
-b --tag denali >> denali
sha256sum
@@ -1362,7 +1371,7 @@
ProjectExplorer.ProcessStep
- 3
+ 4
Build
Build
ProjectExplorer.BuildSteps.Build
Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -r75ce1b81d790999579df838f496011340c3af61c -rf7ca683570f12ffe06ba685d0ad2cb79b1ecba36
--- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 75ce1b81d790999579df838f496011340c3af61c)
+++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision f7ca683570f12ffe06ba685d0ad2cb79b1ecba36)
@@ -7,7 +7,7 @@
*
* \file MAlarmMapping.cpp
* \author (last) Behrouz NematiPour
- * \date (last) 08-Nov-2022
+ * \date (last) 01-Dec-2022
* \author (original) Behrouz NematiPour
* \date (original) 03-May-2021
*
@@ -79,11 +79,11 @@
/*0043*/case GuiAlarmID::ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT : { result = QObject::tr("DG main primary heater FPGA fault." ); break; } /* 43*/
/*0044*/case GuiAlarmID::ALARM_ID_UI_COMM_TIMEOUT : { result = QObject::tr("User interface communication timeout." ); break; } /* 44*/
/*0045*/case GuiAlarmID::ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS : { result = QObject::tr("HD too many bad communications CRC." ); break; } /* 45*/
-/*0046*/case GuiAlarmID::ALARM_ID_CAN_MESSAGE_NOT_ACKED : { result = QObject::tr("System message that required acknowledgment was not acknowledged." ); break; } /* 46*/
+/*0046*/case GuiAlarmID::ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED : { result = QObject::tr("HD System message that required acknowledgment was not acknowledged." ); break; } /* 46*/
/*0047*/case GuiAlarmID::ALARM_ID_UF_RATE_TOO_HIGH_ERROR : { result = QObject::tr("Ultrafiltration rate is too high error during treatment." ); break; } /* 47*/
/*0048*/case GuiAlarmID::ALARM_ID_UF_VOLUME_ACCURACY_ERROR : { result = QObject::tr("Ultrafiltration volume accuracy error during treatment." ); break; } /* 48*/
/*0049*/case GuiAlarmID::ALARM_ID_HD_FPGA_COMM_TIMEOUT : { result = QObject::tr("HD FPGA communication down for too long." ); break; } /* 49*/
-/*0050*/case GuiAlarmID::ALARM_ID_VALVE_CONTROL_FAILURE : { result = QObject::tr("FPGA not accepting commanded valve states." ); break; } /* 50*/
+/*0050*/case GuiAlarmID::ALARM_ID_DG_VALVE_CONTROL_FAILURE : { result = QObject::tr("DG FPGA not accepting commanded valve states." ); break; } /* 50*/
/*0051*/case GuiAlarmID::ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK : { result = QObject::tr("Blood pump failed motor speed check.\nMeasured vs commanded." ); break; } /* 51*/
/*0052*/case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK : { result = QObject::tr("Dialysate inlet pump failed motor speed check.\nMeasured vs commanded." ); break; } /* 52*/
/*0053*/case GuiAlarmID::ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK : { result = QObject::tr("Dialysate outlet pump failed motor speed check.\nMeasured vs commanded." ); break; } /* 53*/
@@ -177,7 +177,7 @@
/*0141*/case GuiAlarmID::ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT : { result = QObject::tr("Air trap fill timeout during treatment." ); break; } /* 141*/
/*0142*/case GuiAlarmID::ALARM_ID_OCCLUSION_BLOOD_PUMP : { result = QObject::tr("Blood pump occlusion detected." ); break; } /* 142*/
/*0143*/case GuiAlarmID::ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE : { result = QObject::tr("DG dialysate temperature sensors out of range." ); break; } /* 143*/
-/*0144*/case GuiAlarmID::ALARM_ID_DG_RO_FLOW_SENSOR_INVALID_CAL_RECORD : { result = QObject::tr("DG RO flow sensor invalid calibration record." ); break; } /* 144*/
+/*0144*/case GuiAlarmID::ALARM_ID__AVAILABLE_1 : { result = QObject::tr("Alarm ID available for use." ); break; } /* 144*/
/*0145*/case GuiAlarmID::ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE : { result = QObject::tr("Concentrate conductivity after adding acid out of range alarm." ); break; } /* 145*/
/*0146*/case GuiAlarmID::ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE : { result = QObject::tr("DG RTC or timer accuracy failure." ); break; } /* 146*/
/*0147*/case GuiAlarmID::ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT : { result = QObject::tr("Wait for the DG to produce dialysate." ); break; } /* 147*/
@@ -341,7 +341,12 @@
/*0305*/case GuiAlarmID::ALARM_ID_HD_CPU_RAM_ERROR : { result = QObject::tr("HD processor RAM error." ); break; } /* 305*/
/*0306*/case GuiAlarmID::ALARM_ID_HD_AIR_TRAP_OVERFILL : { result = QObject::tr("HD air trap over-fill alarm." ); break; } /* 306*/
/*0307*/case GuiAlarmID::ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT : { result = QObject::tr("HD AC power lost second alarm." ); break; } /* 307*/
-/*0308*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Total number of alarms." ); break; } /* 308*/
+/*0308*/case GuiAlarmID::ALARM_ID_DG_CPI_COND_SENSOR_INVALID_CHAR : { result = QObject::tr("DG CPi conductivity sensor invalid character received." ); break; } /* 308*/
+/*0309*/case GuiAlarmID::ALARM_ID_DG_CPO_COND_SENSOR_INVALID_CHAR : { result = QObject::tr("DG CPo conductivity sensor invalid character received." ); break; } /* 309*/
+/*0310*/case GuiAlarmID::ALARM_ID_DG_CD1_COND_SENSOR_INVALID_CHAR : { result = QObject::tr("DG CD1 conductivity sensor invalid character received." ); break; } /* 310*/
+/*0311*/case GuiAlarmID::ALARM_ID_DG_CD2_COND_SENSOR_INVALID_CHAR : { result = QObject::tr("DG CD2 conductivity sensor invalid character received." ); break; } /* 311*/
+/*0312*/case GuiAlarmID::ALARM_ID_HD_DIAL_IN_FLOW_CHECK_FAILURE : { result = QObject::tr("HD Dialysate In flow rate to too low." ); break; } /* 312*/
+/*0313*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Total number of alarms." ); break; } /* 313*/
default:
result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID));