Index: AlarmDefs.h =================================================================== diff -u -r8ab8908654468ef3f6af56b6c71492195cd398e6 -r3ceac1a51e7075bc6ea9a47a29dea235753268a0 --- AlarmDefs.h (.../AlarmDefs.h) (revision 8ab8908654468ef3f6af56b6c71492195cd398e6) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 3ceac1a51e7075bc6ea9a47a29dea235753268a0) @@ -38,7 +38,7 @@ ALARM_ID_NO_ALARM = 0, ///< Indication for when no alarms is a possible situation ALARM_ID_HD_SOFTWARE_FAULT = 1, ///< HD Software fault. Software found itself in an unexpected state ALARM_ID_STUCK_BUTTON_TEST_FAILED = 2, ///< Stuck button POST failure. Stop or Off button detected to be pressed for at least 1 second during test shortly after power up - ALARM_ID_FPGA_POST_TEST_FAILED = 3, ///< FPGA POST failure + ALARM_ID_HD_FPGA_POST_TEST_FAILED = 3, ///< HD FPGA POST failure ALARM_ID_WATCHDOG_POST_TEST_FAILED = 4, ///< Watchdog POST failure ALARM_ID_UI_COMM_POST_FAILED = 5, ///< UI communication POST failure. UI failed to communicate within a reasonable time after power up ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK = 6, ///< Blood pump failed motor controller current check. Too high when pump should be off or out of range when pump should be running @@ -247,6 +247,7 @@ ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR = 209, ///< HD dialysate flow sensor not being read ALARM_ID_HD_DP_FLOW_SENSOR_ERROR = 210, ///< HD dialysate flow sensor error ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT = 211, ///< DG chemical disinfect could not reach to target temperature + ALARM_ID_DG_FPGA_POST_TEST_FAILED = 212, ///< DG FPGA POST failure NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -365,7 +366,7 @@ { ALARM_PRIORITY_NONE, 999, 0, ALARM_ID_NO_ALARM, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_NO_ALARM { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_SOFTWARE_FAULT { ALARM_PRIORITY_HIGH, 1, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_STUCK_BUTTON_TEST_FAILED - { ALARM_PRIORITY_HIGH, 1, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_FPGA_POST_TEST_FAILED + { ALARM_PRIORITY_HIGH, 1, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_FPGA_POST_TEST_FAILED { ALARM_PRIORITY_HIGH, 1, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_WATCHDOG_POST_TEST_FAILED { ALARM_PRIORITY_HIGH, 1, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_UI_COMM_POST_FAILED { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK @@ -574,6 +575,7 @@ { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_DP_FLOW_SENSOR_ERROR { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT + { ALARM_PRIORITY_HIGH, 1, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_FPGA_POST_TEST_FAILED // Priority Rank Escalate In Escalate To Fault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck }; Index: Compatibility.h =================================================================== diff -u -r0980ecacb89bf243bbbcb47fdc63b9630edf02c3 -r3ceac1a51e7075bc6ea9a47a29dea235753268a0 --- Compatibility.h (.../Compatibility.h) (revision 0980ecacb89bf243bbbcb47fdc63b9630edf02c3) +++ Compatibility.h (.../Compatibility.h) (revision 3ceac1a51e7075bc6ea9a47a29dea235753268a0) @@ -25,8 +25,14 @@ * @{ */ -#define COMPATIBILITY_REV 1 ///< Compatibility revision for all system software stacks. +#define SW_COMPATIBILITY_REV 1 ///< Compatibility revision for all system software stacks. + +#define MIN_HD_FPGA_MAJOR 0 ///< Minimum HD FPGA major revision to be compatible with this version of HD firmware. +#define MIN_HD_FPGA_MINOR 14 ///< Minimum HD FPGA minor revision to be compatible with this version of HD firmware. +#define MIN_DG_FPGA_MAJOR 0 ///< Minimum DG FPGA major revision to be compatible with this version of DG firmware. +#define MIN_DG_FPGA_MINOR 2 ///< Minimum DG FPGA minor revision to be compatible with this version of DG firmware. + /**@}*/ #endif Index: HDDefs.h =================================================================== diff -u -ra51bdb2726b09df57f22dfc6c10965fcf4d5da95 -r3ceac1a51e7075bc6ea9a47a29dea235753268a0 --- HDDefs.h (.../HDDefs.h) (revision a51bdb2726b09df57f22dfc6c10965fcf4d5da95) +++ HDDefs.h (.../HDDefs.h) (revision 3ceac1a51e7075bc6ea9a47a29dea235753268a0) @@ -51,19 +51,20 @@ /// Enumeration of init & POST mode states. enum HD_POST_States { - POST_STATE_START = 0, ///< Start initialize & POST mode state - POST_STATE_WATCHDOG, ///< Run watchdog test mode state - POST_STATE_FPGA, ///< Run FPGA test mode state - POST_STATE_RTC, ///< Run RTC test mode state - POST_STATE_NVDATAMGMT, ///< Run NV Data Mgmt. test mode state - POST_STATE_BLOOD_FLOW, ///< Run Blood Flow test mode state - POST_STATE_DIALYSATE_FLOW, ///< Run Dialysate Flow test mode state - POST_STATE_VALVES, ///< Run Valves test mode state - POST_STATE_ALARM_LAMP, ///< Run alarm lamp test mode state - POST_STATE_ACCELEROMETER, ///< Run Accelerometer test mode state - POST_STATE_STUCK_BUTTON, ///< Run stuck button test mode state - POST_STATE_COMPLETED, ///< POST self-tests completed mode state - POST_STATE_FAILED, ///< POST self-tests failed mode state + POST_STATE_START = 0, ///< Start initialize & POST mode state + POST_STATE_WATCHDOG, ///< Run watchdog test state + POST_STATE_FPGA, ///< Run FPGA test state + POST_STATE_RTC, ///< Run RTC test state + POST_STATE_NVDATAMGMT, ///< Run NV Data Mgmt. test state + POST_STATE_BLOOD_FLOW, ///< Run Blood Flow test state + POST_STATE_DIALYSATE_FLOW, ///< Run Dialysate Flow test state + POST_STATE_VALVES, ///< Run Valves test state + POST_STATE_ALARM_LAMP, ///< Run alarm lamp test state + POST_STATE_ACCELEROMETER, ///< Run Accelerometer test state + POST_STATE_FW_COMPATIBILITY, ///< Run firmware compatibility test state + POST_STATE_STUCK_BUTTON, ///< Run stuck button test state + POST_STATE_COMPLETED, ///< POST self-tests completed state + POST_STATE_FAILED, ///< POST self-tests failed state NUM_OF_POST_STATES ///< Number of initialize & POST mode states }; typedef enum HD_POST_States HD_POST_STATE_T; ///< Type for HD POST states enumeration