Index: .cproject
===================================================================
diff -u -r6b268f0dd1a5c790c715abc289754bd59e7ad901 -r67c59954ab757ae9d57b3d80f2b3cb8087300be6
--- .cproject (.../.cproject) (revision 6b268f0dd1a5c790c715abc289754bd59e7ad901)
+++ .cproject (.../.cproject) (revision 67c59954ab757ae9d57b3d80f2b3cb8087300be6)
@@ -45,14 +45,13 @@
-
-
Index: App/Contollers/AlarmLamp.c
===================================================================
diff -u -r9aec79f151c686b730888c98f70f53ad958fe9b5 -r67c59954ab757ae9d57b3d80f2b3cb8087300be6
--- App/Contollers/AlarmLamp.c (.../AlarmLamp.c) (revision 9aec79f151c686b730888c98f70f53ad958fe9b5)
+++ App/Contollers/AlarmLamp.c (.../AlarmLamp.c) (revision 67c59954ab757ae9d57b3d80f2b3cb8087300be6)
@@ -34,7 +34,7 @@
{
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 yellow[NUM_OF_LAMP_STATES]; // yellow 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
};
@@ -62,8 +62,8 @@
{ { 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
{ { 500, 500 }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON, LAMP_STATE_OFF } }, // LAMP_PATTERN_HIGH_ALARM
- { { 1000, 1000 }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF } }, // LAMP_PATTERN_MED_ALARM
- { { 500, 500 }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON, LAMP_STATE_ON }, { LAMP_STATE_OFF, LAMP_STATE_OFF } }, // LAMP_PATTERN_LOW_ALARM
+ { { 1000, 1000 }, { LAMP_STATE_ON, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON, LAMP_STATE_OFF } }, // LAMP_PATTERN_MED_ALARM
+ { { 500, 500 }, { LAMP_STATE_ON, LAMP_STATE_ON }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON, LAMP_STATE_ON } }, // LAMP_PATTERN_LOW_ALARM
{ { 0, 0 }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF } } // LAMP_PATTERN_MANUAL
};
@@ -203,8 +203,7 @@
{
alarmLampSelfTestState = ALARM_LAMP_SELF_TEST_STATE_YELLOW;
alarmLampSelfTestStepTimerCount = getMSTimerCount();
- setCPLDLampRed( PIN_SIGNAL_LOW );
- setCPLDLampYellow( PIN_SIGNAL_HIGH );
+ setCPLDLampGreen( PIN_SIGNAL_HIGH ); // green + red = yellow
}
break;
@@ -213,8 +212,7 @@
{
alarmLampSelfTestState = ALARM_LAMP_SELF_TEST_STATE_GREEN;
alarmLampSelfTestStepTimerCount = getMSTimerCount();
- setCPLDLampYellow( PIN_SIGNAL_LOW );
- setCPLDLampGreen( PIN_SIGNAL_HIGH );
+ setCPLDLampRed( PIN_SIGNAL_LOW );
}
break;
@@ -254,24 +252,24 @@
static void setAlarmLampToPatternStep( void )
{
PIN_SIGNAL_STATE_T green = PIN_SIGNAL_LOW;
- PIN_SIGNAL_STATE_T yellow = PIN_SIGNAL_LOW;
+ PIN_SIGNAL_STATE_T blue = PIN_SIGNAL_LOW;
PIN_SIGNAL_STATE_T red = PIN_SIGNAL_LOW;
lampPatternStepTimer = 0;
if ( lampPatterns[currentLampPattern].green[currentLampPatternStep] == LAMP_STATE_ON )
{
green = PIN_SIGNAL_HIGH;
}
- if ( lampPatterns[currentLampPattern].yellow[currentLampPatternStep] == LAMP_STATE_ON )
+ if ( lampPatterns[currentLampPattern].blue[currentLampPatternStep] == LAMP_STATE_ON )
{
- yellow = PIN_SIGNAL_HIGH;
+ blue = PIN_SIGNAL_HIGH;
}
if ( lampPatterns[currentLampPattern].red[currentLampPatternStep] == LAMP_STATE_ON )
{
red = PIN_SIGNAL_HIGH;
}
setCPLDLampGreen( green );
- setCPLDLampYellow( yellow );
+ setCPLDLampBlue( blue );
setCPLDLampRed( red );
}
Index: App/Drivers/CPLD.c
===================================================================
diff -u -r9aec79f151c686b730888c98f70f53ad958fe9b5 -r67c59954ab757ae9d57b3d80f2b3cb8087300be6
--- App/Drivers/CPLD.c (.../CPLD.c) (revision 9aec79f151c686b730888c98f70f53ad958fe9b5)
+++ App/Drivers/CPLD.c (.../CPLD.c) (revision 67c59954ab757ae9d57b3d80f2b3cb8087300be6)
@@ -35,7 +35,7 @@
// LIN port pin assignments for pins connected to CPLD
#define GREEN_SPI5_PORT_MASK 0x00000200 // (CLK - re-purposed as output GPIO)
-#define YELLOW_SPI5_PORT_MASK 0x00000400 // (SIMO[0] - re-purposed as output GPIO)
+#define BLUE_SPI5_PORT_MASK 0x00000400 // (SIMO[0] - re-purposed as output GPIO)
#define RED_SPI5_PORT_MASK 0x00000800 // (SOMI[0] - re-purposed as output GPIO)
// CPLD pin I/O macros
@@ -48,13 +48,13 @@
#define SET_WD_PET() gioSetBit( gioPORTB, WD_PET_GIO_PORT_PIN, PIN_SIGNAL_HIGH )
#define SET_OFF_REQ() gioSetBit( gioPORTB, OFF_REQUEST_GIO_PORT_PIN, PIN_SIGNAL_HIGH )
#define SET_GREEN() mibspiREG5->PC3 |= GREEN_SPI5_PORT_MASK
-#define SET_YELLOW() mibspiREG5->PC3 |= YELLOW_SPI5_PORT_MASK
+#define SET_BLUE() mibspiREG5->PC3 |= BLUE_SPI5_PORT_MASK
#define SET_RED() mibspiREG5->PC3 |= RED_SPI5_PORT_MASK
#define CLR_WD_PET() gioSetBit( gioPORTB, WD_PET_GIO_PORT_PIN, PIN_SIGNAL_LOW )
#define CLR_OFF_REQ() gioSetBit( gioPORTB, OFF_REQUEST_GIO_PORT_PIN, PIN_SIGNAL_LOW )
#define CLR_GREEN() mibspiREG5->PC3 &= ~GREEN_SPI5_PORT_MASK
-#define CLR_YELLOW() mibspiREG5->PC3 &= ~YELLOW_SPI5_PORT_MASK
+#define CLR_BLUE() mibspiREG5->PC3 &= ~BLUE_SPI5_PORT_MASK
#define CLR_RED() mibspiREG5->PC3 &= ~RED_SPI5_PORT_MASK
/*************************************************************************
@@ -77,7 +77,7 @@
// initialize alarm lamp color LED outputs low (off)
CLR_GREEN();
CLR_RED();
- CLR_YELLOW();
+ CLR_BLUE();
// initialize the associated s/w modules
initAlarmLamp();
@@ -139,24 +139,24 @@
}
/*************************************************************************
- * @brief setCPLDLampYellow
- * The setCPLDLampYellow function sets the alarm lamp yellow signal to CPLD \n
+ * @brief setCPLDLampBlue
+ * The setCPLDLampBlue function sets the alarm lamp blue signal to CPLD \n
* to given level.
* @details
* Inputs : none
- * Outputs : alarm lamp yellow signal set to given level.
+ * Outputs : alarm lamp blue signal set to given level.
* @param level : LOW or HIGH
* @return none
*************************************************************************/
-void setCPLDLampYellow( PIN_SIGNAL_STATE_T level )
+void setCPLDLampBlue( PIN_SIGNAL_STATE_T level )
{
if ( level == PIN_SIGNAL_HIGH )
{
- SET_YELLOW();
+ SET_BLUE();
}
else
{
- CLR_YELLOW();
+ CLR_BLUE();
}
}
Index: App/Drivers/CPLD.h
===================================================================
diff -u -r9aec79f151c686b730888c98f70f53ad958fe9b5 -r67c59954ab757ae9d57b3d80f2b3cb8087300be6
--- App/Drivers/CPLD.h (.../CPLD.h) (revision 9aec79f151c686b730888c98f70f53ad958fe9b5)
+++ App/Drivers/CPLD.h (.../CPLD.h) (revision 67c59954ab757ae9d57b3d80f2b3cb8087300be6)
@@ -27,7 +27,7 @@
PIN_SIGNAL_STATE_T getCPLDWatchdogExpired( void );
void setCPLDLampGreen( PIN_SIGNAL_STATE_T level );
-void setCPLDLampYellow( PIN_SIGNAL_STATE_T level );
+void setCPLDLampBlue( PIN_SIGNAL_STATE_T level );
void setCPLDLampRed( PIN_SIGNAL_STATE_T level );
void toggleCPLDOffRequest( void );
Index: Debug/App/Contollers/subdir_rules.mk
===================================================================
diff -u -r6b268f0dd1a5c790c715abc289754bd59e7ad901 -r67c59954ab757ae9d57b3d80f2b3cb8087300be6
--- Debug/App/Contollers/subdir_rules.mk (.../subdir_rules.mk) (revision 6b268f0dd1a5c790c715abc289754bd59e7ad901)
+++ Debug/App/Contollers/subdir_rules.mk (.../subdir_rules.mk) (revision 67c59954ab757ae9d57b3d80f2b3cb8087300be6)
@@ -6,7 +6,7 @@
App/Contollers/%.obj: ../App/Contollers/%.c $(GEN_OPTS) | $(GEN_FILES)
@echo 'Building file: "$<"'
@echo 'Invoking: ARM Compiler'
- "/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/bin/armcl" -mv7R4 --code_state=32 --float_support=VFPv3D16 -me --include_path="/home/fw/workspace_HD/HD/hdproject/App" --include_path="/home/fw/workspace_HD/HD/hdproject/App/Tasks" --include_path="/home/fw/workspace_HD/HD/hdproject/App/Modes" --include_path="/home/fw/workspace_HD/HD/hdproject/App/Drivers" --include_path="/home/fw/workspace_HD/HD/hdproject/App/Contollers" --include_path="/home/fw/workspace_HD/HD/hdproject/App/Comm" --include_path="/home/fw/workspace_HD/HD/hdproject/App/Services" --include_path="/home/fw/workspace_HD/HD/hdproject" --include_path="/home/fw/workspace_HD/HD/hdproject/include" --include_path="/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/include" --define=__TI_VIM_128CH__ -g --diag_warning=225 --diag_wrap=off --display_error_number --enum_type=packed --abi=eabi --preproc_with_compile --preproc_dependency="App/Contollers/$(basename $(