Index: firmware/App/Controllers/AlarmLamp.c =================================================================== diff -u -reff7b1575f008f81b29ef906f6346fac6012d3ab -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/App/Controllers/AlarmLamp.c (.../AlarmLamp.c) (revision eff7b1575f008f81b29ef906f6346fac6012d3ab) +++ firmware/App/Controllers/AlarmLamp.c (.../AlarmLamp.c) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -58,7 +58,7 @@ static U32 currentLampPatternStep = 0; static U32 lampPatternStepTimer = 0; -const struct LampPatterns lampPatterns[NUM_OF_LAMP_PATTERNS] = { +const struct LampPatterns lampPatterns[ NUM_OF_LAMP_PATTERNS ] = { { { 500, 500 }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF } }, // LAMP_PATTERN_OFF { { 500, 500 }, { LAMP_STATE_ON, LAMP_STATE_ON }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF } }, // LAMP_PATTERN_OK { { 500, 500 }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON, LAMP_STATE_OFF } }, // LAMP_PATTERN_FAULT Fisheye: Tag dcbd821e41803adc6e582d909207bc97f85ff939 refers to a dead (removed) revision in file `firmware/App/Controllers/Buttons.c'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag dcbd821e41803adc6e582d909207bc97f85ff939 refers to a dead (removed) revision in file `firmware/App/Controllers/Buttons.h'. Fisheye: No comparison available. Pass `N' to diff? Index: firmware/App/Drivers/CPLD.c =================================================================== diff -u -r83b1a65b576994e1f8e1476629d8f1277cd67720 -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/App/Drivers/CPLD.c (.../CPLD.c) (revision 83b1a65b576994e1f8e1476629d8f1277cd67720) +++ firmware/App/Drivers/CPLD.c (.../CPLD.c) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -15,7 +15,6 @@ **************************************************************************/ #include -#include #include "gio.h" #include "mibspi.h" @@ -39,28 +38,28 @@ #define RED_SPI5_PORT_MASK 0x00000800 // (SOMI[0] - re-purposed as output GPIO) // CPLD pin I/O macros -#define GET_OFF() (PIN_SIGNAL_STATE_T)(gioGetBit(gioPORTA, OFF_BUTTON_GIO_PORT_PIN)) -#define GET_STOP() (PIN_SIGNAL_STATE_T)(gioGetBit(gioPORTA, STOP_BUTTON_GIO_PORT_PIN)) -#define GET_WD_EXP() (PIN_SIGNAL_STATE_T)(gioGetBit(gioPORTB, WD_EXP_GIO_PORT_PIN)) +#define GET_OFF() ( PIN_SIGNAL_STATE_T )( gioGetBit( gioPORTA, OFF_BUTTON_GIO_PORT_PIN ) ) +#define GET_STOP() ( PIN_SIGNAL_STATE_T )( gioGetBit( gioPORTA, STOP_BUTTON_GIO_PORT_PIN ) ) +#define GET_WD_EXP() ( PIN_SIGNAL_STATE_T )( gioGetBit( gioPORTB, WD_EXP_GIO_PORT_PIN ) ) #define TGL_WD_PET() gioToggleBit( gioPORTB, WD_PET_GIO_PORT_PIN ) -#define TGL_OFF_REQ() gioToggleBit( gioPORTB, OFF_REQUEST_GIO_PORT_PIN) +#define TGL_OFF_REQ() gioToggleBit( gioPORTB, OFF_REQUEST_GIO_PORT_PIN ) #define SET_WD_PET() gioSetBit( gioPORTB, WD_PET_GIO_PORT_PIN, PIN_SIGNAL_HIGH ) #define SET_OFF_REQ() gioSetBit( gioPORTB, OFF_REQUEST_GIO_PORT_PIN, PIN_SIGNAL_HIGH ) -#define SET_GREEN() {mibspiREG5->PC3 |= GREEN_SPI5_PORT_MASK;} -#define SET_BLUE() {mibspiREG5->PC3 |= BLUE_SPI5_PORT_MASK;} -#define SET_RED() {mibspiREG5->PC3 |= RED_SPI5_PORT_MASK;} +#define SET_GREEN() { mibspiREG5->PC3 |= GREEN_SPI5_PORT_MASK; } +#define SET_BLUE() { mibspiREG5->PC3 |= BLUE_SPI5_PORT_MASK; } +#define SET_RED() { mibspiREG5->PC3 |= RED_SPI5_PORT_MASK; } #define CLR_WD_PET() gioSetBit( gioPORTB, WD_PET_GIO_PORT_PIN, PIN_SIGNAL_LOW ) #define CLR_OFF_REQ() gioSetBit( gioPORTB, OFF_REQUEST_GIO_PORT_PIN, PIN_SIGNAL_LOW ) -#define CLR_GREEN() {mibspiREG5->PC3 &= ~GREEN_SPI5_PORT_MASK;} -#define CLR_BLUE() {mibspiREG5->PC3 &= ~BLUE_SPI5_PORT_MASK;} -#define CLR_RED() {mibspiREG5->PC3 &= ~RED_SPI5_PORT_MASK;} +#define CLR_GREEN() { mibspiREG5->PC3 &= ~GREEN_SPI5_PORT_MASK; } +#define CLR_BLUE() { mibspiREG5->PC3 &= ~BLUE_SPI5_PORT_MASK; } +#define CLR_RED() { mibspiREG5->PC3 &= ~RED_SPI5_PORT_MASK; } #ifdef RM46_EVAL_BOARD_TARGET // for RM46 eval board, user button B uses the MIBSPI1_nCS[4] pin, so need to re-purpose that pin as GPIO to see the button #define USER_BUTTON_MASK 0x00000010 // (nCS[4] - #define GET_USER_BUTTON() (PIN_SIGNAL_STATE_T)(((mibspiREG1->PC2 & USER_BUTTON_MASK) == 0 ? PIN_SIGNAL_LOW : PIN_SIGNAL_HIGH)) + #define GET_USER_BUTTON() ( PIN_SIGNAL_STATE_T )( ( ( mibspiREG1->PC2 & USER_BUTTON_MASK ) == 0 ? PIN_SIGNAL_LOW : PIN_SIGNAL_HIGH ) ) PIN_SIGNAL_STATE_T getUserButtonState( void ) { PIN_SIGNAL_STATE_T result = GET_USER_BUTTON(); Index: firmware/App/Modes/ModeDisinfect.c =================================================================== diff -u --- firmware/App/Modes/ModeDisinfect.c (revision 0) +++ firmware/App/Modes/ModeDisinfect.c (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -0,0 +1,67 @@ +/************************************************************************** + * + * Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. + * + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * @file ModeDisinfect.c + * + * @date 20-Dec-2019 + * @author L. Baloa + * + * @brief Top-level state machine for the disinfect mode. + * + **************************************************************************/ + +#include +#include +#include "Common.h" +#include "OperationModes.h" + +// ********** private data ********** + +// ********** private function prototypes ********** + +/************************************************************************* + * @brief initDisinfectMode + * The initDisinfectMode function initializes the disinfect Mode module. + * @details + * Inputs : none + * Outputs : none + * @param none + * @return none + *************************************************************************/ +void initDisinfectMode( void ) +{ +} + +/************************************************************************* + * @brief transitionToDisinfectMode + * The transitionToDisinfectMode function prepares for transition to disinfect mode. + * @details + * Inputs : none + * Outputs : none + * @param none + * @return none + *************************************************************************/ +void transitionToDisinfectMode( void ) +{ + // temporary test code - alarm lamp medium alarm + requestAlarmLampPattern( LAMP_PATTERN_MED_ALARM ); +} + +/************************************************************************* + * @brief execDisinfectMode + * The execDisinfectMode function executes the disinfect Mode state machine. + * @details + * Inputs : none + * Outputs : none + * @param none + * @return none + *************************************************************************/ +void execDisinfectMode( void ) +{ + +} + Index: firmware/App/Modes/ModeDisinfect.h =================================================================== diff -u --- firmware/App/Modes/ModeDisinfect.h (revision 0) +++ firmware/App/Modes/ModeDisinfect.h (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -0,0 +1,26 @@ +/************************************************************************** + * + * Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. + * + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * @file ModeDisinfectt.h + * + * @date 20-Dec-2019 + * @author L. Baloa + * + * @brief Header file for Disinfect Mode. + * + **************************************************************************/ + +#ifndef __MODE_DISINFECT_H__ +#define __MODE_DISINFECT_H__ + +// ********** private function prototypes ********** + +void initDisinfectMode( void ); // initialize this module +void transitionToDisinfectMode( void ); // prepares for transition to treatment mode +void execDisinfectMode( void ); // execute the treatment mode state machine (call from OperationModes) + +#endif Index: firmware/App/Modes/ModeDrain.c =================================================================== diff -u --- firmware/App/Modes/ModeDrain.c (revision 0) +++ firmware/App/Modes/ModeDrain.c (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -0,0 +1,65 @@ +/************************************************************************** + * + * Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. + * + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * @file ModeDrain.c + * + * @date 20-Dec-2019 + * @author L. Baloa + * + * @brief Top-level state machine for the drain mode. + * + **************************************************************************/ + +#include +#include "Common.h" +#include "OperationModes.h" + +// ********** private data ********** + +// ********** private function prototypes ********** + +/************************************************************************* + * @brief initDrainMode + * The initOpParamsMode function initializes the Drain Mode module. + * @details + * Inputs : none + * Outputs : Operating Parameters Mode module initialized. + * @param none + * @return none + *************************************************************************/ +void initDrainMode( void ) +{ +} + +/************************************************************************* + * @brief transitionToDrainMode + * The transitionToDrainMode function prepares for transition to drain \n + * mode. + * @details + * Inputs : none + * Outputs : + * @param none + * @return none + *************************************************************************/ +void transitionToDrainMode( void ) +{ +} + +/************************************************************************* + * @brief execDrainMode + * The execDrainMode function executes the Drain Mode state machine. + * @details + * Inputs : none + * Outputs : + * @param none + * @return none + *************************************************************************/ +void execDrainMode( void ) +{ + +} + Index: firmware/App/Modes/ModeDrain.h =================================================================== diff -u --- firmware/App/Modes/ModeDrain.h (revision 0) +++ firmware/App/Modes/ModeDrain.h (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -0,0 +1,26 @@ +/************************************************************************** + * + * Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. + * + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * @file ModeDrain.h + * + * @date 19-Sep-2019 + * @author L. Baloa + * + * @brief Header file for Drain Mode. + * + **************************************************************************/ + +#ifndef __MODE_DRAIN_H__ +#define __MODE_DRAIN_H__ + +// ********** private function prototypes ********** + +void initDrainMode( void ); // initialize this module +void transitionToDrainMode( void ); // prepares for transition to operating parameters mode +void execDrainMode( void ); // execute the drain mode state machine + +#endif Index: firmware/App/Modes/ModeFill.c =================================================================== diff -u -rdd8c7304a6f366e4815facd247700ea00d26c7ca -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision dd8c7304a6f366e4815facd247700ea00d26c7ca) +++ firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -14,8 +14,6 @@ * **************************************************************************/ -//leo-del #include -//leo-del #include #include "ModeFill.h" #include "Common.h" #include "OperationModes.h" @@ -26,7 +24,8 @@ #endif // ********** private data ********** -static volatile enum FillModeSubModes { +static volatile enum FillModeSubModes +{ CHECK_INLET_WATER = 0, CREATE_PRODUCT_WATER, DIALYSATE_PRODUCTION, @@ -91,7 +90,8 @@ case CHECK_INLET_WATER: // We check every half second to toggle LED - if (TRUE == didTimeout(timer, QUARTER_SECOND)) { + if (TRUE == didTimeout(timer, QUARTER_SECOND)) + { timer = getMSTimerCount(); // Reset timer #ifdef RM46_EVAL_BOARD_TARGET @@ -100,7 +100,8 @@ toggle_counter++; } - if (toggle_counter == 8) { + if (toggle_counter == 8) + { toggle_counter = 0; // switch to submode @@ -112,7 +113,8 @@ case CREATE_PRODUCT_WATER: // We check every half second to toggle LED - if (TRUE == didTimeout(timer, HALF_SECOND)) { + if (TRUE == didTimeout(timer, HALF_SECOND)) + { timer = getMSTimerCount(); // Reset timer #ifdef RM46_EVAL_BOARD_TARGET @@ -121,7 +123,8 @@ toggle_counter++; } - if (toggle_counter == 4) { + if (toggle_counter == 4) + { toggle_counter = 0; // switch to submode @@ -131,7 +134,8 @@ case DIALYSATE_PRODUCTION: // We check every half second to toggle LED - if (TRUE == didTimeout(timer, HALF_SECOND + QUARTER_SECOND)) { + if (TRUE == didTimeout(timer, HALF_SECOND + QUARTER_SECOND)) + { timer = getMSTimerCount(); // Reset timer #ifdef RM46_EVAL_BOARD_TARGET @@ -140,7 +144,8 @@ toggle_counter++; } - if (toggle_counter == 4) { + if (toggle_counter == 4) + { toggle_counter = 0; // switch to submode @@ -150,7 +155,8 @@ case DELIVER_DIALYSATE: - if(toggle_counter == 0) { + if(toggle_counter == 0) + { #ifdef RM46_EVAL_BOARD_TARGET setUserLED(TRUE); #endif Index: firmware/App/Modes/ModeFlush.c =================================================================== diff -u --- firmware/App/Modes/ModeFlush.c (revision 0) +++ firmware/App/Modes/ModeFlush.c (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -0,0 +1,67 @@ +/************************************************************************** + * + * Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. + * + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * @file ModeFlush.c + * + * @date 20-Dec-2019 + * @author L. Baloa + * + * @brief Top-level state machine for flush mode. + * + *************************************************************************/ + +#include +#include +#include "Common.h" +#include "OperationModes.h" + +// ********** private data ********** + +// ********** private function prototypes ********** + +/************************************************************************* + * @brief initFlushMode + * The initFlushMode function initializes flush Mode module. + * @details + * Inputs : none + * Outputs : none + * @param none + * @return none +*************************************************************************/ +void initFlushMode( void ) +{ +} + +/************************************************************************* + * @brief transitionToFlushMode + * The transitionToFlushMode function prepares for transition to \n + * flush mode. + * @details + * Inputs : none + * Outputs : + * @param none + * @return none +*************************************************************************/ +void transitionToFlushMode( void ) +{ + // temporary test code - alarm lamp low alarm + requestAlarmLampPattern( LAMP_PATTERN_LOW_ALARM ); +} + +/************************************************************************* + * @brief execFlushMode + * The execFlushMode function executes the flush Mode state machine. + * @details + * Inputs : none + * Outputs : + * @param none + * @return none +*************************************************************************/ +void execFlushMode( void ) +{ +} + Index: firmware/App/Modes/ModeFlush.h =================================================================== diff -u --- firmware/App/Modes/ModeFlush.h (revision 0) +++ firmware/App/Modes/ModeFlush.h (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -0,0 +1,26 @@ +/************************************************************************** + * + * Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. + * + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * @file ModeFlush.h + * + * @date 20-Dec-2019 + * @author L. Baloa + * + * @brief Header file for Flush Mode. + * + **************************************************************************/ + +#ifndef __MODE_FLUSH_H__ +#define __MODE_FLUSH_H__ + +// ********** private function prototypes ********** + +void initFlushMode( void ); // initialize this module +void transitionToFlushMode( void ); // prepares for transition to pre-treatment mode +void execFlushMode( void ); // execute the pre-treatment mode state machine (call from OperationModes) + +#endif Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -r6d5a23b275903587f400bc686aed4d2709cf3e78 -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 6d5a23b275903587f400bc686aed4d2709cf3e78) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -15,7 +15,6 @@ **************************************************************************/ #include -#include #include "Common.h" #include "CPLD.h" #include "FPGA.h" @@ -29,7 +28,6 @@ { POST_STATE_START = 0, POST_STATE_ALARM_LAMP, - POST_STATE_STUCK_BUTTON, POST_STATE_FPGA, POST_STATE_WATCHDOG, POST_STATE_COMPLETED, @@ -105,11 +103,6 @@ postState = handlePOSTStatus( testStatus ); break; - case POST_STATE_STUCK_BUTTON: - testStatus = execStuckButtonTest(); - postState = handlePOSTStatus( testStatus ); - break; - case POST_STATE_FPGA: testStatus = execFPGATest(); postState = handlePOSTStatus( testStatus ); Fisheye: Tag dcbd821e41803adc6e582d909207bc97f85ff939 refers to a dead (removed) revision in file `firmware/App/Modes/ModeOpParams.c'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag dcbd821e41803adc6e582d909207bc97f85ff939 refers to a dead (removed) revision in file `firmware/App/Modes/ModeOpParams.h'. Fisheye: No comparison available. Pass `N' to diff? Index: firmware/App/Modes/ModePostTreat.c =================================================================== diff -u -reff7b1575f008f81b29ef906f6346fac6012d3ab -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision eff7b1575f008f81b29ef906f6346fac6012d3ab) +++ firmware/App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -15,7 +15,6 @@ **************************************************************************/ #include -#include #include "Common.h" #include "OperationModes.h" #include "ModePostTreat.h" @@ -64,11 +63,5 @@ *************************************************************************/ void execPostTreatmentMode( void ) { - BOOL stop = isStopButtonPressed(); - - if ( TRUE == stop ) - { - requestNewOperationMode( MODE_STAN ); - } } Fisheye: Tag dcbd821e41803adc6e582d909207bc97f85ff939 refers to a dead (removed) revision in file `firmware/App/Modes/ModePreTreat.c'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag dcbd821e41803adc6e582d909207bc97f85ff939 refers to a dead (removed) revision in file `firmware/App/Modes/ModePreTreat.h'. Fisheye: No comparison available. Pass `N' to diff? Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r6d5a23b275903587f400bc686aed4d2709cf3e78 -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 6d5a23b275903587f400bc686aed4d2709cf3e78) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -15,7 +15,6 @@ **************************************************************************/ #include -#include #include "Common.h" #include "OperationModes.h" #include "ModeStandby.h" @@ -68,11 +67,6 @@ *************************************************************************/ void execStandbyMode( void ) { -// BOOL stop = isStopButtonPressed(); -// if ( TRUE == stop ) -// { - //requestNewOperationMode( MODE_FILL ); -// } } Fisheye: Tag dcbd821e41803adc6e582d909207bc97f85ff939 refers to a dead (removed) revision in file `firmware/App/Modes/ModeTreatment.c'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag dcbd821e41803adc6e582d909207bc97f85ff939 refers to a dead (removed) revision in file `firmware/App/Modes/ModeTreatment.h'. Fisheye: No comparison available. Pass `N' to diff? Index: firmware/App/Modes/OperationModes.c =================================================================== diff -u -r6d5a23b275903587f400bc686aed4d2709cf3e78 -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision 6d5a23b275903587f400bc686aed4d2709cf3e78) +++ firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -14,7 +14,10 @@ * **************************************************************************/ +#include +#include #include +#include #include "gio.h" #include "Common.h" @@ -23,40 +26,28 @@ #include "ModeFault.h" #include "ModeFill.h" #include "ModeInitPOST.h" -#include "ModeOpParams.h" #include "ModePostTreat.h" -#include "ModePreTreat.h" #include "ModeService.h" #include "ModeStandby.h" -#include "ModeTreatment.h" // ********** private data ********** 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 FILL 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_FILL, MODE_NLEG, MODE_NLEG, MODE_NLEG, - MODE_NLEG, }, - /* FILL */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_FILL, MODE_NLEG, MODE_NLEG, MODE_NLEG, - MODE_NLEG, }, - /* OPAR */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_FILL, 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 FILL DRAI FLUS DISI + /* FAUL */{ MODE_FAUL, MODE_SERV, 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 }, + /* INIT */{ MODE_FAUL, MODE_NLEG, MODE_INIT, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG }, + /* STAN */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_STAN, MODE_FILL, MODE_NLEG, MODE_NLEG, MODE_NLEG }, + /* FILL */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_FILL, MODE_NLEG, MODE_NLEG, MODE_NLEG }, + /* DRAI */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_DRAI, MODE_NLEG, MODE_NLEG }, + /* FLUS */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_FLUS, MODE_NLEG }, + /* DISI */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_DISI } +}; // ********** private function prototypes ********** @@ -92,10 +83,9 @@ initInitAndPOSTMode(); initStandbyMode(); initFillMode(); - initOpParamsMode(); - initPreTreatmentMode(); - initTreatmentMode(); - initPostTreatmentMode(); + initDrainMode(); + initFlushMode(); + initDisinfectMode(); } /************************************************************************* @@ -153,22 +143,18 @@ execFillMode(); break; - case MODE_OPAR: - execOpParamsMode(); + case MODE_DRAI: + execDrainMode(); break; - case MODE_PRET: - execPreTreatmentMode(); + case MODE_FLUS: + execFlushMode(); break; - case MODE_TREA: - execTreatmentMode(); + case MODE_DISI: + execDisinfectMode(); break; - case MODE_POST: - execPostTreatmentMode(); - break; - default: currentMode = MODE_FAUL; // TODO - trigger s/w fault @@ -281,18 +267,15 @@ case MODE_FILL: transitionToFillMode(); break; - case MODE_OPAR: - transitionToOpParamsMode(); + case MODE_DRAI: + transitionToDrainMode(); break; - case MODE_PRET: - transitionToPreTreatmentMode(); + case MODE_FLUS: + transitionToFlushMode(); break; - case MODE_TREA: - transitionToTreatmentMode(); + case MODE_DISI: + transitionToDisinfectMode(); break; - case MODE_POST: - transitionToPostTreatmentMode(); - break; default: // TODO - s/w fault break; Index: firmware/App/Modes/OperationModes.h =================================================================== diff -u -r6d5a23b275903587f400bc686aed4d2709cf3e78 -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision 6d5a23b275903587f400bc686aed4d2709cf3e78) +++ firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -26,10 +26,9 @@ MODE_INIT, // Initialization & POST MODE_STAN, // Standby MODE_FILL, // Fill mode - MODE_OPAR, // Operating Parameters - MODE_PRET, // Pre-Treatment - MODE_TREA, // Treatment - MODE_POST, // Post-Treatment + MODE_DRAI, // Drain + MODE_FLUS, // Flush + MODE_DISI, // Disinfect MODE_NLEG, // Not legal NUM_OF_MODES } OP_MODE; Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -r663c6ccbe24d0adf734ca0684510eef70884cdee -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 663c6ccbe24d0adf734ca0684510eef70884cdee) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -43,7 +43,7 @@ // ********** private data ********** -const COMM_BUFFER_T CAN_OUT_BUFFERS[NUM_OF_CAN_OUT_BUFFERS] = +const COMM_BUFFER_T CAN_OUT_BUFFERS[ NUM_OF_CAN_OUT_BUFFERS ] = { COMM_BUFFER_OUT_CAN_DG_ALARM, COMM_BUFFER_OUT_CAN_DG_2_HD, @@ -52,15 +52,15 @@ COMM_BUFFER_OUT_UART_PC }; -const COMM_BUFFER_T MSG_IN_BUFFERS[NUM_OF_MSG_IN_BUFFERS] = +const COMM_BUFFER_T MSG_IN_BUFFERS[ NUM_OF_MSG_IN_BUFFERS ] = { COMM_BUFFER_IN_CAN_HD_2_DG, COMM_BUFFER_IN_CAN_PC_2_DG, COMM_BUFFER_IN_UART_PC }; -static U08 pcXmitPacket[PC_MESSAGE_PACKET_SIZE] = {0,0,0,0,0,0,0,0};// = {1,2,3,4,5,6,7,8}; -static U08 pcRecvPacket[PC_MESSAGE_PACKET_SIZE] = {0,0,0,0,0,0,0,0}; +static U08 pcXmitPacket[ PC_MESSAGE_PACKET_SIZE ] = { 0, 0, 0, 0, 0, 0, 0, 0 };// = { 1,2,3,4,5,6,7,8}; +static U08 pcRecvPacket[ PC_MESSAGE_PACKET_SIZE ] = { 0, 0, 0, 0, 0, 0, 0, 0 }; // DMA control records static g_dmaCTRL pcDMAXmitControlRecord; @@ -622,12 +622,6 @@ switch ( msgID ) { - case MSG_ID_OFF_BUTTON_PRESS: - handleOffButtonConfirmMsgFromUI( message ); -#ifdef RM46_EVAL_BOARD_TARGET - setUserLED( TRUE ); -#endif - break; case MSD_ID_DG_FILL_START_STOP: handleDGFillStartStopMessages( message ); @@ -651,14 +645,6 @@ handleTestHDMessageRequest( message ); break; - case MSG_ID_OFF_BUTTON_STATE_OVERRIDE: - handleTestOffButtonStateOverrideRequest( message ); - break; - - case MSG_ID_STOP_BUTTON_STATE_OVERRIDE: - handleTestStopButtonStateOverrideRequest( message ); - break; - case MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE: handleTestAlarmLampPatternOverrideRequest( message ); break; Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r663c6ccbe24d0adf734ca0684510eef70884cdee -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 663c6ccbe24d0adf734ca0684510eef70884cdee) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -20,7 +20,6 @@ #include "Common.h" #include "AlarmLamp.h" -#include "Buttons.h" #include "MsgQueues.h" #include "WatchdogMgmt.h" #include "SystemCommMessages.h" @@ -97,57 +96,9 @@ // ********************* MSG_ID_OFF_BUTTON_PRESS ************************* // *********************************************************************** -/************************************************************************* - * @brief sendOffButtonMsgToUI - * The sendOffButtonMsgToUI function constructs an off button msg to the UI \n - * and queues the msg for transmit on the appropriate CAN channel. - * @details - * Inputs : none - * Outputs : Off button msg constructed and queued. - * @param none - * @return TRUE if msg successfully queued for transmit, FALSE if not - *************************************************************************/ -BOOL sendOffButtonMsgToUI( void ) -{ - BOOL result; - MESSAGE_T msg; - U32 msgSize; - U08 data[sizeof(MESSAGE_WRAPPER_T)+1+CAN_MESSAGE_PAYLOAD_SIZE]; // must hold full (wrapped) message + sync + any CAN padding - // create a message record - blankMessage( &msg ); - msg.hdr.msgID = MSG_ID_OFF_BUTTON_PRESS; - msg.hdr.payloadLen = 0; - // serialize the message (w/ sync, CRC, and appropriate CAN padding) - msgSize = serializeMessage( msg, data ); - - // add serialized message data to appropriate comm buffer - result = addToCommBuffer( COMM_BUFFER_OUT_CAN_DG_2_HD, data, msgSize ); - - return result; -} - /************************************************************************* - * @brief handleOffButtonConfirmMsgFromUI - * The handleOffButtonConfirmMsgFromUI function handles a response to an \n - * off button message to the UI. - * @details - * Inputs : none - * Outputs : message handled - * @param message : a pointer to the message to handle - * @return none - *************************************************************************/ -void handleOffButtonConfirmMsgFromUI( MESSAGE_T *message ) -{ - OFF_BUTTON_MESSAGE_FROM_UI_PAYLOAD_T payload; - - memcpy( &payload, message->payload, sizeof(OFF_BUTTON_MESSAGE_FROM_UI_PAYLOAD_T) ); - userConfirmOffButton( payload.confirmed ); -} - - -/************************************************************************* * @brief handleDGFillStartStopMessages * The handleDGFillStartStopMessages function handles a response to the * start and stop messages thru the CAN bus. @@ -326,72 +277,6 @@ } /************************************************************************* - * @brief handleTestOffButtonStateOverrideRequest - * The handleTestOffButtonStateOverrideRequest function handles a request to \n - * override the state of the off button. - * @details - * Inputs : none - * Outputs : message handled - * @param message : a pointer to the message to handle - * @return none - *************************************************************************/ -void handleTestOffButtonStateOverrideRequest( MESSAGE_T *message ) -{ - TEST_OVERRIDE_PAYLOAD_T payload; - BOOL result = FALSE; - - // verify payload length - if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen ) - { - memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) ); - - if ( FALSE == payload.reset ) - { - result = testSetOffButtonStateOverride( (BUTTON_STATE_T)(payload.state) ); - } - else - { - result = testResetOffButtonStateOverride(); - } - } - // respond to request - sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); -} - -/************************************************************************* - * @brief handleTestStopButtonStateOverrideRequest - * The handleTestStopButtonStateOverrideRequest function handles a request to \n - * override the stop button state. - * @details - * Inputs : none - * Outputs : message handled - * @param message : a pointer to the message to handle - * @return none - *************************************************************************/ -void handleTestStopButtonStateOverrideRequest( MESSAGE_T *message ) -{ - TEST_OVERRIDE_PAYLOAD_T payload; - BOOL result = FALSE; - - // verify payload length - if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen ) - { - memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) ); - - if ( FALSE == payload.reset ) - { - result = testSetStopButtonStateOverride( (BUTTON_STATE_T)(payload.state) ); - } - else - { - result = testResetStopButtonStateOverride(); - } - } - // respond to request - sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); -} - -/************************************************************************* * @brief handleTestAlarmLampPatternOverrideRequest * The handleTestAlarmLampPatternOverrideRequest function handles a request to \n * override the alarm lamp pattern. Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r663c6ccbe24d0adf734ca0684510eef70884cdee -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 663c6ccbe24d0adf734ca0684510eef70884cdee) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -25,13 +25,10 @@ typedef enum Msg_IDs { MSG_ID_UNUSED = 0, - MSG_ID_OFF_BUTTON_PRESS, MSD_ID_DG_FILL_START_STOP = 0x2000, MSG_ID_FIRST_TESTER_MESSAGE = 0xA000, MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TESTER_MESSAGE, MSG_ID_HD_MESSAGE, - MSG_ID_OFF_BUTTON_STATE_OVERRIDE, - MSG_ID_STOP_BUTTON_STATE_OVERRIDE, MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE, MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE, NUM_OF_MSG_IDS @@ -41,8 +38,6 @@ // MSG_ID_OFF_BUTTON_PRESS BOOL sendOffButtonMsgToUI( void ); -void handleOffButtonConfirmMsgFromUI( MESSAGE_T *message ); - void handleDGFillStartStopMessages( MESSAGE_T *message ); // *********** public test support message functions ********** @@ -60,9 +55,6 @@ // MSG_ID_OFF_BUTTON_STATE_OVERRIDE void handleTestOffButtonStateOverrideRequest( MESSAGE_T *message ); -// MSG_ID_STOP_BUTTON_STATE_OVERRIDE -void handleTestStopButtonStateOverrideRequest( MESSAGE_T *message ); - // MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE void handleTestAlarmLampPatternOverrideRequest( MESSAGE_T *message ); Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -reff7b1575f008f81b29ef906f6346fac6012d3ab -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision eff7b1575f008f81b29ef906f6346fac6012d3ab) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -62,7 +62,6 @@ { lastUserPress = TRUE; setUserLED( FALSE ); - sendOffButtonMsgToUI(); } } else Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -reff7b1575f008f81b29ef906f6346fac6012d3ab -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision eff7b1575f008f81b29ef906f6346fac6012d3ab) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -14,7 +14,6 @@ * **************************************************************************/ -#include #include "gio.h" #include "FPGA.h" @@ -34,10 +33,6 @@ // 1st pass for FPGA execFPGAIn(); - // monitor and process buttons - execButtons(); - - // 2nd pass for FPGA execFPGAOut(); Index: firmware/Debug/App/Modes/subdir_vars.mk =================================================================== diff -u -rfd0e359b0ee4b3efdf25ac1fd619f85fffef67b7 -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/Debug/App/Modes/subdir_vars.mk (.../subdir_vars.mk) (revision fd0e359b0ee4b3efdf25ac1fd619f85fffef67b7) +++ firmware/Debug/App/Modes/subdir_vars.mk (.../subdir_vars.mk) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -4,75 +4,75 @@ # Add inputs and outputs from these tool invocations to the build variables C_SRCS += \ +../App/Modes/ModeDisinfect.c \ +../App/Modes/ModeDrain.c \ ../App/Modes/ModeFault.c \ ../App/Modes/ModeFill.c \ +../App/Modes/ModeFlush.c \ ../App/Modes/ModeInitPOST.c \ -../App/Modes/ModeOpParams.c \ ../App/Modes/ModePostTreat.c \ -../App/Modes/ModePreTreat.c \ ../App/Modes/ModeService.c \ ../App/Modes/ModeStandby.c \ -../App/Modes/ModeTreatment.c \ ../App/Modes/OperationModes.c C_DEPS += \ +./App/Modes/ModeDisinfect.d \ +./App/Modes/ModeDrain.d \ ./App/Modes/ModeFault.d \ ./App/Modes/ModeFill.d \ +./App/Modes/ModeFlush.d \ ./App/Modes/ModeInitPOST.d \ -./App/Modes/ModeOpParams.d \ ./App/Modes/ModePostTreat.d \ -./App/Modes/ModePreTreat.d \ ./App/Modes/ModeService.d \ ./App/Modes/ModeStandby.d \ -./App/Modes/ModeTreatment.d \ ./App/Modes/OperationModes.d OBJS += \ +./App/Modes/ModeDisinfect.obj \ +./App/Modes/ModeDrain.obj \ ./App/Modes/ModeFault.obj \ ./App/Modes/ModeFill.obj \ +./App/Modes/ModeFlush.obj \ ./App/Modes/ModeInitPOST.obj \ -./App/Modes/ModeOpParams.obj \ ./App/Modes/ModePostTreat.obj \ -./App/Modes/ModePreTreat.obj \ ./App/Modes/ModeService.obj \ ./App/Modes/ModeStandby.obj \ -./App/Modes/ModeTreatment.obj \ ./App/Modes/OperationModes.obj OBJS__QUOTED += \ +"App/Modes/ModeDisinfect.obj" \ +"App/Modes/ModeDrain.obj" \ "App/Modes/ModeFault.obj" \ "App/Modes/ModeFill.obj" \ +"App/Modes/ModeFlush.obj" \ "App/Modes/ModeInitPOST.obj" \ -"App/Modes/ModeOpParams.obj" \ "App/Modes/ModePostTreat.obj" \ -"App/Modes/ModePreTreat.obj" \ "App/Modes/ModeService.obj" \ "App/Modes/ModeStandby.obj" \ -"App/Modes/ModeTreatment.obj" \ "App/Modes/OperationModes.obj" C_DEPS__QUOTED += \ +"App/Modes/ModeDisinfect.d" \ +"App/Modes/ModeDrain.d" \ "App/Modes/ModeFault.d" \ "App/Modes/ModeFill.d" \ +"App/Modes/ModeFlush.d" \ "App/Modes/ModeInitPOST.d" \ -"App/Modes/ModeOpParams.d" \ "App/Modes/ModePostTreat.d" \ -"App/Modes/ModePreTreat.d" \ "App/Modes/ModeService.d" \ "App/Modes/ModeStandby.d" \ -"App/Modes/ModeTreatment.d" \ "App/Modes/OperationModes.d" C_SRCS__QUOTED += \ +"../App/Modes/ModeDisinfect.c" \ +"../App/Modes/ModeDrain.c" \ "../App/Modes/ModeFault.c" \ "../App/Modes/ModeFill.c" \ +"../App/Modes/ModeFlush.c" \ "../App/Modes/ModeInitPOST.c" \ -"../App/Modes/ModeOpParams.c" \ "../App/Modes/ModePostTreat.c" \ -"../App/Modes/ModePreTreat.c" \ "../App/Modes/ModeService.c" \ "../App/Modes/ModeStandby.c" \ -"../App/Modes/ModeTreatment.c" \ "../App/Modes/OperationModes.c" Index: firmware/Debug/ccsObjs.opt =================================================================== diff -u -raa2d2d9c54eda4fbc18a3cdcba48222cd4b4177f -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/Debug/ccsObjs.opt (.../ccsObjs.opt) (revision aa2d2d9c54eda4fbc18a3cdcba48222cd4b4177f) +++ firmware/Debug/ccsObjs.opt (.../ccsObjs.opt) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -1 +1 @@ -"./irqDispatch_a.obj" "./irqDispatch_c.obj" "./App/Controllers/AlarmLamp.obj" "./App/Controllers/Buttons.obj" "./App/Drivers/CPLD.obj" "./App/Drivers/Comm.obj" "./App/Drivers/SafetyShutdown.obj" "./App/Modes/ModeFault.obj" "./App/Modes/ModeFill.obj" "./App/Modes/ModeInitPOST.obj" "./App/Modes/ModeOpParams.obj" "./App/Modes/ModePostTreat.obj" "./App/Modes/ModePreTreat.obj" "./App/Modes/ModeService.obj" "./App/Modes/ModeStandby.obj" "./App/Modes/ModeTreatment.obj" "./App/Modes/OperationModes.obj" "./App/Services/CommBuffers.obj" "./App/Services/FPGA.obj" "./App/Services/Interrupts.obj" "./App/Services/MsgQueues.obj" "./App/Services/SystemComm.obj" "./App/Services/SystemCommMessages.obj" "./App/Services/Timers.obj" "./App/Services/Utilities.obj" "./App/Services/WatchdogMgmt.obj" "./App/Tasks/TaskBG.obj" "./App/Tasks/TaskGeneral.obj" "./App/Tasks/TaskPriority.obj" "./App/Tasks/TaskTimer.obj" "./source/can.obj" "./source/crc.obj" "./source/dabort.obj" "./source/ecap.obj" "./source/emac.obj" "./source/eqep.obj" "./source/errata_SSWF021_45.obj" "./source/esm.obj" "./source/etpwm.obj" "./source/gio.obj" "./source/lin.obj" "./source/mdio.obj" "./source/mibspi.obj" "./source/notification.obj" "./source/phy_dp83640.obj" "./source/pinmux.obj" "./source/rti.obj" "./source/sci.obj" "./source/sys_core.obj" "./source/sys_dma.obj" "./source/sys_intvecs.obj" "./source/sys_main.obj" "./source/sys_mpu.obj" "./source/sys_pcr.obj" "./source/sys_phantom.obj" "./source/sys_pmm.obj" "./source/sys_pmu.obj" "./source/sys_selftest.obj" "./source/sys_startup.obj" "./source/sys_vim.obj" "./source/system.obj" "../source/sys_link.cmd" -lrtsv7R4_T_le_v3D16_eabi.lib \ No newline at end of file +"./irqDispatch_a.obj" "./irqDispatch_c.obj" "./App/Controllers/AlarmLamp.obj" "./App/Drivers/CPLD.obj" "./App/Drivers/Comm.obj" "./App/Drivers/SafetyShutdown.obj" "./App/Modes/ModeDisinfect.obj" "./App/Modes/ModeDrain.obj" "./App/Modes/ModeFault.obj" "./App/Modes/ModeFill.obj" "./App/Modes/ModeFlush.obj" "./App/Modes/ModeInitPOST.obj" "./App/Modes/ModePostTreat.obj" "./App/Modes/ModeService.obj" "./App/Modes/ModeStandby.obj" "./App/Modes/OperationModes.obj" "./App/Services/CommBuffers.obj" "./App/Services/FPGA.obj" "./App/Services/Interrupts.obj" "./App/Services/MsgQueues.obj" "./App/Services/SystemComm.obj" "./App/Services/SystemCommMessages.obj" "./App/Services/Timers.obj" "./App/Services/Utilities.obj" "./App/Services/WatchdogMgmt.obj" "./App/Tasks/TaskBG.obj" "./App/Tasks/TaskGeneral.obj" "./App/Tasks/TaskPriority.obj" "./App/Tasks/TaskTimer.obj" "./source/can.obj" "./source/crc.obj" "./source/dabort.obj" "./source/ecap.obj" "./source/emac.obj" "./source/eqep.obj" "./source/errata_SSWF021_45.obj" "./source/esm.obj" "./source/etpwm.obj" "./source/gio.obj" "./source/lin.obj" "./source/mdio.obj" "./source/mibspi.obj" "./source/notification.obj" "./source/phy_dp83640.obj" "./source/pinmux.obj" "./source/rti.obj" "./source/sci.obj" "./source/sys_core.obj" "./source/sys_dma.obj" "./source/sys_intvecs.obj" "./source/sys_main.obj" "./source/sys_mpu.obj" "./source/sys_pcr.obj" "./source/sys_phantom.obj" "./source/sys_pmm.obj" "./source/sys_pmu.obj" "./source/sys_selftest.obj" "./source/sys_startup.obj" "./source/sys_vim.obj" "./source/system.obj" "../source/sys_link.cmd" -lrtsv7R4_T_le_v3D16_eabi.lib \ No newline at end of file Index: firmware/Debug/makefile =================================================================== diff -u -raa2d2d9c54eda4fbc18a3cdcba48222cd4b4177f -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/Debug/makefile (.../makefile) (revision aa2d2d9c54eda4fbc18a3cdcba48222cd4b4177f) +++ firmware/Debug/makefile (.../makefile) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -11,19 +11,18 @@ "./irqDispatch_a.obj" \ "./irqDispatch_c.obj" \ "./App/Controllers/AlarmLamp.obj" \ -"./App/Controllers/Buttons.obj" \ "./App/Drivers/CPLD.obj" \ "./App/Drivers/Comm.obj" \ "./App/Drivers/SafetyShutdown.obj" \ +"./App/Modes/ModeDisinfect.obj" \ +"./App/Modes/ModeDrain.obj" \ "./App/Modes/ModeFault.obj" \ "./App/Modes/ModeFill.obj" \ +"./App/Modes/ModeFlush.obj" \ "./App/Modes/ModeInitPOST.obj" \ -"./App/Modes/ModeOpParams.obj" \ "./App/Modes/ModePostTreat.obj" \ -"./App/Modes/ModePreTreat.obj" \ "./App/Modes/ModeService.obj" \ "./App/Modes/ModeStandby.obj" \ -"./App/Modes/ModeTreatment.obj" \ "./App/Modes/OperationModes.obj" \ "./App/Services/CommBuffers.obj" \ "./App/Services/FPGA.obj" \ @@ -224,10 +223,10 @@ # Other Targets clean: -$(RM) $(BIN_OUTPUTS__QUOTED)$(EXE_OUTPUTS__QUOTED) - -$(RM) "irqDispatch_a.obj" "irqDispatch_c.obj" "App/Controllers/AlarmLamp.obj" "App/Controllers/Buttons.obj" "App/Drivers/CPLD.obj" "App/Drivers/Comm.obj" "App/Drivers/SafetyShutdown.obj" "App/Modes/ModeFault.obj" "App/Modes/ModeFill.obj" "App/Modes/ModeInitPOST.obj" "App/Modes/ModeOpParams.obj" "App/Modes/ModePostTreat.obj" "App/Modes/ModePreTreat.obj" "App/Modes/ModeService.obj" "App/Modes/ModeStandby.obj" "App/Modes/ModeTreatment.obj" "App/Modes/OperationModes.obj" "App/Services/CommBuffers.obj" "App/Services/FPGA.obj" "App/Services/Interrupts.obj" "App/Services/MsgQueues.obj" "App/Services/SystemComm.obj" "App/Services/SystemCommMessages.obj" "App/Services/Timers.obj" "App/Services/Utilities.obj" "App/Services/WatchdogMgmt.obj" "App/Tasks/TaskBG.obj" "App/Tasks/TaskGeneral.obj" "App/Tasks/TaskPriority.obj" "App/Tasks/TaskTimer.obj" "source/can.obj" "source/crc.obj" "source/dabort.obj" "source/ecap.obj" "source/emac.obj" "source/eqep.obj" "source/errata_SSWF021_45.obj" "source/esm.obj" "source/etpwm.obj" - -$(RM) "source/gio.obj" "source/lin.obj" "source/mdio.obj" "source/mibspi.obj" "source/notification.obj" "source/phy_dp83640.obj" "source/pinmux.obj" "source/rti.obj" "source/sci.obj" "source/sys_core.obj" "source/sys_dma.obj" "source/sys_intvecs.obj" "source/sys_main.obj" "source/sys_mpu.obj" "source/sys_pcr.obj" "source/sys_phantom.obj" "source/sys_pmm.obj" "source/sys_pmu.obj" "source/sys_selftest.obj" "source/sys_startup.obj" "source/sys_vim.obj" "source/system.obj" - -$(RM) "irqDispatch_c.d" "App/Controllers/AlarmLamp.d" "App/Controllers/Buttons.d" "App/Drivers/CPLD.d" "App/Drivers/Comm.d" "App/Drivers/SafetyShutdown.d" "App/Modes/ModeFault.d" "App/Modes/ModeFill.d" "App/Modes/ModeInitPOST.d" "App/Modes/ModeOpParams.d" "App/Modes/ModePostTreat.d" "App/Modes/ModePreTreat.d" "App/Modes/ModeService.d" "App/Modes/ModeStandby.d" "App/Modes/ModeTreatment.d" "App/Modes/OperationModes.d" "App/Services/CommBuffers.d" "App/Services/FPGA.d" "App/Services/Interrupts.d" "App/Services/MsgQueues.d" "App/Services/SystemComm.d" "App/Services/SystemCommMessages.d" "App/Services/Timers.d" "App/Services/Utilities.d" "App/Services/WatchdogMgmt.d" "App/Tasks/TaskBG.d" "App/Tasks/TaskGeneral.d" "App/Tasks/TaskPriority.d" "App/Tasks/TaskTimer.d" "source/can.d" "source/crc.d" "source/ecap.d" "source/emac.d" "source/eqep.d" "source/errata_SSWF021_45.d" "source/esm.d" "source/etpwm.d" "source/gio.d" "source/lin.d" "source/mdio.d" "source/mibspi.d" "source/notification.d" "source/phy_dp83640.d" - -$(RM) "source/pinmux.d" "source/rti.d" "source/sci.d" "source/sys_dma.d" "source/sys_main.d" "source/sys_pcr.d" "source/sys_phantom.d" "source/sys_pmm.d" "source/sys_selftest.d" "source/sys_startup.d" "source/sys_vim.d" "source/system.d" + -$(RM) "irqDispatch_a.obj" "irqDispatch_c.obj" "App/Controllers/AlarmLamp.obj" "App/Drivers/CPLD.obj" "App/Drivers/Comm.obj" "App/Drivers/SafetyShutdown.obj" "App/Modes/ModeDisinfect.obj" "App/Modes/ModeDrain.obj" "App/Modes/ModeFault.obj" "App/Modes/ModeFill.obj" "App/Modes/ModeFlush.obj" "App/Modes/ModeInitPOST.obj" "App/Modes/ModePostTreat.obj" "App/Modes/ModeService.obj" "App/Modes/ModeStandby.obj" "App/Modes/OperationModes.obj" "App/Services/CommBuffers.obj" "App/Services/FPGA.obj" "App/Services/Interrupts.obj" "App/Services/MsgQueues.obj" "App/Services/SystemComm.obj" "App/Services/SystemCommMessages.obj" "App/Services/Timers.obj" "App/Services/Utilities.obj" "App/Services/WatchdogMgmt.obj" "App/Tasks/TaskBG.obj" "App/Tasks/TaskGeneral.obj" "App/Tasks/TaskPriority.obj" "App/Tasks/TaskTimer.obj" "source/can.obj" "source/crc.obj" "source/dabort.obj" "source/ecap.obj" "source/emac.obj" "source/eqep.obj" "source/errata_SSWF021_45.obj" "source/esm.obj" "source/etpwm.obj" "source/gio.obj" "source/lin.obj" + -$(RM) "source/mdio.obj" "source/mibspi.obj" "source/notification.obj" "source/phy_dp83640.obj" "source/pinmux.obj" "source/rti.obj" "source/sci.obj" "source/sys_core.obj" "source/sys_dma.obj" "source/sys_intvecs.obj" "source/sys_main.obj" "source/sys_mpu.obj" "source/sys_pcr.obj" "source/sys_phantom.obj" "source/sys_pmm.obj" "source/sys_pmu.obj" "source/sys_selftest.obj" "source/sys_startup.obj" "source/sys_vim.obj" "source/system.obj" + -$(RM) "irqDispatch_c.d" "App/Controllers/AlarmLamp.d" "App/Drivers/CPLD.d" "App/Drivers/Comm.d" "App/Drivers/SafetyShutdown.d" "App/Modes/ModeDisinfect.d" "App/Modes/ModeDrain.d" "App/Modes/ModeFault.d" "App/Modes/ModeFill.d" "App/Modes/ModeFlush.d" "App/Modes/ModeInitPOST.d" "App/Modes/ModePostTreat.d" "App/Modes/ModeService.d" "App/Modes/ModeStandby.d" "App/Modes/OperationModes.d" "App/Services/CommBuffers.d" "App/Services/FPGA.d" "App/Services/Interrupts.d" "App/Services/MsgQueues.d" "App/Services/SystemComm.d" "App/Services/SystemCommMessages.d" "App/Services/Timers.d" "App/Services/Utilities.d" "App/Services/WatchdogMgmt.d" "App/Tasks/TaskBG.d" "App/Tasks/TaskGeneral.d" "App/Tasks/TaskPriority.d" "App/Tasks/TaskTimer.d" "source/can.d" "source/crc.d" "source/ecap.d" "source/emac.d" "source/eqep.d" "source/errata_SSWF021_45.d" "source/esm.d" "source/etpwm.d" "source/gio.d" "source/lin.d" "source/mdio.d" "source/mibspi.d" "source/notification.d" "source/phy_dp83640.d" "source/pinmux.d" "source/rti.d" + -$(RM) "source/sci.d" "source/sys_dma.d" "source/sys_main.d" "source/sys_pcr.d" "source/sys_phantom.d" "source/sys_pmm.d" "source/sys_selftest.d" "source/sys_startup.d" "source/sys_vim.d" "source/system.d" -$(RM) "irqDispatch_a.d" "source/dabort.d" "source/sys_core.d" "source/sys_intvecs.d" "source/sys_mpu.d" "source/sys_pmu.d" -@echo 'Finished clean' -@echo ' ' Index: firmware/source/sys_main.c =================================================================== diff -u -reff7b1575f008f81b29ef906f6346fac6012d3ab -rdcbd821e41803adc6e582d909207bc97f85ff939 --- firmware/source/sys_main.c (.../sys_main.c) (revision eff7b1575f008f81b29ef906f6346fac6012d3ab) +++ firmware/source/sys_main.c (.../sys_main.c) (revision dcbd821e41803adc6e582d909207bc97f85ff939) @@ -60,7 +60,6 @@ #include "Common.h" #include "AlarmLamp.h" -#include "Buttons.h" #include "CommBuffers.h" #include "CPLD.h" #include "FPGA.h" @@ -143,7 +142,6 @@ initSafetyShutdown(); initCPLD(); initAlarmLamp(); - initButtons(); initWatchdogMgmt(); initFPGA(); initCommBuffers();