Index: .gitignore =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- .gitignore (.../.gitignore) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ .gitignore (.../.gitignore) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -19,3 +19,4 @@ *.dll *.so +/Debug/ Index: .launches/HD.launch =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- .launches/HD.launch (.../HD.launch) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ .launches/HD.launch (.../HD.launch) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,12 +1,16 @@ + + + + Index: App/Common.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Common.h (.../Common.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Common.h (.../Common.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -35,9 +35,9 @@ typedef enum Pin_Signal_States { - PIN_SIGNAL_LOW = 0, - PIN_SIGNAL_HIGH, - NUM_OF_PIN_SIGNAL_STATES + PIN_SIGNAL_LOW = 0, + PIN_SIGNAL_HIGH, + NUM_OF_PIN_SIGNAL_STATES } PIN_SIGNAL_STATE_T; // *** Common Definitions *** Index: App/Contollers/AlarmLamp.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Contollers/AlarmLamp.c (.../AlarmLamp.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Contollers/AlarmLamp.c (.../AlarmLamp.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file AlarmLamp.c -* -* @brief Controller for the alarm lamp. -* -* @date 20-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file AlarmLamp.c + * + * @brief Controller for the alarm lamp. + * + * @date 20-Sep-2019 + * + *************************************************************************/ #include "Common.h" #include "CPLD.h" @@ -23,34 +23,35 @@ typedef enum LampStates { - LAMP_STATE_OFF = 0, - LAMP_STATE_ON, - NUM_OF_LAMP_STATES + LAMP_STATE_OFF = 0, + LAMP_STATE_ON, + NUM_OF_LAMP_STATES } LAMP_STATE_T; // Lamp Pattern Record -struct LampPatterns { - uint32_t 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 red[NUM_OF_LAMP_STATES]; // red lamp state 1 and 2 +struct LampPatterns +{ + uint32_t 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 red[NUM_OF_LAMP_STATES]; // red lamp state 1 and 2 }; // ********** private data ********** static LAMP_PATTERN_T currentLampPattern = LAMP_PATTERN_OFF; static LAMP_PATTERN_T pendingLampPattern = LAMP_PATTERN_OFF; -static U32 currentLampPatternStep = 0; -static U32 lampPatternStepTimer = 0; +static U32 currentLampPatternStep = 0; +static U32 lampPatternStepTimer = 0; -static 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 - { {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 - { {0, 0}, {LAMP_STATE_OFF, LAMP_STATE_OFF}, {LAMP_STATE_OFF, LAMP_STATE_OFF}, {LAMP_STATE_OFF, LAMP_STATE_OFF} } // LAMP_PATTERN_MANUAL +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 + { { 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 + { { 0, 0 }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF } } // LAMP_PATTERN_MANUAL }; // ********** private function prototypes ********** @@ -65,13 +66,13 @@ * Outputs : AlarmLamp module initialized. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void initAlarmLamp( void ) { - currentLampPattern = LAMP_PATTERN_OFF; - pendingLampPattern = LAMP_PATTERN_OFF; - currentLampPatternStep = 0; - lampPatternStepTimer = 0; + currentLampPattern = LAMP_PATTERN_OFF; + pendingLampPattern = LAMP_PATTERN_OFF; + currentLampPatternStep = 0; + lampPatternStepTimer = 0; } /************************************************************************* @@ -84,39 +85,39 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void ExecuteAlarmLamp( void ) { - // if starting a new lamp pattern, reset pattern variables - if ( ( pendingLampPattern != currentLampPattern ) ) - { - currentLampPattern = pendingLampPattern; - currentLampPatternStep = 0; + // if starting a new lamp pattern, reset pattern variables + if ( pendingLampPattern != currentLampPattern ) + { + currentLampPattern = pendingLampPattern; + currentLampPatternStep = 0; - setAlarmLampToPatternStep(); - } - // otherwise, increment pattern timer - else - { - lampPatternStepTimer += TASK_GENERAL_INTERVAL; - } + setAlarmLampToPatternStep(); + } + // otherwise, increment pattern timer + else + { + lampPatternStepTimer += TASK_GENERAL_INTERVAL; + } - // control alarm lamp to currently set pattern (unless we're in manual pattern) - if ( currentLampPattern != LAMP_PATTERN_MANUAL ) - { - // if pattern step duration has elapsed, move to next step - if ( lampPatternStepTimer >= lampPatterns[currentLampPattern].duration[currentLampPatternStep] ) - { - // increment pattern step - currentLampPatternStep++; - if ( currentLampPatternStep >= NUM_OF_LAMP_STATES ) - { - currentLampPatternStep = 0; - } - // set lamps according to pattern step - setAlarmLampToPatternStep(); - } - } + // control alarm lamp to currently set pattern (unless we're in manual pattern) + if ( currentLampPattern != LAMP_PATTERN_MANUAL ) + { + // if pattern step duration has elapsed, move to next step + if ( lampPatternStepTimer >= lampPatterns[currentLampPattern].duration[currentLampPatternStep] ) + { + // increment pattern step + currentLampPatternStep++; + if ( currentLampPatternStep >= NUM_OF_LAMP_STATES ) + { + currentLampPatternStep = 0; + } + // set lamps according to pattern step + setAlarmLampToPatternStep(); + } + } } /************************************************************************* @@ -127,17 +128,17 @@ * Outputs : pendingLampPattern * @param lampPattern : new lamp pattern * @return none -*************************************************************************/ + *************************************************************************/ void RequestLampPattern( LAMP_PATTERN_T lampPattern ) { - if ( lampPattern < NUM_OF_LAMP_PATTERNS ) - { - pendingLampPattern = lampPattern; - } - else - { - // TODO - s/w fault - } + if ( lampPattern < NUM_OF_LAMP_PATTERNS ) + { + pendingLampPattern = lampPattern; + } + else + { + // TODO - s/w fault + } } /************************************************************************* @@ -149,28 +150,28 @@ * Outputs : lampPatternStepTimer reset. Lamps set per current pattern. * @param lampPattern : new lamp pattern * @return none -*************************************************************************/ + *************************************************************************/ void setAlarmLampToPatternStep( void ) { - PIN_SIGNAL_STATE_T green = PIN_SIGNAL_LOW; - PIN_SIGNAL_STATE_T yellow = PIN_SIGNAL_LOW; - PIN_SIGNAL_STATE_T red = PIN_SIGNAL_LOW; + PIN_SIGNAL_STATE_T green = PIN_SIGNAL_LOW; + PIN_SIGNAL_STATE_T yellow = 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 ) - { - yellow = PIN_SIGNAL_HIGH; - } - if ( lampPatterns[currentLampPattern].red[currentLampPatternStep] == LAMP_STATE_ON ) - { - red = PIN_SIGNAL_HIGH; - } + lampPatternStepTimer = 0; + if ( lampPatterns[currentLampPattern].green[currentLampPatternStep] == LAMP_STATE_ON ) + { + green = PIN_SIGNAL_HIGH; + } + if ( lampPatterns[currentLampPattern].yellow[currentLampPatternStep] == LAMP_STATE_ON ) + { + yellow = PIN_SIGNAL_HIGH; + } + if ( lampPatterns[currentLampPattern].red[currentLampPatternStep] == LAMP_STATE_ON ) + { + red = PIN_SIGNAL_HIGH; + } - setCPLDLampGreen( green ); - setCPLDLampYellow( yellow ); - setCPLDLampRed( red ); + setCPLDLampGreen( green ); + setCPLDLampYellow( yellow ); + setCPLDLampRed( red ); } Index: App/Contollers/AlarmLamp.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Contollers/AlarmLamp.h (.../AlarmLamp.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Contollers/AlarmLamp.h (.../AlarmLamp.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file AlarmLamp.h -* -* @brief Header file for Alarm Lamp module. -* -* @date 20-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file AlarmLamp.h + * + * @brief Header file for Alarm Lamp module. + * + * @date 20-Sep-2019 + * + *************************************************************************/ #ifndef __ALARM_LAMP_H__ #define __ALARM_LAMP_H__ @@ -21,14 +21,14 @@ typedef enum LampPatternEnum { - LAMP_PATTERN_OFF = 0, - LAMP_PATTERN_OK, - LAMP_PATTERN_FAULT, - LAMP_PATTERN_HIGH_ALARM, - LAMP_PATTERN_MED_ALARM, - LAMP_PATTERN_LOW_ALARM, - LAMP_PATTERN_MANUAL, - NUM_OF_LAMP_PATTERNS + LAMP_PATTERN_OFF = 0, + LAMP_PATTERN_OK, + LAMP_PATTERN_FAULT, + LAMP_PATTERN_HIGH_ALARM, + LAMP_PATTERN_MED_ALARM, + LAMP_PATTERN_LOW_ALARM, + LAMP_PATTERN_MANUAL, + NUM_OF_LAMP_PATTERNS } LAMP_PATTERN_T; // ********** public function prototypes ********** Index: App/Contollers/Buttons.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Contollers/Buttons.c (.../Buttons.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Contollers/Buttons.c (.../Buttons.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file Buttons.c -* -* @brief Monitor/Controller for the off and stop buttons. -* -* @date 20-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file Buttons.c + * + * @brief Monitor/Controller for the off and stop buttons. + * + * @date 20-Sep-2019 + * + *************************************************************************/ #include "Common.h" #include "CPLD.h" @@ -24,9 +24,9 @@ typedef enum Button_States { - BUTTON_STATE_RELEASED = 0, // Fault - BUTTON_STATE_PRESSED, // Service - NUM_OF_BUTTON_STATES + BUTTON_STATE_RELEASED = 0, // Fault + BUTTON_STATE_PRESSED, // Service + NUM_OF_BUTTON_STATES } BUTTON_STATE_T; #define OFF_REQUEST_PULSE_COUNT 4 @@ -36,14 +36,14 @@ static BUTTON_STATE_T offButtonState = BUTTON_STATE_RELEASED; static BUTTON_STATE_T prevOffButtonState = BUTTON_STATE_RELEASED; -static BOOL offButtonPressPending = FALSE; +static BOOL offButtonPressPending = FALSE; static BUTTON_STATE_T stopButtonState = BUTTON_STATE_RELEASED; static BUTTON_STATE_T prevStopButtonState = BUTTON_STATE_RELEASED; -static BOOL stopButtonPressPending = FALSE; +static BOOL stopButtonPressPending = FALSE; -static U32 offRequestPulseCount = 0; -static U32 offRequestPulseTimer = 0; +static U32 offRequestPulseCount = 0; +static U32 offRequestPulseTimer = 0; // ********** private function prototypes ********** @@ -59,19 +59,19 @@ * Outputs : Buttons module initialized. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void initButtons( void ) { - offButtonState = BUTTON_STATE_RELEASED; - prevOffButtonState = BUTTON_STATE_RELEASED; - offButtonPressPending = FALSE; + offButtonState = BUTTON_STATE_RELEASED; + prevOffButtonState = BUTTON_STATE_RELEASED; + offButtonPressPending = FALSE; - stopButtonState = BUTTON_STATE_RELEASED; - prevStopButtonState = BUTTON_STATE_RELEASED; - stopButtonPressPending = FALSE; + stopButtonState = BUTTON_STATE_RELEASED; + prevStopButtonState = BUTTON_STATE_RELEASED; + stopButtonPressPending = FALSE; - offRequestPulseCount = 0; - offRequestPulseTimer = 0; + offRequestPulseCount = 0; + offRequestPulseTimer = 0; } /************************************************************************* @@ -82,21 +82,21 @@ * Outputs : offButtonState, stopButtonState, prevOffButtonState, prevStopButtonState * @param none * @return none -*************************************************************************/ + *************************************************************************/ void execButtons( void ) { - PIN_SIGNAL_STATE_T off = getCPLDOffButton(); - PIN_SIGNAL_STATE_T stop = getCPLDStopButton(); + PIN_SIGNAL_STATE_T off = getCPLDOffButton(); + PIN_SIGNAL_STATE_T stop = getCPLDStopButton(); - // set current button states read from CPLD - offButtonState = ( off == PIN_SIGNAL_HIGH ? BUTTON_STATE_PRESSED : BUTTON_STATE_RELEASED ); - stopButtonState = ( stop == PIN_SIGNAL_HIGH ? BUTTON_STATE_PRESSED : BUTTON_STATE_RELEASED ); + // set current button states read from CPLD + offButtonState = ( off == PIN_SIGNAL_HIGH ? BUTTON_STATE_PRESSED : BUTTON_STATE_RELEASED ); + stopButtonState = ( stop == PIN_SIGNAL_HIGH ? BUTTON_STATE_PRESSED : BUTTON_STATE_RELEASED ); - // handle button state transitions for stop button - handleStopButtonProcessing(); + // handle button state transitions for stop button + handleStopButtonProcessing(); - // handle button state transitions for off button - handleOffButtonProcessing(); + // handle button state transitions for off button + handleOffButtonProcessing(); } /************************************************************************* @@ -109,15 +109,15 @@ * Outputs : stopButtonPressPending * @param button * @return true if the stop button is pressed, false if not -*************************************************************************/ + *************************************************************************/ BOOL isStopButtonPressed( void ) { - BOOL result = FALSE; + BOOL result = FALSE; - result = stopButtonPressPending; - stopButtonPressPending = FALSE; + result = stopButtonPressPending; + stopButtonPressPending = FALSE; - return result; + return result; } /************************************************************************* @@ -129,31 +129,31 @@ * Outputs : none * @param button * @return true if given button is pressed, false if not -*************************************************************************/ + *************************************************************************/ BOOL isButtonPressedRaw( BUTTON_T button ) { - BOOL result = FALSE; + BOOL result = FALSE; - switch (button) - { - case BUTTON_OFF: - if ( offButtonState == BUTTON_STATE_PRESSED ) - { - result = TRUE; - } - break; - case BUTTON_STOP: - if ( stopButtonState == BUTTON_STATE_PRESSED ) - { - result = TRUE; - } - break; - default: - // TODO - s/w fault - break; - } + switch ( button ) + { + case BUTTON_OFF: + if ( offButtonState == BUTTON_STATE_PRESSED ) + { + result = TRUE; + } + break; + case BUTTON_STOP: + if ( stopButtonState == BUTTON_STATE_PRESSED ) + { + result = TRUE; + } + break; + default: + // TODO - s/w fault + break; + } - return result; + return result; } /************************************************************************* @@ -165,17 +165,17 @@ * Outputs : stopButtonPressPending * @param none * @return none -*************************************************************************/ + *************************************************************************/ void userConfirmOffButton( void ) { - OP_MODE opMode = getCurrentOperationMode(); + OP_MODE opMode = getCurrentOperationMode(); - if ( ( opMode == MODE_STAN ) || ( opMode == MODE_SERV ) || ( opMode == MODE_FAUL ) ) - { - offButtonPressPending = TRUE; - offRequestPulseCount = OFF_REQUEST_PULSE_COUNT; - offRequestPulseTimer = 0; - } + if ( ( opMode == MODE_STAN ) || ( opMode == MODE_SERV ) || ( opMode == MODE_FAUL ) ) + { + offButtonPressPending = TRUE; + offRequestPulseCount = OFF_REQUEST_PULSE_COUNT; + offRequestPulseTimer = 0; + } } /************************************************************************* @@ -187,41 +187,41 @@ * Outputs : offButtonPressPending, offRequestPulseCount, offRequestPulseTimer * @param none * @return none -*************************************************************************/ + *************************************************************************/ static void handleOffButtonProcessing( void ) { - // handle button state transitions for off button - if ( offButtonState != prevOffButtonState ) - { - if ( offButtonState == BUTTON_STATE_PRESSED ) - { - OP_MODE opMode = getCurrentOperationMode(); + // handle button state transitions for off button + if ( offButtonState != prevOffButtonState ) + { + if ( offButtonState == BUTTON_STATE_PRESSED ) + { + OP_MODE opMode = getCurrentOperationMode(); - // if off request in a valid mode, send to UI for user confirmation - if ( ( opMode == MODE_STAN ) || ( opMode == MODE_SERV ) || ( opMode == MODE_FAUL ) ) - { - // TODO - send off button to UI for user confirmation - // temporary - just pretend user confirmed for now - userConfirmOffButton(); - } - } - prevOffButtonState = offButtonState; - } + // if off request in a valid mode, send to UI for user confirmation + if ( ( opMode == MODE_STAN ) || ( opMode == MODE_SERV ) || ( opMode == MODE_FAUL ) ) + { + // TODO - send off button to UI for user confirmation + // temporary - just pretend user confirmed for now + userConfirmOffButton(); + } + } + prevOffButtonState = offButtonState; + } - if ( TRUE == offButtonPressPending ) - { - offRequestPulseTimer += TASK_PRIORITY_INTERVAL; - if ( offRequestPulseTimer >= OFF_REQUEST_PULSE_INTVL ) - { - offRequestPulseTimer = 0; - offRequestPulseCount--; - if ( offRequestPulseCount == 0 ) - { - offButtonPressPending = false; - } - pulseOffRequestSignal(); - } - } + if ( TRUE == offButtonPressPending ) + { + offRequestPulseTimer += TASK_PRIORITY_INTERVAL; + if ( offRequestPulseTimer >= OFF_REQUEST_PULSE_INTVL ) + { + offRequestPulseTimer = 0; + offRequestPulseCount--; + if ( offRequestPulseCount == 0 ) + { + offButtonPressPending = false; + } + pulseOffRequestSignal(); + } + } } /************************************************************************* @@ -232,14 +232,15 @@ * Outputs : off request signal pulsed * @param none * @return none -*************************************************************************/ + *************************************************************************/ static void pulseOffRequestSignal( void ) { - U32 d; + U32 d; - setCPLDOffRequest( PIN_SIGNAL_HIGH ); - for ( d = 0; d < 1000; d++ ); // ok to block briefly because we're shutting down anyway - setCPLDOffRequest( PIN_SIGNAL_LOW ); + setCPLDOffRequest( PIN_SIGNAL_HIGH ); + for ( d = 0; d < 1000; d++ ) + ; // ok to block briefly because we're shutting down anyway + setCPLDOffRequest( PIN_SIGNAL_LOW ); } /************************************************************************* @@ -251,18 +252,17 @@ * Outputs : stopButtonPressPending * @param none * @return none -*************************************************************************/ + *************************************************************************/ static void handleStopButtonProcessing( void ) { - // handle button state transitions for stop button if ( stopButtonState != prevStopButtonState ) - if ( stopButtonState != prevStopButtonState ) - { - if ( stopButtonState == BUTTON_STATE_PRESSED ) - { - stopButtonPressPending = TRUE; - } - prevStopButtonState = stopButtonState; - } + // handle button state transitions for stop button if ( stopButtonState != prevStopButtonState ) + if ( stopButtonState != prevStopButtonState ) + { + if ( stopButtonState == BUTTON_STATE_PRESSED ) + { + stopButtonPressPending = TRUE; + } + prevStopButtonState = stopButtonState; + } } - Index: App/Contollers/Buttons.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Contollers/Buttons.h (.../Buttons.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Contollers/Buttons.h (.../Buttons.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file Buttons.h -* -* @brief Buttons header file. -* -* @date 20-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file Buttons.h + * + * @brief Buttons header file. + * + * @date 20-Sep-2019 + * + *************************************************************************/ #ifndef __BUTTONS_H__ #define __BUTTONS_H__ @@ -23,9 +23,9 @@ typedef enum Buttons { - BUTTON_OFF = 0, // Off button - BUTTON_STOP, // Stop button - NUM_OF_BUTTONS + BUTTON_OFF = 0, // Off button + BUTTON_STOP, // Stop button + NUM_OF_BUTTONS } BUTTON_T; // ********** public function prototypes ********** Index: App/Contollers/SafetyShutdown.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Contollers/SafetyShutdown.c (.../SafetyShutdown.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Contollers/SafetyShutdown.c (.../SafetyShutdown.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file SafetyShutdown.c -* -* @brief Controller for the safety shutdown signal. -* -* @date 20-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file SafetyShutdown.c + * + * @brief Controller for the safety shutdown signal. + * + * @date 20-Sep-2019 + * + *************************************************************************/ #include "gio.h" @@ -36,10 +36,10 @@ * Outputs : Safety Shutdown module signal output set to initial state. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void initSafetyShutdown( void ) { - CLR_SAFETY_SHUTDOWN(); + CLR_SAFETY_SHUTDOWN(); } /************************************************************************* @@ -50,9 +50,9 @@ * Outputs : Safety Shutdown signal output set to active state. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void activateSafetyShutdown( void ) { - SET_SAFETY_SHUTDOWN(); + SET_SAFETY_SHUTDOWN(); } Index: App/Contollers/SafetyShutdown.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Contollers/SafetyShutdown.h (.../SafetyShutdown.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Contollers/SafetyShutdown.h (.../SafetyShutdown.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file SafetyShutdown.h -* -* @brief Header file for Safety Shutdown Controller. -* -* @date 20-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file SafetyShutdown.h + * + * @brief Header file for Safety Shutdown Controller. + * + * @date 20-Sep-2019 + * + *************************************************************************/ #ifndef __SAFETY_SHUTDOWN_H__ #define __SAFETY_SHUTDOWN_H__ Index: App/Contollers/WatchdogMgmt.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Contollers/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Contollers/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file WatchdogMgmt.c -* -* @brief Monitor for the off and stop buttons. -* -* @date 20-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file WatchdogMgmt.c + * + * @brief Monitor for the off and stop buttons. + * + * @date 20-Sep-2019 + * + *************************************************************************/ #include "Common.h" #include "CPLD.h" @@ -34,10 +34,10 @@ * Outputs : Watchdog mgmt. module initialized. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void initWatchdogMgmt( void ) { - resetWDTaskCheckIns(); + resetWDTaskCheckIns(); } /************************************************************************* @@ -48,38 +48,39 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void execWatchdogMgmt( void ) { - BOOL allTasksCheckedIn = TRUE; - U32 i; + BOOL allTasksCheckedIn = TRUE; + U32 i; - // called by background task, so give bg task credit for checking in - checkInWithWatchdogMgmt( TASK_BG ); + // called by background task, so give bg task credit for checking in + checkInWithWatchdogMgmt( TASK_BG ); - // check to see if all monitored tasks have checked in - for ( i = 0; i < NUM_OF_TASKS; i++ ) - { - if ( FALSE == watchdogTaskCheckedIn[i] ) - { - allTasksCheckedIn = FALSE; - break; - } - } + // check to see if all monitored tasks have checked in + for ( i = 0; i < NUM_OF_TASKS; i++ ) + { + if ( FALSE == watchdogTaskCheckedIn[i] ) + { + allTasksCheckedIn = FALSE; + break; + } + } - // if all monitored tasks checked in, pet watchdog and clear the slate - if ( TRUE == allTasksCheckedIn ) - { - U32 d; + // if all monitored tasks checked in, pet watchdog and clear the slate + if ( TRUE == allTasksCheckedIn ) + { + U32 d; - // pulse the watchdog signal - setCPLDWatchdog( PIN_SIGNAL_HIGH ); - for ( d = 0; d < 1000; d++ ); // ok to block briefly because we're in the background (idle) task - setCPLDWatchdog( PIN_SIGNAL_LOW ); + // pulse the watchdog signal + setCPLDWatchdog( PIN_SIGNAL_HIGH ); + for ( d = 0; d < 1000; d++ ) + ; // ok to block briefly because we're in the background (idle) task + setCPLDWatchdog( PIN_SIGNAL_LOW ); - // reset task check-ins - resetWDTaskCheckIns(); - } + // reset task check-ins + resetWDTaskCheckIns(); + } } /************************************************************************* @@ -91,13 +92,13 @@ * Outputs : task is checked in with the watchdog mgmt.. * @param task : the task that is checking in with the watchdog mgmt. * @return none -*************************************************************************/ + *************************************************************************/ void checkInWithWatchdogMgmt( TASK_T task ) { - if ( task < NUM_OF_TASKS ) - { - watchdogTaskCheckedIn[task] = TRUE; - } + if ( task < NUM_OF_TASKS ) + { + watchdogTaskCheckedIn[task] = TRUE; + } } /************************************************************************* @@ -108,15 +109,15 @@ * Outputs : watchdogTaskCheckedIn[] array reset to all false. * @param none * @return none -*************************************************************************/ + *************************************************************************/ static void resetWDTaskCheckIns( void ) { - U32 i; + U32 i; - // initialize task check-ins to false - for ( i = 0; i < NUM_OF_TASKS; i++ ) - { - watchdogTaskCheckedIn[i] = FALSE; - } + // initialize task check-ins to false + for ( i = 0; i < NUM_OF_TASKS; i++ ) + { + watchdogTaskCheckedIn[i] = FALSE; + } } Index: App/Contollers/WatchdogMgmt.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Contollers/WatchdogMgmt.h (.../WatchdogMgmt.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Contollers/WatchdogMgmt.h (.../WatchdogMgmt.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file WatchdogMgmt.h -* -* @brief Header file for the watchdog management service. -* -* @date 20-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file WatchdogMgmt.h + * + * @brief Header file for the watchdog management service. + * + * @date 20-Sep-2019 + * + *************************************************************************/ #ifndef __WATCHDOG_MGMT_H__ #define __WATCHDOG_MGMT_H__ @@ -21,11 +21,11 @@ typedef enum Tasks { - TASK_BG = 0, // Background - TASK_GENERAL, // General - TASK_PRIORITY, // Priority - TASK_TIMER, // Timer - NUM_OF_TASKS + TASK_BG = 0, // Background + TASK_GENERAL, // General + TASK_PRIORITY, // Priority + TASK_TIMER, // Timer + NUM_OF_TASKS } TASK_T; // ********** public function prototypes ********** Index: App/Drivers/CPLD.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Drivers/CPLD.c (.../CPLD.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Drivers/CPLD.c (.../CPLD.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file CPLD.c -* -* @brief Monitor/Controller for the CPLD. -* -* @date 20-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file CPLD.c + * + * @brief Monitor/Controller for the CPLD. + * + * @date 20-Sep-2019 + * + *************************************************************************/ #include "gio.h" #include "lin.h" @@ -64,24 +64,24 @@ * Outputs : CPLD module signal outputs set to initial states. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void initCPLD( void ) { - // initialize watchdog pet output low (inactive) - CLR_WD_PET(); + // initialize watchdog pet output low (inactive) + CLR_WD_PET(); - // initialize power off request output low (inactive) - CLR_OFF_REQ(); + // initialize power off request output low (inactive) + CLR_OFF_REQ(); - // initialize alarm lamp color LED outputs low (off) - CLR_GREEN(); - CLR_RED(); - CLR_YELLOW(); + // initialize alarm lamp color LED outputs low (off) + CLR_GREEN(); + CLR_RED(); + CLR_YELLOW(); - // initialize the associated s/w modules - initAlarmLamp(); - initButtons(); - initWatchdogMgmt(); + // initialize the associated s/w modules + initAlarmLamp(); + initButtons(); + initWatchdogMgmt(); } /************************************************************************* @@ -93,17 +93,17 @@ * Outputs : watchdog pet signal set to given level. * @param level : LOW or HIGH * @return none -*************************************************************************/ + *************************************************************************/ void setCPLDWatchdog( PIN_SIGNAL_STATE_T level ) { - if ( level == PIN_SIGNAL_HIGH ) - { - SET_WD_PET(); - } - else - { - CLR_WD_PET(); - } + if ( level == PIN_SIGNAL_HIGH ) + { + SET_WD_PET(); + } + else + { + CLR_WD_PET(); + } } /************************************************************************* @@ -115,12 +115,12 @@ * Outputs : none * @param none * @return level : (LOW or HIGH) -*************************************************************************/ + *************************************************************************/ PIN_SIGNAL_STATE_T getCPLDWatchdogExpired( void ) { - PIN_SIGNAL_STATE_T level = GET_WD_EXP(); + PIN_SIGNAL_STATE_T level = GET_WD_EXP(); - return level; + return level; } /************************************************************************* @@ -132,17 +132,17 @@ * Outputs : alarm lamp green signal set to given level. * @param level : LOW or HIGH * @return none -*************************************************************************/ + *************************************************************************/ void setCPLDLampGreen( PIN_SIGNAL_STATE_T level ) { - if ( level == PIN_SIGNAL_HIGH ) - { - SET_GREEN(); - } - else - { - CLR_GREEN(); - } + if ( level == PIN_SIGNAL_HIGH ) + { + SET_GREEN(); + } + else + { + CLR_GREEN(); + } } /************************************************************************* @@ -154,17 +154,17 @@ * Outputs : alarm lamp yellow signal set to given level. * @param level : LOW or HIGH * @return none -*************************************************************************/ + *************************************************************************/ void setCPLDLampYellow( PIN_SIGNAL_STATE_T level ) { - if ( level == PIN_SIGNAL_HIGH ) - { - SET_YELLOW(); - } - else - { - CLR_YELLOW(); - } + if ( level == PIN_SIGNAL_HIGH ) + { + SET_YELLOW(); + } + else + { + CLR_YELLOW(); + } } /************************************************************************* @@ -176,17 +176,17 @@ * Outputs : alarm lamp red signal set to given level. * @param level : LOW or HIGH * @return none -*************************************************************************/ + *************************************************************************/ void setCPLDLampRed( PIN_SIGNAL_STATE_T level ) { - if ( level == PIN_SIGNAL_HIGH ) - { - SET_RED(); - } - else - { - CLR_RED(); - } + if ( level == PIN_SIGNAL_HIGH ) + { + SET_RED(); + } + else + { + CLR_RED(); + } } /************************************************************************* @@ -198,17 +198,17 @@ * Outputs : off request signal set to given level. * @param level : LOW or HIGH * @return none -*************************************************************************/ + *************************************************************************/ void setCPLDOffRequest( PIN_SIGNAL_STATE_T level ) { - if ( level == PIN_SIGNAL_HIGH ) - { - SET_OFF_REQ(); - } - else - { - CLR_OFF_REQ(); - } + if ( level == PIN_SIGNAL_HIGH ) + { + SET_OFF_REQ(); + } + else + { + CLR_OFF_REQ(); + } } /************************************************************************* @@ -220,12 +220,12 @@ * Outputs : none * @param none * @return level : (LOW or HIGH) -*************************************************************************/ + *************************************************************************/ PIN_SIGNAL_STATE_T getCPLDOffButton( void ) { - PIN_SIGNAL_STATE_T level = GET_OFF(); + PIN_SIGNAL_STATE_T level = GET_OFF(); - return level; + return level; } /************************************************************************* @@ -237,11 +237,11 @@ * Outputs : none * @param none * @return level : (LOW or HIGH) -*************************************************************************/ + *************************************************************************/ PIN_SIGNAL_STATE_T getCPLDStopButton( void ) { - PIN_SIGNAL_STATE_T level = GET_STOP(); + PIN_SIGNAL_STATE_T level = GET_STOP(); - return level; + return level; } Index: App/Drivers/CPLD.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Drivers/CPLD.h (.../CPLD.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Drivers/CPLD.h (.../CPLD.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file CPLD.h -* -* @brief header file for CPLD driver . -* -* @date 20-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file CPLD.h + * + * @brief header file for CPLD driver . + * + * @date 20-Sep-2019 + * + *************************************************************************/ #ifndef __CPLD_H__ #define __CPLD_H__ Index: App/Modes/ModeFault.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/ModeFault.c (.../ModeFault.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/ModeFault.c (.../ModeFault.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file ModeFault.c -* -* @brief Top-level state machine for the fault mode. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file ModeFault.c + * + * @brief Top-level state machine for the fault mode. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #include "Common.h" #include "OperationModes.h" @@ -30,7 +30,7 @@ * Outputs : Fault Mode module initialized. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void initFaultMode( void ) { } @@ -43,7 +43,7 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void transitionToFaultMode( void ) { } @@ -56,7 +56,7 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void execFaultMode( void ) { } Index: App/Modes/ModeFault.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/ModeFault.h (.../ModeFault.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/ModeFault.h (.../ModeFault.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,26 +1,26 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file ModeFault.h -* -* @brief Header file for Fault Mode. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file ModeFault.h + * + * @brief Header file for Fault Mode. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #ifndef __MODE_FAULT_H__ #define __MODE_FAULT_H__ // ********** private function prototypes ********** void initFaultMode( void ); // initialize this module -void transitionToFaultMode( void ); // prepares for transition to fault mode +void transitionToFaultMode( void ); // prepares for transition to fault mode void execFaultMode( void ); // execute the fault mode state machine (call from OperationModes) #endif Index: App/Modes/ModeInitPOST.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file ModeInitPOST.c -* -* @brief Top-level state machine for the initialize & POST mode. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file ModeInitPOST.c + * + * @brief Top-level state machine for the initialize & POST mode. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #include "Common.h" #include "AlarmLamp.h" @@ -33,7 +33,7 @@ * Outputs : Initialize & POST Mode module initialized. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void initInitAndPOSTMode( void ) { } @@ -47,12 +47,12 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void transitionToInitAndPOSTMode( void ) { - // temporary test code - solid red alarm lamp - RequestLampPattern( LAMP_PATTERN_MANUAL ); - setCPLDLampRed( PIN_SIGNAL_HIGH ); + // temporary test code - solid red alarm lamp + RequestLampPattern( LAMP_PATTERN_MANUAL ); + setCPLDLampRed( PIN_SIGNAL_HIGH ); } /************************************************************************* @@ -63,14 +63,14 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void execInitAndPOSTMode( void ) { - BOOL stop = isStopButtonPressed(); + BOOL stop = isStopButtonPressed(); - if ( TRUE == stop ) - { - requestNewOperationMode( MODE_STAN ); - } + if ( TRUE == stop ) + { + requestNewOperationMode( MODE_STAN ); + } } Index: App/Modes/ModeInitPOST.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/ModeInitPOST.h (.../ModeInitPOST.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/ModeInitPOST.h (.../ModeInitPOST.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,26 +1,26 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file ModeInitPOST.h -* -* @brief Header file for Initialization and POST Mode. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file ModeInitPOST.h + * + * @brief Header file for Initialization and POST Mode. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #ifndef __MODE_INIT_POST_H__ #define __MODE_INIT_POST_H__ // ********** private function prototypes ********** void initInitAndPOSTMode( void ); // initialize this module -void transitionToInitAndPOSTMode( void ); // prepares for transition to init. & POST mode +void transitionToInitAndPOSTMode( void ); // prepares for transition to init. & POST mode void execInitAndPOSTMode( void ); // execute the init. & POST mode state machine (call from OperationModes) #endif Index: App/Modes/ModeOpParams.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/ModeOpParams.c (.../ModeOpParams.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/ModeOpParams.c (.../ModeOpParams.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file ModeOpParams.c -* -* @brief Top-level state machine for the operating parameters mode. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file ModeOpParams.c + * + * @brief Top-level state machine for the operating parameters mode. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #include "Common.h" #include "AlarmLamp.h" @@ -32,7 +32,7 @@ * Outputs : Operating Parameters Mode module initialized. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void initOpParamsMode( void ) { } @@ -46,11 +46,11 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void transitionToOpParamsMode( void ) { - // temporary test code - alarm lamp fault - RequestLampPattern( LAMP_PATTERN_FAULT ); + // temporary test code - alarm lamp fault + RequestLampPattern( LAMP_PATTERN_FAULT ); } /************************************************************************* @@ -61,14 +61,14 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void execOpParamsMode( void ) { - BOOL stop = isStopButtonPressed(); + BOOL stop = isStopButtonPressed(); - if ( TRUE == stop ) - { - requestNewOperationMode( MODE_PRET ); - } + if ( TRUE == stop ) + { + requestNewOperationMode( MODE_PRET ); + } } Index: App/Modes/ModeOpParams.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/ModeOpParams.h (.../ModeOpParams.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/ModeOpParams.h (.../ModeOpParams.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,26 +1,26 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file ModeOpParams.h -* -* @brief Header file for Operating Parameters Mode. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file ModeOpParams.h + * + * @brief Header file for Operating Parameters Mode. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #ifndef __MODE_OP_PARAMS_H__ #define __MODE_OP_PARAMS_H__ // ********** private function prototypes ********** void initOpParamsMode( void ); // initialize this module -void transitionToOpParamsMode( void ); // prepares for transition to operating parameters mode +void transitionToOpParamsMode( void ); // prepares for transition to operating parameters mode void execOpParamsMode( void ); // execute the operating parameters mode state machine (call from OperationModes) #endif Index: App/Modes/ModePostTreat.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file ModePostTreat.c -* -* @brief Top-level state machine for the post-treatment mode. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file ModePostTreat.c + * + * @brief Top-level state machine for the post-treatment mode. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #include "Common.h" #include "AlarmLamp.h" @@ -32,7 +32,7 @@ * Outputs : Post-Treatment Mode module initialized. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void initPostTreatmentMode( void ) { } @@ -46,11 +46,11 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void transitionToPostTreatmentMode( void ) { - // temporary test code - alarm lamp high alarm - RequestLampPattern( LAMP_PATTERN_HIGH_ALARM ); + // temporary test code - alarm lamp high alarm + RequestLampPattern( LAMP_PATTERN_HIGH_ALARM ); } /************************************************************************* @@ -61,14 +61,14 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void execPostTreatmentMode( void ) { - BOOL stop = isStopButtonPressed(); + BOOL stop = isStopButtonPressed(); - if ( TRUE == stop ) - { - requestNewOperationMode( MODE_STAN ); - } + if ( TRUE == stop ) + { + requestNewOperationMode( MODE_STAN ); + } } Index: App/Modes/ModePostTreat.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/ModePostTreat.h (.../ModePostTreat.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/ModePostTreat.h (.../ModePostTreat.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file ModePostTreat.h -* -* @brief Header file for Post-Treatment Mode. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file ModePostTreat.h + * + * @brief Header file for Post-Treatment Mode. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #ifndef __MODE_POST_TREATMENT_H__ #define __MODE_POST_TREATMENT_H__ Index: App/Modes/ModePrescription.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/ModePrescription.c (.../ModePrescription.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/ModePrescription.c (.../ModePrescription.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file ModePrescription.c -* -* @brief Top-level state machine for the prescription mode. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file ModePrescription.c + * + * @brief Top-level state machine for the prescription mode. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #include "Common.h" #include "AlarmLamp.h" @@ -32,7 +32,7 @@ * Outputs : Prescription Mode module initialized. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void initPrescriptionMode( void ) { } @@ -46,11 +46,11 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void transitionToPrescriptionMode( void ) { - // temporary test code - alarm lamp Off - RequestLampPattern( LAMP_PATTERN_OFF ); + // temporary test code - alarm lamp Off + RequestLampPattern( LAMP_PATTERN_OFF ); } /************************************************************************* @@ -61,14 +61,14 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void execPrescriptionMode( void ) { - BOOL stop = isStopButtonPressed(); + BOOL stop = isStopButtonPressed(); - if ( TRUE == stop ) - { - requestNewOperationMode( MODE_OPAR ); - } + if ( TRUE == stop ) + { + requestNewOperationMode( MODE_OPAR ); + } } Index: App/Modes/ModePrescription.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/ModePrescription.h (.../ModePrescription.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/ModePrescription.h (.../ModePrescription.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,26 +1,26 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file ModePrescription.h -* -* @brief Header file for Prescription Mode. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file ModePrescription.h + * + * @brief Header file for Prescription Mode. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #ifndef __MODE_PRESCRIPTION_H__ #define __MODE_PRESCRIPTION_H__ // ********** private function prototypes ********** void initPrescriptionMode( void ); // initialize this module -void transitionToPrescriptionMode( void ); // prepares for transition to prescription mode +void transitionToPrescriptionMode( void ); // prepares for transition to prescription mode void execPrescriptionMode( void ); // execute the prescription mode state machine (call from OperationModes) #endif Index: App/Modes/ModeService.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/ModeService.c (.../ModeService.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/ModeService.c (.../ModeService.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file ModeService.c -* -* @brief Top-level state machine for the service mode. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file ModeService.c + * + * @brief Top-level state machine for the service mode. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #include "Common.h" #include "OperationModes.h" @@ -30,7 +30,7 @@ * Outputs : Service Mode module initialized. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void initServiceMode( void ) { } @@ -43,7 +43,7 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void transitionToServiceMode( void ) { } @@ -56,7 +56,7 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void execServiceMode( void ) { } Index: App/Modes/ModeService.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/ModeService.h (.../ModeService.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/ModeService.h (.../ModeService.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file ModeService.h -* -* @brief Header file for Service Mode. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file ModeService.h + * + * @brief Header file for Service Mode. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #ifndef __MODE_SERVICE_H__ #define __MODE_SERVICE_H__ Index: App/Modes/ModeStandby.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file ModeStandby.c -* -* @brief Top-level state machine for the standby mode. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file ModeStandby.c + * + * @brief Top-level state machine for the standby mode. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #include "Common.h" #include "AlarmLamp.h" @@ -32,7 +32,7 @@ * Outputs : Standby Mode module initialized. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void initStandbyMode( void ) { } @@ -45,11 +45,11 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void transitionToStandbyMode( void ) { - // temporary test code - alarm lamp OK - RequestLampPattern( LAMP_PATTERN_OK ); + // temporary test code - alarm lamp OK + RequestLampPattern( LAMP_PATTERN_OK ); } /************************************************************************* @@ -60,14 +60,14 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void execStandbyMode( void ) { - BOOL stop = isStopButtonPressed(); + BOOL stop = isStopButtonPressed(); - if ( TRUE == stop ) - { - requestNewOperationMode( MODE_PRES ); - } + if ( TRUE == stop ) + { + requestNewOperationMode( MODE_PRES ); + } } Index: App/Modes/ModeStandby.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/ModeStandby.h (.../ModeStandby.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/ModeStandby.h (.../ModeStandby.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file ModeStandby.h -* -* @brief Header file for Standby Mode. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file ModeStandby.h + * + * @brief Header file for Standby Mode. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #ifndef __MODE_STANDBY_H__ #define __MODE_STANDBY_H__ Index: App/Modes/ModeTreatment.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file ModeTreatment.c -* -* @brief Top-level state machine for the treatment mode. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file ModeTreatment.c + * + * @brief Top-level state machine for the treatment mode. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #include "Common.h" #include "AlarmLamp.h" @@ -32,7 +32,7 @@ * Outputs : Treatment Mode module initialized. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void initTreatmentMode( void ) { } @@ -45,11 +45,11 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void transitionToTreatmentMode( void ) { - // temporary test code - alarm lamp medium alarm - RequestLampPattern( LAMP_PATTERN_MED_ALARM ); + // temporary test code - alarm lamp medium alarm + RequestLampPattern( LAMP_PATTERN_MED_ALARM ); } /************************************************************************* @@ -60,14 +60,14 @@ * Outputs : * @param none * @return none -*************************************************************************/ + *************************************************************************/ void execTreatmentMode( void ) { - BOOL stop = isStopButtonPressed(); + BOOL stop = isStopButtonPressed(); - if ( TRUE == stop ) - { - requestNewOperationMode( MODE_POST ); - } + if ( TRUE == stop ) + { + requestNewOperationMode( MODE_POST ); + } } Index: App/Modes/ModeTreatment.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/ModeTreatment.h (.../ModeTreatment.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/ModeTreatment.h (.../ModeTreatment.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file ModeTreatment.h -* -* @brief Header file for Treatment Mode. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file ModeTreatment.h + * + * @brief Header file for Treatment Mode. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #ifndef __MODE_TREATMENT_H__ #define __MODE_TREATMENT_H__ Index: App/Modes/OperationModes.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/OperationModes.c (.../OperationModes.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/OperationModes.c (.../OperationModes.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file OperationModes.c -* -* @brief Top-level state machine for the HD operation modes. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file OperationModes.c + * + * @brief Top-level state machine for the HD operation modes. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #include "gio.h" @@ -31,23 +31,30 @@ // ********** private data ********** -static volatile BOOL modeRequest[ NUM_OF_MODES - 1 ]; +static volatile BOOL modeRequest[NUM_OF_MODES - 1]; static OP_MODE currentMode = MODE_INIT; // this matrix determines legal transitions from one mode to another -static const OP_MODE MODE_TRANSITION_TABLE[ NUM_OF_MODES-1 ][ NUM_OF_MODES-1 ] = -{ - // from to-> FAULT SERVICE INIT STANBY PRESCRIP. OP.PARAMS PRE-TREAT TREATMENT POST_TREA - /* FAUL */ { MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, }, - /* SERV */ { MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, }, - /* INIT */ { MODE_FAUL, MODE_NLEG, MODE_INIT, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, }, - /* STAN */ { MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_STAN, MODE_PRES, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, }, - /* PRES */ { MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_PRES, MODE_OPAR, MODE_NLEG, MODE_NLEG, MODE_NLEG, }, - /* OPAR */ { MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_PRES, MODE_OPAR, MODE_PRET, MODE_NLEG, MODE_NLEG, }, - /* PRET */ { MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_PRET, MODE_TREA, MODE_NLEG, }, - /* TREA */ { MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_TREA, MODE_POST, }, - /* POST */ { MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_POST, }, -}; +static const OP_MODE MODE_TRANSITION_TABLE[NUM_OF_MODES - 1][NUM_OF_MODES - 1] = { +// from to-> FAULT SERVICE INIT STANBY PRESCRIP. OP.PARAMS PRE-TREAT TREATMENT POST_TREA + /* FAUL */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, + MODE_NLEG, }, + /* SERV */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, + MODE_NLEG, }, + /* INIT */{ MODE_FAUL, MODE_NLEG, MODE_INIT, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, + MODE_NLEG, }, + /* STAN */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_STAN, MODE_PRES, MODE_NLEG, MODE_NLEG, MODE_NLEG, + MODE_NLEG, }, + /* PRES */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_PRES, MODE_OPAR, MODE_NLEG, MODE_NLEG, + MODE_NLEG, }, + /* OPAR */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_PRES, MODE_OPAR, MODE_PRET, MODE_NLEG, + MODE_NLEG, }, + /* PRET */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_PRET, MODE_TREA, + MODE_NLEG, }, + /* TREA */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_TREA, + MODE_POST, }, + /* POST */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, + MODE_POST, }, }; // ********** private function prototypes ********** @@ -62,31 +69,31 @@ * Outputs : Operation Modes module initialized. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void initOperationModes( void ) { - U32 i; + U32 i; - // initialize mode requests to none pending - for ( i = 0; i < (NUM_OF_MODES - 1); i++ ) - { - modeRequest[i] = FALSE; - } + // initialize mode requests to none pending + for ( i = 0; i < ( NUM_OF_MODES - 1 ); i++ ) + { + modeRequest[i] = FALSE; + } - // start in init mode - currentMode = MODE_INIT; - transitionToNewOperationMode( MODE_INIT ); + // start in init mode + currentMode = MODE_INIT; + transitionToNewOperationMode( MODE_INIT ); - // call initializers for the individual modes - initFaultMode(); - initServiceMode(); - initInitAndPOSTMode(); - initStandbyMode(); - initPrescriptionMode(); - initOpParamsMode(); - initPreTreatmentMode(); - initTreatmentMode(); - initPostTreatmentMode(); + // call initializers for the individual modes + initFaultMode(); + initServiceMode(); + initInitAndPOSTMode(); + initStandbyMode(); + initPrescriptionMode(); + initOpParamsMode(); + initPreTreatmentMode(); + initTreatmentMode(); + initPostTreatmentMode(); } /************************************************************************* @@ -97,73 +104,73 @@ * Outputs : currentMode is set by state machine. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void execOperationModes( void ) { - OP_MODE newMode; + OP_MODE newMode; - // any new mode requests? - newMode = arbitrateModeRequest(); // will return current mode if no pending requests - newMode = MODE_TRANSITION_TABLE[currentMode][newMode]; + // any new mode requests? + newMode = arbitrateModeRequest(); // will return current mode if no pending requests + newMode = MODE_TRANSITION_TABLE[currentMode][newMode]; - // is requested new mode valid and legal at this time? - if ( newMode >= MODE_NLEG ) - { - // TODO - s/w fault - newMode = currentMode; - } + // is requested new mode valid and legal at this time? + if ( newMode >= MODE_NLEG ) + { + // TODO - s/w fault + newMode = currentMode; + } - // has mode changed? - if ( currentMode != newMode ) - { - // handle transition to new mode - transitionToNewOperationMode( newMode ); - currentMode = newMode; - } + // has mode changed? + if ( currentMode != newMode ) + { + // handle transition to new mode + transitionToNewOperationMode( newMode ); + currentMode = newMode; + } - // mode specific processing to be done continuously - switch ( currentMode ) - { - case MODE_FAUL: - execFaultMode(); - break; + // mode specific processing to be done continuously + switch ( currentMode ) + { + case MODE_FAUL: + execFaultMode(); + break; - case MODE_SERV: - execServiceMode(); - break; + case MODE_SERV: + execServiceMode(); + break; - case MODE_INIT: - execInitAndPOSTMode(); - break; + case MODE_INIT: + execInitAndPOSTMode(); + break; - case MODE_STAN: - execStandbyMode(); - break; + case MODE_STAN: + execStandbyMode(); + break; - case MODE_PRES: - execPrescriptionMode(); - break; + case MODE_PRES: + execPrescriptionMode(); + break; - case MODE_OPAR: - execOpParamsMode(); - break; + case MODE_OPAR: + execOpParamsMode(); + break; - case MODE_PRET: - execPreTreatmentMode(); - break; + case MODE_PRET: + execPreTreatmentMode(); + break; - case MODE_TREA: - execTreatmentMode(); - break; + case MODE_TREA: + execTreatmentMode(); + break; - case MODE_POST: - execPostTreatmentMode(); - break; + case MODE_POST: + execPostTreatmentMode(); + break; - default: - // TODO - trigger s/w fault - break; - } // end switch + default: + // TODO - trigger s/w fault + break; + } // end switch } /************************************************************************* @@ -174,19 +181,19 @@ * Outputs : Initializes the Operation Modes module. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void requestNewOperationMode( OP_MODE newMode ) { - // validate requested mode - if ( newMode < MODE_NLEG ) - { - // make request - modeRequest[newMode] = TRUE; - } - else - { // invalid mode requested - // TODO - trigger s/w fault - } + // validate requested mode + if ( newMode < MODE_NLEG ) + { + // make request + modeRequest[newMode] = TRUE; + } + else + { // invalid mode requested + // TODO - trigger s/w fault + } } /************************************************************************* @@ -197,10 +204,10 @@ * Outputs : Initializes the Operation Modes module. * @param none * @return none -*************************************************************************/ + *************************************************************************/ OP_MODE getCurrentOperationMode( void ) { - return currentMode; + return currentMode; } /************************************************************************* @@ -211,35 +218,35 @@ * Outputs : Initializes the Operation Modes module. * @param none * @return none -*************************************************************************/ + *************************************************************************/ static OP_MODE arbitrateModeRequest( void ) { - OP_MODE reqMode = currentMode; - U32 i; + OP_MODE reqMode = currentMode; + U32 i; - // block additional requests until after mode arbitration - // TODO - disable priority task + // block additional requests until after mode arbitration + // TODO - disable priority task - // select highest priority mode request -or- current mode if no requests pending - for ( i = 0; i < MODE_NLEG; i++ ) - { - if ( modeRequest[i] != FALSE ) - { - reqMode = (OP_MODE)i; - break; - } - } + // select highest priority mode request -or- current mode if no requests pending + for ( i = 0; i < MODE_NLEG; i++ ) + { + if ( modeRequest[i] != FALSE ) + { + reqMode = (OP_MODE)i; + break; + } + } - // clear all requests now that an arbitration winner is selected - for ( i = 0; i < MODE_NLEG; i++ ) - { - modeRequest[i] = FALSE; - } + // clear all requests now that an arbitration winner is selected + for ( i = 0; i < MODE_NLEG; i++ ) + { + modeRequest[i] = FALSE; + } - // un-block requests - // TODO - enable priority task + // un-block requests + // TODO - enable priority task - return reqMode; + return reqMode; } /************************************************************************* @@ -250,43 +257,42 @@ * Outputs : Initializes the Operation Modes module. * @param none * @return none -*************************************************************************/ + *************************************************************************/ static void transitionToNewOperationMode( OP_MODE newMode ) { - // setup for new operating mode - switch (newMode) - { - case MODE_FAUL: - transitionToFaultMode(); - break; - case MODE_SERV: - transitionToServiceMode(); - break; - case MODE_INIT: - transitionToInitAndPOSTMode(); - break; - case MODE_STAN: - transitionToStandbyMode(); - break; - case MODE_PRES: - transitionToPrescriptionMode(); - break; - case MODE_OPAR: - transitionToOpParamsMode(); - break; - case MODE_PRET: - transitionToPreTreatmentMode(); - break; - case MODE_TREA: - transitionToTreatmentMode(); - break; - case MODE_POST: - transitionToPostTreatmentMode(); - break; - default: - // TODO - s/w fault - break; - } + // setup for new operating mode + switch ( newMode ) + { + case MODE_FAUL: + transitionToFaultMode(); + break; + case MODE_SERV: + transitionToServiceMode(); + break; + case MODE_INIT: + transitionToInitAndPOSTMode(); + break; + case MODE_STAN: + transitionToStandbyMode(); + break; + case MODE_PRES: + transitionToPrescriptionMode(); + break; + case MODE_OPAR: + transitionToOpParamsMode(); + break; + case MODE_PRET: + transitionToPreTreatmentMode(); + break; + case MODE_TREA: + transitionToTreatmentMode(); + break; + case MODE_POST: + transitionToPostTreatmentMode(); + break; + default: + // TODO - s/w fault + break; + } } - Index: App/Modes/OperationModes.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Modes/OperationModes.h (.../OperationModes.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Modes/OperationModes.h (.../OperationModes.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file OperationModes.h -* -* @brief Header file for Operation Modes. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file OperationModes.h + * + * @brief Header file for Operation Modes. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #ifndef __OP_MODES_H__ #define __OP_MODES_H__ @@ -21,23 +21,23 @@ typedef enum Op_Modes // These are in order of priority (highest to lowest) { - MODE_FAUL = 0, // Fault - MODE_SERV, // Service - MODE_INIT, // Initialization & POST - MODE_STAN, // Standby - MODE_PRES, // Prescription - MODE_OPAR, // Operating Parameters - MODE_PRET, // Pre-Treatment - MODE_TREA, // Treatment - MODE_POST, // Post-Treatment - MODE_NLEG, // Not legal - NUM_OF_MODES + MODE_FAUL = 0, // Fault + MODE_SERV, // Service + MODE_INIT, // Initialization & POST + MODE_STAN, // Standby + MODE_PRES, // Prescription + MODE_OPAR, // Operating Parameters + MODE_PRET, // Pre-Treatment + MODE_TREA, // Treatment + MODE_POST, // Post-Treatment + MODE_NLEG, // Not legal + NUM_OF_MODES } OP_MODE; // ********** public function prototypes ********** void initOperationModes( void ); // initialize this module -void execOperationModes( void ); // execute the operation modes state machine (scheduled periodic call) +void execOperationModes( void ); // execute the operation modes state machine (scheduled periodic call) void requestNewOperationMode( OP_MODE newMode ); // request a transition to a new operation mode OP_MODE getCurrentOperationMode( void ); // get the current operation mode Index: App/Tasks/TaskBG.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Tasks/TaskBG.c (.../TaskBG.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Tasks/TaskBG.c (.../TaskBG.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file TaskTimer.c -* -* @brief Timer task handler. -* -* @date 20-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file TaskTimer.c + * + * @brief Timer task handler. + * + * @date 20-Sep-2019 + * + *************************************************************************/ #include "gio.h" @@ -26,13 +26,13 @@ * @details * Inputs : none * Outputs : Executive for watchdog mgmt. and non-volatile data services called. -*************************************************************************/ + *************************************************************************/ void taskBackground( void ) { - while (1) - { - // manage the watchdog - execWatchdogMgmt(); - } + while ( 1 ) + { + // manage the watchdog + execWatchdogMgmt(); + } } Index: App/Tasks/TaskBG.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Tasks/TaskBG.h (.../TaskBG.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Tasks/TaskBG.h (.../TaskBG.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file TaskBG.h -* -* @brief Background task header file. -* -* @date 20-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file TaskBG.h + * + * @brief Background task header file. + * + * @date 20-Sep-2019 + * + *************************************************************************/ #ifndef __TASK_BACKGROUND_H__ #define __TASK_BACKGROUND_H__ Index: App/Tasks/TaskGeneral.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file TaskGeneral.c -* -* @brief General task handler. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file TaskGeneral.c + * + * @brief General task handler. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #include "gio.h" #include "lin.h" @@ -36,27 +36,27 @@ * Outputs : Executive for the TBD called. * @param none * @return none -*************************************************************************/ + *************************************************************************/ void taskGeneral( void ) { - // run operation mode state machine - execOperationModes(); + // run operation mode state machine + execOperationModes(); - // control alarm lamp - ExecuteAlarmLamp(); + // control alarm lamp + ExecuteAlarmLamp(); - // check in with watchdog manager - checkInWithWatchdogMgmt( TASK_GENERAL ); + // check in with watchdog manager + checkInWithWatchdogMgmt( TASK_GENERAL ); - // toggle GPIO to indicate general task has executed - gioToggleBit( gioPORTA, 0 ); - ledCounter++; + // toggle GPIO to indicate general task has executed + gioToggleBit( gioPORTA, 0 ); + ledCounter++; - // Temporary LED blinking for now - TODO: Remove this - if ( ledCounter >= 10 ) - { - ledCounter = 0; - gioToggleBit( gioPORTB, 1 ); - } + // Temporary LED blinking for now - TODO: Remove this +// if ( ledCounter >= 10 ) +// { +// ledCounter = 0; +// gioToggleBit( gioPORTB, 1 ); +// } } Index: App/Tasks/TaskGeneral.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Tasks/TaskGeneral.h (.../TaskGeneral.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Tasks/TaskGeneral.h (.../TaskGeneral.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file TaskGeneral.h -* -* @brief General task header file. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file TaskGeneral.h + * + * @brief General task header file. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #ifndef __TASK_GENERAL_H__ #define __TASK_GENERAL_H__ @@ -23,6 +23,6 @@ // public function prototypes -void taskGeneral(void); +void taskGeneral( void ); #endif Index: App/Tasks/TaskPriority.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file TaskPriority.c -* -* @brief Priority task handler. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file TaskPriority.c + * + * @brief Priority task handler. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #include "gio.h" @@ -27,16 +27,16 @@ * @details * Inputs : none * Outputs : Executive for the FPGA, pumps, valves, and buttons called. -*************************************************************************/ + *************************************************************************/ void taskPriority( void ) { - // monitor and process buttons - execButtons(); + // monitor and process buttons + execButtons(); - // check in with watchdog manager - checkInWithWatchdogMgmt( TASK_PRIORITY ); + // check in with watchdog manager + checkInWithWatchdogMgmt( TASK_PRIORITY ); - // toggle GPIO to indicate priority task has executed - gioToggleBit( gioPORTA, 1 ); + // toggle GPIO to indicate priority task has executed + gioToggleBit( gioPORTA, 1 ); } Index: App/Tasks/TaskPriority.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Tasks/TaskPriority.h (.../TaskPriority.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Tasks/TaskPriority.h (.../TaskPriority.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file TaskPriority.h -* -* @brief Priority task header file. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file TaskPriority.h + * + * @brief Priority task header file. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #ifndef __TASK_PRIORITY_H__ #define __TASK_PRIORITY_H__ @@ -23,6 +23,6 @@ // public function prototypes -void taskPriority(void); +void taskPriority( void ); #endif Index: App/Tasks/TaskTimer.c =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Tasks/TaskTimer.c (.../TaskTimer.c) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Tasks/TaskTimer.c (.../TaskTimer.c) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /************************************************************************* -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file TaskTimer.c -* -* @brief Timer task handler. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file TaskTimer.c + * + * @brief Timer task handler. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #include "gio.h" @@ -27,13 +27,13 @@ * @details * Inputs : none * Outputs : Executive for Timers called. -*************************************************************************/ + *************************************************************************/ void taskTimer( void ) { - // check in with watchdog manager - checkInWithWatchdogMgmt( TASK_TIMER ); + // check in with watchdog manager + checkInWithWatchdogMgmt( TASK_TIMER ); - // toggle GPIO to indicate timer task has executed - gioToggleBit( gioPORTA, 2 ); + // toggle GPIO to indicate timer task has executed + gioToggleBit( gioPORTA, 2 ); } Index: App/Tasks/TaskTimer.h =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- App/Tasks/TaskTimer.h (.../TaskTimer.h) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ App/Tasks/TaskTimer.h (.../TaskTimer.h) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -1,18 +1,18 @@ /*********************************************************************** -* -* Copyright Diality, Inc. 2019-2020. All Rights Reserved. -* 181 Technology, Ste. 150 -* Irvine, CA 92618 -* -* Project Denali -* -* @file TaskTimer.h -* -* @brief Timer task header file. -* -* @date 19-Sep-2019 -* -*************************************************************************/ + * + * Copyright Diality, Inc. 2019-2020. All Rights Reserved. + * 181 Technology, Ste. 150 + * Irvine, CA 92618 + * + * Project Denali + * + * @file TaskTimer.h + * + * @brief Timer task header file. + * + * @date 19-Sep-2019 + * + *************************************************************************/ #ifndef __TASK_TIMER_H__ #define __TASK_TIMER_H__ @@ -23,6 +23,6 @@ // public function prototypes -void taskTimer(void); +void taskTimer( void ); #endif Index: Debug/App/Contollers/subdir_rules.mk =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- Debug/App/Contollers/subdir_rules.mk (.../subdir_rules.mk) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ Debug/App/Contollers/subdir_rules.mk (.../subdir_rules.mk) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -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/App" --include_path="/home/fw/workspace_HD/HD/App/Tasks" --include_path="/home/fw/workspace_HD/HD/App/Modes" --include_path="/home/fw/workspace_HD/HD/App/Drivers" --include_path="/home/fw/workspace_HD/HD/App/Contollers" --include_path="/home/fw/workspace_HD/HD/App/Comm" --include_path="/home/fw/workspace_HD/HD" --include_path="/home/fw/workspace_HD/HD/include" --include_path="/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/include" -g --diag_warning=225 --diag_wrap=off --display_error_number --enum_type=packed --abi=eabi --preproc_with_compile --preproc_dependency="App/Contollers/$(basename $(> Linked Tue Sep 24 08:00:40 2019 +>> Linked Tue Sep 24 13:49:30 2019 OUTPUT FILE NAME: ENTRY POINT SYMBOL: "_c_int00" address: 0000751c Index: Debug/HD.out =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 Binary files differ Index: Debug/HD_linkInfo.xml =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- Debug/HD_linkInfo.xml (.../HD_linkInfo.xml) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ Debug/HD_linkInfo.xml (.../HD_linkInfo.xml) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -2,7 +2,7 @@ TI ARM Linker Unix v18.12.2.LTS Copyright (c) 1996-2018 Texas Instruments Incorporated - 0x5d8a2f98 + 0x5d8a815a 0x0 HD.out @@ -724,1839 +724,1839 @@ .debug_info 0x0 0x0 - 0x31e + 0x328 .debug_info - 0x31e - 0x31e - 0x190 + 0x328 + 0x328 + 0x19a .debug_info - 0x4ae - 0x4ae - 0xdc + 0x4c2 + 0x4c2 + 0xe6 .debug_info - 0x58a - 0x58a - 0x3b4 + 0x5a8 + 0x5a8 + 0x3be .debug_info - 0x93e - 0x93e + 0x966 + 0x966 0x26b .debug_info - 0xba9 - 0xba9 + 0xbd1 + 0xbd1 0x157 .debug_info - 0xd00 - 0xd00 + 0xd28 + 0xd28 0x82 .debug_info - 0xd82 - 0xd82 + 0xdaa + 0xdaa 0xb3 .debug_info - 0xe35 - 0xe35 + 0xe5d + 0xe5d 0xca .debug_info - 0xeff - 0xeff + 0xf27 + 0xf27 0x8b .debug_info - 0xf8a - 0xf8a + 0xfb2 + 0xfb2 0x297 .debug_info - 0x1221 - 0x1221 + 0x1249 + 0x1249 0xbb .debug_info - 0x12dc - 0x12dc - 0x25c + 0x1304 + 0x1304 + 0x266 .debug_info - 0x1538 - 0x1538 - 0x686 + 0x156a + 0x156a + 0x692 .debug_info - 0x1bbe - 0x1bbe + 0x1bfc + 0x1bfc 0x55 .debug_info - 0x1c13 - 0x1c13 + 0x1c51 + 0x1c51 0x55 .debug_info - 0x1c68 - 0x1c68 + 0x1ca6 + 0x1ca6 0x9d .debug_info - 0x1d05 - 0x1d05 - 0x2a3 + 0x1d43 + 0x1d43 + 0x2ad .debug_info - 0x1fa8 - 0x1fa8 - 0x1fb + 0x1ff0 + 0x1ff0 + 0x205 .debug_info - 0x21a3 - 0x21a3 + 0x21f5 + 0x21f5 0x86 .debug_info - 0x2229 - 0x2229 + 0x227b + 0x227b 0x1f9 .debug_info - 0x2422 - 0x2422 + 0x2474 + 0x2474 0x12a .debug_info - 0x254c - 0x254c - 0x2a1 + 0x259e + 0x259e + 0x2ab .debug_info - 0x27ed - 0x27ed - 0xf1 + 0x2849 + 0x2849 + 0xfb .debug_info - 0x28de - 0x28de - 0x3d5 + 0x2944 + 0x2944 + 0x3df .debug_info - 0x2cb3 - 0x2cb3 + 0x2d23 + 0x2d23 0x67 .debug_info - 0x2d1a - 0x2d1a - 0x34c + 0x2d8a + 0x2d8a + 0x356 .debug_info - 0x3066 - 0x3066 - 0x69b + 0x30e0 + 0x30e0 + 0x6a5 .debug_info - 0x3701 - 0x3701 + 0x3785 + 0x3785 0x2bc .debug_info - 0x39bd - 0x39bd + 0x3a41 + 0x3a41 0x186 .debug_info - 0x3b43 - 0x3b43 - 0x208 + 0x3bc7 + 0x3bc7 + 0x212 .debug_info - 0x3d4b - 0x3d4b - 0x2b9 + 0x3dd9 + 0x3dd9 + 0x2c3 .debug_info - 0x4004 - 0x4004 - 0x292 + 0x409c + 0x409c + 0x29c .debug_info - 0x4296 - 0x4296 - 0x2b7 + 0x4338 + 0x4338 + 0x2c1 .debug_info - 0x454d - 0x454d - 0x2aa + 0x45f9 + 0x45f9 + 0x2b4 .debug_info - 0x47f7 - 0x47f7 - 0x2c6 + 0x48ad + 0x48ad + 0x2d0 .debug_info - 0x4abd - 0x4abd - 0x222 + 0x4b7d + 0x4b7d + 0x22c .debug_info - 0x4cdf - 0x4cdf - 0x285 + 0x4da9 + 0x4da9 + 0x28f .debug_info - 0x4f64 - 0x4f64 - 0x29f + 0x5038 + 0x5038 + 0x2a9 .debug_info - 0x5203 - 0x5203 - 0x7b0 + 0x52e1 + 0x52e1 + 0x7ba .debug_info - 0x59b3 - 0x59b3 - 0xda + 0x5a9b + 0x5a9b + 0xe4 .debug_info - 0x5a8d - 0x5a8d - 0xda + 0x5b7f + 0x5b7f + 0xe4 .debug_info - 0x5b67 - 0x5b67 - 0xee + 0x5c63 + 0x5c63 + 0xf8 .debug_info - 0x5c55 - 0x5c55 - 0x7c9 + 0x5d5b + 0x5d5b + 0x7d5 .debug_info - 0x641e - 0x641e - 0x12c + 0x6530 + 0x6530 + 0x136 .debug_info - 0x654a - 0x654a - 0xd5 + 0x6666 + 0x6666 + 0xdf .debug_info - 0x661f - 0x661f - 0x198 + 0x6745 + 0x6745 + 0x1a2 .debug_info - 0x67b7 - 0x67b7 - 0x16c + 0x68e7 + 0x68e7 + 0x176 .debug_info - 0x6923 - 0x6923 - 0x14b + 0x6a5d + 0x6a5d + 0x155 .debug_info - 0x6a6e - 0x6a6e - 0xe9 + 0x6bb2 + 0x6bb2 + 0xf3 .debug_info - 0x6b57 - 0x6b57 - 0x2a8 + 0x6ca5 + 0x6ca5 + 0x2b2 .debug_info - 0x6dff - 0x6dff - 0x629 + 0x6f57 + 0x6f57 + 0x633 .debug_info - 0x7428 - 0x7428 + 0x758a + 0x758a 0x84 .debug_info - 0x74ac - 0x74ac + 0x760e + 0x760e 0x9e7 .debug_info - 0x7e93 - 0x7e93 - 0x300 + 0x7ff5 + 0x7ff5 + 0x30a .debug_info - 0x8193 - 0x8193 - 0xb15 + 0x82ff + 0x82ff + 0xb1f .debug_info - 0x8ca8 - 0x8ca8 - 0x175 + 0x8e1e + 0x8e1e + 0x17f .debug_info - 0x8e1d - 0x8e1d + 0x8f9d + 0x8f9d 0x18c .debug_info - 0x8fa9 - 0x8fa9 + 0x9129 + 0x9129 0x1de .debug_info - 0x9187 - 0x9187 + 0x9307 + 0x9307 0x129 .debug_info - 0x92b0 - 0x92b0 + 0x9430 + 0x9430 0x2d0 .debug_info - 0x9580 - 0x9580 - 0x283 + 0x9700 + 0x9700 + 0x28d .debug_info - 0x9803 - 0x9803 - 0x6cd + 0x998d + 0x998d + 0x6d7 .debug_info - 0x9ed0 - 0x9ed0 - 0x2af + 0xa064 + 0xa064 + 0x2b9 .debug_info - 0xa17f - 0xa17f - 0xcc3 + 0xa31d + 0xa31d + 0xccd .debug_info - 0xae42 - 0xae42 - 0x497 + 0xafea + 0xafea + 0x4a1 .debug_info - 0xb2d9 - 0xb2d9 - 0x7b2 + 0xb48b + 0xb48b + 0x7bc .debug_info - 0xba8b - 0xba8b + 0xbc47 + 0xbc47 0x791 .debug_info - 0xc21c - 0xc21c + 0xc3d8 + 0xc3d8 0x4de .debug_info - 0xc6fa - 0xc6fa + 0xc8b6 + 0xc8b6 0x3ce .debug_info - 0xcac8 - 0xcac8 + 0xcc84 + 0xcc84 0x306 .debug_info - 0xcdce - 0xcdce + 0xcf8a + 0xcf8a 0x7cd .debug_info - 0xd59b - 0xd59b + 0xd757 + 0xd757 0x673 .debug_info - 0xdc0e - 0xdc0e + 0xddca + 0xddca 0x2c .debug_info - 0xdc3a - 0xdc3a + 0xddf6 + 0xddf6 0x437 .debug_info - 0xe071 - 0xe071 + 0xe22d + 0xe22d 0x37b .debug_info - 0xe3ec - 0xe3ec + 0xe5a8 + 0xe5a8 0x1d4 .debug_info - 0xe5c0 - 0xe5c0 + 0xe77c + 0xe77c 0x1ca .debug_info - 0xe78a - 0xe78a + 0xe946 + 0xe946 0x435 .debug_info - 0xebbf - 0xebbf + 0xed7b + 0xed7b 0x551 .debug_info - 0xf110 - 0xf110 + 0xf2cc + 0xf2cc 0x3d3 .debug_info - 0xf4e3 - 0xf4e3 + 0xf69f + 0xf69f 0x1de .debug_info - 0xf6c1 - 0xf6c1 + 0xf87d + 0xf87d 0x17a .debug_info - 0xf83b - 0xf83b + 0xf9f7 + 0xf9f7 0x6a6 .debug_info - 0xfee1 - 0xfee1 + 0x1009d + 0x1009d 0x13e .debug_info - 0x1001f - 0x1001f - 0x26a + 0x101db + 0x101db + 0x274 .debug_info - 0x10289 - 0x10289 - 0x1d3 + 0x1044f + 0x1044f + 0x1dd .debug_info - 0x1045c - 0x1045c + 0x1062c + 0x1062c 0x508 .debug_info - 0x10964 - 0x10964 + 0x10b34 + 0x10b34 0x43c .debug_info - 0x10da0 - 0x10da0 - 0x32b + 0x10f70 + 0x10f70 + 0x335 .debug_info - 0x110cb - 0x110cb - 0xd11 + 0x112a5 + 0x112a5 + 0xd1b .debug_info - 0x11ddc - 0x11ddc - 0x266 + 0x11fc0 + 0x11fc0 + 0x270 .debug_info - 0x12042 - 0x12042 - 0x7de + 0x12230 + 0x12230 + 0x7e8 .debug_info - 0x12820 - 0x12820 - 0xf1 + 0x12a18 + 0x12a18 + 0xfb .debug_info - 0x12911 - 0x12911 - 0x30a + 0x12b13 + 0x12b13 + 0x314 .debug_info - 0x12c1b - 0x12c1b - 0x289 + 0x12e27 + 0x12e27 + 0x293 .debug_info - 0x12ea4 - 0x12ea4 + 0x130ba + 0x130ba 0x242 .debug_info - 0x130e6 - 0x130e6 + 0x132fc + 0x132fc 0x2af .debug_info - 0x13395 - 0x13395 - 0x126 + 0x135ab + 0x135ab + 0x130 .debug_info - 0x134bb - 0x134bb - 0x350 + 0x136db + 0x136db + 0x35a .debug_info - 0x1380b - 0x1380b - 0x659 + 0x13a35 + 0x13a35 + 0x663 .debug_info - 0x13e64 - 0x13e64 - 0x2e78 + 0x14098 + 0x14098 + 0x2e82 .debug_info - 0x16cdc - 0x16cdc - 0x5cc + 0x16f1a + 0x16f1a + 0x5d6 .debug_info - 0x172a8 - 0x172a8 - 0x11f + 0x174f0 + 0x174f0 + 0x129 .debug_info - 0x173c7 - 0x173c7 - 0x4c5 + 0x17619 + 0x17619 + 0x4cf .debug_info - 0x1788c - 0x1788c - 0xce + 0x17ae8 + 0x17ae8 + 0xd8 .debug_info - 0x1795a - 0x1795a - 0x460 + 0x17bc0 + 0x17bc0 + 0x46a .debug_info - 0x17dba - 0x17dba - 0x1e9 + 0x1802a + 0x1802a + 0x1f3 .debug_info - 0x17fa3 - 0x17fa3 + 0x1821d + 0x1821d 0x4f .debug_info - 0x17ff2 - 0x17ff2 - 0x506 + 0x1826c + 0x1826c + 0x510 .debug_info - 0x184f8 - 0x184f8 - 0x7c3 + 0x1877c + 0x1877c + 0x7cd .debug_info - 0x18cbb - 0x18cbb + 0x18f49 + 0x18f49 0x4b4 .debug_info - 0x1916f - 0x1916f + 0x193fd + 0x193fd 0x1a7 .debug_info - 0x19316 - 0x19316 + 0x195a4 + 0x195a4 0x39 .debug_info - 0x1934f - 0x1934f + 0x195dd + 0x195dd 0x39 .debug_info - 0x19388 - 0x19388 + 0x19616 + 0x19616 0x39 .debug_info - 0x193c1 - 0x193c1 + 0x1964f + 0x1964f 0xcd .debug_info - 0x1948e - 0x1948e + 0x1971c + 0x1971c 0x2d5 .debug_info - 0x19763 - 0x19763 + 0x199f1 + 0x199f1 0x1d3 .debug_info - 0x19936 - 0x19936 + 0x19bc4 + 0x19bc4 0x46 .debug_info - 0x1997c - 0x1997c + 0x19c0a + 0x19c0a 0x2a4 .debug_info - 0x19c20 - 0x19c20 + 0x19eae + 0x19eae 0x1d6 .debug_info - 0x19df6 - 0x19df6 + 0x1a084 + 0x1a084 0x46 .debug_info - 0x19e3c - 0x19e3c + 0x1a0ca + 0x1a0ca 0x2c .debug_info - 0x19e68 - 0x19e68 + 0x1a0f6 + 0x1a0f6 0x29f .debug_info - 0x1a107 - 0x1a107 + 0x1a395 + 0x1a395 0x251 .debug_info - 0x1a358 - 0x1a358 + 0x1a5e6 + 0x1a5e6 0x60 .debug_info - 0x1a3b8 - 0x1a3b8 + 0x1a646 + 0x1a646 0x46 .debug_info - 0x1a3fe - 0x1a3fe + 0x1a68c + 0x1a68c 0x39 .debug_info - 0x1a437 - 0x1a437 + 0x1a6c5 + 0x1a6c5 0x123 .debug_info - 0x1a55a - 0x1a55a + 0x1a7e8 + 0x1a7e8 0x11a .debug_info - 0x1a674 - 0x1a674 - 0x90 + 0x1a902 + 0x1a902 + 0x9a .debug_line 0x0 0x0 - 0x4f + 0x59 .debug_line - 0x4f - 0x4f + 0x59 + 0x59 0x41 .debug_line - 0x90 - 0x90 + 0x9a + 0x9a 0x41 .debug_line - 0xd1 - 0xd1 + 0xdb + 0xdb 0xe9 .debug_line - 0x1ba - 0x1ba + 0x1c4 + 0x1c4 0x75 .debug_line - 0x22f - 0x22f - 0x53 + 0x239 + 0x239 + 0x5d .debug_line - 0x282 - 0x282 + 0x296 + 0x296 0x41 .debug_line - 0x2c3 - 0x2c3 + 0x2d7 + 0x2d7 0x41 .debug_line - 0x304 - 0x304 - 0x49 + 0x318 + 0x318 + 0x53 .debug_line - 0x34d - 0x34d + 0x36b + 0x36b 0x20 .debug_line - 0x36d - 0x36d + 0x38b + 0x38b 0x79 .debug_line - 0x3e6 - 0x3e6 + 0x404 + 0x404 0x76 .debug_line - 0x45c - 0x45c + 0x47a + 0x47a 0x3f .debug_line - 0x49b - 0x49b + 0x4b9 + 0x4b9 0x186 .debug_line - 0x621 - 0x621 + 0x63f + 0x63f 0x3f .debug_line - 0x660 - 0x660 + 0x67e + 0x67e 0x3f .debug_line - 0x69f - 0x69f - 0x57 + 0x6bd + 0x6bd + 0x61 .debug_line - 0x6f6 - 0x6f6 - 0x4a + 0x71e + 0x71e + 0x54 .debug_line - 0x740 - 0x740 + 0x772 + 0x772 0x75 .debug_line - 0x7b5 - 0x7b5 - 0x51 + 0x7e7 + 0x7e7 + 0x5b .debug_line - 0x806 - 0x806 - 0x4e + 0x842 + 0x842 + 0x58 .debug_line - 0x854 - 0x854 - 0x4a + 0x89a + 0x89a + 0x54 .debug_line - 0x89e - 0x89e - 0x4f + 0x8ee + 0x8ee + 0x59 .debug_line - 0x8ed - 0x8ed + 0x947 + 0x947 0x44 .debug_line - 0x931 - 0x931 + 0x98b + 0x98b 0xe6 .debug_line - 0xa17 - 0xa17 + 0xa71 + 0xa71 0x44 .debug_line - 0xa5b - 0xa5b - 0xf0 + 0xab5 + 0xab5 + 0x118 .debug_line - 0xb4b - 0xb4b + 0xbcd + 0xbcd 0x166 .debug_line - 0xcb1 - 0xcb1 - 0x4e + 0xd33 + 0xd33 + 0x58 .debug_line - 0xcff - 0xcff - 0x4a + 0xd8b + 0xd8b + 0x54 .debug_line - 0xd49 - 0xd49 + 0xddf + 0xddf 0x72 .debug_line - 0xdbb - 0xdbb + 0xe51 + 0xe51 0x89 .debug_line - 0xe44 - 0xe44 + 0xeda + 0xeda 0x88 .debug_line - 0xecc - 0xecc + 0xf62 + 0xf62 0x89 .debug_line - 0xf55 - 0xf55 + 0xfeb + 0xfeb 0x88 .debug_line - 0xfdd - 0xfdd + 0x1073 + 0x1073 0x8c .debug_line - 0x1069 - 0x1069 + 0x10ff + 0x10ff 0x74 .debug_line - 0x10dd - 0x10dd + 0x1173 + 0x1173 0x87 .debug_line - 0x1164 - 0x1164 + 0x11fa + 0x11fa 0x89 .debug_line - 0x11ed - 0x11ed + 0x1283 + 0x1283 0x138 .debug_line - 0x1325 - 0x1325 + 0x13bb + 0x13bb 0x41 .debug_line - 0x1366 - 0x1366 + 0x13fc + 0x13fc 0x41 .debug_line - 0x13a7 - 0x13a7 + 0x143d + 0x143d 0x41 .debug_line - 0x13e8 - 0x13e8 + 0x147e + 0x147e 0x164 .debug_line - 0x154c - 0x154c + 0x15e2 + 0x15e2 0x51 .debug_line - 0x159d - 0x159d + 0x1633 + 0x1633 0x3e .debug_line - 0x15db - 0x15db + 0x1671 + 0x1671 0x5c .debug_line - 0x1637 - 0x1637 + 0x16cd + 0x16cd 0x56 .debug_line - 0x168d - 0x168d + 0x1723 + 0x1723 0x52 .debug_line - 0x16df - 0x16df + 0x1775 + 0x1775 0x78 .debug_line - 0x1757 - 0x1757 + 0x17ed + 0x17ed 0x20 .debug_line - 0x1777 - 0x1777 + 0x180d + 0x180d 0x1fb .debug_line - 0x1972 - 0x1972 + 0x1a08 + 0x1a08 0x20 .debug_line - 0x1992 - 0x1992 - 0x5d + 0x1a28 + 0x1a28 + 0x67 .debug_line - 0x19ef - 0x19ef - 0x4a + 0x1a8f + 0x1a8f + 0x54 .debug_line - 0x1a39 - 0x1a39 + 0x1ae3 + 0x1ae3 0x289 .debug_line - 0x1cc2 - 0x1cc2 + 0x1d6c + 0x1d6c 0x6e .debug_line - 0x1d30 - 0x1d30 - 0x4e + 0x1dda + 0x1dda + 0x58 .debug_line - 0x1d7e - 0x1d7e - 0x4e + 0x1e32 + 0x1e32 + 0x58 .debug_line - 0x1dcc - 0x1dcc - 0x4a + 0x1e8a + 0x1e8a + 0x54 .debug_line - 0x1e16 - 0x1e16 - 0x4e + 0x1ede + 0x1ede + 0x58 .debug_line - 0x1e64 - 0x1e64 + 0x1f36 + 0x1f36 0x20 .debug_line - 0x1e84 - 0x1e84 + 0x1f56 + 0x1f56 0x196 .debug_line - 0x201a - 0x201a + 0x20ec + 0x20ec 0x20 .debug_line - 0x203a - 0x203a + 0x210c + 0x210c 0x2c0 .debug_line - 0x22fa - 0x22fa + 0x23cc + 0x23cc 0x20 .debug_line - 0x231a - 0x231a + 0x23ec + 0x23ec 0xe8 .debug_line - 0x2402 - 0x2402 - 0x4e + 0x24d4 + 0x24d4 + 0x58 .debug_line - 0x2450 - 0x2450 - 0x51 + 0x252c + 0x252c + 0x5b .debug_line - 0x24a1 - 0x24a1 - 0x4e + 0x2587 + 0x2587 + 0x58 .debug_line - 0x24ef - 0x24ef - 0x4e + 0x25df + 0x25df + 0x58 .debug_line - 0x253d - 0x253d - 0x4e + 0x2637 + 0x2637 + 0x58 .debug_line - 0x258b - 0x258b - 0x4e + 0x268f + 0x268f + 0x58 .debug_line - 0x25d9 - 0x25d9 + 0x26e7 + 0x26e7 0x71 .debug_line - 0x264a - 0x264a - 0x4e + 0x2758 + 0x2758 + 0x58 .debug_line - 0x2698 - 0x2698 - 0x53 + 0x27b0 + 0x27b0 + 0x5d .debug_line - 0x26eb - 0x26eb - 0x4a + 0x280d + 0x280d + 0x54 .debug_line - 0x2735 - 0x2735 - 0x4e + 0x2861 + 0x2861 + 0x58 .debug_line - 0x2783 - 0x2783 - 0x50 + 0x28b9 + 0x28b9 + 0x5a .debug_line - 0x27d3 - 0x27d3 - 0x4d + 0x2913 + 0x2913 + 0x57 .debug_line - 0x2820 - 0x2820 - 0x4e + 0x296a + 0x296a + 0x58 .debug_line - 0x286e - 0x286e - 0x50 + 0x29c2 + 0x29c2 + 0x5a .debug_line - 0x28be - 0x28be - 0x4e + 0x2a1c + 0x2a1c + 0x58 .debug_line - 0x290c - 0x290c - 0x51 + 0x2a74 + 0x2a74 + 0x5b .debug_line - 0x295d - 0x295d - 0x50 + 0x2acf + 0x2acf + 0x5a .debug_line - 0x29ad - 0x29ad + 0x2b29 + 0x2b29 0x20 .debug_line - 0x29cd - 0x29cd + 0x2b49 + 0x2b49 0xd7 .debug_line - 0x2aa4 - 0x2aa4 - 0x51 + 0x2c20 + 0x2c20 + 0x5b .debug_line - 0x2af5 - 0x2af5 - 0x4d + 0x2c7b + 0x2c7b + 0x57 .debug_line - 0x2b42 - 0x2b42 - 0xe5 + 0x2cd2 + 0x2cd2 + 0x10d .debug_line - 0x2c27 - 0x2c27 + 0x2ddf + 0x2ddf 0x2f2 .debug_line - 0x2f19 - 0x2f19 + 0x30d1 + 0x30d1 0x8d .debug_line - 0x2fa6 - 0x2fa6 + 0x315e + 0x315e 0x2e4 .debug_line - 0x328a - 0x328a + 0x3442 + 0x3442 0x4f .debug_line - 0x32d9 - 0x32d9 + 0x3491 + 0x3491 0xaa .debug_line - 0x3383 - 0x3383 + 0x353b + 0x353b 0x20 .debug_line - 0x33a3 - 0x33a3 - 0x4e + 0x355b + 0x355b + 0x58 .debug_line - 0x33f1 - 0x33f1 - 0x4e + 0x35b3 + 0x35b3 + 0x58 .debug_line - 0x343f - 0x343f + 0x360b + 0x360b 0x4b .debug_line - 0x348a - 0x348a + 0x3656 + 0x3656 0x125 .debug_line - 0x35af - 0x35af - 0xb0 + 0x377b + 0x377b + 0xce .debug_line - 0x365f - 0x365f + 0x3849 + 0x3849 0xd30 .debug_line - 0x438f - 0x438f + 0x4579 + 0x4579 0x103 .debug_line - 0x4492 - 0x4492 + 0x467c + 0x467c 0x50 .debug_line - 0x44e2 - 0x44e2 - 0x78 + 0x46cc + 0x46cc + 0x8c .debug_line - 0x455a - 0x455a + 0x4758 + 0x4758 0x37 .debug_line - 0x4591 - 0x4591 + 0x478f + 0x478f 0x1c5 .debug_line - 0x4756 - 0x4756 + 0x4954 + 0x4954 0xb2 .debug_line - 0x4808 - 0x4808 + 0x4a06 + 0x4a06 0x37 .debug_line - 0x483f - 0x483f - 0xaf + 0x4a3d + 0x4a3d + 0xcd .debug_line - 0x48ee - 0x48ee + 0x4b0a + 0x4b0a 0x253 .debug_line - 0x4b41 - 0x4b41 + 0x4d5d + 0x4d5d 0xbf .debug_line - 0x4c00 - 0x4c00 + 0x4e1c + 0x4e1c 0x75 .debug_line - 0x4c75 - 0x4c75 + 0x4e91 + 0x4e91 0x2e .debug_line - 0x4ca3 - 0x4ca3 + 0x4ebf + 0x4ebf 0x9a .debug_line - 0x4d3d - 0x4d3d + 0x4f59 + 0x4f59 0x97 .debug_line - 0x4dd4 - 0x4dd4 + 0x4ff0 + 0x4ff0 0x93 .debug_line - 0x4e67 - 0x4e67 + 0x5083 + 0x5083 0x92 .debug_line - 0x4ef9 - 0x4ef9 + 0x5115 + 0x5115 0x53 .debug_line - 0x4f4c - 0x4f4c + 0x5168 + 0x5168 0x34 .debug_line - 0x4f80 - 0x4f80 + 0x519c + 0x519c 0x20 .debug_line - 0x4fa0 - 0x4fa0 + 0x51bc + 0x51bc 0x58 .debug_line - 0x4ff8 - 0x4ff8 + 0x5214 + 0x5214 0x3a .debug_line - 0x5032 - 0x5032 + 0x524e + 0x524e 0x92 .debug_line - 0x50c4 - 0x50c4 + 0x52e0 + 0x52e0 0x20 .debug_line - 0x50e4 - 0x50e4 + 0x5300 + 0x5300 0xb2 .debug_line - 0x5196 - 0x5196 + 0x53b2 + 0x53b2 0x3a .debug_line - 0x51d0 - 0x51d0 + 0x53ec + 0x53ec 0x9a .debug_line - 0x526a - 0x526a + 0x5486 + 0x5486 0x96 .debug_line - 0x5300 - 0x5300 + 0x551c + 0x551c 0x3c .debug_line - 0x533c - 0x533c + 0x5558 + 0x5558 0x88 @@ -3774,391 +3774,391 @@ .debug_str 0x0 0x0 - 0x2a7 + 0x2b1 .debug_str - 0x2a7 - 0x2a7 - 0x180 + 0x2b1 + 0x2b1 + 0x194 .debug_str - 0x427 - 0x427 - 0x164 + 0x445 + 0x445 + 0x16e .debug_str - 0x58b - 0x58b - 0x111 + 0x5b3 + 0x5b3 + 0x11b .debug_str - 0x69c - 0x69c - 0x12d + 0x6ce + 0x6ce + 0x141 .debug_str - 0x7c9 - 0x7c9 + 0x80f + 0x80f 0x100 .debug_str - 0x8c9 - 0x8c9 - 0x336 + 0x90f + 0x90f + 0x340 .debug_str - 0xbff - 0xbff - 0x13f + 0xc4f + 0xc4f + 0x149 .debug_str - 0xd3e - 0xd3e - 0xfd + 0xd98 + 0xd98 + 0x107 .debug_str - 0xe3b - 0xe3b - 0xd7 + 0xe9f + 0xe9f + 0xe1 .debug_str - 0xf12 - 0xf12 - 0x13a + 0xf80 + 0xf80 + 0x14e .debug_str - 0x104c - 0x104c - 0x12e + 0x10ce + 0x10ce + 0x142 .debug_str - 0x117a - 0x117a - 0x142 + 0x1210 + 0x1210 + 0x156 .debug_str - 0x12bc - 0x12bc - 0x189 + 0x1366 + 0x1366 + 0x19d .debug_str - 0x1445 - 0x1445 - 0xed + 0x1503 + 0x1503 + 0xf7 .debug_str - 0x1532 - 0x1532 - 0x178 + 0x15fa + 0x15fa + 0x18c .debug_str - 0x16aa - 0x16aa - 0x1a6 + 0x1786 + 0x1786 + 0x1ba .debug_str - 0x1850 - 0x1850 + 0x1940 + 0x1940 0x100 .debug_str - 0x1950 - 0x1950 - 0x526 + 0x1a40 + 0x1a40 + 0x53a .debug_str - 0x1e76 - 0x1e76 - 0x204 + 0x1f7a + 0x1f7a + 0x218 .debug_str - 0x207a - 0x207a - 0x13e + 0x2192 + 0x2192 + 0x152 .debug_str - 0x21b8 - 0x21b8 - 0x1a6 + 0x22e4 + 0x22e4 + 0x1ba .debug_str - 0x235e - 0x235e - 0x211 + 0x249e + 0x249e + 0x225 .debug_str - 0x256f - 0x256f - 0x40e + 0x26c3 + 0x26c3 + 0x422 .debug_str - 0x297d - 0x297d - 0x259 + 0x2ae5 + 0x2ae5 + 0x26d .debug_str - 0x2bd6 - 0x2bd6 - 0x1d8 + 0x2d52 + 0x2d52 + 0x1ec .debug_str - 0x2dae - 0x2dae - 0x1c4 + 0x2f3e + 0x2f3e + 0x1d8 .debug_str - 0x2f72 - 0x2f72 - 0x3a5 + 0x3116 + 0x3116 + 0x3b9 .debug_str - 0x3317 - 0x3317 - 0x4df + 0x34cf + 0x34cf + 0x4f3 .debug_str - 0x37f6 - 0x37f6 - 0xd9 + 0x39c2 + 0x39c2 + 0xe3 .debug_str - 0x38cf - 0x38cf - 0x200 + 0x3aa5 + 0x3aa5 + 0x214 .debug_str - 0x3acf - 0x3acf - 0x4ae + 0x3cb9 + 0x3cb9 + 0x4c2 .debug_str - 0x3f7d - 0x3f7d - 0x2d1 + 0x417b + 0x417b + 0x2e5 .debug_str - 0x424e - 0x424e - 0x186 + 0x4460 + 0x4460 + 0x19a .debug_str - 0x43d4 - 0x43d4 - 0x281 + 0x45fa + 0x45fa + 0x295 .debug_str - 0x4655 - 0x4655 - 0x4e8 + 0x488f + 0x488f + 0x4fc .debug_str - 0x4b3d - 0x4b3d - 0x1eb + 0x4d8b + 0x4d8b + 0x1ff .debug_str - 0x4d28 - 0x4d28 - 0x143 + 0x4f8a + 0x4f8a + 0x157 .debug_str - 0x4e6b - 0x4e6b - 0x174 + 0x50e1 + 0x50e1 + 0x188 .debug_str - 0x4fdf - 0x4fdf - 0x34c + 0x5269 + 0x5269 + 0x360 .debug_str - 0x532b - 0x532b - 0x149 + 0x55c9 + 0x55c9 + 0x15d .debug_str - 0x5474 - 0x5474 - 0x33c + 0x5726 + 0x5726 + 0x350 .debug_str - 0x57b0 - 0x57b0 - 0x3ca + 0x5a76 + 0x5a76 + 0x3de .debug_str - 0x5b7a - 0x5b7a - 0x355 + 0x5e54 + 0x5e54 + 0x369 .debug_str - 0x5ecf - 0x5ecf - 0x207 + 0x61bd + 0x61bd + 0x21b .debug_str - 0x60d6 - 0x60d6 - 0xac + 0x63d8 + 0x63d8 + 0xb6 .debug_str - 0x6182 - 0x6182 + 0x648e + 0x648e 0xee .debug_str - 0x6270 - 0x6270 + 0x657c + 0x657c 0x158 .debug_str - 0x63c8 - 0x63c8 + 0x66d4 + 0x66d4 0x151 .debug_str - 0x6519 - 0x6519 + 0x6825 + 0x6825 0x198 .debug_str - 0x66b1 - 0x66b1 + 0x69bd + 0x69bd 0x106 .debug_str - 0x67b7 - 0x67b7 + 0x6ac3 + 0x6ac3 0x10c .debug_str - 0x68c3 - 0x68c3 + 0x6bcf + 0x6bcf 0x141 .debug_str - 0x6a04 - 0x6a04 + 0x6d10 + 0x6d10 0x119 .debug_str - 0x6b1d - 0x6b1d + 0x6e29 + 0x6e29 0x16c .debug_str - 0x6c89 - 0x6c89 + 0x6f95 + 0x6f95 0x159 @@ -5400,7 +5400,7 @@ .debug_info 0x0 0x0 - 0x1a704 + 0x1a99c @@ -5540,7 +5540,7 @@ .debug_line 0x0 0x0 - 0x53c4 + 0x55e0 @@ -5868,7 +5868,7 @@ .debug_str 0x0 0x0 - 0x6de2 + 0x70ee Index: Debug/source/subdir_rules.mk =================================================================== diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r894b734327eb6e7cfa6bf651623576bc10214195 --- Debug/source/subdir_rules.mk (.../subdir_rules.mk) (revision 765d2c35118e202444e737c66c77faf9678cc87e) +++ Debug/source/subdir_rules.mk (.../subdir_rules.mk) (revision 894b734327eb6e7cfa6bf651623576bc10214195) @@ -6,14 +6,14 @@ source/%.obj: ../source/%.asm $(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/App" --include_path="/home/fw/workspace_HD/HD/App/Tasks" --include_path="/home/fw/workspace_HD/HD/App/Modes" --include_path="/home/fw/workspace_HD/HD/App/Drivers" --include_path="/home/fw/workspace_HD/HD/App/Contollers" --include_path="/home/fw/workspace_HD/HD/App/Comm" --include_path="/home/fw/workspace_HD/HD" --include_path="/home/fw/workspace_HD/HD/include" --include_path="/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/include" -g --diag_warning=225 --diag_wrap=off --display_error_number --enum_type=packed --abi=eabi --preproc_with_compile --preproc_dependency="source/$(basename $(