Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -rce48f926049a50239537917cda7eff06557a80bf -r6dcc3d91f1f6095d6d3a722c2e3c2074d69be2a5 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision ce48f926049a50239537917cda7eff06557a80bf) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 6dcc3d91f1f6095d6d3a722c2e3c2074d69be2a5) @@ -139,7 +139,7 @@ alarmStatus.alarmsSilenceExpiresIn = 0; alarmStatus.alarmsEscalatesIn = 0; alarmStatus.alarmTop = ALARM_ID_NO_ALARM; - alarmStatus.topAlarmConditionnDetected = FALSE; + alarmStatus.topAlarmConditionDetected = FALSE; alarmStatus.systemFault = FALSE; alarmStatus.stop = FALSE; alarmStatus.lampOn = FALSE; @@ -664,7 +664,7 @@ // Update alarm to display per highest priority FIFO alarmStatus.alarmsState = highestPriority; alarmStatus.alarmTop = alarmPriorityFIFO[ highestPriority ].alarmID; - alarmStatus.topAlarmConditionnDetected = alarmIsDetected[ alarmStatus.alarmTop ]; + alarmStatus.topAlarmConditionDetected = alarmIsDetected[ alarmStatus.alarmTop ]; alarmStatus.systemFault = faultsActive; alarmStatus.noDialRecirc = dialysateRecircBlocked; } @@ -913,7 +913,7 @@ } // Alarm table loop // If top alarm condition not cleared, block resume and rinseback flags - if ( TRUE == alarmStatus.topAlarmConditionnDetected ) + if ( TRUE == alarmStatus.topAlarmConditionDetected ) { noResume = TRUE; noRinseback = TRUE; @@ -922,7 +922,7 @@ // If top alarm requires user ack or no other user options enabled for recoverable alarm and condition cleared, set user ack flag and block other flags if ( ( TRUE == ALARM_TABLE[ alarmStatus.alarmTop ].alarmUserAckRequired ) || ( ( FALSE == alarmStatus.noClear ) && ( noResume ) && ( noRinseback ) && ( noEndTreatment ) && - ( FALSE == alarmStatus.topAlarmConditionnDetected ) ) ) + ( FALSE == alarmStatus.topAlarmConditionDetected ) ) ) { usrAckReq = TRUE; noResume = TRUE; Index: firmware/App/Services/AlarmMgmt.h =================================================================== diff -u -rce48f926049a50239537917cda7eff06557a80bf -r6dcc3d91f1f6095d6d3a722c2e3c2074d69be2a5 --- firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision ce48f926049a50239537917cda7eff06557a80bf) +++ firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 6dcc3d91f1f6095d6d3a722c2e3c2074d69be2a5) @@ -74,7 +74,7 @@ BOOL alarmsToEscalate; ///< Are any active alarms due to escalate (should UI show count down timer?) U32 alarmsEscalatesIn; ///< Time until alarm will escalate (seconds) ALARM_ID_T alarmTop; ///< ID of current top alarm that will drive lamp/audio and UI should be displaying right now - BOOL topAlarmConditionnDetected; ///< Condition for top alarm is still being detected + BOOL topAlarmConditionDetected; ///< Condition for top alarm is still being detected BOOL systemFault; ///< A system fault is active? BOOL stop; ///< We should be in controlled stop right now BOOL noClear; ///< No recovery will be possible Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -rce48f926049a50239537917cda7eff06557a80bf -r6dcc3d91f1f6095d6d3a722c2e3c2074d69be2a5 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision ce48f926049a50239537917cda7eff06557a80bf) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 6dcc3d91f1f6095d6d3a722c2e3c2074d69be2a5) @@ -1141,7 +1141,7 @@ payload.alarmsFlags |= ( almStatus.alarmsSilenced ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED) : 0 ); payload.alarmsFlags |= ( almStatus.lampOn ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_LAMP_ON) : 0 ); payload.alarmsFlags |= ( almStatus.noMinimize ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE) : 0 ); - payload.alarmsFlags |= ( almStatus.topAlarmConditionnDetected ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION) : 0 ); + payload.alarmsFlags |= ( almStatus.topAlarmConditionDetected ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION) : 0 ); memcpy( payloadPtr, &payload, sizeof( ALARM_COMP_STATUS_PAYLOAD_T ) );