Index: firmware/App/Controllers/AlarmLamp.c =================================================================== diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/App/Controllers/AlarmLamp.c (.../AlarmLamp.c) (revision 73d8423edc56daed591bc0b3f7baee5540aea423) +++ firmware/App/Controllers/AlarmLamp.c (.../AlarmLamp.c) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -164,7 +164,7 @@ } else { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_LAMP_INVALID_PATTERN_REQUESTED, lampPattern ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_LAMP_INVALID_PATTERN_REQUESTED, lampPattern ) } } @@ -255,7 +255,7 @@ break; default: -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_LAMP_INVALID_SELF_TEST_STATE, alarmLampSelfTestState ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_LAMP_INVALID_SELF_TEST_STATE, alarmLampSelfTestState ) result = SELF_TEST_STATUS_FAILED; break; } Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 73d8423edc56daed591bc0b3f7baee5540aea423) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -284,7 +284,7 @@ case POST_STATE_FAILED: // Should not get here - any failed post test should have already triggered a fault and taken us to fault mode default: -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_INIT_POST_INVALID_POST_STATE, postState ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_INIT_POST_INVALID_POST_STATE, postState ) break; } Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 73d8423edc56daed591bc0b3f7baee5540aea423) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -116,7 +116,7 @@ break; default: -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_STANDBY_INVALID_STATE, currentStandbyState ); + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_STANDBY_INVALID_STATE, currentStandbyState ); currentStandbyState = STANDBY_START_STATE; break; } @@ -266,13 +266,13 @@ switch ( action ) { case ALARM_ACTION_STOP: - if ( isAlarmActive( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED ) != TRUE ) - { - // no stop action in standby mode - } - // if Dialin enabled bubble detection, stop on venous bubble detection alarm - else - { +// if ( isAlarmActive( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED ) != TRUE ) +// { +// // no stop action in standby mode +// } +// // if Dialin enabled bubble detection, stop on venous bubble detection alarm +// else +// { // // Pumps should be off // signalBloodPumpHardStop(); // stopSyringePump(); @@ -281,7 +281,7 @@ // setValveAirTrap( STATE_CLOSED ); // setValvePosition( VBA, VALVE_POSITION_C_CLOSE ); // setValvePosition( VBV, VALVE_POSITION_C_CLOSE ); - } +// } break; default: Index: firmware/App/Modes/OperationModes.c =================================================================== diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision 73d8423edc56daed591bc0b3f7baee5540aea423) +++ firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -152,7 +152,7 @@ // Is requested new mode valid and legal at this time? if ( newMode >= MODE_NLEG ) { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED, newMode ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED, newMode ) newMode = currentMode; } @@ -212,7 +212,7 @@ // break; default: -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE, currentMode ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE, currentMode ) currentMode = MODE_FAUL; currentSubMode = 0; break; @@ -250,7 +250,7 @@ } else { // Invalid mode requested -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_REQUESTED, newMode ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_REQUESTED, newMode ) } } @@ -329,7 +329,7 @@ // signalAlarmActionToPostTreatmentMode( action ); // break; default: -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_SIGNAL_ACTION, currentMode ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_SIGNAL_ACTION, currentMode ) break; } } @@ -410,7 +410,7 @@ // currentSubMode = transitionToPostTreatmentMode(); // break; default: -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_TRANSITION_TO, newMode ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_TRANSITION_TO, newMode ) break; } } Index: firmware/App/Monitors/FluidLeak.c =================================================================== diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/App/Monitors/FluidLeak.c (.../FluidLeak.c) (revision 73d8423edc56daed591bc0b3f7baee5540aea423) +++ firmware/App/Monitors/FluidLeak.c (.../FluidLeak.c) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -64,7 +64,7 @@ fluidLeakState.override = OVERRIDE_RESET; fluidLeakStatePublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; - initPersistentAlarm( ALARM_ID_HD_FLUID_LEAK_DETECTED, 0, FLUID_LEAK_ERROR_PERSIST_MS ); +// initPersistentAlarm( ALARM_ID_HD_FLUID_LEAK_DETECTED, 0, FLUID_LEAK_ERROR_PERSIST_MS ); } /*********************************************************************//** @@ -93,15 +93,15 @@ // Check state reading and act upon if ( FLUID_LEAK_STATE_WET == getFluidLeakState() ) { - if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_FLUID_LEAK_DETECTED, TRUE ) ) - { - activateAlarmNoData( ALARM_ID_HD_FLUID_LEAK_DETECTED ); - } +// if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_FLUID_LEAK_DETECTED, TRUE ) ) +// { +// activateAlarmNoData( ALARM_ID_HD_FLUID_LEAK_DETECTED ); +// } } else // FLUID_LEAK_STATE_DRY == getFluidLeakState() { - isPersistentAlarmTriggered( ALARM_ID_HD_FLUID_LEAK_DETECTED, FALSE ); - clearAlarmCondition( ALARM_ID_HD_FLUID_LEAK_DETECTED ); +// isPersistentAlarmTriggered( ALARM_ID_HD_FLUID_LEAK_DETECTED, FALSE ); +// clearAlarmCondition( ALARM_ID_HD_FLUID_LEAK_DETECTED ); } } Index: firmware/App/Services/AlarmMgmtSWFaults.h =================================================================== diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision 73d8423edc56daed591bc0b3f7baee5540aea423) +++ firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -29,6 +29,74 @@ typedef enum { SW_FAULT_ID_NONE = 0, + SW_FAULT_ID_ALARM_LAMP_INVALID_PATTERN_REQUESTED = 1, + SW_FAULT_ID_ALARM_LAMP_INVALID_SELF_TEST_STATE = 2, + SW_FAULT_ID_MODE_INIT_POST_INVALID_POST_STATE = 3, + SW_FAULT_ID_MODE_STANDBY_INVALID_STATE = 4, + SW_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED = 5, + SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE = 6, + SW_FAULT_ID_OP_MODES_INVALID_MODE_REQUESTED = 7, + SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_SIGNAL_ACTION = 8, + SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_TRANSITION_TO = 9, + SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE1 = 10, + SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE2 = 11, + SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR1 = 12, + SW_FAULT_ID_ALARM_MGMT_INVALID_USER_ACTION = 13, + SW_FAULT_ID_INVALID_ALARM_USER_ACTION1 = 14, + SW_FAULT_ID_INVALID_ALARM_USER_ACTION2 = 15, + SW_FAULT_ID_ALARM_MGMT_LAMP_INVALID_ALARM_STATE = 16, + SW_FAULT_ID_ALARM_MGMT_AUDIO_INVALID_ALARM_STATE = 17, + SW_FAULT_ID_ALARM_MGMT_INVALID_FIFO_TO_RESET = 18, + SW_FAULT_ID_HD_INVALID_ALARM_AUDIO_STATE = 19, + SW_FAULT_ID_COMM_BUFFERS_ADD_TOO_MUCH_DATA = 20, + SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER = 21, + SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER = 22, + SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER = 23, + SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER = 24, + SW_FAULT_ID_INVALID_DD_OPERATING_MODE = 25, + SW_FAULT_ID_DD_INVALID_COMMAND_RESPONSE_ID = 26, + SW_FAULT_ID_FPGA_INVALID_ALARM_AUDIO_PARAM = 27, + SW_FAULT_ID_PHANTOM_INTERRUPT = 28, + SW_FAULT_ID_INVALID_RTI_NOTIFICATION = 29, + SW_FAULT_ID_CAN_PARITY_ERROR = 30, + SW_FAULT_ID_CAN_OFF_ERROR = 31, + SW_FAULT_ID_UNEXPECTED_DMA_INTERRUPT = 32, + SW_FAULT_ID_INTERRUPTS_INVALID_EDGE_DETECTED = 33, + SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL = 34, + SW_FAULT_ID_MSG_QUEUES_ADD_QUEUE_FULL = 35, + SW_FAULT_ID_MSG_QUEUES_ADD_INVALID_QUEUE = 36, + SW_FAULT_ID_MSG_QUEUES_GET_INVALID_QUEUE = 37, + SW_FAULT_ID_MSG_QUEUES_IS_EMPTY_INVALID_QUEUE = 38, + SW_FAULT_ID_MSG_QUEUES_IS_FULL_INVALID_QUEUE = 39, + SW_FAULT_ID_ILLEGAL_MEM_ACCESS = 40, + SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE3 = 41, + SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR2 = 42, + SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED1 = 43, + SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED2 = 44, + SW_FAULT_ID_FPGA_INVALID_IN_STATE = 45, + SW_FAULT_ID_FPGA_INVALID_OUT_STATE = 46, + SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA = 47, + SW_FAULT_ID_FPGA_WRITE_RSP_TOO_MUCH_DATA = 48, + SW_FAULT_ID_FPGA_READ_CMD_TOO_MUCH_DATA = 49, + SW_FAULT_ID_FPGA_READ_RSP_TOO_MUCH_DATA = 50, + SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX1 = 51, + SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX2 = 52, + SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX3 = 53, + SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED1 = 54, + SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED2 = 55, + SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED3 = 56, + SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX = 57, + SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED = 58, + SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE = 59, + SW_FAULT_ID_HD_INVALID_TEST_CONFIG_SELECTED1 = 60, + SW_FAULT_ID_HD_INVALID_TEST_CONFIG_SELECTED2 = 61, + SW_FAULT_ID_UTIL_INVALID_WIN_MAX_COUNT = 62, + SW_FAULT_ID_UTIL_INVALID_WIN_COUNT = 63, + SW_FAULT_ID_UTIL_TIME_WINDOWED_COUNT_ERROR = 64, + SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT = 65, + SW_FAULT_ID_WATCHDOG_INVALID_SELF_TEST_STATE = 66, + SW_FAULT_ID_WATCHDOG_INVALID_TASK = 67, + SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_FOR_START_TIME = 68, NUM_OF_SW_FAULT_IDS } SW_FAULT_ID_T; Index: firmware/App/Services/AlarmMgmtTD.c =================================================================== diff -u -r1631728a0f2506fb4e29c5f6c6e1a5f55018caab -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/App/Services/AlarmMgmtTD.c (.../AlarmMgmtTD.c) (revision 1631728a0f2506fb4e29c5f6c6e1a5f55018caab) +++ firmware/App/Services/AlarmMgmtTD.c (.../AlarmMgmtTD.c) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -300,7 +300,7 @@ } else { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE1, alarm ) } } @@ -334,7 +334,7 @@ } else { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR, alarm ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR1, alarm ) } } @@ -393,10 +393,10 @@ if ( ( alarm > ALARM_ID_NO_ALARM ) && ( alarm < NUM_OF_ALARM_IDS ) ) { // if the block timer is 0 OR we have an unblockable alarm - if ( ( ALARM_NOT_BLOCKED == alarmsBlockedTimer ) - || ( ALARM_ID_HD_AC_POWER_LOST == alarm ) - || ( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT == alarm ) - || ( ALARM_ID_HD_DG_RESTARTED_FAULT == alarm ) ) +// if ( ( ALARM_NOT_BLOCKED == alarmsBlockedTimer ) +// || ( ALARM_ID_HD_AC_POWER_LOST == alarm ) +// || ( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT == alarm ) +// || ( ALARM_ID_HD_DG_RESTARTED_FAULT == alarm ) ) { TD_OP_MODE_T opMode = getCurrentOperationMode(); // TREATMENT_STATE_T ts = getTreatmentState(); @@ -439,7 +439,7 @@ } else { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE2, alarm ) } } @@ -462,7 +462,7 @@ } else { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_USER_ACTION, (U32)action ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_USER_ACTION, (U32)action ) } } @@ -544,7 +544,7 @@ break; default: -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_USER_ACTION, action ); + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_USER_ACTION1, action ); break; } @@ -604,7 +604,7 @@ // This default cannot be reached in VectorCAST due to check above for alarmActionIsValid #ifndef _VECTORCAST_ default: -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_USER_ACTION, action ); + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_USER_ACTION2, action ); break; #endif } @@ -844,7 +844,7 @@ } else { - activateAlarmNoData( ALARM_ID_TD_SOFTWARE_FAULT ); + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_FOR_START_TIME, alarmID ) } return result; @@ -1003,7 +1003,7 @@ default: requestAlarmLampPattern( LAMP_PATTERN_FAULT ); -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_LAMP_INVALID_ALARM_STATE, alarmStatus.alarmsState ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_LAMP_INVALID_ALARM_STATE, alarmStatus.alarmsState ) break; } } @@ -1274,21 +1274,8 @@ if ( ( TRUE == isAlarmActive( a ) ) && ( ( TRUE == props.alarmConditionClearImmed ) || ( isAlarmConditionDetected( a ) != TRUE ) || ( action != ALARM_USER_ACTION_RESUME ) ) ) { - TD_OP_MODE_T mode = getCurrentOperationMode(); - U32 sub = getCurrentSubMode(); - - // check special cases where we do not want to clear this alarm - otherwise, clear it - if ( ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT == a ) && ( TRUE == isAlarmConditionDetected( a ) ) && ( mode != MODE_POST ) && - ( action != ALARM_USER_ACTION_RINSEBACK ) && ( action != ALARM_USER_ACTION_END_TREATMENT ) ) - { - // do not clear this alarm if condition not cleared first (unless treatment is over) - result = FALSE; - } - else - { - // clear this alarm - clearAlarmTD( a ); - } + // clear this alarm + clearAlarmTD( a ); } else if ( TRUE == isAlarmActive( a ) ) { @@ -1320,7 +1307,7 @@ } else { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_FIFO_TO_RESET, priority ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_FIFO_TO_RESET, priority ) } } Index: firmware/App/Services/CommBuffers.c =================================================================== diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/App/Services/CommBuffers.c (.../CommBuffers.c) (revision 73d8423edc56daed591bc0b3f7baee5540aea423) +++ firmware/App/Services/CommBuffers.c (.../CommBuffers.c) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -160,7 +160,7 @@ // If buffer overflows persists, fault if ( calcTimeSince( firstBufferOverflowTimeStamp ) > BUFFER_OVERFLOW_PERSISTENCE_MS ) { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_TOO_MUCH_DATA, (U32)buffer ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_TOO_MUCH_DATA, (U32)buffer ) } } else // First overflow - set time stamp for persistence check @@ -178,7 +178,7 @@ } else // Invalid buffer given { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER, buffer ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER, buffer ) } return result; @@ -238,7 +238,7 @@ } else // Invalid buffer given { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER, buffer ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER, buffer ) } return result; @@ -295,7 +295,7 @@ } else // Invalid buffer given { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER, buffer ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER, buffer ) } return numOfBytesPeeked; @@ -325,7 +325,7 @@ } else // Invalid buffer { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER, buffer ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER, buffer ) } return result; Index: firmware/App/Services/DDInterface.c =================================================================== diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/App/Services/DDInterface.c (.../DDInterface.c) (revision 73d8423edc56daed591bc0b3f7baee5540aea423) +++ firmware/App/Services/DDInterface.c (.../DDInterface.c) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -124,14 +124,12 @@ dgCmdResp[ i ].rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE; } - initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS ); - initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS ); - initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_UPPER_MAX_SAFETY_TIMEOUT_MS ); +// initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS ); +// initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS ); +// initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_UPPER_MAX_SAFETY_TIMEOUT_MS ); - initPersistentAlarm( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS ); - initPersistentAlarm( ALARM_ID_HD_NEW_DIALYSATE_TEMP_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS ); - initPersistentAlarm( ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS ); - initPersistentAlarm( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS ); +// initPersistentAlarm( ALARM_ID_HD_NEW_DIALYSATE_TEMP_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS ); +// initPersistentAlarm( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS ); } /**********************************************************************//** @@ -179,18 +177,15 @@ // if ( getCPLDACPowerLossDetected() != TRUE ) { // Trigger alarm if not receiving new dialysate temperature data message in timely manner - checkDGDataFreshness( ALARM_ID_HD_NEW_DIALYSATE_TEMP_DATA_MESSAGE_NOT_RECEIVE, &dgDialysateTemperatureDataFreshFlag ); +// checkDGDataFreshness( ALARM_ID_HD_NEW_DIALYSATE_TEMP_DATA_MESSAGE_NOT_RECEIVE, &dgDialysateTemperatureDataFreshFlag ); - // Trigger alarm if not receiving new reservoirs data message in timely manner - checkDGDataFreshness( ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, &dgReservoirsDataFreshFlag ); - // Trigger alarm if not receiving new DG op mode message in timely manner - checkDGDataFreshness( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE, &dgOpModeDataFreshFlag ); - if ( TRUE == isAlarmActive( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE ) ) - { - // we don't want to keep thinking DG is in a useful mode - set it to fault mode until DG is able to report its' true mode status - setDGOpMode( DG_MODE_FAUL, 0 ); - } +// checkDGDataFreshness( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE, &dgOpModeDataFreshFlag ); +// if ( TRUE == isAlarmActive( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE ) ) +// { +// // we don't want to keep thinking DG is in a useful mode - set it to fault mode until DG is able to report its' true mode status +// setDGOpMode( DG_MODE_FAUL, 0 ); +// } // Check to see if DG has restarted checkDGRestart(); @@ -391,7 +386,7 @@ } else { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_DG_OPERATING_MODE, opMode ); + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_DD_OPERATING_MODE, opMode ); } dgOpModeDataFreshFlag = TRUE; @@ -606,14 +601,14 @@ *************************************************************************/ void cmdStartDGFill( U32 fillToVolMl, F32 targetFlowLPM ) { - dgCmdResp[ DG_CMD_START_FILL ].commandID = DG_CMD_NONE; - - if ( ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) && ( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) ) - { - // The empty bottle alarms should not be active. If they are, the user shall insert the new bottle first and then hit Ok/Resume and - // then the fill can go. This is to make sure the next fill is done the full bottles +// dgCmdResp[ DG_CMD_START_FILL ].commandID = DG_CMD_NONE; +// +// if ( ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) && ( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) ) +// { +// // The empty bottle alarms should not be active. If they are, the user shall insert the new bottle first and then hit Ok/Resume and +// // then the fill can go. This is to make sure the next fill is done the full bottles // sendDGFillCommand( DG_CMD_START, fillToVolMl, targetFlowLPM ); - } +// } } /*********************************************************************//** @@ -904,15 +899,15 @@ } else { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_COMMAND_RESPONSE_ID, dgCmdRespPtr->commandID ); + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_DD_INVALID_COMMAND_RESPONSE_ID, dgCmdRespPtr->commandID ); } if ( TRUE == dgCmdRespPtr->rejected ) { switch ( dgCmdRespPtr->rejectCode ) { case DG_CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER: - SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DG_COMMAND_INVALID_PARAMETER_FAULT, dgCmdRespPtr->commandID ); +// SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DG_COMMAND_INVALID_PARAMETER_FAULT, dgCmdRespPtr->commandID ); break; case DG_CMD_REQUEST_REJECT_REASON_NONE: @@ -968,26 +963,26 @@ BOOL isTempAboveTrigger = (BOOL)( isTDiTempAboveLowSafety || isTDiTempAboveDialysateTarget ); // if ( getTargetDialInFlowRate() > 0 ) - { - // check clear condition first - if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP ) ) - { - isTDiTempAboveHighSafety = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE ); - } - checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, isTDiTempAboveHighSafety, dgDialysateTemp, dgTrimmerTempSet ); - - if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP ) ) - { - isTempAboveTrigger = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE ); - } - checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, isTempAboveTrigger, dgDialysateTemp, dgTrimmerTempSet ); - - if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP ) ) - { - isTempBelowTrigger = ( dgDialysateTemp >= ( dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE ); - } - checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, isTempBelowTrigger, dgDialysateTemp, dgTrimmerTempSet ); - } +// { +// // check clear condition first +// if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP ) ) +// { +// isTDiTempAboveHighSafety = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE ); +// } +// checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, isTDiTempAboveHighSafety, dgDialysateTemp, dgTrimmerTempSet ); +// +// if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP ) ) +// { +// isTempAboveTrigger = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE ); +// } +// checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, isTempAboveTrigger, dgDialysateTemp, dgTrimmerTempSet ); +// +// if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP ) ) +// { +// isTempBelowTrigger = ( dgDialysateTemp >= ( dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE ); +// } +// checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, isTempBelowTrigger, dgDialysateTemp, dgTrimmerTempSet ); +// } // else // { // checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, FALSE, dgDialysateTemp, dgTrimmerTempSet ); @@ -1019,7 +1014,7 @@ if ( ( DG_MODE_FAUL != dgCurrentOpMode ) && ( DG_MODE_GENE != dgCurrentOpMode ) && ( DG_MODE_FILL != dgCurrentOpMode ) && ( DG_MODE_DRAI != dgCurrentOpMode ) ) { - activateAlarmNoData( ALARM_ID_HD_DG_RESTARTED_FAULT ); +// activateAlarmNoData( ALARM_ID_HD_DG_RESTARTED_FAULT ); dgStarted = FALSE; // do not want to re-trigger alarm after alarm is cleared } } Index: firmware/App/Services/FpgaTD.c =================================================================== diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/App/Services/FpgaTD.c (.../FpgaTD.c) (revision 73d8423edc56daed591bc0b3f7baee5540aea423) +++ firmware/App/Services/FpgaTD.c (.../FpgaTD.c) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -262,13 +262,13 @@ else { result = SELF_TEST_STATUS_FAILED; - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_FPGA_POST_TEST_FAILED, (U32)HD_FPGA_COMPATIBILITY_REV, (U32)fpgaSensorReadings.fpgaCompatibilityRev ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_FPGA_POST_TEST_FAILED, (U32)HD_FPGA_COMPATIBILITY_REV, (U32)fpgaSensorReadings.fpgaCompatibilityRev ) } } else { result = SELF_TEST_STATUS_FAILED; - SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaId ) + SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaId ) } return result; @@ -311,7 +311,7 @@ { if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CLOCK_SPEED_ERROR ) ) { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_FPGA_CLOCK_SPEED_CHECK_FAILURE, diffFPGATimerCount, diffTimerCount ); + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_FPGA_CLOCK_SPEED_CHECK_FAILURE, diffFPGATimerCount, diffTimerCount ); } } } @@ -1582,7 +1582,7 @@ { if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_COMM_FAILURES ) ) { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_FPGA_COMM_TIMEOUT, MAX_FPGA_COMM_FAILURES, (U32)fpgaSensorReadings.errorCountProcessor ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_FPGA_COMM_TIMEOUT, MAX_FPGA_COMM_FAILURES, (U32)fpgaSensorReadings.errorCountProcessor ) } } } @@ -1608,7 +1608,7 @@ { if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_COMM_FAILURES ) ) { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_FPGA_COMM_TIMEOUT, MAX_FPGA_COMM_FAILURES, (U32)fpgaSensorReadings.errorCountProcessor ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_FPGA_COMM_TIMEOUT, MAX_FPGA_COMM_FAILURES, (U32)fpgaSensorReadings.errorCountProcessor ) status = TRUE; } } Index: firmware/App/Services/Interrupts.c =================================================================== diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision 73d8423edc56daed591bc0b3f7baee5540aea423) +++ firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -80,7 +80,7 @@ *************************************************************************/ void phantomInterrupt(void) { -// SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_PHANTOM_INTERRUPT ) + SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_PHANTOM_INTERRUPT ) } /*********************************************************************//** @@ -112,7 +112,7 @@ break; default: -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_RTI_NOTIFICATION, notification ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_RTI_NOTIFICATION, notification ) break; } } @@ -156,7 +156,7 @@ can1ParityCnt++; if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_CAN_PARITY ) ) { -// SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_CAN_PARITY_ERROR ) + SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_CAN_PARITY_ERROR ) } } // Bus off - our transmitter has counted 255+ errors @@ -165,7 +165,7 @@ can1BusOffCnt++; if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_CAN_OFF ) ) { -// SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_CAN_OFF_ERROR ) + SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_CAN_OFF_ERROR ) } } // Warning - our transmitter has counted 96+ errors @@ -237,7 +237,7 @@ break; default: -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UNEXPECTED_DMA_INTERRUPT, channel ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UNEXPECTED_DMA_INTERRUPT, channel ) break; } } @@ -263,7 +263,7 @@ break; default: -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INTERRUPTS_INVALID_EDGE_DETECTED, edge ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INTERRUPTS_INVALID_EDGE_DETECTED, edge ) break; } } Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r1631728a0f2506fb4e29c5f6c6e1a5f55018caab -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 1631728a0f2506fb4e29c5f6c6e1a5f55018caab) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -180,7 +180,7 @@ { if ( FALSE == addMsgToPendingACKList( &msg, buffer, data, msgSize ) ) { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL, (U32)(msg.hdr.msgID) ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL, (U32)(msg.hdr.msgID) ) } } } Index: firmware/App/Services/MsgQueues.c =================================================================== diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/App/Services/MsgQueues.c (.../MsgQueues.c) (revision 73d8423edc56daed591bc0b3f7baee5540aea423) +++ firmware/App/Services/MsgQueues.c (.../MsgQueues.c) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -88,12 +88,12 @@ } else // Msg queue is full { -// SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_ADD_QUEUE_FULL ) + SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_ADD_QUEUE_FULL ) } } else // Invalid message queue { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_ADD_INVALID_QUEUE, queue ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_ADD_INVALID_QUEUE, queue ) } return result; @@ -134,7 +134,7 @@ } else // Invalid message queue { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_GET_INVALID_QUEUE, queue ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_GET_INVALID_QUEUE, queue ) } return result; @@ -162,7 +162,7 @@ } else // Invalid message queue { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_EMPTY_INVALID_QUEUE, queue ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_EMPTY_INVALID_QUEUE, queue ) } return result; @@ -190,7 +190,7 @@ } else // Invalid message queue { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_FULL_INVALID_QUEUE, queue ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_FULL_INVALID_QUEUE, queue ) } return result; Index: firmware/App/Services/SystemCommTD.c =================================================================== diff -u -r1631728a0f2506fb4e29c5f6c6e1a5f55018caab -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/App/Services/SystemCommTD.c (.../SystemCommTD.c) (revision 1631728a0f2506fb4e29c5f6c6e1a5f55018caab) +++ firmware/App/Services/SystemCommTD.c (.../SystemCommTD.c) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -111,9 +111,9 @@ ddIsCommunicating = TRUE; timeOfLastDGCheckIn = getMSTimerCount(); - if ( TRUE == isAlarmActive( ALARM_ID_HD_DG_COMM_TIMEOUT ) ) + if ( TRUE == isAlarmActive( ALARM_ID_TD_DD_COMM_TIMEOUT ) ) { - clearAlarmCondition( ALARM_ID_HD_DG_COMM_TIMEOUT ); + clearAlarmCondition( ALARM_ID_TD_DD_COMM_TIMEOUT ); } } @@ -264,7 +264,7 @@ // if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_COMM_ALARMS ) != SW_CONFIG_ENABLE_VALUE ) #endif { - activateAlarmNoData( ALARM_ID_HD_UI_COMM_TIMEOUT ); + activateAlarmNoData( ALARM_ID_TD_UI_COMM_TIMEOUT ); } } @@ -274,13 +274,13 @@ // Only alarm on DG comm loss while in the treatment workflow if ( MODE_PRET == opMode || MODE_TREA == opMode || MODE_POST == opMode ) { - activateAlarmNoData( ALARM_ID_HD_DG_COMM_TIMEOUT ); + activateAlarmNoData( ALARM_ID_TD_DD_COMM_TIMEOUT ); // we don't want to keep thinking DG is in a useful mode - set it to fault mode until DG is able to report its' true mode status // setDGOpMode( DG_MODE_FAUL, 0 ); } else // Otherwise clear the alarm { - clearAlarmCondition( ALARM_ID_HD_DG_COMM_TIMEOUT ); + clearAlarmCondition( ALARM_ID_TD_DD_COMM_TIMEOUT ); } ddIsCommunicating = FALSE; #endif @@ -349,8 +349,6 @@ *************************************************************************/ void processReceivedMessage( MESSAGE_T *message ) { - U16 msgID = message->hdr.msgID; - // Handle any messages from other sub-systems handleIncomingMessage( message ); } Index: firmware/App/Tasks/TaskBG.c =================================================================== diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/App/Tasks/TaskBG.c (.../TaskBG.c) (revision 73d8423edc56daed591bc0b3f7baee5540aea423) +++ firmware/App/Tasks/TaskBG.c (.../TaskBG.c) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -62,7 +62,7 @@ // Check timeout waiting for UI to check in (via CAN) after startup. if ( TRUE == didTimeout( startUICommTimeout, MAX_TIME_FOR_UI_TO_COMMUNICATE_MS ) ) { -// activateAlarmNoData( ALARM_ID_HD_UI_COMM_POST_FAILED ); + activateAlarmNoData( ALARM_ID_TD_UI_COMM_POST_FAILED ); } #endif } Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 73d8423edc56daed591bc0b3f7baee5540aea423) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -16,8 +16,9 @@ ***************************************************************************/ #include "Messaging.h" -#include "OperationModes.h" +#include "OperationModes.h" #include "SystemComm.h" +#include "SystemCommTD.h" #include "TaskGeneral.h" #include "WatchdogMgmt.h" @@ -52,8 +53,8 @@ // Prevent most processing until UI has started communicating or if DG is active and alarm (ALARM_ID_HD_UI_COMM_POST_FAILED) is raised // proceed to further operations since UI likely failed to come up. -// if ( ( TRUE == uiCommunicated() ) || -// ( ( FALSE == isOnlyCANNode() ) && ( TRUE == isAlarmActive( ALARM_ID_HD_UI_COMM_POST_FAILED ) ) ) ) + if ( ( TRUE == uiCommunicated() ) || + ( ( FALSE == isOnlyCANNode() ) && ( TRUE == isAlarmActive( ALARM_ID_TD_UI_COMM_POST_FAILED ) ) ) ) { // // Monitor voltages // execVoltagesMonitor(); Index: firmware/source/sys_selftest.c =================================================================== diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -rf688e0f8bded1f0a687437e3136cfba8b14f87b6 --- firmware/source/sys_selftest.c (.../sys_selftest.c) (revision 73d8423edc56daed591bc0b3f7baee5540aea423) +++ firmware/source/sys_selftest.c (.../sys_selftest.c) (revision f688e0f8bded1f0a687437e3136cfba8b14f87b6) @@ -1129,7 +1129,7 @@ uint32_t marker = STACK_MARKER; uint32_t contentOfLinkRegister = *(volatile uint32_t*)( &marker + LR_OFFSET_WORD_IN_STACK ); *(volatile uint32_t*)( &marker + LR_OFFSET_WORD_IN_STACK ) = contentOfLinkRegister + LR_OFFSET_ADJUSTMENT; -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (U32)SW_FAULT_ID_ILLEGAL_MEM_ACCESS, contentOfLinkRegister ) // log LR to determine what caused violation + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, (U32)SW_FAULT_ID_ILLEGAL_MEM_ACCESS, contentOfLinkRegister ) // log LR to determine what caused violation /* USER CODE END */ }