Index: firmware/App/Controllers/Bubble.c =================================================================== diff -u -rec76cd7277fc01f63dc29328bb40da032b9ef83b -r953879c2319ea70007bfc303422155dd162d87e5 --- firmware/App/Controllers/Bubble.c (.../Bubble.c) (revision ec76cd7277fc01f63dc29328bb40da032b9ef83b) +++ firmware/App/Controllers/Bubble.c (.../Bubble.c) (revision 953879c2319ea70007bfc303422155dd162d87e5) @@ -293,7 +293,7 @@ { activateAlarmNoData( ALARM_ID_HD_ARTERIAL_BUBBLE_SELF_TEST_FAILURE ); } - else if ( bubble == ADV ) + else // ADV { activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE ); } Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -r6e4bd21dee082a57f919a7a97954376ea2bc01ad -r953879c2319ea70007bfc303422155dd162d87e5 --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision 6e4bd21dee082a57f919a7a97954376ea2bc01ad) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision 953879c2319ea70007bfc303422155dd162d87e5) @@ -539,7 +539,7 @@ { VALVE_SELF_TEST_STATE_T state = VALVE_SELF_TEST_COMPLETE; - if ( areValvesFunctional() ) + if ( TRUE == areValvesFunctional() ) { valvesSelfTestResult = SELF_TEST_STATUS_PASSED; } Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -rfc12876da6930c955864352182aee2076513a1cc -r953879c2319ea70007bfc303422155dd162d87e5 --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision fc12876da6930c955864352182aee2076513a1cc) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 953879c2319ea70007bfc303422155dd162d87e5) @@ -151,8 +151,9 @@ break; case POST_STATE_NVDATAMGMT: - testStatus = execNVDataMgmtSelfTest(); - postState = handlePOSTStatus( testStatus ); +// testStatus = execNVDataMgmtSelfTest(); +// postState = handlePOSTStatus( testStatus ); + postState = POST_STATE_BLOOD_FLOW; // TODO - restore before merge to staging (for now, cal failure fails but does not trigger fault and so I am seeing s/w fault) break; case POST_STATE_BLOOD_FLOW: @@ -170,6 +171,10 @@ postState = handlePOSTStatus( testStatus ); break; + case POST_STATE_SYRINGE_PUMP: + postState = POST_STATE_ALARM_AUDIO; + break; + case POST_STATE_ALARM_AUDIO: testStatus = execAlarmAudioSelfTest(); postState = handlePOSTStatus( testStatus ); Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -rfc12876da6930c955864352182aee2076513a1cc -r953879c2319ea70007bfc303422155dd162d87e5 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision fc12876da6930c955864352182aee2076513a1cc) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 953879c2319ea70007bfc303422155dd162d87e5) @@ -90,11 +90,11 @@ /// Lookup table to determine appropriate divider for a given alarm audio volume level. const U08 ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[MAX_ALARM_VOLUME_LEVEL][NUM_OF_ALARM_AUDIO_VOLUME_FACTORS] = { - { 2, 1 }, + { 1, 0 }, { 1, 1 }, - { 0, 1 }, - { 0, 3 }, - { 0, 5 } + { 3, 1 }, + { 3, 2 }, + { 4, 2 } }; // ********** private data ********** @@ -833,18 +833,18 @@ { U32 volume = getAlarmAudioVolume(); - // If we're not in Init-POST mode, ensure audio test tone request is cancelled. - if ( getCurrentOperationMode() != MODE_INIT ) - { - alarmAudioTestToneRequested = FALSE; - } - // If audio test in progress, play test tone. if ( TRUE == alarmAudioTestToneRequested ) { // Play test tone at min volume setAlarmAudioState( ALARM_AUDIO_TEST_TONE, - ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[MAX_ALARM_VOLUME_LEVEL-1][ALARM_AUDIO_VOLUME_GAIN], - ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[MAX_ALARM_VOLUME_LEVEL-1][ALARM_AUDIO_VOLUME_DIVIDER] ); + ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[0][ALARM_AUDIO_VOLUME_GAIN], + ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[0][ALARM_AUDIO_VOLUME_DIVIDER] ); + // If we're in Fault mode, ensure audio test tone request is cancelled. + if ( MODE_FAUL == getCurrentOperationMode() ) + { + alarmAudioTestToneRequested = FALSE; + } + } // If alarm silenced, play no alarm audio. else if ( TRUE == alarmStatus.alarmsSilenced ) Index: firmware/App/Services/WatchdogMgmt.c =================================================================== diff -u -rfc12876da6930c955864352182aee2076513a1cc -r953879c2319ea70007bfc303422155dd162d87e5 --- firmware/App/Services/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision fc12876da6930c955864352182aee2076513a1cc) +++ firmware/App/Services/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision 953879c2319ea70007bfc303422155dd162d87e5) @@ -32,7 +32,7 @@ #define MIN_WATCHDOG_PET_INTERVAL_MS 45 ///< Minimum watchdog pet interval (in ms). #define WATCHDOG_POST_TIMEOUT_MS 500 ///< Watchdog POST test timeout (in ms). -#define WATCHDOG_RECOVERY_TIME_MS 250 ///< After watchdog POST test, wait this long (in ms) before moving on. +#define WATCHDOG_RECOVERY_TIME_MS 500 ///< After watchdog POST test, wait this long (in ms) before moving on. #define MAX_24V_LEVEL_ON_WATCHDOG_EXPIRED 5.0 ///< Maximum voltage on 24V line when watchdog is expired. // TODO - check w/ Systems. Takes time for V to bleed off. Had to raise to 5V. #define MIN_24V_LEVEL_ON_WATCHDOG_RECOVER 22.6 ///< Minimum voltage on 24V line when watchdog is recovered. Index: firmware/HD.dil =================================================================== diff -u -rfc12876da6930c955864352182aee2076513a1cc -r953879c2319ea70007bfc303422155dd162d87e5 --- firmware/HD.dil (.../HD.dil) (revision fc12876da6930c955864352182aee2076513a1cc) +++ firmware/HD.dil (.../HD.dil) (revision 953879c2319ea70007bfc303422155dd162d87e5) @@ -1,4 +1,4 @@ -# RM46L852PGE 07/23/21 11:14:50 +# RM46L852PGE 07/27/21 12:57:43 # ARCH=RM46L852PGE # @@ -1611,14 +1611,14 @@ DRIVER.GIO.VAR.GIO_PORT1_BIT2_POL.VALUE=0 DRIVER.GIO.VAR.GIO_PORT0_BIT0_DIR.VALUE=0 DRIVER.GIO.VAR.GIO_PORT1_BIT6_ENA.VALUE=0 -DRIVER.GIO.VAR.GIO_PORT1_BIT2_PSL.VALUE=1 +DRIVER.GIO.VAR.GIO_PORT1_BIT2_PSL.VALUE=0 DRIVER.GIO.VAR.GIO_PORT1_BIT6_DIR.VALUE=0 DRIVER.GIO.VAR.GIO_BASE.VALUE=0xFFF7BC00 DRIVER.GIO.VAR.GIO_PORT1_BIT3_LVL.VALUE=0 DRIVER.GIO.VAR.GIO_PORT0_BIT1_ENA.VALUE=0 DRIVER.GIO.VAR.GIO_PORT1_BIT4_PDR.VALUE=0 DRIVER.GIO.VAR.GIO_PORT1_BIT3_POL.VALUE=0 -DRIVER.GIO.VAR.GIO_PORT1_BIT2_PULL.VALUE=2 +DRIVER.GIO.VAR.GIO_PORT1_BIT2_PULL.VALUE=1 DRIVER.GIO.VAR.GIO_PORT0_BIT1_DIR.VALUE=0 DRIVER.GIO.VAR.GIO_PORT1_BIT5_DOUT.VALUE=0 DRIVER.GIO.VAR.GIO_PORT0_BIT6_PULL.VALUE=0 Index: firmware/include/gio.h =================================================================== diff -u -ra74a984a7059f75d86ad87d6d9499bd8f94cc976 -r953879c2319ea70007bfc303422155dd162d87e5 --- firmware/include/gio.h (.../gio.h) (revision a74a984a7059f75d86ad87d6d9499bd8f94cc976) +++ firmware/include/gio.h (.../gio.h) (revision 953879c2319ea70007bfc303422155dd162d87e5) @@ -130,7 +130,7 @@ #define GIO_PORTBDIR_CONFIGVALUE ((uint32)((uint32)1U << 0U) | (uint32)((uint32)1U << 1U) | (uint32)((uint32)0U << 2U) | (uint32)((uint32)1U << 3U) | (uint32)((uint32)0U << 4U) | (uint32)((uint32)0U << 5U) | (uint32)((uint32)0U << 6U) | (uint32)((uint32)0U << 7U)) #define GIO_PORTBPDR_CONFIGVALUE ((uint32)((uint32)0U << 0U) | (uint32)((uint32)0U << 1U) | (uint32)((uint32)0U << 2U) | (uint32)((uint32)0U << 3U) | (uint32)((uint32)0U << 4U) | (uint32)((uint32)0U << 5U) | (uint32)((uint32)0U << 6U) | (uint32)((uint32)0U << 7U)) -#define GIO_PORTBPSL_CONFIGVALUE ((uint32)((uint32)0U << 0U) | (uint32)((uint32)0U << 1U) | (uint32)((uint32)1U << 2U) | (uint32)((uint32)0U << 3U) | (uint32)((uint32)0U << 4U) | (uint32)((uint32)0U << 5U) | (uint32)((uint32)0U << 6U) | (uint32)((uint32)0U << 7U)) +#define GIO_PORTBPSL_CONFIGVALUE ((uint32)((uint32)0U << 0U) | (uint32)((uint32)0U << 1U) | (uint32)((uint32)0U << 2U) | (uint32)((uint32)0U << 3U) | (uint32)((uint32)0U << 4U) | (uint32)((uint32)0U << 5U) | (uint32)((uint32)0U << 6U) | (uint32)((uint32)0U << 7U)) #define GIO_PORTBPULDIS_CONFIGVALUE ((uint32)((uint32)0U << 0U) | (uint32)((uint32)0U << 1U) | (uint32)((uint32)0U << 2U) |(uint32)((uint32)0U << 3U) | (uint32)((uint32)0U << 4U) | (uint32)((uint32)0U << 5U) | (uint32)((uint32)0U << 6U) | (uint32)((uint32)0U << 7U)) Index: firmware/source/gio.c =================================================================== diff -u -ra74a984a7059f75d86ad87d6d9499bd8f94cc976 -r953879c2319ea70007bfc303422155dd162d87e5 --- firmware/source/gio.c (.../gio.c) (revision a74a984a7059f75d86ad87d6d9499bd8f94cc976) +++ firmware/source/gio.c (.../gio.c) (revision 953879c2319ea70007bfc303422155dd162d87e5) @@ -155,7 +155,7 @@ /** - Port B pullup / pulldown selection */ gioPORTB->PSL = (uint32)((uint32)0U << 0U) /* Bit 0 */ | (uint32)((uint32)0U << 1U) /* Bit 1 */ - | (uint32)((uint32)1U << 2U) /* Bit 2 */ + | (uint32)((uint32)0U << 2U) /* Bit 2 */ | (uint32)((uint32)0U << 3U) /* Bit 3 */ | (uint32)((uint32)0U << 4U) /* Bit 4 */ | (uint32)((uint32)0U << 5U) /* Bit 5 */