Fisheye: Tag 72ae2be3400d1671b3a9c0c6610938cd57055d8b refers to a dead (removed) revision in file `firmware/App/Controllers/PermeateTank.c'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 72ae2be3400d1671b3a9c0c6610938cd57055d8b refers to a dead (removed) revision in file `firmware/App/Controllers/PermeateTank.h'. Fisheye: No comparison available. Pass `N' to diff? Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r94d93795b2a516b3bdd7fc7030eb5eac933bfcd0 -r8e72441bc5cd51272b1dc6b14d6c95b4888d6301 --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 94d93795b2a516b3bdd7fc7030eb5eac933bfcd0) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 8e72441bc5cd51272b1dc6b14d6c95b4888d6301) @@ -19,7 +19,6 @@ #include "Flow.h" -#include "FPOperationModes.h" //#include "NVDataMgmt.h" #include "Messaging.h" #include "MessageSupport.h" @@ -44,8 +43,8 @@ #define ROP_FLOW_CONTROL_P_COEFFICIENT 0.15F ///< P term for RO pump flow control. #define ROP_FLOW_CONTROL_I_COEFFICIENT 0.65F ///< I term for RO pump flow control. -#define ROP_PRESSURE_CONTROL_P_COEFFICIENT 0.01F ///< P term for RO pump pressure control. -#define ROP_PRESSURE_CONTROL_I_COEFFICIENT 0.01F ///< I term for RO pump pressure control. +#define ROP_PRESSURE_CONTROL_P_COEFFICIENT 0.15F ///< P term for RO pump pressure control. +#define ROP_PRESSURE_CONTROL_I_COEFFICIENT 0.65F ///< I term for RO pump pressure control. #define ROP_FLOW_TO_PWM_SLOPE 0.5F ///< Slope of flow to PWM line equation. #define ROP_FLOW_TO_PWM_INTERCEPT 0.0F ///< Intercept of flow to PWM line equation. Index: firmware/App/Drivers/PAL.c =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r8e72441bc5cd51272b1dc6b14d6c95b4888d6301 --- firmware/App/Drivers/PAL.c (.../PAL.c) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Drivers/PAL.c (.../PAL.c) (revision 8e72441bc5cd51272b1dc6b14d6c95b4888d6301) @@ -80,12 +80,12 @@ /*********************************************************************//** * @brief - * The clear_saftety_shutdown function clears the GPIO to enable 24v supply. + * The clear_safety_shutdown function clears the GPIO to enable 24v supply. * @details \b Inputs: none * @details \b Outputs: mibspiREG1->PC3 * @return Value none *************************************************************************/ -void clear_saftety_shutdown( void ) +void clear_safety_shutdown( void ) { CLR_SAFETY_SHUTDOWN(); } Index: firmware/App/Drivers/PAL.h =================================================================== diff -u -r99498a5bab0a1f4c706376feceadc66df6d1c22e -r8e72441bc5cd51272b1dc6b14d6c95b4888d6301 --- firmware/App/Drivers/PAL.h (.../PAL.h) (revision 99498a5bab0a1f4c706376feceadc66df6d1c22e) +++ firmware/App/Drivers/PAL.h (.../PAL.h) (revision 8e72441bc5cd51272b1dc6b14d6c95b4888d6301) @@ -21,7 +21,7 @@ void setCrcREG_PSA_SIGREGL1( U32 regval ); U32 getCrcREG_PSA_SIGREGL1( void ); -void clear_saftety_shutdown( void ); +void clear_safety_shutdown( void ); void set_safety_shutdown( void ); /**@}*/ Index: firmware/App/Drivers/SafetyShutdown.c =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r8e72441bc5cd51272b1dc6b14d6c95b4888d6301 --- firmware/App/Drivers/SafetyShutdown.c (.../SafetyShutdown.c) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Drivers/SafetyShutdown.c (.../SafetyShutdown.c) (revision 8e72441bc5cd51272b1dc6b14d6c95b4888d6301) @@ -58,7 +58,7 @@ safetyShutdownSelfTestState = SAFETY_SHUTDOWN_SELF_TEST_STATE_START; safetyShutdownSelfTestStatus = SELF_TEST_STATUS_IN_PROGRESS; safetyShutdownSelfTestTimerCount = 0; - clear_saftety_shutdown(); + clear_safety_shutdown(); } /*********************************************************************//** @@ -179,66 +179,49 @@ safetyShutdownSelfTestState = SAFETY_SHUTDOWN_SELF_TEST_STATE_START; } + +/************************************************************************* + * TEST SUPPORT FUNCTIONS + *************************************************************************/ + + /*********************************************************************//** * @brief - * The testSetSafetyShutdownOverride function overrides the HD safety shutdown. + * The testSafetyShutdownOverride function overrides the safety + * shutdown. * @details \b Inputs: none - * @details \b Outputs: HD safety shutdown overridden - * @param value TRUE to activate safety shutdown, FALSE to de-activate it + * @details \b Outputs: FP safety shutdown overridden + * @param value TRUE to activate safety shutdown, FALSE to de-activate it. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testSetSafetyShutdownOverride( U32 value ) +BOOL testSetResetSafetyShutdownOverride( MESSAGE_T *message ) { - BOOL result = FALSE; + BOOL result = FALSE; + TEST_OVERRIDE_PAYLOAD_T payload; + OVERRIDE_TYPE_T ovType = getOverridePayloadFromMessage( message, &payload ); - if ( TRUE == isTestingActivated() ) + // Verify tester has logged in with f/w and override type is valid + if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) ) { - // remember natural state before override so we can reset + BOOL value = (BOOL)payload.state.u32; + + // Remember natural state before override so we can reset safetyShutdownOverrideResetState = safetyShutdownActivated; - // override safety shutdown signal + // Override safety shutdown signal if ( value > 0 ) { activateSafetyShutdown(); } else { safetyShutdownActivated = FALSE; - clear_saftety_shutdown(); + clear_safety_shutdown(); } result = TRUE; } return result; } -/*********************************************************************//** - * @brief - * The testResetSafetyShutdownOverride function resets the override of the - * HD safety shutdown. - * @details \b Inputs: none - * @details \b Outputs: shutdown override reset - * @return TRUE if override reset successful, FALSE if not - *************************************************************************/ -BOOL testResetSafetyShutdownOverride( void ) -{ - BOOL result = FALSE; - - if ( TRUE == isTestingActivated() ) - { - if ( TRUE == safetyShutdownOverrideResetState ) - { - activateSafetyShutdown(); - } - else - { - safetyShutdownActivated = FALSE; - clear_saftety_shutdown(); - } - result = TRUE; - } - - return result; -} - /**@}*/ Index: firmware/App/Drivers/SafetyShutdown.h =================================================================== diff -u -rd5574e12aa9638c933d11b9bee8d5cf024864440 -r8e72441bc5cd51272b1dc6b14d6c95b4888d6301 --- firmware/App/Drivers/SafetyShutdown.h (.../SafetyShutdown.h) (revision d5574e12aa9638c933d11b9bee8d5cf024864440) +++ firmware/App/Drivers/SafetyShutdown.h (.../SafetyShutdown.h) (revision 8e72441bc5cd51272b1dc6b14d6c95b4888d6301) @@ -27,9 +27,8 @@ BOOL isSafetyShutdownActivated( void ); SELF_TEST_STATUS_T execSafetyShutdownTest( void ); void resetSafetyShutdownPOSTState( void ); +BOOL testSetResetSafetyShutdownOverride( MESSAGE_T *message ); -BOOL testSetSafetyShutdownOverride( U32 value ); -BOOL testResetSafetyShutdownOverride( void ); /**@}*/ Index: firmware/App/Modes/FPModeFault.c =================================================================== diff -u -r94d93795b2a516b3bdd7fc7030eb5eac933bfcd0 -r8e72441bc5cd51272b1dc6b14d6c95b4888d6301 --- firmware/App/Modes/FPModeFault.c (.../FPModeFault.c) (revision 94d93795b2a516b3bdd7fc7030eb5eac933bfcd0) +++ firmware/App/Modes/FPModeFault.c (.../FPModeFault.c) (revision 8e72441bc5cd51272b1dc6b14d6c95b4888d6301) @@ -15,6 +15,7 @@ * ***************************************************************************/ +#include "FPModeFault.h" #include "FPModeStandby.h" #include "FPOperationModes.h" #include "BoostPump.h" Index: firmware/App/Modes/FPModeFault.h =================================================================== diff -u -r94d93795b2a516b3bdd7fc7030eb5eac933bfcd0 -r8e72441bc5cd51272b1dc6b14d6c95b4888d6301 --- firmware/App/Modes/FPModeFault.h (.../FPModeFault.h) (revision 94d93795b2a516b3bdd7fc7030eb5eac933bfcd0) +++ firmware/App/Modes/FPModeFault.h (.../FPModeFault.h) (revision 8e72441bc5cd51272b1dc6b14d6c95b4888d6301) @@ -15,15 +15,15 @@ * ***************************************************************************/ -#ifndef __MODE_FAULT_H__ -#define __MODE_FAULT_H__ +#ifndef __MODE_FP_FAULT_H__ +#define __MODE_FP_FAULT_H__ #include "FPCommon.h" #include "FPDefs.h" /** * @defgroup FPFaultMode FPFaultMode - * @brief FaultMode unit. + * @brief FaultMode unit. Manages fault mode functions via state machine. * * @addtogroup FPFaultMode * @{ @@ -35,6 +35,9 @@ U32 transitionToFaultMode( void ); // Prepares for transition to fault mode U32 execFaultMode( void ); // Execute the fault mode state machine (call from OperationModes) +FP_FAULT_STATE_T getCurrentFaultState( void ); // get the current state of the fault mode. + + /**@}*/ #endif Index: firmware/App/Modes/FPModeInitPOST.h =================================================================== diff -u -r94d93795b2a516b3bdd7fc7030eb5eac933bfcd0 -r8e72441bc5cd51272b1dc6b14d6c95b4888d6301 --- firmware/App/Modes/FPModeInitPOST.h (.../FPModeInitPOST.h) (revision 94d93795b2a516b3bdd7fc7030eb5eac933bfcd0) +++ firmware/App/Modes/FPModeInitPOST.h (.../FPModeInitPOST.h) (revision 8e72441bc5cd51272b1dc6b14d6c95b4888d6301) @@ -15,8 +15,8 @@ * ***************************************************************************/ -#ifndef __MODE_INIT_POST_H__ -#define __MODE_INIT_POST_H__ +#ifndef __MODE_FP_INIT_POST_H__ +#define __MODE_FP_INIT_POST_H__ #include "FPCommon.h" #include "FPDefs.h" Index: firmware/App/Modes/FPModeStandby.h =================================================================== diff -u -r94d93795b2a516b3bdd7fc7030eb5eac933bfcd0 -r8e72441bc5cd51272b1dc6b14d6c95b4888d6301 --- firmware/App/Modes/FPModeStandby.h (.../FPModeStandby.h) (revision 94d93795b2a516b3bdd7fc7030eb5eac933bfcd0) +++ firmware/App/Modes/FPModeStandby.h (.../FPModeStandby.h) (revision 8e72441bc5cd51272b1dc6b14d6c95b4888d6301) @@ -15,8 +15,8 @@ * ***************************************************************************/ -#ifndef __MODE_STANDBY_H__ -#define __MODE_STANDBY_H__ +#ifndef __MODE_FP_STANDBY_H__ +#define __MODE_FP_STANDBY_H__ #include "FPCommon.h" #include "FPDefs.h" Index: firmware/App/Modes/FPOperationModes.h =================================================================== diff -u -r94d93795b2a516b3bdd7fc7030eb5eac933bfcd0 -r8e72441bc5cd51272b1dc6b14d6c95b4888d6301 --- firmware/App/Modes/FPOperationModes.h (.../FPOperationModes.h) (revision 94d93795b2a516b3bdd7fc7030eb5eac933bfcd0) +++ firmware/App/Modes/FPOperationModes.h (.../FPOperationModes.h) (revision 8e72441bc5cd51272b1dc6b14d6c95b4888d6301) @@ -15,8 +15,8 @@ * ***************************************************************************/ -#ifndef __OP_MODES_H__ -#define __OP_MODES_H__ +#ifndef __FP_OP_MODES_H__ +#define __FP_OP_MODES_H__ #include "FPCommon.h" #include "FPDefs.h" Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r94d93795b2a516b3bdd7fc7030eb5eac933bfcd0 -r8e72441bc5cd51272b1dc6b14d6c95b4888d6301 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 94d93795b2a516b3bdd7fc7030eb5eac933bfcd0) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 8e72441bc5cd51272b1dc6b14d6c95b4888d6301) @@ -18,6 +18,7 @@ #include "PAL.h" #include "Pressure.h" #include "ROPump.h" +#include "SafetyShutdown.h" #include "SystemCommFP.h" #include "Temperature.h" #include "Utilities.h" @@ -111,7 +112,8 @@ { MSG_ID_FP_BOOST_PUMP_TARGET_PWM_OVERRIDE_REQUEST, &testBoostPumpTargetDutyCycleOverride }, { MSG_ID_FP_BOOST_PUMP_STOP_REQUEST, &testBoostPumpHardStop }, { MSG_ID_FP_RO_PUMP_STOP_REQUEST, &testROPumpHardStop }, -{ MSG_ID_FW_VERSIONS_REQUEST, &handleVersionRequestMessage }, +{ MSG_ID_FW_VERSIONS_REQUEST, &handleVersionRequestMessage }, +{ MSG_ID_FP_SAFETY_SHUTDOWN_OVERRIDE_REQUEST, &testSetResetSafetyShutdownOverride }, };