Index: firmware/App/Controllers/AlarmLamp.c =================================================================== diff -u -ra2bc96881a5fc3d8f779246b2abebf15a8de9384 -r766708fceb0bdf1af8c7897df29d4f5036bfd3db --- firmware/App/Controllers/AlarmLamp.c (.../AlarmLamp.c) (revision a2bc96881a5fc3d8f779246b2abebf15a8de9384) +++ firmware/App/Controllers/AlarmLamp.c (.../AlarmLamp.c) (revision 766708fceb0bdf1af8c7897df29d4f5036bfd3db) @@ -71,7 +71,7 @@ static BOOL alarmLampOn = FALSE; ///< Flag indicates whether an any lamp is currently on. /// Two step alarm lamp patterns (repeating). -const struct LampPatterns lampPatterns[ NUM_OF_LAMP_PATTERNS ] = { +const struct LampPatterns LAMP_PATTERNS[ NUM_OF_LAMP_PATTERNS ] = { { { 500, 500 }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF } }, // LAMP_PATTERN_OFF { { 500, 500 }, { LAMP_STATE_ON, LAMP_STATE_ON }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF } }, // LAMP_PATTERN_OK { { 250, 250 }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON, LAMP_STATE_OFF } }, // LAMP_PATTERN_FAULT @@ -135,7 +135,7 @@ if ( getCurrentAlarmLampPattern() != LAMP_PATTERN_MANUAL ) { // If pattern step duration has elapsed, move to next step - if ( lampPatternStepTimer >= lampPatterns[ getCurrentAlarmLampPattern() ].duration[ currentLampPatternStep ] ) + if ( lampPatternStepTimer >= LAMP_PATTERNS[ getCurrentAlarmLampPattern() ].duration[ currentLampPatternStep ] ) { // Increment pattern step currentLampPatternStep++; @@ -177,7 +177,7 @@ * @details Outputs: none * @return currentLampPattern *************************************************************************/ -LAMP_PATTERN_T getCurrentAlarmLampPattern( void ) +LAMP_PATTERN_T getCurrentAlarmLampPattern( void ) { LAMP_PATTERN_T result = (LAMP_PATTERN_T)currentLampPattern.data; @@ -280,17 +280,17 @@ alarmLampOn = FALSE; lampPatternStepTimer = 0; - if ( lampPatterns[ getCurrentAlarmLampPattern() ].green[ currentLampPatternStep ] == LAMP_STATE_ON ) + if ( LAMP_PATTERNS[ getCurrentAlarmLampPattern() ].green[ currentLampPatternStep ] == LAMP_STATE_ON ) { green = PIN_SIGNAL_HIGH; alarmLampOn = TRUE; } - if ( lampPatterns[ getCurrentAlarmLampPattern() ].blue[ currentLampPatternStep ] == LAMP_STATE_ON ) + if ( LAMP_PATTERNS[ getCurrentAlarmLampPattern() ].blue[ currentLampPatternStep ] == LAMP_STATE_ON ) { blue = PIN_SIGNAL_HIGH; alarmLampOn = TRUE; } - if ( lampPatterns[ getCurrentAlarmLampPattern() ].red[ currentLampPatternStep ] == LAMP_STATE_ON ) + if ( LAMP_PATTERNS[ getCurrentAlarmLampPattern() ].red[ currentLampPatternStep ] == LAMP_STATE_ON ) { red = PIN_SIGNAL_HIGH; alarmLampOn = TRUE;