Index: firmware/App/Controllers/AlarmLamp.c =================================================================== diff -u -ra0aca1a4d87df989303b4f7f41208a4916861afa -r1bbf9da32e622975efed00b1a7589387a9829440 --- firmware/App/Controllers/AlarmLamp.c (.../AlarmLamp.c) (revision a0aca1a4d87df989303b4f7f41208a4916861afa) +++ firmware/App/Controllers/AlarmLamp.c (.../AlarmLamp.c) (revision 1bbf9da32e622975efed00b1a7589387a9829440) @@ -33,10 +33,10 @@ // Lamp Pattern Record struct LampPatterns { - U32 duration[NUM_OF_LAMP_STATES]; // in ms - LAMP_STATE_T green[NUM_OF_LAMP_STATES]; // green lamp state 1 and 2 - LAMP_STATE_T blue[NUM_OF_LAMP_STATES]; // blue lamp state 1 and 2 - LAMP_STATE_T red[NUM_OF_LAMP_STATES]; // red lamp state 1 and 2 + U32 duration[NUM_OF_LAMP_STATES ]; // in ms + LAMP_STATE_T green[ NUM_OF_LAMP_STATES ]; // green lamp state 1 and 2 + LAMP_STATE_T blue[ NUM_OF_LAMP_STATES ]; // blue lamp state 1 and 2 + LAMP_STATE_T red[ NUM_OF_LAMP_STATES ]; // red lamp state 1 and 2 }; typedef enum Alarm_Lamp_Self_Test_States @@ -58,7 +58,7 @@ static U32 currentLampPatternStep = 0; static U32 lampPatternStepTimer = 0; -const struct LampPatterns lampPatterns[NUM_OF_LAMP_PATTERNS] = { +const struct LampPatterns lampPatterns[ 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 { { 500, 500 }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON, LAMP_STATE_OFF } }, // LAMP_PATTERN_FAULT @@ -125,7 +125,7 @@ if ( getCurrentAlarmLampPattern() != LAMP_PATTERN_MANUAL ) { // if pattern step duration has elapsed, move to next step - if ( lampPatternStepTimer >= lampPatterns[getCurrentAlarmLampPattern()].duration[currentLampPatternStep] ) + if ( lampPatternStepTimer >= lampPatterns[ getCurrentAlarmLampPattern() ].duration[ currentLampPatternStep ] ) { // increment pattern step currentLampPatternStep++; @@ -253,15 +253,15 @@ PIN_SIGNAL_STATE_T red = PIN_SIGNAL_LOW; lampPatternStepTimer = 0; - if ( lampPatterns[getCurrentAlarmLampPattern()].green[currentLampPatternStep] == LAMP_STATE_ON ) + if ( lampPatterns[ getCurrentAlarmLampPattern() ].green[ currentLampPatternStep ] == LAMP_STATE_ON ) { green = PIN_SIGNAL_HIGH; } - if ( lampPatterns[getCurrentAlarmLampPattern()].blue[currentLampPatternStep] == LAMP_STATE_ON ) + if ( lampPatterns[ getCurrentAlarmLampPattern() ].blue[ currentLampPatternStep ] == LAMP_STATE_ON ) { blue = PIN_SIGNAL_HIGH; } - if ( lampPatterns[getCurrentAlarmLampPattern()].red[currentLampPatternStep] == LAMP_STATE_ON ) + if ( lampPatterns[ getCurrentAlarmLampPattern() ].red[ currentLampPatternStep ] == LAMP_STATE_ON ) { red = PIN_SIGNAL_HIGH; }